diff --git a/TODO.txt b/TODO.txt
index d5f2e0d..3cf9d5f 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -5,7 +5,7 @@ deco No Copper pots
deco No Copper plates
deco No Lanterns
deco No Light plates
-deco No Stone - Stairs + slabs
+deco No Stone - Stairs
Limestone
Slate
Basalt
diff --git a/src/java/mmm/deco/slabs/DSlabParts.java b/src/java/mmm/deco/slabs/DSlabParts.java
index c720569..79f99c2 100644
--- a/src/java/mmm/deco/slabs/DSlabParts.java
+++ b/src/java/mmm/deco/slabs/DSlabParts.java
@@ -3,6 +3,7 @@ package mmm.deco.slabs;
import mmm.core.CRegistry;
import mmm.core.api.I_RecipeRegistrar;
+import mmm.deco.DSmoothStone;
import mmm.materials.MTree;
import net.minecraft.block.Block;
import net.minecraft.block.BlockStone;
@@ -37,6 +38,12 @@ public class DSlabParts
return slab;
}
+
+ public static DSlabParts fromSmoothStone( final DSmoothStone.SmoothStoneBlock stone )
+ {
+ return new DSlabParts( stone.getDefaultState( ) , stone.rock.name );
+ }
+
public final DSlabHalf HALF;
public final DSlabDouble DOUBLE;
public final ItemSlab ITEM;
diff --git a/src/java/mmm/deco/slabs/DSlabs.java b/src/java/mmm/deco/slabs/DSlabs.java
index 7896091..5d0ee93 100644
--- a/src/java/mmm/deco/slabs/DSlabs.java
+++ b/src/java/mmm/deco/slabs/DSlabs.java
@@ -1,6 +1,7 @@
package mmm.deco.slabs;
+import mmm.MmmDeco;
import mmm.MmmMaterials;
import net.minecraft.block.BlockStone;
@@ -11,6 +12,11 @@ public class DSlabs
public final DSlabParts GRANITE;
public final DSlabParts DIORITE;
public final DSlabParts ANDESITE;
+
+ public final DSlabParts LIMESTONE;
+ public final DSlabParts SLATE;
+ public final DSlabParts BASALT;
+
public final DSlabParts HEVEA;
public final DSlabParts BAMBOO;
@@ -20,6 +26,11 @@ public class DSlabs
this.GRANITE = DSlabParts.fromVanillaSmoothStone( BlockStone.EnumType.GRANITE_SMOOTH );
this.DIORITE = DSlabParts.fromVanillaSmoothStone( BlockStone.EnumType.DIORITE_SMOOTH );
this.ANDESITE = DSlabParts.fromVanillaSmoothStone( BlockStone.EnumType.ANDESITE_SMOOTH );
+
+ this.LIMESTONE = DSlabParts.fromSmoothStone( MmmDeco.STONE.LIMESTONE );
+ this.SLATE = DSlabParts.fromSmoothStone( MmmDeco.STONE.SLATE );
+ this.BASALT = DSlabParts.fromSmoothStone( MmmDeco.STONE.BASALT );
+
this.HEVEA = DSlabParts.fromWood( MmmMaterials.TREE.HEVEA );
this.BAMBOO = DSlabParts.fromWood( MmmMaterials.TREE.BAMBOO );
}
diff --git a/src/resources/assets/mmm/blockstates/deco/slabs/basalt.json b/src/resources/assets/mmm/blockstates/deco/slabs/basalt.json
new file mode 100644
index 0000000..564e147
--- /dev/null
+++ b/src/resources/assets/mmm/blockstates/deco/slabs/basalt.json
@@ -0,0 +1,6 @@
+{
+ "variants": {
+ "half=bottom,variant=default": { "model": "mmm:deco/slabs/basalt/bottom" },
+ "half=top,variant=default": { "model": "mmm:deco/slabs/basalt/top" }
+ }
+}
\ No newline at end of file
diff --git a/src/resources/assets/mmm/blockstates/deco/slabs/basalt_double.json b/src/resources/assets/mmm/blockstates/deco/slabs/basalt_double.json
new file mode 100644
index 0000000..a1560a2
--- /dev/null
+++ b/src/resources/assets/mmm/blockstates/deco/slabs/basalt_double.json
@@ -0,0 +1,5 @@
+{
+ "variants": {
+ "variant=default": { "model": "mmm:deco/slabs/basalt/double" }
+ }
+}
diff --git a/src/resources/assets/mmm/blockstates/deco/slabs/limestone.json b/src/resources/assets/mmm/blockstates/deco/slabs/limestone.json
new file mode 100644
index 0000000..7839d2f
--- /dev/null
+++ b/src/resources/assets/mmm/blockstates/deco/slabs/limestone.json
@@ -0,0 +1,6 @@
+{
+ "variants": {
+ "half=bottom,variant=default": { "model": "mmm:deco/slabs/limestone/bottom" },
+ "half=top,variant=default": { "model": "mmm:deco/slabs/limestone/top" }
+ }
+}
\ No newline at end of file
diff --git a/src/resources/assets/mmm/blockstates/deco/slabs/limestone_double.json b/src/resources/assets/mmm/blockstates/deco/slabs/limestone_double.json
new file mode 100644
index 0000000..05a6e58
--- /dev/null
+++ b/src/resources/assets/mmm/blockstates/deco/slabs/limestone_double.json
@@ -0,0 +1,5 @@
+{
+ "variants": {
+ "variant=default": { "model": "mmm:deco/slabs/limestone/double" }
+ }
+}
diff --git a/src/resources/assets/mmm/blockstates/deco/slabs/slate.json b/src/resources/assets/mmm/blockstates/deco/slabs/slate.json
new file mode 100644
index 0000000..99829cd
--- /dev/null
+++ b/src/resources/assets/mmm/blockstates/deco/slabs/slate.json
@@ -0,0 +1,6 @@
+{
+ "variants": {
+ "half=bottom,variant=default": { "model": "mmm:deco/slabs/slate/bottom" },
+ "half=top,variant=default": { "model": "mmm:deco/slabs/slate/top" }
+ }
+}
\ No newline at end of file
diff --git a/src/resources/assets/mmm/blockstates/deco/slabs/slate_double.json b/src/resources/assets/mmm/blockstates/deco/slabs/slate_double.json
new file mode 100644
index 0000000..dd0e724
--- /dev/null
+++ b/src/resources/assets/mmm/blockstates/deco/slabs/slate_double.json
@@ -0,0 +1,5 @@
+{
+ "variants": {
+ "variant=default": { "model": "mmm:deco/slabs/slate/double" }
+ }
+}
diff --git a/src/resources/assets/mmm/lang/en_US.lang b/src/resources/assets/mmm/lang/en_US.lang
index 7655d26..393e78d 100644
--- a/src/resources/assets/mmm/lang/en_US.lang
+++ b/src/resources/assets/mmm/lang/en_US.lang
@@ -137,18 +137,21 @@ tile.mmm.deco.smoothstone.limestone.name=Polished Limestone
tile.mmm.deco.smoothstone.basalt.name=Polished Basalt
tile.mmm.deco.smoothstone.slate.name=Polished Slate
+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.limestone.name=Limestone Slab
+tile.mmm.deco.slabs.basalt.name=Basalt Slab
+tile.mmm.deco.slabs.slate.name=Slate Slab
+tile.mmm.deco.slabs.hevea.name=Hevea Wood Slab
+tile.mmm.deco.slabs.bamboo.name=Bamboo Wood Slab
+
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.fence.hevea.name=Hevea Fence
tile.mmm.deco.fence.gate.hevea.name=Hevea Fence Gate
tile.mmm.deco.fence.bamboo.name=Bamboo Fence
diff --git a/src/resources/assets/mmm/models/block/deco/slabs/andesite/bottom.json b/src/resources/assets/mmm/models/block/deco/slabs/andesite/bottom.json
index 0523df6..f10cb14 100644
--- a/src/resources/assets/mmm/models/block/deco/slabs/andesite/bottom.json
+++ b/src/resources/assets/mmm/models/block/deco/slabs/andesite/bottom.json
@@ -3,6 +3,6 @@
"textures": {
"bottom": "minecraft:blocks/stone_andesite_smooth",
"top": "minecraft:blocks/stone_andesite_smooth",
- "side": "mmm:blocks/deco/slabs/andesite_side"
+ "side": "mmm:blocks/deco/slabs/andesite"
}
}
diff --git a/src/resources/assets/mmm/models/block/deco/slabs/andesite/double.json b/src/resources/assets/mmm/models/block/deco/slabs/andesite/double.json
index 40ada33..708ff2d 100644
--- a/src/resources/assets/mmm/models/block/deco/slabs/andesite/double.json
+++ b/src/resources/assets/mmm/models/block/deco/slabs/andesite/double.json
@@ -2,6 +2,6 @@
"parent": "minecraft:block/cube_column",
"textures": {
"end": "minecraft:blocks/stone_andesite_smooth",
- "side": "mmm:blocks/deco/slabs/andesite_side"
+ "side": "mmm:blocks/deco/slabs/andesite"
}
}
\ No newline at end of file
diff --git a/src/resources/assets/mmm/models/block/deco/slabs/andesite/top.json b/src/resources/assets/mmm/models/block/deco/slabs/andesite/top.json
index caa36db..7bf8673 100644
--- a/src/resources/assets/mmm/models/block/deco/slabs/andesite/top.json
+++ b/src/resources/assets/mmm/models/block/deco/slabs/andesite/top.json
@@ -3,6 +3,6 @@
"textures": {
"bottom": "minecraft:blocks/stone_andesite_smooth",
"top": "minecraft:blocks/stone_andesite_smooth",
- "side": "mmm:blocks/deco/slabs/andesite_side"
+ "side": "mmm:blocks/deco/slabs/andesite"
}
}
\ No newline at end of file
diff --git a/src/resources/assets/mmm/models/block/deco/slabs/basalt/bottom.json b/src/resources/assets/mmm/models/block/deco/slabs/basalt/bottom.json
new file mode 100644
index 0000000..6435aec
--- /dev/null
+++ b/src/resources/assets/mmm/models/block/deco/slabs/basalt/bottom.json
@@ -0,0 +1,8 @@
+{
+ "parent": "minecraft:block/half_slab",
+ "textures": {
+ "bottom": "mmm:blocks/deco/smoothstone/basalt",
+ "top": "mmm:blocks/deco/smoothstone/basalt",
+ "side": "mmm:blocks/deco/slabs/basalt"
+ }
+}
diff --git a/src/resources/assets/mmm/models/block/deco/slabs/basalt/double.json b/src/resources/assets/mmm/models/block/deco/slabs/basalt/double.json
new file mode 100644
index 0000000..dd3749b
--- /dev/null
+++ b/src/resources/assets/mmm/models/block/deco/slabs/basalt/double.json
@@ -0,0 +1,7 @@
+{
+ "parent": "minecraft:block/cube_column",
+ "textures": {
+ "end": "mmm:blocks/deco/smoothstone/basalt",
+ "side": "mmm:blocks/deco/slabs/basalt"
+ }
+}
\ No newline at end of file
diff --git a/src/resources/assets/mmm/models/block/deco/slabs/basalt/top.json b/src/resources/assets/mmm/models/block/deco/slabs/basalt/top.json
new file mode 100644
index 0000000..7df7cfc
--- /dev/null
+++ b/src/resources/assets/mmm/models/block/deco/slabs/basalt/top.json
@@ -0,0 +1,8 @@
+{
+ "parent": "minecraft:block/upper_slab",
+ "textures": {
+ "bottom": "mmm:blocks/deco/smoothstone/basalt",
+ "top": "mmm:blocks/deco/smoothstone/basalt",
+ "side": "mmm:blocks/deco/slabs/basalt"
+ }
+}
\ No newline at end of file
diff --git a/src/resources/assets/mmm/models/block/deco/slabs/diorite/bottom.json b/src/resources/assets/mmm/models/block/deco/slabs/diorite/bottom.json
index a15608f..d0f8f99 100644
--- a/src/resources/assets/mmm/models/block/deco/slabs/diorite/bottom.json
+++ b/src/resources/assets/mmm/models/block/deco/slabs/diorite/bottom.json
@@ -3,6 +3,6 @@
"textures": {
"bottom": "minecraft:blocks/stone_diorite_smooth",
"top": "minecraft:blocks/stone_diorite_smooth",
- "side": "mmm:blocks/deco/slabs/diorite_side"
+ "side": "mmm:blocks/deco/slabs/diorite"
}
}
diff --git a/src/resources/assets/mmm/models/block/deco/slabs/diorite/double.json b/src/resources/assets/mmm/models/block/deco/slabs/diorite/double.json
index f0d9b78..9927376 100644
--- a/src/resources/assets/mmm/models/block/deco/slabs/diorite/double.json
+++ b/src/resources/assets/mmm/models/block/deco/slabs/diorite/double.json
@@ -2,6 +2,6 @@
"parent": "minecraft:block/cube_column",
"textures": {
"end": "minecraft:blocks/stone_diorite_smooth",
- "side": "mmm:blocks/deco/slabs/diorite_side"
+ "side": "mmm:blocks/deco/slabs/diorite"
}
}
\ No newline at end of file
diff --git a/src/resources/assets/mmm/models/block/deco/slabs/diorite/top.json b/src/resources/assets/mmm/models/block/deco/slabs/diorite/top.json
index 27f90f2..54cae6d 100644
--- a/src/resources/assets/mmm/models/block/deco/slabs/diorite/top.json
+++ b/src/resources/assets/mmm/models/block/deco/slabs/diorite/top.json
@@ -3,6 +3,6 @@
"textures": {
"bottom": "minecraft:blocks/stone_diorite_smooth",
"top": "minecraft:blocks/stone_diorite_smooth",
- "side": "mmm:blocks/deco/slabs/diorite_side"
+ "side": "mmm:blocks/deco/slabs/diorite"
}
}
\ No newline at end of file
diff --git a/src/resources/assets/mmm/models/block/deco/slabs/granite/bottom.json b/src/resources/assets/mmm/models/block/deco/slabs/granite/bottom.json
index 09e68b4..7ea7e65 100644
--- a/src/resources/assets/mmm/models/block/deco/slabs/granite/bottom.json
+++ b/src/resources/assets/mmm/models/block/deco/slabs/granite/bottom.json
@@ -3,6 +3,6 @@
"textures": {
"bottom": "minecraft:blocks/stone_granite_smooth",
"top": "minecraft:blocks/stone_granite_smooth",
- "side": "mmm:blocks/deco/slabs/granite_side"
+ "side": "mmm:blocks/deco/slabs/granite"
}
}
diff --git a/src/resources/assets/mmm/models/block/deco/slabs/granite/double.json b/src/resources/assets/mmm/models/block/deco/slabs/granite/double.json
index 6e3ce26..47a9927 100644
--- a/src/resources/assets/mmm/models/block/deco/slabs/granite/double.json
+++ b/src/resources/assets/mmm/models/block/deco/slabs/granite/double.json
@@ -2,6 +2,6 @@
"parent": "minecraft:block/cube_column",
"textures": {
"end": "minecraft:blocks/stone_granite_smooth",
- "side": "mmm:blocks/deco/slabs/granite_side"
+ "side": "mmm:blocks/deco/slabs/granite"
}
}
\ No newline at end of file
diff --git a/src/resources/assets/mmm/models/block/deco/slabs/granite/top.json b/src/resources/assets/mmm/models/block/deco/slabs/granite/top.json
index c8856bb..57d7124 100644
--- a/src/resources/assets/mmm/models/block/deco/slabs/granite/top.json
+++ b/src/resources/assets/mmm/models/block/deco/slabs/granite/top.json
@@ -3,6 +3,6 @@
"textures": {
"bottom": "minecraft:blocks/stone_granite_smooth",
"top": "minecraft:blocks/stone_granite_smooth",
- "side": "mmm:blocks/deco/slabs/granite_side"
+ "side": "mmm:blocks/deco/slabs/granite"
}
}
\ No newline at end of file
diff --git a/src/resources/assets/mmm/models/block/deco/slabs/limestone/bottom.json b/src/resources/assets/mmm/models/block/deco/slabs/limestone/bottom.json
new file mode 100644
index 0000000..fc6602b
--- /dev/null
+++ b/src/resources/assets/mmm/models/block/deco/slabs/limestone/bottom.json
@@ -0,0 +1,8 @@
+{
+ "parent": "minecraft:block/half_slab",
+ "textures": {
+ "bottom": "mmm:blocks/deco/smoothstone/limestone",
+ "top": "mmm:blocks/deco/smoothstone/limestone",
+ "side": "mmm:blocks/deco/slabs/limestone"
+ }
+}
diff --git a/src/resources/assets/mmm/models/block/deco/slabs/limestone/double.json b/src/resources/assets/mmm/models/block/deco/slabs/limestone/double.json
new file mode 100644
index 0000000..180ea61
--- /dev/null
+++ b/src/resources/assets/mmm/models/block/deco/slabs/limestone/double.json
@@ -0,0 +1,7 @@
+{
+ "parent": "minecraft:block/cube_column",
+ "textures": {
+ "end": "mmm:blocks/deco/smoothstone/limestone",
+ "side": "mmm:blocks/deco/slabs/limestone"
+ }
+}
\ No newline at end of file
diff --git a/src/resources/assets/mmm/models/block/deco/slabs/limestone/top.json b/src/resources/assets/mmm/models/block/deco/slabs/limestone/top.json
new file mode 100644
index 0000000..25f3249
--- /dev/null
+++ b/src/resources/assets/mmm/models/block/deco/slabs/limestone/top.json
@@ -0,0 +1,8 @@
+{
+ "parent": "minecraft:block/upper_slab",
+ "textures": {
+ "bottom": "mmm:blocks/deco/smoothstone/limestone",
+ "top": "mmm:blocks/deco/smoothstone/limestone",
+ "side": "mmm:blocks/deco/slabs/limestone"
+ }
+}
\ No newline at end of file
diff --git a/src/resources/assets/mmm/models/block/deco/slabs/slate/bottom.json b/src/resources/assets/mmm/models/block/deco/slabs/slate/bottom.json
new file mode 100644
index 0000000..6692dbd
--- /dev/null
+++ b/src/resources/assets/mmm/models/block/deco/slabs/slate/bottom.json
@@ -0,0 +1,8 @@
+{
+ "parent": "minecraft:block/half_slab",
+ "textures": {
+ "bottom": "mmm:blocks/deco/smoothstone/slate",
+ "top": "mmm:blocks/deco/smoothstone/slate",
+ "side": "mmm:blocks/deco/slabs/slate"
+ }
+}
diff --git a/src/resources/assets/mmm/models/block/deco/slabs/slate/double.json b/src/resources/assets/mmm/models/block/deco/slabs/slate/double.json
new file mode 100644
index 0000000..1ccee75
--- /dev/null
+++ b/src/resources/assets/mmm/models/block/deco/slabs/slate/double.json
@@ -0,0 +1,7 @@
+{
+ "parent": "minecraft:block/cube_column",
+ "textures": {
+ "end": "mmm:blocks/deco/smoothstone/slate",
+ "side": "mmm:blocks/deco/slabs/slate"
+ }
+}
\ No newline at end of file
diff --git a/src/resources/assets/mmm/models/block/deco/slabs/slate/top.json b/src/resources/assets/mmm/models/block/deco/slabs/slate/top.json
new file mode 100644
index 0000000..3e36aa2
--- /dev/null
+++ b/src/resources/assets/mmm/models/block/deco/slabs/slate/top.json
@@ -0,0 +1,8 @@
+{
+ "parent": "minecraft:block/upper_slab",
+ "textures": {
+ "bottom": "mmm:blocks/deco/smoothstone/slate",
+ "top": "mmm:blocks/deco/smoothstone/slate",
+ "side": "mmm:blocks/deco/slabs/slate"
+ }
+}
\ No newline at end of file
diff --git a/src/resources/assets/mmm/models/item/deco/slabs/basalt.json b/src/resources/assets/mmm/models/item/deco/slabs/basalt.json
new file mode 100644
index 0000000..e2418d2
--- /dev/null
+++ b/src/resources/assets/mmm/models/item/deco/slabs/basalt.json
@@ -0,0 +1,3 @@
+{
+ "parent": "mmm:block/deco/slabs/basalt/bottom"
+}
\ No newline at end of file
diff --git a/src/resources/assets/mmm/models/item/deco/slabs/limestone.json b/src/resources/assets/mmm/models/item/deco/slabs/limestone.json
new file mode 100644
index 0000000..4f78a38
--- /dev/null
+++ b/src/resources/assets/mmm/models/item/deco/slabs/limestone.json
@@ -0,0 +1,3 @@
+{
+ "parent": "mmm:block/deco/slabs/limestone/bottom"
+}
\ No newline at end of file
diff --git a/src/resources/assets/mmm/models/item/deco/slabs/slate.json b/src/resources/assets/mmm/models/item/deco/slabs/slate.json
new file mode 100644
index 0000000..f348056
--- /dev/null
+++ b/src/resources/assets/mmm/models/item/deco/slabs/slate.json
@@ -0,0 +1,3 @@
+{
+ "parent": "mmm:block/deco/slabs/slate/bottom"
+}
\ No newline at end of file
diff --git a/src/resources/assets/mmm/textures/blocks/deco/slabs/andesite_side.png b/src/resources/assets/mmm/textures/blocks/deco/slabs/andesite.png
similarity index 100%
rename from src/resources/assets/mmm/textures/blocks/deco/slabs/andesite_side.png
rename to src/resources/assets/mmm/textures/blocks/deco/slabs/andesite.png
diff --git a/src/resources/assets/mmm/textures/blocks/deco/slabs/basalt.png b/src/resources/assets/mmm/textures/blocks/deco/slabs/basalt.png
new file mode 100644
index 0000000..14451fe
Binary files /dev/null and b/src/resources/assets/mmm/textures/blocks/deco/slabs/basalt.png differ
diff --git a/src/resources/assets/mmm/textures/blocks/deco/slabs/diorite_side.png b/src/resources/assets/mmm/textures/blocks/deco/slabs/diorite.png
similarity index 100%
rename from src/resources/assets/mmm/textures/blocks/deco/slabs/diorite_side.png
rename to src/resources/assets/mmm/textures/blocks/deco/slabs/diorite.png
diff --git a/src/resources/assets/mmm/textures/blocks/deco/slabs/granite_side.png b/src/resources/assets/mmm/textures/blocks/deco/slabs/granite.png
similarity index 100%
rename from src/resources/assets/mmm/textures/blocks/deco/slabs/granite_side.png
rename to src/resources/assets/mmm/textures/blocks/deco/slabs/granite.png
diff --git a/src/resources/assets/mmm/textures/blocks/deco/slabs/limestone.png b/src/resources/assets/mmm/textures/blocks/deco/slabs/limestone.png
new file mode 100644
index 0000000..01f613f
Binary files /dev/null and b/src/resources/assets/mmm/textures/blocks/deco/slabs/limestone.png differ
diff --git a/src/resources/assets/mmm/textures/blocks/deco/slabs/slate.png b/src/resources/assets/mmm/textures/blocks/deco/slabs/slate.png
new file mode 100644
index 0000000..8826eea
Binary files /dev/null and b/src/resources/assets/mmm/textures/blocks/deco/slabs/slate.png differ