From d0b8bda5ccd75aab6a219739fe464209cbf2f3ed Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Wed, 18 Nov 2015 23:11:24 +0100 Subject: [PATCH] Made TileEntities update less often to reduce server traffic --- .../config/values/ConfigIntValues.java | 11 ++++------- .../tile/TileEntityAtomicReconstructor.java | 1 + .../actuallyadditions/tile/TileEntityBase.java | 12 +++++++++++- .../actuallyadditions/tile/TileEntityBreaker.java | 1 + .../tile/TileEntityCanolaPress.java | 1 + .../tile/TileEntityCoalGenerator.java | 1 + .../tile/TileEntityCoffeeMachine.java | 1 + .../actuallyadditions/tile/TileEntityCompost.java | 1 + .../tile/TileEntityDirectionalBreaker.java | 1 + .../actuallyadditions/tile/TileEntityDropper.java | 1 + .../actuallyadditions/tile/TileEntityEnergizer.java | 1 + .../actuallyadditions/tile/TileEntityEnervator.java | 1 + .../actuallyadditions/tile/TileEntityFeeder.java | 1 + .../tile/TileEntityFermentingBarrel.java | 1 + .../actuallyadditions/tile/TileEntityFishingNet.java | 1 + .../tile/TileEntityFluidCollector.java | 1 + .../tile/TileEntityFurnaceDouble.java | 1 + .../tile/TileEntityFurnaceSolar.java | 1 + .../tile/TileEntityGreenhouseGlass.java | 1 + .../actuallyadditions/tile/TileEntityGrinder.java | 1 + .../tile/TileEntityHeatCollector.java | 1 + .../actuallyadditions/tile/TileEntityInputter.java | 1 + .../tile/TileEntityInventoryBase.java | 5 +++++ .../tile/TileEntityItemRepairer.java | 1 + .../actuallyadditions/tile/TileEntityLaserRelay.java | 1 + .../tile/TileEntityLavaFactoryController.java | 1 + .../tile/TileEntityLeafGenerator.java | 1 + .../tile/TileEntityOilGenerator.java | 1 + .../tile/TileEntityPhantomPlacer.java | 1 + .../tile/TileEntityPhantomface.java | 1 + .../tile/TileEntityRangedCollector.java | 1 + .../tile/TileEntitySmileyCloud.java | 1 + .../tile/TileEntityXPSolidifier.java | 1 + 33 files changed, 50 insertions(+), 8 deletions(-) diff --git a/src/main/java/ellpeck/actuallyadditions/config/values/ConfigIntValues.java b/src/main/java/ellpeck/actuallyadditions/config/values/ConfigIntValues.java index af58ba281..c3219b867 100644 --- a/src/main/java/ellpeck/actuallyadditions/config/values/ConfigIntValues.java +++ b/src/main/java/ellpeck/actuallyadditions/config/values/ConfigIntValues.java @@ -158,12 +158,7 @@ public enum ConfigIntValues{ MAGNET_RING_ENERGY_USE("Magnet Ring: Energy Used", ConfigCategories.MACHINE_VALUES, 5, 0, 500, "The Amount of Energy the Magnet Ring uses per tick"), WATER_RING_RANGE("Water Ring: Range", ConfigCategories.MACHINE_VALUES, 3, 1, 10, "The Range of the Water Ring"), - WATER_RING_ENERGY_USE("Magnet Ring: Energy Used", ConfigCategories.MACHINE_VALUES, 30, 0, 500, "The Amount of Energy the Water Ring uses per Block"), - - ORE_MAGNET_MAX_TIMER("Ore Magnet: Max Timer", ConfigCategories.MACHINE_VALUES, 20, 1, 2000, "The approximate Time it takes for the Ore Magnet to search for a new block to mine"), - ORE_MAGNET_RANGE("Ore Magnet: Range", ConfigCategories.MACHINE_VALUES, 10, 1, 60, "The range of the Ore Magnet"), - ORE_MAGNET_OIL_USE("Ore Magnet: Oil Use", ConfigCategories.MACHINE_VALUES, 30, 0, 5000, "The amount of oil the Ore Magnet uses every Block"), - ORE_MAGNET_ENERGY_USE("Ore Magnet: Energy USe", ConfigCategories.MACHINE_VALUES, 250, 10, 10000, "The amount of Energy the Ore Magnet uses every tick"), + WATER_RING_ENERGY_USE("Water Ring: Energy Used", ConfigCategories.MACHINE_VALUES, 30, 0, 500, "The Amount of Energy the Water Ring uses per Block"), LEAF_GENERATOR_ENERGY_PRODUCED("Leaf Generator: Energy Produced", ConfigCategories.MACHINE_VALUES, 300, 1, 10000, "How much Energy the Leaf Generator produces per Leaf broken"), LEAF_GENERATOR_COOLDOWN_TIME("Leaf Generator: Cooldown Time", ConfigCategories.MACHINE_VALUES, 5, 0, 100, "The amount of ticks that it takes util another Leaf gets proken"), @@ -181,7 +176,9 @@ public enum ConfigIntValues{ RECONSTRUCTOR_DISTANCE("Atomic Reconstructor: Distance", ConfigCategories.MACHINE_VALUES, 10, 1, 50, "The max distance the Reconstructor goes forward to find blocks to convert"), RECONSTRCUTOR_RANGE("Atomic Reconstructor: Range", ConfigCategories.MACHINE_VALUES, 2, 1, 10, "The range of Converting blocks or items into other blocks or items"), RECONSTRUCTOR_USE_PER_BLOCK("Atomic Reconstructor: Energy Use per Block", ConfigCategories.MACHINE_VALUES, 800, 0, 100000, "The amount of Energy the Reconstructor uses per Block converted"), - RECONSTRUCTOR_COOLDOWN_TIMER("Atomic Reconstrucor: Cooldown Timer", ConfigCategories.MACHINE_VALUES, 100, 0, 10000, "The amount of time the Reconstructor waits between shooting lasers"); + RECONSTRUCTOR_COOLDOWN_TIMER("Atomic Reconstrucor: Cooldown Timer", ConfigCategories.MACHINE_VALUES, 100, 0, 10000, "The amount of time the Reconstructor waits between shooting lasers"), + + TILE_ENTITY_UPDATE_INTERVAL("Tile Entities: Update Interval", ConfigCategories.OTHER, 5, 1, 100, "The amount of ticks waited before a TileEntity sends an additional Update to the Client"); public final String name; public final String category; diff --git a/src/main/java/ellpeck/actuallyadditions/tile/TileEntityAtomicReconstructor.java b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityAtomicReconstructor.java index 7e60f57d5..40a91dacb 100644 --- a/src/main/java/ellpeck/actuallyadditions/tile/TileEntityAtomicReconstructor.java +++ b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityAtomicReconstructor.java @@ -40,6 +40,7 @@ public class TileEntityAtomicReconstructor extends TileEntityBase implements IEn @Override @SuppressWarnings("unchecked") public void updateEntity(){ + super.updateEntity(); if(!this.worldObj.isRemote){ int usePerBlock = ConfigIntValues.RECONSTRUCTOR_USE_PER_BLOCK.getValue(); if(!worldObj.isBlockIndirectlyGettingPowered(xCoord, yCoord, zCoord) && this.storage.getEnergyStored() >= usePerBlock){ diff --git a/src/main/java/ellpeck/actuallyadditions/tile/TileEntityBase.java b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityBase.java index bb5986212..666778624 100644 --- a/src/main/java/ellpeck/actuallyadditions/tile/TileEntityBase.java +++ b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityBase.java @@ -11,6 +11,7 @@ package ellpeck.actuallyadditions.tile; import cpw.mods.fml.common.registry.GameRegistry; +import ellpeck.actuallyadditions.config.values.ConfigIntValues; import ellpeck.actuallyadditions.util.ModUtil; import net.minecraft.block.Block; import net.minecraft.nbt.NBTTagCompound; @@ -22,6 +23,8 @@ import net.minecraft.world.World; public abstract class TileEntityBase extends TileEntity{ + private int ticksElapsed; + public static void init(){ ModUtil.LOGGER.info("Registering TileEntities..."); @@ -66,6 +69,11 @@ public abstract class TileEntityBase extends TileEntity{ GameRegistry.registerTileEntity(TileEntityAtomicReconstructor.class, ModUtil.MOD_ID_LOWER+":tileEntityAtomicReconstructor"); } + @Override + public void updateEntity(){ + this.ticksElapsed++; + } + @Override public final void readFromNBT(NBTTagCompound compound){ super.readFromNBT(compound); @@ -104,6 +112,8 @@ public abstract class TileEntityBase extends TileEntity{ } protected void sendUpdate(){ - this.worldObj.markBlockForUpdate(this.xCoord, this.yCoord, this.zCoord); + if(this.ticksElapsed % ConfigIntValues.TILE_ENTITY_UPDATE_INTERVAL.getValue() == 0){ + this.worldObj.markBlockForUpdate(this.xCoord, this.yCoord, this.zCoord); + } } } \ No newline at end of file diff --git a/src/main/java/ellpeck/actuallyadditions/tile/TileEntityBreaker.java b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityBreaker.java index 84b737e1d..847e5270b 100644 --- a/src/main/java/ellpeck/actuallyadditions/tile/TileEntityBreaker.java +++ b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityBreaker.java @@ -38,6 +38,7 @@ public class TileEntityBreaker extends TileEntityInventoryBase{ @Override @SuppressWarnings("unchecked") public void updateEntity(){ + super.updateEntity(); if(!worldObj.isRemote){ if(!worldObj.isBlockIndirectlyGettingPowered(xCoord, yCoord, zCoord)){ if(this.currentTime > 0){ diff --git a/src/main/java/ellpeck/actuallyadditions/tile/TileEntityCanolaPress.java b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityCanolaPress.java index 0220e93eb..843230e04 100644 --- a/src/main/java/ellpeck/actuallyadditions/tile/TileEntityCanolaPress.java +++ b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityCanolaPress.java @@ -41,6 +41,7 @@ public class TileEntityCanolaPress extends TileEntityInventoryBase implements IE @Override @SuppressWarnings("unchecked") public void updateEntity(){ + super.updateEntity(); if(!worldObj.isRemote){ if(this.isCanola(0) && ConfigIntValues.PRESS_MB_PRODUCED.getValue() <= this.tank.getCapacity()-this.tank.getFluidAmount()){ if(this.storage.getEnergyStored() >= ConfigIntValues.PRESS_ENERGY_USED.getValue()){ diff --git a/src/main/java/ellpeck/actuallyadditions/tile/TileEntityCoalGenerator.java b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityCoalGenerator.java index 427d7a24a..8e9bc9427 100644 --- a/src/main/java/ellpeck/actuallyadditions/tile/TileEntityCoalGenerator.java +++ b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityCoalGenerator.java @@ -37,6 +37,7 @@ public class TileEntityCoalGenerator extends TileEntityInventoryBase implements @Override @SuppressWarnings("unchecked") public void updateEntity(){ + super.updateEntity(); if(!worldObj.isRemote){ boolean flag = this.currentBurnTime > 0; diff --git a/src/main/java/ellpeck/actuallyadditions/tile/TileEntityCoffeeMachine.java b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityCoffeeMachine.java index 2c841c57c..aa5de18f4 100644 --- a/src/main/java/ellpeck/actuallyadditions/tile/TileEntityCoffeeMachine.java +++ b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityCoffeeMachine.java @@ -50,6 +50,7 @@ public class TileEntityCoffeeMachine extends TileEntityInventoryBase implements @Override public void updateEntity(){ + super.updateEntity(); if(!worldObj.isRemote){ this.storeCoffee(); diff --git a/src/main/java/ellpeck/actuallyadditions/tile/TileEntityCompost.java b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityCompost.java index b6343d967..b7b00143d 100644 --- a/src/main/java/ellpeck/actuallyadditions/tile/TileEntityCompost.java +++ b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityCompost.java @@ -28,6 +28,7 @@ public class TileEntityCompost extends TileEntityInventoryBase{ @Override public void updateEntity(){ + super.updateEntity(); if(!worldObj.isRemote){ if(this.slots[0] != null && this.slots[0].stackSize > 0){ diff --git a/src/main/java/ellpeck/actuallyadditions/tile/TileEntityDirectionalBreaker.java b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityDirectionalBreaker.java index 157588820..b3324e104 100644 --- a/src/main/java/ellpeck/actuallyadditions/tile/TileEntityDirectionalBreaker.java +++ b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityDirectionalBreaker.java @@ -39,6 +39,7 @@ public class TileEntityDirectionalBreaker extends TileEntityInventoryBase implem @Override @SuppressWarnings("unchecked") public void updateEntity(){ + super.updateEntity(); if(!worldObj.isRemote){ if(!worldObj.isBlockIndirectlyGettingPowered(xCoord, yCoord, zCoord)){ int usagePerBlock = ConfigIntValues.DIRECTIONAL_BREAKER_RF_PER_BLOCK.getValue(); diff --git a/src/main/java/ellpeck/actuallyadditions/tile/TileEntityDropper.java b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityDropper.java index 3d0bc293c..99ebb86d3 100644 --- a/src/main/java/ellpeck/actuallyadditions/tile/TileEntityDropper.java +++ b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityDropper.java @@ -27,6 +27,7 @@ public class TileEntityDropper extends TileEntityInventoryBase{ @Override @SuppressWarnings("unchecked") public void updateEntity(){ + super.updateEntity(); if(!worldObj.isRemote){ if(!worldObj.isBlockIndirectlyGettingPowered(xCoord, yCoord, zCoord)){ if(this.currentTime > 0){ diff --git a/src/main/java/ellpeck/actuallyadditions/tile/TileEntityEnergizer.java b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityEnergizer.java index 4f1fd3923..8ce2d9ffe 100644 --- a/src/main/java/ellpeck/actuallyadditions/tile/TileEntityEnergizer.java +++ b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityEnergizer.java @@ -30,6 +30,7 @@ public class TileEntityEnergizer extends TileEntityInventoryBase implements IEne @Override public void updateEntity(){ + super.updateEntity(); if(!worldObj.isRemote){ if(this.slots[0] != null && this.slots[0].getItem() instanceof IEnergyContainerItem && this.slots[1] == null){ if(this.storage.getEnergyStored() > 0){ diff --git a/src/main/java/ellpeck/actuallyadditions/tile/TileEntityEnervator.java b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityEnervator.java index 23cd597fd..3a475727d 100644 --- a/src/main/java/ellpeck/actuallyadditions/tile/TileEntityEnervator.java +++ b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityEnervator.java @@ -31,6 +31,7 @@ public class TileEntityEnervator extends TileEntityInventoryBase implements IEne @Override public void updateEntity(){ + super.updateEntity(); if(!worldObj.isRemote){ if(this.slots[0] != null && this.slots[0].getItem() instanceof IEnergyContainerItem && this.slots[1] == null){ if(((IEnergyContainerItem)this.slots[0].getItem()).getEnergyStored(this.slots[0]) > 0){ diff --git a/src/main/java/ellpeck/actuallyadditions/tile/TileEntityFeeder.java b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityFeeder.java index 3aba24803..6476ec5ca 100644 --- a/src/main/java/ellpeck/actuallyadditions/tile/TileEntityFeeder.java +++ b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityFeeder.java @@ -34,6 +34,7 @@ public class TileEntityFeeder extends TileEntityInventoryBase{ @Override @SuppressWarnings("unchecked") public void updateEntity(){ + super.updateEntity(); if(!worldObj.isRemote){ boolean theFlag = this.currentTimer > 0; List animals = worldObj.getEntitiesWithinAABB(EntityAnimal.class, AxisAlignedBB.getBoundingBox(this.xCoord-ConfigIntValues.FEEDER_REACH.getValue(), this.yCoord-ConfigIntValues.FEEDER_REACH.getValue(), this.zCoord-ConfigIntValues.FEEDER_REACH.getValue(), this.xCoord+ConfigIntValues.FEEDER_REACH.getValue(), this.yCoord+ConfigIntValues.FEEDER_REACH.getValue(), this.zCoord+ConfigIntValues.FEEDER_REACH.getValue())); diff --git a/src/main/java/ellpeck/actuallyadditions/tile/TileEntityFermentingBarrel.java b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityFermentingBarrel.java index c4838ee5f..f604c3ae4 100644 --- a/src/main/java/ellpeck/actuallyadditions/tile/TileEntityFermentingBarrel.java +++ b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityFermentingBarrel.java @@ -37,6 +37,7 @@ public class TileEntityFermentingBarrel extends TileEntityInventoryBase implemen @Override @SuppressWarnings("unchecked") public void updateEntity(){ + super.updateEntity(); if(!worldObj.isRemote){ if(this.canolaTank.getFluidAmount() >= ConfigIntValues.BARREL_MB_PRODUCED.getValue() && ConfigIntValues.BARREL_MB_PRODUCED.getValue() <= this.oilTank.getCapacity()-this.oilTank.getFluidAmount()){ this.currentProcessTime++; diff --git a/src/main/java/ellpeck/actuallyadditions/tile/TileEntityFishingNet.java b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityFishingNet.java index 9e37c526b..4545d491f 100644 --- a/src/main/java/ellpeck/actuallyadditions/tile/TileEntityFishingNet.java +++ b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityFishingNet.java @@ -37,6 +37,7 @@ public class TileEntityFishingNet extends TileEntityBase{ @Override public void updateEntity(){ + super.updateEntity(); if(!worldObj.isRemote){ if(!worldObj.isBlockIndirectlyGettingPowered(xCoord, yCoord, zCoord)){ if(worldObj.getBlock(xCoord, yCoord-1, zCoord).getMaterial() == Material.water){ diff --git a/src/main/java/ellpeck/actuallyadditions/tile/TileEntityFluidCollector.java b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityFluidCollector.java index a3f8c3678..553cae63c 100644 --- a/src/main/java/ellpeck/actuallyadditions/tile/TileEntityFluidCollector.java +++ b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityFluidCollector.java @@ -80,6 +80,7 @@ public class TileEntityFluidCollector extends TileEntityInventoryBase implements @Override @SuppressWarnings("unchecked") public void updateEntity(){ + super.updateEntity(); if(!worldObj.isRemote){ if(!worldObj.isBlockIndirectlyGettingPowered(xCoord, yCoord, zCoord)){ if(this.currentTime > 0){ diff --git a/src/main/java/ellpeck/actuallyadditions/tile/TileEntityFurnaceDouble.java b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityFurnaceDouble.java index 16890f67b..924a17255 100644 --- a/src/main/java/ellpeck/actuallyadditions/tile/TileEntityFurnaceDouble.java +++ b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityFurnaceDouble.java @@ -41,6 +41,7 @@ public class TileEntityFurnaceDouble extends TileEntityInventoryBase implements @Override @SuppressWarnings("unchecked") public void updateEntity(){ + super.updateEntity(); if(!worldObj.isRemote){ boolean flag = this.firstSmeltTime > 0 || this.secondSmeltTime > 0; diff --git a/src/main/java/ellpeck/actuallyadditions/tile/TileEntityFurnaceSolar.java b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityFurnaceSolar.java index c0d65883e..20d9b4a10 100644 --- a/src/main/java/ellpeck/actuallyadditions/tile/TileEntityFurnaceSolar.java +++ b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityFurnaceSolar.java @@ -53,6 +53,7 @@ public class TileEntityFurnaceSolar extends TileEntityBase implements IEnergyPro @Override public void updateEntity(){ + super.updateEntity(); if(!worldObj.isRemote){ if(worldObj.canBlockSeeTheSky(xCoord, yCoord, zCoord) && worldObj.isDaytime()){ if(ConfigIntValues.FURNACE_SOLAR_ENERGY_PRODUCED.getValue() <= this.getMaxEnergyStored(ForgeDirection.UNKNOWN)-this.getEnergyStored(ForgeDirection.UNKNOWN)){ diff --git a/src/main/java/ellpeck/actuallyadditions/tile/TileEntityGreenhouseGlass.java b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityGreenhouseGlass.java index c0f54e31f..eca6cf610 100644 --- a/src/main/java/ellpeck/actuallyadditions/tile/TileEntityGreenhouseGlass.java +++ b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityGreenhouseGlass.java @@ -24,6 +24,7 @@ public class TileEntityGreenhouseGlass extends TileEntityBase{ @Override public void updateEntity(){ + super.updateEntity(); if(!worldObj.isRemote){ if(worldObj.canBlockSeeTheSky(xCoord, yCoord, zCoord) && worldObj.isDaytime()){ WorldPos blockToFert = this.blockToFertilize(); diff --git a/src/main/java/ellpeck/actuallyadditions/tile/TileEntityGrinder.java b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityGrinder.java index 8a1cad2ac..0f91059ae 100644 --- a/src/main/java/ellpeck/actuallyadditions/tile/TileEntityGrinder.java +++ b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityGrinder.java @@ -71,6 +71,7 @@ public class TileEntityGrinder extends TileEntityInventoryBase implements IEnerg @Override @SuppressWarnings("unchecked") public void updateEntity(){ + super.updateEntity(); if(!worldObj.isRemote){ boolean flag = this.firstCrushTime > 0 || this.secondCrushTime > 0; diff --git a/src/main/java/ellpeck/actuallyadditions/tile/TileEntityHeatCollector.java b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityHeatCollector.java index 38417b6b5..b5592d569 100644 --- a/src/main/java/ellpeck/actuallyadditions/tile/TileEntityHeatCollector.java +++ b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityHeatCollector.java @@ -28,6 +28,7 @@ public class TileEntityHeatCollector extends TileEntityBase implements IEnergyPr @Override public void updateEntity(){ + super.updateEntity(); if(!worldObj.isRemote){ ArrayList blocksAround = new ArrayList(); if(ConfigIntValues.HEAT_COLLECTOR_ENERGY_PRODUCED.getValue() <= this.getMaxEnergyStored(ForgeDirection.UNKNOWN)-this.getEnergyStored(ForgeDirection.UNKNOWN)){ diff --git a/src/main/java/ellpeck/actuallyadditions/tile/TileEntityInputter.java b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityInputter.java index 55ad9230f..6cea4ffa4 100644 --- a/src/main/java/ellpeck/actuallyadditions/tile/TileEntityInputter.java +++ b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityInputter.java @@ -82,6 +82,7 @@ public class TileEntityInputter extends TileEntityInventoryBase implements IButt @Override public void updateEntity(){ + super.updateEntity(); if(!worldObj.isRemote){ this.initVars(); diff --git a/src/main/java/ellpeck/actuallyadditions/tile/TileEntityInventoryBase.java b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityInventoryBase.java index 29d8b4771..72db4bd26 100644 --- a/src/main/java/ellpeck/actuallyadditions/tile/TileEntityInventoryBase.java +++ b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityInventoryBase.java @@ -79,6 +79,11 @@ public abstract class TileEntityInventoryBase extends TileEntityBase implements } } + @Override + public void updateEntity(){ + super.updateEntity(); + } + @Override public int getInventoryStackLimit(){ return 64; diff --git a/src/main/java/ellpeck/actuallyadditions/tile/TileEntityItemRepairer.java b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityItemRepairer.java index afd095ffb..e5f4d5848 100644 --- a/src/main/java/ellpeck/actuallyadditions/tile/TileEntityItemRepairer.java +++ b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityItemRepairer.java @@ -35,6 +35,7 @@ public class TileEntityItemRepairer extends TileEntityInventoryBase implements I @Override @SuppressWarnings("unchecked") public void updateEntity(){ + super.updateEntity(); if(!worldObj.isRemote){ if(this.slots[SLOT_OUTPUT] == null && canBeRepaired(this.slots[SLOT_INPUT])){ if(this.slots[SLOT_INPUT].getItemDamage() <= 0){ diff --git a/src/main/java/ellpeck/actuallyadditions/tile/TileEntityLaserRelay.java b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityLaserRelay.java index d8089b606..7f535e806 100644 --- a/src/main/java/ellpeck/actuallyadditions/tile/TileEntityLaserRelay.java +++ b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityLaserRelay.java @@ -32,6 +32,7 @@ public class TileEntityLaserRelay extends TileEntityBase implements IEnergyRecei @Override public void updateEntity(){ + super.updateEntity(); if(this.worldObj.isRemote){ this.renderParticles(); } diff --git a/src/main/java/ellpeck/actuallyadditions/tile/TileEntityLavaFactoryController.java b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityLavaFactoryController.java index 35b14a33a..19caedbc1 100644 --- a/src/main/java/ellpeck/actuallyadditions/tile/TileEntityLavaFactoryController.java +++ b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityLavaFactoryController.java @@ -45,6 +45,7 @@ public class TileEntityLavaFactoryController extends TileEntityBase implements I @Override @SuppressWarnings("unchecked") public void updateEntity(){ + super.updateEntity(); if(!worldObj.isRemote){ if(this.storage.getEnergyStored() >= ConfigIntValues.LAVA_FACTORY_ENERGY_USED.getValue() && this.isMultiblock() == HAS_AIR){ this.currentWorkTime++; diff --git a/src/main/java/ellpeck/actuallyadditions/tile/TileEntityLeafGenerator.java b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityLeafGenerator.java index 9028e5fe9..cd310a1f3 100644 --- a/src/main/java/ellpeck/actuallyadditions/tile/TileEntityLeafGenerator.java +++ b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityLeafGenerator.java @@ -41,6 +41,7 @@ public class TileEntityLeafGenerator extends TileEntityBase implements IEnergyPr @Override @SuppressWarnings("unchecked") public void updateEntity(){ + super.updateEntity(); if(!worldObj.isRemote){ if(!this.worldObj.isBlockIndirectlyGettingPowered(this.xCoord, this.yCoord, this.zCoord)){ diff --git a/src/main/java/ellpeck/actuallyadditions/tile/TileEntityOilGenerator.java b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityOilGenerator.java index 2743d10b1..904ee9667 100644 --- a/src/main/java/ellpeck/actuallyadditions/tile/TileEntityOilGenerator.java +++ b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityOilGenerator.java @@ -38,6 +38,7 @@ public class TileEntityOilGenerator extends TileEntityInventoryBase implements I @Override @SuppressWarnings("unchecked") public void updateEntity(){ + super.updateEntity(); if(!worldObj.isRemote){ boolean flag = this.currentBurnTime > 0; diff --git a/src/main/java/ellpeck/actuallyadditions/tile/TileEntityPhantomPlacer.java b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityPhantomPlacer.java index f42cf5232..7aa403229 100644 --- a/src/main/java/ellpeck/actuallyadditions/tile/TileEntityPhantomPlacer.java +++ b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityPhantomPlacer.java @@ -42,6 +42,7 @@ public class TileEntityPhantomPlacer extends TileEntityInventoryBase implements @Override public void updateEntity(){ + super.updateEntity(); if(!worldObj.isRemote){ this.range = TileEntityPhantomface.upgradeRange(ConfigIntValues.PHANTOM_PLACER_RANGE.getValue(), worldObj, xCoord, yCoord, zCoord); diff --git a/src/main/java/ellpeck/actuallyadditions/tile/TileEntityPhantomface.java b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityPhantomface.java index ceeee5c4d..ac1b8b0d7 100644 --- a/src/main/java/ellpeck/actuallyadditions/tile/TileEntityPhantomface.java +++ b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityPhantomface.java @@ -41,6 +41,7 @@ public class TileEntityPhantomface extends TileEntityInventoryBase implements IP @Override public void updateEntity(){ + super.updateEntity(); if(!worldObj.isRemote){ this.range = upgradeRange(ConfigIntValues.PHANTOMFACE_RANGE.getValue(), worldObj, xCoord, yCoord, zCoord); diff --git a/src/main/java/ellpeck/actuallyadditions/tile/TileEntityRangedCollector.java b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityRangedCollector.java index b1616dd24..d032ca8b1 100644 --- a/src/main/java/ellpeck/actuallyadditions/tile/TileEntityRangedCollector.java +++ b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityRangedCollector.java @@ -35,6 +35,7 @@ public class TileEntityRangedCollector extends TileEntityInventoryBase implement @Override @SuppressWarnings("unchecked") public void updateEntity(){ + super.updateEntity(); if(!worldObj.isRemote){ if(!worldObj.isBlockIndirectlyGettingPowered(xCoord, yCoord, zCoord)){ int range = ConfigIntValues.RANGED_COLLECTOR_RANGE.getValue(); diff --git a/src/main/java/ellpeck/actuallyadditions/tile/TileEntitySmileyCloud.java b/src/main/java/ellpeck/actuallyadditions/tile/TileEntitySmileyCloud.java index e37a05da7..fd8bf285d 100644 --- a/src/main/java/ellpeck/actuallyadditions/tile/TileEntitySmileyCloud.java +++ b/src/main/java/ellpeck/actuallyadditions/tile/TileEntitySmileyCloud.java @@ -41,6 +41,7 @@ public class TileEntitySmileyCloud extends TileEntityBase implements IStringReac @Override public void updateEntity(){ + super.updateEntity(); if(!worldObj.isRemote){ if(!Objects.equals(this.name, this.nameBefore)){ this.nameBefore = this.name; diff --git a/src/main/java/ellpeck/actuallyadditions/tile/TileEntityXPSolidifier.java b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityXPSolidifier.java index 9ebd62288..2e67d5a49 100644 --- a/src/main/java/ellpeck/actuallyadditions/tile/TileEntityXPSolidifier.java +++ b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityXPSolidifier.java @@ -31,6 +31,7 @@ public class TileEntityXPSolidifier extends TileEntityInventoryBase implements I @Override public void updateEntity(){ + super.updateEntity(); if(!worldObj.isRemote){ if(this.amount > 0){ if(this.slots[0] == null){