From 75a4dd16cce2ab4682ceda53485f49ee79cdf45e Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 24 Jun 2020 20:17:53 -0500 Subject: [PATCH] Convert forge has/createTileEntity back into ITEP for portability.Once upon a time this was 'best practice' but it never seemed to provide any benefit. --- .../botania/common/block/BlockAlfPortal.java | 11 ++++------- .../vazkii/botania/common/block/BlockAltar.java | 10 +++------- .../botania/common/block/BlockAnimatedTorch.java | 10 +++------- .../vazkii/botania/common/block/BlockAvatar.java | 10 +++------- .../vazkii/botania/common/block/BlockBifrost.java | 10 +++------- .../botania/common/block/BlockCacophonium.java | 10 +++------- .../vazkii/botania/common/block/BlockCell.java | 10 +++------- .../vazkii/botania/common/block/BlockCocoon.java | 10 +++------- .../botania/common/block/BlockCraftyCrate.java | 2 +- .../vazkii/botania/common/block/BlockEnderEye.java | 10 +++------- .../vazkii/botania/common/block/BlockFakeAir.java | 14 +++----------- .../common/block/BlockFloatingSpecialFlower.java | 2 +- .../botania/common/block/BlockForestEye.java | 10 +++------- .../botania/common/block/BlockHourglass.java | 10 +++------- .../botania/common/block/BlockIncensePlate.java | 10 +++------- .../botania/common/block/BlockLightRelay.java | 10 +++------- .../botania/common/block/BlockOpenCrate.java | 10 +++------- .../vazkii/botania/common/block/BlockPlatform.java | 14 +++----------- .../vazkii/botania/common/block/BlockPylon.java | 10 +++------- .../botania/common/block/BlockSparkChanger.java | 10 +++------- .../botania/common/block/BlockSpecialFlower.java | 10 +++------- .../botania/common/block/BlockTeruTeruBozu.java | 10 +++------- .../botania/common/block/BlockTinyPlanet.java | 10 +++------- .../common/block/corporea/BlockCorporeaBase.java | 7 ++----- .../block/corporea/BlockCorporeaCrystalCube.java | 2 +- .../common/block/corporea/BlockCorporeaFunnel.java | 2 +- .../common/block/corporea/BlockCorporeaIndex.java | 2 +- .../block/corporea/BlockCorporeaInterceptor.java | 2 +- .../block/corporea/BlockCorporeaRetainer.java | 10 +++------- .../common/block/decor/BlockFloatingFlower.java | 10 +++------- .../botania/common/block/decor/BlockManaFlame.java | 10 +++------- .../botania/common/block/decor/BlockStarfield.java | 10 +++------- .../common/block/decor/BlockTinyPotato.java | 10 +++------- .../botania/common/block/mana/BlockBellows.java | 10 +++------- .../botania/common/block/mana/BlockBrewery.java | 10 +++------- .../common/block/mana/BlockDistributor.java | 10 +++------- .../botania/common/block/mana/BlockEnchanter.java | 10 +++------- .../common/block/mana/BlockManaDetector.java | 10 +++------- .../botania/common/block/mana/BlockManaVoid.java | 10 +++------- .../botania/common/block/mana/BlockPool.java | 10 +++------- .../botania/common/block/mana/BlockPrism.java | 10 +++------- .../botania/common/block/mana/BlockPump.java | 10 +++------- .../common/block/mana/BlockRFGenerator.java | 10 +++------- .../botania/common/block/mana/BlockRuneAltar.java | 10 +++------- .../common/block/mana/BlockSpawnerClaw.java | 10 +++------- .../botania/common/block/mana/BlockSpreader.java | 10 +++------- .../botania/common/block/mana/BlockTerraPlate.java | 10 +++------- .../botania/common/block/mana/BlockTurntable.java | 10 +++------- .../common/block/string/BlockRedString.java | 7 ++----- .../block/string/BlockRedStringComparator.java | 2 +- .../block/string/BlockRedStringContainer.java | 2 +- .../block/string/BlockRedStringDispenser.java | 2 +- .../block/string/BlockRedStringFertilizer.java | 2 +- .../block/string/BlockRedStringInterceptor.java | 2 +- .../common/block/string/BlockRedStringRelay.java | 2 +- 55 files changed, 140 insertions(+), 317 deletions(-) diff --git a/src/main/java/vazkii/botania/common/block/BlockAlfPortal.java b/src/main/java/vazkii/botania/common/block/BlockAlfPortal.java index 08abb948c..0c85bcdbd 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAlfPortal.java +++ b/src/main/java/vazkii/botania/common/block/BlockAlfPortal.java @@ -10,6 +10,7 @@ package vazkii.botania.common.block; import net.minecraft.block.Block; import net.minecraft.block.BlockState; +import net.minecraft.block.ITileEntityProvider; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.item.ItemStack; @@ -28,8 +29,9 @@ import vazkii.botania.common.advancements.AlfPortalTrigger; import vazkii.botania.common.block.tile.TileAlfPortal; import javax.annotation.Nonnull; +import javax.annotation.Nullable; -public class BlockAlfPortal extends BlockMod implements IWandable { +public class BlockAlfPortal extends BlockMod implements ITileEntityProvider, IWandable { public BlockAlfPortal(Properties builder) { super(builder); @@ -41,14 +43,9 @@ public class BlockAlfPortal extends BlockMod implements IWandable { builder.add(BotaniaStateProps.ALFPORTAL_STATE); } - @Override - public boolean hasTileEntity(BlockState state) { - return true; - } - @Nonnull @Override - public TileEntity createTileEntity(@Nonnull BlockState state, @Nonnull IBlockReader world) { + public TileEntity createNewTileEntity(@Nonnull IBlockReader world) { return new TileAlfPortal(); } diff --git a/src/main/java/vazkii/botania/common/block/BlockAltar.java b/src/main/java/vazkii/botania/common/block/BlockAltar.java index a592d08d3..7ffe0ea5e 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAltar.java +++ b/src/main/java/vazkii/botania/common/block/BlockAltar.java @@ -10,6 +10,7 @@ package vazkii.botania.common.block; import net.minecraft.block.Block; import net.minecraft.block.BlockState; +import net.minecraft.block.ITileEntityProvider; import net.minecraft.entity.Entity; import net.minecraft.entity.item.ItemEntity; import net.minecraft.entity.player.PlayerEntity; @@ -44,7 +45,7 @@ import vazkii.botania.common.item.rod.ItemWaterRod; import javax.annotation.Nonnull; -public class BlockAltar extends BlockMod { +public class BlockAltar extends BlockMod implements ITileEntityProvider { private static final VoxelShape BASE = Block.makeCuboidShape(0, 0, 0, 16, 2, 16); private static final VoxelShape MIDDLE = Block.makeCuboidShape(2, 2, 2, 14, 12, 14); @@ -213,14 +214,9 @@ public class BlockAltar extends BlockMod { .orElse(stack); } - @Override - public boolean hasTileEntity(BlockState state) { - return true; - } - @Nonnull @Override - public TileEntity createTileEntity(@Nonnull BlockState state, @Nonnull IBlockReader world) { + public TileEntity createNewTileEntity(@Nonnull IBlockReader world) { return new TileAltar(); } diff --git a/src/main/java/vazkii/botania/common/block/BlockAnimatedTorch.java b/src/main/java/vazkii/botania/common/block/BlockAnimatedTorch.java index 5086ea259..98bd7d970 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAnimatedTorch.java +++ b/src/main/java/vazkii/botania/common/block/BlockAnimatedTorch.java @@ -10,6 +10,7 @@ package vazkii.botania.common.block; import net.minecraft.block.BlockRenderType; import net.minecraft.block.BlockState; +import net.minecraft.block.ITileEntityProvider; import net.minecraft.client.Minecraft; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.player.PlayerEntity; @@ -38,7 +39,7 @@ import vazkii.botania.common.block.tile.TileAnimatedTorch; import javax.annotation.Nonnull; import javax.annotation.Nullable; -public class BlockAnimatedTorch extends BlockModWaterloggable implements IWandable, IManaTrigger, IHourglassTrigger, IWandHUD { +public class BlockAnimatedTorch extends BlockModWaterloggable implements ITileEntityProvider, IWandable, IManaTrigger, IHourglassTrigger, IWandHUD { private static final VoxelShape SHAPE = makeCuboidShape(0, 0, 0, 16, 4, 16); @@ -123,15 +124,10 @@ public class BlockAnimatedTorch extends BlockModWaterloggable implements IWandab } @Override - public TileEntity createTileEntity(@Nonnull BlockState state, @Nonnull IBlockReader world) { + public TileEntity createNewTileEntity(@Nonnull IBlockReader world) { return new TileAnimatedTorch(); } - @Override - public boolean hasTileEntity(BlockState state) { - return true; - } - @Override public void onPlayerDestroy(IWorld world, BlockPos pos, BlockState state) { // TE is already gone so best we can do is just notify everyone diff --git a/src/main/java/vazkii/botania/common/block/BlockAvatar.java b/src/main/java/vazkii/botania/common/block/BlockAvatar.java index 67af51b1f..e1eb745ee 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAvatar.java +++ b/src/main/java/vazkii/botania/common/block/BlockAvatar.java @@ -11,6 +11,7 @@ package vazkii.botania.common.block; import net.minecraft.block.Block; import net.minecraft.block.BlockRenderType; import net.minecraft.block.BlockState; +import net.minecraft.block.ITileEntityProvider; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.BlockItemUseContext; import net.minecraft.item.ItemStack; @@ -33,7 +34,7 @@ import vazkii.botania.common.core.helper.InventoryHelper; import javax.annotation.Nonnull; -public class BlockAvatar extends BlockModWaterloggable { +public class BlockAvatar extends BlockModWaterloggable implements ITileEntityProvider { private static final VoxelShape X_AABB = makeCuboidShape(5, 0, 3.5, 11, 17, 12.5); private static final VoxelShape Z_AABB = makeCuboidShape(3.5, 0, 5, 12.5, 17, 11); @@ -97,14 +98,9 @@ public class BlockAvatar extends BlockModWaterloggable { return BlockRenderType.ENTITYBLOCK_ANIMATED; } - @Override - public boolean hasTileEntity(BlockState state) { - return true; - } - @Nonnull @Override - public TileEntity createTileEntity(@Nonnull BlockState state, @Nonnull IBlockReader world) { + public TileEntity createNewTileEntity(@Nonnull IBlockReader world) { return new TileAvatar(); } diff --git a/src/main/java/vazkii/botania/common/block/BlockBifrost.java b/src/main/java/vazkii/botania/common/block/BlockBifrost.java index 36ce5775e..58e7004bf 100644 --- a/src/main/java/vazkii/botania/common/block/BlockBifrost.java +++ b/src/main/java/vazkii/botania/common/block/BlockBifrost.java @@ -9,6 +9,7 @@ package vazkii.botania.common.block; import net.minecraft.block.BlockState; +import net.minecraft.block.ITileEntityProvider; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -21,7 +22,7 @@ import vazkii.botania.common.item.ModItems; import javax.annotation.Nonnull; -public class BlockBifrost extends BlockBifrostPerm { +public class BlockBifrost extends BlockBifrostPerm implements ITileEntityProvider { public BlockBifrost(Properties builder) { super(builder); @@ -33,14 +34,9 @@ public class BlockBifrost extends BlockBifrostPerm { return new ItemStack(ModItems.rainbowRod); } - @Override - public boolean hasTileEntity(BlockState state) { - return true; - } - @Nonnull @Override - public TileEntity createTileEntity(@Nonnull BlockState state, @Nonnull IBlockReader world) { + public TileEntity createNewTileEntity(@Nonnull IBlockReader world) { return new TileBifrost(); } } diff --git a/src/main/java/vazkii/botania/common/block/BlockCacophonium.java b/src/main/java/vazkii/botania/common/block/BlockCacophonium.java index bce7cc556..c34522032 100644 --- a/src/main/java/vazkii/botania/common/block/BlockCacophonium.java +++ b/src/main/java/vazkii/botania/common/block/BlockCacophonium.java @@ -10,6 +10,7 @@ package vazkii.botania.common.block; import net.minecraft.block.Block; import net.minecraft.block.BlockState; +import net.minecraft.block.ITileEntityProvider; import net.minecraft.inventory.InventoryHelper; import net.minecraft.state.StateContainer; import net.minecraft.state.properties.BlockStateProperties; @@ -22,7 +23,7 @@ import vazkii.botania.common.block.tile.TileCacophonium; import javax.annotation.Nonnull; -public class BlockCacophonium extends BlockMod { +public class BlockCacophonium extends BlockMod implements ITileEntityProvider { protected BlockCacophonium(Properties builder) { super(builder); setDefaultState(getDefaultState().with(BlockStateProperties.POWERED, false)); @@ -60,14 +61,9 @@ public class BlockCacophonium extends BlockMod { } } - @Override - public boolean hasTileEntity(BlockState state) { - return true; - } - @Nonnull @Override - public TileEntity createTileEntity(@Nonnull BlockState state, @Nonnull IBlockReader world) { + public TileEntity createNewTileEntity(@Nonnull IBlockReader world) { return new TileCacophonium(); } diff --git a/src/main/java/vazkii/botania/common/block/BlockCell.java b/src/main/java/vazkii/botania/common/block/BlockCell.java index 040df980c..71a6d6b4e 100644 --- a/src/main/java/vazkii/botania/common/block/BlockCell.java +++ b/src/main/java/vazkii/botania/common/block/BlockCell.java @@ -9,6 +9,7 @@ package vazkii.botania.common.block; import net.minecraft.block.BlockState; +import net.minecraft.block.ITileEntityProvider; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.IBlockReader; @@ -16,20 +17,15 @@ import vazkii.botania.common.block.tile.TileCell; import javax.annotation.Nonnull; -public class BlockCell extends BlockMod { +public class BlockCell extends BlockMod implements ITileEntityProvider { public BlockCell(Properties builder) { super(builder); } - @Override - public boolean hasTileEntity(BlockState state) { - return true; - } - @Nonnull @Override - public TileEntity createTileEntity(@Nonnull BlockState state, @Nonnull IBlockReader world) { + public TileEntity createNewTileEntity(@Nonnull IBlockReader world) { return new TileCell(); } diff --git a/src/main/java/vazkii/botania/common/block/BlockCocoon.java b/src/main/java/vazkii/botania/common/block/BlockCocoon.java index 820737105..323c56490 100644 --- a/src/main/java/vazkii/botania/common/block/BlockCocoon.java +++ b/src/main/java/vazkii/botania/common/block/BlockCocoon.java @@ -10,6 +10,7 @@ package vazkii.botania.common.block; import net.minecraft.block.BlockRenderType; import net.minecraft.block.BlockState; +import net.minecraft.block.ITileEntityProvider; import net.minecraft.entity.Entity; import net.minecraft.entity.item.ItemEntity; import net.minecraft.entity.player.PlayerEntity; @@ -34,7 +35,7 @@ import vazkii.botania.common.item.ModItems; import javax.annotation.Nonnull; -public class BlockCocoon extends BlockModWaterloggable { +public class BlockCocoon extends BlockModWaterloggable implements ITileEntityProvider { private static final VoxelShape SHAPE = makeCuboidShape(3, 0, 3, 13, 14, 13);; @@ -107,14 +108,9 @@ public class BlockCocoon extends BlockModWaterloggable { return ActionResultType.PASS; } - @Override - public boolean hasTileEntity(BlockState state) { - return true; - } - @Nonnull @Override - public TileEntity createTileEntity(@Nonnull BlockState state, @Nonnull IBlockReader world) { + public TileEntity createNewTileEntity(@Nonnull IBlockReader world) { return new TileCocoon(); } diff --git a/src/main/java/vazkii/botania/common/block/BlockCraftyCrate.java b/src/main/java/vazkii/botania/common/block/BlockCraftyCrate.java index a58e933f3..048de6634 100644 --- a/src/main/java/vazkii/botania/common/block/BlockCraftyCrate.java +++ b/src/main/java/vazkii/botania/common/block/BlockCraftyCrate.java @@ -42,7 +42,7 @@ public class BlockCraftyCrate extends BlockOpenCrate implements IWandHUD { @Nonnull @Override - public TileEntity createTileEntity(@Nonnull BlockState state, @Nonnull IBlockReader world) { + public TileEntity createNewTileEntity(@Nonnull IBlockReader world) { return new TileCraftCrate(); } diff --git a/src/main/java/vazkii/botania/common/block/BlockEnderEye.java b/src/main/java/vazkii/botania/common/block/BlockEnderEye.java index f877d7285..a1a45969e 100644 --- a/src/main/java/vazkii/botania/common/block/BlockEnderEye.java +++ b/src/main/java/vazkii/botania/common/block/BlockEnderEye.java @@ -10,6 +10,7 @@ package vazkii.botania.common.block; import net.minecraft.block.Block; import net.minecraft.block.BlockState; +import net.minecraft.block.ITileEntityProvider; import net.minecraft.particles.RedstoneParticleData; import net.minecraft.state.StateContainer; import net.minecraft.state.properties.BlockStateProperties; @@ -25,7 +26,7 @@ import javax.annotation.Nonnull; import java.util.Random; -public class BlockEnderEye extends BlockMod { +public class BlockEnderEye extends BlockMod implements ITileEntityProvider { protected BlockEnderEye(Properties builder) { super(builder); @@ -47,14 +48,9 @@ public class BlockEnderEye extends BlockMod { return state.get(BlockStateProperties.POWERED) ? 15 : 0; } - @Override - public boolean hasTileEntity(BlockState state) { - return true; - } - @Nonnull @Override - public TileEntity createTileEntity(@Nonnull BlockState state, @Nonnull IBlockReader world) { + public TileEntity createNewTileEntity(@Nonnull IBlockReader world) { return new TileEnderEye(); } diff --git a/src/main/java/vazkii/botania/common/block/BlockFakeAir.java b/src/main/java/vazkii/botania/common/block/BlockFakeAir.java index 2f085f05c..7bddcf05e 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFakeAir.java +++ b/src/main/java/vazkii/botania/common/block/BlockFakeAir.java @@ -8,10 +8,7 @@ */ package vazkii.botania.common.block; -import net.minecraft.block.AirBlock; -import net.minecraft.block.Block; -import net.minecraft.block.BlockState; -import net.minecraft.block.Blocks; +import net.minecraft.block.*; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockReader; @@ -25,7 +22,7 @@ import javax.annotation.Nonnull; import java.util.Random; -public class BlockFakeAir extends AirBlock { +public class BlockFakeAir extends AirBlock implements ITileEntityProvider { public BlockFakeAir(Properties builder) { super(builder); @@ -54,14 +51,9 @@ public class BlockFakeAir extends AirBlock { return 4; } - @Override - public boolean hasTileEntity(BlockState state) { - return true; - } - @Nonnull @Override - public TileEntity createTileEntity(@Nonnull BlockState state, @Nonnull IBlockReader world) { + public TileEntity createNewTileEntity(@Nonnull IBlockReader world) { return new TileFakeAir(); } } diff --git a/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java index 45ff8a3cb..0f9df6608 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java @@ -128,7 +128,7 @@ public class BlockFloatingSpecialFlower extends BlockFloatingFlower implements I @Nonnull @Override - public TileEntity createTileEntity(@Nonnull BlockState state, @Nonnull IBlockReader world) { + public TileEntity createNewTileEntity(@Nonnull IBlockReader world) { return teProvider.get(); } } diff --git a/src/main/java/vazkii/botania/common/block/BlockForestEye.java b/src/main/java/vazkii/botania/common/block/BlockForestEye.java index 0277f0f6f..db1a20dda 100644 --- a/src/main/java/vazkii/botania/common/block/BlockForestEye.java +++ b/src/main/java/vazkii/botania/common/block/BlockForestEye.java @@ -9,6 +9,7 @@ package vazkii.botania.common.block; import net.minecraft.block.BlockState; +import net.minecraft.block.ITileEntityProvider; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.shapes.ISelectionContext; @@ -20,7 +21,7 @@ import vazkii.botania.common.block.tile.TileForestEye; import javax.annotation.Nonnull; -public class BlockForestEye extends BlockModWaterloggable { +public class BlockForestEye extends BlockModWaterloggable implements ITileEntityProvider { private static final VoxelShape SHAPE = makeCuboidShape(4, 4, 4, 12, 12, 12); @@ -45,14 +46,9 @@ public class BlockForestEye extends BlockModWaterloggable { return eye == null ? 0 : Math.min(15, Math.max(0, eye.entities - 1)); } - @Override - public boolean hasTileEntity(BlockState state) { - return true; - } - @Nonnull @Override - public TileEntity createTileEntity(@Nonnull BlockState state, @Nonnull IBlockReader world) { + public TileEntity createNewTileEntity(@Nonnull IBlockReader world) { return new TileForestEye(); } diff --git a/src/main/java/vazkii/botania/common/block/BlockHourglass.java b/src/main/java/vazkii/botania/common/block/BlockHourglass.java index b5aef42e5..86fb95289 100644 --- a/src/main/java/vazkii/botania/common/block/BlockHourglass.java +++ b/src/main/java/vazkii/botania/common/block/BlockHourglass.java @@ -11,6 +11,7 @@ package vazkii.botania.common.block; import net.minecraft.block.Block; import net.minecraft.block.BlockRenderType; import net.minecraft.block.BlockState; +import net.minecraft.block.ITileEntityProvider; import net.minecraft.client.Minecraft; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; @@ -47,7 +48,7 @@ import javax.annotation.Nonnull; import java.util.Random; -public class BlockHourglass extends BlockModWaterloggable implements IManaTrigger, IWandable, IWandHUD { +public class BlockHourglass extends BlockModWaterloggable implements IManaTrigger, ITileEntityProvider, IWandable, IWandHUD { private static final VoxelShape SHAPE = makeCuboidShape(4, 0, 4, 12, 18.4, 12); @@ -134,14 +135,9 @@ public class BlockHourglass extends BlockModWaterloggable implements IManaTrigge return BlockRenderType.ENTITYBLOCK_ANIMATED; } - @Override - public boolean hasTileEntity(BlockState state) { - return true; - } - @Nonnull @Override - public TileEntity createTileEntity(@Nonnull BlockState state, @Nonnull IBlockReader world) { + public TileEntity createNewTileEntity(@Nonnull IBlockReader world) { return new TileHourglass(); } diff --git a/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java b/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java index 1b1f7f465..f9ac8050e 100644 --- a/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java +++ b/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java @@ -10,6 +10,7 @@ package vazkii.botania.common.block; import net.minecraft.block.Block; import net.minecraft.block.BlockState; +import net.minecraft.block.ITileEntityProvider; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.BlockItemUseContext; import net.minecraft.item.ItemStack; @@ -34,7 +35,7 @@ import vazkii.botania.common.core.helper.InventoryHelper; import javax.annotation.Nonnull; -public class BlockIncensePlate extends BlockModWaterloggable { +public class BlockIncensePlate extends BlockModWaterloggable implements ITileEntityProvider { private static final VoxelShape X_SHAPE = makeCuboidShape(6, 0, 2, 10, 1, 14); private static final VoxelShape Z_SHAPE = makeCuboidShape(2, 0, 6, 14, 1, 10); @@ -117,14 +118,9 @@ public class BlockIncensePlate extends BlockModWaterloggable { } } - @Override - public boolean hasTileEntity(BlockState state) { - return true; - } - @Nonnull @Override - public TileEntity createTileEntity(@Nonnull BlockState state, @Nonnull IBlockReader world) { + public TileEntity createNewTileEntity(@Nonnull IBlockReader world) { return new TileIncensePlate(); } diff --git a/src/main/java/vazkii/botania/common/block/BlockLightRelay.java b/src/main/java/vazkii/botania/common/block/BlockLightRelay.java index 1f05c8924..45b761026 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLightRelay.java +++ b/src/main/java/vazkii/botania/common/block/BlockLightRelay.java @@ -11,6 +11,7 @@ package vazkii.botania.common.block; import net.minecraft.block.Block; import net.minecraft.block.BlockRenderType; import net.minecraft.block.BlockState; +import net.minecraft.block.ITileEntityProvider; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.state.StateContainer; @@ -36,7 +37,7 @@ import javax.annotation.Nonnull; import java.util.Random; -public class BlockLightRelay extends BlockModWaterloggable implements IWandable { +public class BlockLightRelay extends BlockModWaterloggable implements ITileEntityProvider, IWandable { private static final VoxelShape SHAPE = makeCuboidShape(5, 5, 5, 11, 11, 11); public final LuminizerVariant variant; @@ -103,14 +104,9 @@ public class BlockLightRelay extends BlockModWaterloggable implements IWandable return BlockRenderType.ENTITYBLOCK_ANIMATED; } - @Override - public boolean hasTileEntity(BlockState state) { - return true; - } - @Nonnull @Override - public TileEntity createTileEntity(@Nonnull BlockState state, @Nonnull IBlockReader world) { + public TileEntity createNewTileEntity(@Nonnull IBlockReader world) { return new TileLightRelay(); } diff --git a/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java b/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java index b2da9e2ab..197a9e199 100644 --- a/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java +++ b/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java @@ -9,6 +9,7 @@ package vazkii.botania.common.block; import net.minecraft.block.BlockState; +import net.minecraft.block.ITileEntityProvider; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -24,7 +25,7 @@ import vazkii.botania.common.core.helper.InventoryHelper; import javax.annotation.Nonnull; -public class BlockOpenCrate extends BlockMod implements IWandable { +public class BlockOpenCrate extends BlockMod implements ITileEntityProvider, IWandable { protected BlockOpenCrate(Properties builder) { super(builder); @@ -50,14 +51,9 @@ public class BlockOpenCrate extends BlockMod implements IWandable { } } - @Override - public boolean hasTileEntity(BlockState state) { - return true; - } - @Nonnull @Override - public TileEntity createTileEntity(@Nonnull BlockState state, @Nonnull IBlockReader world) { + public TileEntity createNewTileEntity(@Nonnull IBlockReader world) { return new TileOpenCrate(); } diff --git a/src/main/java/vazkii/botania/common/block/BlockPlatform.java b/src/main/java/vazkii/botania/common/block/BlockPlatform.java index 07482b7d4..c5d6dfcc1 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPlatform.java +++ b/src/main/java/vazkii/botania/common/block/BlockPlatform.java @@ -8,10 +8,7 @@ */ package vazkii.botania.common.block; -import net.minecraft.block.Block; -import net.minecraft.block.BlockRenderType; -import net.minecraft.block.BlockState; -import net.minecraft.block.Blocks; +import net.minecraft.block.*; import net.minecraft.block.material.Material; import net.minecraft.entity.Entity; import net.minecraft.entity.player.PlayerEntity; @@ -36,7 +33,7 @@ import vazkii.botania.common.block.tile.TilePlatform; import javax.annotation.Nonnull; import javax.annotation.Nullable; -public class BlockPlatform extends BlockMod implements IWandable, IManaCollisionGhost { +public class BlockPlatform extends BlockMod implements IWandable, IManaCollisionGhost, ITileEntityProvider { public enum Variant { ABSTRUSE, @@ -71,14 +68,9 @@ public class BlockPlatform extends BlockMod implements IWandable, IManaCollision return variant != Variant.INFRANGIBLE; } - @Override - public boolean hasTileEntity(BlockState state) { - return true; - } - @Nonnull @Override - public TileEntity createTileEntity(@Nonnull BlockState state, @Nonnull IBlockReader world) { + public TileEntity createNewTileEntity(@Nonnull IBlockReader world) { return new TilePlatform(); } diff --git a/src/main/java/vazkii/botania/common/block/BlockPylon.java b/src/main/java/vazkii/botania/common/block/BlockPylon.java index 76760c01d..9201a387d 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPylon.java +++ b/src/main/java/vazkii/botania/common/block/BlockPylon.java @@ -11,6 +11,7 @@ package vazkii.botania.common.block; import net.minecraft.block.Block; import net.minecraft.block.BlockRenderType; import net.minecraft.block.BlockState; +import net.minecraft.block.ITileEntityProvider; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.shapes.ISelectionContext; @@ -22,7 +23,7 @@ import vazkii.botania.common.block.tile.TilePylon; import javax.annotation.Nonnull; -public class BlockPylon extends BlockModWaterloggable { +public class BlockPylon extends BlockModWaterloggable implements ITileEntityProvider { private static final VoxelShape SHAPE = Block.makeCuboidShape(2, 0, 2, 14, 21, 14); public enum Variant { @@ -59,14 +60,9 @@ public class BlockPylon extends BlockModWaterloggable { } } - @Override - public boolean hasTileEntity(BlockState state) { - return true; - } - @Nonnull @Override - public TileEntity createTileEntity(@Nonnull BlockState state, @Nonnull IBlockReader world) { + public TileEntity createNewTileEntity(@Nonnull IBlockReader world) { return new TilePylon(); } diff --git a/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java b/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java index 5ec430a3d..5627fd9f8 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java +++ b/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java @@ -10,6 +10,7 @@ package vazkii.botania.common.block; import net.minecraft.block.Block; import net.minecraft.block.BlockState; +import net.minecraft.block.ITileEntityProvider; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.state.StateContainer; @@ -32,7 +33,7 @@ import vazkii.botania.common.item.ItemSparkUpgrade; import javax.annotation.Nonnull; -public class BlockSparkChanger extends BlockModWaterloggable { +public class BlockSparkChanger extends BlockModWaterloggable implements ITileEntityProvider { private static final VoxelShape SHAPE = makeCuboidShape(0, 0, 0, 16, 3, 16); @@ -109,14 +110,9 @@ public class BlockSparkChanger extends BlockModWaterloggable { return 0; } - @Override - public boolean hasTileEntity(BlockState state) { - return true; - } - @Nonnull @Override - public TileEntity createTileEntity(@Nonnull BlockState state, @Nonnull IBlockReader world) { + public TileEntity createNewTileEntity(@Nonnull IBlockReader world) { return new TileSparkChanger(); } diff --git a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java index 93f88b526..589a97fa3 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java @@ -11,6 +11,7 @@ package vazkii.botania.common.block; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; import net.minecraft.block.FlowerBlock; +import net.minecraft.block.ITileEntityProvider; import net.minecraft.client.Minecraft; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.player.PlayerEntity; @@ -42,7 +43,7 @@ import javax.annotation.Nullable; import java.util.List; import java.util.function.Supplier; -public class BlockSpecialFlower extends FlowerBlock implements IWandable, IWandHUD { +public class BlockSpecialFlower extends FlowerBlock implements ITileEntityProvider, IWandable, IWandHUD { private static final VoxelShape SHAPE = makeCuboidShape(4.8, 0, 4.8, 12.8, 16, 12.8); private final Supplier teProvider; @@ -115,14 +116,9 @@ public class BlockSpecialFlower extends FlowerBlock implements IWandable, IWandH return tileentity != null && tileentity.receiveClientEvent(event, param); } - @Override - public boolean hasTileEntity(BlockState state) { - return true; - } - @Nonnull @Override - public TileEntity createTileEntity(@Nonnull BlockState state, @Nonnull IBlockReader world) { + public TileEntity createNewTileEntity(@Nonnull IBlockReader world) { return teProvider.get(); } diff --git a/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java b/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java index 14bdd13c1..069443a11 100644 --- a/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java +++ b/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java @@ -11,6 +11,7 @@ package vazkii.botania.common.block; import net.minecraft.block.BlockRenderType; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; +import net.minecraft.block.ITileEntityProvider; import net.minecraft.entity.Entity; import net.minecraft.entity.item.ItemEntity; import net.minecraft.entity.player.PlayerEntity; @@ -29,7 +30,7 @@ import vazkii.botania.common.block.tile.TileTeruTeruBozu; import javax.annotation.Nonnull; -public class BlockTeruTeruBozu extends BlockModWaterloggable { +public class BlockTeruTeruBozu extends BlockModWaterloggable implements ITileEntityProvider { private static final VoxelShape SHAPE = makeCuboidShape(4, 0.16, 4, 12, 15.84, 12); @@ -110,14 +111,9 @@ public class BlockTeruTeruBozu extends BlockModWaterloggable { return BlockRenderType.ENTITYBLOCK_ANIMATED; } - @Override - public boolean hasTileEntity(BlockState state) { - return true; - } - @Nonnull @Override - public TileEntity createTileEntity(@Nonnull BlockState state, @Nonnull IBlockReader world) { + public TileEntity createNewTileEntity(@Nonnull IBlockReader world) { return new TileTeruTeruBozu(); } diff --git a/src/main/java/vazkii/botania/common/block/BlockTinyPlanet.java b/src/main/java/vazkii/botania/common/block/BlockTinyPlanet.java index 1c0a5b91d..b8dc3b54c 100644 --- a/src/main/java/vazkii/botania/common/block/BlockTinyPlanet.java +++ b/src/main/java/vazkii/botania/common/block/BlockTinyPlanet.java @@ -9,6 +9,7 @@ package vazkii.botania.common.block; import net.minecraft.block.BlockState; +import net.minecraft.block.ITileEntityProvider; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.shapes.ISelectionContext; @@ -21,7 +22,7 @@ import vazkii.botania.common.block.tile.TileTinyPlanet; import javax.annotation.Nonnull; -public class BlockTinyPlanet extends BlockModWaterloggable implements IManaCollisionGhost { +public class BlockTinyPlanet extends BlockModWaterloggable implements IManaCollisionGhost, ITileEntityProvider { private static final VoxelShape AABB = makeCuboidShape(3, 3, 3, 13, 13, 13); @@ -35,14 +36,9 @@ public class BlockTinyPlanet extends BlockModWaterloggable implements IManaColli return AABB; } - @Override - public boolean hasTileEntity(BlockState state) { - return true; - } - @Nonnull @Override - public TileEntity createTileEntity(@Nonnull BlockState state, @Nonnull IBlockReader world) { + public TileEntity createNewTileEntity(@Nonnull IBlockReader world) { return new TileTinyPlanet(); } diff --git a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaBase.java b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaBase.java index 59651604d..d17071e7e 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaBase.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaBase.java @@ -10,6 +10,7 @@ package vazkii.botania.common.block.corporea; import net.minecraft.block.Block; import net.minecraft.block.BlockState; +import net.minecraft.block.ITileEntityProvider; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -19,7 +20,7 @@ import vazkii.botania.common.core.helper.InventoryHelper; import javax.annotation.Nonnull; -public abstract class BlockCorporeaBase extends BlockMod { +public abstract class BlockCorporeaBase extends BlockMod implements ITileEntityProvider { public BlockCorporeaBase(Block.Properties builder) { super(builder); @@ -34,8 +35,4 @@ public abstract class BlockCorporeaBase extends BlockMod { } } - @Override - public boolean hasTileEntity(BlockState state) { - return true; - } } diff --git a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaCrystalCube.java b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaCrystalCube.java index d357fd871..b553e0ab2 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaCrystalCube.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaCrystalCube.java @@ -88,7 +88,7 @@ public class BlockCorporeaCrystalCube extends BlockCorporeaBaseWaterloggable imp @Nonnull @Override - public TileCorporeaBase createTileEntity(@Nonnull BlockState state, @Nonnull IBlockReader world) { + public TileCorporeaBase createNewTileEntity(@Nonnull IBlockReader world) { return new TileCorporeaCrystalCube(); } diff --git a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaFunnel.java b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaFunnel.java index bc0255f33..e29ab013f 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaFunnel.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaFunnel.java @@ -48,7 +48,7 @@ public class BlockCorporeaFunnel extends BlockCorporeaBase { @Nonnull @Override - public TileCorporeaBase createTileEntity(@Nonnull BlockState state, @Nonnull IBlockReader world) { + public TileCorporeaBase createNewTileEntity(@Nonnull IBlockReader world) { return new TileCorporeaFunnel(); } diff --git a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaIndex.java b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaIndex.java index c5d18d0e5..51b6de936 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaIndex.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaIndex.java @@ -31,7 +31,7 @@ public class BlockCorporeaIndex extends BlockCorporeaBaseWaterloggable { @Nonnull @Override - public TileCorporeaBase createTileEntity(@Nonnull BlockState state, @Nonnull IBlockReader world) { + public TileCorporeaBase createNewTileEntity(@Nonnull IBlockReader world) { return new TileCorporeaIndex(); } } diff --git a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaInterceptor.java b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaInterceptor.java index 755fd04fa..213235bae 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaInterceptor.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaInterceptor.java @@ -59,7 +59,7 @@ public class BlockCorporeaInterceptor extends BlockCorporeaBase { @Nonnull @Override - public TileCorporeaBase createTileEntity(@Nonnull BlockState state, @Nonnull IBlockReader world) { + public TileCorporeaBase createNewTileEntity(@Nonnull IBlockReader world) { return new TileCorporeaInterceptor(); } diff --git a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaRetainer.java b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaRetainer.java index 74009c8e3..bbf2ce73e 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaRetainer.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaRetainer.java @@ -10,6 +10,7 @@ package vazkii.botania.common.block.corporea; import net.minecraft.block.Block; import net.minecraft.block.BlockState; +import net.minecraft.block.ITileEntityProvider; import net.minecraft.state.StateContainer; import net.minecraft.state.properties.BlockStateProperties; import net.minecraft.tileentity.TileEntity; @@ -22,7 +23,7 @@ import vazkii.botania.common.block.tile.corporea.TileCorporeaRetainer; import javax.annotation.Nonnull; -public class BlockCorporeaRetainer extends BlockMod { +public class BlockCorporeaRetainer extends BlockMod implements ITileEntityProvider { public BlockCorporeaRetainer(Block.Properties builder) { super(builder); @@ -57,14 +58,9 @@ public class BlockCorporeaRetainer extends BlockMod { return ((TileCorporeaRetainer) world.getTileEntity(pos)).getComparatorValue(); } - @Override - public boolean hasTileEntity(BlockState state) { - return true; - } - @Nonnull @Override - public TileEntity createTileEntity(@Nonnull BlockState state, @Nonnull IBlockReader world) { + public TileEntity createNewTileEntity(@Nonnull IBlockReader world) { return new TileCorporeaRetainer(); } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java b/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java index 1953c172f..f6b064b63 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java @@ -10,6 +10,7 @@ package vazkii.botania.common.block.decor; import net.minecraft.block.BlockRenderType; import net.minecraft.block.BlockState; +import net.minecraft.block.ITileEntityProvider; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.DyeColor; import net.minecraft.item.ItemStack; @@ -40,7 +41,7 @@ import javax.annotation.Nonnull; import java.util.Random; -public class BlockFloatingFlower extends BlockModWaterloggable { +public class BlockFloatingFlower extends BlockModWaterloggable implements ITileEntityProvider { private static final VoxelShape SHAPE = makeCuboidShape(1.6, 1.6, 1.6, 14.4, 14.4, 14.4); public final DyeColor color; @@ -107,14 +108,9 @@ public class BlockFloatingFlower extends BlockModWaterloggable { return ActionResultType.PASS; } - @Override - public boolean hasTileEntity(BlockState state) { - return true; - } - @Nonnull @Override - public TileEntity createTileEntity(@Nonnull BlockState state, @Nonnull IBlockReader world) { + public TileEntity createNewTileEntity(@Nonnull IBlockReader world) { return new TileFloatingFlower(); } } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockManaFlame.java b/src/main/java/vazkii/botania/common/block/decor/BlockManaFlame.java index 10d49ab4d..2a85f532d 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockManaFlame.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockManaFlame.java @@ -10,6 +10,7 @@ package vazkii.botania.common.block.decor; import net.minecraft.block.BlockRenderType; import net.minecraft.block.BlockState; +import net.minecraft.block.ITileEntityProvider; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.tags.ItemTags; @@ -31,7 +32,7 @@ import vazkii.botania.common.item.ModItems; import javax.annotation.Nonnull; -public class BlockManaFlame extends BlockMod { +public class BlockManaFlame extends BlockMod implements ITileEntityProvider { private static final VoxelShape SHAPE = makeCuboidShape(4, 4, 4, 12, 12, 12); @@ -67,14 +68,9 @@ public class BlockManaFlame extends BlockMod { return ActionResultType.PASS; } - @Override - public boolean hasTileEntity(BlockState state) { - return true; - } - @Nonnull @Override - public TileEntity createTileEntity(@Nonnull BlockState state, @Nonnull IBlockReader world) { + public TileEntity createNewTileEntity(@Nonnull IBlockReader world) { return new TileManaFlame(); } } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockStarfield.java b/src/main/java/vazkii/botania/common/block/decor/BlockStarfield.java index 84f6b4794..8ab731f70 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockStarfield.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockStarfield.java @@ -9,6 +9,7 @@ package vazkii.botania.common.block.decor; import net.minecraft.block.BlockState; +import net.minecraft.block.ITileEntityProvider; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.shapes.ISelectionContext; @@ -20,7 +21,7 @@ import vazkii.botania.common.block.tile.TileStarfield; import javax.annotation.Nonnull; -public class BlockStarfield extends BlockModWaterloggable { +public class BlockStarfield extends BlockModWaterloggable implements ITileEntityProvider { private static final VoxelShape SHAPE = makeCuboidShape(0, 0, 0, 16, 4, 16); @@ -34,14 +35,9 @@ public class BlockStarfield extends BlockModWaterloggable { return SHAPE; } - @Override - public boolean hasTileEntity(BlockState state) { - return true; - } - @Nonnull @Override - public TileEntity createTileEntity(@Nonnull BlockState state, @Nonnull IBlockReader world) { + public TileEntity createNewTileEntity(@Nonnull IBlockReader world) { return new TileStarfield(); } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockTinyPotato.java b/src/main/java/vazkii/botania/common/block/decor/BlockTinyPotato.java index 7db4c37a7..1603d1475 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockTinyPotato.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockTinyPotato.java @@ -11,6 +11,7 @@ package vazkii.botania.common.block.decor; import net.minecraft.block.Block; import net.minecraft.block.BlockRenderType; import net.minecraft.block.BlockState; +import net.minecraft.block.ITileEntityProvider; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.BlockItemUseContext; @@ -39,7 +40,7 @@ import vazkii.botania.common.core.helper.InventoryHelper; import javax.annotation.Nonnull; import javax.annotation.Nullable; -public class BlockTinyPotato extends BlockModWaterloggable { +public class BlockTinyPotato extends BlockModWaterloggable implements ITileEntityProvider { private static final VoxelShape SHAPE = makeCuboidShape(6, 0, 6, 10, 6, 10); @@ -102,14 +103,9 @@ public class BlockTinyPotato extends BlockModWaterloggable { return BlockRenderType.ENTITYBLOCK_ANIMATED; } - @Override - public boolean hasTileEntity(BlockState state) { - return true; - } - @Nonnull @Override - public TileEntity createTileEntity(@Nonnull BlockState state, @Nonnull IBlockReader world) { + public TileEntity createNewTileEntity(@Nonnull IBlockReader world) { return new TileTinyPotato(); } } diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockBellows.java b/src/main/java/vazkii/botania/common/block/mana/BlockBellows.java index a85db87cf..c5b376a0c 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockBellows.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockBellows.java @@ -11,6 +11,7 @@ package vazkii.botania.common.block.mana; import net.minecraft.block.Block; import net.minecraft.block.BlockRenderType; import net.minecraft.block.BlockState; +import net.minecraft.block.ITileEntityProvider; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.BlockItemUseContext; import net.minecraft.state.StateContainer; @@ -32,7 +33,7 @@ import vazkii.botania.common.entity.EntityDoppleganger; import javax.annotation.Nonnull; -public class BlockBellows extends BlockMod { +public class BlockBellows extends BlockMod implements ITileEntityProvider { private static final VoxelShape SHAPE = makeCuboidShape(3, 0, 3, 13, 10.0, 13); @@ -73,14 +74,9 @@ public class BlockBellows extends BlockMod { return BlockRenderType.ENTITYBLOCK_ANIMATED; } - @Override - public boolean hasTileEntity(BlockState state) { - return true; - } - @Nonnull @Override - public TileEntity createTileEntity(@Nonnull BlockState state, @Nonnull IBlockReader world) { + public TileEntity createNewTileEntity(@Nonnull IBlockReader world) { return new TileBellows(); } diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockBrewery.java b/src/main/java/vazkii/botania/common/block/mana/BlockBrewery.java index b4865214e..af2849109 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockBrewery.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockBrewery.java @@ -11,6 +11,7 @@ package vazkii.botania.common.block.mana; import net.minecraft.block.Block; import net.minecraft.block.BlockRenderType; import net.minecraft.block.BlockState; +import net.minecraft.block.ITileEntityProvider; import net.minecraft.client.Minecraft; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; @@ -36,7 +37,7 @@ import vazkii.botania.common.core.helper.InventoryHelper; import javax.annotation.Nonnull; -public class BlockBrewery extends BlockModWaterloggable implements IWandHUD { +public class BlockBrewery extends BlockModWaterloggable implements ITileEntityProvider, IWandHUD { private static final VoxelShape SHAPE = makeCuboidShape(6, 0.8, 6, 10, 15.2, 10); @@ -101,14 +102,9 @@ public class BlockBrewery extends BlockModWaterloggable implements IWandHUD { return BlockRenderType.ENTITYBLOCK_ANIMATED; } - @Override - public boolean hasTileEntity(BlockState state) { - return true; - } - @Nonnull @Override - public TileEntity createTileEntity(@Nonnull BlockState state, @Nonnull IBlockReader world) { + public TileEntity createNewTileEntity(@Nonnull IBlockReader world) { return new TileBrewery(); } diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockDistributor.java b/src/main/java/vazkii/botania/common/block/mana/BlockDistributor.java index 74e87e1d3..adc263ffd 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockDistributor.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockDistributor.java @@ -10,6 +10,7 @@ package vazkii.botania.common.block.mana; import net.minecraft.block.Block; import net.minecraft.block.BlockState; +import net.minecraft.block.ITileEntityProvider; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.shapes.ISelectionContext; @@ -21,7 +22,7 @@ import vazkii.botania.common.block.tile.mana.TileDistributor; import javax.annotation.Nonnull; -public class BlockDistributor extends BlockModWaterloggable { +public class BlockDistributor extends BlockModWaterloggable implements ITileEntityProvider { private static final VoxelShape SHAPE = Block.makeCuboidShape(4, 0, 4, 12, 16, 12); @@ -35,14 +36,9 @@ public class BlockDistributor extends BlockModWaterloggable { return SHAPE; } - @Override - public boolean hasTileEntity(BlockState state) { - return true; - } - @Nonnull @Override - public TileEntity createTileEntity(@Nonnull BlockState state, @Nonnull IBlockReader world) { + public TileEntity createNewTileEntity(@Nonnull IBlockReader world) { return new TileDistributor(); } diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java b/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java index 91309afad..0ac62f522 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java @@ -10,6 +10,7 @@ package vazkii.botania.common.block.mana; import net.minecraft.block.Block; import net.minecraft.block.BlockState; +import net.minecraft.block.ITileEntityProvider; import net.minecraft.client.Minecraft; import net.minecraft.entity.item.ItemEntity; import net.minecraft.entity.player.PlayerEntity; @@ -37,7 +38,7 @@ import vazkii.botania.common.item.ModItems; import javax.annotation.Nonnull; -public class BlockEnchanter extends BlockMod implements IWandable, IWandHUD { +public class BlockEnchanter extends BlockMod implements ITileEntityProvider, IWandable, IWandHUD { public BlockEnchanter(Properties builder) { super(builder); @@ -49,14 +50,9 @@ public class BlockEnchanter extends BlockMod implements IWandable, IWandHUD { builder.add(BotaniaStateProps.ENCHANTER_DIRECTION); } - @Override - public boolean hasTileEntity(BlockState state) { - return true; - } - @Nonnull @Override - public TileEntity createTileEntity(@Nonnull BlockState state, @Nonnull IBlockReader world) { + public TileEntity createNewTileEntity(@Nonnull IBlockReader world) { return new TileEnchanter(); } diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockManaDetector.java b/src/main/java/vazkii/botania/common/block/mana/BlockManaDetector.java index 492cbfd13..eaa99ad15 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockManaDetector.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockManaDetector.java @@ -10,6 +10,7 @@ package vazkii.botania.common.block.mana; import net.minecraft.block.Block; import net.minecraft.block.BlockState; +import net.minecraft.block.ITileEntityProvider; import net.minecraft.state.StateContainer; import net.minecraft.state.properties.BlockStateProperties; import net.minecraft.tileentity.TileEntity; @@ -28,7 +29,7 @@ import vazkii.botania.common.block.tile.mana.TileManaDetector; import javax.annotation.Nonnull; -public class BlockManaDetector extends BlockMod implements IManaCollisionGhost { +public class BlockManaDetector extends BlockMod implements IManaCollisionGhost, ITileEntityProvider { public BlockManaDetector(Properties builder) { super(builder); @@ -61,14 +62,9 @@ public class BlockManaDetector extends BlockMod implements IManaCollisionGhost { } } - @Override - public boolean hasTileEntity(BlockState state) { - return true; - } - @Nonnull @Override - public TileEntity createTileEntity(@Nonnull BlockState state, @Nonnull IBlockReader world) { + public TileEntity createNewTileEntity(@Nonnull IBlockReader world) { return new TileManaDetector(); } diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockManaVoid.java b/src/main/java/vazkii/botania/common/block/mana/BlockManaVoid.java index 09bb83690..52f01e9df 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockManaVoid.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockManaVoid.java @@ -9,6 +9,7 @@ package vazkii.botania.common.block.mana; import net.minecraft.block.BlockState; +import net.minecraft.block.ITileEntityProvider; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; @@ -24,20 +25,15 @@ import vazkii.botania.common.block.tile.mana.TileManaVoid; import javax.annotation.Nonnull; -public class BlockManaVoid extends BlockMod implements IPoolOverlayProvider { +public class BlockManaVoid extends BlockMod implements IPoolOverlayProvider, ITileEntityProvider { public BlockManaVoid(Properties builder) { super(builder); } - @Override - public boolean hasTileEntity(BlockState state) { - return true; - } - @Nonnull @Override - public TileEntity createTileEntity(@Nonnull BlockState state, @Nonnull IBlockReader world) { + public TileEntity createNewTileEntity(@Nonnull IBlockReader world) { return new TileManaVoid(); } diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockPool.java b/src/main/java/vazkii/botania/common/block/mana/BlockPool.java index 10fffd09d..1c7edc91b 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPool.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPool.java @@ -10,6 +10,7 @@ package vazkii.botania.common.block.mana; import net.minecraft.block.BlockRenderType; import net.minecraft.block.BlockState; +import net.minecraft.block.ITileEntityProvider; import net.minecraft.client.Minecraft; import net.minecraft.entity.Entity; import net.minecraft.entity.item.ItemEntity; @@ -39,7 +40,7 @@ import javax.annotation.Nonnull; import java.util.Collections; import java.util.List; -public class BlockPool extends BlockModWaterloggable implements IWandHUD, IWandable { +public class BlockPool extends BlockModWaterloggable implements ITileEntityProvider, IWandHUD, IWandable { private static final VoxelShape SLAB = makeCuboidShape(0, 0, 0, 16, 8, 16); private static final VoxelShape CUTOUT = makeCuboidShape(1, 1, 1, 15, 8, 15); private static final VoxelShape REAL_SHAPE = VoxelShapes.combineAndSimplify(SLAB, CUTOUT, IBooleanFunction.ONLY_FIRST); @@ -74,14 +75,9 @@ public class BlockPool extends BlockModWaterloggable implements IWandHUD, IWanda } } - @Override - public boolean hasTileEntity(BlockState state) { - return true; - } - @Nonnull @Override - public TileEntity createTileEntity(@Nonnull BlockState state, @Nonnull IBlockReader world) { + public TileEntity createNewTileEntity(@Nonnull IBlockReader world) { return new TilePool(); } diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java b/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java index e49afe916..b4becfeae 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java @@ -10,6 +10,7 @@ package vazkii.botania.common.block.mana; import net.minecraft.block.Block; import net.minecraft.block.BlockState; +import net.minecraft.block.ITileEntityProvider; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.state.StateContainer; @@ -37,7 +38,7 @@ import vazkii.botania.common.core.helper.InventoryHelper; import javax.annotation.Nonnull; -public class BlockPrism extends BlockModWaterloggable implements IManaTrigger, IManaCollisionGhost { +public class BlockPrism extends BlockModWaterloggable implements ITileEntityProvider, IManaTrigger, IManaCollisionGhost { private static final VoxelShape SHAPE = makeCuboidShape(4, 0, 4, 12, 16, 12); public BlockPrism(Properties builder) { @@ -108,14 +109,9 @@ public class BlockPrism extends BlockModWaterloggable implements IManaTrigger, I } } - @Override - public boolean hasTileEntity(BlockState state) { - return true; - } - @Nonnull @Override - public TileEntity createTileEntity(@Nonnull BlockState state, @Nonnull IBlockReader world) { + public TileEntity createNewTileEntity(@Nonnull IBlockReader world) { return new TilePrism(); } diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockPump.java b/src/main/java/vazkii/botania/common/block/mana/BlockPump.java index 18d6a2c96..da6906ed0 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPump.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPump.java @@ -10,6 +10,7 @@ package vazkii.botania.common.block.mana; import net.minecraft.block.Block; import net.minecraft.block.BlockState; +import net.minecraft.block.ITileEntityProvider; import net.minecraft.item.BlockItemUseContext; import net.minecraft.state.StateContainer; import net.minecraft.state.properties.BlockStateProperties; @@ -26,7 +27,7 @@ import vazkii.botania.common.block.tile.mana.TilePump; import javax.annotation.Nonnull; -public class BlockPump extends BlockModWaterloggable { +public class BlockPump extends BlockModWaterloggable implements ITileEntityProvider { private static final VoxelShape X_SHAPE = makeCuboidShape(0, 0, 4, 16, 8, 12); private static final VoxelShape Z_SHAPE = makeCuboidShape(4, 0, 0, 12, 8, 16); @@ -68,14 +69,9 @@ public class BlockPump extends BlockModWaterloggable { return ((TilePump) world.getTileEntity(pos)).comparator; } - @Override - public boolean hasTileEntity(BlockState state) { - return true; - } - @Nonnull @Override - public TileEntity createTileEntity(@Nonnull BlockState state, @Nonnull IBlockReader world) { + public TileEntity createNewTileEntity(@Nonnull IBlockReader world) { return new TilePump(); } } diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockRFGenerator.java b/src/main/java/vazkii/botania/common/block/mana/BlockRFGenerator.java index f1dd93c58..b4a3122b7 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockRFGenerator.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockRFGenerator.java @@ -9,6 +9,7 @@ package vazkii.botania.common.block.mana; import net.minecraft.block.BlockState; +import net.minecraft.block.ITileEntityProvider; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.IBlockReader; @@ -17,20 +18,15 @@ import vazkii.botania.common.block.tile.mana.TileRFGenerator; import javax.annotation.Nonnull; -public class BlockRFGenerator extends BlockMod { +public class BlockRFGenerator extends BlockMod implements ITileEntityProvider { public BlockRFGenerator(Properties builder) { super(builder); } - @Override - public boolean hasTileEntity(BlockState state) { - return true; - } - @Nonnull @Override - public TileEntity createTileEntity(@Nonnull BlockState state, @Nonnull IBlockReader world) { + public TileEntity createNewTileEntity(@Nonnull IBlockReader world) { return new TileRFGenerator(); } diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java b/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java index 7e54d2c55..b4bb3ddfa 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java @@ -10,6 +10,7 @@ package vazkii.botania.common.block.mana; import net.minecraft.block.Block; import net.minecraft.block.BlockState; +import net.minecraft.block.ITileEntityProvider; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -34,7 +35,7 @@ import vazkii.botania.common.core.helper.InventoryHelper; import javax.annotation.Nonnull; -public class BlockRuneAltar extends BlockModWaterloggable implements IWandable { +public class BlockRuneAltar extends BlockModWaterloggable implements ITileEntityProvider, IWandable { private static final VoxelShape TOP = Block.makeCuboidShape(0, 6, 0, 16, 12, 16); private static final VoxelShape BOTTOM = Block.makeCuboidShape(2, 0, 2, 14, 6, 14); @@ -87,14 +88,9 @@ public class BlockRuneAltar extends BlockModWaterloggable implements IWandable { } } - @Override - public boolean hasTileEntity(BlockState state) { - return true; - } - @Nonnull @Override - public TileEntity createTileEntity(@Nonnull BlockState state, @Nonnull IBlockReader world) { + public TileEntity createNewTileEntity(@Nonnull IBlockReader world) { return new TileRuneAltar(); } diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockSpawnerClaw.java b/src/main/java/vazkii/botania/common/block/mana/BlockSpawnerClaw.java index 78c42452c..d42308924 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockSpawnerClaw.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockSpawnerClaw.java @@ -10,6 +10,7 @@ package vazkii.botania.common.block.mana; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; +import net.minecraft.block.ITileEntityProvider; import net.minecraft.item.ItemGroup; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -24,7 +25,7 @@ import vazkii.botania.common.block.tile.TileSpawnerClaw; import javax.annotation.Nonnull; -public class BlockSpawnerClaw extends BlockModWaterloggable { +public class BlockSpawnerClaw extends BlockModWaterloggable implements ITileEntityProvider { private static final VoxelShape SHAPE = makeCuboidShape(2, 0, 2, 14, 2, 14); @@ -44,14 +45,9 @@ public class BlockSpawnerClaw extends BlockModWaterloggable { list.add(new ItemStack(Blocks.SPAWNER)); } - @Override - public boolean hasTileEntity(BlockState state) { - return true; - } - @Nonnull @Override - public TileEntity createTileEntity(@Nonnull BlockState state, IBlockReader world) { + public TileEntity createNewTileEntity(IBlockReader world) { return new TileSpawnerClaw(); } diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java b/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java index 96b1753e2..79036b595 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java @@ -13,6 +13,7 @@ import com.google.common.collect.ImmutableList; import net.minecraft.block.Block; import net.minecraft.block.BlockRenderType; import net.minecraft.block.BlockState; +import net.minecraft.block.ITileEntityProvider; import net.minecraft.client.Minecraft; import net.minecraft.entity.EntityType; import net.minecraft.entity.LivingEntity; @@ -48,7 +49,7 @@ import javax.annotation.Nullable; import java.util.List; -public class BlockSpreader extends BlockModWaterloggable implements IWandable, IWandHUD, IWireframeAABBProvider { +public class BlockSpreader extends BlockModWaterloggable implements ITileEntityProvider, IWandable, IWandHUD, IWireframeAABBProvider { private static final VoxelShape RENDER_SHAPE = makeCuboidShape(1, 1, 1, 15, 15, 15); public enum Variant { @@ -200,14 +201,9 @@ public class BlockSpreader extends BlockModWaterloggable implements IWandable, I return true; } - @Override - public boolean hasTileEntity(BlockState state) { - return true; - } - @Nonnull @Override - public TileEntity createTileEntity(@Nonnull BlockState state, @Nonnull IBlockReader world) { + public TileEntity createNewTileEntity(@Nonnull IBlockReader world) { return new TileSpreader(); } diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockTerraPlate.java b/src/main/java/vazkii/botania/common/block/mana/BlockTerraPlate.java index 88462d337..d202d3bee 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockTerraPlate.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockTerraPlate.java @@ -9,6 +9,7 @@ package vazkii.botania.common.block.mana; import net.minecraft.block.BlockState; +import net.minecraft.block.ITileEntityProvider; import net.minecraft.entity.item.ItemEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; @@ -30,7 +31,7 @@ import vazkii.botania.common.item.ModItems; import javax.annotation.Nonnull; -public class BlockTerraPlate extends BlockModWaterloggable { +public class BlockTerraPlate extends BlockModWaterloggable implements ITileEntityProvider { private static final VoxelShape SHAPE = makeCuboidShape(0, 0, 0, 16, 3, 16); @@ -68,14 +69,9 @@ public class BlockTerraPlate extends BlockModWaterloggable { return false; } - @Override - public boolean hasTileEntity(BlockState state) { - return true; - } - @Nonnull @Override - public TileEntity createTileEntity(@Nonnull BlockState state, @Nonnull IBlockReader world) { + public TileEntity createNewTileEntity(@Nonnull IBlockReader world) { return new TileTerraPlate(); } diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockTurntable.java b/src/main/java/vazkii/botania/common/block/mana/BlockTurntable.java index d30b1395b..b38a31f71 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockTurntable.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockTurntable.java @@ -9,6 +9,7 @@ package vazkii.botania.common.block.mana; import net.minecraft.block.BlockState; +import net.minecraft.block.ITileEntityProvider; import net.minecraft.client.Minecraft; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; @@ -27,20 +28,15 @@ import vazkii.botania.common.block.tile.mana.TileTurntable; import javax.annotation.Nonnull; -public class BlockTurntable extends BlockMod implements IWandable, IWandHUD { +public class BlockTurntable extends BlockMod implements ITileEntityProvider, IWandable, IWandHUD { public BlockTurntable(Properties builder) { super(builder); } - @Override - public boolean hasTileEntity(BlockState state) { - return true; - } - @Nonnull @Override - public TileEntity createTileEntity(@Nonnull BlockState state, @Nonnull IBlockReader world) { + public TileEntity createNewTileEntity(@Nonnull IBlockReader world) { return new TileTurntable(); } diff --git a/src/main/java/vazkii/botania/common/block/string/BlockRedString.java b/src/main/java/vazkii/botania/common/block/string/BlockRedString.java index 44852d609..7b3262076 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedString.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedString.java @@ -10,13 +10,14 @@ package vazkii.botania.common.block.string; import net.minecraft.block.Block; import net.minecraft.block.BlockState; +import net.minecraft.block.ITileEntityProvider; import net.minecraft.item.BlockItemUseContext; import net.minecraft.state.StateContainer; import net.minecraft.state.properties.BlockStateProperties; import vazkii.botania.common.block.BlockMod; -public abstract class BlockRedString extends BlockMod { +public abstract class BlockRedString extends BlockMod implements ITileEntityProvider { public BlockRedString(Block.Properties builder) { super(builder); @@ -32,8 +33,4 @@ public abstract class BlockRedString extends BlockMod { return getDefaultState().with(BlockStateProperties.FACING, context.getNearestLookingDirection().getOpposite()); } - @Override - public boolean hasTileEntity(BlockState state) { - return true; - } } diff --git a/src/main/java/vazkii/botania/common/block/string/BlockRedStringComparator.java b/src/main/java/vazkii/botania/common/block/string/BlockRedStringComparator.java index ea109878a..636a7ed6e 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedStringComparator.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedStringComparator.java @@ -40,7 +40,7 @@ public class BlockRedStringComparator extends BlockRedString { @Nonnull @Override - public TileRedString createTileEntity(@Nonnull BlockState state, @Nonnull IBlockReader world) { + public TileRedString createNewTileEntity(@Nonnull IBlockReader world) { return new TileRedStringComparator(); } diff --git a/src/main/java/vazkii/botania/common/block/string/BlockRedStringContainer.java b/src/main/java/vazkii/botania/common/block/string/BlockRedStringContainer.java index 7bf2cc9ad..946915443 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedStringContainer.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedStringContainer.java @@ -28,7 +28,7 @@ public class BlockRedStringContainer extends BlockRedString { @Nonnull @Override - public TileRedString createTileEntity(@Nonnull BlockState state, @Nonnull IBlockReader world) { + public TileRedString createNewTileEntity(@Nonnull IBlockReader world) { return new TileRedStringContainer(); } diff --git a/src/main/java/vazkii/botania/common/block/string/BlockRedStringDispenser.java b/src/main/java/vazkii/botania/common/block/string/BlockRedStringDispenser.java index 7c6fb65a7..ca4b2a5b5 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedStringDispenser.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedStringDispenser.java @@ -50,7 +50,7 @@ public class BlockRedStringDispenser extends BlockRedString { @Nonnull @Override - public TileRedString createTileEntity(@Nonnull BlockState meta, IBlockReader world) { + public TileRedString createNewTileEntity(@Nonnull IBlockReader world) { return new TileRedStringDispenser(); } } diff --git a/src/main/java/vazkii/botania/common/block/string/BlockRedStringFertilizer.java b/src/main/java/vazkii/botania/common/block/string/BlockRedStringFertilizer.java index a79096106..2a5d32ff1 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedStringFertilizer.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedStringFertilizer.java @@ -49,7 +49,7 @@ public class BlockRedStringFertilizer extends BlockRedString implements IGrowabl @Nonnull @Override - public TileRedString createTileEntity(@Nonnull BlockState meta, @Nonnull IBlockReader world) { + public TileRedString createNewTileEntity(@Nonnull IBlockReader world) { return new TileRedStringFertilizer(); } } diff --git a/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java b/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java index 3b89ea575..24e02d41b 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java @@ -65,7 +65,7 @@ public class BlockRedStringInterceptor extends BlockRedString { @Nonnull @Override - public TileRedString createTileEntity(@Nonnull BlockState state, @Nonnull IBlockReader world) { + public TileRedString createNewTileEntity(@Nonnull IBlockReader world) { return new TileRedStringInterceptor(); } } diff --git a/src/main/java/vazkii/botania/common/block/string/BlockRedStringRelay.java b/src/main/java/vazkii/botania/common/block/string/BlockRedStringRelay.java index 7599bb7e0..987456cb3 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedStringRelay.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedStringRelay.java @@ -28,7 +28,7 @@ public class BlockRedStringRelay extends BlockRedString { @Nonnull @Override - public TileRedString createTileEntity(@Nonnull BlockState state, @Nonnull IBlockReader world) { + public TileRedString createNewTileEntity(@Nonnull IBlockReader world) { return new TileRedStringRelay(); }