From 3c5f5884312e16373d7bd098a4fcdbdffdd092eb Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 4 Mar 2016 11:01:55 -0600 Subject: [PATCH] Get rid of BlockContainer --- .../botania/common/block/BlockAlfPortal.java | 9 ++- .../botania/common/block/BlockAltar.java | 9 ++- .../botania/common/block/BlockAvatar.java | 9 ++- .../botania/common/block/BlockBifrost.java | 9 ++- .../common/block/BlockCacophonium.java | 9 ++- .../botania/common/block/BlockCamo.java | 7 ++- .../botania/common/block/BlockCell.java | 9 ++- .../botania/common/block/BlockCocoon.java | 9 ++- .../botania/common/block/BlockEnderEye.java | 9 ++- .../botania/common/block/BlockFakeAir.java | 9 ++- .../block/BlockFloatingSpecialFlower.java | 2 +- .../botania/common/block/BlockForestEye.java | 10 ++- .../botania/common/block/BlockHourglass.java | 9 ++- .../common/block/BlockIncensePlate.java | 9 ++- .../botania/common/block/BlockLightRelay.java | 9 ++- .../vazkii/botania/common/block/BlockMod.java | 2 +- .../common/block/BlockModContainer.java | 61 ------------------- .../botania/common/block/BlockOpenCrate.java | 11 +++- .../botania/common/block/BlockPlatform.java | 3 +- .../botania/common/block/BlockPylon.java | 9 ++- .../common/block/BlockSparkChanger.java | 9 ++- .../common/block/BlockSpecialFlower.java | 9 ++- .../common/block/BlockTeruTeruBozu.java | 9 ++- .../botania/common/block/BlockTinyPlanet.java | 10 ++- .../block/corporea/BlockCorporeaBase.java | 10 ++- .../corporea/BlockCorporeaCrystalCube.java | 2 +- .../block/corporea/BlockCorporeaFunnel.java | 2 +- .../block/corporea/BlockCorporeaIndex.java | 2 +- .../corporea/BlockCorporeaInterceptor.java | 2 +- .../block/corporea/BlockCorporeaRetainer.java | 11 +++- .../block/decor/BlockFloatingFlower.java | 11 +++- .../common/block/decor/BlockManaBeacon.java | 11 +++- .../common/block/decor/BlockManaFlame.java | 11 +++- .../common/block/decor/BlockStarfield.java | 11 +++- .../common/block/decor/BlockTinyPotato.java | 11 +++- .../common/block/mana/BlockBellows.java | 11 +++- .../common/block/mana/BlockBrewery.java | 11 +++- .../common/block/mana/BlockDistributor.java | 12 +++- .../common/block/mana/BlockEnchanter.java | 11 +++- .../common/block/mana/BlockManaDetector.java | 11 +++- .../common/block/mana/BlockManaVoid.java | 12 +++- .../botania/common/block/mana/BlockPool.java | 11 +++- .../botania/common/block/mana/BlockPrism.java | 11 +++- .../botania/common/block/mana/BlockPump.java | 12 +++- .../common/block/mana/BlockRFGenerator.java | 12 +++- .../common/block/mana/BlockRuneAltar.java | 11 +++- .../common/block/mana/BlockSpawnerClaw.java | 12 +++- .../common/block/mana/BlockSpreader.java | 11 +++- .../common/block/mana/BlockTerraPlate.java | 11 +++- .../common/block/mana/BlockTurntable.java | 12 +++- .../common/block/string/BlockRedString.java | 9 ++- .../string/BlockRedStringComparator.java | 3 +- .../block/string/BlockRedStringContainer.java | 3 +- .../block/string/BlockRedStringDispenser.java | 2 +- .../string/BlockRedStringFertilizer.java | 2 +- .../string/BlockRedStringInterceptor.java | 2 +- .../block/string/BlockRedStringRelay.java | 3 +- 57 files changed, 347 insertions(+), 182 deletions(-) delete mode 100644 src/main/java/vazkii/botania/common/block/BlockModContainer.java diff --git a/src/main/java/vazkii/botania/common/block/BlockAlfPortal.java b/src/main/java/vazkii/botania/common/block/BlockAlfPortal.java index 47d93e231..6d0351e57 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAlfPortal.java +++ b/src/main/java/vazkii/botania/common/block/BlockAlfPortal.java @@ -30,7 +30,7 @@ import vazkii.botania.common.block.tile.TileAlfPortal; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -public class BlockAlfPortal extends BlockModContainer implements IWandable, ILexiconable { +public class BlockAlfPortal extends BlockMod implements IWandable, ILexiconable { public BlockAlfPortal() { super(Material.wood); @@ -59,7 +59,12 @@ public class BlockAlfPortal extends BlockModContainer implements IWandable, ILex } @Override - public TileEntity createNewTileEntity(World world, int meta) { + public boolean hasTileEntity(IBlockState state) { + return true; + } + + @Override + public TileEntity createTileEntity(World world, IBlockState state) { 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 cd8f81078..1c6e721e1 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAltar.java +++ b/src/main/java/vazkii/botania/common/block/BlockAltar.java @@ -51,7 +51,7 @@ import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; import net.minecraftforge.fml.common.registry.GameRegistry; -public class BlockAltar extends BlockModContainer implements ILexiconable { +public class BlockAltar extends BlockMod implements ILexiconable { Random random; @@ -259,7 +259,12 @@ public class BlockAltar extends BlockModContainer implements ILexiconable { } @Override - public TileEntity createNewTileEntity(World world, int meta) { + public boolean hasTileEntity(IBlockState state) { + return true; + } + + @Override + public TileEntity createTileEntity(World world, IBlockState state) { return new TileAltar(); } diff --git a/src/main/java/vazkii/botania/common/block/BlockAvatar.java b/src/main/java/vazkii/botania/common/block/BlockAvatar.java index 5d5c29382..f67905abe 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAvatar.java +++ b/src/main/java/vazkii/botania/common/block/BlockAvatar.java @@ -34,7 +34,7 @@ import vazkii.botania.common.block.tile.TileSimpleInventory; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -public class BlockAvatar extends BlockModContainer implements ILexiconable { +public class BlockAvatar extends BlockMod implements ILexiconable { Random random; @@ -163,7 +163,12 @@ public class BlockAvatar extends BlockModContainer implements ILexiconable { } @Override - public TileEntity createNewTileEntity(World world, int meta) { + public boolean hasTileEntity(IBlockState state) { + return true; + } + + @Override + public TileEntity createTileEntity(World world, IBlockState state) { 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 a6407eef0..47ddb5a14 100644 --- a/src/main/java/vazkii/botania/common/block/BlockBifrost.java +++ b/src/main/java/vazkii/botania/common/block/BlockBifrost.java @@ -32,7 +32,7 @@ import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -public class BlockBifrost extends BlockModContainer implements ILexiconable { +public class BlockBifrost extends BlockMod implements ILexiconable { public BlockBifrost() { super(Material.glass); @@ -81,7 +81,12 @@ public class BlockBifrost extends BlockModContainer implements ILexiconable { } @Override - public TileEntity createNewTileEntity(World world, int meta) { + public boolean hasTileEntity(IBlockState state) { + return true; + } + + @Override + public TileEntity createTileEntity(World world, IBlockState state) { 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 2368ce3e5..be121710a 100644 --- a/src/main/java/vazkii/botania/common/block/BlockCacophonium.java +++ b/src/main/java/vazkii/botania/common/block/BlockCacophonium.java @@ -28,7 +28,7 @@ import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.block.tile.TileCacophonium; import vazkii.botania.common.lib.LibBlockNames; -public class BlockCacophonium extends BlockModContainer { +public class BlockCacophonium extends BlockMod { protected BlockCacophonium() { super(Material.wood); @@ -98,7 +98,12 @@ public class BlockCacophonium extends BlockModContainer { } @Override - public TileEntity createNewTileEntity(World world, int meta) { + public boolean hasTileEntity(IBlockState state) { + return true; + } + + @Override + public TileEntity createTileEntity(World world, IBlockState state) { return new TileCacophonium(); } diff --git a/src/main/java/vazkii/botania/common/block/BlockCamo.java b/src/main/java/vazkii/botania/common/block/BlockCamo.java index 2b299f91f..5f27a7281 100644 --- a/src/main/java/vazkii/botania/common/block/BlockCamo.java +++ b/src/main/java/vazkii/botania/common/block/BlockCamo.java @@ -26,7 +26,7 @@ import vazkii.botania.common.block.tile.TileCamo; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -public abstract class BlockCamo extends BlockModContainer { +public abstract class BlockCamo extends BlockMod { protected BlockCamo(Material par2Material) { super(par2Material); @@ -102,4 +102,9 @@ public abstract class BlockCamo extends BlockModContainer { return 0xFFFFFF; } + @Override + public boolean hasTileEntity(IBlockState state) { + return true; + } + } \ No newline at end of file diff --git a/src/main/java/vazkii/botania/common/block/BlockCell.java b/src/main/java/vazkii/botania/common/block/BlockCell.java index 93332ca10..6ec393dac 100644 --- a/src/main/java/vazkii/botania/common/block/BlockCell.java +++ b/src/main/java/vazkii/botania/common/block/BlockCell.java @@ -27,7 +27,7 @@ import vazkii.botania.common.block.tile.TileCell; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -public class BlockCell extends BlockModContainer implements ILexiconable { +public class BlockCell extends BlockMod implements ILexiconable { public BlockCell() { super(Material.gourd); @@ -41,7 +41,12 @@ public class BlockCell extends BlockModContainer implements ILexiconable { } @Override - public TileEntity createNewTileEntity(World world, int meta) { + public boolean hasTileEntity(IBlockState state) { + return true; + } + + @Override + public TileEntity createTileEntity(World world, IBlockState state) { 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 734acc728..8775d9bbe 100644 --- a/src/main/java/vazkii/botania/common/block/BlockCocoon.java +++ b/src/main/java/vazkii/botania/common/block/BlockCocoon.java @@ -29,7 +29,7 @@ import vazkii.botania.common.block.tile.TileCocoon; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -public class BlockCocoon extends BlockModContainer implements ILexiconable { +public class BlockCocoon extends BlockMod implements ILexiconable { protected BlockCocoon() { super(Material.cloth); @@ -81,7 +81,12 @@ public class BlockCocoon extends BlockModContainer implements ILexiconable { } @Override - public TileEntity createNewTileEntity(World world, int meta) { + public boolean hasTileEntity(IBlockState state) { + return true; + } + + @Override + public TileEntity createTileEntity(World world, IBlockState state) { return new TileCocoon(); } diff --git a/src/main/java/vazkii/botania/common/block/BlockEnderEye.java b/src/main/java/vazkii/botania/common/block/BlockEnderEye.java index bcb903910..3bf8521de 100644 --- a/src/main/java/vazkii/botania/common/block/BlockEnderEye.java +++ b/src/main/java/vazkii/botania/common/block/BlockEnderEye.java @@ -27,7 +27,7 @@ import vazkii.botania.common.block.tile.TileEnderEye; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -public class BlockEnderEye extends BlockModContainer implements ILexiconable { +public class BlockEnderEye extends BlockMod implements ILexiconable { protected BlockEnderEye() { super(Material.iron); @@ -64,7 +64,12 @@ public class BlockEnderEye extends BlockModContainer implements ILexiconable { } @Override - public TileEntity createNewTileEntity(World world, int meta) { + public boolean hasTileEntity(IBlockState state) { + return true; + } + + @Override + public TileEntity createTileEntity(World world, IBlockState state) { 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 ec5d1f5af..072f3aade 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFakeAir.java +++ b/src/main/java/vazkii/botania/common/block/BlockFakeAir.java @@ -30,7 +30,7 @@ import net.minecraftforge.fml.common.registry.GameRegistry; import vazkii.botania.common.block.tile.TileFakeAir; import vazkii.botania.common.lib.LibBlockNames; -public class BlockFakeAir extends BlockModContainer { +public class BlockFakeAir extends BlockMod { public BlockFakeAir() { super(Material.air); @@ -127,7 +127,12 @@ public class BlockFakeAir extends BlockModContainer { } @Override - public TileEntity createNewTileEntity(World world, int meta) { + public boolean hasTileEntity(IBlockState state) { + return true; + } + + @Override + public TileEntity createTileEntity(World world, IBlockState state) { 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 2e64b29cc..a606cdc85 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java @@ -197,7 +197,7 @@ public class BlockFloatingSpecialFlower extends BlockFloatingFlower implements I } @Override - public TileEntity createNewTileEntity(World world, int meta) { + public TileEntity createTileEntity(World world, IBlockState state) { return new TileFloatingSpecialFlower(); } diff --git a/src/main/java/vazkii/botania/common/block/BlockForestEye.java b/src/main/java/vazkii/botania/common/block/BlockForestEye.java index 6cdce7f1b..f37321ff7 100644 --- a/src/main/java/vazkii/botania/common/block/BlockForestEye.java +++ b/src/main/java/vazkii/botania/common/block/BlockForestEye.java @@ -11,6 +11,7 @@ package vazkii.botania.common.block; import net.minecraft.block.material.Material; +import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -22,7 +23,7 @@ import vazkii.botania.common.block.tile.TileForestEye; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -public class BlockForestEye extends BlockModContainer implements ILexiconable { +public class BlockForestEye extends BlockMod implements ILexiconable { public BlockForestEye() { super(Material.iron); @@ -55,7 +56,12 @@ public class BlockForestEye extends BlockModContainer implements ILexiconable { } @Override - public TileEntity createNewTileEntity(World world, int meta) { + public boolean hasTileEntity(IBlockState state) { + return true; + } + + @Override + public TileEntity createTileEntity(World world, IBlockState state) { 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 9548b0627..251294a6d 100644 --- a/src/main/java/vazkii/botania/common/block/BlockHourglass.java +++ b/src/main/java/vazkii/botania/common/block/BlockHourglass.java @@ -41,7 +41,7 @@ import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -public class BlockHourglass extends BlockModContainer implements IManaTrigger, IWandable, IWandHUD, ILexiconable { +public class BlockHourglass extends BlockMod implements IManaTrigger, IWandable, IWandHUD, ILexiconable { Random random; @@ -181,7 +181,12 @@ public class BlockHourglass extends BlockModContainer implements IManaTrigger, I } @Override - public TileEntity createNewTileEntity(World world, int meta) { + public boolean hasTileEntity(IBlockState state) { + return true; + } + + @Override + public TileEntity createTileEntity(World world, IBlockState state) { 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 0aab68bd4..117ac8f79 100644 --- a/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java +++ b/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java @@ -30,7 +30,7 @@ import vazkii.botania.common.block.tile.TileIncensePlate; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -public class BlockIncensePlate extends BlockModContainer implements ILexiconable { +public class BlockIncensePlate extends BlockMod implements ILexiconable { protected BlockIncensePlate() { super(Material.wood); @@ -136,7 +136,12 @@ public class BlockIncensePlate extends BlockModContainer implements ILexiconable } @Override - public TileEntity createNewTileEntity(World world, int meta) { + public boolean hasTileEntity(IBlockState state) { + return true; + } + + @Override + public TileEntity createTileEntity(World world, IBlockState state) { 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 aa3f3e9f1..4af6a0d71 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLightRelay.java +++ b/src/main/java/vazkii/botania/common/block/BlockLightRelay.java @@ -38,7 +38,7 @@ import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; import net.minecraftforge.fml.common.registry.GameRegistry; -public class BlockLightRelay extends BlockModContainer implements IWandable, ILexiconable { +public class BlockLightRelay extends BlockMod implements IWandable, ILexiconable { protected BlockLightRelay() { super(Material.glass); @@ -150,7 +150,12 @@ public class BlockLightRelay extends BlockModContainer implements IWandable, ILe } @Override - public TileEntity createNewTileEntity(World world, int meta) { + public boolean hasTileEntity(IBlockState state) { + return true; + } + + @Override + public TileEntity createTileEntity(World world, IBlockState state) { return new TileLightRelay(); } diff --git a/src/main/java/vazkii/botania/common/block/BlockMod.java b/src/main/java/vazkii/botania/common/block/BlockMod.java index 6a95f77f9..7d6325e4e 100644 --- a/src/main/java/vazkii/botania/common/block/BlockMod.java +++ b/src/main/java/vazkii/botania/common/block/BlockMod.java @@ -45,7 +45,7 @@ public class BlockMod extends Block { return super.setLightLevel(p_149715_1_); } - boolean registerInCreative() { + protected boolean registerInCreative() { return true; } diff --git a/src/main/java/vazkii/botania/common/block/BlockModContainer.java b/src/main/java/vazkii/botania/common/block/BlockModContainer.java deleted file mode 100644 index dfb4905b1..000000000 --- a/src/main/java/vazkii/botania/common/block/BlockModContainer.java +++ /dev/null @@ -1,61 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - * - * File Created @ [Jan 14, 2014, 5:32:55 PM (GMT)] - */ -package vazkii.botania.common.block; - -import net.minecraft.block.Block; -import net.minecraft.block.BlockContainer; -import net.minecraft.block.material.Material; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; -import vazkii.botania.common.core.BotaniaCreativeTab; -import vazkii.botania.common.item.block.ItemBlockMod; -import net.minecraftforge.fml.common.registry.GameRegistry; - -public abstract class BlockModContainer extends BlockContainer { - - public int originalLight; - - protected BlockModContainer(Material par2Material) { - super(par2Material); - if(registerInCreative()) - setCreativeTab(BotaniaCreativeTab.INSTANCE); - } - - @Override - public int getRenderType() { - return 3; - } - - @Override - public Block setUnlocalizedName(String par1Str) { - if(shouldRegisterInNameSet()) - GameRegistry.registerBlock(this, ItemBlockMod.class, par1Str); - return super.setUnlocalizedName(par1Str); - } - - protected boolean shouldRegisterInNameSet() { - return true; - } - - @Override - public Block setLightLevel(float p_149715_1_) { - originalLight = (int) (p_149715_1_ * 15); - return super.setLightLevel(p_149715_1_); - } - - public boolean registerInCreative() { - return true; - } - - @Override - public abstract T createNewTileEntity(World world, int meta); - -} \ No newline at end of file diff --git a/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java b/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java index 1cb4f16b1..f534861f6 100644 --- a/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java +++ b/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java @@ -49,7 +49,7 @@ import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; import net.minecraftforge.fml.common.registry.GameRegistry; -public class BlockOpenCrate extends BlockModContainer implements ILexiconable, IWandable, IWandHUD { +public class BlockOpenCrate extends BlockMod implements ILexiconable, IWandable, IWandHUD { Random random; @@ -167,8 +167,13 @@ public class BlockOpenCrate extends BlockModContainer implements ILexiconable, I } @Override - public TileEntity createNewTileEntity(World world, int meta) { - return meta == 0 ? new TileOpenCrate() : new TileCraftCrate(); + public boolean hasTileEntity(IBlockState state) { + return true; + } + + @Override + public TileEntity createTileEntity(World world, IBlockState state) { + return state.getValue(BotaniaStateProps.CRATE_VARIANT) == CrateVariant.OPEN ? new TileOpenCrate() : new TileCraftCrate(); } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockPlatform.java b/src/main/java/vazkii/botania/common/block/BlockPlatform.java index 916492f9c..f13d46a30 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPlatform.java +++ b/src/main/java/vazkii/botania/common/block/BlockPlatform.java @@ -22,6 +22,7 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; @@ -131,7 +132,7 @@ public class BlockPlatform extends BlockCamo implements ILexiconable, IWandable } @Override - public TileCamo createNewTileEntity(World world, int meta) { + public TileEntity createTileEntity(World world, IBlockState state) { 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 764059b12..0687e5322 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPylon.java +++ b/src/main/java/vazkii/botania/common/block/BlockPylon.java @@ -37,7 +37,7 @@ import net.minecraftforge.fml.common.Optional; import net.minecraftforge.fml.common.registry.GameRegistry; @Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.crafting.IInfusionStabiliser", striprefs = true) -public class BlockPylon extends BlockModContainer implements ILexiconable, IInfusionStabiliser { +public class BlockPylon extends BlockMod implements ILexiconable, IInfusionStabiliser { public BlockPylon() { super(Material.iron); @@ -117,7 +117,12 @@ public class BlockPylon extends BlockModContainer implements ILexiconable, IInfu } @Override - public TileEntity createNewTileEntity(World world, int meta) { + public boolean hasTileEntity(IBlockState state) { + return true; + } + + @Override + public TileEntity createTileEntity(World world, IBlockState state) { 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 8b1b84a90..055a75cf9 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java +++ b/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java @@ -34,7 +34,7 @@ import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -public class BlockSparkChanger extends BlockModContainer implements ILexiconable { +public class BlockSparkChanger extends BlockMod implements ILexiconable { Random random; @@ -171,7 +171,12 @@ public class BlockSparkChanger extends BlockModContainer implements ILexiconable } @Override - public TileEntity createNewTileEntity(World world, int meta) { + public boolean hasTileEntity(IBlockState state) { + return true; + } + + @Override + public TileEntity createTileEntity(World world, IBlockState state) { 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 dc366c41e..581e4322d 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java @@ -61,7 +61,7 @@ import vazkii.botania.common.item.block.ItemBlockSpecialFlower; import vazkii.botania.common.lib.LibBlockNames; import net.minecraftforge.fml.common.registry.GameRegistry; -public class BlockSpecialFlower extends BlockFlower implements ITileEntityProvider, ISpecialFlower, IWandable, ILexiconable, IWandHUD { +public class BlockSpecialFlower extends BlockFlower implements ISpecialFlower, IWandable, ILexiconable, IWandHUD { static { BotaniaAPI.subtilesForCreativeMenu.addAll(Arrays.asList(new String[] { @@ -257,7 +257,12 @@ public class BlockSpecialFlower extends BlockFlower implements ITileEntityProvid } @Override - public TileEntity createNewTileEntity(World world, int meta) { + public boolean hasTileEntity(IBlockState state) { + return true; + } + + @Override + public TileEntity createTileEntity(World world, IBlockState state) { return new TileSpecialFlower(); } diff --git a/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java b/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java index b86891662..38ce90f31 100644 --- a/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java +++ b/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java @@ -28,7 +28,7 @@ import vazkii.botania.common.block.tile.TileTeruTeruBozu; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -public class BlockTeruTeruBozu extends BlockModContainer implements ILexiconable { +public class BlockTeruTeruBozu extends BlockMod implements ILexiconable { public BlockTeruTeruBozu() { super(Material.cloth); @@ -112,7 +112,12 @@ public class BlockTeruTeruBozu extends BlockModContainer implements ILexiconable } @Override - public TileEntity createNewTileEntity(World world, int meta) { + public boolean hasTileEntity(IBlockState state) { + return true; + } + + @Override + public TileEntity createTileEntity(World world, IBlockState state) { 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 5c49a0663..28a4dbea5 100644 --- a/src/main/java/vazkii/botania/common/block/BlockTinyPlanet.java +++ b/src/main/java/vazkii/botania/common/block/BlockTinyPlanet.java @@ -11,6 +11,7 @@ package vazkii.botania.common.block; import net.minecraft.block.material.Material; +import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -22,7 +23,7 @@ import vazkii.botania.common.block.tile.TileTinyPlanet; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -public class BlockTinyPlanet extends BlockModContainer implements ILexiconable { +public class BlockTinyPlanet extends BlockMod implements ILexiconable { protected BlockTinyPlanet() { super(Material.rock); @@ -45,7 +46,12 @@ public class BlockTinyPlanet extends BlockModContainer implements ILexiconable { } @Override - public TileEntity createNewTileEntity(World world, int meta) { + public boolean hasTileEntity(IBlockState state) { + return true; + } + + @Override + public TileEntity createTileEntity(World world, IBlockState state) { 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 2b6c7504a..854bbf72c 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaBase.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaBase.java @@ -24,11 +24,10 @@ import net.minecraft.util.BlockPos; import net.minecraft.world.World; import vazkii.botania.common.achievement.ICraftAchievement; import vazkii.botania.common.achievement.ModAchievements; -import vazkii.botania.common.block.BlockModContainer; +import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.block.tile.TileSimpleInventory; -import vazkii.botania.common.block.tile.corporea.TileCorporeaBase; -public abstract class BlockCorporeaBase extends BlockModContainer implements ICraftAchievement { +public abstract class BlockCorporeaBase extends BlockMod implements ICraftAchievement { Random random; @@ -82,4 +81,9 @@ public abstract class BlockCorporeaBase extends BlockModContainer implements ILexiconable { +public abstract class BlockRedString extends BlockMod implements ILexiconable { public BlockRedString(String name) { super(Material.rock); @@ -58,6 +58,11 @@ public abstract class BlockRedString extends BlockModContainer im return getDefaultState().withProperty(BotaniaStateProps.FACING, EnumFacing.getFront(meta)); } + @Override + public boolean hasTileEntity(IBlockState state) { + return true; + } + @Override public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.redString; 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 52454f072..115f2531b 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedStringComparator.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedStringComparator.java @@ -10,6 +10,7 @@ */ package vazkii.botania.common.block.string; +import net.minecraft.block.state.IBlockState; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; @@ -36,7 +37,7 @@ public class BlockRedStringComparator extends BlockRedString { } @Override - public TileRedString createNewTileEntity(World world, int meta) { + public TileRedString createTileEntity(World world, IBlockState state) { 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 c4c1e5672..87062e037 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedStringContainer.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedStringContainer.java @@ -10,6 +10,7 @@ */ package vazkii.botania.common.block.string; +import net.minecraft.block.state.IBlockState; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import vazkii.botania.api.state.BotaniaStateProps; @@ -25,7 +26,7 @@ public class BlockRedStringContainer extends BlockRedString { } @Override - public TileRedString createNewTileEntity(World world, int meta) { + public TileRedString createTileEntity(World world, IBlockState state) { 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 e29631dc0..db31fe196 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedStringDispenser.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedStringDispenser.java @@ -65,7 +65,7 @@ public class BlockRedStringDispenser extends BlockRedString { } @Override - public TileRedString createNewTileEntity(World world, int meta) { + public TileRedString createTileEntity(World world, IBlockState meta) { 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 d5987da7a..1d577d783 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedStringFertilizer.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedStringFertilizer.java @@ -45,7 +45,7 @@ public class BlockRedStringFertilizer extends BlockRedString implements IGrowabl } @Override - public TileRedString createNewTileEntity(World world, int meta) { + public TileRedString createTileEntity(World world, IBlockState meta) { 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 18e691611..474edd332 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java @@ -86,7 +86,7 @@ public class BlockRedStringInterceptor extends BlockRedString { } @Override - public TileRedString createNewTileEntity(World world, int meta) { + public TileRedString createTileEntity(World world, IBlockState state) { 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 5a284f116..5c8b47286 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedStringRelay.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedStringRelay.java @@ -10,6 +10,7 @@ */ package vazkii.botania.common.block.string; +import net.minecraft.block.state.IBlockState; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import vazkii.botania.api.state.BotaniaStateProps; @@ -25,7 +26,7 @@ public class BlockRedStringRelay extends BlockRedString { } @Override - public TileRedString createNewTileEntity(World world, int meta) { + public TileRedString createTileEntity(World world, IBlockState state) { return new TileRedStringRelay(); }