Better config format, fix comments

Author: calmilamsy

glass-config-api-v3/src/main/java/net/modificationstation/stationapi/impl/config/GCCore.java

@@ -203,6 +203,7 @@ public static void loadModConfig(Object rootConfigObject, ModContainer modContai
             }
             net.modificationstation.stationapi.impl.config.object.ConfigCategory configCategory = new net.modificationstation.stationapi.impl.config.object.ConfigCategory(modContainer.getMetadata().getId(), configField.getAnnotation(GConfig.class).visibleName(), null, configField, objField, configField.isAnnotationPresent(MultiplayerSynced.class), HashMultimap.create(), true);
             readDeeper(rootConfigObject, configField, modConfigFile.path(""), configCategory, totalReadFields, totalReadCategories, isMultiplayer, defaultEntry);
+            readDeeper(rootConfigObject, configField, modConfigFile.path(), configCategory, totalReadFields, totalReadCategories, isMultiplayer, defaultEntry);
             if (!loaded) {
                 MOD_CONFIGS.put(configID, BiTuple.of(MOD_CONFIGS.remove(configID).one(), configCategory));
             } else {
@@ -308,8 +309,7 @@ public static String saveConfig(EntrypointContainer<Object> container, net.modif
             GlassYamlFile configFile = new GlassYamlFile(new File(FabricLoader.getInstance().getConfigDir().toFile(), container.getProvider().getMetadata().getId() + "/" + category.parentField.getAnnotation(GConfig.class).value() + ".yml"));
             configFile.createNewFile();
             GlassYamlFile serverExported = new GlassYamlFile();
-            // The path("") is critical for saving a shitton of copy-paste snowflake code. Thank you library maker, for not being controlling.
-            saveDeeper(configFile.path(""), serverExported.path(""), category, category.parentField, readValues, readCategories);
+            saveDeeper(configFile.path(), serverExported.path(), category, category.parentField, readValues, readCategories);
 
             if (EventStorage.PRE_SAVE_LISTENERS.containsKey(container.getProvider().getMetadata().getId())) {
                 EventStorage.PRE_SAVE_LISTENERS.get(container.getProvider().getMetadata().getId()).getEntrypoint().onPreConfigSaved(source, new GlassYamlFile(configFile.getConfigurationFile()), configFile);
@@ -341,9 +341,9 @@ else if (entry instanceof ConfigEntry) {
                 }
                 Object jsonElement = configFactory.apply(((ConfigEntry<?>) entry).value);
                 if (!((ConfigEntry<?>) entry).multiplayerLoaded) {
-                    YamlFileWrapper child = newValues.setChild(entry.id, jsonElement);
+                    newValues.setChild(entry.id, jsonElement);
                     if (entry.description != null && !entry.description.isEmpty()) {
-                        child.comment(entry.description);
+                        newValues.path(entry.id).comment(entry.description);
                     }
                 }
                 if (entry.multiplayerSynced) {

glass-config-api-v3/src/main/java/net/modificationstation/stationapi/impl/config/GlassYamlFile.java

@@ -2,7 +2,6 @@
 
 import org.simpleyaml.configuration.comments.format.YamlCommentFormat;
 import org.simpleyaml.configuration.file.YamlFile;
-import org.simpleyaml.configuration.file.YamlFileWrapper;
 import org.simpleyaml.configuration.implementation.api.QuoteStyle;
 
 import java.io.*;
@@ -22,8 +21,11 @@ public GlassYamlFile(String override) throws IOException {
     public GlassYamlFile(File file) throws IllegalArgumentException {
         super(file);
         options().useComments(true);
-        options().quoteStyleDefaults().setDefaultQuoteStyle(QuoteStyle.DOUBLE);
         setCommentFormat(YamlCommentFormat.PRETTY);
+        options().quoteStyleDefaults().setQuoteStyle(List.class, QuoteStyle.DOUBLE);
+        options().quoteStyleDefaults().setQuoteStyle(Map.class, QuoteStyle.DOUBLE);
+        options().quoteStyleDefaults().setQuoteStyle(String.class, QuoteStyle.DOUBLE);
+        options().quoteStyleDefaults().setQuoteStyle(String[].class, QuoteStyle.DOUBLE);
         options().headerFormatter()
                 .prefixFirst("#####################################################")
                 .commentPrefix("##  ")
@@ -47,7 +49,6 @@ public Float getFloat(String key) {
         return (Float) get(key);
     }
 
-    // WHyyyy
     public <T extends Enum<?>> T getEnum(String key, Class<T> targetEnum, T defaultValue) {
         return targetEnum.getEnumConstants()[getInt(key, defaultValue.ordinal())];
     }
@@ -87,4 +88,8 @@ private void merge(Map<String, Object> self, Map<String, Object> other) {
     public GlassYamlWrapper path(String path) {
         return new GlassYamlWrapper(this, path);
     }
+
+    public GlassYamlWrapper path() {
+        return new GlassYamlWrapper(this, "");
+    }
 }

glass-config-api-v3/src/main/java/net/modificationstation/stationapi/impl/config/GlassYamlWrapper.java

@@ -2,6 +2,9 @@
 
 import org.simpleyaml.configuration.file.YamlFile;
 import org.simpleyaml.configuration.file.YamlFileWrapper;
+import org.simpleyaml.configuration.implementation.api.YamlImplementation;
+
+import java.util.*;
 
 // And so the code crimes continue.
 public class GlassYamlWrapper extends YamlFileWrapper {
@@ -23,6 +26,7 @@ public <T> Object getChild(String key, Class<T> type) {
 
     @Override
     public GlassYamlWrapper path(String path) {
-        return new GlassYamlWrapper(this.configuration, path, this);
+        // Fixes some fuckery with comments.
+        return new GlassYamlWrapper(this.configuration, path, Objects.equals(this.path, "") ? null : this);
     }
 }