Update textures + Add sand (1x, 2x, 3x, 4x) + cobbled_deepslate (1x, …

…2x, 3x, 4x)

src/main/kotlin/eu/koboo/nova/compressed/blocks/registry/Blocks.kt

@@ -20,12 +20,38 @@ object Blocks : BlockRegistry by CompressedBlocksAddon.registry {
             SoundGroup.STONE,
             Material.COBBLESTONE
     )
+    private val OPTIONS_COBBLED_DEEPSLATE = BlockOptions(
+            3.5,
+            VanillaToolCategories.PICKAXE,
+            VanillaToolTiers.WOOD,
+            true,
+            SoundGroup.STONE,
+            Material.COBBLED_DEEPSLATE
+    )
+    private val OPTIONS_SAND = BlockOptions(
+            1.5,
+            VanillaToolCategories.SHOVEL,
+            VanillaToolTiers.WOOD,
+            false,
+            SoundGroup.SAND,
+            Material.SAND
+    )
+
+    val COBBLED_DEEPSLATE_1X = block("compressed_cobbled_deepslate_1x").blockOptions(OPTIONS_COBBLED_DEEPSLATE).register()
+    val COBBLED_DEEPSLATE_2X = block("compressed_cobbled_deepslate_2x").blockOptions(OPTIONS_COBBLED_DEEPSLATE).register()
+    val COBBLED_DEEPSLATE_3X = block("compressed_cobbled_deepslate_3x").blockOptions(OPTIONS_COBBLED_DEEPSLATE).register()
+    val COBBLED_DEEPSLATE_4X = block("compressed_cobbled_deepslate_4x").blockOptions(OPTIONS_COBBLED_DEEPSLATE).register()
 
     val COBBLESTONE_1X = block("compressed_cobblestone_1x").blockOptions(OPTIONS_STONE).register()
     val COBBLESTONE_2X = block("compressed_cobblestone_2x").blockOptions(OPTIONS_STONE).register()
     val COBBLESTONE_3X = block("compressed_cobblestone_3x").blockOptions(OPTIONS_STONE).register()
     val COBBLESTONE_4X = block("compressed_cobblestone_4x").blockOptions(OPTIONS_STONE).register()
 
+    val SAND_1X = block("compressed_sand_1x").blockOptions(OPTIONS_SAND).register()
+    val SAND_2X = block("compressed_sand_2x").blockOptions(OPTIONS_SAND).register()
+    val SAND_3X = block("compressed_sand_3x").blockOptions(OPTIONS_SAND).register()
+    val SAND_4X = block("compressed_sand_4x").blockOptions(OPTIONS_SAND).register()
+
     val STONE_1X = block("compressed_stone_1x").blockOptions(OPTIONS_STONE).register()
     val STONE_2X = block("compressed_stone_2x").blockOptions(OPTIONS_STONE).register()
     val STONE_3X = block("compressed_stone_3x").blockOptions(OPTIONS_STONE).register()

src/main/kotlin/eu/koboo/nova/compressed/blocks/registry/Items.kt

@@ -7,11 +7,22 @@ import xyz.xenondevs.nova.initialize.Init
 @Init
 object Items : ItemRegistry by CompressedBlocksAddon.registry {
 
+
+    val COBBLED_DEEPSLATE_1X = registerItem(Blocks.COBBLED_DEEPSLATE_1X)
+    val COBBLED_DEEPSLATE_2X = registerItem(Blocks.COBBLED_DEEPSLATE_2X)
+    val COBBLED_DEEPSLATE_3X = registerItem(Blocks.COBBLED_DEEPSLATE_3X)
+    val COBBLED_DEEPSLATE_4X = registerItem(Blocks.COBBLED_DEEPSLATE_4X)
+
     val COBBLESTONE_1X = registerItem(Blocks.COBBLESTONE_1X)
     val COBBLESTONE_2X = registerItem(Blocks.COBBLESTONE_2X)
     val COBBLESTONE_3X = registerItem(Blocks.COBBLESTONE_3X)
     val COBBLESTONE_4X = registerItem(Blocks.COBBLESTONE_4X)
 
+    val SAND_1X = registerItem(Blocks.SAND_1X)
+    val SAND_2X = registerItem(Blocks.SAND_2X)
+    val SAND_3X = registerItem(Blocks.SAND_3X)
+    val SAND_4X = registerItem(Blocks.SAND_4X)
+
     val STONE_1X = registerItem(Blocks.STONE_1X)
     val STONE_2X = registerItem(Blocks.STONE_2X)
     val STONE_3X = registerItem(Blocks.STONE_3X)

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

@@ -7,5 +7,13 @@
   "block.compressed_blocks.compressed_stone_1x": "Compressed Stone (1x)",
   "block.compressed_blocks.compressed_stone_2x": "Compressed Stone (2x)",
   "block.compressed_blocks.compressed_stone_3x": "Compressed Stone (3x)",
-  "block.compressed_blocks.compressed_stone_4x": "Compressed Stone (4x)"
+  "block.compressed_blocks.compressed_stone_4x": "Compressed Stone (4x)",
+  "block.compressed_blocks.compressed_cobbled_deepslate_1x": "Compressed Cobbled Deepslate (1x)",
+  "block.compressed_blocks.compressed_cobbled_deepslate_2x": "Compressed Cobbled Deepslate (2x)",
+  "block.compressed_blocks.compressed_cobbled_deepslate_3x": "Compressed Cobbled Deepslate (3x)",
+  "block.compressed_blocks.compressed_cobbled_deepslate_4x": "Compressed Cobbled Deepslate (4x)",
+  "block.compressed_blocks.compressed_sand_1x": "Compressed Sand (1x)",
+  "block.compressed_blocks.compressed_sand_2x": "Compressed Sand (2x)",
+  "block.compressed_blocks.compressed_sand_3x": "Compressed Sand (3x)",
+  "block.compressed_blocks.compressed_sand_4x": "Compressed Sand (4x)"
 }

src/main/resources/assets/materials.json

@@ -1,50 +1,18 @@
 {
-  "compressed_cobblestone_1x": {
-    "item": "block/compressed_cobblestone_1x",
-    "block": {
-      "type": "solid"
-    }
-  },
-  "compressed_cobblestone_2x": {
-    "item": "block/compressed_cobblestone_2x",
-    "block": {
-      "type": "solid"
-    }
-  },
-  "compressed_cobblestone_3x": {
-    "item": "block/compressed_cobblestone_3x",
-    "block": {
-      "type": "solid"
-    }
-  },
-  "compressed_cobblestone_4x": {
-    "item": "block/compressed_cobblestone_4x",
-    "block": {
-      "type": "solid"
-    }
-  },
-  "compressed_stone_1x": {
-    "item": "block/compressed_stone_1x",
-    "block": {
-      "type": "solid"
-    }
-  },
-  "compressed_stone_2x": {
-    "item": "block/compressed_stone_2x",
-    "block": {
-      "type": "solid"
-    }
-  },
-  "compressed_stone_3x": {
-    "item": "block/compressed_stone_3x",
-    "block": {
-      "type": "solid"
-    }
-  },
-  "compressed_stone_4x": {
-    "item": "block/compressed_stone_4x",
-    "block": {
-      "type": "solid"
-    }
-  }
+  "compressed_cobblestone_1x": "block/compressed_cobblestone_1x",
+  "compressed_cobblestone_2x": "block/compressed_cobblestone_2x",
+  "compressed_cobblestone_3x": "block/compressed_cobblestone_3x",
+  "compressed_cobblestone_4x": "block/compressed_cobblestone_4x",
+  "compressed_stone_1x": "block/compressed_stone_1x",
+  "compressed_stone_2x": "block/compressed_stone_2x",
+  "compressed_stone_3x": "block/compressed_stone_3x",
+  "compressed_stone_4x": "block/compressed_stone_4x",
+  "compressed_cobbled_deepslate_1x": "block/compressed_cobbled_deepslate_1x",
+  "compressed_cobbled_deepslate_2x": "block/compressed_cobbled_deepslate_2x",
+  "compressed_cobbled_deepslate_3x": "block/compressed_cobbled_deepslate_3x",
+  "compressed_cobbled_deepslate_4x": "block/compressed_cobbled_deepslate_4x",
+  "compressed_sand_1x": "block/compressed_sand_1x",
+  "compressed_sand_2x": "block/compressed_sand_2x",
+  "compressed_sand_3x": "block/compressed_sand_3x",
+  "compressed_sand_4x": "block/compressed_sand_4x"
 }

src/main/resources/assets/models/block/compressed_cobbled_deepslate_1x.json

@@ -0,0 +1,6 @@
+{
+    "parent": "nova:block/block",
+    "textures": {
+        "0": "compressed_blocks:block/compressed_cobbled_deepslate_1x"
+    }
+}

src/main/resources/assets/models/block/compressed_cobbled_deepslate_2x.json

@@ -0,0 +1,6 @@
+{
+    "parent": "nova:block/block",
+    "textures": {
+        "0": "compressed_blocks:block/compressed_cobbled_deepslate_2x"
+    }
+}

src/main/resources/assets/models/block/compressed_cobbled_deepslate_3x.json

@@ -0,0 +1,6 @@
+{
+    "parent": "nova:block/block",
+    "textures": {
+        "0": "compressed_blocks:block/compressed_cobbled_deepslate_3x"
+    }
+}

src/main/resources/assets/models/block/compressed_cobbled_deepslate_4x.json

@@ -0,0 +1,6 @@
+{
+    "parent": "nova:block/block",
+    "textures": {
+        "0": "compressed_blocks:block/compressed_cobbled_deepslate_4x"
+    }
+}

src/main/resources/assets/models/block/compressed_sand_1x.json

@@ -0,0 +1,6 @@
+{
+    "parent": "nova:block/block",
+    "textures": {
+        "0": "compressed_blocks:block/compressed_sand_1x"
+    }
+}

src/main/resources/assets/models/block/compressed_sand_2x.json

@@ -0,0 +1,6 @@
+{
+    "parent": "nova:block/block",
+    "textures": {
+        "0": "compressed_blocks:block/compressed_sand_2x"
+    }
+}

src/main/resources/assets/models/block/compressed_sand_3x.json

@@ -0,0 +1,6 @@
+{
+    "parent": "nova:block/block",
+    "textures": {
+        "0": "compressed_blocks:block/compressed_sand_3x"
+    }
+}

src/main/resources/assets/models/block/compressed_sand_4x.json

@@ -0,0 +1,6 @@
+{
+    "parent": "nova:block/block",
+    "textures": {
+        "0": "compressed_blocks:block/compressed_sand_4x"
+    }
+}

src/main/resources/item_categories.yml

@@ -10,4 +10,12 @@ compressed_blocks_category:
     - compressed_blocks:compressed_stone_1x
     - compressed_blocks:compressed_stone_2x
     - compressed_blocks:compressed_stone_3x
-    - compressed_blocks:compressed_stone_4x
+    - compressed_blocks:compressed_stone_4x
+    - compressed_blocks:compressed_cobbled_deepslate_1x
+    - compressed_blocks:compressed_cobbled_deepslate_2x
+    - compressed_blocks:compressed_cobbled_deepslate_3x
+    - compressed_blocks:compressed_cobbled_deepslate_4x
+    - compressed_blocks:compressed_sand_1x
+    - compressed_blocks:compressed_sand_2x
+    - compressed_blocks:compressed_sand_3x
+    - compressed_blocks:compressed_sand_4x

src/main/resources/recipes/minecraft/shaped/compressed_cobbled_deepslate_1x.json

@@ -0,0 +1,11 @@
+{
+  "result": "compressed_blocks:compressed_cobbled_deepslate_1x",
+  "shape": [
+    "ccc",
+    "ccc",
+    "ccc"
+  ],
+  "ingredients": {
+    "c": "minecraft:cobbled_deepslate"
+  }
+}

src/main/resources/recipes/minecraft/shaped/compressed_cobbled_deepslate_2x.json

@@ -0,0 +1,11 @@
+{
+  "result": "compressed_blocks:compressed_cobbled_deepslate_2x",
+  "shape": [
+    "ccc",
+    "ccc",
+    "ccc"
+  ],
+  "ingredients": {
+    "c": "compressed_blocks:compressed_cobbled_deepslate_1x"
+  }
+}

src/main/resources/recipes/minecraft/shaped/compressed_cobbled_deepslate_3x.json

@@ -0,0 +1,11 @@
+{
+  "result": "compressed_blocks:compressed_cobbled_deepslate_3x",
+  "shape": [
+    "ccc",
+    "ccc",
+    "ccc"
+  ],
+  "ingredients": {
+    "c": "compressed_blocks:compressed_cobbled_deepslate_2x"
+  }
+}

src/main/resources/recipes/minecraft/shaped/compressed_cobbled_deepslate_4x.json

@@ -0,0 +1,11 @@
+{
+  "result": "compressed_blocks:compressed_cobbled_deepslate_4x",
+  "shape": [
+    "ccc",
+    "ccc",
+    "ccc"
+  ],
+  "ingredients": {
+    "c": "compressed_blocks:compressed_cobbled_deepslate_3x"
+  }
+}

src/main/resources/recipes/minecraft/shaped/compressed_sand_1x.json

@@ -0,0 +1,11 @@
+{
+  "result": "compressed_blocks:compressed_sand_1x",
+  "shape": [
+    "ccc",
+    "ccc",
+    "ccc"
+  ],
+  "ingredients": {
+    "c": "minecraft:sand"
+  }
+}

src/main/resources/recipes/minecraft/shaped/compressed_sand_2x.json

@@ -0,0 +1,11 @@
+{
+  "result": "compressed_blocks:compressed_sand_2x",
+  "shape": [
+    "ccc",
+    "ccc",
+    "ccc"
+  ],
+  "ingredients": {
+    "c": "compressed_blocks:compressed_sand_1x"
+  }
+}

src/main/resources/recipes/minecraft/shaped/compressed_sand_3x.json

@@ -0,0 +1,11 @@
+{
+  "result": "compressed_blocks:compressed_sand_3x",
+  "shape": [
+    "ccc",
+    "ccc",
+    "ccc"
+  ],
+  "ingredients": {
+    "c": "compressed_blocks:compressed_sand_2x"
+  }
+}

src/main/resources/recipes/minecraft/shaped/compressed_sand_4x.json

@@ -0,0 +1,11 @@
+{
+  "result": "compressed_blocks:compressed_sand_4x",
+  "shape": [
+    "ccc",
+    "ccc",
+    "ccc"
+  ],
+  "ingredients": {
+    "c": "compressed_blocks:compressed_sand_3x"
+  }
+}

src/main/resources/recipes/minecraft/shapeless/compressed_cobbled_deepslate_1x_reverse.json

@@ -0,0 +1,7 @@
+{
+  "result": "minecraft:cobbled_deepslate",
+  "amount": 9,
+  "ingredients": {
+    "compressed_blocks:compressed_cobbled_deepslate_1x": 1
+  }
+}

src/main/resources/recipes/minecraft/shapeless/compressed_cobbled_deepslate_2x_reverse.json

@@ -0,0 +1,7 @@
+{
+  "result": "compressed_blocks:compressed_cobbled_deepslate_1x",
+  "amount": 9,
+  "ingredients": {
+    "compressed_blocks:compressed_cobbled_deepslate_2x": 1
+  }
+}

src/main/resources/recipes/minecraft/shapeless/compressed_cobbled_deepslate_3x_reverse.json

@@ -0,0 +1,7 @@
+{
+  "result": "compressed_blocks:compressed_cobbled_deepslate_2x",
+  "amount": 9,
+  "ingredients": {
+    "compressed_blocks:compressed_cobbled_deepslate_3x": 1
+  }
+}

src/main/resources/recipes/minecraft/shapeless/compressed_cobbled_deepslate_4x_reverse.json

@@ -0,0 +1,7 @@
+{
+  "result": "compressed_blocks:compressed_cobbled_deepslate_3x",
+  "amount": 9,
+  "ingredients": {
+    "compressed_blocks:compressed_cobbled_deepslate_4x": 1
+  }
+}

src/main/resources/recipes/minecraft/shapeless/compressed_sand_1x_reverse.json

@@ -0,0 +1,7 @@
+{
+  "result": "minecraft:sand",
+  "amount": 9,
+  "ingredients": {
+    "compressed_blocks:compressed_sand_1x": 1
+  }
+}

src/main/resources/recipes/minecraft/shapeless/compressed_sand_2x_reverse.json

@@ -0,0 +1,7 @@
+{
+  "result": "compressed_blocks:compressed_sand_1x",
+  "amount": 9,
+  "ingredients": {
+    "compressed_blocks:compressed_sand_2x": 1
+  }
+}

src/main/resources/recipes/minecraft/shapeless/compressed_sand_3x_reverse.json

@@ -0,0 +1,7 @@
+{
+  "result": "compressed_blocks:compressed_sand_2x",
+  "amount": 9,
+  "ingredients": {
+    "compressed_blocks:compressed_sand_3x": 1
+  }
+}

src/main/resources/recipes/minecraft/shapeless/compressed_sand_4x_reverse.json

@@ -0,0 +1,7 @@
+{
+  "result": "compressed_blocks:compressed_sand_3x",
+  "amount": 9,
+  "ingredients": {
+    "compressed_blocks:compressed_sand_4x": 1
+  }
+}