Update to 1.17.x-1.1.0

CHANGELOG.md

@@ -2,6 +2,12 @@
 
 ***
 
+## 1.17.x-1.1.0
+- (+) Added cobblestone and rock variants for the new stone blocks (deepslate, calcite, tuff)
+- (*) Adjusted the height of stick block to prevent possible Z-fighting
+- (*) Fixed a bug where you cannot mine modded blocks due to the changes in mining in 1.17 (#25)
+- (*) Renamed all cobblestone variants to match the official naming convention (e.g. Cobbled Diorite)
+
 ## 1.17.x-1.0.3
 EarlyGame has successfully been ported to 1.17!
 - (+) All features from [1.16.x](https://github.com/JayCeeCreates/earlygame/blob/1.16/CHANGELOG.md) versions

README.md

@@ -1,7 +1,6 @@
 <p align="center">
 <a href="https://github.com/JayCeeCreates/earlygame/blob/master/LICENSE"><img src="https://img.shields.io/github/license/jayceecreates/earlygame?style=for-the-badge"></a>
-<img src="https://img.shields.io/badge/mc%20version-1.16--1.17-brightgreen?style=for-the-badge">
-<img src="https://img.shields.io/badge/mod%20version-1.0.3-yellow?style=for-the-badge">
+<img src="https://img.shields.io/badge/mc%20version-1.16--1.17-yellow?style=for-the-badge">
 <a href="https://fabricmc.net"><img src="https://img.shields.io/badge/modloader-fabric-blue?style=for-the-badge"></a>
 </p>
 

gradle.properties

@@ -8,7 +8,7 @@ org.gradle.jvmargs=-Xmx1G
 	loader_version=0.11.3
 
 # Mod Properties
-	mod_version = 1.17.x-1.0.4-S1
+	mod_version = 1.17.x-1.1.0
 	maven_group = jayceecreates.earlygame
 	archives_base_name = earlygame
 

src/main/java/jayceecreates/earlygame/block/CobbledCalcite.java

@@ -0,0 +1,13 @@
+package jayceecreates.earlygame.block;
+
+import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
+import net.minecraft.block.Block;
+import net.minecraft.block.Blocks;
+
+public class CobbledCalcite extends Block {
+
+    public CobbledCalcite() {
+        super(FabricBlockSettings.copy(Blocks.CALCITE).strength(1.25F));
+    }
+
+}

src/main/java/jayceecreates/earlygame/block/CobbledTuff.java

@@ -0,0 +1,13 @@
+package jayceecreates.earlygame.block;
+
+import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
+import net.minecraft.block.Block;
+import net.minecraft.block.Blocks;
+
+public class CobbledTuff extends Block {
+
+    public CobbledTuff() {
+        super(FabricBlockSettings.copy(Blocks.TUFF).strength(2.0F, 6.0F));
+    }
+
+}

src/main/java/jayceecreates/earlygame/init/BlocksInit.java

@@ -15,13 +15,18 @@ public class BlocksInit {
     public static final Block ANDESITE_ROCK_BLOCK = new RockBlock();
     public static final Block DIORITE_ROCK_BLOCK = new RockBlock();
     public static final Block GRANITE_ROCK_BLOCK = new RockBlock();
+    public static final Block DEEPSLATE_ROCK_BLOCK = new RockBlock();
+    public static final Block CALCITE_ROCK_BLOCK = new RockBlock();
+    public static final Block TUFF_ROCK_BLOCK = new RockBlock();
     public static final Block SANDSTONE_ROCK_BLOCK = new RockBlock();
     public static final Block RED_SANDSTONE_ROCK_BLOCK = new RockBlock();
 
     // cobblestone
-    public static final Block ANDESITE_COBBLESTONE = new Cobblestone();
-    public static final Block DIORITE_COBBLESTONE = new Cobblestone();
-    public static final Block GRANITE_COBBLESTONE = new Cobblestone();
+    public static final Block COBBLED_ANDESITE = new Cobblestone();
+    public static final Block COBBLED_DIORITE = new Cobblestone();
+    public static final Block COBBLED_GRANITE = new Cobblestone();
+    public static final Block COBBLED_CALCITE = new CobbledCalcite();
+    public static final Block COBBLED_TUFF = new CobbledTuff();
 
     // stick
     public static final Block STICK_TWIG_BLOCK = new StickTwigBlock();
@@ -33,22 +38,32 @@ public static void init() {
         Registry.register(Registry.ITEM, new Identifier("earlygame", "andesite_rock"), ItemsInit.ANDESITE_STONE_ROCK);
         Registry.register(Registry.ITEM, new Identifier("earlygame", "diorite_rock"), ItemsInit.DIORITE_STONE_ROCK);
         Registry.register(Registry.ITEM, new Identifier("earlygame", "granite_rock"), ItemsInit.GRANITE_STONE_ROCK);
+        Registry.register(Registry.ITEM, new Identifier("earlygame", "deepslate_rock"), ItemsInit.DEEPSLATE_STONE_ROCK);
+        Registry.register(Registry.ITEM, new Identifier("earlygame", "calcite_rock"), ItemsInit.CALCITE_STONE_ROCK);
+        Registry.register(Registry.ITEM, new Identifier("earlygame", "tuff_rock"), ItemsInit.TUFF_STONE_ROCK);
         Registry.register(Registry.ITEM, new Identifier("earlygame", "sandstone_rock"), ItemsInit.SANDSTONE_ROCK);
         Registry.register(Registry.ITEM, new Identifier("earlygame", "red_sandstone_rock"), ItemsInit.RED_SANDSTONE_ROCK);
         Registry.register(Registry.BLOCK, new Identifier("earlygame", "stone_rock_block"), STONE_ROCK_BLOCK);
         Registry.register(Registry.BLOCK, new Identifier("earlygame", "andesite_rock_block"), ANDESITE_ROCK_BLOCK);
         Registry.register(Registry.BLOCK, new Identifier("earlygame", "diorite_rock_block"), DIORITE_ROCK_BLOCK);
         Registry.register(Registry.BLOCK, new Identifier("earlygame", "granite_rock_block"), GRANITE_ROCK_BLOCK);
+        Registry.register(Registry.BLOCK, new Identifier("earlygame", "deepslate_rock_block"), DEEPSLATE_ROCK_BLOCK);
+        Registry.register(Registry.BLOCK, new Identifier("earlygame", "calcite_rock_block"), CALCITE_ROCK_BLOCK);
+        Registry.register(Registry.BLOCK, new Identifier("earlygame", "tuff_rock_block"), TUFF_ROCK_BLOCK);
         Registry.register(Registry.BLOCK, new Identifier("earlygame", "sandstone_rock_block"), SANDSTONE_ROCK_BLOCK);
         Registry.register(Registry.BLOCK, new Identifier("earlygame", "red_sandstone_rock_block"), RED_SANDSTONE_ROCK_BLOCK);
 
         // cobblestone
-        Registry.register(Registry.ITEM, new Identifier("earlygame", "andesite_cobblestone"), new BlockItem(ANDESITE_COBBLESTONE, new Item.Settings().group(ModItemGroup.EARLYGAME)));
-        Registry.register(Registry.ITEM, new Identifier("earlygame", "diorite_cobblestone"), new BlockItem(DIORITE_COBBLESTONE, new Item.Settings().group(ModItemGroup.EARLYGAME)));
-        Registry.register(Registry.ITEM, new Identifier("earlygame", "granite_cobblestone"), new BlockItem(GRANITE_COBBLESTONE, new Item.Settings().group(ModItemGroup.EARLYGAME)));
-        Registry.register(Registry.BLOCK, new Identifier("earlygame", "andesite_cobblestone"), ANDESITE_COBBLESTONE);
-        Registry.register(Registry.BLOCK, new Identifier("earlygame", "diorite_cobblestone"), DIORITE_COBBLESTONE);
-        Registry.register(Registry.BLOCK, new Identifier("earlygame", "granite_cobblestone"), GRANITE_COBBLESTONE);
+        Registry.register(Registry.ITEM, new Identifier("earlygame", "cobbled_andesite"), new BlockItem(COBBLED_ANDESITE, new Item.Settings().group(ModItemGroup.EARLYGAME)));
+        Registry.register(Registry.ITEM, new Identifier("earlygame", "cobbled_diorite"), new BlockItem(COBBLED_DIORITE, new Item.Settings().group(ModItemGroup.EARLYGAME)));
+        Registry.register(Registry.ITEM, new Identifier("earlygame", "cobbled_granite"), new BlockItem(COBBLED_GRANITE, new Item.Settings().group(ModItemGroup.EARLYGAME)));
+        Registry.register(Registry.ITEM, new Identifier("earlygame", "cobbled_calcite"), new BlockItem(COBBLED_CALCITE, new Item.Settings().group(ModItemGroup.EARLYGAME)));
+        Registry.register(Registry.ITEM, new Identifier("earlygame", "cobbled_tuff"), new BlockItem(COBBLED_TUFF, new Item.Settings().group(ModItemGroup.EARLYGAME)));
+        Registry.register(Registry.BLOCK, new Identifier("earlygame", "cobbled_andesite"), COBBLED_ANDESITE);
+        Registry.register(Registry.BLOCK, new Identifier("earlygame", "cobbled_diorite"), COBBLED_DIORITE);
+        Registry.register(Registry.BLOCK, new Identifier("earlygame", "cobbled_granite"), COBBLED_GRANITE);
+        Registry.register(Registry.BLOCK, new Identifier("earlygame", "cobbled_calcite"), COBBLED_CALCITE);
+        Registry.register(Registry.BLOCK, new Identifier("earlygame", "cobbled_tuff"), COBBLED_TUFF);
 
         // stick
         Registry.register(Registry.BLOCK, new Identifier("earlygame", "stick_twig"), STICK_TWIG_BLOCK);

src/main/java/jayceecreates/earlygame/init/ItemsInit.java

@@ -28,6 +28,9 @@ public class ItemsInit {
     public static final Item ANDESITE_STONE_ROCK = new BlockItem(BlocksInit.ANDESITE_ROCK_BLOCK, new Item.Settings().group(ModItemGroup.EARLYGAME));
     public static final Item DIORITE_STONE_ROCK = new BlockItem(BlocksInit.DIORITE_ROCK_BLOCK, new Item.Settings().group(ModItemGroup.EARLYGAME));
     public static final Item GRANITE_STONE_ROCK = new BlockItem(BlocksInit.GRANITE_ROCK_BLOCK, new Item.Settings().group(ModItemGroup.EARLYGAME));
+    public static final Item DEEPSLATE_STONE_ROCK = new BlockItem(BlocksInit.DEEPSLATE_ROCK_BLOCK, new Item.Settings().group(ModItemGroup.EARLYGAME));
+    public static final Item CALCITE_STONE_ROCK = new BlockItem(BlocksInit.CALCITE_ROCK_BLOCK, new Item.Settings().group(ModItemGroup.EARLYGAME));
+    public static final Item TUFF_STONE_ROCK = new BlockItem(BlocksInit.TUFF_ROCK_BLOCK, new Item.Settings().group(ModItemGroup.EARLYGAME));
     public static final Item SANDSTONE_ROCK = new BlockItem(BlocksInit.SANDSTONE_ROCK_BLOCK, new Item.Settings().group(ModItemGroup.EARLYGAME));
     public static final Item RED_SANDSTONE_ROCK = new BlockItem(BlocksInit.RED_SANDSTONE_ROCK_BLOCK, new Item.Settings().group(ModItemGroup.EARLYGAME));
 

src/main/resources/assets/earlygame/blockstates/calcite_rock_block.json

@@ -0,0 +1,7 @@
+{
+    "variants": {
+        "": {
+            "model": "earlygame:block/calcite_rock_block"
+        }
+    }
+}

src/main/resources/assets/earlygame/blockstates/cobbled_andesite.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "earlygame:block/cobbled_andesite"
+    }
+  }
+}

src/main/resources/assets/earlygame/blockstates/cobbled_calcite.json

@@ -0,0 +1,7 @@
+{
+    "variants": {
+      "": {
+        "model": "earlygame:block/cobbled_calcite"
+      }
+    }
+  }

src/main/resources/assets/earlygame/blockstates/cobbled_diorite.json

@@ -0,0 +1,7 @@
+{
+    "variants": {
+      "": {
+        "model": "earlygame:block/cobbled_diorite"
+      }
+    }
+  }

src/main/resources/assets/earlygame/blockstates/cobbled_granite.json

@@ -0,0 +1,7 @@
+{
+    "variants": {
+      "": {
+        "model": "earlygame:block/cobbled_granite"
+      }
+    }
+  }

src/main/resources/assets/earlygame/blockstates/cobbled_tuff.json

@@ -0,0 +1,7 @@
+{
+    "variants": {
+      "": {
+        "model": "earlygame:block/cobbled_tuff"
+      }
+    }
+  }

src/main/resources/assets/earlygame/blockstates/deepslate_rock_block.json

@@ -0,0 +1,7 @@
+{
+    "variants": {
+        "": {
+            "model": "earlygame:block/deepslate_rock_block"
+        }
+    }
+}

src/main/resources/assets/earlygame/blockstates/tuff_rock_block.json

@@ -0,0 +1,7 @@
+{
+    "variants": {
+        "": {
+            "model": "earlygame:block/tuff_rock_block"
+        }
+    }
+}

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

@@ -130,11 +130,16 @@
     "block.earlygame.andesite_rock_block": "Andesite Rock",
     "block.earlygame.diorite_rock_block": "Diorite Rock",
     "block.earlygame.granite_rock_block": "Granite Rock",
+    "block.earlygame.deepslate_rock_block": "Deepslate Rock",
+    "block.earlygame.calcite_rock_block": "Calcite Rock",
+    "block.earlygame.tuff_rock_block": "Tuff Rock",
     "block.earlygame.sandstone_rock_block": "Sandstone Rock",
     "block.earlygame.red_sandstone_rock_block": "Red Sandstone Rock",
-    "block.earlygame.andesite_cobblestone": "Andesite Cobblestone",
-    "block.earlygame.diorite_cobblestone": "Diorite Cobblestone",
-    "block.earlygame.granite_cobblestone": "Granite Cobblestone",
+    "block.earlygame.cobbled_andesite": "Cobbled Andesite",
+    "block.earlygame.cobbled_diorite": "Cobbled Diorite",
+    "block.earlygame.cobbled_granite": "Cobbled Granite",
+    "block.earlygame.cobbled_calcite": "Cobbled Calcite",
+    "block.earlygame.cobbled_tuff": "Cobbled Tuff",
 
     "itemGroup.earlygame.eggroup": "EarlyGame"
 }

src/main/resources/assets/earlygame/models/block/calcite_rock_block.json

@@ -0,0 +1,6 @@
+{
+    "parent": "earlygame:block/rock_block",
+    "textures": {
+        "all": "minecraft:block/calcite"
+    }
+}

src/main/resources/assets/earlygame/models/block/andesite_cobblestone.json → src/main/resources/assets/earlygame/models/block/cobbled_andesite.json

@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:block/cube_all",
   "textures": {
-    "all": "earlygame:block/andesite_cobblestone"
+    "all": "earlygame:block/cobbled_andesite"
   }
 }

src/main/resources/assets/earlygame/models/block/granite_cobblestone.json → src/main/resources/assets/earlygame/models/block/cobbled_calcite.json

@@ -1,6 +1,6 @@
 {
     "parent": "minecraft:block/cube_all",
     "textures": {
-      "all": "earlygame:block/granite_cobblestone"
+      "all": "earlygame:block/cobbled_calcite"
     }
   }

src/main/resources/assets/earlygame/models/block/diorite_cobblestone.json → src/main/resources/assets/earlygame/models/block/cobbled_diorite.json

@@ -1,6 +1,6 @@
 {
     "parent": "minecraft:block/cube_all",
     "textures": {
-      "all": "earlygame:block/diorite_cobblestone"
+      "all": "earlygame:block/cobbled_diorite"
     }
   }

src/main/resources/assets/earlygame/models/block/cobbled_granite.json

@@ -0,0 +1,6 @@
+{
+    "parent": "minecraft:block/cube_all",
+    "textures": {
+      "all": "earlygame:block/cobbled_granite"
+    }
+  }

src/main/resources/assets/earlygame/models/block/cobbled_tuff.json

@@ -0,0 +1,6 @@
+{
+    "parent": "minecraft:block/cube_all",
+    "textures": {
+      "all": "earlygame:block/cobbled_tuff"
+    }
+  }

src/main/resources/assets/earlygame/models/block/deepslate_rock_block.json

@@ -0,0 +1,6 @@
+{
+    "parent": "earlygame:block/rock_block",
+    "textures": {
+        "all": "minecraft:block/deepslate"
+    }
+}

src/main/resources/assets/earlygame/models/block/tuff_rock_block.json

@@ -0,0 +1,6 @@
+{
+    "parent": "earlygame:block/rock_block",
+    "textures": {
+        "all": "minecraft:block/tuff"
+    }
+}

src/main/resources/assets/earlygame/models/item/calcite_rock.json

@@ -0,0 +1,6 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "earlygame:item/calcite_rock"
+    }
+}

src/main/resources/assets/earlygame/models/item/cobbled_andesite.json

@@ -0,0 +1,3 @@
+{
+  "parent": "earlygame:block/cobbled_andesite"
+}

src/main/resources/assets/earlygame/models/item/cobbled_calcite.json

@@ -0,0 +1,3 @@
+{
+    "parent": "earlygame:block/cobbled_calcite"
+  }

src/main/resources/assets/earlygame/models/item/cobbled_diorite.json

@@ -0,0 +1,3 @@
+{
+    "parent": "earlygame:block/cobbled_diorite"
+  }

src/main/resources/assets/earlygame/models/item/cobbled_granite.json

@@ -0,0 +1,3 @@
+{
+    "parent": "earlygame:block/cobbled_granite"
+  }

src/main/resources/assets/earlygame/models/item/cobbled_tuff.json

@@ -0,0 +1,3 @@
+{
+    "parent": "earlygame:block/cobbled_tuff"
+  }

src/main/resources/assets/earlygame/models/item/deepslate_rock.json

@@ -0,0 +1,6 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "earlygame:item/deepslate_rock"
+    }
+}

src/main/resources/assets/earlygame/models/item/tuff_rock.json

@@ -0,0 +1,6 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "earlygame:item/tuff_rock"
+    }
+}

src/main/resources/data/earlygame/advancements/andesite_from_cobblestone.json

@@ -6,7 +6,7 @@
         "conditions": {
           "items": [
             {
-              "items": [ "earlygame:andesite_cobblestone" ]
+              "items": [ "earlygame:cobbled_andesite" ]
             }
           ]
         }