Don't blanket implement ITickable on everything, some TE's are now non-tickable (e.g. prisms, platforms), yields minor performance increase

This commit is contained in:
Vincent Lee committed 2018-01-11 22:23:33 -06:00
1 parent 446bd04b3d
commit 124fc8518a
35 files changed
+69 -39

No files matched your search

@@ -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),
@@ -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;
@@ -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";
@@ -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;
@@ -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";
@@ -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;
@@ -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";
@@ -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";
@@ -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() {
@@ -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;
@@ -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";
@@ -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";
@@ -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;
@@ -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";
@@ -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() {}
}
@@ -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) {
@@ -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";
@@ -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";
@@ -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";
@@ -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;
@@ -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() {
@@ -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;
@@ -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;
@@ -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() {
@@ -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";
@@ -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";
@@ -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;
@@ -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";
@@ -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<IManaReceiver> validPools = new ArrayList<>();
@@ -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() {
@@ -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;
@@ -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";
@@ -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;
@@ -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";
@@ -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;