From f3cce3d24ecc59453c8cab6014260e0e2703f1a9 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 10 Jan 2016 22:53:21 -0600 Subject: [PATCH] Global safety checks for blockstates while chunks are unloading --- .../botania/client/core/proxy/ClientProxy.java | 6 +++++- .../client/render/tile/RenderTileAlfPortal.java | 9 ++++----- .../client/render/tile/RenderTileAltar.java | 4 ++++ .../client/render/tile/RenderTileAvatar.java | 12 ++++++++++-- .../client/render/tile/RenderTileBellows.java | 4 ++++ .../render/tile/RenderTileFloatingFlower.java | 4 ++++ .../render/tile/RenderTileIncensePlate.java | 6 +++++- .../client/render/tile/RenderTileLightRelay.java | 4 ++++ .../client/render/tile/RenderTilePool.java | 6 ++++++ .../client/render/tile/RenderTilePump.java | 10 ++++++++-- .../client/render/tile/RenderTilePylon.java | 4 ++++ .../client/render/tile/RenderTileSpreader.java | 4 ++++ .../client/render/tile/RenderTileTinyPotato.java | 4 ++++ .../botania/common/block/tile/TileAlfPortal.java | 9 ++++----- .../botania/common/block/tile/TileAltar.java | 4 ++-- .../botania/common/block/tile/TileAvatar.java | 5 ++--- .../botania/common/block/tile/TileBifrost.java | 4 ++-- .../botania/common/block/tile/TileBrewery.java | 5 ++--- .../botania/common/block/tile/TileCocoon.java | 4 ++-- .../common/block/tile/TileCraftCrate.java | 2 +- .../botania/common/block/tile/TileEnchanter.java | 6 ++---- .../botania/common/block/tile/TileEnderEye.java | 6 ++---- .../botania/common/block/tile/TileForestEye.java | 4 ++-- .../botania/common/block/tile/TileHourglass.java | 5 ++--- .../common/block/tile/TileIncensePlate.java | 4 ++-- .../common/block/tile/TileLightRelay.java | 4 ++-- .../common/block/tile/TileManaBeacon.java | 7 ++----- .../botania/common/block/tile/TileManaFlame.java | 4 ++-- .../botania/common/block/tile/TileMod.java | 16 +++++++++++++++- .../botania/common/block/tile/TileOpenCrate.java | 4 ++-- .../botania/common/block/tile/TileRuneAltar.java | 4 ++-- .../common/block/tile/TileSpawnerClaw.java | 4 ++-- .../common/block/tile/TileSpecialFlower.java | 4 ++-- .../common/block/tile/TileSpiritShrine.java | 4 ++-- .../botania/common/block/tile/TileStarfield.java | 7 ++----- .../common/block/tile/TileTerraPlate.java | 4 ++-- .../common/block/tile/TileTeruTeruBozu.java | 6 ++---- .../common/block/tile/TileTinyPlanet.java | 4 ++-- .../common/block/tile/TileTinyPotato.java | 4 ++-- .../tile/corporea/TileCorporeaCrystalCube.java | 4 ++-- .../block/tile/corporea/TileCorporeaIndex.java | 4 ++-- .../common/block/tile/mana/TileBellows.java | 4 ++-- .../common/block/tile/mana/TileDistributor.java | 4 ++-- .../common/block/tile/mana/TileManaDetector.java | 6 +++--- .../botania/common/block/tile/mana/TilePool.java | 7 ++----- .../botania/common/block/tile/mana/TilePump.java | 4 ++-- .../common/block/tile/mana/TileRFGenerator.java | 4 ++-- .../common/block/tile/mana/TileSpreader.java | 2 +- .../common/block/tile/mana/TileTurntable.java | 4 ++-- .../common/block/tile/string/TileRedString.java | 7 ++----- .../tile/string/TileRedStringComparator.java | 2 +- .../tile/string/TileRedStringInterceptor.java | 4 ++-- .../botania/common/entity/EntityFallingStar.java | 8 +++++--- .../item/equipment/tool/ItemStarSword.java | 2 +- 54 files changed, 163 insertions(+), 114 deletions(-) diff --git a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java index 6b844e51b..de5885f60 100644 --- a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java +++ b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java @@ -180,12 +180,15 @@ public class ClientProxy extends CommonProxy { MinecraftForge.EVENT_BUS.register(MiscellaneousIcons.INSTANCE); ModelHandler.registerModels(); + initRenderers(); } @Override public void init(FMLInitializationEvent event) { super.init(event); + initAuxiliaryRender(); + ModChallenges.init(); MinecraftForge.EVENT_BUS.register(new ClientTickHandler()); @@ -214,7 +217,6 @@ public class ClientProxy extends CommonProxy { dootDoot = true; } - initRenderers(); } @Override @@ -270,7 +272,9 @@ public class ClientProxy extends CommonProxy { RenderingRegistry.registerEntityRenderingHandler(EntityEnderAirBottle.class, renderManager -> new RenderSnowballStack(renderManager, new ItemStack(ModItems.manaResource, 1, 15), Minecraft.getMinecraft().getRenderItem())); ShaderHelper.initShaders(); + } + private void initAuxiliaryRender() { Map skinMap = Minecraft.getMinecraft().getRenderManager().getSkinMap(); RenderPlayer render = skinMap.get("default"); render.addLayer(new ContributorFancinessHandler()); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileAlfPortal.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileAlfPortal.java index 552268409..cf273ce9a 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileAlfPortal.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileAlfPortal.java @@ -31,13 +31,12 @@ public class RenderTileAlfPortal extends TileEntitySpecialRenderer { @Override public void renderTileEntityAt(TileAltar altar, double d0, double d1, double d2, float pticks, int digProgress) { + if (altar != null && altar.getWorld() != null && !altar.getWorld().isBlockLoaded(altar.getPos(), false)) { + return; + } + GlStateManager.pushMatrix(); GlStateManager.enableRescaleNormal(); GlStateManager.color(1F, 1F, 1F, 1F); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileAvatar.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileAvatar.java index ba84c4033..51e6c3dd8 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileAvatar.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileAvatar.java @@ -17,11 +17,13 @@ import net.minecraft.client.renderer.block.model.ItemCameraTransforms; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; import vazkii.botania.api.item.IAvatarWieldable; +import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.lib.LibResources; import vazkii.botania.client.model.ModelAvatar; @@ -38,17 +40,23 @@ public class RenderTileAvatar extends TileEntitySpecialRenderer { @Override public void renderTileEntityAt(TileAvatar avatar, double d0, double d1, double d2, float pticks, int digProgress) { + if (avatar != null && avatar.getWorld() != null && !avatar.getWorld().isBlockLoaded(avatar.getPos(), false)) { + return; + } + GlStateManager.pushMatrix(); GlStateManager.enableRescaleNormal(); GlStateManager.color(1F, 1F, 1F, 1F); GlStateManager.translate(d0, d1, d2); Minecraft.getMinecraft().renderEngine.bindTexture(texture); - int meta = avatar != null && avatar.getWorld() != null ? avatar.getBlockMetadata() : 0; + EnumFacing facing = avatar != null && avatar.getWorld() != null + ? avatar.getWorld().getBlockState(avatar.getPos()).getValue(BotaniaStateProps.CARDINALS) + : EnumFacing.SOUTH; GlStateManager.translate(0.5F, 1.6F, 0.5F); GlStateManager.scale(1F, -1F, -1F); - GlStateManager.rotate(ROTATIONS[Math.max(Math.min(ROTATIONS.length - 1, meta - 2), 0)], 0F, 1F, 0F); + GlStateManager.rotate(ROTATIONS[Math.max(Math.min(ROTATIONS.length - 1, facing.getIndex() - 2), 0)], 0F, 1F, 0F); model.render(); if (avatar == null) { diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileBellows.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileBellows.java index 5df13f445..40c31ed6d 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileBellows.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileBellows.java @@ -30,6 +30,10 @@ public class RenderTileBellows extends TileEntitySpecialRenderer { @Override public void renderTileEntityAt(TileBellows bellows, double d0, double d1, double d2, float f, int digProgress) { + if (bellows != null && bellows.getWorld() != null && !bellows.getWorld().isBlockLoaded(bellows.getPos(), false)) { + return; + } + GlStateManager.pushMatrix(); GlStateManager.enableRescaleNormal(); GlStateManager.color(1F, 1F, 1F, 1F); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileFloatingFlower.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileFloatingFlower.java index c3d4e41f5..0b7d8fbb4 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileFloatingFlower.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileFloatingFlower.java @@ -32,6 +32,10 @@ public class RenderTileFloatingFlower extends TileEntitySpecialRenderer { @Override public void renderTileEntityAt(TileEntity tile, double d0, double d1, double d2, float t, int digProgress) { + if (tile != null && tile.getWorld() != null && !tile.getWorld().isBlockLoaded(tile.getPos(), false)) { + return; + } + BlockRendererDispatcher brd = Minecraft.getMinecraft().getBlockRendererDispatcher(); IFloatingFlower flower = (IFloatingFlower) tile; GlStateManager.pushMatrix(); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileIncensePlate.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileIncensePlate.java index 28dc78357..85553ff37 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileIncensePlate.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileIncensePlate.java @@ -37,7 +37,11 @@ public class RenderTileIncensePlate extends TileEntitySpecialRenderer 0 ? MiscellaneousIcons.INSTANCE.lightRelayWorldIconRed : MiscellaneousIcons.INSTANCE.lightRelayWorldIcon; diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java b/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java index beeb87960..b07257938 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java @@ -52,6 +52,10 @@ public class RenderTilePool extends TileEntitySpecialRenderer { @Override public void renderTileEntityAt(TilePool pool, double d0, double d1, double d2, float f, int digProgress) { + if (pool != null && pool.getWorld() != null && !pool.getWorld().isBlockLoaded(pool.getPos(), false)) { + return; + } + GlStateManager.pushMatrix(); GlStateManager.enableBlend(); GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); @@ -92,6 +96,8 @@ public class RenderTilePool extends TileEntitySpecialRenderer { tess.draw(); + GlStateManager.enableLighting(); + GlStateManager.translate(0.5F, 1.5F, 0.5F); GlStateManager.color(1, 1, 1, a); GlStateManager.enableRescaleNormal(); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTilePump.java b/src/main/java/vazkii/botania/client/render/tile/RenderTilePump.java index ae77944ba..7b7bc921e 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTilePump.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTilePump.java @@ -13,8 +13,10 @@ package vazkii.botania.client.render.tile; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; +import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; +import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.client.lib.LibResources; import vazkii.botania.client.model.ModelPump; import vazkii.botania.common.block.tile.mana.TilePump; @@ -30,17 +32,21 @@ public class RenderTilePump extends TileEntitySpecialRenderer { @Override public void renderTileEntityAt(TilePump pump, double d0, double d1, double d2, float f, int digProgress) { + if (pump != null && pump.getWorld() != null && !pump.getWorld().isBlockLoaded(pump.getPos(), false)) { + return; + } + GlStateManager.pushMatrix(); GlStateManager.enableRescaleNormal(); GlStateManager.color(1F, 1F, 1F, 1F); GlStateManager.translate(d0, d1, d2); Minecraft.getMinecraft().renderEngine.bindTexture(texture); - int meta = pump != null && pump.getWorld() != null ? pump.getBlockMetadata() : 0; + EnumFacing facing = pump != null && pump.getWorld() != null ? pump.getWorld().getBlockState(pump.getPos()).getValue(BotaniaStateProps.CARDINALS) : EnumFacing.SOUTH; GlStateManager.translate(0.5F, 0.5F, 0.5F); GlStateManager.scale(1F, -1F, -1F); - GlStateManager.rotate(ROTATIONS[Math.max(Math.min(ROTATIONS.length - 1, meta - 2), 0)], 0F, 1F, 0F); + GlStateManager.rotate(ROTATIONS[Math.max(Math.min(ROTATIONS.length - 1, facing.getIndex() - 2), 0)], 0F, 1F, 0F); model.render(Math.max(0F, Math.min(8F, pump == null ? 8 : pump.innerRingPos + pump.moving * f))); GlStateManager.color(1F, 1F, 1F); GlStateManager.scale(1F, -1F, -1F); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTilePylon.java b/src/main/java/vazkii/botania/client/render/tile/RenderTilePylon.java index 68e2077a6..50ca5f0c8 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTilePylon.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTilePylon.java @@ -51,6 +51,10 @@ public class RenderTilePylon extends TileEntitySpecialRenderer { @Override public void renderTileEntityAt(TilePylon pylon, double d0, double d1, double d2, float pticks, int digProgress) { + if (pylon != null && pylon.getWorld() != null && !pylon.getWorld().isBlockLoaded(pylon.getPos(), false)) { + return; + } + if(model == null) model = ConfigHandler.oldPylonModel ? new ModelPylonOld() : new ModelPylon(); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileSpreader.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileSpreader.java index e32dd3492..e82687fa9 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileSpreader.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileSpreader.java @@ -46,6 +46,10 @@ public class RenderTileSpreader extends TileEntitySpecialRenderer @Override public void renderTileEntityAt(TileSpreader spreader, double d0, double d1, double d2, float ticks, int digProgress) { + if (spreader != null && spreader.getWorld() != null && !spreader.getWorld().isBlockLoaded(spreader.getPos(), false)) { + return; + } + GlStateManager.pushMatrix(); GlStateManager.enableRescaleNormal(); GlStateManager.color(1F, 1F, 1F, 1F); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java index 5694eece1..a2756b9d2 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java @@ -50,6 +50,10 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer items = worldObj.getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(pos.add(0, 1D / 16D * 20D, 0), pos.add(1, 1D / 16D * 21D,1))); boolean didChange = false; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileAvatar.java b/src/main/java/vazkii/botania/common/block/tile/TileAvatar.java index 63d376274..a2a169c62 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileAvatar.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileAvatar.java @@ -19,7 +19,7 @@ import vazkii.botania.api.item.IAvatarTile; import vazkii.botania.api.item.IAvatarWieldable; import vazkii.botania.common.lib.LibBlockNames; -public class TileAvatar extends TileSimpleInventory implements IAvatarTile, ISidedInventory, ITickable { +public class TileAvatar extends TileSimpleInventory implements IAvatarTile, ISidedInventory { private static final int MAX_MANA = 6400; @@ -32,8 +32,7 @@ public class TileAvatar extends TileSimpleInventory implements IAvatarTile, ISid int mana; @Override - public void update() { - + public void updateEntity() { enabled = true; for(EnumFacing dir : EnumFacing.VALUES) { int redstoneSide = worldObj.getRedstonePower(pos.offset(dir), dir); diff --git a/src/main/java/vazkii/botania/common/block/tile/TileBifrost.java b/src/main/java/vazkii/botania/common/block/tile/TileBifrost.java index 2edaf85b9..57fcd2459 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileBifrost.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileBifrost.java @@ -14,14 +14,14 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.ITickable; import vazkii.botania.common.Botania; -public class TileBifrost extends TileMod implements ITickable { +public class TileBifrost extends TileMod { private static final String TAG_TICKS = "ticks"; public int ticks = 0; @Override - public void update() { + public void updateEntity() { if(!worldObj.isRemote) { if(ticks <= 0) { worldObj.setBlockToAir(pos); diff --git a/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java b/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java index 12f061455..6fd2d81ee 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java @@ -36,7 +36,7 @@ import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.lib.LibBlockNames; // This is mostly copypasta from TileRuneAltar -public class TileBrewery extends TileSimpleInventory implements ISidedInventory, IManaReceiver, ITickable { +public class TileBrewery extends TileSimpleInventory implements ISidedInventory, IManaReceiver { private static final String TAG_MANA = "mana"; @@ -80,8 +80,7 @@ public class TileBrewery extends TileSimpleInventory implements ISidedInventory, } @Override - public void update() { - + public void updateEntity() { if(mana > 0 && recipe == null) { for(RecipeBrew recipe : BotaniaAPI.brewRecipes) if(recipe.matches(this)) { diff --git a/src/main/java/vazkii/botania/common/block/tile/TileCocoon.java b/src/main/java/vazkii/botania/common/block/tile/TileCocoon.java index b5d0f35af..ce5a86a62 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileCocoon.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileCocoon.java @@ -24,7 +24,7 @@ import net.minecraft.entity.passive.EntityWolf; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.ITickable; -public class TileCocoon extends TileMod implements ITickable { +public class TileCocoon extends TileMod { private static final String TAG_TIME_PASSED = "timePassed"; private static final String TAG_EMERALDS_GIVEN = "emeraldsGiven"; @@ -36,7 +36,7 @@ public class TileCocoon extends TileMod implements ITickable { public int emeraldsGiven; @Override - public void update() { + public void updateEntity() { timePassed++; if(timePassed >= TOTAL_TIME) hatch(); diff --git a/src/main/java/vazkii/botania/common/block/tile/TileCraftCrate.java b/src/main/java/vazkii/botania/common/block/tile/TileCraftCrate.java index 1064a86f8..0a0bd8129 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileCraftCrate.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileCraftCrate.java @@ -91,7 +91,7 @@ public class TileCraftCrate extends TileOpenCrate { } @Override - public void update() { + public void updateEntity() { if(!worldObj.isRemote && (craft(true) && canEject() || isFull())) ejectAll(); 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 4d9b63b5b..f60b948ed 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java @@ -49,7 +49,7 @@ import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModBlocks; -public class TileEnchanter extends TileMod implements ISparkAttachable, ITickable { +public class TileEnchanter extends TileMod implements ISparkAttachable { private static final String TAG_STAGE = "stage"; private static final String TAG_STAGE_TICKS = "stageTicks"; @@ -133,10 +133,8 @@ public class TileEnchanter extends TileMod implements ISparkAttachable, ITickabl } @Override - public void update() { + public void updateEntity() { IBlockState state = worldObj.getBlockState(getPos()); - if (state.getBlock() != ModBlocks.enchanter) - return; EnumFacing.Axis axis = state.getValue(BotaniaStateProps.ENCHANTER_DIRECTION); for(BlockPos pylon : PYLON_LOCATIONS.get(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 14f529838..76ef55b68 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileEnderEye.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileEnderEye.java @@ -24,12 +24,10 @@ 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 { +public class TileEnderEye extends TileMod { @Override - public void update() { - if (worldObj.getBlockState(getPos()).getBlock() != ModBlocks.enderEye) - return; + public void updateEntity() { 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/TileForestEye.java b/src/main/java/vazkii/botania/common/block/tile/TileForestEye.java index 6153d71a8..4e15d11d3 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileForestEye.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileForestEye.java @@ -14,12 +14,12 @@ import net.minecraft.entity.passive.EntityAnimal; import net.minecraft.util.ITickable; import net.minecraft.util.AxisAlignedBB; -public class TileForestEye extends TileMod implements ITickable { +public class TileForestEye extends TileMod { public int entities = 0; @Override - public void update() { + public void updateEntity() { int range = 6; int entityCount = worldObj.getEntitiesWithinAABB(EntityAnimal.class, new AxisAlignedBB(pos.add(-range, -range, -range), pos.add(range + 1, range + 1, range + 1))).size(); if(entityCount != entities) { diff --git a/src/main/java/vazkii/botania/common/block/tile/TileHourglass.java b/src/main/java/vazkii/botania/common/block/tile/TileHourglass.java index b83d649f5..12288692b 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileHourglass.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileHourglass.java @@ -26,7 +26,7 @@ import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.lib.LibBlockNames; -public class TileHourglass extends TileSimpleInventory implements ITickable { +public class TileHourglass extends TileSimpleInventory { private static final String TAG_TIME = "time"; private static final String TAG_TIME_FRACTION = "timeFraction"; @@ -43,8 +43,7 @@ public class TileHourglass extends TileSimpleInventory implements ITickable { public boolean move = true; @Override - public void update() { - + public void updateEntity() { int totalTime = getTotalTime(); if(totalTime > 0) { if(move) diff --git a/src/main/java/vazkii/botania/common/block/tile/TileIncensePlate.java b/src/main/java/vazkii/botania/common/block/tile/TileIncensePlate.java index ae07b0307..6e9ea916b 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileIncensePlate.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileIncensePlate.java @@ -30,7 +30,7 @@ import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.brew.ItemIncenseStick; import vazkii.botania.common.lib.LibBlockNames; -public class TileIncensePlate extends TileSimpleInventory implements ISidedInventory, ITickable { +public class TileIncensePlate extends TileSimpleInventory implements ISidedInventory { private static final String TAG_TIME_LEFT = "timeLeft"; private static final String TAG_BURNING = "burning"; @@ -42,7 +42,7 @@ public class TileIncensePlate extends TileSimpleInventory implements ISidedInven public int comparatorOutput = 0; @Override - public void update() { + public void updateEntity() { ItemStack stack = getStackInSlot(0); if(stack != null && burning) { Brew brew = ((ItemIncenseStick) ModItems.incenseStick).getBrew(stack); diff --git a/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java b/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java index 0dbacae49..47466a07c 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java @@ -37,7 +37,7 @@ import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.core.helper.MathHelper; import vazkii.botania.common.core.helper.Vector3; -public class TileLightRelay extends TileMod implements IWandBindable, ITickable { +public class TileLightRelay extends TileMod implements IWandBindable { private static final int MAX_DIST = 20; @@ -63,7 +63,7 @@ public class TileLightRelay extends TileMod implements IWandBindable, ITickable } @Override - public void update() { + public void updateEntity() { ticksElapsed++; if(bindPos.getY() > -1 && isValidBinding()) { 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 5ac481572..1f697d583 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileManaBeacon.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileManaBeacon.java @@ -16,13 +16,10 @@ import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModBlocks; -public class TileManaBeacon extends TileMod implements ITickable { +public class TileManaBeacon extends TileMod { @Override - public void update() { - if (worldObj.getBlockState(getPos()).getBlock() != ModBlocks.manaBeacon) - return; - + public void updateEntity() { 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/TileManaFlame.java b/src/main/java/vazkii/botania/common/block/tile/TileManaFlame.java index 69b215961..20fe601f1 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileManaFlame.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileManaFlame.java @@ -15,7 +15,7 @@ import net.minecraft.util.ITickable; import vazkii.botania.common.Botania; import vazkii.botania.common.integration.coloredlights.ColoredLightHelper; -public class TileManaFlame extends TileMod implements ITickable { +public class TileManaFlame extends TileMod { private static final String TAG_COLOR = "color"; @@ -32,7 +32,7 @@ public class TileManaFlame extends TileMod implements ITickable { } @Override - public void update() { + public void updateEntity() { float c = 0.3F; if(Math.random() < c) { 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 c7c979a79..510a4d848 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileMod.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileMod.java @@ -17,9 +17,10 @@ import net.minecraft.network.Packet; import net.minecraft.network.play.server.S35PacketUpdateTileEntity; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; +import net.minecraft.util.ITickable; import net.minecraft.world.World; -public class TileMod extends TileEntity { +public class TileMod extends TileEntity implements ITickable { @Override public boolean shouldRefresh(World world, BlockPos pos, IBlockState oldState, IBlockState newState) { @@ -61,4 +62,17 @@ public class TileMod extends TileEntity { readCustomNBT(packet.getNbtCompound()); } + @Override + public final void update() { + if (worldObj.isBlockLoaded(getPos(), false)) { + updateEntity(); + } else { + System.out.println("Skipping a tick because our chunk unloaded"); + } + } + + protected void updateEntity() { + // NO-OP + } + } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileOpenCrate.java b/src/main/java/vazkii/botania/common/block/tile/TileOpenCrate.java index 83b76bd79..cb806a9e1 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileOpenCrate.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileOpenCrate.java @@ -23,7 +23,7 @@ import net.minecraftforge.fml.common.ObfuscationReflectionHelper; import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibObfuscation; -public class TileOpenCrate extends TileSimpleInventory implements ITickable { +public class TileOpenCrate extends TileSimpleInventory { @Override public boolean shouldRefresh(World world, BlockPos pos, IBlockState oldState, IBlockState newState) { @@ -41,7 +41,7 @@ public class TileOpenCrate extends TileSimpleInventory implements ITickable { } @Override - public void update() { + public void updateEntity() { 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/TileRuneAltar.java b/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java index cb18e5605..6293b142f 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java @@ -43,7 +43,7 @@ import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibObfuscation; -public class TileRuneAltar extends TileSimpleInventory implements ISidedInventory, IManaReceiver, ITickable { +public class TileRuneAltar extends TileSimpleInventory implements ISidedInventory, IManaReceiver { private static final String TAG_MANA = "mana"; private static final String TAG_MANA_TO_GET = "manaToGet"; @@ -106,7 +106,7 @@ public class TileRuneAltar extends TileSimpleInventory implements ISidedInventor } @Override - public void update() { + public void updateEntity() { // Update every tick. recieveMana(0); diff --git a/src/main/java/vazkii/botania/common/block/tile/TileSpawnerClaw.java b/src/main/java/vazkii/botania/common/block/tile/TileSpawnerClaw.java index 9ba37e846..ace660ec7 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileSpawnerClaw.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileSpawnerClaw.java @@ -30,7 +30,7 @@ import vazkii.botania.common.Botania; import vazkii.botania.common.lib.LibObfuscation; import net.minecraftforge.fml.relauncher.ReflectionHelper; -public class TileSpawnerClaw extends TileMod implements IManaReceiver, ITickable { +public class TileSpawnerClaw extends TileMod implements IManaReceiver { private static final String TAG_MANA = "mana"; @@ -44,7 +44,7 @@ public class TileSpawnerClaw extends TileMod implements IManaReceiver, ITickable private static final Method getEntityNameToSpawn = ReflectionHelper.findMethod(MobSpawnerBaseLogic.class, null, LibObfuscation.GET_ENTITY_TO_SPAWN); @Override - public void update() { + public void updateEntity() { TileEntity tileBelow = worldObj.getTileEntity(pos.down()); if(mana >= 5 && tileBelow instanceof TileEntityMobSpawner) { TileEntityMobSpawner spawner = (TileEntityMobSpawner) tileBelow; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileSpecialFlower.java b/src/main/java/vazkii/botania/common/block/tile/TileSpecialFlower.java index dd1e63285..7aa691c78 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileSpecialFlower.java @@ -35,7 +35,7 @@ import vazkii.botania.api.wand.IWandBindable; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.string.TileRedStringRelay; -public class TileSpecialFlower extends TileMod implements IWandBindable, ISubTileSlowableContainer, ITickable { +public class TileSpecialFlower extends TileMod implements IWandBindable, ISubTileSlowableContainer { private static final String TAG_SUBTILE_NAME = "subTileName"; private static final String TAG_SUBTILE_CMP = "subTileCmp"; @@ -72,7 +72,7 @@ public class TileSpecialFlower extends TileMod implements IWandBindable, ISubTil } @Override - public void update() { + public void updateEntity() { if(subTile != null) { TileEntity tileBelow = worldObj.getTileEntity(pos.down()); if(tileBelow instanceof TileRedStringRelay) { diff --git a/src/main/java/vazkii/botania/common/block/tile/TileSpiritShrine.java b/src/main/java/vazkii/botania/common/block/tile/TileSpiritShrine.java index faee5505e..58707948c 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileSpiritShrine.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileSpiritShrine.java @@ -13,12 +13,12 @@ package vazkii.botania.common.block.tile; import net.minecraft.util.ITickable; import vazkii.botania.common.Botania; -public class TileSpiritShrine extends TileMod implements ITickable { +public class TileSpiritShrine extends TileMod { int ticks; @Override - public void update() { + public void updateEntity() { if(worldObj.isRemote) { if(ticks >= 40) { float[][] colors = new float[][] { 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 d07601cd8..9c8df7544 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileStarfield.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileStarfield.java @@ -15,13 +15,10 @@ import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModBlocks; -public class TileStarfield extends TileMod implements ITickable { +public class TileStarfield extends TileMod { @Override - public void update() { - if (worldObj.getBlockState(getPos()).getBlock() != ModBlocks.starfield) - return; - + public void updateEntity() { 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/TileTerraPlate.java b/src/main/java/vazkii/botania/common/block/tile/TileTerraPlate.java index b64614045..eff85c483 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileTerraPlate.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileTerraPlate.java @@ -34,7 +34,7 @@ import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.mana.TilePool; import vazkii.botania.common.item.ModItems; -public class TileTerraPlate extends TileMod implements ISparkAttachable, ITickable { +public class TileTerraPlate extends TileMod implements ISparkAttachable { public static final int MAX_MANA = TilePool.MAX_MANA / 2; @@ -68,7 +68,7 @@ public class TileTerraPlate extends TileMod implements ISparkAttachable, ITickab } @Override - public void update() { + public void updateEntity() { boolean removeMana = true; if(hasValidPlatform()) { diff --git a/src/main/java/vazkii/botania/common/block/tile/TileTeruTeruBozu.java b/src/main/java/vazkii/botania/common/block/tile/TileTeruTeruBozu.java index 74157b72a..5657c5e40 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileTeruTeruBozu.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileTeruTeruBozu.java @@ -10,14 +10,12 @@ */ package vazkii.botania.common.block.tile; -import net.minecraft.util.ITickable; - -public class TileTeruTeruBozu extends TileMod implements ITickable { +public class TileTeruTeruBozu extends TileMod { public boolean wasRaining = false; @Override - public void update() { + public void updateEntity() { boolean isRaining = worldObj.isRaining(); if(isRaining && worldObj.rand.nextInt(9600) == 0) worldObj.getWorldInfo().setRaining(false); diff --git a/src/main/java/vazkii/botania/common/block/tile/TileTinyPlanet.java b/src/main/java/vazkii/botania/common/block/tile/TileTinyPlanet.java index 6ffa2e6cb..1df9195e7 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileTinyPlanet.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileTinyPlanet.java @@ -14,10 +14,10 @@ import net.minecraft.util.ITickable; import vazkii.botania.api.mana.IManaCollisionGhost; import vazkii.botania.common.item.equipment.bauble.ItemTinyPlanet; -public class TileTinyPlanet extends TileMod implements IManaCollisionGhost, ITickable { +public class TileTinyPlanet extends TileMod implements IManaCollisionGhost { @Override - public void update() { + public void updateEntity() { ItemTinyPlanet.applyEffect(worldObj, pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5); } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileTinyPotato.java b/src/main/java/vazkii/botania/common/block/tile/TileTinyPotato.java index e8f7f3ab1..b80cfc69d 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileTinyPotato.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileTinyPotato.java @@ -14,7 +14,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.ITickable; -public class TileTinyPotato extends TileMod implements ITickable { +public class TileTinyPotato extends TileMod { private static final String TAG_NAME = "name"; @@ -36,7 +36,7 @@ public class TileTinyPotato extends TileMod implements ITickable { } @Override - public void update() { + public void updateEntity() { if(worldObj.rand.nextInt(100) == 0) jump(); diff --git a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaCrystalCube.java b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaCrystalCube.java index 3645474fd..d709d2ed2 100644 --- a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaCrystalCube.java +++ b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaCrystalCube.java @@ -22,7 +22,7 @@ import vazkii.botania.api.corporea.ICorporeaSpark; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.common.lib.LibBlockNames; -public class TileCorporeaCrystalCube extends TileCorporeaBase implements ICorporeaRequestor, ITickable { +public class TileCorporeaCrystalCube extends TileCorporeaBase implements ICorporeaRequestor { private static final String TAG_REQUEST_TARGET = "requestTarget"; private static final String TAG_ITEM_COUNT = "itemCount"; @@ -35,7 +35,7 @@ public class TileCorporeaCrystalCube extends TileCorporeaBase implements ICorpor public int compValue = 0; @Override - public void update() { + public void updateEntity() { ++ticks; if(ticks % 20 == 0) updateCount(); diff --git a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaIndex.java b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaIndex.java index 65c5fdffb..11d3798e6 100644 --- a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaIndex.java +++ b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaIndex.java @@ -45,7 +45,7 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -public class TileCorporeaIndex extends TileCorporeaBase implements ICorporeaRequestor, ITickable { +public class TileCorporeaIndex extends TileCorporeaBase implements ICorporeaRequestor { public static final double RADIUS = 2.5; @@ -152,7 +152,7 @@ public class TileCorporeaIndex extends TileCorporeaBase implements ICorporeaRequ public boolean hasCloseby; @Override - public void update() { + public void updateEntity() { double x = pos.getX() + 0.5; double y = pos.getY() + 0.5; double z = pos.getZ() + 0.5; diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TileBellows.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileBellows.java index 2be51938e..36abd8cfa 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TileBellows.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileBellows.java @@ -22,7 +22,7 @@ import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.common.block.subtile.functional.SubTileExoflame; import vazkii.botania.common.block.tile.TileMod; -public class TileBellows extends TileMod implements ITickable { +public class TileBellows extends TileMod { private static final String TAG_ACTIVE = "active"; @@ -36,7 +36,7 @@ public class TileBellows extends TileMod implements ITickable { } @Override - public void update() { + public void updateEntity() { boolean disable = true; TileEntity tile = getLinkedTile(); if(!active && tile instanceof TilePool) { diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TileDistributor.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileDistributor.java index 2a5486981..e26e0fa52 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TileDistributor.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileDistributor.java @@ -22,12 +22,12 @@ import vazkii.botania.api.mana.IManaReceiver; import vazkii.botania.common.block.tile.TileMod; import vazkii.botania.common.lib.LibMisc; -public class TileDistributor extends TileMod implements IManaReceiver, ITickable { +public class TileDistributor extends TileMod implements IManaReceiver { List validPools = new ArrayList(); @Override - public void update() { + public void updateEntity() { validPools.clear(); for(EnumFacing dir : LibMisc.CARDINAL_DIRECTIONS) { TileEntity tileAt = worldObj.getTileEntity(pos.offset(dir)); 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 78b6fa338..d583364a6 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 @@ -21,11 +21,11 @@ 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 { +public class TileManaDetector extends TileMod implements IManaCollisionGhost { @Override - public void update() { - if(!worldObj.isRemote && worldObj.getBlockState(getPos()).getBlock() == ModBlocks.manaDetector) { + public void updateEntity() { + if(!worldObj.isRemote) { 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 8b5999da9..64f4d567a 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 @@ -67,7 +67,7 @@ import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibMisc; import vazkii.botania.common.lib.LibObfuscation; -public class TilePool extends TileMod implements IManaPool, IDyablePool, IKeyLocked, ISparkAttachable, IThrottledPacket, ITickable { +public class TilePool extends TileMod implements IManaPool, IDyablePool, IKeyLocked, ISparkAttachable, IThrottledPacket { public static final int MAX_MANA = 1000000; public static final int MAX_MANA_DILLUTED = 10000; @@ -198,10 +198,7 @@ public class TilePool extends TileMod implements IManaPool, IDyablePool, IKeyLoc } @Override - public void update() { - if (worldObj.getBlockState(getPos()).getBlock() != ModBlocks.pool) - return; - + public void updateEntity() { boolean wasDoingTransfer = isDoingTransfer; isDoingTransfer = false; if(manaCap == -1) diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TilePump.java b/src/main/java/vazkii/botania/common/block/tile/mana/TilePump.java index 0a7f26561..93555c126 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TilePump.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TilePump.java @@ -17,7 +17,7 @@ import net.minecraft.util.EnumFacing; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.common.block.tile.TileMod; -public class TilePump extends TileMod implements ITickable { +public class TilePump extends TileMod { private static final String TAG_ACTIVE = "active"; @@ -32,7 +32,7 @@ public class TilePump extends TileMod implements ITickable { int lastComparator = 0; @Override - public void update() { + public void updateEntity() { hasRedstone = 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/mana/TileRFGenerator.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileRFGenerator.java index 675407b14..bbb501dcb 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TileRFGenerator.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileRFGenerator.java @@ -26,7 +26,7 @@ import java.util.EnumMap; import java.util.Map; @Optional.Interface(iface = "cofh.api.energy.IEnergyConnection", modid = "CoFHAPI|energy") -public class TileRFGenerator extends TileMod implements IManaReceiver, IEnergyConnection, ITickable { +public class TileRFGenerator extends TileMod implements IManaReceiver, IEnergyConnection { private static final int CONVERSION_RATE = 10; private static final int MAX_MANA = 1280 * CONVERSION_RATE; @@ -48,7 +48,7 @@ public class TileRFGenerator extends TileMod implements IManaReceiver, IEnergyCo } @Override - public void update() { + public void updateEntity() { if(!worldObj.isRemote && Loader.isModLoaded("CoFHAPI|energy")) { if(deadCache) reCache(); 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 781124006..56bec53a5 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 @@ -169,7 +169,7 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, } @Override - public void update() { + public void updateEntity() { boolean inNetwork = ManaNetworkHandler.instance.isCollectorIn(this); boolean wasInNetwork = inNetwork; if(!inNetwork && !isInvalid()) { diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TileTurntable.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileTurntable.java index b231a287c..20f095d1d 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TileTurntable.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileTurntable.java @@ -26,7 +26,7 @@ import org.lwjgl.opengl.GL11; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.common.block.tile.TileMod; -public class TileTurntable extends TileMod implements ITickable { +public class TileTurntable extends TileMod { private static final String TAG_SPEED = "speed"; private static final String TAG_BACKWARDS = "backwards"; @@ -35,7 +35,7 @@ public class TileTurntable extends TileMod implements ITickable { boolean backwards = false; @Override - public void update() { + public void updateEntity() { boolean redstone = false; for(EnumFacing dir : EnumFacing.VALUES) { 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 e4609ebca..10d980da4 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 @@ -22,15 +22,12 @@ 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 { +public abstract class TileRedString extends TileMod implements ITileBound { private BlockPos binding; @Override - public void update() { - if (!(worldObj.getBlockState(getPos()).getBlock() instanceof BlockRedString)) - return; - + public void updateEntity() { EnumFacing dir = getOrientation(); BlockPos pos_ = getPos(); int range = getRange(); diff --git a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringComparator.java b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringComparator.java index e3b787ddd..8157dd1a8 100644 --- a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringComparator.java +++ b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringComparator.java @@ -19,7 +19,7 @@ public class TileRedStringComparator extends TileRedString { int comparatorValue = 0; @Override - public void update() { + public void updateEntity() { BlockPos binding = getBinding(); EnumFacing dir = getOrientation(); Block block = getBlockAtBinding(); diff --git a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringInterceptor.java b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringInterceptor.java index d5a3bc949..daf0f777b 100644 --- a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringInterceptor.java +++ b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringInterceptor.java @@ -20,12 +20,12 @@ import net.minecraft.util.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.state.BotaniaStateProps; -public class TileRedStringInterceptor extends TileRedString implements ITickable { +public class TileRedStringInterceptor extends TileRedString { public static List interceptors = new ArrayList(); @Override - public void update() { + public void updateEntity() { if(!interceptors.contains(this)) interceptors.add(this); } diff --git a/src/main/java/vazkii/botania/common/entity/EntityFallingStar.java b/src/main/java/vazkii/botania/common/entity/EntityFallingStar.java index d971de2d6..c984b088a 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityFallingStar.java +++ b/src/main/java/vazkii/botania/common/entity/EntityFallingStar.java @@ -74,9 +74,11 @@ public class EntityFallingStar extends EntityThrowableCopy { else pos.entityHit.attackEntityFrom(DamageSource.generic, 10); } - Block block = worldObj.getBlockState(pos.getBlockPos()).getBlock(); - if(ConfigHandler.blockBreakParticles && !block.isAir(worldObj, pos.getBlockPos())) - worldObj.playAuxSFX(2001, pos.getBlockPos(), Block.getStateId(worldObj.getBlockState(pos.getBlockPos()))); + if (pos.getBlockPos() != null) { + Block block = worldObj.getBlockState(pos.getBlockPos()).getBlock(); + if(ConfigHandler.blockBreakParticles && !block.isAir(worldObj, pos.getBlockPos())) + worldObj.playAuxSFX(2001, pos.getBlockPos(), Block.getStateId(worldObj.getBlockState(pos.getBlockPos()))); + } setDead(); } diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/ItemStarSword.java b/src/main/java/vazkii/botania/common/item/equipment/tool/ItemStarSword.java index d621371d3..b4a31e676 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/ItemStarSword.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/ItemStarSword.java @@ -46,7 +46,7 @@ public class ItemStarSword extends ItemManasteelSword implements ICraftAchieveme if(player.getCurrentEquippedItem() == par1ItemStack && player.swingProgress == check && !par2World.isRemote && par2World.rand.nextInt(2) == 0) { MovingObjectPosition pos = ToolCommons.raytraceFromEntity(par2World, par3Entity, true, 48); - if(pos != null) { + if(pos != null && pos.getBlockPos() != null) { Vector3 posVec = new Vector3(pos.getBlockPos().getX(), pos.getBlockPos().getY(), pos.getBlockPos().getZ()); Vector3 motVec = new Vector3((Math.random() - 0.5) * 18, 24, (Math.random() - 0.5) * 18); posVec.add(motVec);