From 45710ebb8ffeddc68bb26e6b364967c9dbdff5ad Mon Sep 17 00:00:00 2001 From: Nick Date: Tue, 23 Feb 2016 22:47:28 -0800 Subject: [PATCH] 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 --- src/main/java/WayofTime/bloodmagic/block/BlockBloodTank.java | 5 +++++ .../WayofTime/bloodmagic/block/BlockDimensionalPortal.java | 1 - .../WayofTime/bloodmagic/compat/jei/BloodMagicPlugin.java | 3 +++ .../WayofTime/bloodmagic/ritual/portal/LocationsHandler.java | 1 - .../WayofTime/bloodmagic/tile/TileDimensionalPortal.java | 5 +++-- 5 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockBloodTank.java b/src/main/java/WayofTime/bloodmagic/block/BlockBloodTank.java index 08a9ecce..63b3f48a 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockBloodTank.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockBloodTank.java @@ -44,6 +44,11 @@ public class BlockBloodTank extends BlockContainer return new TileBloodTank(); } + @Override + public int getRenderType() { + return 3; + } + @Override public boolean onBlockActivated(World world, BlockPos blockPos, IBlockState blockState, EntityPlayer player, EnumFacing side, float hitX, float hitY, float hitZ) { diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockDimensionalPortal.java b/src/main/java/WayofTime/bloodmagic/block/BlockDimensionalPortal.java index 17ef7aa4..b295b8d1 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockDimensionalPortal.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockDimensionalPortal.java @@ -33,7 +33,6 @@ public class BlockDimensionalPortal extends BlockIntegerContainer super(Material.portal, 2); setUnlocalizedName(Constants.Mod.MODID + ".dimensionalPortal"); setRegistryName(Constants.BloodMagicBlock.DIMENSIONAL_PORTAL.getRegName()); - setCreativeTab(BloodMagic.tabBloodMagic); setBlockUnbreakable(); setResistance(2000); setLightOpacity(0); diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/BloodMagicPlugin.java b/src/main/java/WayofTime/bloodmagic/compat/jei/BloodMagicPlugin.java index 5e6509cd..14fb79fc 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/BloodMagicPlugin.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/BloodMagicPlugin.java @@ -21,6 +21,7 @@ import WayofTime.bloodmagic.registry.ModBlocks; import WayofTime.bloodmagic.registry.ModItems; import mezz.jei.api.*; import net.minecraft.item.ItemStack; +import net.minecraftforge.oredict.OreDictionary; import javax.annotation.Nonnull; 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.phantomBlock)); jeiHelper.getItemBlacklist().addItemToBlacklist(new ItemStack(ModBlocks.alchemyArray)); + jeiHelper.getItemBlacklist().addItemToBlacklist(new ItemStack(ModBlocks.dimensionalPortal, 1, OreDictionary.WILDCARD_VALUE)); for (Map.Entry 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_NAME); + jeiHelper.getNbtIgnoreList().ignoreNbtTagNames(Constants.NBT.USES); jeiHelper.getNbtIgnoreList().ignoreNbtTagNames(Constants.NBT.SOULS); jeiHelper.getNbtIgnoreList().ignoreNbtTagNames(Constants.NBT.X_COORD); jeiHelper.getNbtIgnoreList().ignoreNbtTagNames(Constants.NBT.Y_COORD); diff --git a/src/main/java/WayofTime/bloodmagic/ritual/portal/LocationsHandler.java b/src/main/java/WayofTime/bloodmagic/ritual/portal/LocationsHandler.java index dc386710..18ee3ad0 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/portal/LocationsHandler.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/portal/LocationsHandler.java @@ -62,7 +62,6 @@ public class LocationsHandler implements Serializable return map; } catch (IOException e) { - e.printStackTrace(); return null; } catch (ClassNotFoundException e) { diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileDimensionalPortal.java b/src/main/java/WayofTime/bloodmagic/tile/TileDimensionalPortal.java index 15fb6363..42f3f4cf 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileDimensionalPortal.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileDimensionalPortal.java @@ -1,13 +1,14 @@ package WayofTime.bloodmagic.tile; import WayofTime.bloodmagic.ritual.RitualPortal; +import com.google.common.base.Strings; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; public class TileDimensionalPortal extends TileEntity { - public String portalID; + public String portalID = ""; public int masterStoneX; public int masterStoneY; public int masterStoneZ; @@ -32,7 +33,7 @@ public class TileDimensionalPortal extends TileEntity { 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("masterStoneY", masterStoneY);