Limestone / slate / basalt slabs

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

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;

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 );
 	}

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" }
+    }
+}

src/resources/assets/mmm/blockstates/deco/slabs/basalt_double.json

@@ -0,0 +1,5 @@
+{
+    "variants": {
+        "variant=default": { "model": "mmm:deco/slabs/basalt/double" }
+    }
+}

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" }
+    }
+}

src/resources/assets/mmm/blockstates/deco/slabs/limestone_double.json

@@ -0,0 +1,5 @@
+{
+    "variants": {
+        "variant=default": { "model": "mmm:deco/slabs/limestone/double" }
+    }
+}

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" }
+    }
+}

src/resources/assets/mmm/blockstates/deco/slabs/slate_double.json

@@ -0,0 +1,5 @@
+{
+    "variants": {
+        "variant=default": { "model": "mmm:deco/slabs/slate/double" }
+    }
+}

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

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"
     }
 }

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"
     }
 }

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"
     }
 }

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"
+    }
+}

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"
+    }
+}

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"
+    }
+}

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"
     }
 }

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"
     }
 }

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"
     }
 }

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"
     }
 }

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"
     }
 }

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"
     }
 }

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"
+    }
+}

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"
+    }
+}

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"
+    }
+}

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"
+    }
+}

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"
+    }
+}

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"
+    }
+}

src/resources/assets/mmm/models/item/deco/slabs/basalt.json

@@ -0,0 +1,3 @@
+{
+	"parent": "mmm:block/deco/slabs/basalt/bottom"
+}

src/resources/assets/mmm/models/item/deco/slabs/limestone.json

@@ -0,0 +1,3 @@
+{
+	"parent": "mmm:block/deco/slabs/limestone/bottom"
+}

src/resources/assets/mmm/models/item/deco/slabs/slate.json

@@ -0,0 +1,3 @@
+{
+	"parent": "mmm:block/deco/slabs/slate/bottom"
+}