fix: configurate v3 -> v4 changes

okocraft · Mar 26, 2024 · 4b8f18d · 4b8f18d
1 parent 2133926
commit 4b8f18d
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 14 deletions.
diff --git a/src/main/java/net/okocraft/serverconnector/ServerConnectorPlugin.java b/src/main/java/net/okocraft/serverconnector/ServerConnectorPlugin.java
@@ -16,10 +16,11 @@
 import net.okocraft.serverconnector.lang.Messages;
 import net.okocraft.serverconnector.listener.FirstJoinListener;
 import net.okocraft.serverconnector.listener.PlayerListener;
-import ninja.leaping.configurate.ConfigurationNode;
-import ninja.leaping.configurate.yaml.YAMLConfigurationLoader;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+import org.spongepowered.configurate.BasicConfigurationNode;
+import org.spongepowered.configurate.ConfigurationNode;
+import org.spongepowered.configurate.yaml.YamlConfigurationLoader;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -117,15 +118,15 @@ private void loadConfig() throws IOException {
             this.saveResource("config.yml", filepath);
         }
 
-        var node = YAMLConfigurationLoader.builder().setPath(filepath).build().load();
+        var node = YamlConfigurationLoader.builder().path(filepath).build().load();
 
-        var messageSendingSetting = node.getNode("message-sending-setting");
-        this.config.sendJoinMessage = messageSendingSetting.getNode("join").getBoolean();
-        this.config.sendFirstJoinMessage = messageSendingSetting.getNode("first-join").getBoolean();
-        this.config.sendLeaveMessage = messageSendingSetting.getNode("leave").getBoolean();
-        this.config.sendSwitchMessage = messageSendingSetting.getNode("switch").getBoolean();
+        var messageSendingSetting = node.node("message-sending-setting");
+        this.config.sendJoinMessage = messageSendingSetting.node("join").getBoolean();
+        this.config.sendFirstJoinMessage = messageSendingSetting.node("first-join").getBoolean();
+        this.config.sendLeaveMessage = messageSendingSetting.node("leave").getBoolean();
+        this.config.sendSwitchMessage = messageSendingSetting.node("switch").getBoolean();
 
-        for (var entry : node.getNode("server-permission").getChildrenMap().entrySet()) {
+        for (var entry : node.node("server-permission").childrenMap().entrySet()) {
             var key = String.valueOf(entry.getKey());
             switch (key) {
                 case "enable":
@@ -139,13 +140,13 @@ private void loadConfig() throws IOException {
             }
         }
 
-        this.config.fallbackServer = node.getNode("server-to-send-when-kicked").getString();
+        this.config.fallbackServer = node.node("server-to-send-when-kicked").getString();
     }
 
     private void loadMessages() throws IOException {
         Path directory = this.dataDirectory.resolve("languages");
         Files.createDirectories(directory);
-        this.localizedMessagesMap.put(null, new Messages(ConfigurationNode.root()));
+        this.localizedMessagesMap.put(null, new Messages(BasicConfigurationNode.root()));
         this.saveResource("en.yml", directory.resolve("en.yml"));
         this.saveResource("ja_JP.yml", directory.resolve("ja_JP.yml"));
         try (Stream<Path> list = Files.list(directory)) {
@@ -168,7 +169,7 @@ private void loadMessageFile(Path filepath) {
         ConfigurationNode source;
 
         try {
-           source = YAMLConfigurationLoader.builder().setPath(filepath).build().load();
+           source = YamlConfigurationLoader.builder().path(filepath).build().load();
         } catch (IOException e) {
             throw new UncheckedIOException(e);
         }

diff --git a/src/main/java/net/okocraft/serverconnector/lang/Messages.java b/src/main/java/net/okocraft/serverconnector/lang/Messages.java
@@ -5,8 +5,8 @@
 import net.kyori.adventure.text.minimessage.MiniMessage;
 import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
 import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
-import ninja.leaping.configurate.ConfigurationNode;
 import org.jetbrains.annotations.NotNull;
+import org.spongepowered.configurate.ConfigurationNode;
 
 public final class Messages {
 
@@ -89,7 +89,7 @@ public Messages(@NotNull ConfigurationNode source) {
     }
 
     private static @NotNull String getMessage(@NotNull ConfigurationNode source, @NotNull String def, @NotNull Object @NotNull ... keys) {
-        return source.getNode(keys).getString(def);
+        return source.node(keys).getString(def);
     }
 
     private static @NotNull TagResolver player(@NotNull Player player) {