Fixed potential problems with fonts

Author: UnicornMaster-dev

gradle.properties

@@ -4,11 +4,11 @@ org.gradle.jvmargs=-Xmx2G
 # Fabric Properties
 minecraft_version=1.21.5
 yarn_version=1.21.5+build.1
-loader_version=0.16.10
+loader_version=0.16.14
 
 # Mod Properties
 mod_version = 0.3
 maven_group = anticope.rejects
 archives_base_name = meteor-rejects-addon
 
-baritone_version=1.21.4
+baritone_version=1.21.5

src/main/java/anticope/rejects/utils/RejectsConfig.java

@@ -80,24 +80,32 @@ public NbtCompound toTag() {
 
     @Override
     public RejectsConfig fromTag(NbtCompound tag) {
-        // Clean the "httpAllowed" string in case it's wrapped in Optional
-        String httpAllowedString = String.valueOf(tag.getString("httpAllowed"));
-        if (httpAllowedString.startsWith("Optional[")) {
-            httpAllowedString = httpAllowedString.substring(9, httpAllowedString.length() - 1); // Strip "Optional[" and "]"
+        // Get the "httpAllowed" string safely
+        String httpAllowedString = "Everything";
+        if (tag.contains("httpAllowed")) {
+            NbtElement httpAllowedElement = tag.get("httpAllowed");
+            if (httpAllowedElement != null) {
+                httpAllowedString = String.valueOf(httpAllowedElement.asString());
+                // Remove quotes if present (asString() may wrap in quotes)
+                if (httpAllowedString.startsWith("\"") && httpAllowedString.endsWith("\"")) {
+                    httpAllowedString = httpAllowedString.substring(1, httpAllowedString.length() - 1);
+                }
+                if (httpAllowedString.startsWith("Optional[")) {
+                    httpAllowedString = httpAllowedString.substring(9, httpAllowedString.length() - 1);
+                }
+            }
         }
 
         try {
-            // Convert the cleaned string to the HttpAllowed enum
             httpAllowed = HttpAllowed.valueOf(httpAllowedString);
         } catch (IllegalArgumentException e) {
-            // Handle invalid enum value (optional)
             java.lang.System.err.println("Invalid value for httpAllowed: " + httpAllowedString);
-            httpAllowed = HttpAllowed.Everything; // Default to Everything in case of error
+            httpAllowed = HttpAllowed.Everything;
         }
 
-        httpUserAgent = String.valueOf(tag.getString("httpUserAgent"));
-        loadSystemFonts = Boolean.parseBoolean(String.valueOf(tag.getBoolean("loadSystemFonts")));
-        duplicateModuleNames = Boolean.parseBoolean(String.valueOf(tag.getBoolean("duplicateModuleNames")));
+        httpUserAgent = tag.contains("httpUserAgent") ? String.valueOf(tag.getString("httpUserAgent")) : "Meteor Client";
+        loadSystemFonts = tag.contains("loadSystemFonts") && tag.getBoolean("loadSystemFonts").orElse(false);
+        duplicateModuleNames = tag.contains("duplicateModuleNames") && tag.getBoolean("duplicateModuleNames").orElse(false);
 
         NbtList valueTag = tag.getListOrEmpty("hiddenModules");
         for (NbtElement tagI : valueTag) {
@@ -106,5 +114,4 @@ public RejectsConfig fromTag(NbtCompound tag) {
 
         return this;
     }
-
 }