From 52496b770a9357aff689050ab4b6e50679f251d9 Mon Sep 17 00:00:00 2001
From: Caedis <Caedis@users.noreply.github.com>
Date: Mon, 1 Jan 2024 11:47:44 -0600
Subject: [PATCH] add vanilla mining levels

---
 dependencies.gradle                            |  3 ++-
 src/main/java/team/chisel/Features.java        | 17 +++++++++++++++++
 src/main/java/team/chisel/carving/Carving.java |  1 +
 3 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/dependencies.gradle b/dependencies.gradle
index 3517209e..2cec6c91 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -11,9 +11,10 @@ dependencies {
 
     shadowImplementation("com.github.GTNewHorizons:CTMLib:1.4.4:dev")
 
-    compileOnly("com.github.GTNewHorizons:waila:1.6.5:dev") {
+    devOnlyNonPublishable("com.github.GTNewHorizons:waila:1.6.5:dev") {
         transitive = false
     }
+    devOnlyNonPublishable("com.github.GTNewHorizons:WailaHarvestability:1.1.10-GTNH:dev")
 
     compileOnly("curse.maven:ee3-65509:2305023") {  // https://www.curseforge.com/minecraft/mc-mods/ee3/files/2305023
         transitive = false
diff --git a/src/main/java/team/chisel/Features.java b/src/main/java/team/chisel/Features.java
index 3fead6fa..06ea837c 100644
--- a/src/main/java/team/chisel/Features.java
+++ b/src/main/java/team/chisel/Features.java
@@ -939,6 +939,9 @@ public enum Features {
                 .setHardness(5F)
                 .setResistance(10F)
                 .setStepSound(Block.soundTypeMetal);
+
+            diamond_block.setHarvestLevel("pickaxe", 2);
+
             Carving.chisel.addVariation("diamond_block", Blocks.diamond_block, 0, 0);
             diamond_block.carverHelper.addVariation("tile.diamond.1.desc", 1, "diamond/terrain-diamond-embossed");
             diamond_block.carverHelper.addVariation("tile.diamond.2.desc", 2, "diamond/terrain-diamond-gem");
@@ -1031,6 +1034,9 @@ public enum Features {
                 .setHardness(5.0F)
                 .setResistance(10.0F)
                 .setStepSound(Block.soundTypeMetal);
+
+            emerald_block.setHarvestLevel("pickaxe", 2);
+
             Carving.chisel.addVariation("emerald_block", Blocks.emerald_block, 0, 0);
             emerald_block.carverHelper.addVariation("tile.emerald.1.desc", 1, "emerald/panel");
             emerald_block.carverHelper.addVariation("tile.emerald.2.desc", 2, "emerald/panelclassic");
@@ -1512,6 +1518,9 @@ public enum Features {
                 .setHardness(3F)
                 .setResistance(10F)
                 .setStepSound(Block.soundTypeMetal);
+
+            gold_block.setHarvestLevel("pickaxe", 2);
+
             Carving.chisel.addVariation("gold_block", Blocks.gold_block, 0, 0);
             gold_block.carverHelper.addVariation("tile.gold.1.desc", 1, "gold/terrain-gold-largeingot");
             gold_block.carverHelper.addVariation("tile.gold.2.desc", 2, "gold/terrain-gold-smallingot");
@@ -1920,6 +1929,9 @@ public enum Features {
                 .setHardness(5F)
                 .setResistance(10F)
                 .setStepSound(Block.soundTypeMetal);
+
+            iron_block.setHarvestLevel("pickaxe", 1);
+
             Carving.chisel.addVariation("iron_block", Blocks.iron_block, 0, 0);
             iron_block.carverHelper.addVariation("tile.iron.1.desc", 1, "iron/terrain-iron-largeingot");
             iron_block.carverHelper.addVariation("tile.iron.2.desc", 2, "iron/terrain-iron-smallingot");
@@ -2031,6 +2043,9 @@ public enum Features {
                 .setHardness(3F)
                 .setResistance(5F)
                 .setStepSound(Block.soundTypeStone);
+
+            lapis_block.setHarvestLevel("pickaxe", 1);
+
             Carving.chisel.addVariation("lapis_block", Blocks.lapis_block, 0, 0);
             lapis_block.carverHelper.addVariation("tile.lapis.1.desc", 1, "lapis/terrain-lapisblock-chunky");
             lapis_block.carverHelper.addVariation("tile.lapis.2.desc", 2, "lapis/terrain-lapisblock-panel");
@@ -2789,6 +2804,8 @@ public enum Features {
                 .setResistance(2000.0F)
                 .setStepSound(Block.soundTypeStone);
 
+            obsidian.setHarvestLevel("pickaxe", 3);
+
             Carving.chisel.addVariation("obsidian", Blocks.obsidian, 0, 0);
             obsidian.carverHelper.addVariation("tile.obsidian.1.desc", 1, "obsidian/pillar");
             obsidian.carverHelper.addVariation("tile.obsidian.2.desc", 2, "obsidian/pillar-quartz");
diff --git a/src/main/java/team/chisel/carving/Carving.java b/src/main/java/team/chisel/carving/Carving.java
index 925f6b63..b70c0105 100644
--- a/src/main/java/team/chisel/carving/Carving.java
+++ b/src/main/java/team/chisel/carving/Carving.java
@@ -160,6 +160,7 @@ public class Carving implements ICarvingRegistry {
             throw new NullPointerException("Cannot add variation in group " + groupName + " for null variation.");
         }
 
+
         ICarvingGroup group = groups.getGroupByName(groupName);
 
         if (group == null) {