Some minor cleanup
* Hid Dimensional Portal from JEI and Creative * Fixed stacktrace spam when invalid portal was stepped into * Fixed tank rendering no model at all * Fixed NBT saving for Dimensional Portal
This commit is contained in:
parent
5c5cda1917
commit
45710ebb8f
|
@ -44,6 +44,11 @@ public class BlockBloodTank extends BlockContainer
|
||||||
return new TileBloodTank();
|
return new TileBloodTank();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int getRenderType() {
|
||||||
|
return 3;
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean onBlockActivated(World world, BlockPos blockPos, IBlockState blockState, EntityPlayer player, EnumFacing side, float hitX, float hitY, float hitZ)
|
public boolean onBlockActivated(World world, BlockPos blockPos, IBlockState blockState, EntityPlayer player, EnumFacing side, float hitX, float hitY, float hitZ)
|
||||||
{
|
{
|
||||||
|
|
|
@ -33,7 +33,6 @@ public class BlockDimensionalPortal extends BlockIntegerContainer
|
||||||
super(Material.portal, 2);
|
super(Material.portal, 2);
|
||||||
setUnlocalizedName(Constants.Mod.MODID + ".dimensionalPortal");
|
setUnlocalizedName(Constants.Mod.MODID + ".dimensionalPortal");
|
||||||
setRegistryName(Constants.BloodMagicBlock.DIMENSIONAL_PORTAL.getRegName());
|
setRegistryName(Constants.BloodMagicBlock.DIMENSIONAL_PORTAL.getRegName());
|
||||||
setCreativeTab(BloodMagic.tabBloodMagic);
|
|
||||||
setBlockUnbreakable();
|
setBlockUnbreakable();
|
||||||
setResistance(2000);
|
setResistance(2000);
|
||||||
setLightOpacity(0);
|
setLightOpacity(0);
|
||||||
|
|
|
@ -21,6 +21,7 @@ import WayofTime.bloodmagic.registry.ModBlocks;
|
||||||
import WayofTime.bloodmagic.registry.ModItems;
|
import WayofTime.bloodmagic.registry.ModItems;
|
||||||
import mezz.jei.api.*;
|
import mezz.jei.api.*;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
|
import net.minecraftforge.oredict.OreDictionary;
|
||||||
|
|
||||||
import javax.annotation.Nonnull;
|
import javax.annotation.Nonnull;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
@ -51,6 +52,7 @@ public class BloodMagicPlugin extends BlankModPlugin
|
||||||
jeiHelper.getItemBlacklist().addItemToBlacklist(new ItemStack(ModBlocks.spectralBlock));
|
jeiHelper.getItemBlacklist().addItemToBlacklist(new ItemStack(ModBlocks.spectralBlock));
|
||||||
jeiHelper.getItemBlacklist().addItemToBlacklist(new ItemStack(ModBlocks.phantomBlock));
|
jeiHelper.getItemBlacklist().addItemToBlacklist(new ItemStack(ModBlocks.phantomBlock));
|
||||||
jeiHelper.getItemBlacklist().addItemToBlacklist(new ItemStack(ModBlocks.alchemyArray));
|
jeiHelper.getItemBlacklist().addItemToBlacklist(new ItemStack(ModBlocks.alchemyArray));
|
||||||
|
jeiHelper.getItemBlacklist().addItemToBlacklist(new ItemStack(ModBlocks.dimensionalPortal, 1, OreDictionary.WILDCARD_VALUE));
|
||||||
|
|
||||||
for (Map.Entry<String, Integer> entry : LivingArmourHandler.upgradeMaxLevelMap.entrySet())
|
for (Map.Entry<String, Integer> entry : LivingArmourHandler.upgradeMaxLevelMap.entrySet())
|
||||||
{
|
{
|
||||||
|
@ -67,6 +69,7 @@ public class BloodMagicPlugin extends BlankModPlugin
|
||||||
|
|
||||||
jeiHelper.getNbtIgnoreList().ignoreNbtTagNames(Constants.NBT.OWNER_UUID);
|
jeiHelper.getNbtIgnoreList().ignoreNbtTagNames(Constants.NBT.OWNER_UUID);
|
||||||
jeiHelper.getNbtIgnoreList().ignoreNbtTagNames(Constants.NBT.OWNER_NAME);
|
jeiHelper.getNbtIgnoreList().ignoreNbtTagNames(Constants.NBT.OWNER_NAME);
|
||||||
|
jeiHelper.getNbtIgnoreList().ignoreNbtTagNames(Constants.NBT.USES);
|
||||||
jeiHelper.getNbtIgnoreList().ignoreNbtTagNames(Constants.NBT.SOULS);
|
jeiHelper.getNbtIgnoreList().ignoreNbtTagNames(Constants.NBT.SOULS);
|
||||||
jeiHelper.getNbtIgnoreList().ignoreNbtTagNames(Constants.NBT.X_COORD);
|
jeiHelper.getNbtIgnoreList().ignoreNbtTagNames(Constants.NBT.X_COORD);
|
||||||
jeiHelper.getNbtIgnoreList().ignoreNbtTagNames(Constants.NBT.Y_COORD);
|
jeiHelper.getNbtIgnoreList().ignoreNbtTagNames(Constants.NBT.Y_COORD);
|
||||||
|
|
|
@ -62,7 +62,6 @@ public class LocationsHandler implements Serializable
|
||||||
return map;
|
return map;
|
||||||
} catch (IOException e)
|
} catch (IOException e)
|
||||||
{
|
{
|
||||||
e.printStackTrace();
|
|
||||||
return null;
|
return null;
|
||||||
} catch (ClassNotFoundException e)
|
} catch (ClassNotFoundException e)
|
||||||
{
|
{
|
||||||
|
|
|
@ -1,13 +1,14 @@
|
||||||
package WayofTime.bloodmagic.tile;
|
package WayofTime.bloodmagic.tile;
|
||||||
|
|
||||||
import WayofTime.bloodmagic.ritual.RitualPortal;
|
import WayofTime.bloodmagic.ritual.RitualPortal;
|
||||||
|
import com.google.common.base.Strings;
|
||||||
import net.minecraft.nbt.NBTTagCompound;
|
import net.minecraft.nbt.NBTTagCompound;
|
||||||
import net.minecraft.tileentity.TileEntity;
|
import net.minecraft.tileentity.TileEntity;
|
||||||
import net.minecraft.util.BlockPos;
|
import net.minecraft.util.BlockPos;
|
||||||
|
|
||||||
public class TileDimensionalPortal extends TileEntity
|
public class TileDimensionalPortal extends TileEntity
|
||||||
{
|
{
|
||||||
public String portalID;
|
public String portalID = "";
|
||||||
public int masterStoneX;
|
public int masterStoneX;
|
||||||
public int masterStoneY;
|
public int masterStoneY;
|
||||||
public int masterStoneZ;
|
public int masterStoneZ;
|
||||||
|
@ -32,7 +33,7 @@ public class TileDimensionalPortal extends TileEntity
|
||||||
{
|
{
|
||||||
super.writeToNBT(tagCompound);
|
super.writeToNBT(tagCompound);
|
||||||
|
|
||||||
tagCompound.setString(RitualPortal.PORTAL_ID_TAG, portalID);
|
tagCompound.setString(RitualPortal.PORTAL_ID_TAG, Strings.isNullOrEmpty(portalID) ? "" : portalID);
|
||||||
|
|
||||||
tagCompound.setInteger("masterStoneX", masterStoneX);
|
tagCompound.setInteger("masterStoneX", masterStoneX);
|
||||||
tagCompound.setInteger("masterStoneY", masterStoneY);
|
tagCompound.setInteger("masterStoneY", masterStoneY);
|
||||||
|
|
Loading…
Reference in a new issue