diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPBamboo.java b/src/main/java/biomesoplenty/common/block/BlockBOPBamboo.java index 3ee646c2f..6641e1919 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPBamboo.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPBamboo.java @@ -16,6 +16,8 @@ import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.properties.IProperty; import net.minecraft.block.properties.PropertyInteger; +import net.minecraft.block.state.BlockStateBase; +import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; import net.minecraft.util.EnumFacing; @@ -32,7 +34,7 @@ public class BlockBOPBamboo extends BlockBOPDecoration // add properties public static final PropertyInteger AGE = PropertyInteger.create("age", 0, 15); @Override - protected BlockState createBlockState() {return new BlockState(this, new IProperty[] { AGE });} + protected BlockStateContainer createBlockState() {return new BlockStateContainer(this, new IProperty[] { AGE });} public BlockBOPBamboo() diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPBiomeBlock.java b/src/main/java/biomesoplenty/common/block/BlockBOPBiomeBlock.java index cc9aaeb02..bb3d7b66c 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPBiomeBlock.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPBiomeBlock.java @@ -19,6 +19,7 @@ import net.minecraft.block.Block; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; +import net.minecraft.init.Biomes; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.math.BlockPos; @@ -47,16 +48,16 @@ public class BlockBOPBiomeBlock extends BlockBOPGeneric List vanillaBiomesToExclude = Arrays.asList( new BiomeGenBase[] { - BiomeGenBase.sky, - BiomeGenBase.hell, - BiomeGenBase.beach, - BiomeGenBase.coldBeach, - BiomeGenBase.stoneBeach, - BiomeGenBase.ocean, - BiomeGenBase.frozenOcean, - BiomeGenBase.deepOcean, - BiomeGenBase.river, - BiomeGenBase.frozenRiver + Biomes.sky, + Biomes.hell, + Biomes.beach, + Biomes.coldBeach, + Biomes.stoneBeach, + Biomes.ocean, + Biomes.frozenOcean, + Biomes.deepOcean, + Biomes.river, + Biomes.frozenRiver } ); diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPBones.java b/src/main/java/biomesoplenty/common/block/BlockBOPBones.java index 7136a6735..395abac9e 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPBones.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPBones.java @@ -15,6 +15,7 @@ import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.properties.IProperty; import net.minecraft.block.properties.PropertyEnum; +import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemBlock; @@ -49,7 +50,7 @@ public class BlockBOPBones extends Block implements IBOPBlock public static final PropertyEnum VARIANT = PropertyEnum.create("variant", BoneType.class); public static final PropertyEnum AXIS = PropertyEnum.create("axis", EnumFacing.Axis.class); @Override - protected BlockState createBlockState() {return new BlockState(this, new IProperty[] { AXIS, VARIANT });} + protected BlockStateContainer createBlockState() {return new BlockStateContainer(this, new IProperty[] { AXIS, VARIANT });} // implement IBOPBlock diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPCoral.java b/src/main/java/biomesoplenty/common/block/BlockBOPCoral.java index 802f4a9ca..0346c6211 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPCoral.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPCoral.java @@ -11,11 +11,11 @@ package biomesoplenty.common.block; import static net.minecraft.block.BlockLiquid.LEVEL; import biomesoplenty.api.block.BlockQueries; -import net.minecraft.block.Block; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.properties.IProperty; import net.minecraft.block.properties.PropertyEnum; +import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.util.IStringSerializable; import net.minecraft.util.math.BlockPos; @@ -41,7 +41,7 @@ public class BlockBOPCoral extends BlockBOPDecoration }; public static PropertyEnum VARIANT = PropertyEnum.create("variant", CoralType.class); @Override - protected BlockState createBlockState() {return new BlockState(this, new IProperty[] { LEVEL, VARIANT });} + protected BlockStateContainer createBlockState() {return new BlockStateContainer(this, new IProperty[] { LEVEL, VARIANT });} // implement IBOPBlock @Override diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPDirt.java b/src/main/java/biomesoplenty/common/block/BlockBOPDirt.java index 3494ea910..4de0bac97 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPDirt.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPDirt.java @@ -21,6 +21,7 @@ import net.minecraft.block.material.Material; import net.minecraft.block.properties.IProperty; import net.minecraft.block.properties.PropertyBool; import net.minecraft.block.properties.PropertyEnum; +import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; import net.minecraft.item.ItemBlock; @@ -51,7 +52,7 @@ public class BlockBOPDirt extends Block implements IBOPBlock, ISustainsPlantType public static final PropertyEnum VARIANT = PropertyEnum.create("variant", BOPDirtType.class); public static final PropertyBool COARSE = PropertyBool.create("coarse"); @Override - protected BlockState createBlockState() {return new BlockState(this, new IProperty[] { COARSE, VARIANT });} + protected BlockStateContainer createBlockState() {return new BlockStateContainer(this, new IProperty[] { COARSE, VARIANT });} // implement IBOPBlock @Override diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPDoubleDecoration.java b/src/main/java/biomesoplenty/common/block/BlockBOPDoubleDecoration.java index ebc085507..c88875719 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPDoubleDecoration.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPDoubleDecoration.java @@ -14,6 +14,7 @@ import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.block.properties.IProperty; import net.minecraft.block.properties.PropertyEnum; +import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.EntityLivingBase; import net.minecraft.init.Blocks; @@ -43,7 +44,7 @@ public class BlockBOPDoubleDecoration extends BlockBOPDecoration { }; public static final PropertyEnum HALF = PropertyEnum.create("half", Half.class); @Override - protected BlockState createBlockState() {return new BlockState(this, new IProperty[] { HALF });} + protected BlockStateContainer createBlockState() {return new BlockStateContainer(this, new IProperty[] { HALF });} @Override public IProperty[] getNonRenderingProperties() { return null; } diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPDoublePlant.java b/src/main/java/biomesoplenty/common/block/BlockBOPDoublePlant.java index d34a5706e..58b3e4a39 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPDoublePlant.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPDoublePlant.java @@ -18,7 +18,7 @@ import biomesoplenty.common.enums.BOPPlants; import biomesoplenty.common.util.block.BlockStateUtils; import net.minecraft.block.properties.IProperty; import net.minecraft.block.properties.PropertyEnum; -import net.minecraft.block.state.BlockStateBase; +import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; @@ -57,7 +57,7 @@ public class BlockBOPDoublePlant extends BlockBOPDoubleDecoration implements ISh }; public static final PropertyEnum VARIANT = PropertyEnum.create("variant", DoublePlantType.class); @Override - protected BlockState createBlockState() {return new BlockStateBase(this, new IProperty[] { HALF, VARIANT });} + protected BlockStateContainer createBlockState() {return new BlockStateContainer(this, new IProperty[] { HALF, VARIANT });} // implement IBOPBlock diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPDoubleWoodSlab.java b/src/main/java/biomesoplenty/common/block/BlockBOPDoubleWoodSlab.java index 6d4243050..bd6401878 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPDoubleWoodSlab.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPDoubleWoodSlab.java @@ -18,8 +18,10 @@ import biomesoplenty.common.enums.BOPWoods; import biomesoplenty.common.util.block.BlockStateUtils; import biomesoplenty.common.util.block.VariantPagingHelper; import net.minecraft.block.BlockSlab; +import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.properties.IProperty; +import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.init.Blocks; @@ -64,10 +66,10 @@ public class BlockBOPDoubleWoodSlab extends BlockSlab implements IBOPBlock // add properties (note we inherit HALF property from parent BlockSlab) @Override - protected BlockState createBlockState() + protected BlockStateContainer createBlockState() { this.variantProperty = currentVariantProperty; // get from static variable - return new BlockState(this, new IProperty[] { HALF, this.variantProperty }); + return new BlockStateContainer(this, new IProperty[] { HALF, this.variantProperty }); } // implement IBOPBlock @@ -90,7 +92,7 @@ public class BlockBOPDoubleWoodSlab extends BlockSlab implements IBOPBlock { super(Material.wood); this.useNeighborBrightness = true; - this.setHardness(2.0F).setResistance(5.0F).setStepSound(soundTypeWood); + this.setHardness(2.0F).setResistance(5.0F).setStepSound(SoundType.WOOD); this.setHarvestLevel("axe", 0); this.setDefaultState(this.blockState.getBaseState().withProperty(HALF, BlockSlab.EnumBlockHalf.BOTTOM)); } diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPFarmland.java b/src/main/java/biomesoplenty/common/block/BlockBOPFarmland.java index 012ae794f..ab1b2e47b 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPFarmland.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPFarmland.java @@ -20,6 +20,7 @@ import net.minecraft.block.BlockFarmland; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.properties.IProperty; +import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; @@ -54,10 +55,10 @@ public class BlockBOPFarmland extends BlockFarmland implements IBOPBlock public IProperty variantProperty; @Override - protected BlockState createBlockState() + protected BlockStateContainer createBlockState() { this.variantProperty = currentVariantProperty; - return new BlockState(this, new IProperty[] { MOISTURE, this.variantProperty }); + return new BlockStateContainer(this, new IProperty[] { MOISTURE, this.variantProperty }); } @Override diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPFlower.java b/src/main/java/biomesoplenty/common/block/BlockBOPFlower.java index 0be5d0f60..d9e4bcbab 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPFlower.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPFlower.java @@ -19,6 +19,7 @@ import biomesoplenty.common.item.ItemBOPFlower; import biomesoplenty.common.util.block.VariantPagingHelper; import net.minecraft.block.Block; import net.minecraft.block.properties.IProperty; +import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; @@ -68,10 +69,10 @@ public class BlockBOPFlower extends BlockBOPDecoration implements IShearable public IProperty variantProperty; @Override - protected BlockState createBlockState() + protected BlockStateContainer createBlockState() { this.variantProperty = currentVariantProperty; // get from static variable - return new BlockState(this, new IProperty[] { this.variantProperty }); + return new BlockStateContainer(this, new IProperty[] { this.variantProperty }); } diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPGem.java b/src/main/java/biomesoplenty/common/block/BlockBOPGem.java index 599678d1f..f823c840c 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPGem.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPGem.java @@ -16,6 +16,7 @@ import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.properties.IProperty; import net.minecraft.block.properties.PropertyEnum; +import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.item.ItemBlock; @@ -24,7 +25,7 @@ public class BlockBOPGem extends Block implements IBOPBlock // add properties public static final PropertyEnum VARIANT = PropertyEnum.create("variant", BOPGems.class); @Override - protected BlockState createBlockState() {return new BlockState(this, new IProperty[] { VARIANT });} + protected BlockStateContainer createBlockState() {return new BlockStateContainer(this, new IProperty[] { VARIANT });} // implement IBOPBlock diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPGemOre.java b/src/main/java/biomesoplenty/common/block/BlockBOPGemOre.java index 26c08ec95..a3dcebff2 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPGemOre.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPGemOre.java @@ -21,6 +21,7 @@ import net.minecraft.block.Block; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.properties.IProperty; +import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.item.Item; import net.minecraft.item.ItemBlock; @@ -34,7 +35,7 @@ public class BlockBOPGemOre extends Block implements IBOPBlock // add properties (note VARIANT is imported statically from the BlockGem class) @Override - protected BlockState createBlockState() {return new BlockState(this, new IProperty[] { VARIANT });} + protected BlockStateContainer createBlockState() {return new BlockStateContainer(this, new IProperty[] { VARIANT });} // implement IBOPBlock diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPGrass.java b/src/main/java/biomesoplenty/common/block/BlockBOPGrass.java index 77e85ea02..f49d60a71 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPGrass.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPGrass.java @@ -22,6 +22,7 @@ import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.properties.IProperty; import net.minecraft.block.properties.PropertyEnum; +import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.client.particle.EffectRenderer; import net.minecraft.entity.Entity; @@ -61,7 +62,7 @@ public class BlockBOPGrass extends BlockGrass implements IBOPBlock, ISustainsPla }; public static final PropertyEnum VARIANT = PropertyEnum.create("variant", BOPGrassType.class); @Override - protected BlockState createBlockState() {return new BlockState(this, new IProperty[] { SNOWY, VARIANT });} + protected BlockStateContainer createBlockState() {return new BlockStateContainer(this, new IProperty[] { SNOWY, VARIANT });} // implement IBOPBlock diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPHalfOtherSlab.java b/src/main/java/biomesoplenty/common/block/BlockBOPHalfOtherSlab.java index ec713d438..1ce2ec2db 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPHalfOtherSlab.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPHalfOtherSlab.java @@ -19,6 +19,7 @@ import net.minecraft.block.BlockSlab; import net.minecraft.block.material.Material; import net.minecraft.block.properties.IProperty; import net.minecraft.block.properties.PropertyEnum; +import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; @@ -66,7 +67,7 @@ public class BlockBOPHalfOtherSlab extends BlockSlab implements IBOPBlock // add properties (note we inherit HALF property from parent BlockSlab) public static final PropertyEnum VARIANT = PropertyEnum.create("variant", SlabType.class); @Override - protected BlockState createBlockState() {return new BlockState(this, new IProperty[] { HALF, VARIANT });} + protected BlockStateContainer createBlockState() {return new BlockStateContainer(this, new IProperty[] { HALF, VARIANT });} // implement IBOPBlock diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPHalfWoodSlab.java b/src/main/java/biomesoplenty/common/block/BlockBOPHalfWoodSlab.java index 170353abb..60154234d 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPHalfWoodSlab.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPHalfWoodSlab.java @@ -20,6 +20,7 @@ import net.minecraft.block.BlockSlab; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.properties.IProperty; +import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.init.Blocks; @@ -64,10 +65,10 @@ public class BlockBOPHalfWoodSlab extends BlockSlab implements IBOPBlock // add properties (note we inherit HALF property from parent BlockSlab) @Override - protected BlockState createBlockState() + protected BlockStateContainer createBlockState() { this.variantProperty = currentVariantProperty; // get from static variable - return new BlockState(this, new IProperty[] { HALF, this.variantProperty }); + return new BlockStateContainer(this, new IProperty[] { HALF, this.variantProperty }); } // implement IBOPBlock diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPHive.java b/src/main/java/biomesoplenty/common/block/BlockBOPHive.java index 088e48dad..25dfcc628 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPHive.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPHive.java @@ -19,6 +19,7 @@ import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.properties.IProperty; import net.minecraft.block.properties.PropertyEnum; +import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.item.Item; import net.minecraft.item.ItemBlock; @@ -46,7 +47,7 @@ public class BlockBOPHive extends Block implements IBOPBlock }; public static final PropertyEnum VARIANT = PropertyEnum.create("variant", HiveType.class); @Override - protected BlockState createBlockState() {return new BlockState(this, new IProperty[] { VARIANT });} + protected BlockStateContainer createBlockState() {return new BlockStateContainer(this, new IProperty[] { VARIANT });} // implement IBOPBlock diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPLeaves.java b/src/main/java/biomesoplenty/common/block/BlockBOPLeaves.java index 0760e5587..6c133acc2 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPLeaves.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPLeaves.java @@ -19,6 +19,7 @@ import biomesoplenty.common.util.block.VariantPagingHelper; import net.minecraft.block.BlockLeaves; import net.minecraft.block.BlockPlanks; import net.minecraft.block.properties.IProperty; +import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -69,10 +70,10 @@ public class BlockBOPLeaves extends BlockLeaves implements IBOPBlock public IProperty variantProperty; @Override - protected BlockState createBlockState() + protected BlockStateContainer createBlockState() { this.variantProperty = currentVariantProperty; // get from static variable - return new BlockState(this, new IProperty[] { CHECK_DECAY, DECAYABLE, this.variantProperty }); + return new BlockStateContainer(this, new IProperty[] { CHECK_DECAY, DECAYABLE, this.variantProperty }); } diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPLilypad.java b/src/main/java/biomesoplenty/common/block/BlockBOPLilypad.java index 675a913c3..e7b66c333 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPLilypad.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPLilypad.java @@ -14,6 +14,7 @@ import net.minecraft.block.BlockLilyPad; import net.minecraft.block.SoundType; import net.minecraft.block.properties.IProperty; import net.minecraft.block.properties.PropertyEnum; +import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.item.ItemBlock; import net.minecraft.util.IStringSerializable; @@ -44,7 +45,7 @@ public class BlockBOPLilypad extends BlockLilyPad implements IBOPBlock }; public static final PropertyEnum VARIANT = PropertyEnum.create("variant", LilypadType.class); @Override - protected BlockState createBlockState() {return new BlockState(this, new IProperty[] { VARIANT });} + protected BlockStateContainer createBlockState() {return new BlockStateContainer(this, new IProperty[] { VARIANT });} // implement IBOPBlock diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPLog.java b/src/main/java/biomesoplenty/common/block/BlockBOPLog.java index a29fed39a..86123d218 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPLog.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPLog.java @@ -14,6 +14,7 @@ import biomesoplenty.common.item.ItemBOPBlock; import biomesoplenty.common.util.block.VariantPagingHelper; import net.minecraft.block.BlockLog; import net.minecraft.block.properties.IProperty; +import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; import net.minecraft.item.ItemBlock; @@ -50,10 +51,10 @@ public class BlockBOPLog extends BlockLog implements IBOPBlock public IProperty variantProperty; @Override - protected BlockState createBlockState() + protected BlockStateContainer createBlockState() { this.variantProperty = currentVariantProperty; // get from static variable - return new BlockState(this, new IProperty[] { LOG_AXIS, this.variantProperty }); + return new BlockStateContainer(this, new IProperty[] { LOG_AXIS, this.variantProperty }); } diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPMud.java b/src/main/java/biomesoplenty/common/block/BlockBOPMud.java index 3f2fcba1d..ad1520034 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPMud.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPMud.java @@ -19,6 +19,7 @@ import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.properties.IProperty; import net.minecraft.block.properties.PropertyEnum; +import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; @@ -53,7 +54,7 @@ public class BlockBOPMud extends Block implements IBOPBlock, ISustainsPlantType }; public static final PropertyEnum VARIANT = PropertyEnum.create("variant", MudType.class); @Override - protected BlockState createBlockState() {return new BlockState(this, new IProperty[] { VARIANT });} + protected BlockStateContainer createBlockState() {return new BlockStateContainer(this, new IProperty[] { VARIANT });} // implement IBOPBlock diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPMushroom.java b/src/main/java/biomesoplenty/common/block/BlockBOPMushroom.java index e59962f17..724bf8520 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPMushroom.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPMushroom.java @@ -12,6 +12,7 @@ import biomesoplenty.api.block.BlockQueries; import biomesoplenty.common.item.ItemBOPBlock; import net.minecraft.block.properties.IProperty; import net.minecraft.block.properties.PropertyEnum; +import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.item.ItemBlock; import net.minecraft.util.IStringSerializable; @@ -39,7 +40,7 @@ public class BlockBOPMushroom extends BlockBOPDecoration }; public static final PropertyEnum VARIANT = PropertyEnum.create("variant", MushroomType.class); @Override - protected BlockState createBlockState() {return new BlockState(this, new IProperty[] { VARIANT });} + protected BlockStateContainer createBlockState() {return new BlockStateContainer(this, new IProperty[] { VARIANT });} // implement IBOPBlock diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPPlanks.java b/src/main/java/biomesoplenty/common/block/BlockBOPPlanks.java index 0ca3e64f0..d6b54afcb 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPPlanks.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPPlanks.java @@ -16,6 +16,7 @@ import net.minecraft.block.Block; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.properties.IProperty; +import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; import net.minecraft.item.ItemBlock; @@ -53,10 +54,10 @@ public class BlockBOPPlanks extends Block implements IBOPBlock public IProperty variantProperty; @Override - protected BlockState createBlockState() + protected BlockStateContainer createBlockState() { this.variantProperty = currentVariantProperty; // get from static variable - return new BlockState(this, new IProperty[] { this.variantProperty }); + return new BlockStateContainer(this, new IProperty[] { this.variantProperty }); } diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPPlant.java b/src/main/java/biomesoplenty/common/block/BlockBOPPlant.java index 0a6fbf5c7..c86948d1b 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPPlant.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPPlant.java @@ -18,6 +18,7 @@ import biomesoplenty.common.item.ItemBOPPlant; import biomesoplenty.common.util.block.VariantPagingHelper; import net.minecraft.block.Block; import net.minecraft.block.properties.IProperty; +import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; @@ -79,10 +80,10 @@ public class BlockBOPPlant extends BlockBOPDecoration implements IShearable public IProperty variantProperty; @Override - protected BlockState createBlockState() + protected BlockStateContainer createBlockState() { this.variantProperty = currentVariantProperty; // get from static variable - return new BlockState(this, new IProperty[] { this.variantProperty }); + return new BlockStateContainer(this, new IProperty[] { this.variantProperty }); } diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPSand.java b/src/main/java/biomesoplenty/common/block/BlockBOPSand.java index dd9ef98ec..16f2dd230 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPSand.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPSand.java @@ -11,12 +11,12 @@ package biomesoplenty.common.block; import biomesoplenty.api.block.IBOPBlock; import biomesoplenty.api.block.ISustainsPlantType; import biomesoplenty.common.item.ItemBOPBlock; -import net.minecraft.block.Block; import net.minecraft.block.BlockFalling; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.properties.IProperty; import net.minecraft.block.properties.PropertyEnum; +import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; import net.minecraft.item.ItemBlock; @@ -48,7 +48,7 @@ public class BlockBOPSand extends BlockFalling implements IBOPBlock, ISustainsPl }; public static final PropertyEnum VARIANT = PropertyEnum.create("variant", SandType.class); @Override - protected BlockState createBlockState() {return new BlockState(this, new IProperty[] { VARIANT });} + protected BlockStateContainer createBlockState() {return new BlockStateContainer(this, new IProperty[] { VARIANT });} // implement IBOPBlock diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPSapling.java b/src/main/java/biomesoplenty/common/block/BlockBOPSapling.java index 94d19b471..af27858aa 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPSapling.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPSapling.java @@ -30,6 +30,7 @@ import net.minecraft.block.IGrowable; import net.minecraft.block.SoundType; import net.minecraft.block.properties.IProperty; import net.minecraft.block.properties.PropertyInteger; +import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; import net.minecraft.item.ItemBlock; @@ -70,10 +71,10 @@ public class BlockBOPSapling extends BlockBOPDecoration implements IGrowable { public static final PropertyInteger STAGE = PropertyInteger.create("stage", 0, 1); @Override - protected BlockState createBlockState() + protected BlockStateContainer createBlockState() { this.variantProperty = currentVariantProperty; // get from static variable - return new BlockState(this, new IProperty[] { STAGE, this.variantProperty }); + return new BlockStateContainer(this, new IProperty[] { STAGE, this.variantProperty }); } diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPSeaweed.java b/src/main/java/biomesoplenty/common/block/BlockBOPSeaweed.java index aefe0b213..4b5fa8a9a 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPSeaweed.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPSeaweed.java @@ -13,11 +13,11 @@ import static net.minecraft.block.BlockLiquid.LEVEL; import biomesoplenty.api.block.BlockQueries; import biomesoplenty.api.block.IBOPBlock; import biomesoplenty.common.item.ItemBOPBlock; -import net.minecraft.block.Block; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.properties.IProperty; import net.minecraft.block.properties.PropertyEnum; +import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; import net.minecraft.item.ItemBlock; @@ -65,7 +65,7 @@ public class BlockBOPSeaweed extends BlockBOPDecoration implements IBOPBlock public static final PropertyEnum POSITION = PropertyEnum.create("position", SeaweedPosition.class); @Override - protected BlockState createBlockState() {return new BlockState(this, new IProperty[] { LEVEL, POSITION, VARIANT });} + protected BlockStateContainer createBlockState() {return new BlockStateContainer(this, new IProperty[] { LEVEL, POSITION, VARIANT });} // implement IBOPBlock diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPStone.java b/src/main/java/biomesoplenty/common/block/BlockBOPStone.java index 33ab8605e..fec14f4d5 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPStone.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPStone.java @@ -16,6 +16,7 @@ import net.minecraft.block.material.Material; import net.minecraft.block.properties.IProperty; import net.minecraft.block.properties.PropertyBool; import net.minecraft.block.properties.PropertyEnum; +import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; import net.minecraft.item.ItemBlock; @@ -45,7 +46,7 @@ public class BlockBOPStone extends Block implements IBOPBlock public static final PropertyEnum VARIANT = PropertyEnum.create("variant", StoneType.class); public static PropertyBool POLISHED = PropertyBool.create("polished"); @Override - protected BlockState createBlockState() {return new BlockState(this, new IProperty[] { VARIANT, POLISHED });} + protected BlockStateContainer createBlockState() {return new BlockStateContainer(this, new IProperty[] { VARIANT, POLISHED });} // implement IBOPBlock diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPTerrarium.java b/src/main/java/biomesoplenty/common/block/BlockBOPTerrarium.java index 3db977fc0..bb0880b93 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPTerrarium.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPTerrarium.java @@ -14,6 +14,7 @@ import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.block.properties.IProperty; import net.minecraft.block.properties.PropertyEnum; +import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.item.ItemBlock; import net.minecraft.util.IStringSerializable; @@ -40,7 +41,7 @@ public class BlockBOPTerrarium extends Block implements IBOPBlock }; public static final PropertyEnum VARIANT = PropertyEnum.create("variant", TerrariumType.class); @Override - protected BlockState createBlockState() {return new BlockState(this, new IProperty[] { VARIANT });} + protected BlockStateContainer createBlockState() {return new BlockStateContainer(this, new IProperty[] { VARIANT });} // implement IBOPBlock