(fix) Config nesting issue

Jan-DT · Feb 8, 2024 · 31f7613 · 31f7613
1 parent 143f525
commit 31f7613
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -9,7 +9,7 @@ yarn_mappings=1.20.4+build.3
 loader_version=0.15.6
 
 # Mod Properties
-mod_version=0.1.1
+mod_version=0.1.2
 maven_group=nl.jandt
 archives_base_name=survivaltools
 

diff --git a/src/main/java/nl/jandt/information/InfoCommand.java b/src/main/java/nl/jandt/information/InfoCommand.java
@@ -10,20 +10,20 @@
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.text.Text;
 import nl.jandt.SurvivalTools;
-import nl.jandt.utils.SrvConfigModel;
+import nl.jandt.utils.SrvConfig;
 import org.jetbrains.annotations.Nullable;
 
 public class InfoCommand implements Command<ServerCommandSource> {
-    private static final SrvConfigModel.InfoConfig INFO_CONFIG = SurvivalTools.CONFIG.infoConfig();
+    private static final SrvConfig.InfoConfig INFO_CONFIG = SurvivalTools.CONFIG.infoConfig;
     public static InfoCommand instance = new InfoCommand();
 
     public void registerCommand(CommandDispatcher<ServerCommandSource> dispatcher) {
-        if (!INFO_CONFIG.enabled) {
+        if (!INFO_CONFIG.enabled()) {
             return;
         }
 
         dispatcher.register(CommandManager
-                .literal(INFO_CONFIG.command)
+                .literal(INFO_CONFIG.command())
                 .executes(this));
     }
 
@@ -34,7 +34,7 @@ public int run(CommandContext<ServerCommandSource> ctx) throws CommandSyntaxExce
         final @Nullable ServerPlayerEntity player = source.getPlayerOrThrow();
         assert player != null;
 
-        player.sendMessage(Text.Serialization.fromJson(INFO_CONFIG.message));
+        player.sendMessage(Text.Serialization.fromJson(INFO_CONFIG.message()));
 
         return 0;
     }

diff --git a/src/main/java/nl/jandt/information/MotdCommand.java b/src/main/java/nl/jandt/information/MotdCommand.java
@@ -11,26 +11,26 @@
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.text.Text;
 import nl.jandt.SurvivalTools;
-import nl.jandt.utils.SrvConfigModel;
+import nl.jandt.utils.SrvConfig;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 public class MotdCommand implements Command<ServerCommandSource> {
-    public static final SrvConfigModel.MotdConfig MOTD_CONFIG = SurvivalTools.CONFIG.motdConfig();
+    public static final SrvConfig.MotdConfig MOTD_CONFIG = SurvivalTools.CONFIG.motdConfig;
     public static MotdCommand instance = new MotdCommand();
 
     public void registerCommand(CommandDispatcher<ServerCommandSource> dispatcher) {
-        if (!MOTD_CONFIG.enabled) {
+        if (!MOTD_CONFIG.enabled()) {
             return;
         }
 
         dispatcher.register(CommandManager
-                .literal(MOTD_CONFIG.command)
+                .literal(MOTD_CONFIG.command())
                 .executes(this));
     }
 
     public void registerJoin(ServerPlayNetworkHandler handler) {
-        if (!MOTD_CONFIG.enabled) {
+        if (!MOTD_CONFIG.enabled()) {
             return;
         }
 
@@ -51,6 +51,6 @@ public int run(CommandContext<ServerCommandSource> ctx) throws CommandSyntaxExce
     }
 
     public void sendMotd(@NotNull ServerPlayerEntity targetPlayer) {
-        targetPlayer.sendMessage(Text.Serialization.fromJson(MOTD_CONFIG.message));
+        targetPlayer.sendMessage(Text.Serialization.fromJson(MOTD_CONFIG.message()));
     }
 }