Updated ContentsParser with new setList method

fulminazzo · Apr 11, 2024 · 1a40150 · 1a40150
1 parent 5873d15
commit 1a40150
Showing 1 changed file with 3 additions and 15 deletions.
diff --git a/gui/serializer/src/main/java/it/angrybear/yagl/guis/ContentsParser.java b/gui/serializer/src/main/java/it/angrybear/yagl/guis/ContentsParser.java
@@ -9,7 +9,6 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.LinkedList;
 import java.util.List;
 
 public class ContentsParser extends YAMLParser<GUIImpl.Contents> {
@@ -23,16 +22,8 @@ public ContentsParser() {
         return (c, s) -> {
             ConfigurationSection section = c.getConfigurationSection(s);
             if (section == null) return null;
-            List<GUIContent> contents = new LinkedList<>();
-            for (String key : section.getKeys())
-                try {
-                    int i = Integer.parseInt(key);
-                    if (i < 0) throw new NumberFormatException();
-                    while (contents.size() - 1 < i) contents.add(null);
-                    contents.set(i, section.get(String.valueOf(i), GUIContent.class));
-                } catch (NumberFormatException e) {
-                    throw new IllegalArgumentException(String.format("Invalid key '%s'", key));
-                }
+            List<GUIContent> contents = c.getList(s, GUIContent.class);
+            if (contents == null) return null;
             return new GUIImpl.Contents(contents.toArray(new GUIContent[0]));
         };
     }
@@ -42,10 +33,7 @@ public ContentsParser() {
         return (c, s, g) -> {
             c.set(s, null);
             if (g == null) return;
-            ConfigurationSection section = c.createSection(s);
-            List<GUIContent> contents = g.getContents();
-            for (int i = 0; i < contents.size(); i++)
-                section.set(String.valueOf(i), contents.get(i));
+            c.setList(s, g.getContents());
         };
     }
 }