From b7e77936b33e485a8e370da25b20d60938eb31d1 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 18 Jun 2016 14:36:36 -0500 Subject: [PATCH] Remove guards in TileMod since forge has them now --- .../botania/common/block/tile/TileAlfPortal.java | 2 +- .../vazkii/botania/common/block/tile/TileAltar.java | 3 +-- .../vazkii/botania/common/block/tile/TileAvatar.java | 2 +- .../vazkii/botania/common/block/tile/TileBifrost.java | 2 +- .../vazkii/botania/common/block/tile/TileBrewery.java | 2 +- .../vazkii/botania/common/block/tile/TileCocoon.java | 2 +- .../botania/common/block/tile/TileCraftCrate.java | 2 +- .../botania/common/block/tile/TileEnchanter.java | 2 +- .../vazkii/botania/common/block/tile/TileEnderEye.java | 2 +- .../botania/common/block/tile/TileForestEye.java | 2 +- .../botania/common/block/tile/TileHourglass.java | 2 +- .../botania/common/block/tile/TileIncensePlate.java | 2 +- .../botania/common/block/tile/TileLightRelay.java | 2 +- .../botania/common/block/tile/TileManaBeacon.java | 2 +- .../botania/common/block/tile/TileManaFlame.java | 2 +- .../java/vazkii/botania/common/block/tile/TileMod.java | 10 +--------- .../botania/common/block/tile/TileOpenCrate.java | 2 +- .../botania/common/block/tile/TileRuneAltar.java | 3 +-- .../botania/common/block/tile/TileSpawnerClaw.java | 2 +- .../botania/common/block/tile/TileSpecialFlower.java | 2 +- .../botania/common/block/tile/TileSpiritShrine.java | 2 +- .../botania/common/block/tile/TileStarfield.java | 2 +- .../botania/common/block/tile/TileTerraPlate.java | 2 +- .../botania/common/block/tile/TileTeruTeruBozu.java | 2 +- .../botania/common/block/tile/TileTinyPlanet.java | 2 +- .../botania/common/block/tile/TileTinyPotato.java | 2 +- .../block/tile/corporea/TileCorporeaCrystalCube.java | 2 +- .../common/block/tile/corporea/TileCorporeaIndex.java | 2 +- .../botania/common/block/tile/mana/TileBellows.java | 2 +- .../common/block/tile/mana/TileDistributor.java | 2 +- .../common/block/tile/mana/TileManaDetector.java | 2 +- .../botania/common/block/tile/mana/TilePool.java | 2 +- .../botania/common/block/tile/mana/TilePump.java | 2 +- .../common/block/tile/mana/TileRFGenerator.java | 2 +- .../botania/common/block/tile/mana/TileSpreader.java | 2 +- .../botania/common/block/tile/mana/TileTurntable.java | 2 +- .../common/block/tile/string/TileRedString.java | 2 +- .../block/tile/string/TileRedStringComparator.java | 4 ++-- .../block/tile/string/TileRedStringInterceptor.java | 4 ++-- 39 files changed, 41 insertions(+), 51 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 a92a7059f..38944a87f 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java @@ -108,7 +108,7 @@ public class TileAlfPortal extends TileMod { } @Override - public void updateEntity() { + public void update() { IBlockState iBlockState = worldObj.getBlockState(getPos()); if(iBlockState.getValue(BotaniaStateProps.ALFPORTAL_STATE) == AlfPortalState.OFF) { ticksOpen = 0; 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 862ecf5c3..a519c99b0 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileAltar.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileAltar.java @@ -34,7 +34,6 @@ import net.minecraftforge.fluids.capability.IFluidHandler; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.items.IItemHandlerModifiable; -import org.lwjgl.opengl.GL11; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.item.IPetalApothecary; @@ -245,7 +244,7 @@ public class TileAltar extends TileSimpleInventory implements IPetalApothecary { } @Override - public void updateEntity() { + public void update() { List items = worldObj.getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(pos.add(0, 1D / 16D * 20D, 0), pos.add(1, 1D / 16D * 32D, 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 b8737f28d..67f29ac8e 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileAvatar.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileAvatar.java @@ -30,7 +30,7 @@ public class TileAvatar extends TileSimpleInventory implements IAvatarTile { int mana; @Override - public void updateEntity() { + public void update() { 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 5937ec5e2..3702277c4 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileBifrost.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileBifrost.java @@ -22,7 +22,7 @@ public class TileBifrost extends TileMod { public int ticks = 0; @Override - public void updateEntity() { + public void update() { 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 1190a44bc..fe4412b2b 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java @@ -79,7 +79,7 @@ public class TileBrewery extends TileSimpleInventory implements IManaReceiver { } @Override - public void updateEntity() { + public void update() { if(mana > 0 && recipe == null) { for(RecipeBrew recipe : BotaniaAPI.brewRecipes) if(recipe.matches(itemHandler)) { 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 5320fe9f5..2c421bf16 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileCocoon.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileCocoon.java @@ -37,7 +37,7 @@ public class TileCocoon extends TileMod { public int emeraldsGiven; @Override - public void updateEntity() { + public void update() { 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 2ba68987d..02b925c79 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileCraftCrate.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileCraftCrate.java @@ -99,7 +99,7 @@ public class TileCraftCrate extends TileOpenCrate { } @Override - public void updateEntity() { + public void update() { if (worldObj.isRemote) return; 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 6761eb3aa..f1a2881ae 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java @@ -137,7 +137,7 @@ public class TileEnchanter extends TileMod implements ISparkAttachable { } @Override - public void updateEntity() { + public void update() { IBlockState state = worldObj.getBlockState(getPos()); EnumFacing.Axis axis = state.getValue(BotaniaStateProps.ENCHANTER_DIRECTION); 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 7825f795e..fbc3c557c 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileEnderEye.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileEnderEye.java @@ -27,7 +27,7 @@ import java.util.List; public class TileEnderEye extends TileMod { @Override - public void updateEntity() { + public void update() { if (worldObj.isRemote) return; 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 4ff7e5dcf..2927a6179 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileForestEye.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileForestEye.java @@ -18,7 +18,7 @@ public class TileForestEye extends TileMod { public int entities = 0; @Override - public void updateEntity() { + public void update() { if (worldObj.isRemote) return; int range = 6; 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 8d9d9ec32..91f921440 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileHourglass.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileHourglass.java @@ -42,7 +42,7 @@ public class TileHourglass extends TileSimpleInventory { public boolean move = true; @Override - public void updateEntity() { + public void update() { 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 1dca546f9..e24df9698 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileIncensePlate.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileIncensePlate.java @@ -40,7 +40,7 @@ public class TileIncensePlate extends TileSimpleInventory { public int comparatorOutput = 0; @Override - public void updateEntity() { + public void update() { ItemStack stack = itemHandler.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 2103a5435..0ec1e489a 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java @@ -67,7 +67,7 @@ public class TileLightRelay extends TileMod implements IWandBindable { } @Override - public void updateEntity() { + public void update() { 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 a958338c0..379159d12 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileManaBeacon.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileManaBeacon.java @@ -17,7 +17,7 @@ import vazkii.botania.common.Botania; public class TileManaBeacon extends TileMod { @Override - public void updateEntity() { + public void update() { 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 64754b76f..5fb526148 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileManaFlame.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileManaFlame.java @@ -29,7 +29,7 @@ public class TileManaFlame extends TileMod { } @Override - public void updateEntity() { + public void update() { float c = 0.3F; if(worldObj.isRemote && 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 8330eff47..634ee588b 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileMod.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileMod.java @@ -68,14 +68,6 @@ public class TileMod extends TileEntity implements ITickable { } @Override - public final void update() { - if (!isInvalid() && worldObj.isBlockLoaded(getPos(), !worldObj.isRemote)) { - updateEntity(); - } - } - - protected void updateEntity() { - // NO-OP - } + public void update() {} } 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 04db2a04b..77c476774 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileOpenCrate.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileOpenCrate.java @@ -41,7 +41,7 @@ public class TileOpenCrate extends TileSimpleInventory { } @Override - public void updateEntity() { + public void update() { if (worldObj.isRemote) return; 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 337bce14b..33f01f7a7 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java @@ -22,7 +22,6 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.AxisAlignedBB; import org.lwjgl.opengl.GL11; -import org.lwjgl.opengl.GL12; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.mana.IManaReceiver; @@ -102,7 +101,7 @@ public class TileRuneAltar extends TileSimpleInventory implements IManaReceiver } @Override - public void updateEntity() { + public void update() { // 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 6b1e0b6b3..2ad1b4a26 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileSpawnerClaw.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileSpawnerClaw.java @@ -36,7 +36,7 @@ public class TileSpawnerClaw extends TileMod implements IManaReceiver { int mana = 0; @Override - public void updateEntity() { + public void update() { 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 fcb8429bc..48ed8dd84 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileSpecialFlower.java @@ -72,7 +72,7 @@ public class TileSpecialFlower extends TileMod implements IWandBindable, ISubTil } @Override - public void updateEntity() { + public void update() { 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 8ab7f4f0f..f9396260e 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileSpiritShrine.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileSpiritShrine.java @@ -17,7 +17,7 @@ public class TileSpiritShrine extends TileMod { int ticks; @Override - public void updateEntity() { + public void update() { 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 414d30186..f8145e3c0 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileStarfield.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileStarfield.java @@ -16,7 +16,7 @@ import vazkii.botania.common.Botania; public class TileStarfield extends TileMod { @Override - public void updateEntity() { + public void update() { 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 47fc10d9c..8fa745355 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileTerraPlate.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileTerraPlate.java @@ -69,7 +69,7 @@ public class TileTerraPlate extends TileMod implements ISparkAttachable { } @Override - public void updateEntity() { + public void update() { 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 afed2e16b..a0414cd4a 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileTeruTeruBozu.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileTeruTeruBozu.java @@ -15,7 +15,7 @@ public class TileTeruTeruBozu extends TileMod { public boolean wasRaining = false; @Override - public void updateEntity() { + public void update() { if (worldObj.isRemote) return; 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 6e5e46c65..b034e32fa 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileTinyPlanet.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileTinyPlanet.java @@ -15,7 +15,7 @@ import vazkii.botania.common.item.equipment.bauble.ItemTinyPlanet; public class TileTinyPlanet extends TileMod { @Override - public void updateEntity() { + public void update() { 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 b452a5323..78110a5bc 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileTinyPotato.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileTinyPotato.java @@ -37,7 +37,7 @@ public class TileTinyPotato extends TileMod { } @Override - public void updateEntity() { + public void update() { 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 e8906d9cb..f8e829c28 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 @@ -53,7 +53,7 @@ public class TileCorporeaCrystalCube extends TileCorporeaBase implements ICorpor } @Override - public void updateEntity() { + public void update() { ++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 b542252a7..c2c5dc628 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 @@ -148,7 +148,7 @@ public class TileCorporeaIndex extends TileCorporeaBase implements ICorporeaRequ public boolean hasCloseby; @Override - public void updateEntity() { + public void update() { 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 79daa002b..6758332ba 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 @@ -38,7 +38,7 @@ public class TileBellows extends TileMod { } @Override - public void updateEntity() { + public void update() { 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 e9794dcc5..ae11b8d8b 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 @@ -25,7 +25,7 @@ public class TileDistributor extends TileMod implements IManaReceiver { final List validPools = new ArrayList<>(); @Override - public void updateEntity() { + public void update() { if (worldObj.isRemote) return; validPools.clear(); 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 b6e21c257..bef4c86bf 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,7 +21,7 @@ import vazkii.botania.common.block.tile.TileMod; public class TileManaDetector extends TileMod { @Override - public void updateEntity() { + public void update() { 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 && !worldObj.isRemote) 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 56847a1c4..564f2cc01 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 @@ -214,7 +214,7 @@ public class TilePool extends TileMod implements IManaPool, IKeyLocked, ISparkAt } @Override - public void updateEntity() { + public void update() { if(manaCap == -1) manaCap = worldObj.getBlockState(getPos()).getValue(BotaniaStateProps.POOL_VARIANT) == PoolVariant.DILUTED ? MAX_MANA_DILLUTED : MAX_MANA; 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 14b06df4f..8e9221d23 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 @@ -69,7 +69,7 @@ public class TilePump extends TileMod { } @Override - public void updateEntity() { + public void update() { 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 4df7bf647..0392a884a 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 @@ -45,7 +45,7 @@ public class TileRFGenerator extends TileMod implements IManaReceiver, IEnergyCo } @Override - public void updateEntity() { + public void update() { if(!worldObj.isRemote && Botania.rfApiLoaded) { 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 f05e55fb0..ed5fa28f5 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 @@ -182,7 +182,7 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, } @Override - public void updateEntity() { + public void update() { 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 fcbaa3536..6a5927e79 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 @@ -32,7 +32,7 @@ public class TileTurntable extends TileMod { boolean backwards = false; @Override - public void updateEntity() { + public void update() { 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 bef529a75..84a46f19e 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 @@ -28,7 +28,7 @@ public abstract class TileRedString extends TileMod implements ITileBound { private BlockPos binding; @Override - public void updateEntity() { + public void update() { 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 349f4b9f8..d9de807b4 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,8 +19,8 @@ public class TileRedStringComparator extends TileRedString { int comparatorValue = 0; @Override - public void updateEntity() { - super.updateEntity(); + public void update() { + super.update(); BlockPos binding = getBinding(); EnumFacing dir = getOrientation(); IBlockState state = getStateAtBinding(); 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 1bc39f10f..188b2d17c 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 @@ -29,8 +29,8 @@ public class TileRedStringInterceptor extends TileRedString { private static final ThreadLocal> interceptors = ThreadLocal.withInitial(HashSet::new);; @Override - public void updateEntity() { - super.updateEntity(); + public void update() { + super.update(); interceptors.get().add(this); }