From b6c259e4ac015d538c1d6a17bfdeffba71b5be75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emmanuel=20Beno=C3=AEt?= Date: Mon, 11 Jul 2016 01:04:05 +0200 Subject: [PATCH] Bamboo and hevea stairs and slabs --- TODO.txt | 2 +- src/java/mmm/deco/DSlab.java | 27 +++++++++--- src/java/mmm/deco/DStairs.java | 25 ++++++++++- src/java/mmm/deco/DecorativeBlocks.java | 21 ++++++--- src/java/mmm/materials/MTree.java | 14 +++++- .../mmm/blockstates/deco/slabs/bamboo.json | 6 +++ .../blockstates/deco/slabs/bamboo_double.json | 5 +++ .../mmm/blockstates/deco/slabs/hevea.json | 6 +++ .../blockstates/deco/slabs/hevea_double.json | 5 +++ .../mmm/blockstates/deco/stairs/bamboo.json | 44 +++++++++++++++++++ .../mmm/blockstates/deco/stairs/hevea.json | 44 +++++++++++++++++++ src/resources/assets/mmm/lang/en_US.lang | 4 ++ .../block/deco/slabs/bamboo/bottom.json | 8 ++++ .../block/deco/slabs/bamboo/double.json | 7 +++ .../models/block/deco/slabs/bamboo/top.json | 8 ++++ .../models/block/deco/slabs/hevea/bottom.json | 8 ++++ .../models/block/deco/slabs/hevea/double.json | 7 +++ .../models/block/deco/slabs/hevea/top.json | 8 ++++ .../block/deco/stairs/bamboo/inner.json | 8 ++++ .../block/deco/stairs/bamboo/outer.json | 8 ++++ .../block/deco/stairs/bamboo/straight.json | 8 ++++ .../models/block/deco/stairs/hevea/inner.json | 8 ++++ .../models/block/deco/stairs/hevea/outer.json | 8 ++++ .../block/deco/stairs/hevea/straight.json | 8 ++++ .../mmm/models/item/deco/slabs/bamboo.json | 3 ++ .../mmm/models/item/deco/slabs/hevea.json | 3 ++ .../mmm/models/item/deco/stairs/bamboo.json | 3 ++ .../mmm/models/item/deco/stairs/hevea.json | 3 ++ 28 files changed, 293 insertions(+), 16 deletions(-) create mode 100644 src/resources/assets/mmm/blockstates/deco/slabs/bamboo.json create mode 100644 src/resources/assets/mmm/blockstates/deco/slabs/bamboo_double.json create mode 100644 src/resources/assets/mmm/blockstates/deco/slabs/hevea.json create mode 100644 src/resources/assets/mmm/blockstates/deco/slabs/hevea_double.json create mode 100644 src/resources/assets/mmm/blockstates/deco/stairs/bamboo.json create mode 100644 src/resources/assets/mmm/blockstates/deco/stairs/hevea.json create mode 100644 src/resources/assets/mmm/models/block/deco/slabs/bamboo/bottom.json create mode 100644 src/resources/assets/mmm/models/block/deco/slabs/bamboo/double.json create mode 100644 src/resources/assets/mmm/models/block/deco/slabs/bamboo/top.json create mode 100644 src/resources/assets/mmm/models/block/deco/slabs/hevea/bottom.json create mode 100644 src/resources/assets/mmm/models/block/deco/slabs/hevea/double.json create mode 100644 src/resources/assets/mmm/models/block/deco/slabs/hevea/top.json create mode 100644 src/resources/assets/mmm/models/block/deco/stairs/bamboo/inner.json create mode 100644 src/resources/assets/mmm/models/block/deco/stairs/bamboo/outer.json create mode 100644 src/resources/assets/mmm/models/block/deco/stairs/bamboo/straight.json create mode 100644 src/resources/assets/mmm/models/block/deco/stairs/hevea/inner.json create mode 100644 src/resources/assets/mmm/models/block/deco/stairs/hevea/outer.json create mode 100644 src/resources/assets/mmm/models/block/deco/stairs/hevea/straight.json create mode 100644 src/resources/assets/mmm/models/item/deco/slabs/bamboo.json create mode 100644 src/resources/assets/mmm/models/item/deco/slabs/hevea.json create mode 100644 src/resources/assets/mmm/models/item/deco/stairs/bamboo.json create mode 100644 src/resources/assets/mmm/models/item/deco/stairs/hevea.json diff --git a/TODO.txt b/TODO.txt index e7e3759..54cc6e2 100644 --- a/TODO.txt +++ b/TODO.txt @@ -9,7 +9,7 @@ deco No Stone - Smooth + stairs + slabs Limestone Slate Basalt -deco No Wood - Stairs + slabs + doors + fences + chairs + tables + thrones +deco No Wood - Doors + fences + chairs + tables + thrones Hevea Bamboo ------------------------------------------------------------------------------------------------------- diff --git a/src/java/mmm/deco/DSlab.java b/src/java/mmm/deco/DSlab.java index 22df865..6eae237 100644 --- a/src/java/mmm/deco/DSlab.java +++ b/src/java/mmm/deco/DSlab.java @@ -1,6 +1,7 @@ package mmm.deco; +import mmm.materials.MTree; import mmm.utils.I_URecipeRegistrar; import mmm.utils.URegistry; import net.minecraft.block.Block; @@ -16,33 +17,47 @@ import net.minecraftforge.fml.common.registry.GameRegistry; public class DSlab implements I_URecipeRegistrar { - public static DSlab fromStone( final BlockStone.EnumType type ) + public static DSlab fromVanillaSmoothStone( final BlockStone.EnumType type ) { final IBlockState bs = Blocks.STONE.getDefaultState( ).withProperty( BlockStone.VARIANT , type ); final String name = type.getName( ).replace( "smooth_" , "" ); return new DSlab( bs , name ); } + + public static DSlab fromWood( final MTree materials ) + { + final DSlab slab = new DSlab( materials.PLANKS.getDefaultState( ) , materials.NAME ); + if ( materials.getBaseFlammability( ) != 0 ) { + Blocks.FIRE.setFireInfo( slab.HALF , materials.getBaseFireEncouragement( ) , + materials.getBaseFlammability( ) * 4 ); + Blocks.FIRE.setFireInfo( slab.DOUBLE , materials.getBaseFireEncouragement( ) , + materials.getBaseFlammability( ) * 4 ); + } + return slab; + } + public final DSlabHalf HALF; public final DSlabDouble DOUBLE; public final ItemSlab ITEM; + public DSlab( final Block modelBlock , final String name ) + { + this( modelBlock.getDefaultState( ) , name ); + } + + public DSlab( final IBlockState modelState , final String name ) { this.HALF = new DSlabHalf( modelState , name ); this.DOUBLE = new DSlabDouble( this.HALF , name ); this.ITEM = new ItemSlab( this.HALF , this.HALF , this.DOUBLE ); URegistry.setIdentifiers( this.ITEM , "deco" , "slabs" , name ); - } - - public DSlab register( ) - { URegistry.addBlock( this.HALF , this.ITEM ); URegistry.addBlock( this.DOUBLE , null ); URegistry.addRecipeRegistrar( this ); - return this; } diff --git a/src/java/mmm/deco/DStairs.java b/src/java/mmm/deco/DStairs.java index 4813279..7715fde 100644 --- a/src/java/mmm/deco/DStairs.java +++ b/src/java/mmm/deco/DStairs.java @@ -1,6 +1,7 @@ package mmm.deco; +import mmm.materials.MTree; import mmm.utils.I_URecipeRegistrar; import mmm.utils.URegistry; import net.minecraft.block.Block; @@ -17,16 +18,36 @@ public class DStairs extends BlockStairs implements I_URecipeRegistrar { - public static DStairs fromStone( final BlockStone.EnumType type ) + public static DStairs fromVanillaSmoothStone( final BlockStone.EnumType type ) { final IBlockState bs = Blocks.STONE.getDefaultState( ).withProperty( BlockStone.VARIANT , type ); - return new DStairs( bs , type.getName( ).replace( "smooth_" , "" ) ); + final DStairs stairs = new DStairs( bs , type.getName( ).replace( "smooth_" , "" ) ); + URegistry.addBlock( stairs ); + return stairs; + } + + + public static DStairs fromWood( final MTree materials ) + { + final DStairs stairs = new DStairs( materials.PLANKS.getDefaultState( ) , materials.NAME ); + URegistry.addBlock( stairs ); + if ( materials.getBaseFlammability( ) != 0 ) { + Blocks.FIRE.setFireInfo( stairs , materials.getBaseFireEncouragement( ) , + materials.getBaseFlammability( ) * 4 ); + } + return stairs; } public final IBlockState modelState; public final Block modelBlock; + public DStairs( final Block modelBlock , final String name ) + { + this( modelBlock.getDefaultState( ) , name ); + } + + public DStairs( final IBlockState modelState , final String name ) { super( modelState ); diff --git a/src/java/mmm/deco/DecorativeBlocks.java b/src/java/mmm/deco/DecorativeBlocks.java index 9d408b5..5b636fa 100644 --- a/src/java/mmm/deco/DecorativeBlocks.java +++ b/src/java/mmm/deco/DecorativeBlocks.java @@ -1,6 +1,7 @@ package mmm.deco; +import mmm.materials.Materials; import mmm.utils.URegistry; import net.minecraft.block.BlockStone; @@ -11,10 +12,14 @@ public class DecorativeBlocks public static final DStairs STAIRS_GRANITE; public static final DStairs STAIRS_DIORITE; public static final DStairs STAIRS_ANDESITE; + public static final DStairs STAIRS_HEVEA; + public static final DStairs STAIRS_BAMBOO; public static final DSlab SLAB_GRANITE; public static final DSlab SLAB_DIORITE; public static final DSlab SLAB_ANDESITE; + public static final DSlab SLAB_HEVEA; + public static final DSlab SLAB_BAMBOO; public static final DTable TABLE_OAK; public static final DTable TABLE_BIRCH; @@ -43,14 +48,18 @@ public class DecorativeBlocks final BlockStone.EnumType andesite = BlockStone.EnumType.ANDESITE_SMOOTH; // Stairs - URegistry.addBlock( STAIRS_GRANITE = DStairs.fromStone( granite ) ); - URegistry.addBlock( STAIRS_DIORITE = DStairs.fromStone( diorite ) ); - URegistry.addBlock( STAIRS_ANDESITE = DStairs.fromStone( andesite ) ); + STAIRS_GRANITE = DStairs.fromVanillaSmoothStone( granite ); + STAIRS_DIORITE = DStairs.fromVanillaSmoothStone( diorite ); + STAIRS_ANDESITE = DStairs.fromVanillaSmoothStone( andesite ); + STAIRS_HEVEA = DStairs.fromWood( Materials.TREE.HEVEA ); + STAIRS_BAMBOO = DStairs.fromWood( Materials.TREE.BAMBOO ); // Slabs - SLAB_GRANITE = DSlab.fromStone( granite ).register( ); - SLAB_DIORITE = DSlab.fromStone( diorite ).register( ); - SLAB_ANDESITE = DSlab.fromStone( andesite ).register( ); + SLAB_GRANITE = DSlab.fromVanillaSmoothStone( granite ); + SLAB_DIORITE = DSlab.fromVanillaSmoothStone( diorite ); + SLAB_ANDESITE = DSlab.fromVanillaSmoothStone( andesite ); + SLAB_HEVEA = DSlab.fromWood( Materials.TREE.HEVEA ); + SLAB_BAMBOO = DSlab.fromWood( Materials.TREE.BAMBOO ); // Tables URegistry.addBlock( TABLE_OAK = new DTable( E_DWoodType.OAK ) ); diff --git a/src/java/mmm/materials/MTree.java b/src/java/mmm/materials/MTree.java index dfadfd2..af17b90 100644 --- a/src/java/mmm/materials/MTree.java +++ b/src/java/mmm/materials/MTree.java @@ -249,12 +249,25 @@ public class MTree } } + public boolean hasLogBoundingBox( ) { return this.logBoundingBoxX != null; } + public int getBaseFireEncouragement( ) + { + return baseFireEncouragement; + } + + + public int getBaseFlammability( ) + { + return baseFlammability; + } + + public int getSaplingDropChance( ) { return this.saplingDropChance; @@ -507,5 +520,4 @@ public class MTree 'I' , new ItemStack( Items.IRON_INGOT ) ); } - } diff --git a/src/resources/assets/mmm/blockstates/deco/slabs/bamboo.json b/src/resources/assets/mmm/blockstates/deco/slabs/bamboo.json new file mode 100644 index 0000000..8c28b85 --- /dev/null +++ b/src/resources/assets/mmm/blockstates/deco/slabs/bamboo.json @@ -0,0 +1,6 @@ +{ + "variants": { + "half=bottom,variant=default": { "model": "mmm:deco/slabs/bamboo/bottom" }, + "half=top,variant=default": { "model": "mmm:deco/slabs/bamboo/top" } + } +} \ No newline at end of file diff --git a/src/resources/assets/mmm/blockstates/deco/slabs/bamboo_double.json b/src/resources/assets/mmm/blockstates/deco/slabs/bamboo_double.json new file mode 100644 index 0000000..592aaab --- /dev/null +++ b/src/resources/assets/mmm/blockstates/deco/slabs/bamboo_double.json @@ -0,0 +1,5 @@ +{ + "variants": { + "variant=default": { "model": "mmm:deco/slabs/bamboo/double" } + } +} diff --git a/src/resources/assets/mmm/blockstates/deco/slabs/hevea.json b/src/resources/assets/mmm/blockstates/deco/slabs/hevea.json new file mode 100644 index 0000000..296ed82 --- /dev/null +++ b/src/resources/assets/mmm/blockstates/deco/slabs/hevea.json @@ -0,0 +1,6 @@ +{ + "variants": { + "half=bottom,variant=default": { "model": "mmm:deco/slabs/hevea/bottom" }, + "half=top,variant=default": { "model": "mmm:deco/slabs/hevea/top" } + } +} \ No newline at end of file diff --git a/src/resources/assets/mmm/blockstates/deco/slabs/hevea_double.json b/src/resources/assets/mmm/blockstates/deco/slabs/hevea_double.json new file mode 100644 index 0000000..832150d --- /dev/null +++ b/src/resources/assets/mmm/blockstates/deco/slabs/hevea_double.json @@ -0,0 +1,5 @@ +{ + "variants": { + "variant=default": { "model": "mmm:deco/slabs/hevea/double" } + } +} diff --git a/src/resources/assets/mmm/blockstates/deco/stairs/bamboo.json b/src/resources/assets/mmm/blockstates/deco/stairs/bamboo.json new file mode 100644 index 0000000..ec0cea6 --- /dev/null +++ b/src/resources/assets/mmm/blockstates/deco/stairs/bamboo.json @@ -0,0 +1,44 @@ +{ + "variants": { + "facing=east,half=bottom,shape=straight": { "model": "mmm:deco/stairs/bamboo/straight" }, + "facing=west,half=bottom,shape=straight": { "model": "mmm:deco/stairs/bamboo/straight", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "mmm:deco/stairs/bamboo/straight", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "mmm:deco/stairs/bamboo/straight", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "mmm:deco/stairs/bamboo/outer" }, + "facing=west,half=bottom,shape=outer_right": { "model": "mmm:deco/stairs/bamboo/outer", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "mmm:deco/stairs/bamboo/outer", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "mmm:deco/stairs/bamboo/outer", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "mmm:deco/stairs/bamboo/outer", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "mmm:deco/stairs/bamboo/outer", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "mmm:deco/stairs/bamboo/outer" }, + "facing=north,half=bottom,shape=outer_left": { "model": "mmm:deco/stairs/bamboo/outer", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "mmm:deco/stairs/bamboo/inner" }, + "facing=west,half=bottom,shape=inner_right": { "model": "mmm:deco/stairs/bamboo/inner", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "mmm:deco/stairs/bamboo/inner", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "mmm:deco/stairs/bamboo/inner", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "mmm:deco/stairs/bamboo/inner", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "mmm:deco/stairs/bamboo/inner", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "mmm:deco/stairs/bamboo/inner" }, + "facing=north,half=bottom,shape=inner_left": { "model": "mmm:deco/stairs/bamboo/inner", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "mmm:deco/stairs/bamboo/straight", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "mmm:deco/stairs/bamboo/straight", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "mmm:deco/stairs/bamboo/straight", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "mmm:deco/stairs/bamboo/straight", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "mmm:deco/stairs/bamboo/outer", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "mmm:deco/stairs/bamboo/outer", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "mmm:deco/stairs/bamboo/outer", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "mmm:deco/stairs/bamboo/outer", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "mmm:deco/stairs/bamboo/outer", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "mmm:deco/stairs/bamboo/outer", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "mmm:deco/stairs/bamboo/outer", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "mmm:deco/stairs/bamboo/outer", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "mmm:deco/stairs/bamboo/inner", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "mmm:deco/stairs/bamboo/inner", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "mmm:deco/stairs/bamboo/inner", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "mmm:deco/stairs/bamboo/inner", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "mmm:deco/stairs/bamboo/inner", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "mmm:deco/stairs/bamboo/inner", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "mmm:deco/stairs/bamboo/inner", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "mmm:deco/stairs/bamboo/inner", "x": 180, "y": 270, "uvlock": true } + } +} \ No newline at end of file diff --git a/src/resources/assets/mmm/blockstates/deco/stairs/hevea.json b/src/resources/assets/mmm/blockstates/deco/stairs/hevea.json new file mode 100644 index 0000000..5a6039a --- /dev/null +++ b/src/resources/assets/mmm/blockstates/deco/stairs/hevea.json @@ -0,0 +1,44 @@ +{ + "variants": { + "facing=east,half=bottom,shape=straight": { "model": "mmm:deco/stairs/hevea/straight" }, + "facing=west,half=bottom,shape=straight": { "model": "mmm:deco/stairs/hevea/straight", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "mmm:deco/stairs/hevea/straight", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "mmm:deco/stairs/hevea/straight", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "mmm:deco/stairs/hevea/outer" }, + "facing=west,half=bottom,shape=outer_right": { "model": "mmm:deco/stairs/hevea/outer", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "mmm:deco/stairs/hevea/outer", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "mmm:deco/stairs/hevea/outer", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "mmm:deco/stairs/hevea/outer", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "mmm:deco/stairs/hevea/outer", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "mmm:deco/stairs/hevea/outer" }, + "facing=north,half=bottom,shape=outer_left": { "model": "mmm:deco/stairs/hevea/outer", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "mmm:deco/stairs/hevea/inner" }, + "facing=west,half=bottom,shape=inner_right": { "model": "mmm:deco/stairs/hevea/inner", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "mmm:deco/stairs/hevea/inner", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "mmm:deco/stairs/hevea/inner", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "mmm:deco/stairs/hevea/inner", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "mmm:deco/stairs/hevea/inner", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "mmm:deco/stairs/hevea/inner" }, + "facing=north,half=bottom,shape=inner_left": { "model": "mmm:deco/stairs/hevea/inner", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "mmm:deco/stairs/hevea/straight", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "mmm:deco/stairs/hevea/straight", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "mmm:deco/stairs/hevea/straight", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "mmm:deco/stairs/hevea/straight", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "mmm:deco/stairs/hevea/outer", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "mmm:deco/stairs/hevea/outer", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "mmm:deco/stairs/hevea/outer", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "mmm:deco/stairs/hevea/outer", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "mmm:deco/stairs/hevea/outer", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "mmm:deco/stairs/hevea/outer", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "mmm:deco/stairs/hevea/outer", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "mmm:deco/stairs/hevea/outer", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "mmm:deco/stairs/hevea/inner", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "mmm:deco/stairs/hevea/inner", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "mmm:deco/stairs/hevea/inner", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "mmm:deco/stairs/hevea/inner", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "mmm:deco/stairs/hevea/inner", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "mmm:deco/stairs/hevea/inner", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "mmm:deco/stairs/hevea/inner", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "mmm:deco/stairs/hevea/inner", "x": 180, "y": 270, "uvlock": true } + } +} \ No newline at end of file diff --git a/src/resources/assets/mmm/lang/en_US.lang b/src/resources/assets/mmm/lang/en_US.lang index 105e1e8..5ec1c2d 100644 --- a/src/resources/assets/mmm/lang/en_US.lang +++ b/src/resources/assets/mmm/lang/en_US.lang @@ -136,10 +136,14 @@ item.mmm.food.milk.donkey.name=Donkey milk tile.mmm.deco.stairs.granite.name=Granite Stairs tile.mmm.deco.stairs.diorite.name=Diorite Stairs tile.mmm.deco.stairs.andesite.name=Andesite Stairs +tile.mmm.deco.stairs.hevea.name=Hevea Wood Stairs +tile.mmm.deco.stairs.bamboo.name=Bamboo Wood Stairs tile.mmm.deco.slabs.granite.name=Granite Slab tile.mmm.deco.slabs.diorite.name=Diorite Slab tile.mmm.deco.slabs.andesite.name=Andesite Slab +tile.mmm.deco.slabs.hevea.name=Hevea Wood Slab +tile.mmm.deco.slabs.bamboo.name=Bamboo Wood Slab tile.mmm.deco.table.oak.name=Oak Table tile.mmm.deco.table.birch.name=Birch Table diff --git a/src/resources/assets/mmm/models/block/deco/slabs/bamboo/bottom.json b/src/resources/assets/mmm/models/block/deco/slabs/bamboo/bottom.json new file mode 100644 index 0000000..bb6c434 --- /dev/null +++ b/src/resources/assets/mmm/models/block/deco/slabs/bamboo/bottom.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/half_slab", + "textures": { + "bottom": "mmm:blocks/materials/planks/bamboo", + "top": "mmm:blocks/materials/planks/bamboo", + "side": "mmm:blocks/materials/planks/bamboo" + } +} diff --git a/src/resources/assets/mmm/models/block/deco/slabs/bamboo/double.json b/src/resources/assets/mmm/models/block/deco/slabs/bamboo/double.json new file mode 100644 index 0000000..9b1630d --- /dev/null +++ b/src/resources/assets/mmm/models/block/deco/slabs/bamboo/double.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column", + "textures": { + "end": "mmm:blocks/materials/planks/bamboo", + "side": "mmm:blocks/materials/planks/bamboo" + } +} \ No newline at end of file diff --git a/src/resources/assets/mmm/models/block/deco/slabs/bamboo/top.json b/src/resources/assets/mmm/models/block/deco/slabs/bamboo/top.json new file mode 100644 index 0000000..19c8b88 --- /dev/null +++ b/src/resources/assets/mmm/models/block/deco/slabs/bamboo/top.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/upper_slab", + "textures": { + "bottom": "mmm:blocks/materials/planks/bamboo", + "top": "mmm:blocks/materials/planks/bamboo", + "side": "mmm:blocks/materials/planks/bamboo" + } +} \ No newline at end of file diff --git a/src/resources/assets/mmm/models/block/deco/slabs/hevea/bottom.json b/src/resources/assets/mmm/models/block/deco/slabs/hevea/bottom.json new file mode 100644 index 0000000..d4ca644 --- /dev/null +++ b/src/resources/assets/mmm/models/block/deco/slabs/hevea/bottom.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/half_slab", + "textures": { + "bottom": "mmm:blocks/materials/planks/hevea", + "top": "mmm:blocks/materials/planks/hevea", + "side": "mmm:blocks/materials/planks/hevea" + } +} diff --git a/src/resources/assets/mmm/models/block/deco/slabs/hevea/double.json b/src/resources/assets/mmm/models/block/deco/slabs/hevea/double.json new file mode 100644 index 0000000..946d361 --- /dev/null +++ b/src/resources/assets/mmm/models/block/deco/slabs/hevea/double.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column", + "textures": { + "end": "mmm:blocks/materials/planks/hevea", + "side": "mmm:blocks/materials/planks/hevea" + } +} \ No newline at end of file diff --git a/src/resources/assets/mmm/models/block/deco/slabs/hevea/top.json b/src/resources/assets/mmm/models/block/deco/slabs/hevea/top.json new file mode 100644 index 0000000..6916504 --- /dev/null +++ b/src/resources/assets/mmm/models/block/deco/slabs/hevea/top.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/upper_slab", + "textures": { + "bottom": "mmm:blocks/materials/planks/hevea", + "top": "mmm:blocks/materials/planks/hevea", + "side": "mmm:blocks/materials/planks/hevea" + } +} \ No newline at end of file diff --git a/src/resources/assets/mmm/models/block/deco/stairs/bamboo/inner.json b/src/resources/assets/mmm/models/block/deco/stairs/bamboo/inner.json new file mode 100644 index 0000000..330c28f --- /dev/null +++ b/src/resources/assets/mmm/models/block/deco/stairs/bamboo/inner.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/inner_stairs", + "textures": { + "bottom": "mmm:blocks/materials/planks/bamboo", + "top": "mmm:blocks/materials/planks/bamboo", + "side": "mmm:blocks/materials/planks/bamboo" + } +} diff --git a/src/resources/assets/mmm/models/block/deco/stairs/bamboo/outer.json b/src/resources/assets/mmm/models/block/deco/stairs/bamboo/outer.json new file mode 100644 index 0000000..73bc297 --- /dev/null +++ b/src/resources/assets/mmm/models/block/deco/stairs/bamboo/outer.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/outer_stairs", + "textures": { + "bottom": "mmm:blocks/materials/planks/bamboo", + "top": "mmm:blocks/materials/planks/bamboo", + "side": "mmm:blocks/materials/planks/bamboo" + } +} diff --git a/src/resources/assets/mmm/models/block/deco/stairs/bamboo/straight.json b/src/resources/assets/mmm/models/block/deco/stairs/bamboo/straight.json new file mode 100644 index 0000000..1f7b63f --- /dev/null +++ b/src/resources/assets/mmm/models/block/deco/stairs/bamboo/straight.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/stairs", + "textures": { + "bottom": "mmm:blocks/materials/planks/bamboo", + "top": "mmm:blocks/materials/planks/bamboo", + "side": "mmm:blocks/materials/planks/bamboo" + } +} diff --git a/src/resources/assets/mmm/models/block/deco/stairs/hevea/inner.json b/src/resources/assets/mmm/models/block/deco/stairs/hevea/inner.json new file mode 100644 index 0000000..58f689f --- /dev/null +++ b/src/resources/assets/mmm/models/block/deco/stairs/hevea/inner.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/inner_stairs", + "textures": { + "bottom": "mmm:blocks/materials/planks/hevea", + "top": "mmm:blocks/materials/planks/hevea", + "side": "mmm:blocks/materials/planks/hevea" + } +} diff --git a/src/resources/assets/mmm/models/block/deco/stairs/hevea/outer.json b/src/resources/assets/mmm/models/block/deco/stairs/hevea/outer.json new file mode 100644 index 0000000..17b4687 --- /dev/null +++ b/src/resources/assets/mmm/models/block/deco/stairs/hevea/outer.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/outer_stairs", + "textures": { + "bottom": "mmm:blocks/materials/planks/hevea", + "top": "mmm:blocks/materials/planks/hevea", + "side": "mmm:blocks/materials/planks/hevea" + } +} diff --git a/src/resources/assets/mmm/models/block/deco/stairs/hevea/straight.json b/src/resources/assets/mmm/models/block/deco/stairs/hevea/straight.json new file mode 100644 index 0000000..8e90518 --- /dev/null +++ b/src/resources/assets/mmm/models/block/deco/stairs/hevea/straight.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/stairs", + "textures": { + "bottom": "mmm:blocks/materials/planks/hevea", + "top": "mmm:blocks/materials/planks/hevea", + "side": "mmm:blocks/materials/planks/hevea" + } +} diff --git a/src/resources/assets/mmm/models/item/deco/slabs/bamboo.json b/src/resources/assets/mmm/models/item/deco/slabs/bamboo.json new file mode 100644 index 0000000..5290eaf --- /dev/null +++ b/src/resources/assets/mmm/models/item/deco/slabs/bamboo.json @@ -0,0 +1,3 @@ +{ + "parent": "mmm:block/deco/slabs/bamboo/bottom" +} \ No newline at end of file diff --git a/src/resources/assets/mmm/models/item/deco/slabs/hevea.json b/src/resources/assets/mmm/models/item/deco/slabs/hevea.json new file mode 100644 index 0000000..413c470 --- /dev/null +++ b/src/resources/assets/mmm/models/item/deco/slabs/hevea.json @@ -0,0 +1,3 @@ +{ + "parent": "mmm:block/deco/slabs/hevea/bottom" +} \ No newline at end of file diff --git a/src/resources/assets/mmm/models/item/deco/stairs/bamboo.json b/src/resources/assets/mmm/models/item/deco/stairs/bamboo.json new file mode 100644 index 0000000..2a28263 --- /dev/null +++ b/src/resources/assets/mmm/models/item/deco/stairs/bamboo.json @@ -0,0 +1,3 @@ +{ + "parent": "mmm:block/deco/stairs/bamboo/straight" +} \ No newline at end of file diff --git a/src/resources/assets/mmm/models/item/deco/stairs/hevea.json b/src/resources/assets/mmm/models/item/deco/stairs/hevea.json new file mode 100644 index 0000000..c95999e --- /dev/null +++ b/src/resources/assets/mmm/models/item/deco/stairs/hevea.json @@ -0,0 +1,3 @@ +{ + "parent": "mmm:block/deco/stairs/hevea/straight" +} \ No newline at end of file