Added chitin stairs and slabs

src/main/java/com/minelittlepony/unicopia/block/SmartSlabBlock.java

@@ -13,11 +13,11 @@ import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.BlockView;
 import net.minecraft.world.World;
 
-public abstract class AbstractSlabBlock extends SlabBlock {
+public class SmartSlabBlock extends SlabBlock {
 
     protected final BlockState modelState;
 
-    public AbstractSlabBlock(BlockState inherited, Block.Settings settings) {
+    public SmartSlabBlock(BlockState inherited, Block.Settings settings) {
         super(settings);
         modelState = inherited;
     }

src/main/java/com/minelittlepony/unicopia/block/SmartStairsBlock.java

@@ -9,11 +9,11 @@ import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.BlockView;
 import net.minecraft.world.World;
 
-public abstract class AbstractStairsBlock extends StairsBlock {
+public class SmartStairsBlock extends StairsBlock {
 
     protected final BlockState baseBlockState;
 
-    public AbstractStairsBlock(BlockState inherited, Settings settings) {
+    public SmartStairsBlock(BlockState inherited, Settings settings) {
         super(inherited, settings);
         baseBlockState = inherited;
     }

src/main/java/com/minelittlepony/unicopia/block/UBlocks.java

@@ -120,10 +120,19 @@ public interface UBlocks {
                     .sounds(BlockSoundGroup.SAND)
                     .breakByTool(FabricToolTags.SHOVELS, 1)
                     .build()));
-    ChitinBlock CHITIN_SHELL_BLOCK = register("chitin_shell_block", new ChitinBlock(FabricBlockSettings.of(UMaterials.CHITIN)
+    Block CHITIN_SHELL_BLOCK = register("chitin_shell_block", new ChitinBlock(FabricBlockSettings.of(UMaterials.CHITIN)
                     .strength(50, 2000)
                     .breakByTool(FabricToolTags.PICKAXES, 2)
                     .build()));
+    Block CHITIN_SHELL_STAIRS = register("chitin_shell_stairs", new SmartStairsBlock(CHITIN_SHELL_BLOCK.getDefaultState(), FabricBlockSettings.of(UMaterials.CHITIN)
+            .strength(50, 2000)
+            .breakByTool(FabricToolTags.PICKAXES, 2)
+            .build()));
+    Block CHITIN_SHELL_SLAB = register("chitin_shell_slab", new SmartSlabBlock(CHITIN_SHELL_BLOCK.getDefaultState(), FabricBlockSettings.of(UMaterials.CHITIN)
+            .strength(50, 2000)
+            .breakByTool(FabricToolTags.PICKAXES, 2)
+            .build()));
+
     Block CHISELED_CHITIN_SHELL_BLOCK = register("chiseled_chitin_shell_block", new ChiselledChitinBlock(FabricBlockSettings.of(UMaterials.CHITIN)
                     .strength(50, 2000)
                     .breakByTool(FabricToolTags.PICKAXES, 2)

src/main/java/com/minelittlepony/unicopia/gas/CloudSlabBlock.java

@@ -1,6 +1,6 @@
 package com.minelittlepony.unicopia.gas;
 
-import com.minelittlepony.unicopia.block.AbstractSlabBlock;
+import com.minelittlepony.unicopia.block.SmartSlabBlock;
 
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
@@ -12,7 +12,7 @@ import net.minecraft.util.shape.VoxelShape;
 import net.minecraft.util.shape.VoxelShapes;
 import net.minecraft.world.BlockView;
 
-public class CloudSlabBlock extends AbstractSlabBlock implements Gas {
+public class CloudSlabBlock extends SmartSlabBlock implements Gas {
 
     public CloudSlabBlock(BlockState inherited, Settings settings) {
         super(inherited, settings);

src/main/java/com/minelittlepony/unicopia/gas/CloudStairsBlock.java

@@ -1,6 +1,6 @@
 package com.minelittlepony.unicopia.gas;
 
-import com.minelittlepony.unicopia.block.AbstractStairsBlock;
+import com.minelittlepony.unicopia.block.SmartStairsBlock;
 
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
@@ -12,7 +12,7 @@ import net.minecraft.util.shape.VoxelShape;
 import net.minecraft.util.shape.VoxelShapes;
 import net.minecraft.world.BlockView;
 
-public class CloudStairsBlock extends AbstractStairsBlock implements Gas {
+public class CloudStairsBlock extends SmartStairsBlock implements Gas {
 
     public CloudStairsBlock(BlockState inherited, Settings settings) {
         super(inherited, settings);

src/main/java/com/minelittlepony/unicopia/item/UItems.java

@@ -64,8 +64,12 @@ public interface UItems {
     Item MUSIC_DISC_FUNK = register("music_disc_funk", USounds.RECORD_FUNK);
 
     Item HIVE_WALL_BLOCK = register("hive_wall_block", new BlockItem(UBlocks.HIVE_WALL_BLOCK, new Settings().group(ItemGroup.BUILDING_BLOCKS)));
+
     Item CHITIN_SHELL = register("chitin_shell", new Item(new Settings().group(ItemGroup.MATERIALS)));
     Item CHITIN_SHELL_BLOCK = register("chitin_shell_block", new BlockItem(UBlocks.CHITIN_SHELL_BLOCK, new Settings().group(ItemGroup.BUILDING_BLOCKS)));
+    Item CHITIN_SHELL_SLAB = register("chitin_shell_slab", new BlockItem(UBlocks.CHITIN_SHELL_SLAB, new Settings().group(ItemGroup.BUILDING_BLOCKS)));
+    Item CHITIN_SHELL_STAIRS = register("chitin_shell_stairs", new BlockItem(UBlocks.CHITIN_SHELL_STAIRS, new Settings().group(ItemGroup.BUILDING_BLOCKS)));
+
     Item CHISELED_CHITIN_SHELL_BLOCK = register("chiseled_chitin_shell_block", new BlockItem(UBlocks.CHISELED_CHITIN_SHELL_BLOCK, new Settings().group(ItemGroup.BUILDING_BLOCKS)));
     Item SLIME_DROP = register("slime_drop", new BlockItem(UBlocks.SLIME_DROP, new Settings().group(ItemGroup.MATERIALS)));
     Item SLIME_LAYER = register("slime_layer", new BlockItem(UBlocks.SLIME_LAYER, new Settings().group(ItemGroup.DECORATIONS)));

src/main/resources/assets/unicopia/blockstates/chitin_shell_slab.json

@@ -0,0 +1,7 @@
+{
+    "variants": {
+        "type=bottom": { "model": "unicopia:block/chitin_shell_slab" },
+        "type=top": { "model": "unicopia:block/chitin_shell_slab_top" },
+        "type=double": { "model": "unicopia:block/chitin_shell_block" }
+    }
+}

src/main/resources/assets/unicopia/blockstates/chitin_shell_stairs.json

@@ -0,0 +1,45 @@
+{
+    "variants": {
+        "facing=east,half=bottom,shape=straight":  { "model": "unicopia:block/chitin_shell_stairs" },
+        "facing=west,half=bottom,shape=straight":  { "model": "unicopia:block/chitin_shell_stairs", "y": 180, "uvlock": true },
+        "facing=south,half=bottom,shape=straight": { "model": "unicopia:block/chitin_shell_stairs", "y": 90, "uvlock": true },
+        "facing=north,half=bottom,shape=straight": { "model": "unicopia:block/chitin_shell_stairs", "y": 270, "uvlock": true },
+        "facing=east,half=bottom,shape=outer_right":  { "model": "unicopia:block/chitin_shell_outer_stairs" },
+        "facing=west,half=bottom,shape=outer_right":  { "model": "unicopia:block/chitin_shell_outer_stairs", "y": 180, "uvlock": true },
+        "facing=south,half=bottom,shape=outer_right": { "model": "unicopia:block/chitin_shell_outer_stairs", "y": 90, "uvlock": true },
+        "facing=north,half=bottom,shape=outer_right": { "model": "unicopia:block/chitin_shell_outer_stairs", "y": 270, "uvlock": true },
+        "facing=east,half=bottom,shape=outer_left":  { "model": "unicopia:block/chitin_shell_outer_stairs", "y": 270, "uvlock": true },
+        "facing=west,half=bottom,shape=outer_left":  { "model": "unicopia:block/chitin_shell_outer_stairs", "y": 90, "uvlock": true },
+        "facing=south,half=bottom,shape=outer_left": { "model": "unicopia:block/chitin_shell_outer_stairs" },
+        "facing=north,half=bottom,shape=outer_left": { "model": "unicopia:block/chitin_shell_outer_stairs", "y": 180, "uvlock": true },
+        "facing=east,half=bottom,shape=inner_right":  { "model": "unicopia:block/chitin_shell_inner_stairs" },
+        "facing=west,half=bottom,shape=inner_right":  { "model": "unicopia:block/chitin_shell_inner_stairs", "y": 180, "uvlock": true },
+        "facing=south,half=bottom,shape=inner_right": { "model": "unicopia:block/chitin_shell_inner_stairs", "y": 90, "uvlock": true },
+        "facing=north,half=bottom,shape=inner_right": { "model": "unicopia:block/chitin_shell_inner_stairs", "y": 270, "uvlock": true },
+        "facing=east,half=bottom,shape=inner_left":  { "model": "unicopia:block/chitin_shell_inner_stairs", "y": 270, "uvlock": true },
+        "facing=west,half=bottom,shape=inner_left":  { "model": "unicopia:block/chitin_shell_inner_stairs", "y": 90, "uvlock": true },
+        "facing=south,half=bottom,shape=inner_left": { "model": "unicopia:block/chitin_shell_inner_stairs" },
+        "facing=north,half=bottom,shape=inner_left": { "model": "unicopia:block/chitin_shell_inner_stairs", "y": 180, "uvlock": true },
+        
+        "facing=east,half=top,shape=straight":  { "model": "unicopia:block/chitin_shell_stairs_top", "x": 180, "uvlock": true },
+        "facing=west,half=top,shape=straight":  { "model": "unicopia:block/chitin_shell_stairs_top", "x": 180, "y": 180, "uvlock": true },
+        "facing=south,half=top,shape=straight": { "model": "unicopia:block/chitin_shell_stairs_top", "x": 180, "y": 90, "uvlock": true },
+        "facing=north,half=top,shape=straight": { "model": "unicopia:block/chitin_shell_stairs_top", "x": 180, "y": 270, "uvlock": true },
+        "facing=east,half=top,shape=outer_right":  { "model": "unicopia:block/chitin_shell_outer_stairs_top", "x": 180, "y": 90, "uvlock": true },
+        "facing=west,half=top,shape=outer_right":  { "model": "unicopia:block/chitin_shell_outer_stairs_top", "x": 180, "y": 270, "uvlock": true },
+        "facing=south,half=top,shape=outer_right": { "model": "unicopia:block/chitin_shell_outer_stairs_top", "x": 180, "y": 180, "uvlock": true },
+        "facing=north,half=top,shape=outer_right": { "model": "unicopia:block/chitin_shell_outer_stairs_top", "x": 180, "uvlock": true },
+        "facing=east,half=top,shape=outer_left":  { "model": "unicopia:block/chitin_shell_outer_stairs_top", "x": 180, "uvlock": true },
+        "facing=west,half=top,shape=outer_left":  { "model": "unicopia:block/chitin_shell_outer_stairs_top", "x": 180, "y": 180, "uvlock": true },
+        "facing=south,half=top,shape=outer_left": { "model": "unicopia:block/chitin_shell_outer_stairs_top", "x": 180, "y": 90, "uvlock": true },
+        "facing=north,half=top,shape=outer_left": { "model": "unicopia:block/chitin_shell_outer_stairs_top", "x": 180, "y": 270, "uvlock": true },
+        "facing=east,half=top,shape=inner_right":  { "model": "unicopia:block/chitin_shell_inner_stairs_top", "x": 180, "y": 90, "uvlock": true },
+        "facing=west,half=top,shape=inner_right":  { "model": "unicopia:block/chitin_shell_inner_stairs_top", "x": 180, "y": 270, "uvlock": true },
+        "facing=south,half=top,shape=inner_right": { "model": "unicopia:block/chitin_shell_inner_stairs_top", "x": 180, "y": 180, "uvlock": true },
+        "facing=north,half=top,shape=inner_right": { "model": "unicopia:block/chitin_shell_inner_stairs_top", "x": 180, "uvlock": true },
+        "facing=east,half=top,shape=inner_left":  { "model": "unicopia:block/chitin_shell_inner_stairs_top", "x": 180, "uvlock": true },
+        "facing=west,half=top,shape=inner_left":  { "model": "unicopia:block/chitin_shell_inner_stairs_top", "x": 180, "y": 180, "uvlock": true },
+        "facing=south,half=top,shape=inner_left": { "model": "unicopia:block/chitin_shell_inner_stairs_top", "x": 180, "y": 90, "uvlock": true },
+        "facing=north,half=top,shape=inner_left": { "model": "unicopia:block/chitin_shell_inner_stairs_top", "x": 180, "y": 270, "uvlock": true }
+    }
+}

src/main/resources/assets/unicopia/lang/en_us.json

@@ -19,6 +19,8 @@
 
   "block.unicopia.hive_wall_block": "Hive Wall Block",
   "block.unicopia.chitin_shell_block": "Chitin Shell Block",
+  "block.unicopia.chitin_shell_stairs": "Chitin Shell Stairs",
+  "block.unicopia.chitin_shell_slab": "Chitin Shell Slab",
   "block.unicopia.chiseled_chitin_shell_block": "Chiseled Chitin Shell Block",
   "block.unicopia.chitin_shell": "Chitin Shell",
   "block.unicopia.slime_drop": "Slime Droplet",

src/main/resources/assets/unicopia/models/block/chitin_shell_inner_stairs.json

@@ -0,0 +1,8 @@
+{   "parent": "unicopia:block/cloud_inner_stairs",
+    "textures": {
+	    "bottom": "unicopia:blocks/chitin_block_covered",
+	    "top": "unicopia:blocks/chitin_block_top",
+	    "side": "unicopia:blocks/chitin_block_uncovered",
+	    "step": "unicopia:blocks/chitin_shell_slab_side_uncovered"
+	}
+}

src/main/resources/assets/unicopia/models/block/chitin_shell_inner_stairs_top.json

@@ -0,0 +1,6 @@
+{   "parent": "unicopia:block/chitin_shell_inner_stairs",
+    "textures": {
+	    "bottom": "unicopia:blocks/chitin_block_top",
+	    "top": "unicopia:blocks/chitin_block_covered"
+	}
+}

src/main/resources/assets/unicopia/models/block/chitin_shell_outer_stairs.json

@@ -0,0 +1,8 @@
+{   "parent": "unicopia:block/cloud_outer_stairs",
+    "textures": {
+	    "bottom": "unicopia:blocks/chitin_block_covered",
+	    "top": "unicopia:blocks/chitin_block_top",
+	    "side": "unicopia:blocks/chitin_block_uncovered",
+	    "step": "unicopia:blocks/chitin_shell_slab_side_uncovered"
+	}
+}

src/main/resources/assets/unicopia/models/block/chitin_shell_outer_stairs_top.json

@@ -0,0 +1,6 @@
+{   "parent": "unicopia:block/chitin_shell_outer_stairs",
+    "textures": {
+	    "bottom": "unicopia:blocks/chitin_block_top",
+	    "top": "unicopia:blocks/chitin_block_covered"
+	}
+}

src/main/resources/assets/unicopia/models/block/chitin_shell_slab.json

@@ -0,0 +1,8 @@
+{
+    "parent": "block/slab",
+    "textures": {
+        "bottom": "unicopia:blocks/chitin_block_covered",
+        "top": "unicopia:blocks/chitin_block_top",
+        "side": "unicopia:blocks/chitin_shell_slab_side_uncovered"
+    }
+}

src/main/resources/assets/unicopia/models/block/chitin_shell_slab_top.json

@@ -0,0 +1,8 @@
+{
+    "parent": "block/slab_top",
+    "textures": {
+        "bottom": "unicopia:blocks/chitin_block_covered",
+        "top": "unicopia:blocks/chitin_block_top",
+        "side": "unicopia:blocks/chitin_shell_slab_side_uncovered"
+    }
+}

src/main/resources/assets/unicopia/models/block/chitin_shell_stairs.json

@@ -0,0 +1,8 @@
+{   "parent": "unicopia:block/cloud_stairs",
+    "textures": {
+	    "bottom": "unicopia:blocks/chitin_block_covered",
+	    "top": "unicopia:blocks/chitin_block_top",
+	    "side": "unicopia:blocks/chitin_block_uncovered",
+	    "step": "unicopia:blocks/chitin_shell_slab_side_uncovered"
+	}
+}

src/main/resources/assets/unicopia/models/block/chitin_shell_stairs_top.json

@@ -0,0 +1,6 @@
+{   "parent": "unicopia:block/chitin_shell_stairs",
+    "textures": {
+	    "bottom": "unicopia:blocks/chitin_block_top",
+	    "top": "unicopia:blocks/chitin_block_covered"
+	}
+}

src/main/resources/assets/unicopia/models/item/chitin_shell_slab.json

@@ -0,0 +1,10 @@
+{
+    "parent": "unicopia:block/chitin_shell_slab",
+    "display": {
+        "thirdperson": {
+            "rotation": [ 10, -45, 170 ],
+            "translation": [ 0, 1.5, -2.75 ],
+            "scale": [ 0.375, 0.375, 0.375 ]
+        }
+    }
+}

src/main/resources/assets/unicopia/models/item/chitin_shell_stairs.json

@@ -0,0 +1,3 @@
+{
+	"parent": "unicopia:block/chitin_shell_stairs"
+}

src/main/resources/data/minecraft/tags/blocks/slabs.json

@@ -4,6 +4,7 @@
     "unicopia:cloud_slab",
     "unicopia:enchanted_cloud_slab",
     "unicopia:dense_cloud_slab",
+    "unicopia:chitin_shell_slab",
     "unicopia:smooth_marble_slab"
   ]
 }

src/main/resources/data/minecraft/tags/blocks/stairs.json

@@ -1,6 +1,9 @@
 {
   "replace": false,
   "values": [
-    "unicopia:cloud_stairs"
+  	"unicopia:chitin_shell_stairs",
+    "unicopia:cloud_stairs",
+    "unicopia:enchanted_cloud_stairs",
+    "unicopia:dense_cloud_stairs"
   ]
 }

src/main/resources/data/minecraft/tags/items/slabs.json

@@ -3,6 +3,8 @@
   "values": [
     "unicopia:cloud_slab",
     "unicopia:enchanted_cloud_slab",
-    "unicopia:dense_cloud_slab"
+    "unicopia:dense_cloud_slab",
+    "unicopia:chitin_shell_slab",
+    "unicopia:smooth_marble_slab"
   ]
 }

src/main/resources/data/minecraft/tags/items/stairs.json

@@ -1,6 +1,9 @@
 {
   "replace": false,
   "values": [
-    "unicopia:cloud_stairs"
+  	"unicopia:chitin_shell_stairs",
+    "unicopia:cloud_stairs",
+    "unicopia:enchanted_cloud_stairs",
+    "unicopia:dense_cloud_stairs"
   ]
 }

src/main/resources/data/unicopia/loot_tables/blocks/chitin_shell_slab.json

@@ -0,0 +1,11 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "rolls": 1,
+      "entries": [
+        { "type": "minecraft:item", "name": "unicopia:chitin_shell_slab" }
+      ]
+    }
+  ]
+}

src/main/resources/data/unicopia/loot_tables/blocks/chitin_shell_stairs.json

@@ -0,0 +1,11 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "rolls": 1,
+      "entries": [
+        { "type": "minecraft:item", "name": "unicopia:chitin_shell_stairs" }
+      ]
+    }
+  ]
+}

src/main/resources/data/unicopia/recipes/chitin_shell_slab.json

@@ -0,0 +1,12 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "pattern": [
+    "###"
+  ],
+  "key": {
+    "#": [
+      { "item": "unicopia:chitin_shell_block" }
+    ]
+  },
+  "result": { "item": "unicopia:chitin_shell_slab", "count": 6 }
+}

src/main/resources/data/unicopia/recipes/chitin_shell_stairs.json

@@ -0,0 +1,14 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "pattern": [
+    "#  ",
+    "## ",
+    "###"
+  ],
+  "key": {
+    "#": [
+      { "item": "unicopia:chitin_shell_block" }
+    ]
+  },
+  "result": { "item": "unicopia:chitin_shell_stairs", "count": 4 }
+}