Add default value for configs

Author: Kenny-Hui

src/main/java/com/lx862/svrutil/data/JoinMessage.java

@@ -4,6 +4,7 @@
 import com.google.gson.JsonObject;
 import eu.pb4.placeholders.api.TextParserUtils;
 import net.minecraft.text.Text;
+import net.minecraft.util.JsonHelper;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -25,10 +26,10 @@ public JoinMessage(Text title, Text subtitle, Text joinMessage, int delayTick, L
 
     public static JoinMessage fromJson(JsonObject jsonObject) {
         List<Integer> permLevels = new ArrayList<>();
-        int delayTick = jsonObject.has("delayTick") ? jsonObject.get("delayTick").getAsInt() : 0;
-        Text title = jsonObject.has("title") ? TextParserUtils.formatText(jsonObject.get("title").getAsString()) : null;
-        Text subtitle = jsonObject.has("subtitle") ? TextParserUtils.formatText(jsonObject.get("subtitle").getAsString()) : null;
-        Text joinMessage = jsonObject.has("message") ? TextParserUtils.formatText(jsonObject.get("message").getAsString()) : null;
+        Text title = JsonHelper.hasString(jsonObject, "title") ? TextParserUtils.formatText(JsonHelper.getString(jsonObject, "title")) : null;
+        Text subtitle = JsonHelper.hasString(jsonObject, "subtitle") ? TextParserUtils.formatText(JsonHelper.getString(jsonObject, "subtitle")) : null;
+        Text joinMessage = JsonHelper.hasString(jsonObject, "message") ? TextParserUtils.formatText(JsonHelper.getString(jsonObject, "message")) : null;
+        int delayTick = JsonHelper.getInt(jsonObject, "delayTick", 0);
 
         try {
             jsonObject.get("permLevels").getAsJsonArray().forEach(e -> {

src/main/java/com/lx862/svrutil/feature/FancyMessageFeature.java

@@ -15,7 +15,6 @@ public void readConfig(JsonObject jsonObject) {
 
     @Override
     public JsonObject generateConfig() {
-        JsonObject jsonObject = super.generateConfig();
-        return jsonObject;
+        return super.generateConfig();
     }
 }

src/main/java/com/lx862/svrutil/feature/Feature.java

@@ -4,6 +4,7 @@
 import net.fabricmc.fabric.api.networking.v1.PacketSender;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.network.ServerPlayNetworkHandler;
+import net.minecraft.util.JsonHelper;
 
 public abstract class Feature {
     public final String displayName;
@@ -16,7 +17,7 @@ public Feature(String displayName, String configName) {
     }
 
     public void readConfig(JsonObject jsonObject) {
-        this.enabled = jsonObject.has("enabled") && jsonObject.get("enabled").getAsBoolean();
+        this.enabled = JsonHelper.getBoolean(jsonObject, "enabled", false);
     }
 
     public JsonObject generateConfig() {

src/main/java/com/lx862/svrutil/feature/HungerFeature.java

@@ -2,6 +2,7 @@
 
 import com.google.gson.JsonObject;
 import net.minecraft.server.MinecraftServer;
+import net.minecraft.util.JsonHelper;
 
 public class HungerFeature extends Feature {
     public int minHunger = 0;
@@ -14,8 +15,8 @@ public HungerFeature() {
     @Override
     public void readConfig(JsonObject jsonObject) {
         super.readConfig(jsonObject);
-        this.minHunger = jsonObject.get("minLevel").getAsInt();
-        this.maxHunger = jsonObject.get("maxLevel").getAsInt();
+        this.minHunger = JsonHelper.getInt(jsonObject, "minLevel", minHunger);
+        this.maxHunger = JsonHelper.getInt(jsonObject, "maxLevel", maxHunger);
     }
 
     @Override

src/main/java/com/lx862/svrutil/feature/TextOverrideFeature.java

@@ -1,9 +1,9 @@
 package com.lx862.svrutil.feature;
 
-import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import eu.pb4.placeholders.api.TextParserUtils;
 import net.minecraft.text.Text;
+import net.minecraft.util.JsonHelper;
 
 public class TextOverrideFeature extends Feature {
     private static Text whitelistedMessage = null;
@@ -15,18 +15,7 @@ public TextOverrideFeature() {
     @Override
     public void readConfig(JsonObject jsonObject) {
         super.readConfig(jsonObject);
-        if(jsonObject.has("whitelistedMessage")) {
-            JsonElement element = jsonObject.get("whitelistedMessage");
-            try {
-                whitelistedMessage = Text.Serializer.fromJson(element);
-            } catch (Exception ignored) {
-            }
-
-            try {
-                whitelistedMessage = TextParserUtils.formatText(element.getAsString());
-            } catch (Exception ignored) {
-            }
-        }
+        whitelistedMessage = JsonHelper.hasString(jsonObject, "whitelistedMessage") ? TextParserUtils.formatText(JsonHelper.getString(jsonObject, "whitelistedMessage")) : null;
     }
 
     @Override

src/main/java/com/lx862/svrutil/feature/VanillaMechanicsFeature.java

@@ -1,6 +1,7 @@
 package com.lx862.svrutil.feature;
 
 import com.google.gson.JsonObject;
+import net.minecraft.util.JsonHelper;
 
 public class VanillaMechanicsFeature extends Feature {
     private int fallingBlockDelay = 2;
@@ -14,9 +15,9 @@ public VanillaMechanicsFeature() {
     @Override
     public void readConfig(JsonObject jsonObject) {
         super.readConfig(jsonObject);
-        this.fallingBlockDelay = jsonObject.get("fallingBlockDelay").getAsInt();
-        this.immutableItemFrame = jsonObject.get("immutableItemFrame").getAsBoolean();
-        this.minItemFrameInteractOpLevel = jsonObject.get("minItemFrameInteractOpLevel").getAsInt();
+        this.fallingBlockDelay = JsonHelper.getInt(jsonObject, "fallingBlockDelay", fallingBlockDelay);
+        this.immutableItemFrame = JsonHelper.getBoolean(jsonObject, "immutableItemFrame", immutableItemFrame);
+        this.minItemFrameInteractOpLevel = JsonHelper.getInt(jsonObject, "minItemFrameInteractOpLevel", minItemFrameInteractOpLevel);
     }
 
     @Override

src/main/resources/fabric.mod.json

@@ -27,7 +27,7 @@
   ],
 
   "depends": {
-    "fabricloader": ">=0.9",
+    "fabricloader": ">=0.15",
     "fabric": "*",
     "minecraft": ">=1.19"
   }