From 5753def8e9223894339b99658d2c8fb38cb35521 Mon Sep 17 00:00:00 2001
From: TheBusyBiscuit <mrCookieSlime@gmail.com>
Date: Sun, 4 Oct 2020 12:42:59 +0200
Subject: [PATCH] Hey unit tests, you work now, k pls?

---
 .../thebusybiscuit/slimefun4/api/items/ItemSetting.java  | 6 ++++++
 .../implementation/items/tools/ClimbingPick.java         | 9 ++++++---
 .../items/implementations/tools/TestClimbingPick.java    | 5 ++++-
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/api/items/ItemSetting.java b/src/main/java/io/github/thebusybiscuit/slimefun4/api/items/ItemSetting.java
index 774265809..578540ffc 100644
--- a/src/main/java/io/github/thebusybiscuit/slimefun4/api/items/ItemSetting.java
+++ b/src/main/java/io/github/thebusybiscuit/slimefun4/api/items/ItemSetting.java
@@ -153,4 +153,10 @@ public class ItemSetting<T> {
         }
     }
 
+    @Override
+    public String toString() {
+        T currentValue = this.value != null ? this.value : defaultValue;
+        return getClass().getSimpleName() + " {" + getKey() + " = " + currentValue + " (default: " + getDefaultValue() + ")";
+    }
+
 }
diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/tools/ClimbingPick.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/tools/ClimbingPick.java
index ab20d3032..5449d97ad 100644
--- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/tools/ClimbingPick.java
+++ b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/tools/ClimbingPick.java
@@ -143,10 +143,13 @@ public class ClimbingPick extends SimpleSlimefunItem<ItemUseHandler> implements
      */
     public double getClimbingSpeed(@Nonnull ItemStack item, @Nonnull Material type) {
         double speed = getClimbingSpeed(type);
-        int efficiencyLevel = item.getEnchantmentLevel(Enchantment.DIG_SPEED);
 
-        if (speed > 0 && efficiencyLevel > 0) {
-            speed += efficiencyLevel * EFFICIENCY_MODIFIER;
+        if (speed > 0) {
+            int efficiencyLevel = item.getEnchantmentLevel(Enchantment.DIG_SPEED);
+
+            if (efficiencyLevel > 0) {
+                speed += efficiencyLevel * EFFICIENCY_MODIFIER;
+            }
         }
 
         return speed;
diff --git a/src/test/java/io/github/thebusybiscuit/slimefun4/testing/tests/items/implementations/tools/TestClimbingPick.java b/src/test/java/io/github/thebusybiscuit/slimefun4/testing/tests/items/implementations/tools/TestClimbingPick.java
index b1fb1ec00..5bd1c4d8b 100644
--- a/src/test/java/io/github/thebusybiscuit/slimefun4/testing/tests/items/implementations/tools/TestClimbingPick.java
+++ b/src/test/java/io/github/thebusybiscuit/slimefun4/testing/tests/items/implementations/tools/TestClimbingPick.java
@@ -56,6 +56,7 @@ class TestClimbingPick implements SlimefunItemTest<ClimbingPick> {
     @Override
     public ClimbingPick registerSlimefunItem(SlimefunPlugin plugin, String id) {
         try {
+            TestUtilities.registerDefaultTags(server);
             SlimefunTag.CLIMBING_PICK_WEAK_SURFACES.reload();
             SlimefunTag.CLIMBING_PICK_STRONG_SURFACES.reload();
         }
@@ -63,7 +64,7 @@ class TestClimbingPick implements SlimefunItemTest<ClimbingPick> {
             Assertions.fail(e);
         }
 
-        SlimefunItemStack item = new SlimefunItemStack(id, Material.IRON_PICKAXE, "&5Test Pick");
+        SlimefunItemStack item = new SlimefunItemStack(id, Material.IRON_PICKAXE, "&5Test Pick", id);
         ClimbingPick pick = new ClimbingPick(TestUtilities.getCategory(plugin, "climbing_pick"), item, RecipeType.NULL, new ItemStack[9]) {
 
             @Override
@@ -91,6 +92,7 @@ class TestClimbingPick implements SlimefunItemTest<ClimbingPick> {
     }
 
     private static Stream<Arguments> getStrongSurfaces() throws TagMisconfigurationException {
+        TestUtilities.registerDefaultTags(server);
         SlimefunTag.CLIMBING_PICK_STRONG_SURFACES.reload();
         return SlimefunTag.CLIMBING_PICK_STRONG_SURFACES.getValues().stream().map(Arguments::of);
     }
@@ -108,6 +110,7 @@ class TestClimbingPick implements SlimefunItemTest<ClimbingPick> {
     }
 
     private static Stream<Arguments> getWeakSurfaces() throws TagMisconfigurationException {
+        TestUtilities.registerDefaultTags(server);
         SlimefunTag.CLIMBING_PICK_WEAK_SURFACES.reload();
         return SlimefunTag.CLIMBING_PICK_WEAK_SURFACES.getValues().stream().map(Arguments::of);
     }