Merge pull request #24 from Seeloewen/master

Add support for bows
RappyLabyAddons · Aug 2, 2024 · 38c354a · 38c354a
2 parents 4f02148 + d8ed3a8
commit 38c354a
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 5 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -19,7 +19,7 @@ labyMod {
         author = "RappyTV"
         description = "Stops you from using your currently used tool when its almost destroyed."
         minecraftVersion = "*"
-        version = System.getenv().getOrDefault("VERSION", "1.4.1")
+        version = System.getenv().getOrDefault("VERSION", "1.4.2")
     }
 
     minecraft {

diff --git a/core/src/main/java/com/rappytv/toolwarn/util/WarnTool.java b/core/src/main/java/com/rappytv/toolwarn/util/WarnTool.java
@@ -71,10 +71,11 @@ public enum Type {
         AXE(2, 0),
         SHOVEL(3, 0),
         HOE(0, 1),
-        CROSSBOW(1, 1),
-        LIGHTER(2, 1),
-        SHEARS(3, 1),
-        TRIDENT(0, 2);
+        BOW(1, 1),
+        CROSSBOW(2, 1),
+        LIGHTER(3, 1),
+        SHEARS(0, 2),
+        TRIDENT(1, 2);
 
         private final ResourceLocation sprite = ResourceLocation.create("toolwarn", "textures/tools.png");
         private final int x;
@@ -102,6 +103,8 @@ public static Type getByItem(ItemStack itemStack) {
                 return SHOVEL;
             } else if (path.endsWith("_hoe")) {
                 return HOE;
+            } else if (path.equalsIgnoreCase("bow")) {
+                return BOW;
             } else if (path.equalsIgnoreCase("crossbow")) {
                 return CROSSBOW;
             } else if (path.equalsIgnoreCase("flint_and_steel")) {

diff --git a/core/src/main/resources/assets/toolwarn/i18n/de_de.json b/core/src/main/resources/assets/toolwarn/i18n/de_de.json
@@ -34,6 +34,7 @@
                     "axe": "Axt",
                     "shovel": "Schaufel",
                     "hoe": "Hacke",
+                    "bow": "Bogen",
                     "crossbow": "Armbrust",
                     "lighter": "Feuerzeug",
                     "shears": "Schere",

diff --git a/core/src/main/resources/assets/toolwarn/i18n/en_us.json b/core/src/main/resources/assets/toolwarn/i18n/en_us.json
@@ -34,6 +34,7 @@
                     "axe": "Axe",
                     "shovel": "Shovel",
                     "hoe": "Hoe",
+                    "bow": "Bow",
                     "crossbow": "Crossbow",
                     "lighter": "Flint and steel",
                     "shears": "Shears",

diff --git a/core/src/main/resources/assets/toolwarn/textures/tools.png b/core/src/main/resources/assets/toolwarn/textures/tools.png