From e616e017623faa9732b0cc43a33035e14deca5e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emmanuel=20Beno=C3=AEt?= Date: Tue, 12 Jul 2016 17:17:26 +0200 Subject: [PATCH] Hevea / bamboo doors --- TODO.txt | 3 - graphics/bamboo-door.xcf | Bin 0 -> 7764 bytes graphics/hevea-door.xcf | Bin 0 -> 5760 bytes src/java/mmm/MmmDeco.java | 3 + src/java/mmm/deco/doors/DDoor.java | 25 ++++++ src/java/mmm/deco/doors/DDoorBlock.java | 78 ++++++++++++++++++ src/java/mmm/deco/doors/DDoors.java | 20 +++++ .../mmm/blockstates/deco/door/bamboo.json | 36 ++++++++ .../mmm/blockstates/deco/door/hevea.json | 36 ++++++++ src/resources/assets/mmm/lang/en_US.lang | 13 +-- .../block/deco/door/bamboo/bottom_lh.json | 8 ++ .../block/deco/door/bamboo/bottom_rh.json | 8 ++ .../models/block/deco/door/bamboo/top_lh.json | 8 ++ .../models/block/deco/door/bamboo/top_rh.json | 8 ++ .../block/deco/door/hevea/bottom_lh.json | 8 ++ .../block/deco/door/hevea/bottom_rh.json | 8 ++ .../models/block/deco/door/hevea/top_lh.json | 8 ++ .../models/block/deco/door/hevea/top_rh.json | 8 ++ .../mmm/models/item/deco/door/bamboo.json | 6 ++ .../mmm/models/item/deco/door/hevea.json | 6 ++ .../blocks/deco/door/bamboo/bottom.png | Bin 0 -> 779 bytes .../textures/blocks/deco/door/bamboo/top.png | Bin 0 -> 763 bytes .../blocks/deco/door/hevea/bottom.png | Bin 0 -> 721 bytes .../textures/blocks/deco/door/hevea/top.png | Bin 0 -> 742 bytes .../mmm/textures/items/deco/door/bamboo.png | Bin 0 -> 120 bytes .../mmm/textures/items/deco/door/hevea.png | Bin 0 -> 122 bytes 26 files changed, 282 insertions(+), 8 deletions(-) create mode 100644 graphics/bamboo-door.xcf create mode 100644 graphics/hevea-door.xcf create mode 100644 src/java/mmm/deco/doors/DDoor.java create mode 100644 src/java/mmm/deco/doors/DDoorBlock.java create mode 100644 src/java/mmm/deco/doors/DDoors.java create mode 100644 src/resources/assets/mmm/blockstates/deco/door/bamboo.json create mode 100644 src/resources/assets/mmm/blockstates/deco/door/hevea.json create mode 100644 src/resources/assets/mmm/models/block/deco/door/bamboo/bottom_lh.json create mode 100644 src/resources/assets/mmm/models/block/deco/door/bamboo/bottom_rh.json create mode 100644 src/resources/assets/mmm/models/block/deco/door/bamboo/top_lh.json create mode 100644 src/resources/assets/mmm/models/block/deco/door/bamboo/top_rh.json create mode 100644 src/resources/assets/mmm/models/block/deco/door/hevea/bottom_lh.json create mode 100644 src/resources/assets/mmm/models/block/deco/door/hevea/bottom_rh.json create mode 100644 src/resources/assets/mmm/models/block/deco/door/hevea/top_lh.json create mode 100644 src/resources/assets/mmm/models/block/deco/door/hevea/top_rh.json create mode 100644 src/resources/assets/mmm/models/item/deco/door/bamboo.json create mode 100644 src/resources/assets/mmm/models/item/deco/door/hevea.json create mode 100644 src/resources/assets/mmm/textures/blocks/deco/door/bamboo/bottom.png create mode 100644 src/resources/assets/mmm/textures/blocks/deco/door/bamboo/top.png create mode 100644 src/resources/assets/mmm/textures/blocks/deco/door/hevea/bottom.png create mode 100644 src/resources/assets/mmm/textures/blocks/deco/door/hevea/top.png create mode 100644 src/resources/assets/mmm/textures/items/deco/door/bamboo.png create mode 100644 src/resources/assets/mmm/textures/items/deco/door/hevea.png diff --git a/TODO.txt b/TODO.txt index 85058af..213ea76 100644 --- a/TODO.txt +++ b/TODO.txt @@ -9,9 +9,6 @@ deco No Stone - Smooth + stairs + slabs Limestone Slate Basalt -deco No Wood - Doors - Hevea - Bamboo ------------------------------------------------------------------------------------------------------- plants No? Tomatoes plants No? Turnips diff --git a/graphics/bamboo-door.xcf b/graphics/bamboo-door.xcf new file mode 100644 index 0000000000000000000000000000000000000000..b49fd226f939aa4c855535e6e25cb4827ff80aeb GIT binary patch literal 7764 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 BZhrs( literal 0 HcmV?d00001 diff --git a/src/java/mmm/MmmDeco.java b/src/java/mmm/MmmDeco.java index 34edcbb..f283423 100644 --- a/src/java/mmm/MmmDeco.java +++ b/src/java/mmm/MmmDeco.java @@ -5,6 +5,7 @@ import mmm.deco.DChairs; import mmm.deco.DSeatEntity; import mmm.deco.DStairs; import mmm.deco.DTables; +import mmm.deco.doors.DDoors; import mmm.deco.fences.DFences; import mmm.deco.slabs.DSlabs; import mmm.deco.thrones.DThrones; @@ -17,6 +18,7 @@ public class MmmDeco public static final DStairs STAIRS; public static final DSlabs SLAB; public static final DFences FENCE; + public static final DDoors DOOR; public static final DTables TABLE; public static final DChairs CHAIR; public static final DThrones THRONE; @@ -25,6 +27,7 @@ public class MmmDeco STAIRS = new DStairs( ); SLAB = new DSlabs( ); FENCE = new DFences( ); + DOOR = new DDoors( ); TABLE = new DTables( ); CHAIR = new DChairs( ); THRONE = new DThrones( ); diff --git a/src/java/mmm/deco/doors/DDoor.java b/src/java/mmm/deco/doors/DDoor.java new file mode 100644 index 0000000..3873e8b --- /dev/null +++ b/src/java/mmm/deco/doors/DDoor.java @@ -0,0 +1,25 @@ +package mmm.deco.doors; + + +import mmm.core.CRegistry; +import mmm.materials.MWood; +import net.minecraft.item.ItemDoor; + + + +public class DDoor +{ + + public final DDoorBlock BLOCK; + public final ItemDoor ITEM; + + + public DDoor( final MWood wood ) + { + this.BLOCK = new DDoorBlock( this , wood ); + this.ITEM = new ItemDoor( this.BLOCK ); + CRegistry.setIdentifiers( this.ITEM , "deco" , "door" , wood.getSuffix( ) ); + CRegistry.addBlock( this.BLOCK , this.ITEM ); + } + +} diff --git a/src/java/mmm/deco/doors/DDoorBlock.java b/src/java/mmm/deco/doors/DDoorBlock.java new file mode 100644 index 0000000..f858a6e --- /dev/null +++ b/src/java/mmm/deco/doors/DDoorBlock.java @@ -0,0 +1,78 @@ +package mmm.deco.doors; + + +import java.util.Random; + +import mmm.core.CRegistry; +import mmm.core.api.blocks.I_StateMapperProvider; +import mmm.materials.MWood; +import net.minecraft.block.BlockDoor; +import net.minecraft.block.SoundType; +import net.minecraft.block.material.MapColor; +import net.minecraft.block.material.Material; +import net.minecraft.block.state.IBlockState; +import net.minecraft.client.renderer.block.statemap.IStateMapper; +import net.minecraft.client.renderer.block.statemap.StateMap; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.RayTraceResult; +import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + + + +public class DDoorBlock + extends BlockDoor + implements I_StateMapperProvider +{ + + private final DDoor door; + private final MapColor mapColor; + + + public DDoorBlock( final DDoor door , final MWood wood ) + { + super( Material.WOOD ); + this.mapColor = wood.getMapColor( ); + this.door = door; + + this.setHardness( 3f ); + this.setSoundType( SoundType.WOOD ); + + CRegistry.setIdentifiers( this , "deco" , "door" , wood.getSuffix( ) ); + } + + + @Override + public MapColor getMapColor( final IBlockState state ) + { + return this.mapColor; + } + + + @Override + public Item getItemDropped( final IBlockState state , final Random rand , final int fortune ) + { + return state.getValue( BlockDoor.HALF ) == BlockDoor.EnumDoorHalf.UPPER ? null : this.door.ITEM; + } + + + @Override + public ItemStack getPickBlock( final IBlockState state , final RayTraceResult target , final World world , + final BlockPos pos , final EntityPlayer player ) + { + return new ItemStack( this.door.ITEM ); + } + + + @Override + @SideOnly( Side.CLIENT ) + public IStateMapper getStateMapper( ) + { + return new StateMap.Builder( ).ignore( BlockDoor.POWERED ).build( ); + } + +} diff --git a/src/java/mmm/deco/doors/DDoors.java b/src/java/mmm/deco/doors/DDoors.java new file mode 100644 index 0000000..8d6af5f --- /dev/null +++ b/src/java/mmm/deco/doors/DDoors.java @@ -0,0 +1,20 @@ +package mmm.deco.doors; + + +import mmm.MmmMaterials; + + + +public class DDoors +{ + public final DDoor BAMBOO; + public final DDoor HEVEA; + + + public DDoors( ) + { + this.BAMBOO = new DDoor( MmmMaterials.WOOD.BAMBOO ); + this.HEVEA = new DDoor( MmmMaterials.WOOD.HEVEA ); + } + +} diff --git a/src/resources/assets/mmm/blockstates/deco/door/bamboo.json b/src/resources/assets/mmm/blockstates/deco/door/bamboo.json new file mode 100644 index 0000000..32da703 --- /dev/null +++ b/src/resources/assets/mmm/blockstates/deco/door/bamboo.json @@ -0,0 +1,36 @@ +{ + "variants" : { + "facing=east,half=lower,hinge=left,open=false": { "model": "mmm:deco/door/bamboo/bottom_lh" }, + "facing=south,half=lower,hinge=left,open=false": { "model": "mmm:deco/door/bamboo/bottom_lh", "y": 90 }, + "facing=west,half=lower,hinge=left,open=false": { "model": "mmm:deco/door/bamboo/bottom_lh", "y": 180 }, + "facing=north,half=lower,hinge=left,open=false": { "model": "mmm:deco/door/bamboo/bottom_lh", "y": 270 }, + "facing=east,half=lower,hinge=right,open=false": { "model": "mmm:deco/door/bamboo/bottom_rh" }, + "facing=south,half=lower,hinge=right,open=false": { "model": "mmm:deco/door/bamboo/bottom_rh", "y": 90 }, + "facing=west,half=lower,hinge=right,open=false": { "model": "mmm:deco/door/bamboo/bottom_rh", "y": 180 }, + "facing=north,half=lower,hinge=right,open=false": { "model": "mmm:deco/door/bamboo/bottom_rh", "y": 270 }, + "facing=east,half=lower,hinge=left,open=true": { "model": "mmm:deco/door/bamboo/bottom_rh", "y": 90 }, + "facing=south,half=lower,hinge=left,open=true": { "model": "mmm:deco/door/bamboo/bottom_rh", "y": 180 }, + "facing=west,half=lower,hinge=left,open=true": { "model": "mmm:deco/door/bamboo/bottom_rh", "y": 270 }, + "facing=north,half=lower,hinge=left,open=true": { "model": "mmm:deco/door/bamboo/bottom_rh" }, + "facing=east,half=lower,hinge=right,open=true": { "model": "mmm:deco/door/bamboo/bottom_lh", "y": 270 }, + "facing=south,half=lower,hinge=right,open=true": { "model": "mmm:deco/door/bamboo/bottom_lh" }, + "facing=west,half=lower,hinge=right,open=true": { "model": "mmm:deco/door/bamboo/bottom_lh", "y": 90 }, + "facing=north,half=lower,hinge=right,open=true": { "model": "mmm:deco/door/bamboo/bottom_lh", "y": 180 }, + "facing=east,half=upper,hinge=left,open=false": { "model": "mmm:deco/door/bamboo/top_lh" }, + "facing=south,half=upper,hinge=left,open=false": { "model": "mmm:deco/door/bamboo/top_lh", "y": 90 }, + "facing=west,half=upper,hinge=left,open=false": { "model": "mmm:deco/door/bamboo/top_lh", "y": 180 }, + "facing=north,half=upper,hinge=left,open=false": { "model": "mmm:deco/door/bamboo/top_lh", "y": 270 }, + "facing=east,half=upper,hinge=right,open=false": { "model": "mmm:deco/door/bamboo/top_rh" }, + "facing=south,half=upper,hinge=right,open=false": { "model": "mmm:deco/door/bamboo/top_rh", "y": 90 }, + "facing=west,half=upper,hinge=right,open=false": { "model": "mmm:deco/door/bamboo/top_rh", "y": 180 }, + "facing=north,half=upper,hinge=right,open=false": { "model": "mmm:deco/door/bamboo/top_rh", "y": 270 }, + "facing=east,half=upper,hinge=left,open=true": { "model": "mmm:deco/door/bamboo/top_rh", "y": 90 }, + "facing=south,half=upper,hinge=left,open=true": { "model": "mmm:deco/door/bamboo/top_rh", "y": 180 }, + "facing=west,half=upper,hinge=left,open=true": { "model": "mmm:deco/door/bamboo/top_rh", "y": 270 }, + "facing=north,half=upper,hinge=left,open=true": { "model": "mmm:deco/door/bamboo/top_rh" }, + "facing=east,half=upper,hinge=right,open=true": { "model": "mmm:deco/door/bamboo/top_lh", "y": 270 }, + "facing=south,half=upper,hinge=right,open=true": { "model": "mmm:deco/door/bamboo/top_lh" }, + "facing=west,half=upper,hinge=right,open=true": { "model": "mmm:deco/door/bamboo/top_lh", "y": 90 }, + "facing=north,half=upper,hinge=right,open=true": { "model": "mmm:deco/door/bamboo/top_lh", "y": 180 } + } +} \ No newline at end of file diff --git a/src/resources/assets/mmm/blockstates/deco/door/hevea.json b/src/resources/assets/mmm/blockstates/deco/door/hevea.json new file mode 100644 index 0000000..4601b00 --- /dev/null +++ b/src/resources/assets/mmm/blockstates/deco/door/hevea.json @@ -0,0 +1,36 @@ +{ + "variants" : { + "facing=east,half=lower,hinge=left,open=false": { "model": "mmm:deco/door/hevea/bottom_lh" }, + "facing=south,half=lower,hinge=left,open=false": { "model": "mmm:deco/door/hevea/bottom_lh", "y": 90 }, + "facing=west,half=lower,hinge=left,open=false": { "model": "mmm:deco/door/hevea/bottom_lh", "y": 180 }, + "facing=north,half=lower,hinge=left,open=false": { "model": "mmm:deco/door/hevea/bottom_lh", "y": 270 }, + "facing=east,half=lower,hinge=right,open=false": { "model": "mmm:deco/door/hevea/bottom_rh" }, + "facing=south,half=lower,hinge=right,open=false": { "model": "mmm:deco/door/hevea/bottom_rh", "y": 90 }, + "facing=west,half=lower,hinge=right,open=false": { "model": "mmm:deco/door/hevea/bottom_rh", "y": 180 }, + "facing=north,half=lower,hinge=right,open=false": { "model": "mmm:deco/door/hevea/bottom_rh", "y": 270 }, + "facing=east,half=lower,hinge=left,open=true": { "model": "mmm:deco/door/hevea/bottom_rh", "y": 90 }, + "facing=south,half=lower,hinge=left,open=true": { "model": "mmm:deco/door/hevea/bottom_rh", "y": 180 }, + "facing=west,half=lower,hinge=left,open=true": { "model": "mmm:deco/door/hevea/bottom_rh", "y": 270 }, + "facing=north,half=lower,hinge=left,open=true": { "model": "mmm:deco/door/hevea/bottom_rh" }, + "facing=east,half=lower,hinge=right,open=true": { "model": "mmm:deco/door/hevea/bottom_lh", "y": 270 }, + "facing=south,half=lower,hinge=right,open=true": { "model": "mmm:deco/door/hevea/bottom_lh" }, + "facing=west,half=lower,hinge=right,open=true": { "model": "mmm:deco/door/hevea/bottom_lh", "y": 90 }, + "facing=north,half=lower,hinge=right,open=true": { "model": "mmm:deco/door/hevea/bottom_lh", "y": 180 }, + "facing=east,half=upper,hinge=left,open=false": { "model": "mmm:deco/door/hevea/top_lh" }, + "facing=south,half=upper,hinge=left,open=false": { "model": "mmm:deco/door/hevea/top_lh", "y": 90 }, + "facing=west,half=upper,hinge=left,open=false": { "model": "mmm:deco/door/hevea/top_lh", "y": 180 }, + "facing=north,half=upper,hinge=left,open=false": { "model": "mmm:deco/door/hevea/top_lh", "y": 270 }, + "facing=east,half=upper,hinge=right,open=false": { "model": "mmm:deco/door/hevea/top_rh" }, + "facing=south,half=upper,hinge=right,open=false": { "model": "mmm:deco/door/hevea/top_rh", "y": 90 }, + "facing=west,half=upper,hinge=right,open=false": { "model": "mmm:deco/door/hevea/top_rh", "y": 180 }, + "facing=north,half=upper,hinge=right,open=false": { "model": "mmm:deco/door/hevea/top_rh", "y": 270 }, + "facing=east,half=upper,hinge=left,open=true": { "model": "mmm:deco/door/hevea/top_rh", "y": 90 }, + "facing=south,half=upper,hinge=left,open=true": { "model": "mmm:deco/door/hevea/top_rh", "y": 180 }, + "facing=west,half=upper,hinge=left,open=true": { "model": "mmm:deco/door/hevea/top_rh", "y": 270 }, + "facing=north,half=upper,hinge=left,open=true": { "model": "mmm:deco/door/hevea/top_rh" }, + "facing=east,half=upper,hinge=right,open=true": { "model": "mmm:deco/door/hevea/top_lh", "y": 270 }, + "facing=south,half=upper,hinge=right,open=true": { "model": "mmm:deco/door/hevea/top_lh" }, + "facing=west,half=upper,hinge=right,open=true": { "model": "mmm:deco/door/hevea/top_lh", "y": 90 }, + "facing=north,half=upper,hinge=right,open=true": { "model": "mmm:deco/door/hevea/top_lh", "y": 180 } + } +} \ 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 63ab107..5bbee92 100644 --- a/src/resources/assets/mmm/lang/en_US.lang +++ b/src/resources/assets/mmm/lang/en_US.lang @@ -145,6 +145,14 @@ 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.fence.hevea.name=Hevea Fence +tile.mmm.deco.fence.gate.hevea.name=Hevea Fence Gate +tile.mmm.deco.fence.bamboo.name=Bamboo Fence +tile.mmm.deco.fence.gate.bamboo.name=Bamboo Fence Gate + +tile.mmm.deco.door.hevea.name=Hevea Door +tile.mmm.deco.door.bamboo.name=Bamboo Door + tile.mmm.deco.table.oak.name=Oak Table tile.mmm.deco.table.birch.name=Birch Table tile.mmm.deco.table.spruce.name=Spruce Table @@ -298,8 +306,3 @@ tile.mmm.deco.throne.hevea.red.name=Hevea Throne (Red) tile.mmm.deco.throne.hevea.silver.name=Hevea Throne (Silver) tile.mmm.deco.throne.hevea.white.name=Hevea Throne (White) tile.mmm.deco.throne.hevea.yellow.name=Hevea Throne (Yellow) - -tile.mmm.deco.fence.hevea.name=Hevea Fence -tile.mmm.deco.fence.gate.hevea.name=Hevea Fence Gate -tile.mmm.deco.fence.bamboo.name=Bamboo Fence -tile.mmm.deco.fence.gate.bamboo.name=Bamboo Fence Gate diff --git a/src/resources/assets/mmm/models/block/deco/door/bamboo/bottom_lh.json b/src/resources/assets/mmm/models/block/deco/door/bamboo/bottom_lh.json new file mode 100644 index 0000000..fc53a01 --- /dev/null +++ b/src/resources/assets/mmm/models/block/deco/door/bamboo/bottom_lh.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/door_bottom", + "textures": + { + "bottom": "mmm:blocks/deco/door/bamboo/bottom", + "top": "mmm:blocks/deco/door/bamboo/top" + } +} \ No newline at end of file diff --git a/src/resources/assets/mmm/models/block/deco/door/bamboo/bottom_rh.json b/src/resources/assets/mmm/models/block/deco/door/bamboo/bottom_rh.json new file mode 100644 index 0000000..7525241 --- /dev/null +++ b/src/resources/assets/mmm/models/block/deco/door/bamboo/bottom_rh.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/door_bottom_rh", + "textures": + { + "bottom": "mmm:blocks/deco/door/bamboo/bottom", + "top": "mmm:blocks/deco/door/bamboo/top" + } +} \ No newline at end of file diff --git a/src/resources/assets/mmm/models/block/deco/door/bamboo/top_lh.json b/src/resources/assets/mmm/models/block/deco/door/bamboo/top_lh.json new file mode 100644 index 0000000..de414d6 --- /dev/null +++ b/src/resources/assets/mmm/models/block/deco/door/bamboo/top_lh.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/door_top", + "textures": + { + "bottom": "mmm:blocks/deco/door/bamboo/bottom", + "top": "mmm:blocks/deco/door/bamboo/top" + } +} \ No newline at end of file diff --git a/src/resources/assets/mmm/models/block/deco/door/bamboo/top_rh.json b/src/resources/assets/mmm/models/block/deco/door/bamboo/top_rh.json new file mode 100644 index 0000000..fe9f400 --- /dev/null +++ b/src/resources/assets/mmm/models/block/deco/door/bamboo/top_rh.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/door_top_rh", + "textures": + { + "bottom": "mmm:blocks/deco/door/bamboo/bottom", + "top": "mmm:blocks/deco/door/bamboo/top" + } +} \ No newline at end of file diff --git a/src/resources/assets/mmm/models/block/deco/door/hevea/bottom_lh.json b/src/resources/assets/mmm/models/block/deco/door/hevea/bottom_lh.json new file mode 100644 index 0000000..9943308 --- /dev/null +++ b/src/resources/assets/mmm/models/block/deco/door/hevea/bottom_lh.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/door_bottom", + "textures": + { + "bottom": "mmm:blocks/deco/door/hevea/bottom", + "top": "mmm:blocks/deco/door/hevea/top" + } +} \ No newline at end of file diff --git a/src/resources/assets/mmm/models/block/deco/door/hevea/bottom_rh.json b/src/resources/assets/mmm/models/block/deco/door/hevea/bottom_rh.json new file mode 100644 index 0000000..1aab346 --- /dev/null +++ b/src/resources/assets/mmm/models/block/deco/door/hevea/bottom_rh.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/door_bottom_rh", + "textures": + { + "bottom": "mmm:blocks/deco/door/hevea/bottom", + "top": "mmm:blocks/deco/door/hevea/top" + } +} \ No newline at end of file diff --git a/src/resources/assets/mmm/models/block/deco/door/hevea/top_lh.json b/src/resources/assets/mmm/models/block/deco/door/hevea/top_lh.json new file mode 100644 index 0000000..9a5d1c2 --- /dev/null +++ b/src/resources/assets/mmm/models/block/deco/door/hevea/top_lh.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/door_top", + "textures": + { + "bottom": "mmm:blocks/deco/door/hevea/bottom", + "top": "mmm:blocks/deco/door/hevea/top" + } +} \ No newline at end of file diff --git a/src/resources/assets/mmm/models/block/deco/door/hevea/top_rh.json b/src/resources/assets/mmm/models/block/deco/door/hevea/top_rh.json new file mode 100644 index 0000000..83668e7 --- /dev/null +++ b/src/resources/assets/mmm/models/block/deco/door/hevea/top_rh.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/door_top_rh", + "textures": + { + "bottom": "mmm:blocks/deco/door/hevea/bottom", + "top": "mmm:blocks/deco/door/hevea/top" + } +} \ No newline at end of file diff --git a/src/resources/assets/mmm/models/item/deco/door/bamboo.json b/src/resources/assets/mmm/models/item/deco/door/bamboo.json new file mode 100644 index 0000000..67037c0 --- /dev/null +++ b/src/resources/assets/mmm/models/item/deco/door/bamboo.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mmm:items/deco/door/bamboo" + } +} \ No newline at end of file diff --git a/src/resources/assets/mmm/models/item/deco/door/hevea.json b/src/resources/assets/mmm/models/item/deco/door/hevea.json new file mode 100644 index 0000000..ae1da11 --- /dev/null +++ b/src/resources/assets/mmm/models/item/deco/door/hevea.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mmm:items/deco/door/hevea" + } +} \ No newline at end of file diff --git a/src/resources/assets/mmm/textures/blocks/deco/door/bamboo/bottom.png b/src/resources/assets/mmm/textures/blocks/deco/door/bamboo/bottom.png new file mode 100644 index 0000000000000000000000000000000000000000..ab2d5dc8cf755e0ec51ed07dc9d4eb402304d2b2 GIT binary patch literal 779 zcmV+m1N8ifP)WFU8GbZ8()Nlj2>E@cM*00M7GL_t(I%T3ZxYn??D z$MNquGxI$6Pw2Iqnt;?R5GEu#w6*~>(e)i78N``P z2l~0=4rV$UH>`nqLsO%!8yRu31_16(5+x!?Nj94jqXWmoaB&FG462feFlsYWazcXA z^>jtaeIY_eyC-rMvM8lXlzxf^4N*fxsB1@r@wgizF?u@fu?BU3T7y=N944p;T~0^} z+VI~6CFB2lz#B*k9K+h?PgHe+dk3oIq9FEiT&S%v3_d!-@G2;vNfA}_gZDqhTBTJ( zRmr*EY)^t@qm&r!IH}8|+>?_c66n#<5eN`6<_sXBBsvfs{i-J(Yb+XVsOar?4qs*) zW6sad2mU$>>d>gQj(*h>5k(Lpgj|wP`h*IUj#w_Qv$gdhr@w!}Y%9fLvCEa&N1Q+T zoKhrqmN%GA<^*hd^3AuO#GlU|GYo;5q1u>qJr;(h3G4L*B`2y?vSykYDJ9$+&(5Ec z!Fl-b5t^Lb7cT$4K(&Axx$CL*1%02XHSo2Nr-GY+7^~GK{{s8aL}|~ZO&0(F002ov JPDHLkV1hpOQ|tf$ literal 0 HcmV?d00001 diff --git a/src/resources/assets/mmm/textures/blocks/deco/door/bamboo/top.png b/src/resources/assets/mmm/textures/blocks/deco/door/bamboo/top.png new file mode 100644 index 0000000000000000000000000000000000000000..8ffba47350dea6db6bb977f1ebcebf879d9e7056 GIT binary patch literal 763 zcmVWFU8GbZ8()Nlj2>E@cM*00Li0L_t(I%SF=9idvvUceW~b{1K=%tmqLD+IC?g1GT*bft*~0%J6W?wd}+ znDn1}&Z%-6)>NF3MCW1m| zN7%c~hT+xUl(Ev~j_r0!&PE8B8MOvor$8kLcH2EFJt380SfZwmSLfN~WBytG#qegy zVsXr$&!4hdzhJq%B&XnyXHQtIU$TC^=Hz4n;Ye4UO7}h&JzjIH*3pYMEjjO8-i4ML0)g#bE*LR2*i1W#(C!BuV;SR0oWW3QT zG_Po?lzqj{&(ARp0NkA<%4|N;&l@U%B>UxvT~E##_l8JJp3i$)g)%}ZK`jl7Ca4IVB_suP zJe&id7%uYGoXKazw+6pnxVtR578@YN3{fs$$k( zw+mv8ENQaiq|QjzV@VMSRK!7m5K0ju4jZTni4H_3gF^%!dssBp+Q8gJi>T)hp{faH@~Ya~&U8Ud&T7NMvJkjc4^Tc;m# za{MiQJmL6w5!?NHZr}O_t-rB2(ioeQvH}g8W#sJaEWZBkOEfu_Gu!tYR5ED8a!;x6 t=sTm-;QI%^Fbo5$)ryCYE?5mO`42%}Pcl-~fhhn0002ovPDHLkV1m{!KmPy# literal 0 HcmV?d00001 diff --git a/src/resources/assets/mmm/textures/blocks/deco/door/hevea/bottom.png b/src/resources/assets/mmm/textures/blocks/deco/door/hevea/bottom.png new file mode 100644 index 0000000000000000000000000000000000000000..676b3bac19d52092bbf3c08ffae835b3d553f758 GIT binary patch literal 721 zcmV;?0xtcDP)ubV~ z-!HlSaLcR9ORC|J{r-x{c*6R04Qdpz}Ff*hGNHv-gih`sHrl@8#_h3rOJw*}eyB<>mdw?m5nxTCnh!axZ zF(}K=f(k+i7>1Vs24z{{ePB?HFjc&G#DRE6sOvlWlsGv#=IQbn%;Ci0gQtiknlh)) zH_Vh%#0L z?+e6xE-!wgsz!(iJ_zfR6*;xU!H`!M7aYtE*lxGPqGWZn;_hyXF9IQih!fAjbjo^j zLMS4A*RncV^XI!a?CUL~$(Y0C5l;_|w%IY6EcpAMdz^us|NILvmhfmfDKQQR67Uju z`~(pIyf0|GJzhL&N;o?^qigqcsi*53yhKvsp>qgm-=nJZZ39k7DFN=`lV*?n^use! z-~GR{eeRqRqk|ctD9D<@l$;Z02~_EGPr#svLtcFSC7aW4(3~;LlrbXWa5&Z{D;8gD z(40sqGpt5@z80K7>!AN3r?u(PpBHZ`VS1lA>24{&JkltxW0PJ z?adXK@^4)ed|)|#1pF81*i-%UUWB4{a)+|W@_(eNS^R5UyWJuOc`Nr@aGg#f-pB0eOs zopaeUdu9#a=YIS3r?y@!QLn6455zEKJl!Crp01m)UcIBWN~sB&fODuQrDpEuuka6V zUo*d(;{a=o)Za3l&L~zHcN0o2g=kyB5tm6x|Sco9LIYUI>&dwY#*4N*m$^6}G;czj&qMez!48yS2u%X~DE-olT zX4G}y9I65DJ&lHnhX!3YM%6PKPibbTDB?iW;lKIngq!PY&d*QSKRkivaNAkKjZ0IGqM*QhAg44;QYPHS=*$U~1xq!ehaA>L!dfSEC*9-L500UXXbQoqK> z&{2lWhfhv9I623;fD;H^#7bd0+h%)b#&~0fIwhqQF)Elb)B#U}5GUlc;`M*`SglyA z&>A8Rhhwo=^KQ{oYoQF45Z(|%K*i(5d(0}%!H|1sFq&>qhJ=~1Ts~md5a;;)uL<+{ zoV&X_zWA)Ny|agW_ruSq3Nd!1+*7UKy=OF@65|-N2CdP6%gal?{Cvc>U%yXInVd8K Y1N3xU9glJR!T&t;ucLK6VAUL?~1 literal 0 HcmV?d00001 diff --git a/src/resources/assets/mmm/textures/items/deco/door/hevea.png b/src/resources/assets/mmm/textures/items/deco/door/hevea.png new file mode 100644 index 0000000000000000000000000000000000000000..2d9e580f9f5d670391d3bcee7960e34e25bd6c8b GIT binary patch literal 122 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`j-D=#Ar_~T6Bek=xHtDh{l_md zduC`bJD8Z6IWjjetm9n9csI294)=*!Y}dG7RD61JGQmdZ5QC*6@52n0mWy8*7}Tak V&vf7kivb$O;OXk;vd$@?2>@y1CxZY0 literal 0 HcmV?d00001