Add loading from configurate node

ClubObsidian · Feb 9, 2024 · 903876c · 903876c
1 parent 72e5a71
commit 903876c
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 13 deletions.
diff --git a/README.md b/README.md
@@ -29,7 +29,7 @@ repositories {
 	maven { url 'https://jitpack.io' }
 }
 
-compile 'com.github.clubobsidian:wrappy:4.0.0'
+compile 'com.github.clubobsidian:wrappy:4.1.0'
 ```
 
 ### Maven
@@ -45,7 +45,7 @@ compile 'com.github.clubobsidian:wrappy:4.0.0'
 <dependency>
 	<groupId>com.github.clubobsidian</groupId>
 	<artifactId>wrappy</artifactId>
-	<version>4.0.0</version>
+	<version>4.1.0</version>
 </dependency>
 ```
 

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -8,7 +8,7 @@ plugins {
 }
 
 group = "com.github.clubobsidian"
-version = "4.0.0"
+version = "4.1.0"
 
 java {
     toolchain.languageVersion.set(JavaLanguageVersion.of(11))

diff --git a/src/main/java/com/clubobsidian/wrappy/Configuration.java b/src/main/java/com/clubobsidian/wrappy/Configuration.java
@@ -18,6 +18,7 @@
 
 import com.clubobsidian.wrappy.util.HashUtil;
 import org.spongepowered.configurate.ConfigurateException;
+import org.spongepowered.configurate.ConfigurationNode;
 import org.spongepowered.configurate.hocon.HoconConfigurationLoader;
 import org.spongepowered.configurate.jackson.JacksonConfigurationLoader;
 import org.spongepowered.configurate.loader.AbstractConfigurationLoader;
@@ -107,6 +108,12 @@ public static Configuration load(ConfigurationLoader<?> loader) {
         return modified ? config : null;
     }
 
+    public static Configuration load(ConfigurationNode node) {
+        Configuration config = new Configuration();
+        config.node = node;
+        return config;
+    }
+
     private static boolean modifyNode(Configuration config, ConfigurationLoader<?> loader) {
         try {
             config.loader = loader;

diff --git a/src/main/java/com/clubobsidian/wrappy/ConfigurationSection.java b/src/main/java/com/clubobsidian/wrappy/ConfigurationSection.java
@@ -50,16 +50,15 @@ public class ConfigurationSection {
     protected ConfigurationLoader<?> loader;
 
     public boolean save() {
-        if (!this.loader.canSave()) {
-            return false;
-        }
-        try {
-            this.loader.save(this.node);
-            return true;
-        } catch (IOException e) {
-            e.printStackTrace();
-            return false;
+        if (this.loader != null && this.loader.canSave()) {
+            try {
+                this.loader.save(this.node);
+                return true;
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
         }
+        return false;
     }
 
     public ConfigurationNode getNode() {

diff --git a/src/test/java/com/clubobsidian/wrappy/test/config/TestConfigurateLoading.java b/src/test/java/com/clubobsidian/wrappy/test/config/TestConfigurateLoading.java
@@ -31,7 +31,7 @@ public class TestConfigurateLoading {
     private static File testFile = new File("test.yml");
 
     @Test
-    public void loadConfigurate() {
+    public void loadConfigurateLoader() {
         ConfigurationLoader<?> loader = YamlConfigurationLoader
                 .builder()
                 .nodeStyle(NodeStyle.BLOCK)
@@ -41,4 +41,17 @@ public void loadConfigurate() {
         Configuration config = Configuration.load(loader);
         assertEquals("value", config.getString("key"));
     }
+
+    @Test
+    public void loadConfigurateNode() {
+        ConfigurationLoader<?> loader = YamlConfigurationLoader
+                .builder()
+                .nodeStyle(NodeStyle.BLOCK)
+                .indent(2)
+                .path(testFile.toPath())
+                .build();
+        Configuration config = Configuration.load(loader);
+        Configuration copied = Configuration.load(config.getNode());
+        assertEquals("value", copied.getString("key"));
+    }
 }