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 f772f5ca4..6fe7fa41c 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java @@ -17,6 +17,7 @@ import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.ITickable; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraftforge.common.MinecraftForge; @@ -44,7 +45,7 @@ import java.util.ArrayList; import java.util.List; import java.util.function.Function; -public class TileAlfPortal extends TileMod { +public class TileAlfPortal extends TileMod implements ITickable { private static final BlockPos[] LIVINGWOOD_POSITIONS = { new BlockPos(-1, 0, 0), new BlockPos(1, 0, 0), new BlockPos(-2, 1, 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 5758a3966..b185014cf 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileAltar.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileAltar.java @@ -27,6 +27,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.NetworkManager; import net.minecraft.network.play.server.SPacketUpdateTileEntity; import net.minecraft.util.EnumParticleTypes; +import net.minecraft.util.ITickable; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.AxisAlignedBB; import net.minecraftforge.fluids.Fluid; @@ -60,7 +61,7 @@ import java.util.ArrayList; import java.util.List; import java.util.regex.Pattern; -public class TileAltar extends TileSimpleInventory implements IPetalApothecary { +public class TileAltar extends TileSimpleInventory implements IPetalApothecary, ITickable { private static final Pattern SEED_PATTERN = Pattern.compile("(?:(?:(?:[A-Z-_.:]|^)seed)|(?:(?:[a-z-_.:]|^)Seed))(?:[sA-Z-_.:]|$)"); private static final int SET_KEEP_TICKS_EVENT = 0; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileAnimatedTorch.java b/src/main/java/vazkii/botania/common/block/tile/TileAnimatedTorch.java index d04232f8a..9ab8d9708 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileAnimatedTorch.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileAnimatedTorch.java @@ -18,6 +18,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumParticleTypes; +import net.minecraft.util.ITickable; import net.minecraft.util.text.translation.I18n; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -26,7 +27,7 @@ import vazkii.botania.common.block.ModBlocks; import java.util.Arrays; -public class TileAnimatedTorch extends TileMod { +public class TileAnimatedTorch extends TileMod implements ITickable { public static final String TAG_SIDE = "side"; public static final String TAG_ROTATING = "rotating"; 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 bcd365475..d51d97099 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileAvatar.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileAvatar.java @@ -13,6 +13,7 @@ package vazkii.botania.common.block.tile; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; +import net.minecraft.util.ITickable; import net.minecraftforge.items.IItemHandler; import vazkii.botania.api.item.IAvatarTile; import vazkii.botania.api.item.IAvatarWieldable; @@ -20,7 +21,7 @@ import vazkii.botania.api.state.BotaniaStateProps; import javax.annotation.Nonnull; -public class TileAvatar extends TileSimpleInventory implements IAvatarTile { +public class TileAvatar extends TileSimpleInventory implements IAvatarTile, ITickable { private static final int MAX_MANA = 6400; 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 16b4266c0..ebfda96e6 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileBifrost.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileBifrost.java @@ -11,11 +11,12 @@ package vazkii.botania.common.block.tile; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.ITickable; import vazkii.botania.common.Botania; import javax.annotation.Nonnull; -public class TileBifrost extends TileMod { +public class TileBifrost extends TileMod implements ITickable { private static final String TAG_TICKS = "ticks"; 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 26ee4674e..f07e3a650 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java @@ -17,6 +17,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumHand; +import net.minecraft.util.ITickable; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.AxisAlignedBB; import vazkii.botania.api.BotaniaAPI; @@ -38,7 +39,7 @@ import javax.annotation.Nullable; import java.awt.Color; import java.util.List; -public class TileBrewery extends TileSimpleInventory implements IManaReceiver { +public class TileBrewery extends TileSimpleInventory implements IManaReceiver, ITickable { private static final String TAG_MANA = "mana"; private static final int CRAFT_EFFECT_EVENT = 0; 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 e68401541..d96a55065 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileCocoon.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileCocoon.java @@ -24,9 +24,10 @@ import net.minecraft.entity.passive.EntitySheep; import net.minecraft.entity.passive.EntityVillager; import net.minecraft.entity.passive.EntityWolf; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.ITickable; import net.minecraftforge.fml.common.registry.VillagerRegistry; -public class TileCocoon extends TileMod { +public class TileCocoon extends TileMod implements ITickable{ private static final String TAG_TIME_PASSED = "timePassed"; private static final String TAG_EMERALDS_GIVEN = "emeraldsGiven"; 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 3f00290b1..db6274ce0 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java @@ -27,6 +27,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; +import net.minecraft.util.ITickable; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; @@ -55,7 +56,7 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; -public class TileEnchanter extends TileMod implements ISparkAttachable { +public class TileEnchanter extends TileMod implements ISparkAttachable, ITickable { private static final String TAG_STAGE = "stage"; private static final String TAG_STAGE_TICKS = "stageTicks"; 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 b18874596..395c30c58 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileEnderEye.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileEnderEye.java @@ -16,6 +16,7 @@ import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumParticleTypes; +import net.minecraft.util.ITickable; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.WorldServer; @@ -24,7 +25,7 @@ import vazkii.botania.common.item.equipment.tool.ToolCommons; import java.util.List; -public class TileEnderEye extends TileMod { +public class TileEnderEye extends TileMod implements ITickable { @Override public void update() { 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 5f52a3625..dc6435a29 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileForestEye.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileForestEye.java @@ -11,9 +11,10 @@ package vazkii.botania.common.block.tile; import net.minecraft.entity.passive.EntityAnimal; +import net.minecraft.util.ITickable; import net.minecraft.util.math.AxisAlignedBB; -public class TileForestEye extends TileMod { +public class TileForestEye extends TileMod implements ITickable { public int entities = 0; 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 95978812f..396c2023d 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileHourglass.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileHourglass.java @@ -21,6 +21,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; +import net.minecraft.util.ITickable; import net.minecraft.util.StringUtils; import net.minecraft.util.math.BlockPos; import net.minecraftforge.fml.relauncher.Side; @@ -32,7 +33,7 @@ import vazkii.botania.common.item.ModItems; import javax.annotation.Nonnull; -public class TileHourglass extends TileSimpleInventory { +public class TileHourglass extends TileSimpleInventory implements ITickable { private static final String TAG_TIME = "time"; private static final String TAG_TIME_FRACTION = "timeFraction"; 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 2672914a0..176e207da 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileIncensePlate.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileIncensePlate.java @@ -16,6 +16,7 @@ import net.minecraft.init.SoundEvents; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.potion.PotionEffect; +import net.minecraft.util.ITickable; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.AxisAlignedBB; import vazkii.botania.api.BotaniaAPI; @@ -29,7 +30,7 @@ import javax.annotation.Nonnull; import java.awt.Color; import java.util.List; -public class TileIncensePlate extends TileSimpleInventory { +public class TileIncensePlate extends TileSimpleInventory implements ITickable { private static final String TAG_TIME_LEFT = "timeLeft"; private static final String TAG_BURNING = "burning"; 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 7433cc94b..15a8d0498 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java @@ -33,6 +33,7 @@ import net.minecraft.network.datasync.EntityDataManager; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.DamageSource; import net.minecraft.util.EnumFacing; +import net.minecraft.util.ITickable; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; @@ -49,7 +50,7 @@ import vazkii.botania.common.core.helper.PlayerHelper; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.lib.LibMisc; -public class TileLightRelay extends TileMod implements IWandBindable { +public class TileLightRelay extends TileMod implements ITickable, IWandBindable { private static final int MAX_DIST = 20; 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 ac611d730..12c4d660c 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileManaFlame.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileManaFlame.java @@ -11,9 +11,10 @@ package vazkii.botania.common.block.tile; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.ITickable; import vazkii.botania.common.Botania; -public class TileManaFlame extends TileMod { +public class TileManaFlame extends TileMod implements ITickable { private static final String TAG_COLOR = "color"; 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 c97041a2c..505bc9812 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileMod.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileMod.java @@ -15,13 +15,12 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.NetworkManager; import net.minecraft.network.play.server.SPacketUpdateTileEntity; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ITickable; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import javax.annotation.Nonnull; -public class TileMod extends TileEntity implements ITickable { +public class TileMod extends TileEntity { @Override public boolean shouldRefresh(World world, BlockPos pos, @Nonnull IBlockState oldState, @Nonnull IBlockState newState) { @@ -65,7 +64,4 @@ public class TileMod extends TileEntity implements ITickable { readPacketNBT(packet.getNbtCompound()); } - @Override - 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 5ba3f95de..b4de34254 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileOpenCrate.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileOpenCrate.java @@ -16,6 +16,7 @@ import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; +import net.minecraft.util.ITickable; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.state.BotaniaStateProps; @@ -23,7 +24,7 @@ import vazkii.botania.common.block.ModBlocks; import javax.annotation.Nonnull; -public class TileOpenCrate extends TileSimpleInventory { +public class TileOpenCrate extends TileSimpleInventory implements ITickable { @Override public boolean shouldRefresh(World world, BlockPos pos, @Nonnull IBlockState oldState, @Nonnull IBlockState newState) { 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 b9c46ac08..cf570fffe 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java @@ -20,6 +20,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumHand; +import net.minecraft.util.ITickable; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.AxisAlignedBB; import org.lwjgl.opengl.GL11; @@ -42,7 +43,7 @@ import javax.annotation.Nullable; import java.util.ArrayList; import java.util.List; -public class TileRuneAltar extends TileSimpleInventory implements IManaReceiver { +public class TileRuneAltar extends TileSimpleInventory implements IManaReceiver, ITickable { private static final String TAG_MANA = "mana"; private static final String TAG_MANA_TO_GET = "manaToGet"; 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 67e0c9c27..da904f736 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileSpawnerClaw.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileSpawnerClaw.java @@ -18,6 +18,7 @@ import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.MobSpawnerBaseLogic; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityMobSpawner; +import net.minecraft.util.ITickable; import net.minecraft.util.WeightedSpawnerEntity; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; @@ -26,7 +27,7 @@ import net.minecraft.world.chunk.storage.AnvilChunkLoader; import vazkii.botania.api.mana.IManaReceiver; import vazkii.botania.common.Botania; -public class TileSpawnerClaw extends TileMod implements IManaReceiver { +public class TileSpawnerClaw extends TileMod implements IManaReceiver, ITickable { private static final String TAG_MANA = "mana"; 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 ea1927532..1f8ab46aa 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileSpecialFlower.java @@ -23,6 +23,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; +import net.minecraft.util.ITickable; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; @@ -37,7 +38,7 @@ import vazkii.botania.common.block.tile.string.TileRedStringRelay; import java.util.List; -public class TileSpecialFlower extends TileMod implements IWandBindable, ISubTileSlowableContainer { +public class TileSpecialFlower extends TileMod implements IWandBindable, ISubTileSlowableContainer, ITickable { private static final String TAG_SUBTILE_NAME = "subTileName"; private static final String TAG_SUBTILE_CMP = "subTileCmp"; 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 c2ef014a1..7805acaa1 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileSpiritShrine.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileSpiritShrine.java @@ -10,9 +10,10 @@ */ package vazkii.botania.common.block.tile; +import net.minecraft.util.ITickable; import vazkii.botania.common.Botania; -public class TileSpiritShrine extends TileMod { +public class TileSpiritShrine extends TileMod implements ITickable { int ticks; 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 dae6a8b43..6d350e153 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileStarfield.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileStarfield.java @@ -10,10 +10,11 @@ */ package vazkii.botania.common.block.tile; +import net.minecraft.util.ITickable; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.Botania; -public class TileStarfield extends TileMod { +public class TileStarfield extends TileMod implements ITickable { @Override public void update() { 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 c742db336..bdd96c1ff 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileTerraPlate.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileTerraPlate.java @@ -17,6 +17,7 @@ import net.minecraft.entity.item.EntityItem; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.ITickable; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; @@ -36,7 +37,7 @@ import vazkii.botania.common.network.PacketHandler; import java.util.List; -public class TileTerraPlate extends TileMod implements ISparkAttachable { +public class TileTerraPlate extends TileMod implements ISparkAttachable, ITickable { public static final int MAX_MANA = TilePool.MAX_MANA / 2; 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 c8fbe428a..301c4350f 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileTeruTeruBozu.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileTeruTeruBozu.java @@ -10,9 +10,10 @@ */ package vazkii.botania.common.block.tile; +import net.minecraft.util.ITickable; import net.minecraft.world.World; -public class TileTeruTeruBozu extends TileMod { +public class TileTeruTeruBozu extends TileMod implements ITickable { public boolean wasRaining = 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 a6e0f23f9..c2e53a11f 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileTinyPlanet.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileTinyPlanet.java @@ -10,9 +10,10 @@ */ package vazkii.botania.common.block.tile; +import net.minecraft.util.ITickable; import vazkii.botania.common.item.equipment.bauble.ItemTinyPlanet; -public class TileTinyPlanet extends TileMod { +public class TileTinyPlanet extends TileMod implements ITickable { @Override public void update() { 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 ca02c50b5..e00bb822a 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileTinyPotato.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileTinyPotato.java @@ -17,6 +17,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; +import net.minecraft.util.ITickable; import net.minecraft.util.ResourceLocation; import net.minecraft.util.SoundCategory; import net.minecraft.util.text.TextComponentString; @@ -26,7 +27,7 @@ import vazkii.botania.common.core.handler.ModSounds; import vazkii.botania.common.core.helper.PlayerHelper; import vazkii.botania.common.lib.LibMisc; -public class TileTinyPotato extends TileSimpleInventory { +public class TileTinyPotato extends TileSimpleInventory implements ITickable { private static final String TAG_NAME = "name"; 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 1f8877ee4..7d4d4fa0f 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 @@ -15,6 +15,7 @@ import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; +import net.minecraft.util.ITickable; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.model.ModelLoaderRegistry; import net.minecraftforge.common.capabilities.Capability; @@ -30,7 +31,7 @@ import vazkii.botania.api.internal.VanillaPacketDispatcher; import javax.annotation.Nonnull; import java.util.List; -public class TileCorporeaCrystalCube extends TileCorporeaBase implements ICorporeaRequestor { +public class TileCorporeaCrystalCube extends TileCorporeaBase implements ICorporeaRequestor, ITickable { private static final String TAG_REQUEST_TARGET = "requestTarget"; private static final String TAG_ITEM_COUNT = "itemCount"; 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 b7cba96f5..a86a0d7ae 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 @@ -14,6 +14,7 @@ import net.minecraft.client.Minecraft; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.ITickable; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.text.Style; @@ -44,7 +45,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import java.util.stream.Collectors; -public class TileCorporeaIndex extends TileCorporeaBase implements ICorporeaRequestor { +public class TileCorporeaIndex extends TileCorporeaBase implements ICorporeaRequestor, ITickable { public static final double RADIUS = 2.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 12d665847..f1443c7d9 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 @@ -17,6 +17,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityFurnace; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumParticleTypes; +import net.minecraft.util.ITickable; import net.minecraft.util.SoundCategory; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.state.BotaniaStateProps; @@ -24,7 +25,7 @@ import vazkii.botania.common.block.subtile.functional.SubTileExoflame; import vazkii.botania.common.block.tile.TileMod; import vazkii.botania.common.core.handler.ModSounds; -public class TileBellows extends TileMod { +public class TileBellows extends TileMod implements ITickable { private static final String TAG_ACTIVE = "active"; 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 d0ce75362..a99a946af 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 @@ -12,6 +12,7 @@ package vazkii.botania.common.block.tile.mana; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; +import net.minecraft.util.ITickable; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.mana.IManaPool; import vazkii.botania.api.mana.IManaReceiver; @@ -20,7 +21,7 @@ import vazkii.botania.common.block.tile.TileMod; import java.util.ArrayList; import java.util.List; -public class TileDistributor extends TileMod implements IManaReceiver { +public class TileDistributor extends TileMod implements IManaReceiver, ITickable { final List validPools = new ArrayList<>(); 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 62b6a1983..819f61d8f 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 @@ -12,13 +12,14 @@ package vazkii.botania.common.block.tile.mana; import com.google.common.base.Predicates; import net.minecraft.entity.Entity; +import net.minecraft.util.ITickable; import net.minecraft.util.math.AxisAlignedBB; import vazkii.botania.api.internal.IManaBurst; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.Botania; import vazkii.botania.common.block.tile.TileMod; -public class TileManaDetector extends TileMod { +public class TileManaDetector extends TileMod implements ITickable { @Override public void update() { 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 2dfb361a8..ec65fd3ed 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 @@ -27,6 +27,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.play.server.SPacketUpdateTileEntity; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; +import net.minecraft.util.ITickable; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; @@ -67,7 +68,7 @@ import java.awt.Color; import java.util.ArrayList; import java.util.List; -public class TilePool extends TileMod implements IManaPool, IKeyLocked, ISparkAttachable, IThrottledPacket { +public class TilePool extends TileMod implements IManaPool, IKeyLocked, ISparkAttachable, IThrottledPacket, ITickable { public static final Color PARTICLE_COLOR = new Color(0x00C6FF); public static final int MAX_MANA = 1000000; 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 d60f16e50..0cdebc14b 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 @@ -14,6 +14,7 @@ import com.google.common.collect.ImmutableMap; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumParticleTypes; +import net.minecraft.util.ITickable; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.model.ModelLoaderRegistry; import net.minecraftforge.common.animation.TimeValues; @@ -27,7 +28,7 @@ import vazkii.botania.common.block.tile.TileMod; import javax.annotation.Nonnull; -public class TilePump extends TileMod { +public class TilePump extends TileMod implements ITickable { private static final String TAG_ACTIVE = "active"; 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 4be160d39..a6e3b09f1 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 @@ -13,6 +13,7 @@ package vazkii.botania.common.block.tile.mana; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; +import net.minecraft.util.ITickable; import net.minecraft.util.math.BlockPos; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.energy.CapabilityEnergy; @@ -23,7 +24,7 @@ import vazkii.botania.common.block.tile.TileMod; import javax.annotation.Nonnull; import javax.annotation.Nullable; -public class TileRFGenerator extends TileMod implements IManaReceiver { +public class TileRFGenerator extends TileMod implements IManaReceiver, ITickable { private static final int MANA_TO_FE = 10; private static final int MAX_ENERGY = 1280 * MANA_TO_FE; 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 f06a0d0e8..e11271f9e 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 @@ -18,12 +18,13 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; +import net.minecraft.util.ITickable; import net.minecraft.util.text.TextFormatting; import org.lwjgl.opengl.GL11; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.common.block.tile.TileMod; -public class TileTurntable extends TileMod { +public class TileTurntable extends TileMod implements ITickable { private static final String TAG_SPEED = "speed"; private static final String TAG_BACKWARDS = "backwards"; 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 c412a9de4..1c5c2d57c 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 @@ -15,6 +15,7 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; +import net.minecraft.util.ITickable; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import vazkii.botania.api.state.BotaniaStateProps; @@ -23,7 +24,7 @@ import vazkii.botania.common.block.tile.TileMod; import javax.annotation.Nonnull; -public abstract class TileRedString extends TileMod implements ITileBound { +public abstract class TileRedString extends TileMod implements ITileBound, ITickable { private BlockPos binding;