update workspace to 1.20.4

rosebudmods · Feb 27, 2024 · 91cf5df · 91cf5df
1 parent 112d538
commit 91cf5df
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 11 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id "fabric-loom" version "1.3.+"
+    id "fabric-loom" version "1.5.+"
     id "com.github.johnrengelman.shadow" version "7.1.2"
     id "com.modrinth.minotaur" version "2.+"
 }

diff --git a/gradle.properties b/gradle.properties
@@ -3,17 +3,17 @@ org.gradle.jvmargs=-Xmx1G
 
 # minecraft, mappings and loader dependencies
 # check these on https://modmuss50.me/fabric.html
-minecraft_version=1.20.2
+minecraft_version=1.20.4
 quilt_mappings=3
-loader_version=0.14.22
+loader_version=0.15.7
 
 # mod properties
-mod_version=1.2.0+mc1.20.2
+mod_version=1.2.0+mc1.20.4
 maven_group=rainglow
 archives_base_name=rainglow
 
 # other dependencies
 java_version=17
-spruceui_version=5.0.3+1.20.2
-mod_menu_version=8.0.0
-fabric_api_version=0.89.3+1.20.2
+spruceui_version=5.0.3+1.20.4
+mod_menu_version=9.0.0
+fabric_api_version=0.96.4+1.20.4
diff --git a/src/main/java/io/ix0rai/rainglow/Rainglow.java b/src/main/java/io/ix0rai/rainglow/Rainglow.java
@@ -113,8 +113,7 @@ public static Item getItem(int index) {
         return COLOURS.get(index).getItem();
     }
 
-    public static String generateRandomColourId(RandomGenerator random)
-    {
+    public static String generateRandomColourId(RandomGenerator random) {
         return COLOURS.get(random.nextInt(COLOURS.size())).getId();
     }
 

diff --git a/src/main/java/io/ix0rai/rainglow/config/RainglowConfigScreen.java b/src/main/java/io/ix0rai/rainglow/config/RainglowConfigScreen.java
@@ -159,7 +159,7 @@ private SpruceLabelWidget createColourListLabel(String translationKey, RainglowM
 
                 boolean appendComma = i + 2 < mode.getColours().size();
 
-                text.append("\n").append(colour1).append(colour2.equals("") ? "" : ", ").append(colour2).append(appendComma ? "," : "");
+                text.append("\n").append(colour1).append(colour2.isEmpty() ? "" : ", ").append(colour2).append(appendComma ? "," : "");
             } else  {
                 text.append("\n... ").append(mode.getColours().size() - maxDisplayedColourCount).append(" ").append(Language.getInstance().get(Rainglow.translatableTextKey("config.more")));
             }
@@ -171,7 +171,7 @@ private SpruceLabelWidget createColourListLabel(String translationKey, RainglowM
     }
 
     private static void sendConfigLockedToast() {
-        Toast toast = new SystemToast(SystemToast.Type.PACK_LOAD_FAILURE, Rainglow.translatableText("config.server_locked_title"), Rainglow.translatableText("config.server_locked_description"));
+        Toast toast = new SystemToast(SystemToast.C_ozahoshp.field_47585, Rainglow.translatableText("config.server_locked_title"), Rainglow.translatableText("config.server_locked_description"));
         MinecraftClient.getInstance().getToastManager().add(toast);
     }
 }