From 4345bd9728ac1a42214fff67bd6bb66829cf8c2d Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 9 Jan 2016 19:01:31 -0600 Subject: [PATCH] More blockstate guards in TE and blockstate conversions --- .../botania/common/block/tile/TileAlfPortal.java | 5 +++-- .../vazkii/botania/common/block/tile/TileAltar.java | 4 +++- .../botania/common/block/tile/TileEnchanter.java | 11 +++++------ .../botania/common/block/tile/TileEnderEye.java | 3 +++ .../botania/common/block/tile/TileFloatingFlower.java | 7 +++++-- .../botania/common/block/tile/TileManaBeacon.java | 4 ++++ .../vazkii/botania/common/block/tile/TileMod.java | 2 -- .../botania/common/block/tile/TileStarfield.java | 4 ++++ .../common/block/tile/mana/TileManaDetector.java | 3 ++- .../botania/common/block/tile/mana/TilePool.java | 11 ++++++++--- .../botania/common/block/tile/mana/TilePrism.java | 3 ++- .../botania/common/block/tile/mana/TileSpreader.java | 11 +++++++---- .../common/block/tile/string/TileRedString.java | 4 ++++ .../botania/common/item/rod/ItemRainbowRod.java | 11 ++++++----- 14 files changed, 56 insertions(+), 27 deletions(-) diff --git a/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java b/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java index c2ca42eb1..9d74ac818 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java @@ -127,7 +127,8 @@ public class TileAlfPortal extends TileMod implements ITickable { public void update() { IBlockState iBlockState = worldObj.getBlockState(getPos()); if(iBlockState.getBlock() != ModBlocks.alfPortal || iBlockState.getValue(BotaniaStateProps.ALFPORTAL_STATE) == AlfPortalState.OFF) { - ticksOpen = 0; + if (iBlockState.getBlock() == ModBlocks.alfPortal) + ticksOpen = 0; return; } AlfPortalState state = iBlockState.getValue(BotaniaStateProps.ALFPORTAL_STATE); @@ -209,7 +210,7 @@ public class TileAlfPortal extends TileMod implements ITickable { AxisAlignedBB getPortalAABB() { AxisAlignedBB aabb = new AxisAlignedBB(pos.add(-1, 1, 0), pos.add(2, 4, 1)); - if(getBlockMetadata() == 2) + if(worldObj.getBlockState(getPos()).getValue(BotaniaStateProps.ALFPORTAL_STATE) == AlfPortalState.ON_X) aabb = new AxisAlignedBB(pos.add(0, 1, -1), pos.add(1, 4, 2)); return aabb; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileAltar.java b/src/main/java/vazkii/botania/common/block/tile/TileAltar.java index 65d480123..3e66dfe66 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileAltar.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileAltar.java @@ -41,6 +41,8 @@ import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.item.IPetalApothecary; import vazkii.botania.api.recipe.IFlowerComponent; import vazkii.botania.api.recipe.RecipePetals; +import vazkii.botania.api.state.BotaniaStateProps; +import vazkii.botania.api.state.enums.AltarVariant; import vazkii.botania.client.core.handler.HUDHandler; import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.common.Botania; @@ -67,7 +69,7 @@ public class TileAltar extends TileSimpleInventory implements ISidedInventory, I if(stack == null || item.isDead) return false; - if(!isMossy && getBlockMetadata() == 0) { + if(!isMossy && worldObj.getBlockState(getPos()).getValue(BotaniaStateProps.ALTAR_VARIANT) == AltarVariant.DEFAULT) { if(stack.getItem() == Item.getItemFromBlock(Blocks.vine)) { isMossy = true; if (worldObj.isRemote) { diff --git a/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java b/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java index a90b01434..cd348ad3f 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java @@ -140,12 +140,11 @@ public class TileEnchanter extends TileMod implements ISparkAttachable, ITickabl return; EnumFacing.Axis axis = state.getValue(BotaniaStateProps.ENCHANTER_DIRECTION); - if(getBlockMetadata() < PYLON_LOCATIONS.size()) - for(BlockPos pylon : PYLON_LOCATIONS.get(axis)) { - TileEntity tile = worldObj.getTileEntity(pos.add(pylon)); - if(tile != null && tile instanceof TilePylon) - ((TilePylon) tile).activated = false; - } + for(BlockPos pylon : PYLON_LOCATIONS.get(axis)) { + TileEntity tile = worldObj.getTileEntity(pos.add(pylon)); + if(tile != null && tile instanceof TilePylon) + ((TilePylon) tile).activated = false; + } if(!canEnchanterExist(worldObj, pos, axis)) { diff --git a/src/main/java/vazkii/botania/common/block/tile/TileEnderEye.java b/src/main/java/vazkii/botania/common/block/tile/TileEnderEye.java index a661d6eaa..14f529838 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileEnderEye.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileEnderEye.java @@ -21,12 +21,15 @@ import net.minecraft.util.ITickable; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.MovingObjectPosition; import vazkii.botania.api.state.BotaniaStateProps; +import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.item.equipment.tool.ToolCommons; public class TileEnderEye extends TileMod implements ITickable { @Override public void update() { + if (worldObj.getBlockState(getPos()).getBlock() != ModBlocks.enderEye) + return; boolean wasLooking = worldObj.getBlockState(getPos()).getValue(BotaniaStateProps.POWERED); int range = 80; List players = worldObj.getEntitiesWithinAABB(EntityPlayer.class, new AxisAlignedBB(pos.add(-range, -range, -range), pos.add(range, range, range))); diff --git a/src/main/java/vazkii/botania/common/block/tile/TileFloatingFlower.java b/src/main/java/vazkii/botania/common/block/tile/TileFloatingFlower.java index a0d1d0c2c..b8407c47a 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileFloatingFlower.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileFloatingFlower.java @@ -10,8 +10,10 @@ */ package vazkii.botania.common.block.tile; +import net.minecraft.item.EnumDyeColor; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.decor.IFloatingFlower; @@ -28,8 +30,9 @@ public class TileFloatingFlower extends TileMod implements IFloatingFlower { forcedStack = null; return retStack; } - - return new ItemStack(ModBlocks.shinyFlower, 1, getBlockMetadata()); + EnumDyeColor color = worldObj.getBlockState(getPos()).getBlock() != ModBlocks.floatingFlower ? EnumDyeColor.WHITE + : worldObj.getBlockState(getPos()).getValue(BotaniaStateProps.COLOR); + return new ItemStack(ModBlocks.shinyFlower, 1, color.getMetadata()); } @Override diff --git a/src/main/java/vazkii/botania/common/block/tile/TileManaBeacon.java b/src/main/java/vazkii/botania/common/block/tile/TileManaBeacon.java index f2f184082..41c28d03e 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileManaBeacon.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileManaBeacon.java @@ -16,11 +16,15 @@ import net.minecraft.util.ITickable; import net.minecraft.util.EnumFacing; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.Botania; +import vazkii.botania.common.block.ModBlocks; public class TileManaBeacon extends TileMod implements ITickable { @Override public void update() { + if (worldObj.getBlockState(getPos()).getBlock() != ModBlocks.manaBeacon) + return; + boolean redstone = false; for(EnumFacing dir : EnumFacing.VALUES) { int redstoneSide = worldObj.getRedstonePower(pos.offset(dir), dir); diff --git a/src/main/java/vazkii/botania/common/block/tile/TileMod.java b/src/main/java/vazkii/botania/common/block/tile/TileMod.java index 149689951..c7c979a79 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileMod.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileMod.java @@ -23,8 +23,6 @@ public class TileMod extends TileEntity { @Override public boolean shouldRefresh(World world, BlockPos pos, IBlockState oldState, IBlockState newState) { - // todo: review all subclasses. this could potentially leave stragglers hanging. - // todo: example: open crate and crafty crate should refresh when variants change return oldState.getBlock() != newState.getBlock(); } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileStarfield.java b/src/main/java/vazkii/botania/common/block/tile/TileStarfield.java index 151416057..d07601cd8 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileStarfield.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileStarfield.java @@ -13,11 +13,15 @@ package vazkii.botania.common.block.tile; import net.minecraft.util.ITickable; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.Botania; +import vazkii.botania.common.block.ModBlocks; public class TileStarfield extends TileMod implements ITickable { @Override public void update() { + if (worldObj.getBlockState(getPos()).getBlock() != ModBlocks.starfield) + return; + boolean state = worldObj.getBlockState(getPos()).getValue(BotaniaStateProps.POWERED); if(!worldObj.isRemote) { boolean newState = !worldObj.isDaytime(); diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TileManaDetector.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileManaDetector.java index ea33d7782..78b6fa338 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TileManaDetector.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileManaDetector.java @@ -18,13 +18,14 @@ import vazkii.botania.api.internal.IManaBurst; import vazkii.botania.api.mana.IManaCollisionGhost; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.Botania; +import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.TileMod; public class TileManaDetector extends TileMod implements IManaCollisionGhost, ITickable { @Override public void update() { - if(!worldObj.isRemote) { + if(!worldObj.isRemote && worldObj.getBlockState(getPos()).getBlock() == ModBlocks.manaDetector) { boolean state = worldObj.getBlockState(getPos()).getValue(BotaniaStateProps.POWERED); boolean expectedState = worldObj.getEntitiesWithinAABB(Entity.class, new AxisAlignedBB(pos, pos.add(1, 1, 1)), Predicates.instanceOf(IManaBurst.class)).size() != 0; if(state != expectedState) diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TilePool.java b/src/main/java/vazkii/botania/common/block/tile/mana/TilePool.java index 120522499..79f863dd9 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TilePool.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TilePool.java @@ -51,6 +51,8 @@ import vazkii.botania.api.mana.ManaNetworkEvent; import vazkii.botania.api.mana.spark.ISparkAttachable; import vazkii.botania.api.mana.spark.ISparkEntity; import vazkii.botania.api.recipe.RecipeManaInfusion; +import vazkii.botania.api.state.BotaniaStateProps; +import vazkii.botania.api.state.enums.PoolVariant; import vazkii.botania.client.core.handler.HUDHandler; import vazkii.botania.client.core.handler.LightningHandler; import vazkii.botania.client.core.helper.RenderHelper; @@ -198,10 +200,13 @@ public class TilePool extends TileMod implements IManaPool, IDyablePool, IKeyLoc @Override public void update() { + if (worldObj.getBlockState(getPos()).getBlock() != ModBlocks.pool) + return; + boolean wasDoingTransfer = isDoingTransfer; isDoingTransfer = false; if(manaCap == -1) - manaCap = getBlockMetadata() == 2 ? MAX_MANA_DILLUTED : MAX_MANA; + manaCap = worldObj.getBlockState(getPos()).getValue(BotaniaStateProps.POOL_VARIANT) == PoolVariant.DILUTED ? MAX_MANA_DILLUTED : MAX_MANA; if(!ManaNetworkHandler.instance.isPoolIn(this) && !isInvalid()) ManaNetworkEvent.addPool(this); @@ -349,7 +354,7 @@ public class TilePool extends TileMod implements IManaPool, IDyablePool, IKeyLoc } public void renderHUD(Minecraft mc, ScaledResolution res) { - ItemStack pool = new ItemStack(ModBlocks.pool, 1, getBlockMetadata()); + ItemStack pool = new ItemStack(ModBlocks.pool, 1, worldObj.getBlockState(getPos()).getValue(BotaniaStateProps.POOL_VARIANT).ordinal()); String name = StatCollector.translateToLocal(pool.getUnlocalizedName().replaceAll("tile.", "tile." + LibResources.PREFIX_MOD) + ".name"); int color = 0x4444FF; HUDHandler.drawSimpleManaHUD(color, knownMana, manaCap, name, res); @@ -391,7 +396,7 @@ public class TilePool extends TileMod implements IManaPool, IDyablePool, IKeyLoc @Override public int getCurrentMana() { - return worldObj != null && getBlockMetadata() == 1 ? MAX_MANA : mana; + return worldObj != null && worldObj.getBlockState(getPos()).getValue(BotaniaStateProps.POOL_VARIANT) == PoolVariant.CREATIVE ? MAX_MANA : mana; } @Override diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TilePrism.java b/src/main/java/vazkii/botania/common/block/tile/mana/TilePrism.java index 4181709db..8f8b571a5 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TilePrism.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TilePrism.java @@ -19,6 +19,7 @@ import vazkii.botania.api.mana.BurstProperties; import vazkii.botania.api.mana.ILens; import vazkii.botania.api.mana.IManaCollisionGhost; import vazkii.botania.api.mana.ITinyPlanetExcempt; +import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.block.tile.TileSimpleInventory; import vazkii.botania.common.lib.LibBlockNames; @@ -26,7 +27,7 @@ public class TilePrism extends TileSimpleInventory implements IManaCollisionGhos public void onBurstCollision(IManaBurst burst) { ItemStack lens = getStackInSlot(0); - boolean active = (getBlockMetadata() & 8) == 0; + boolean active = worldObj.getBlockState(getPos()).getValue(BotaniaStateProps.POWERED); boolean valid = lens != null && lens.getItem() instanceof ILens && (!(lens.getItem() instanceof ITinyPlanetExcempt) || ((ITinyPlanetExcempt) lens.getItem()).shouldPull(lens)); if(active) { diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TileSpreader.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileSpreader.java index 8b1c4b664..6a7e9ec9f 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TileSpreader.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileSpreader.java @@ -48,6 +48,8 @@ import vazkii.botania.api.mana.IManaSpreader; import vazkii.botania.api.mana.IRedirectable; import vazkii.botania.api.mana.IThrottledPacket; import vazkii.botania.api.mana.ManaNetworkEvent; +import vazkii.botania.api.state.BotaniaStateProps; +import vazkii.botania.api.state.enums.SpreaderVariant; import vazkii.botania.api.wand.IWandBindable; import vazkii.botania.client.core.handler.HUDHandler; import vazkii.botania.client.lib.LibResources; @@ -440,15 +442,16 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, } public boolean isRedstone() { - return worldObj == null ? staticRedstone : getBlockMetadata() == 1; + return worldObj == null ? staticRedstone : worldObj.getBlockState(getPos()).getValue(BotaniaStateProps.SPREADER_VARIANT) == SpreaderVariant.REDSTONE; } public boolean isDreamwood() { - return worldObj == null ? staticDreamwood : getBlockMetadata() == 2 || getBlockMetadata() == 3; + SpreaderVariant variant = worldObj.getBlockState(getPos()).getValue(BotaniaStateProps.SPREADER_VARIANT); + return worldObj == null ? staticDreamwood : variant == SpreaderVariant.ELVEN || variant == SpreaderVariant.GAIA; } public boolean isULTRA_SPREADER() { - return worldObj == null ? staticUltra : getBlockMetadata() == 3; + return worldObj == null ? staticUltra : worldObj.getBlockState(getPos()).getValue(BotaniaStateProps.SPREADER_VARIANT) == SpreaderVariant.GAIA; } public void checkForReceiver() { @@ -543,7 +546,7 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, } public void renderHUD(Minecraft mc, ScaledResolution res) { - String name = StatCollector.translateToLocal(new ItemStack(ModBlocks.spreader, 1, getBlockMetadata()).getUnlocalizedName().replaceAll("tile.", "tile." + LibResources.PREFIX_MOD) + ".name"); + String name = StatCollector.translateToLocal(new ItemStack(ModBlocks.spreader, 1, worldObj.getBlockState(getPos()).getValue(BotaniaStateProps.SPREADER_VARIANT).ordinal()).getUnlocalizedName().replaceAll("tile.", "tile." + LibResources.PREFIX_MOD) + ".name"); int color = isRedstone() ? 0xFF0000 : isDreamwood() ? 0xFF00AE : 0x00FF00; HUDHandler.drawSimpleManaHUD(color, knownMana, getMaxMana(), name, res); diff --git a/src/main/java/vazkii/botania/common/block/tile/string/TileRedString.java b/src/main/java/vazkii/botania/common/block/tile/string/TileRedString.java index 29b9cc751..e4609ebca 100644 --- a/src/main/java/vazkii/botania/common/block/tile/string/TileRedString.java +++ b/src/main/java/vazkii/botania/common/block/tile/string/TileRedString.java @@ -19,6 +19,7 @@ import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.wand.ITileBound; +import vazkii.botania.common.block.string.BlockRedString; import vazkii.botania.common.block.tile.TileMod; public abstract class TileRedString extends TileMod implements ITileBound, ITickable { @@ -27,6 +28,9 @@ public abstract class TileRedString extends TileMod implements ITileBound, ITick @Override public void update() { + if (!(worldObj.getBlockState(getPos()).getBlock() instanceof BlockRedString)) + return; + EnumFacing dir = getOrientation(); BlockPos pos_ = getPos(); int range = getRange(); diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemRainbowRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemRainbowRod.java index 674bfcfb7..2795bf6d9 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemRainbowRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemRainbowRod.java @@ -24,6 +24,7 @@ import vazkii.botania.api.item.IAvatarWieldable; import vazkii.botania.api.item.IManaProficiencyArmor; import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; +import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModBlocks; @@ -145,17 +146,17 @@ public class ItemRainbowRod extends ItemMod implements IManaUsingItem, IAvatarWi int l = 20; AxisAlignedBB axis = null; - switch(te.getBlockMetadata() - 2) { - case 0 : + switch(world.getBlockState(tePos).getValue(BotaniaStateProps.CARDINALS)) { + case NORTH : axis = new AxisAlignedBB(tePos.add(-w, -h, -l), tePos.add(w + 1, h, 0)); break; - case 1 : + case SOUTH : axis = new AxisAlignedBB(tePos.add(-w, -h, 1), tePos.add(w + 1, h, l + 1)); break; - case 2 : + case WEST : axis = new AxisAlignedBB(tePos.add(-l, -h, -w), tePos.add(0, h, w + 1)); break; - case 3 : + case EAST : axis = new AxisAlignedBB(tePos.add(1, -h, -w), tePos.add(l + 1, h, w + 1)); }