From 367fa2cefaac6ab67c5bb6624804cae78b0103d2 Mon Sep 17 00:00:00 2001 From: Adubbz Date: Wed, 16 Mar 2016 23:15:05 +1100 Subject: [PATCH] Fixed some model stuff, began work on fixing block colouring dependent on https://github.com/MinecraftForge/MinecraftForge/pull/2546 --- .../biomesoplenty/api/block/IBOPBlock.java | 3 +++ .../common/block/BlockBOPBones.java | 4 +++- .../common/block/BlockBOPCrystal.java | 4 +++- .../common/block/BlockBOPDecoration.java | 5 +++- .../common/block/BlockBOPDirt.java | 4 +++- .../common/block/BlockBOPDoor.java | 5 +++- .../common/block/BlockBOPDoubleWoodSlab.java | 3 +++ .../common/block/BlockBOPFarmland.java | 3 +++ .../common/block/BlockBOPFence.java | 3 +++ .../common/block/BlockBOPFenceGate.java | 5 +++- .../common/block/BlockBOPFlesh.java | 3 +++ .../common/block/BlockBOPGem.java | 4 +++- .../common/block/BlockBOPGemOre.java | 4 +++- .../common/block/BlockBOPGeneric.java | 4 +++- .../common/block/BlockBOPGrass.java | 4 +++- .../common/block/BlockBOPHalfOtherSlab.java | 4 +++- .../common/block/BlockBOPHalfWoodSlab.java | 5 +++- .../common/block/BlockBOPHive.java | 5 +++- .../common/block/BlockBOPHoney.java | 3 +++ .../common/block/BlockBOPLeaves.java | 3 +++ .../common/block/BlockBOPLilypad.java | 4 +++- .../common/block/BlockBOPLog.java | 5 ++-- .../common/block/BlockBOPMud.java | 3 +++ .../common/block/BlockBOPPlanks.java | 4 +++- .../common/block/BlockBOPSand.java | 3 +++ .../common/block/BlockBOPStone.java | 4 +++- .../common/block/BlockBOPTerrarium.java | 4 +++- .../common/block/BlockBOPTurnip.java | 4 +++- .../common/block/BlockBOPVine.java | 4 +++- .../common/block/BlockBOPWoodStairs.java | 3 +++ .../biomesoplenty/common/init/ModBlocks.java | 17 ++++++++++++-- .../biomesoplenty/core/BiomesOPlenty.java | 4 +++- .../java/biomesoplenty/core/ClientProxy.java | 23 ++++++++++++++++++- .../java/biomesoplenty/core/CommonProxy.java | 3 ++- .../biomesoplenty/models/block/bush.json | 2 +- .../biomesoplenty/models/block/dampgrass.json | 2 +- .../biomesoplenty/models/block/koru.json | 2 +- .../models/block/mediumgrass.json | 2 +- .../biomesoplenty/models/block/poisonivy.json | 2 +- .../models/block/shortgrass.json | 2 +- .../biomesoplenty/models/block/sprout.json | 2 +- .../models/block/wheatgrass.json | 2 +- .../models/item/cherry_stairs.json | 12 +--------- .../models/item/ebony_stairs.json | 12 +--------- .../models/item/ethereal_stairs.json | 12 +--------- .../models/item/eucalyptus_stairs.json | 12 +--------- .../biomesoplenty/models/item/fir_stairs.json | 12 +--------- .../models/item/hellbark_stairs.json | 12 +--------- .../models/item/jacaranda_stairs.json | 12 +--------- .../models/item/large_bone_segment.json | 9 +------- .../models/item/magic_stairs.json | 12 +--------- .../models/item/mahogany_stairs.json | 12 +--------- .../models/item/mangrove_stairs.json | 12 +--------- .../models/item/medium_bone_segment.json | 9 +------- .../models/item/mud_brick_stairs.json | 12 +--------- .../models/item/palm_stairs.json | 12 +--------- .../models/item/pine_stairs.json | 12 +--------- .../models/item/redwood_stairs.json | 12 +--------- .../models/item/sacred_oak_fence.json | 12 +--------- .../models/item/sacred_oak_stairs.json | 12 +--------- .../models/item/small_bone_segment.json | 9 +------- .../models/item/umbran_stairs.json | 12 +--------- .../models/item/willow_stairs.json | 12 +--------- 63 files changed, 166 insertions(+), 256 deletions(-) diff --git a/src/main/java/biomesoplenty/api/block/IBOPBlock.java b/src/main/java/biomesoplenty/api/block/IBOPBlock.java index 891f2cb90..cdc6d0e65 100644 --- a/src/main/java/biomesoplenty/api/block/IBOPBlock.java +++ b/src/main/java/biomesoplenty/api/block/IBOPBlock.java @@ -10,6 +10,7 @@ package biomesoplenty.api.block; import net.minecraft.block.properties.IProperty; import net.minecraft.block.state.IBlockState; +import net.minecraft.client.renderer.color.IBlockColor; import net.minecraft.item.ItemBlock; public interface IBOPBlock { @@ -18,5 +19,7 @@ public interface IBOPBlock { public IProperty[] getPresetProperties(); public IProperty[] getNonRenderingProperties(); public String getStateName(IBlockState state); + + public IBlockColor getColourHandler(); } \ No newline at end of file diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPBones.java b/src/main/java/biomesoplenty/common/block/BlockBOPBones.java index 3a1737897..6d7310eba 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPBones.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPBones.java @@ -17,6 +17,7 @@ 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.renderer.color.IBlockColor; import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; @@ -51,7 +52,8 @@ public class BlockBOPBones extends Block implements IBOPBlock public static final PropertyEnum AXIS = PropertyEnum.create("axis", EnumFacing.Axis.class); @Override protected BlockStateContainer createBlockState() {return new BlockStateContainer(this, new IProperty[] { AXIS, VARIANT });} - + @Override + public IBlockColor getColourHandler() { return null; } // implement IBOPBlock @Override diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPCrystal.java b/src/main/java/biomesoplenty/common/block/BlockBOPCrystal.java index 9fc47961f..7e205cd48 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPCrystal.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPCrystal.java @@ -18,6 +18,7 @@ import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.properties.IProperty; import net.minecraft.block.state.IBlockState; +import net.minecraft.client.renderer.color.IBlockColor; import net.minecraft.entity.Entity; import net.minecraft.entity.boss.EntityDragon; import net.minecraft.item.Item; @@ -37,7 +38,8 @@ public class BlockBOPCrystal extends Block implements IBOPBlock public IProperty[] getNonRenderingProperties() { return null; } @Override public String getStateName(IBlockState state) {return "";} - + @Override + public IBlockColor getColourHandler() { return null; } public BlockBOPCrystal() { super(Material.glass); diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPDecoration.java b/src/main/java/biomesoplenty/common/block/BlockBOPDecoration.java index 5fadd1918..fe4d4e609 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPDecoration.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPDecoration.java @@ -11,12 +11,14 @@ package biomesoplenty.common.block; import java.util.Random; import biomesoplenty.api.block.IBOPBlock; +import biomesoplenty.common.init.ModBlocks; 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.state.IBlockState; +import net.minecraft.client.renderer.color.IBlockColor; import net.minecraft.init.Blocks; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; @@ -41,7 +43,8 @@ public class BlockBOPDecoration extends Block implements IBOPBlock public IProperty[] getNonRenderingProperties() { return null; } @Override public String getStateName(IBlockState state) {return "";} - + @Override + public IBlockColor getColourHandler() { return ModBlocks.FOLIAGE_COLOURING; } // constructor public BlockBOPDecoration() { diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPDirt.java b/src/main/java/biomesoplenty/common/block/BlockBOPDirt.java index c7e7359d0..27f923185 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPDirt.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPDirt.java @@ -23,6 +23,7 @@ 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.client.renderer.color.IBlockColor; import net.minecraft.init.Blocks; import net.minecraft.item.ItemBlock; import net.minecraft.util.EnumFacing; @@ -66,7 +67,8 @@ public class BlockBOPDirt extends Block implements IBOPBlock, ISustainsPlantType { return (Boolean.TRUE.equals(state.getValue(COARSE)) ? "coarse_" : "") + ((BOPDirtType) state.getValue(VARIANT)).getName() + "_dirt"; } - + @Override + public IBlockColor getColourHandler() { 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 a8fccd04b..ae465bad8 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPDoor.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPDoor.java @@ -18,6 +18,7 @@ import net.minecraft.block.BlockDoor; import net.minecraft.block.material.Material; import net.minecraft.block.properties.IProperty; import net.minecraft.block.state.IBlockState; +import net.minecraft.client.renderer.color.IBlockColor; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; import net.minecraft.item.Item; @@ -42,7 +43,9 @@ public class BlockBOPDoor extends BlockDoor implements IBOPBlock public IProperty[] getNonRenderingProperties() { return new IProperty[] {POWERED}; } @Override public String getStateName(IBlockState state) {return "";} - + @Override + public IBlockColor getColourHandler() { return null; } + // Map from woods to BlockBOPDoor instance and back private static Map variantToBlock = new HashMap(); public static BlockBOPDoor getBlock(BOPWoods wood) diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPDoubleWoodSlab.java b/src/main/java/biomesoplenty/common/block/BlockBOPDoubleWoodSlab.java index 8e43c408c..5340ad893 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPDoubleWoodSlab.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPDoubleWoodSlab.java @@ -23,6 +23,7 @@ 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.client.renderer.color.IBlockColor; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.init.Blocks; import net.minecraft.item.Item; @@ -85,6 +86,8 @@ public class BlockBOPDoubleWoodSlab extends BlockSlab implements IBOPBlock { return "double_" + ((BOPWoods)state.getValue(this.variantProperty)).getName() + "_wood_slab"; } + @Override + public IBlockColor getColourHandler() { 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 74064dcfe..3f81f1615 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPFarmland.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPFarmland.java @@ -22,6 +22,7 @@ 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.client.renderer.color.IBlockColor; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -76,6 +77,8 @@ public class BlockBOPFarmland extends BlockFarmland implements IBOPBlock { return ((BlockBOPDirt.BOPDirtType) state.getValue(this.variantProperty)).getName() + "_farmland"; } + @Override + public IBlockColor getColourHandler() { 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 5484838bf..0bd4f506a 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPFence.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPFence.java @@ -20,6 +20,7 @@ import net.minecraft.block.material.MapColor; import net.minecraft.block.material.Material; import net.minecraft.block.properties.IProperty; import net.minecraft.block.state.IBlockState; +import net.minecraft.client.renderer.color.IBlockColor; import net.minecraft.init.Blocks; import net.minecraft.item.ItemBlock; import net.minecraft.util.EnumFacing; @@ -38,6 +39,8 @@ public class BlockBOPFence extends BlockFence implements IBOPBlock public IProperty[] getNonRenderingProperties() { return null; } @Override public String getStateName(IBlockState state) {return "";} + @Override + public IBlockColor getColourHandler() { return null; } // Map from woods to BlockBOPFence instance and back private static Map variantToBlock = new HashMap(); diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPFenceGate.java b/src/main/java/biomesoplenty/common/block/BlockBOPFenceGate.java index 50b8bd594..8656c4aae 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPFenceGate.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPFenceGate.java @@ -19,6 +19,7 @@ import net.minecraft.block.BlockPlanks; import net.minecraft.block.SoundType; import net.minecraft.block.properties.IProperty; import net.minecraft.block.state.IBlockState; +import net.minecraft.client.renderer.color.IBlockColor; import net.minecraft.init.Blocks; import net.minecraft.item.ItemBlock; import net.minecraft.util.EnumFacing; @@ -38,7 +39,9 @@ public class BlockBOPFenceGate extends BlockFenceGate implements IBOPBlock public IProperty[] getNonRenderingProperties() { return new IProperty[] {POWERED}; } @Override public String getStateName(IBlockState state) {return "";} - + @Override + public IBlockColor getColourHandler() { return null; } + // Map from woods to BlockBOPFenceGate instance and back private static Map variantToBlock = new HashMap(); public static BlockBOPFenceGate getBlock(BOPWoods wood) diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPFlesh.java b/src/main/java/biomesoplenty/common/block/BlockBOPFlesh.java index b98b0fc6a..80e1614f8 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPFlesh.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPFlesh.java @@ -18,6 +18,7 @@ import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.properties.IProperty; import net.minecraft.block.state.IBlockState; +import net.minecraft.client.renderer.color.IBlockColor; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; @@ -42,6 +43,8 @@ public class BlockBOPFlesh extends Block implements IBOPBlock public IProperty[] getNonRenderingProperties() { return null; } @Override public String getStateName(IBlockState state) {return "";} + @Override + public IBlockColor getColourHandler() { return null; } public BlockBOPFlesh() { super(Material.sponge); diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPGem.java b/src/main/java/biomesoplenty/common/block/BlockBOPGem.java index 1f732a15a..06ff9d03c 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPGem.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPGem.java @@ -18,6 +18,7 @@ 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.renderer.color.IBlockColor; import net.minecraft.item.ItemBlock; public class BlockBOPGem extends Block implements IBOPBlock @@ -40,7 +41,8 @@ public class BlockBOPGem extends Block implements IBOPBlock { return ((BOPGems) state.getValue(VARIANT)).getName() + "_block"; } - + @Override + public IBlockColor getColourHandler() { 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 b51f822d0..3d98d1053 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPGemOre.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPGemOre.java @@ -23,6 +23,7 @@ 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.client.renderer.color.IBlockColor; import net.minecraft.item.Item; import net.minecraft.item.ItemBlock; import net.minecraft.util.math.BlockPos; @@ -50,7 +51,8 @@ public class BlockBOPGemOre extends Block implements IBOPBlock { return ((BOPGems) state.getValue(VARIANT)).getName() + "_ore"; } - + @Override + public IBlockColor getColourHandler() { 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 d620383b1..b93cec90d 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPGeneric.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPGeneric.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.state.IBlockState; +import net.minecraft.client.renderer.color.IBlockColor; import net.minecraft.item.ItemBlock; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; @@ -37,7 +38,8 @@ public class BlockBOPGeneric extends Block implements IBOPBlock, ISustainsPlantT public IProperty[] getNonRenderingProperties() { return null; } @Override public String getStateName(IBlockState state) {return "";} - + @Override + public IBlockColor getColourHandler() { return null; } public BlockBOPGeneric() { // use rock as default material diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPGrass.java b/src/main/java/biomesoplenty/common/block/BlockBOPGrass.java index f191fee08..118d08356 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPGrass.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPGrass.java @@ -25,6 +25,7 @@ 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.client.renderer.color.IBlockColor; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -84,7 +85,8 @@ public class BlockBOPGrass extends BlockGrass implements IBOPBlock, ISustainsPla return grassType.getName() + "_grass_block"; } } - + @Override + public IBlockColor getColourHandler() { return null; } public BlockBOPGrass() { diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPHalfOtherSlab.java b/src/main/java/biomesoplenty/common/block/BlockBOPHalfOtherSlab.java index 304c52770..a7a6e6224 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPHalfOtherSlab.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPHalfOtherSlab.java @@ -22,6 +22,7 @@ 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.renderer.color.IBlockColor; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemBlock; @@ -83,7 +84,8 @@ public class BlockBOPHalfOtherSlab extends BlockSlab implements IBOPBlock { return ((SlabType) state.getValue(VARIANT)).getName() + "_slab"; } - + @Override + public IBlockColor getColourHandler() { 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 471e1cb40..3898ef6c3 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPHalfWoodSlab.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPHalfWoodSlab.java @@ -22,6 +22,7 @@ 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.client.renderer.color.IBlockColor; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.init.Blocks; import net.minecraft.item.Item; @@ -82,7 +83,9 @@ public class BlockBOPHalfWoodSlab extends BlockSlab implements IBOPBlock public String getStateName(IBlockState state) { return ((BOPWoods) state.getValue(this.variantProperty)).getName() + "_wood_slab"; - } + } + @Override + public IBlockColor getColourHandler() { 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 d8811331e..a9ad1a969 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPHive.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPHive.java @@ -21,6 +21,7 @@ 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.renderer.color.IBlockColor; import net.minecraft.item.Item; import net.minecraft.item.ItemBlock; import net.minecraft.util.IStringSerializable; @@ -62,7 +63,9 @@ public class BlockBOPHive extends Block implements IBOPBlock { return ((HiveType) state.getValue(VARIANT)).getName() + "_block"; } - + @Override + public IBlockColor getColourHandler() { return null; } + public BlockBOPHive() { super(Material.wood); diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPHoney.java b/src/main/java/biomesoplenty/common/block/BlockBOPHoney.java index 87e08a10e..9c733a938 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPHoney.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPHoney.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.state.IBlockState; +import net.minecraft.client.renderer.color.IBlockColor; import net.minecraft.item.ItemBlock; import net.minecraft.util.BlockRenderLayer; import net.minecraftforge.fml.relauncher.Side; @@ -32,6 +33,8 @@ public class BlockBOPHoney extends Block implements IBOPBlock public IProperty[] getNonRenderingProperties() { return null; } @Override public String getStateName(IBlockState state) {return "";} + @Override + public IBlockColor getColourHandler() { return null; } public BlockBOPHoney() { super(Material.glass); diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPLeaves.java b/src/main/java/biomesoplenty/common/block/BlockBOPLeaves.java index 1d14038e3..790aec7bb 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPLeaves.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPLeaves.java @@ -21,6 +21,7 @@ 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.client.renderer.color.IBlockColor; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; @@ -98,6 +99,8 @@ public class BlockBOPLeaves extends BlockLeaves implements IBOPBlock return tree.getName() + "_leaves"; } } + @Override + public IBlockColor getColourHandler() { return null; } private BlockBOPLeaves() { diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPLilypad.java b/src/main/java/biomesoplenty/common/block/BlockBOPLilypad.java index 837f67f36..2182ceb06 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPLilypad.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPLilypad.java @@ -16,6 +16,7 @@ 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.renderer.color.IBlockColor; import net.minecraft.item.ItemBlock; import net.minecraft.util.IStringSerializable; import net.minecraft.util.math.AxisAlignedBB; @@ -62,7 +63,8 @@ public class BlockBOPLilypad extends BlockLilyPad implements IBOPBlock return "lily_"+type.getName(); } - + @Override + public IBlockColor getColourHandler() { 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 c5ce6571e..8ca8e4f3e 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPLog.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPLog.java @@ -16,6 +16,7 @@ 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.client.renderer.color.IBlockColor; import net.minecraft.init.Blocks; import net.minecraft.item.ItemBlock; import net.minecraft.util.EnumFacing; @@ -77,8 +78,8 @@ public class BlockBOPLog extends BlockLog implements IBOPBlock return wood.getName() + "_log"; } } - - + @Override + public IBlockColor getColourHandler() { 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 7f438f5ca..56b44b749 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPMud.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPMud.java @@ -21,6 +21,7 @@ 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.renderer.color.IBlockColor; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; @@ -69,6 +70,8 @@ public class BlockBOPMud extends Block implements IBOPBlock, ISustainsPlantType { return ((MudType) state.getValue(VARIANT)).getName(); } + @Override + public IBlockColor getColourHandler() { 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 d06d52f62..b2725cf28 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPPlanks.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPPlanks.java @@ -18,6 +18,7 @@ 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.client.renderer.color.IBlockColor; import net.minecraft.init.Blocks; import net.minecraft.item.ItemBlock; import net.minecraft.util.EnumFacing; @@ -73,7 +74,8 @@ public class BlockBOPPlanks extends Block implements IBOPBlock { return ((BOPWoods) state.getValue(this.variantProperty)).getName() + "_planks"; } - + @Override + public IBlockColor getColourHandler() { 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 a9dd07f76..694b58956 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPSand.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPSand.java @@ -18,6 +18,7 @@ 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.renderer.color.IBlockColor; import net.minecraft.entity.Entity; import net.minecraft.item.ItemBlock; import net.minecraft.util.EnumFacing; @@ -63,6 +64,8 @@ public class BlockBOPSand extends BlockFalling implements IBOPBlock, ISustainsPl { return ((SandType) state.getValue(VARIANT)).getName(); } + @Override + public IBlockColor getColourHandler() { 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 40a87ba62..649e7d9ca 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPStone.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPStone.java @@ -18,6 +18,7 @@ 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.client.renderer.color.IBlockColor; import net.minecraft.entity.Entity; import net.minecraft.item.ItemBlock; import net.minecraft.util.IStringSerializable; @@ -61,7 +62,8 @@ public class BlockBOPStone extends Block implements IBOPBlock { return (Boolean.TRUE.equals(state.getValue(POLISHED)) ? "polished_" : "") + ((StoneType) state.getValue(VARIANT)).getName(); } - + @Override + public IBlockColor getColourHandler() { 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 7d71e9ef1..177b4aca6 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPTerrarium.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPTerrarium.java @@ -16,6 +16,7 @@ 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.renderer.color.IBlockColor; import net.minecraft.item.ItemBlock; import net.minecraft.util.BlockRenderLayer; import net.minecraft.util.IStringSerializable; @@ -62,7 +63,8 @@ public class BlockBOPTerrarium extends Block implements IBOPBlock return "terrarium_"+type.getName(); } } - + @Override + public IBlockColor getColourHandler() { 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 8f58fb798..289bf49ef 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPTurnip.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPTurnip.java @@ -15,6 +15,7 @@ import biomesoplenty.common.item.ItemBOPBlock; import net.minecraft.block.BlockCrops; import net.minecraft.block.properties.IProperty; import net.minecraft.block.state.IBlockState; +import net.minecraft.client.renderer.color.IBlockColor; import net.minecraft.item.Item; import net.minecraft.item.ItemBlock; import net.minecraft.util.math.BlockPos; @@ -34,7 +35,8 @@ public class BlockBOPTurnip extends BlockCrops implements IBOPBlock public IProperty[] getNonRenderingProperties() { return null; } @Override public String getStateName(IBlockState state) {return "";} - + @Override + public IBlockColor getColourHandler() { return null; } @Override protected Item getSeed() diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPVine.java b/src/main/java/biomesoplenty/common/block/BlockBOPVine.java index e0e405271..62a2dcaf8 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPVine.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPVine.java @@ -14,6 +14,7 @@ import net.minecraft.block.BlockVine; import net.minecraft.block.SoundType; import net.minecraft.block.properties.IProperty; import net.minecraft.block.state.IBlockState; +import net.minecraft.client.renderer.color.IBlockColor; import net.minecraft.init.Blocks; import net.minecraft.item.ItemBlock; import net.minecraft.util.EnumFacing; @@ -34,7 +35,8 @@ public class BlockBOPVine extends BlockVine implements IBOPBlock public IProperty[] getNonRenderingProperties() { return null; } @Override public String getStateName(IBlockState state) {return "";} - + @Override + public IBlockColor getColourHandler() { return null; } // if set to true, (the default), use BlockVine getBlockColor(), getRenderColor() and colorMultiplier() functions to color the texture based on biome // if set to false, use 0xFFFFFF for all the color functions so that the texture is used as it is diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPWoodStairs.java b/src/main/java/biomesoplenty/common/block/BlockBOPWoodStairs.java index bc8530aad..5eb2d17eb 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPWoodStairs.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPWoodStairs.java @@ -17,6 +17,7 @@ import biomesoplenty.common.item.ItemBOPBlock; import net.minecraft.block.BlockStairs; import net.minecraft.block.properties.IProperty; import net.minecraft.block.state.IBlockState; +import net.minecraft.client.renderer.color.IBlockColor; import net.minecraft.init.Blocks; import net.minecraft.item.ItemBlock; import net.minecraft.util.EnumFacing; @@ -36,6 +37,8 @@ public class BlockBOPWoodStairs extends BlockStairs implements IBOPBlock public IProperty[] getNonRenderingProperties() { return null; } @Override public String getStateName(IBlockState state) {return "";} + @Override + public IBlockColor getColourHandler() { return null; } // Map from woods to BlockBOPStairs instance and back private static Map variantToBlock = new HashMap(); diff --git a/src/main/java/biomesoplenty/common/init/ModBlocks.java b/src/main/java/biomesoplenty/common/init/ModBlocks.java index e59d337a9..65e1b10ad 100644 --- a/src/main/java/biomesoplenty/common/init/ModBlocks.java +++ b/src/main/java/biomesoplenty/common/init/ModBlocks.java @@ -77,6 +77,7 @@ import net.minecraft.block.BlockStairs; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; +import net.minecraft.client.renderer.color.IBlockColor; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.init.Items; import net.minecraft.item.Item; @@ -84,6 +85,10 @@ import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemBucket; import net.minecraft.item.ItemDoor; import net.minecraft.item.ItemSlab; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.ColorizerFoliage; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.biome.BiomeColorHelper; import net.minecraftforge.common.EnumPlantType; import net.minecraftforge.fluids.BlockFluidBase; import net.minecraftforge.fluids.Fluid; @@ -92,7 +97,15 @@ import net.minecraftforge.fml.common.registry.GameRegistry; public class ModBlocks { - + public static final IBlockColor FOLIAGE_COLOURING = new IBlockColor() + { + @Override + public int colorMultiplier(IBlockState state, IBlockAccess world, BlockPos pos, int tintIndex) + { + return world != null && pos != null ? BiomeColorHelper.getFoliageColorAtPos(world, pos) : ColorizerFoliage.getFoliageColorBasic(); + } + }; + // TODO: use getDrops() in classes where the drops are very specific, instead of implementing all 3 of quantityDropped() getItemDropped() and damageDropped() // TODO: docblocks! // TODO: make better use of canSustainPlant() in BlockDecoration and children @@ -353,7 +366,7 @@ public class ModBlocks IBOPBlock bopBlock = (IBOPBlock)block; GameRegistry.registerBlock(block, bopBlock.getItemClass(), blockName); - BiomesOPlenty.proxy.registerNonRenderingProperties(block); + BiomesOPlenty.proxy.registerBlockSided(block); // check for missing default states IBlockState defaultState = block.getDefaultState(); diff --git a/src/main/java/biomesoplenty/core/BiomesOPlenty.java b/src/main/java/biomesoplenty/core/BiomesOPlenty.java index 753aa9c15..e1d4b632c 100644 --- a/src/main/java/biomesoplenty/core/BiomesOPlenty.java +++ b/src/main/java/biomesoplenty/core/BiomesOPlenty.java @@ -84,6 +84,8 @@ public class BiomesOPlenty @EventHandler public void init(FMLInitializationEvent event) { + BiomesOPlenty.proxy.registerColouredBlocks(); + NetworkRegistry.INSTANCE.registerGuiHandler(this, new GuiHandler()); } @@ -92,7 +94,7 @@ public class BiomesOPlenty { ModCompatibility.postInit(); } - + @EventHandler public void serverStarting(FMLServerStartingEvent event) { diff --git a/src/main/java/biomesoplenty/core/ClientProxy.java b/src/main/java/biomesoplenty/core/ClientProxy.java index c147d7d9f..ac3899c9c 100644 --- a/src/main/java/biomesoplenty/core/ClientProxy.java +++ b/src/main/java/biomesoplenty/core/ClientProxy.java @@ -30,6 +30,7 @@ import biomesoplenty.common.entities.projectiles.EntityDart; import biomesoplenty.common.entities.projectiles.EntityMudball; import biomesoplenty.common.entities.projectiles.RenderDart; import biomesoplenty.common.entities.projectiles.RenderMudball; +import com.google.common.collect.Lists; import net.minecraft.block.Block; import net.minecraft.block.properties.IProperty; import net.minecraft.block.state.IBlockState; @@ -63,6 +64,8 @@ public class ClientProxy extends CommonProxy public static ResourceLocation[] bopTitlePanoramaPaths = new ResourceLocation[] {new ResourceLocation("biomesoplenty:textures/gui/title/background/panorama_0.png"), new ResourceLocation("biomesoplenty:textures/gui/title/background/panorama_1.png"), new ResourceLocation("biomesoplenty:textures/gui/title/background/panorama_2.png"), new ResourceLocation("biomesoplenty:textures/gui/title/background/panorama_3.png"), new ResourceLocation("biomesoplenty:textures/gui/title/background/panorama_4.png"), new ResourceLocation("biomesoplenty:textures/gui/title/background/panorama_5.png")}; public static ResourceLocation particleTexturesLocation = new ResourceLocation("biomesoplenty:textures/particles/particles.png"); + private static List blocksToColour = Lists.newArrayList(); + @Override public void registerRenderers() { @@ -80,6 +83,16 @@ public class ClientProxy extends CommonProxy replaceForgeResources(); } + @Override + public void registerColouredBlocks() + { + for (Block block : blocksToColour) + { + IBOPBlock bopBlock = (IBOPBlock)block; + Minecraft.getMinecraft().getBlockColors().registerBlockColorHandler(bopBlock.getColourHandler(), block); + } + } + @Override public void registerItemVariantModel(Item item, String name, int metadata) { @@ -91,11 +104,13 @@ public class ClientProxy extends CommonProxy } @Override - public void registerNonRenderingProperties(Block block) + public void registerBlockSided(Block block) { if (block instanceof IBOPBlock) { IBOPBlock bopBlock = (IBOPBlock)block; + + //Register non-rendering properties IProperty[] nonRenderingProperties = bopBlock.getNonRenderingProperties(); if (nonRenderingProperties != null) @@ -104,6 +119,12 @@ public class ClientProxy extends CommonProxy IStateMapper custom_mapper = (new StateMap.Builder()).ignore(nonRenderingProperties).build(); ModelLoader.setCustomStateMapper(block, custom_mapper); } + + //Register colour handlers + if (bopBlock.getColourHandler() != null) + { + blocksToColour.add(block); + } } } diff --git a/src/main/java/biomesoplenty/core/CommonProxy.java b/src/main/java/biomesoplenty/core/CommonProxy.java index 596d645bd..0e123aa9d 100644 --- a/src/main/java/biomesoplenty/core/CommonProxy.java +++ b/src/main/java/biomesoplenty/core/CommonProxy.java @@ -15,8 +15,9 @@ import net.minecraft.item.Item; public class CommonProxy { public void registerRenderers() {} + public void registerColouredBlocks() {} public void registerItemVariantModel(Item item, String name, int metadata) {} - public void registerNonRenderingProperties(Block block) {} + public void registerBlockSided(Block block) {} public void registerFluidBlockRendering(Block block, String name) {} public void spawnParticle(BOPParticleTypes type, double x, double y, double z, Object... info) {} } \ No newline at end of file diff --git a/src/main/resources/assets/biomesoplenty/models/block/bush.json b/src/main/resources/assets/biomesoplenty/models/block/bush.json index a66e12334..c30c1560d 100644 --- a/src/main/resources/assets/biomesoplenty/models/block/bush.json +++ b/src/main/resources/assets/biomesoplenty/models/block/bush.json @@ -1,5 +1,5 @@ { - "parent": "block/tallgrass", + "parent": "block/tinted_cross", "textures": { "cross": "biomesoplenty:blocks/bush" } diff --git a/src/main/resources/assets/biomesoplenty/models/block/dampgrass.json b/src/main/resources/assets/biomesoplenty/models/block/dampgrass.json index ab1606151..370245a90 100644 --- a/src/main/resources/assets/biomesoplenty/models/block/dampgrass.json +++ b/src/main/resources/assets/biomesoplenty/models/block/dampgrass.json @@ -1,5 +1,5 @@ { - "parent": "block/tallgrass", + "parent": "block/tinted_cross", "textures": { "cross": "biomesoplenty:blocks/dampgrass" } diff --git a/src/main/resources/assets/biomesoplenty/models/block/koru.json b/src/main/resources/assets/biomesoplenty/models/block/koru.json index 87b8de584..3d06eb8b2 100644 --- a/src/main/resources/assets/biomesoplenty/models/block/koru.json +++ b/src/main/resources/assets/biomesoplenty/models/block/koru.json @@ -1,5 +1,5 @@ { - "parent": "block/tallgrass", + "parent": "block/tinted_cross", "textures": { "cross": "biomesoplenty:blocks/koru" } diff --git a/src/main/resources/assets/biomesoplenty/models/block/mediumgrass.json b/src/main/resources/assets/biomesoplenty/models/block/mediumgrass.json index 2d9332735..88c4370a2 100644 --- a/src/main/resources/assets/biomesoplenty/models/block/mediumgrass.json +++ b/src/main/resources/assets/biomesoplenty/models/block/mediumgrass.json @@ -1,5 +1,5 @@ { - "parent": "block/tallgrass", + "parent": "block/tinted_cross", "textures": { "cross": "biomesoplenty:blocks/mediumgrass" } diff --git a/src/main/resources/assets/biomesoplenty/models/block/poisonivy.json b/src/main/resources/assets/biomesoplenty/models/block/poisonivy.json index a4e83b083..827b76c29 100644 --- a/src/main/resources/assets/biomesoplenty/models/block/poisonivy.json +++ b/src/main/resources/assets/biomesoplenty/models/block/poisonivy.json @@ -1,5 +1,5 @@ { - "parent": "block/tallgrass", + "parent": "block/tinted_cross", "textures": { "cross": "biomesoplenty:blocks/poisonivy" } diff --git a/src/main/resources/assets/biomesoplenty/models/block/shortgrass.json b/src/main/resources/assets/biomesoplenty/models/block/shortgrass.json index 338f0a776..f7e001401 100644 --- a/src/main/resources/assets/biomesoplenty/models/block/shortgrass.json +++ b/src/main/resources/assets/biomesoplenty/models/block/shortgrass.json @@ -1,5 +1,5 @@ { - "parent": "block/tallgrass", + "parent": "block/tinted_cross", "textures": { "cross": "biomesoplenty:blocks/shortgrass" } diff --git a/src/main/resources/assets/biomesoplenty/models/block/sprout.json b/src/main/resources/assets/biomesoplenty/models/block/sprout.json index 31d062a31..25195220d 100644 --- a/src/main/resources/assets/biomesoplenty/models/block/sprout.json +++ b/src/main/resources/assets/biomesoplenty/models/block/sprout.json @@ -1,5 +1,5 @@ { - "parent": "block/tallgrass", + "parent": "block/tinted_cross", "textures": { "cross": "biomesoplenty:blocks/sprout" } diff --git a/src/main/resources/assets/biomesoplenty/models/block/wheatgrass.json b/src/main/resources/assets/biomesoplenty/models/block/wheatgrass.json index de4381488..738daa673 100644 --- a/src/main/resources/assets/biomesoplenty/models/block/wheatgrass.json +++ b/src/main/resources/assets/biomesoplenty/models/block/wheatgrass.json @@ -1,5 +1,5 @@ { - "parent": "block/tallgrass", + "parent": "block/tinted_cross", "textures": { "cross": "biomesoplenty:blocks/wheatgrass" } diff --git a/src/main/resources/assets/biomesoplenty/models/item/cherry_stairs.json b/src/main/resources/assets/biomesoplenty/models/item/cherry_stairs.json index 695b1e262..5e2021f5c 100644 --- a/src/main/resources/assets/biomesoplenty/models/item/cherry_stairs.json +++ b/src/main/resources/assets/biomesoplenty/models/item/cherry_stairs.json @@ -1,13 +1,3 @@ { - "parent": "biomesoplenty:block/cherry_stairs", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - }, - "gui": { - "rotation": [ 0, 180, 0 ] - } - } + "parent": "biomesoplenty:block/cherry_stairs" } diff --git a/src/main/resources/assets/biomesoplenty/models/item/ebony_stairs.json b/src/main/resources/assets/biomesoplenty/models/item/ebony_stairs.json index b7c86ad68..767afe5ae 100644 --- a/src/main/resources/assets/biomesoplenty/models/item/ebony_stairs.json +++ b/src/main/resources/assets/biomesoplenty/models/item/ebony_stairs.json @@ -1,13 +1,3 @@ { - "parent": "biomesoplenty:block/ebony_stairs", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - }, - "gui": { - "rotation": [ 0, 180, 0 ] - } - } + "parent": "biomesoplenty:block/ebony_stairs" } diff --git a/src/main/resources/assets/biomesoplenty/models/item/ethereal_stairs.json b/src/main/resources/assets/biomesoplenty/models/item/ethereal_stairs.json index 4c285f6f2..b56a3cff3 100644 --- a/src/main/resources/assets/biomesoplenty/models/item/ethereal_stairs.json +++ b/src/main/resources/assets/biomesoplenty/models/item/ethereal_stairs.json @@ -1,13 +1,3 @@ { - "parent": "biomesoplenty:block/ethereal_stairs", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - }, - "gui": { - "rotation": [ 0, 180, 0 ] - } - } + "parent": "biomesoplenty:block/ethereal_stairs" } diff --git a/src/main/resources/assets/biomesoplenty/models/item/eucalyptus_stairs.json b/src/main/resources/assets/biomesoplenty/models/item/eucalyptus_stairs.json index 7fbf6d3f1..cbd5ae772 100644 --- a/src/main/resources/assets/biomesoplenty/models/item/eucalyptus_stairs.json +++ b/src/main/resources/assets/biomesoplenty/models/item/eucalyptus_stairs.json @@ -1,13 +1,3 @@ { - "parent": "biomesoplenty:block/eucalyptus_stairs", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - }, - "gui": { - "rotation": [ 0, 180, 0 ] - } - } + "parent": "biomesoplenty:block/eucalyptus_stairs" } diff --git a/src/main/resources/assets/biomesoplenty/models/item/fir_stairs.json b/src/main/resources/assets/biomesoplenty/models/item/fir_stairs.json index 5079693de..8c7411ecc 100644 --- a/src/main/resources/assets/biomesoplenty/models/item/fir_stairs.json +++ b/src/main/resources/assets/biomesoplenty/models/item/fir_stairs.json @@ -1,13 +1,3 @@ { - "parent": "biomesoplenty:block/fir_stairs", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - }, - "gui": { - "rotation": [ 0, 180, 0 ] - } - } + "parent": "biomesoplenty:block/fir_stairs" } diff --git a/src/main/resources/assets/biomesoplenty/models/item/hellbark_stairs.json b/src/main/resources/assets/biomesoplenty/models/item/hellbark_stairs.json index 445c9b5ff..15efb2167 100644 --- a/src/main/resources/assets/biomesoplenty/models/item/hellbark_stairs.json +++ b/src/main/resources/assets/biomesoplenty/models/item/hellbark_stairs.json @@ -1,13 +1,3 @@ { - "parent": "biomesoplenty:block/hellbark_stairs", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - }, - "gui": { - "rotation": [ 0, 180, 0 ] - } - } + "parent": "biomesoplenty:block/hellbark_stairs" } diff --git a/src/main/resources/assets/biomesoplenty/models/item/jacaranda_stairs.json b/src/main/resources/assets/biomesoplenty/models/item/jacaranda_stairs.json index 68827082f..1ed1aad6b 100644 --- a/src/main/resources/assets/biomesoplenty/models/item/jacaranda_stairs.json +++ b/src/main/resources/assets/biomesoplenty/models/item/jacaranda_stairs.json @@ -1,13 +1,3 @@ { - "parent": "biomesoplenty:block/jacaranda_stairs", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - }, - "gui": { - "rotation": [ 0, 180, 0 ] - } - } + "parent": "biomesoplenty:block/jacaranda_stairs" } diff --git a/src/main/resources/assets/biomesoplenty/models/item/large_bone_segment.json b/src/main/resources/assets/biomesoplenty/models/item/large_bone_segment.json index c7787262a..542b47de2 100755 --- a/src/main/resources/assets/biomesoplenty/models/item/large_bone_segment.json +++ b/src/main/resources/assets/biomesoplenty/models/item/large_bone_segment.json @@ -1,10 +1,3 @@ { - "parent": "biomesoplenty:block/large_bone_segment", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } + "parent": "biomesoplenty:block/large_bone_segment" } diff --git a/src/main/resources/assets/biomesoplenty/models/item/magic_stairs.json b/src/main/resources/assets/biomesoplenty/models/item/magic_stairs.json index 9fc17ef7c..a655bc5d9 100644 --- a/src/main/resources/assets/biomesoplenty/models/item/magic_stairs.json +++ b/src/main/resources/assets/biomesoplenty/models/item/magic_stairs.json @@ -1,13 +1,3 @@ { - "parent": "biomesoplenty:block/magic_stairs", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - }, - "gui": { - "rotation": [ 0, 180, 0 ] - } - } + "parent": "biomesoplenty:block/magic_stairs" } diff --git a/src/main/resources/assets/biomesoplenty/models/item/mahogany_stairs.json b/src/main/resources/assets/biomesoplenty/models/item/mahogany_stairs.json index abec29178..4848541d7 100644 --- a/src/main/resources/assets/biomesoplenty/models/item/mahogany_stairs.json +++ b/src/main/resources/assets/biomesoplenty/models/item/mahogany_stairs.json @@ -1,13 +1,3 @@ { - "parent": "biomesoplenty:block/mahogany_stairs", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - }, - "gui": { - "rotation": [ 0, 180, 0 ] - } - } + "parent": "biomesoplenty:block/mahogany_stairs" } diff --git a/src/main/resources/assets/biomesoplenty/models/item/mangrove_stairs.json b/src/main/resources/assets/biomesoplenty/models/item/mangrove_stairs.json index cb3933ca5..045c1fec8 100644 --- a/src/main/resources/assets/biomesoplenty/models/item/mangrove_stairs.json +++ b/src/main/resources/assets/biomesoplenty/models/item/mangrove_stairs.json @@ -1,13 +1,3 @@ { - "parent": "biomesoplenty:block/mangrove_stairs", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - }, - "gui": { - "rotation": [ 0, 180, 0 ] - } - } + "parent": "biomesoplenty:block/mangrove_stairs" } diff --git a/src/main/resources/assets/biomesoplenty/models/item/medium_bone_segment.json b/src/main/resources/assets/biomesoplenty/models/item/medium_bone_segment.json index d64326a08..0ad6c9d8f 100755 --- a/src/main/resources/assets/biomesoplenty/models/item/medium_bone_segment.json +++ b/src/main/resources/assets/biomesoplenty/models/item/medium_bone_segment.json @@ -1,10 +1,3 @@ { - "parent": "biomesoplenty:block/medium_bone_segment", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } + "parent": "biomesoplenty:block/medium_bone_segment" } diff --git a/src/main/resources/assets/biomesoplenty/models/item/mud_brick_stairs.json b/src/main/resources/assets/biomesoplenty/models/item/mud_brick_stairs.json index c5744b491..bb2a4ae0d 100644 --- a/src/main/resources/assets/biomesoplenty/models/item/mud_brick_stairs.json +++ b/src/main/resources/assets/biomesoplenty/models/item/mud_brick_stairs.json @@ -1,13 +1,3 @@ { - "parent": "biomesoplenty:block/mud_brick_stairs", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - }, - "gui": { - "rotation": [ 0, 180, 0 ] - } - } + "parent": "biomesoplenty:block/mud_brick_stairs" } diff --git a/src/main/resources/assets/biomesoplenty/models/item/palm_stairs.json b/src/main/resources/assets/biomesoplenty/models/item/palm_stairs.json index a0e2cb664..009b1cca6 100644 --- a/src/main/resources/assets/biomesoplenty/models/item/palm_stairs.json +++ b/src/main/resources/assets/biomesoplenty/models/item/palm_stairs.json @@ -1,13 +1,3 @@ { - "parent": "biomesoplenty:block/palm_stairs", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - }, - "gui": { - "rotation": [ 0, 180, 0 ] - } - } + "parent": "biomesoplenty:block/palm_stairs" } diff --git a/src/main/resources/assets/biomesoplenty/models/item/pine_stairs.json b/src/main/resources/assets/biomesoplenty/models/item/pine_stairs.json index 3c92e4bbc..356bc349d 100644 --- a/src/main/resources/assets/biomesoplenty/models/item/pine_stairs.json +++ b/src/main/resources/assets/biomesoplenty/models/item/pine_stairs.json @@ -1,13 +1,3 @@ { - "parent": "biomesoplenty:block/pine_stairs", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - }, - "gui": { - "rotation": [ 0, 180, 0 ] - } - } + "parent": "biomesoplenty:block/pine_stairs" } diff --git a/src/main/resources/assets/biomesoplenty/models/item/redwood_stairs.json b/src/main/resources/assets/biomesoplenty/models/item/redwood_stairs.json index ba03c26a7..4f7e3162d 100644 --- a/src/main/resources/assets/biomesoplenty/models/item/redwood_stairs.json +++ b/src/main/resources/assets/biomesoplenty/models/item/redwood_stairs.json @@ -1,13 +1,3 @@ { - "parent": "biomesoplenty:block/redwood_stairs", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - }, - "gui": { - "rotation": [ 0, 180, 0 ] - } - } + "parent": "biomesoplenty:block/redwood_stairs" } diff --git a/src/main/resources/assets/biomesoplenty/models/item/sacred_oak_fence.json b/src/main/resources/assets/biomesoplenty/models/item/sacred_oak_fence.json index 7645ae645..335e46b22 100644 --- a/src/main/resources/assets/biomesoplenty/models/item/sacred_oak_fence.json +++ b/src/main/resources/assets/biomesoplenty/models/item/sacred_oak_fence.json @@ -1,14 +1,4 @@ { - "parent": "biomesoplenty:block/sacred_oak_fence_inventory", - "display": { - "thirdperson": { - "rotation": [ 0, 0, 180 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - }, - "gui": { - "rotation": [ 0, 90, 0 ] - } - } + "parent": "biomesoplenty:block/sacred_oak_fence_inventory" } diff --git a/src/main/resources/assets/biomesoplenty/models/item/sacred_oak_stairs.json b/src/main/resources/assets/biomesoplenty/models/item/sacred_oak_stairs.json index 4207e9d1b..799ba12b4 100644 --- a/src/main/resources/assets/biomesoplenty/models/item/sacred_oak_stairs.json +++ b/src/main/resources/assets/biomesoplenty/models/item/sacred_oak_stairs.json @@ -1,13 +1,3 @@ { - "parent": "biomesoplenty:block/sacred_oak_stairs", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - }, - "gui": { - "rotation": [ 0, 180, 0 ] - } - } + "parent": "biomesoplenty:block/sacred_oak_stairs" } diff --git a/src/main/resources/assets/biomesoplenty/models/item/small_bone_segment.json b/src/main/resources/assets/biomesoplenty/models/item/small_bone_segment.json index 1016ce346..afc3f7bfa 100755 --- a/src/main/resources/assets/biomesoplenty/models/item/small_bone_segment.json +++ b/src/main/resources/assets/biomesoplenty/models/item/small_bone_segment.json @@ -1,10 +1,3 @@ { - "parent": "biomesoplenty:block/small_bone_segment", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } + "parent": "biomesoplenty:block/small_bone_segment" } diff --git a/src/main/resources/assets/biomesoplenty/models/item/umbran_stairs.json b/src/main/resources/assets/biomesoplenty/models/item/umbran_stairs.json index cee78adcb..1f60e11d6 100644 --- a/src/main/resources/assets/biomesoplenty/models/item/umbran_stairs.json +++ b/src/main/resources/assets/biomesoplenty/models/item/umbran_stairs.json @@ -1,13 +1,3 @@ { - "parent": "biomesoplenty:block/umbran_stairs", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - }, - "gui": { - "rotation": [ 0, 180, 0 ] - } - } + "parent": "biomesoplenty:block/umbran_stairs" } diff --git a/src/main/resources/assets/biomesoplenty/models/item/willow_stairs.json b/src/main/resources/assets/biomesoplenty/models/item/willow_stairs.json index 00a1a9b57..ff9dabe02 100644 --- a/src/main/resources/assets/biomesoplenty/models/item/willow_stairs.json +++ b/src/main/resources/assets/biomesoplenty/models/item/willow_stairs.json @@ -1,13 +1,3 @@ { - "parent": "biomesoplenty:block/willow_stairs", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - }, - "gui": { - "rotation": [ 0, 180, 0 ] - } - } + "parent": "biomesoplenty:block/willow_stairs" }