Merge remote-tracking branch 'origin/1.18.2/dev' into 1.18.2/4.1

splatcraft · Apr 13, 2024 · a43c0f8 · a43c0f8
2 parents 90dcd3f + 89456c5
commit a43c0f8
Show file tree

Hide file tree

Showing 9 changed files with 2,202 additions and 167 deletions.
diff --git a/src/main/java/net/splatcraft/forge/util/ColorUtils.java b/src/main/java/net/splatcraft/forge/util/ColorUtils.java
@@ -230,18 +230,13 @@ public static MutableComponent getColorName(int color)
         }
 
         String fallbackUnloc;
-        String fallbackName;
+        MutableComponent fallbackName;
 
-        try
-        {
-            fallbackUnloc = "ink_color." + String.format("%06X", color).toLowerCase();
-            fallbackName = new TranslatableComponent(fallbackUnloc).getString();
-            if (!fallbackName.equals(fallbackName))
-            {
-                return new TextComponent(fallbackUnloc);
-            }
-        } catch (NoClassDefFoundError ignored)
+        fallbackUnloc = "ink_color." + String.format("%06X", color).toLowerCase();
+        fallbackName = new TranslatableComponent(fallbackUnloc);
+        if (!fallbackUnloc.equals(fallbackName.getString()))
         {
+            return fallbackName;
         }
 
 
@@ -251,20 +246,14 @@ public static MutableComponent getColorName(int color)
             return new TranslatableComponent("ink_color.invert", colorObj.getLocalizedName());
         }
 
-        try
-        {
-            fallbackUnloc = "ink_color." + String.format("%06X", 0xFFFFFF - color).toLowerCase();
-            fallbackName = new TranslatableComponent(fallbackUnloc).getString();
+        fallbackUnloc = "ink_color." + String.format("%06X", 0xFFFFFF - color).toLowerCase();
+        fallbackName = new TranslatableComponent(fallbackUnloc);
 
-            if (!fallbackName.equals(fallbackUnloc))
-            {
-                return new TranslatableComponent("ink_color.invert", fallbackName);
-            }
-        } catch (NoClassDefFoundError ignored)
+        if (!fallbackName.getString().equals(fallbackUnloc))
         {
+            return new TranslatableComponent("ink_color.invert", fallbackName);
         }
 
-
         return new TextComponent("#" + String.format("%06X", color).toUpperCase());
 
     }

diff --git a/src/main/resources/assets/splatcraft/lang/es_ar.json b/src/main/resources/assets/splatcraft/lang/es_ar.json
diff --git a/src/main/resources/assets/splatcraft/lang/es_cl.json b/src/main/resources/assets/splatcraft/lang/es_cl.json
diff --git a/src/main/resources/assets/splatcraft/lang/es_ec.json b/src/main/resources/assets/splatcraft/lang/es_ec.json
diff --git a/src/main/resources/assets/splatcraft/lang/es_es.json b/src/main/resources/assets/splatcraft/lang/es_es.json
diff --git a/src/main/resources/assets/splatcraft/lang/es_mx.json b/src/main/resources/assets/splatcraft/lang/es_mx.json
diff --git a/src/main/resources/assets/splatcraft/lang/es_uy.json b/src/main/resources/assets/splatcraft/lang/es_uy.json
diff --git a/src/main/resources/assets/splatcraft/lang/es_ve.json b/src/main/resources/assets/splatcraft/lang/es_ve.json
diff --git a/src/main/resources/data/splatcraft/recipes/weapon_workbench/splat_roller.json b/src/main/resources/data/splatcraft/recipes/weapon_workbench/splat_roller.json
@@ -63,7 +63,7 @@
     },
     {
       "name": "weaponType.coro_coro",
-      "advancement": "splatcraft:unlocks/coro_coro_splat_roller",
+      "advancement": "splatcraft:unlocks/corocoro_splat_roller",
       "result": {
         "item": "splatcraft:corocoro_splat_roller",
         "count": 1