Update to mc1.21.7

Author: NotRyken

changelog.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 2.4.8
+
+- Fixed color deserialization (1.21.6-7 only)
+
 ## 2.4.7
 
 - Fixed an issue with replacement message styling duplicating components

common/src/main/java/dev/terminalmc/chatnotify/config/Config.java

@@ -431,8 +431,11 @@ public static void save() {
      */
     private Config validate() {
         // Validate defaults
-        if (defaultColor < 0 || defaultColor > 0xFFFFFFFF)
+        if (defaultColor < -0xFFFFFF || defaultColor > 0xFFFFFF) {
             defaultColor = defaultColorDefault;
+        } else {
+            defaultColor = rgbToArgb(defaultColor);
+        }
         defaultSound.validate();
 
         // Remove blank prefixes and sort by decreasing length
@@ -465,6 +468,17 @@ private void validateUserNotif() {
         }
     }
 
+    /**
+     * Converts an RGB color to an ARGB color, if necessary.
+     */
+    static int rgbToArgb(int rgb) {
+        if (rgb >= 0x000000 && rgb <= 0xFFFFFF) {
+            return rgb | 0xFF000000;
+        } else {
+            return rgb;
+        }
+    }
+
     // Deserialization
 
     public static class Deserializer implements JsonDeserializer<Config> {

common/src/main/java/dev/terminalmc/chatnotify/config/TextStyle.java

@@ -133,8 +133,11 @@ public Style getStyle() {
      * Validates this instance. Called after deserialization and before saving.
      */
     TextStyle validate() {
-        if (color < 0 || color > 0xFFFFFFFF)
+        if (color < -0xFFFFFF || color > 0xFFFFFF) {
             color = colorDefault;
+        } else {
+            color = Config.rgbToArgb(color);
+        }
         return this;
     }
 

gradle.properties

@@ -10,7 +10,7 @@
 template_version=3
 
 # Mod Version
-mod_version=2.4.7
+mod_version=2.4.8
 # 'STABLE', 'BETA' or 'ALPHA'
 mod_version_type=STABLE