diff --git a/TODO.txt b/TODO.txt
index 89fc9a5..1643077 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -9,7 +9,7 @@ deco No Stone - Smooth + stairs + slabs
Limestone
Slate
Basalt
-deco No Wood - Doors + fences + chairs + thrones
+deco No Wood - Doors + fences + thrones
Hevea
Bamboo
-------------------------------------------------------------------------------------------------------
diff --git a/src/java/mmm/deco/DecorativeBlocks.java b/src/java/mmm/deco/DecorativeBlocks.java
index 3090f4a..c4964c7 100644
--- a/src/java/mmm/deco/DecorativeBlocks.java
+++ b/src/java/mmm/deco/DecorativeBlocks.java
@@ -36,6 +36,8 @@ public class DecorativeBlocks
public static final DChair CHAIR_JUNGLE;
public static final DChair CHAIR_DARK_OAK;
public static final DChair CHAIR_ACACIA;
+ public static final DChair CHAIR_HEVEA;
+ public static final DChair CHAIR_BAMBOO;
public static final DThrone THRONE_OAK;
public static final DThrone THRONE_BIRCH;
@@ -80,6 +82,8 @@ public class DecorativeBlocks
URegistry.addBlock( CHAIR_JUNGLE = new DChair( DWoodType.JUNGLE ) );
URegistry.addBlock( CHAIR_DARK_OAK = new DChair( DWoodType.DARK_OAK ) );
URegistry.addBlock( CHAIR_ACACIA = new DChair( DWoodType.ACACIA ) );
+ URegistry.addBlock( CHAIR_HEVEA = new DChair( DWoodType.HEVEA ) );
+ URegistry.addBlock( CHAIR_BAMBOO = new DChair( DWoodType.BAMBOO ) );
// Thrones
THRONE_OAK = new DThrone( DWoodType.OAK );
diff --git a/src/resources/assets/mmm/blockstates/deco/chair/bamboo.json b/src/resources/assets/mmm/blockstates/deco/chair/bamboo.json
new file mode 100644
index 0000000..45353c4
--- /dev/null
+++ b/src/resources/assets/mmm/blockstates/deco/chair/bamboo.json
@@ -0,0 +1,8 @@
+{
+ "variants" : {
+ "facing=north": { "model": "mmm:deco/chair/bamboo" } ,
+ "facing=east": { "model": "mmm:deco/chair/bamboo" , "y": 90 } ,
+ "facing=south": { "model": "mmm:deco/chair/bamboo" , "y": 180 } ,
+ "facing=west": { "model": "mmm:deco/chair/bamboo" , "y": 270 }
+ }
+}
\ No newline at end of file
diff --git a/src/resources/assets/mmm/blockstates/deco/chair/hevea.json b/src/resources/assets/mmm/blockstates/deco/chair/hevea.json
new file mode 100644
index 0000000..b0fcb03
--- /dev/null
+++ b/src/resources/assets/mmm/blockstates/deco/chair/hevea.json
@@ -0,0 +1,8 @@
+{
+ "variants" : {
+ "facing=north": { "model": "mmm:deco/chair/hevea" } ,
+ "facing=east": { "model": "mmm:deco/chair/hevea" , "y": 90 } ,
+ "facing=south": { "model": "mmm:deco/chair/hevea" , "y": 180 } ,
+ "facing=west": { "model": "mmm:deco/chair/hevea" , "y": 270 }
+ }
+}
\ 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 22a3c76..5ab9a92 100644
--- a/src/resources/assets/mmm/lang/en_US.lang
+++ b/src/resources/assets/mmm/lang/en_US.lang
@@ -160,6 +160,8 @@ tile.mmm.deco.chair.spruce.name=Spruce Chair
tile.mmm.deco.chair.acacia.name=Acacia Chair
tile.mmm.deco.chair.jungle.name=Jungle Wood Chair
tile.mmm.deco.chair.dark_oak.name=Dark Oak Chair
+tile.mmm.deco.chair.hevea.name=Hevea Chair
+tile.mmm.deco.chair.bamboo.name=Bamboo Chair
tile.mmm.deco.throne.oak.black.name=Oak Throne (Black)
tile.mmm.deco.throne.oak.blue.name=Oak Throne (Blue)
diff --git a/src/resources/assets/mmm/models/block/deco/chair/acacia.json b/src/resources/assets/mmm/models/block/deco/chair/acacia.json
index 4d00c1f..8471b5b 100644
--- a/src/resources/assets/mmm/models/block/deco/chair/acacia.json
+++ b/src/resources/assets/mmm/models/block/deco/chair/acacia.json
@@ -1,7 +1,6 @@
{
"parent": "mmm:block/deco/chair",
"textures": {
- "body": "minecraft:blocks/planks_acacia",
- "leg": "minecraft:blocks/log_acacia"
+ "body": "minecraft:blocks/planks_acacia"
}
}
diff --git a/src/resources/assets/mmm/models/block/deco/chair/bamboo.json b/src/resources/assets/mmm/models/block/deco/chair/bamboo.json
new file mode 100644
index 0000000..9eb7941
--- /dev/null
+++ b/src/resources/assets/mmm/models/block/deco/chair/bamboo.json
@@ -0,0 +1,6 @@
+{
+ "parent": "mmm:block/deco/chair",
+ "textures": {
+ "body": "mmm:blocks/materials/planks/bamboo"
+ }
+}
diff --git a/src/resources/assets/mmm/models/block/deco/chair/birch.json b/src/resources/assets/mmm/models/block/deco/chair/birch.json
index 291e874..c7ceb40 100644
--- a/src/resources/assets/mmm/models/block/deco/chair/birch.json
+++ b/src/resources/assets/mmm/models/block/deco/chair/birch.json
@@ -1,7 +1,6 @@
{
"parent": "mmm:block/deco/chair",
"textures": {
- "body": "minecraft:blocks/planks_birch",
- "leg": "minecraft:blocks/log_birch"
+ "body": "minecraft:blocks/planks_birch"
}
}
diff --git a/src/resources/assets/mmm/models/block/deco/chair/dark_oak.json b/src/resources/assets/mmm/models/block/deco/chair/dark_oak.json
index b468cc3..e9df843 100644
--- a/src/resources/assets/mmm/models/block/deco/chair/dark_oak.json
+++ b/src/resources/assets/mmm/models/block/deco/chair/dark_oak.json
@@ -1,7 +1,6 @@
{
"parent": "mmm:block/deco/chair",
"textures": {
- "body": "minecraft:blocks/planks_big_oak",
- "leg": "minecraft:blocks/log_big_oak"
+ "body": "minecraft:blocks/planks_big_oak"
}
}
diff --git a/src/resources/assets/mmm/models/block/deco/chair/hevea.json b/src/resources/assets/mmm/models/block/deco/chair/hevea.json
new file mode 100644
index 0000000..40cec81
--- /dev/null
+++ b/src/resources/assets/mmm/models/block/deco/chair/hevea.json
@@ -0,0 +1,7 @@
+{
+ "parent": "mmm:block/deco/chair",
+ "textures": {
+ "body": "mmm:blocks/materials/planks/hevea",
+ "leg": "mmm:blocks/materials/log/side/hevea"
+ }
+}
diff --git a/src/resources/assets/mmm/models/block/deco/chair/jungle.json b/src/resources/assets/mmm/models/block/deco/chair/jungle.json
index 12ec41a..345c589 100644
--- a/src/resources/assets/mmm/models/block/deco/chair/jungle.json
+++ b/src/resources/assets/mmm/models/block/deco/chair/jungle.json
@@ -1,7 +1,6 @@
{
"parent": "mmm:block/deco/chair",
"textures": {
- "body": "minecraft:blocks/planks_jungle",
- "leg": "minecraft:blocks/log_jungle"
+ "body": "minecraft:blocks/planks_jungle"
}
}
diff --git a/src/resources/assets/mmm/models/block/deco/chair/oak.json b/src/resources/assets/mmm/models/block/deco/chair/oak.json
index b58552d..8e7185b 100644
--- a/src/resources/assets/mmm/models/block/deco/chair/oak.json
+++ b/src/resources/assets/mmm/models/block/deco/chair/oak.json
@@ -1,7 +1,6 @@
{
"parent": "mmm:block/deco/chair",
"textures": {
- "body": "minecraft:blocks/planks_oak",
- "leg": "minecraft:blocks/log_oak"
+ "body": "minecraft:blocks/planks_oak"
}
}
diff --git a/src/resources/assets/mmm/models/block/deco/chair/spruce.json b/src/resources/assets/mmm/models/block/deco/chair/spruce.json
index 0254a8b..fb38bb5 100644
--- a/src/resources/assets/mmm/models/block/deco/chair/spruce.json
+++ b/src/resources/assets/mmm/models/block/deco/chair/spruce.json
@@ -1,7 +1,6 @@
{
"parent": "mmm:block/deco/chair",
"textures": {
- "body": "minecraft:blocks/planks_spruce",
- "leg": "minecraft:blocks/log_spruce"
+ "body": "minecraft:blocks/planks_spruce"
}
}
diff --git a/src/resources/assets/mmm/models/item/deco/chair/acacia.json b/src/resources/assets/mmm/models/item/deco/chair/acacia.json
index c65908d..51b058b 100644
--- a/src/resources/assets/mmm/models/item/deco/chair/acacia.json
+++ b/src/resources/assets/mmm/models/item/deco/chair/acacia.json
@@ -1,7 +1,6 @@
{
"parent": "mmm:item/deco/chair",
"textures": {
- "body": "minecraft:blocks/planks_acacia",
- "legs": "minecraft:blocks/log_acacia"
+ "body": "minecraft:blocks/planks_acacia"
}
}
diff --git a/src/resources/assets/mmm/models/item/deco/chair/bamboo.json b/src/resources/assets/mmm/models/item/deco/chair/bamboo.json
new file mode 100644
index 0000000..6da2995
--- /dev/null
+++ b/src/resources/assets/mmm/models/item/deco/chair/bamboo.json
@@ -0,0 +1,6 @@
+{
+ "parent": "mmm:item/deco/chair",
+ "textures": {
+ "body": "mmm:blocks/materials/planks/bamboo"
+ }
+}
diff --git a/src/resources/assets/mmm/models/item/deco/chair/birch.json b/src/resources/assets/mmm/models/item/deco/chair/birch.json
index 0e44f7e..be3b538 100644
--- a/src/resources/assets/mmm/models/item/deco/chair/birch.json
+++ b/src/resources/assets/mmm/models/item/deco/chair/birch.json
@@ -1,7 +1,6 @@
{
"parent": "mmm:item/deco/chair",
"textures": {
- "body": "minecraft:blocks/planks_birch",
- "legs": "minecraft:blocks/log_birch"
+ "body": "minecraft:blocks/planks_birch"
}
}
diff --git a/src/resources/assets/mmm/models/item/deco/chair/dark_oak.json b/src/resources/assets/mmm/models/item/deco/chair/dark_oak.json
index 1736396..b3d623f 100644
--- a/src/resources/assets/mmm/models/item/deco/chair/dark_oak.json
+++ b/src/resources/assets/mmm/models/item/deco/chair/dark_oak.json
@@ -1,7 +1,6 @@
{
"parent": "mmm:item/deco/chair",
"textures": {
- "body": "minecraft:blocks/planks_big_oak",
- "legs": "minecraft:blocks/log_big_oak"
+ "body": "minecraft:blocks/planks_big_oak"
}
}
diff --git a/src/resources/assets/mmm/models/item/deco/chair/hevea.json b/src/resources/assets/mmm/models/item/deco/chair/hevea.json
new file mode 100644
index 0000000..35881bb
--- /dev/null
+++ b/src/resources/assets/mmm/models/item/deco/chair/hevea.json
@@ -0,0 +1,6 @@
+{
+ "parent": "mmm:item/deco/chair",
+ "textures": {
+ "body": "mmm:blocks/materials/planks/hevea"
+ }
+}
diff --git a/src/resources/assets/mmm/models/item/deco/chair/jungle.json b/src/resources/assets/mmm/models/item/deco/chair/jungle.json
index 3b32d1a..ad53053 100644
--- a/src/resources/assets/mmm/models/item/deco/chair/jungle.json
+++ b/src/resources/assets/mmm/models/item/deco/chair/jungle.json
@@ -1,7 +1,6 @@
{
"parent": "mmm:item/deco/chair",
"textures": {
- "body": "minecraft:blocks/planks_jungle",
- "legs": "minecraft:blocks/log_jungle"
+ "body": "minecraft:blocks/planks_jungle"
}
}
diff --git a/src/resources/assets/mmm/models/item/deco/chair/oak.json b/src/resources/assets/mmm/models/item/deco/chair/oak.json
index a648247..6ff69fe 100644
--- a/src/resources/assets/mmm/models/item/deco/chair/oak.json
+++ b/src/resources/assets/mmm/models/item/deco/chair/oak.json
@@ -1,7 +1,6 @@
{
"parent": "mmm:item/deco/chair",
"textures": {
- "body": "minecraft:blocks/planks_oak",
- "legs": "minecraft:blocks/log_oak"
+ "body": "minecraft:blocks/planks_oak"
}
}
diff --git a/src/resources/assets/mmm/models/item/deco/chair/spruce.json b/src/resources/assets/mmm/models/item/deco/chair/spruce.json
index f21a4e2..ad7e5b2 100644
--- a/src/resources/assets/mmm/models/item/deco/chair/spruce.json
+++ b/src/resources/assets/mmm/models/item/deco/chair/spruce.json
@@ -1,7 +1,6 @@
{
"parent": "mmm:item/deco/chair",
"textures": {
- "body": "minecraft:blocks/planks_spruce",
- "legs": "minecraft:blocks/log_spruce"
+ "body": "minecraft:blocks/planks_spruce"
}
}