diff --git a/build.properties b/build.properties index 142c6d2ef..70fab574c 100644 --- a/build.properties +++ b/build.properties @@ -1,4 +1,4 @@ minecraft_version=1.9.4 -forge_version=12.17.0.1922-1.9.4 +forge_version=12.17.0.1940 mod_version=4.1.0 mappings_version=snapshot_nodoc_20160519 diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPBones.java b/src/main/java/biomesoplenty/common/block/BlockBOPBones.java index af248c2ec..5df547352 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPBones.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPBones.java @@ -27,6 +27,8 @@ import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class BlockBOPBones extends Block implements IBOPBlock { @@ -51,8 +53,10 @@ public class BlockBOPBones extends Block implements IBOPBlock @Override protected BlockStateContainer createBlockState() {return new BlockStateContainer(this, new IProperty[] { AXIS, VARIANT });} @Override + @SideOnly(Side.CLIENT) public IBlockColor getBlockColor() { return null; } @Override + @SideOnly(Side.CLIENT) public IItemColor getItemColor() { return null; } // implement IBOPBlock diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPCrystal.java b/src/main/java/biomesoplenty/common/block/BlockBOPCrystal.java index 1d8b5e747..9cfda9f73 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPCrystal.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPCrystal.java @@ -25,6 +25,8 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemBlock; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class BlockBOPCrystal extends Block implements IBOPBlock { @@ -39,8 +41,10 @@ public class BlockBOPCrystal extends Block implements IBOPBlock @Override public String getStateName(IBlockState state) {return "";} @Override + @SideOnly(Side.CLIENT) public IBlockColor getBlockColor() { return null; } @Override + @SideOnly(Side.CLIENT) public IItemColor getItemColor() { return null; } public BlockBOPCrystal() { diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPDecoration.java b/src/main/java/biomesoplenty/common/block/BlockBOPDecoration.java index 13d3dc151..abfb25781 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPDecoration.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPDecoration.java @@ -42,8 +42,10 @@ public class BlockBOPDecoration extends Block implements IBOPBlock @Override public String getStateName(IBlockState state) {return "";} @Override + @SideOnly(Side.CLIENT) public IBlockColor getBlockColor() { return null; } @Override + @SideOnly(Side.CLIENT) public IItemColor getItemColor() { return null; } // constructor diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPDirt.java b/src/main/java/biomesoplenty/common/block/BlockBOPDirt.java index 73075c6bf..02acb6454 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPDirt.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPDirt.java @@ -31,6 +31,8 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.EnumPlantType; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class BlockBOPDirt extends Block implements IBOPBlock, ISustainsPlantType { @@ -67,8 +69,10 @@ public class BlockBOPDirt extends Block implements IBOPBlock, ISustainsPlantType return (Boolean.TRUE.equals(state.getValue(COARSE)) ? "coarse_" : "") + ((BOPDirtType) state.getValue(VARIANT)).getName() + "_dirt"; } @Override + @SideOnly(Side.CLIENT) public IBlockColor getBlockColor() { return null; } @Override + @SideOnly(Side.CLIENT) public IItemColor getItemColor() { return null; } public BlockBOPDirt() { diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPDoor.java b/src/main/java/biomesoplenty/common/block/BlockBOPDoor.java index ead56d73e..0c7a9af37 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPDoor.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPDoor.java @@ -44,8 +44,10 @@ public class BlockBOPDoor extends BlockDoor implements IBOPBlock @Override public String getStateName(IBlockState state) {return "";} @Override + @SideOnly(Side.CLIENT) public IBlockColor getBlockColor() { return null; } @Override + @SideOnly(Side.CLIENT) public IItemColor getItemColor() { return null; } // Map from woods to BlockBOPDoor instance and back diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPDoubleWoodSlab.java b/src/main/java/biomesoplenty/common/block/BlockBOPDoubleWoodSlab.java index 4995877cb..b982e5343 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPDoubleWoodSlab.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPDoubleWoodSlab.java @@ -87,8 +87,10 @@ public class BlockBOPDoubleWoodSlab extends BlockSlab implements IBOPBlock return "double_" + ((BOPWoods)state.getValue(this.variantProperty)).getName() + "_wood_slab"; } @Override + @SideOnly(Side.CLIENT) public IBlockColor getBlockColor() { return null; } @Override + @SideOnly(Side.CLIENT) public IItemColor getItemColor() { return null; } private BlockBOPDoubleWoodSlab() diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPFarmland.java b/src/main/java/biomesoplenty/common/block/BlockBOPFarmland.java index a0606dc96..a232bd4eb 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPFarmland.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPFarmland.java @@ -37,6 +37,8 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.EnumPlantType; import net.minecraftforge.common.IPlantable; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class BlockBOPFarmland extends BlockFarmland implements IBOPBlock { @@ -78,8 +80,10 @@ public class BlockBOPFarmland extends BlockFarmland implements IBOPBlock return ((BlockBOPDirt.BOPDirtType) state.getValue(this.variantProperty)).getName() + "_farmland"; } @Override + @SideOnly(Side.CLIENT) public IBlockColor getBlockColor() { return null; } @Override + @SideOnly(Side.CLIENT) public IItemColor getItemColor() { return null; } public BlockBOPFarmland() diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPFence.java b/src/main/java/biomesoplenty/common/block/BlockBOPFence.java index 6fdd91e16..41e875aa0 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPFence.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPFence.java @@ -26,6 +26,8 @@ import net.minecraft.item.ItemBlock; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class BlockBOPFence extends BlockFence implements IBOPBlock { @@ -40,8 +42,10 @@ public class BlockBOPFence extends BlockFence implements IBOPBlock @Override public String getStateName(IBlockState state) {return "";} @Override + @SideOnly(Side.CLIENT) public IBlockColor getBlockColor() { return null; } @Override + @SideOnly(Side.CLIENT) public IItemColor getItemColor() { return null; } // Map from woods to BlockBOPFence instance and back diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPFenceGate.java b/src/main/java/biomesoplenty/common/block/BlockBOPFenceGate.java index 5f3e60ae5..861c5a5b0 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPFenceGate.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPFenceGate.java @@ -25,6 +25,8 @@ import net.minecraft.item.ItemBlock; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class BlockBOPFenceGate extends BlockFenceGate implements IBOPBlock { @@ -40,8 +42,10 @@ public class BlockBOPFenceGate extends BlockFenceGate implements IBOPBlock @Override public String getStateName(IBlockState state) {return "";} @Override + @SideOnly(Side.CLIENT) public IBlockColor getBlockColor() { return null; } @Override + @SideOnly(Side.CLIENT) public IItemColor getItemColor() { return null; } // Map from woods to BlockBOPFenceGate instance and back diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPFlesh.java b/src/main/java/biomesoplenty/common/block/BlockBOPFlesh.java index a56c0c01f..ce3b4bd28 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPFlesh.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPFlesh.java @@ -44,8 +44,10 @@ public class BlockBOPFlesh extends Block implements IBOPBlock @Override public String getStateName(IBlockState state) {return "";} @Override + @SideOnly(Side.CLIENT) public IBlockColor getBlockColor() { return null; } @Override + @SideOnly(Side.CLIENT) public IItemColor getItemColor() { return null; } public BlockBOPFlesh() { diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPGem.java b/src/main/java/biomesoplenty/common/block/BlockBOPGem.java index d4dff1632..dfd99689c 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPGem.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPGem.java @@ -20,6 +20,8 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.color.IBlockColor; import net.minecraft.client.renderer.color.IItemColor; import net.minecraft.item.ItemBlock; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class BlockBOPGem extends Block implements IBOPBlock { @@ -42,8 +44,10 @@ public class BlockBOPGem extends Block implements IBOPBlock return ((BOPGems) state.getValue(VARIANT)).getName() + "_block"; } @Override + @SideOnly(Side.CLIENT) public IBlockColor getBlockColor() { return null; } @Override + @SideOnly(Side.CLIENT) public IItemColor getItemColor() { return null; } public BlockBOPGem() diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPGemOre.java b/src/main/java/biomesoplenty/common/block/BlockBOPGemOre.java index ac00ecbe1..89c4722ec 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPGemOre.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPGemOre.java @@ -30,6 +30,8 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class BlockBOPGemOre extends Block implements IBOPBlock { @@ -52,8 +54,10 @@ public class BlockBOPGemOre extends Block implements IBOPBlock return ((BOPGems) state.getValue(VARIANT)).getName() + "_ore"; } @Override + @SideOnly(Side.CLIENT) public IBlockColor getBlockColor() { return null; } @Override + @SideOnly(Side.CLIENT) public IItemColor getItemColor() { return null; } public BlockBOPGemOre() diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPGeneric.java b/src/main/java/biomesoplenty/common/block/BlockBOPGeneric.java index fa6755b0e..135c41955 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPGeneric.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPGeneric.java @@ -24,6 +24,8 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraftforge.common.EnumPlantType; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class BlockBOPGeneric extends Block implements IBOPBlock, ISustainsPlantType { @@ -38,8 +40,10 @@ public class BlockBOPGeneric extends Block implements IBOPBlock, ISustainsPlantT @Override public String getStateName(IBlockState state) {return "";} @Override + @SideOnly(Side.CLIENT) public IBlockColor getBlockColor() { return null; } @Override + @SideOnly(Side.CLIENT) public IItemColor getItemColor() { return null; } public BlockBOPGeneric() { diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPGrass.java b/src/main/java/biomesoplenty/common/block/BlockBOPGrass.java index 32197d7d5..139fcccf6 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPGrass.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPGrass.java @@ -84,8 +84,10 @@ public class BlockBOPGrass extends BlockGrass implements IBOPBlock, ISustainsPla } } @Override + @SideOnly(Side.CLIENT) public IBlockColor getBlockColor() { return BlockColoring.GRASS_COLORING; } @Override + @SideOnly(Side.CLIENT) public IItemColor getItemColor() { return BlockColoring.BLOCK_ITEM_COLORING; } public BlockBOPGrass() diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPHalfOtherSlab.java b/src/main/java/biomesoplenty/common/block/BlockBOPHalfOtherSlab.java index ef945ca20..1e3e43e52 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPHalfOtherSlab.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPHalfOtherSlab.java @@ -85,8 +85,10 @@ public class BlockBOPHalfOtherSlab extends BlockSlab implements IBOPBlock return ((SlabType) state.getValue(VARIANT)).getName() + "_slab"; } @Override + @SideOnly(Side.CLIENT) public IBlockColor getBlockColor() { return null; } @Override + @SideOnly(Side.CLIENT) public IItemColor getItemColor() { return null; } public IBlockState getFullBlockVariantState(SlabType type) diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPHalfWoodSlab.java b/src/main/java/biomesoplenty/common/block/BlockBOPHalfWoodSlab.java index 74a15cff3..339b69773 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPHalfWoodSlab.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPHalfWoodSlab.java @@ -85,8 +85,10 @@ public class BlockBOPHalfWoodSlab extends BlockSlab implements IBOPBlock return ((BOPWoods) state.getValue(this.variantProperty)).getName() + "_wood_slab"; } @Override + @SideOnly(Side.CLIENT) public IBlockColor getBlockColor() { return null; } @Override + @SideOnly(Side.CLIENT) public IItemColor getItemColor() { return null; } private BlockBOPHalfWoodSlab() diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPHive.java b/src/main/java/biomesoplenty/common/block/BlockBOPHive.java index 7fca97995..38fb3b46e 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPHive.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPHive.java @@ -27,6 +27,8 @@ import net.minecraft.item.ItemBlock; import net.minecraft.util.IStringSerializable; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class BlockBOPHive extends Block implements IBOPBlock { @@ -64,8 +66,10 @@ public class BlockBOPHive extends Block implements IBOPBlock return ((HiveType) state.getValue(VARIANT)).getName() + "_block"; } @Override + @SideOnly(Side.CLIENT) public IBlockColor getBlockColor() { return null; } @Override + @SideOnly(Side.CLIENT) public IItemColor getItemColor() { return null; } public BlockBOPHive() diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPHoney.java b/src/main/java/biomesoplenty/common/block/BlockBOPHoney.java index ee6932546..ead342012 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPHoney.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPHoney.java @@ -34,8 +34,10 @@ public class BlockBOPHoney extends Block implements IBOPBlock @Override public String getStateName(IBlockState state) {return "";} @Override + @SideOnly(Side.CLIENT) public IBlockColor getBlockColor() { return null; } @Override + @SideOnly(Side.CLIENT) public IItemColor getItemColor() { return null; } public BlockBOPHoney() { diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPLilypad.java b/src/main/java/biomesoplenty/common/block/BlockBOPLilypad.java index 28f413fcc..dc38465b1 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPLilypad.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPLilypad.java @@ -88,6 +88,7 @@ public class BlockBOPLilypad extends BlockLilyPad implements IBOPBlock }; } @Override + @SideOnly(Side.CLIENT) public IItemColor getItemColor() { return null; } public BlockBOPLilypad() diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPLog.java b/src/main/java/biomesoplenty/common/block/BlockBOPLog.java index 9d757d4d4..e54ce6600 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPLog.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPLog.java @@ -22,6 +22,8 @@ import net.minecraft.item.ItemBlock; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class BlockBOPLog extends BlockLog implements IBOPBlock { @@ -79,8 +81,10 @@ public class BlockBOPLog extends BlockLog implements IBOPBlock } } @Override + @SideOnly(Side.CLIENT) public IBlockColor getBlockColor() { return null; } @Override + @SideOnly(Side.CLIENT) public IItemColor getItemColor() { return null; } private BlockBOPLog() diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPMud.java b/src/main/java/biomesoplenty/common/block/BlockBOPMud.java index c2846ebb1..ea69bceb7 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPMud.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPMud.java @@ -33,6 +33,8 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.EnumPlantType; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class BlockBOPMud extends Block implements IBOPBlock, ISustainsPlantType { @@ -71,8 +73,10 @@ public class BlockBOPMud extends Block implements IBOPBlock, ISustainsPlantType return ((MudType) state.getValue(VARIANT)).getName(); } @Override + @SideOnly(Side.CLIENT) public IBlockColor getBlockColor() { return null; } @Override + @SideOnly(Side.CLIENT) public IItemColor getItemColor() { return null; } public BlockBOPMud() { diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPPlanks.java b/src/main/java/biomesoplenty/common/block/BlockBOPPlanks.java index 1f7ec04c8..f01e5cb70 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPPlanks.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPPlanks.java @@ -24,6 +24,8 @@ import net.minecraft.item.ItemBlock; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class BlockBOPPlanks extends Block implements IBOPBlock { @@ -75,8 +77,10 @@ public class BlockBOPPlanks extends Block implements IBOPBlock return ((BOPWoods) state.getValue(this.variantProperty)).getName() + "_planks"; } @Override + @SideOnly(Side.CLIENT) public IBlockColor getBlockColor() { return null; } @Override + @SideOnly(Side.CLIENT) public IItemColor getItemColor() { return null; } public BlockBOPPlanks() diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPSand.java b/src/main/java/biomesoplenty/common/block/BlockBOPSand.java index f88e78606..041b434b5 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPSand.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPSand.java @@ -27,6 +27,8 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.EnumPlantType; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class BlockBOPSand extends BlockFalling implements IBOPBlock, ISustainsPlantType { @@ -64,8 +66,10 @@ public class BlockBOPSand extends BlockFalling implements IBOPBlock, ISustainsPl return ((SandType) state.getValue(VARIANT)).getName(); } @Override + @SideOnly(Side.CLIENT) public IBlockColor getBlockColor() { return null; } @Override + @SideOnly(Side.CLIENT) public IItemColor getItemColor() { return null; } public BlockBOPSand() { diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPStone.java b/src/main/java/biomesoplenty/common/block/BlockBOPStone.java index 789fcecab..e1b8b07b6 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPStone.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPStone.java @@ -25,6 +25,8 @@ import net.minecraft.util.IStringSerializable; import net.minecraft.util.math.BlockPos; import net.minecraft.world.Explosion; import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class BlockBOPStone extends Block implements IBOPBlock { @@ -63,8 +65,10 @@ public class BlockBOPStone extends Block implements IBOPBlock return (Boolean.TRUE.equals(state.getValue(POLISHED)) ? "polished_" : "") + ((StoneType) state.getValue(VARIANT)).getName(); } @Override + @SideOnly(Side.CLIENT) public IBlockColor getBlockColor() { return null; } @Override + @SideOnly(Side.CLIENT) public IItemColor getItemColor() { return null; } public BlockBOPStone() diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPTerrarium.java b/src/main/java/biomesoplenty/common/block/BlockBOPTerrarium.java index 57b860413..8c9fe4ac9 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPTerrarium.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPTerrarium.java @@ -24,6 +24,8 @@ import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class BlockBOPTerrarium extends Block implements IBOPBlock { @@ -67,8 +69,10 @@ public class BlockBOPTerrarium extends Block implements IBOPBlock } } @Override + @SideOnly(Side.CLIENT) public IBlockColor getBlockColor() { return null; } @Override + @SideOnly(Side.CLIENT) public IItemColor getItemColor() { return null; } public BlockBOPTerrarium() diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPTurnip.java b/src/main/java/biomesoplenty/common/block/BlockBOPTurnip.java index afabb439b..55312d9ca 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPTurnip.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPTurnip.java @@ -21,6 +21,8 @@ import net.minecraft.item.ItemBlock; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraftforge.common.EnumPlantType; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; // TODO: stop snow settling on this (floats above it) public class BlockBOPTurnip extends BlockCrops implements IBOPBlock @@ -36,8 +38,10 @@ public class BlockBOPTurnip extends BlockCrops implements IBOPBlock @Override public String getStateName(IBlockState state) {return "";} @Override + @SideOnly(Side.CLIENT) public IBlockColor getBlockColor() { return null; } @Override + @SideOnly(Side.CLIENT) public IItemColor getItemColor() { return null; } @Override diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPVine.java b/src/main/java/biomesoplenty/common/block/BlockBOPVine.java index 658462bec..eb7eb6e8a 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPVine.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPVine.java @@ -20,6 +20,8 @@ import net.minecraft.item.ItemBlock; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class BlockBOPVine extends BlockVine implements IBOPBlock { @@ -34,8 +36,10 @@ public class BlockBOPVine extends BlockVine implements IBOPBlock @Override public String getStateName(IBlockState state) {return "";} @Override + @SideOnly(Side.CLIENT) public IBlockColor getBlockColor() { return useGreyScaleTextures ? BlockColoring.FOLIAGE_COLORING : null; } @Override + @SideOnly(Side.CLIENT) public IItemColor getItemColor() { return BlockColoring.BLOCK_ITEM_COLORING; } // if set to true, (the default), use BlockVine getBlockColor(), getRenderColor() and colorMultiplier() functions to color the texture based on biome diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPWoodStairs.java b/src/main/java/biomesoplenty/common/block/BlockBOPWoodStairs.java index c82a01a4a..8c48212d1 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPWoodStairs.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPWoodStairs.java @@ -23,6 +23,8 @@ import net.minecraft.item.ItemBlock; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class BlockBOPWoodStairs extends BlockStairs implements IBOPBlock { @@ -38,8 +40,10 @@ public class BlockBOPWoodStairs extends BlockStairs implements IBOPBlock @Override public String getStateName(IBlockState state) {return "";} @Override + @SideOnly(Side.CLIENT) public IBlockColor getBlockColor() { return null; } @Override + @SideOnly(Side.CLIENT) public IItemColor getItemColor() { return null; } // Map from woods to BlockBOPStairs instance and back diff --git a/src/main/java/biomesoplenty/common/item/ItemBOPSpawnEgg.java b/src/main/java/biomesoplenty/common/item/ItemBOPSpawnEgg.java index d99b4e5cb..82bb7765a 100644 --- a/src/main/java/biomesoplenty/common/item/ItemBOPSpawnEgg.java +++ b/src/main/java/biomesoplenty/common/item/ItemBOPSpawnEgg.java @@ -86,8 +86,8 @@ public class ItemBOPSpawnEgg extends Item implements IColoredItem return super.getUnlocalizedName(stack)+"_"+entityName; } - @SideOnly(Side.CLIENT) @Override + @SideOnly(Side.CLIENT) public IItemColor getItemColor() { return new IItemColor()