Fix GameModeConfig

.gitea/workflows/build.yml

@@ -63,9 +63,6 @@ jobs:
           cp "SpigotCore/build/libs/SpigotCore-all.jar" "deploy/SpigotCore.jar"
           cp "Teamserver/build/libs/Teamserver.jar" "deploy/Builder.jar"
           cp "TowerRun/build/libs/TowerRun.jar" "deploy/TowerRun.jar"
-          cp "VelocityCore/Persistent/build/libs/Persistent.jar" "deploy/PersistentVelocityCore.jar"
-          cp "VelocityCore/Dependencies/build/libs/Dependencies-all.jar" "deploy/DependenciesVelocityCore.jar"
-          cp "VelocityCore/build/libs/VelocityCore-all.jar" "deploy/VelocityCore.jar"
           cp "WebsiteBackend/build/libs/WebsiteBackend-all.jar" "deploy/website-api.jar"
           cp "CLI/build/distributions/sw.zip" "deploy/sw.zip"
 

CommonCore/SQL/src/de/steamwar/sql/GameModeConfig.java

@@ -30,6 +30,7 @@ import java.time.LocalDateTime;
 import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 @ToString
 public final class GameModeConfig<M, W> {
@@ -146,12 +147,12 @@ public final class GameModeConfig<M, W> {
     public final List<String> CheckQuestions;
 
     /**
-     * The allowed checkers to check this schematic type denoted by a list of SteamwarUser ids.
+     * The allowed checkers to check this schematic type denoted by a list of SteamWar ids.
      * The people need the {@link UserPerm#CHECK} to be able to check though.
      *
      * @implSpec {@code []} by default -> denoting every person with {@link UserPerm#CHECK} can check it
      */
-    public final Set<Integer> Checkers;
+    public final List<Integer> Checkers;
 
     /**
      * Bundle for countdowns during the fight
@@ -246,7 +247,7 @@ public final class GameModeConfig<M, W> {
         }
 
         CheckQuestions = loader.getStringList("CheckQuestions");
-        Checkers = loader.getIntSet("Checkers");
+        Checkers = loader.getIntList("Checkers");
         Times = new TimesConfig(loader.with("Times"));
         // Arena would be here to be in config order but needs Schematic.Size and EnterStages loaded afterwards
         Schematic = new SchematicConfig<>(loader.with("Schematic"));
@@ -710,13 +711,26 @@ public final class GameModeConfig<M, W> {
             Map<Set<M>, Integer> Limited = new HashMap<>();
             for (Map<?, ?> entry : loader.getMapList("Limited")) {
                 int amount = (Integer) entry.get("Amount");
-                Set<String> materials = new HashSet<>((List<String>) entry.get("Materials"));
+                Set<M> materials = Stream.of((List<String>) entry.get("Materials"))
+                        .filter(Objects::nonNull)
+                        .flatMap(List::stream)
+                        .map(String::toUpperCase)
+                        .map(material -> {
+                            try {
+                                return loader.materialMapper.apply(material);
+                            } catch (Exception e) {
+                                return null;
+                            }
+                        })
+                        .filter(Objects::nonNull)
+                        .collect(Collectors.toSet());
+
                 if (amount == 0) {
                     materials.forEach(material -> {
-                        Limited.put(Collections.singleton(loader.materialMapper.apply(material.toUpperCase())), 0);
+                        Limited.put(Collections.singleton(material), 0);
                     });
                 } else {
-                    Limited.put(Collections.unmodifiableSet(materials.stream().map(String::toUpperCase).map(loader.materialMapper).collect(Collectors.toSet())), amount);
+                    Limited.put(materials, amount);
                 }
             }
             SQLWrapper.impl.getMaterialWithGreaterBlastResistance(MaxBlastResistance).forEach(material -> {

CommonCore/SQL/src/de/steamwar/sql/YMLWrapper.java

@@ -139,12 +139,6 @@ final class YMLWrapper<M, W> {
         return get(path, o -> (List<Integer>) o);
     }
 
-    public Set<Integer> getIntSet(String path) {
-        List<Integer> list = get(path, o -> (List<Integer>) o);
-        if (list.isEmpty()) return Collections.emptySet();
-        return Collections.unmodifiableSet(new HashSet<>(list));
-    }
-
     public List<SchematicType> getSchematicTypeList(String path) {
         List<String> list = getStringList(path);
         if (list.isEmpty()) {

settings.gradle.kts

@@ -251,11 +251,5 @@ include("TowerRun")
 
 include("TutorialSystem")
 
-include(
-    "VelocityCore",
-    "VelocityCore:Dependencies",
-    "VelocityCore:Persistent"
-)
-
 include("TNTLeague")
 include("WebsiteBackend")