Backport CommonCore changes from #430

VelocityCore /check command

.gitea/workflows/build.yml

@@ -63,6 +63,9 @@ 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"
 
@@ -127,12 +130,7 @@ jobs:
           ssh-keyscan -p "$port" "$DEPLOY_HOST" >> ~/.ssh/known_hosts
 
           ssh -i ~/.ssh/deploy_key -p "$port" "${DEPLOY_USER}@${DEPLOY_HOST}" "mkdir -p '$DEPLOY_PATH'"
-          ssh -i ~/.ssh/deploy_key -p "$port" "${DEPLOY_USER}@${DEPLOY_HOST}" "mkdir -p '$DEPLOY_PATH/upload'"
-          scp -i ~/.ssh/deploy_key -P "$port" deploy/* "${DEPLOY_USER}@${DEPLOY_HOST}:$DEPLOY_PATH/upload"
-          ssh -i ~/.ssh/deploy_key -p "$port" "${DEPLOY_USER}@${DEPLOY_HOST}" "rm -f '$DEPLOY_PATH'/*.jar '$DEPLOY_PATH'/*.zip"
-          ssh -i ~/.ssh/deploy_key -p "$port" "${DEPLOY_USER}@${DEPLOY_HOST}" "mv '$DEPLOY_PATH'/upload/* '$DEPLOY_PATH'"
-          ssh -i ~/.ssh/deploy_key -p "$port" "${DEPLOY_USER}@${DEPLOY_HOST}" "rm -r '$DEPLOY_PATH/upload'"
-          ssh -i ~/.ssh/deploy_key -p "$port" "${DEPLOY_USER}@${DEPLOY_HOST}" "chmod o-w '$DEPLOY_PATH'/*"
+          scp -i ~/.ssh/deploy_key -P "$port" deploy/* "${DEPLOY_USER}@${DEPLOY_HOST}:$DEPLOY_PATH/"
       - name: Restart Services
         shell: bash
         env:

BauSystem/BauSystem_Main/src/BauSystem.properties

@@ -864,7 +864,6 @@ LAUFBAU_SETTINGS_ADVANCED=§eLeft-Click §8-§7 Advanced settings
 LAUFBAU_BLOCK_COBWEB=§eCobweb
 LAUFBAU_BLOCK_GRASS_PATH=§eGrass Path
 LAUFBAU_BLOCK_SOUL_SAND=§eSoul Sand
-LAUFBAU_BLOCK_MUD=§eMud
 LAUFBAU_BLOCK_COCOA=§eCocoa
 LAUFBAU_BLOCK_TURTLE_EGG=§eTurtle Eggs
 LAUFBAU_BLOCK_CHEST=§eChest

BauSystem/BauSystem_Main/src/BauSystem_de.properties

@@ -802,7 +802,6 @@ LAUFBAU_SETTINGS_ADVANCED=§eLinks-Click §8-§7 Erweiterte Einstellung
 LAUFBAU_BLOCK_COBWEB=§eCobweb
 LAUFBAU_BLOCK_GRASS_PATH=§eGrass Path
 LAUFBAU_BLOCK_SOUL_SAND=§eSoul Sand
-LAUFBAU_BLOCK_MUD=§eMud
 LAUFBAU_BLOCK_COCOA=§eCocoa
 LAUFBAU_BLOCK_TURTLE_EGG=§eTurtle Eggs
 LAUFBAU_BLOCK_CHEST=§eChest

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/BlockBoundingBox.java

@@ -101,11 +101,7 @@ public class BlockBoundingBox {
         addPixel(Material.END_STONE.createBlockData(), 0, 0, 0, 16, 16, 16, null);
 
         addPixel(NMSWrapper.impl.pathMaterial().createBlockData(), 0, 0, 0, 16, 15, 16, createItem("LAUFBAU_BLOCK_GRASS_PATH", NMSWrapper.impl.pathMaterial()));
-        addPixel(Material.SOUL_SAND.createBlockData(), 0, 0, 0, 16, 14, 16, createItem("LAUFBAU_BLOCK_SOUL_SAND", Material.SOUL_SAND));
-
-        if (Core.getVersion() >= 19) {
-            addPixel(Material.MUD.createBlockData(), 0, 0, 0, 16, 14, 16, createItem("LAUFBAU_BLOCK_MUD", Material.MUD));
-        }
+        addPixel(Material.MUD.createBlockData(), 0, 0, 0, 16, 14, 16, createItem("LAUFBAU_BLOCK_SOUL_SAND", Material.SOUL_SAND));
 
         Cocoa cocoaNorth = (Cocoa) Material.COCOA.createBlockData();
         cocoaNorth.setAge(2);

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/LaufbauCommand.java

@@ -25,12 +25,14 @@ import de.steamwar.bausystem.shared.Pair;
 import de.steamwar.bausystem.utils.WorldEditUtils;
 import de.steamwar.command.SWCommand;
 import de.steamwar.linkage.Linked;
+import de.steamwar.linkage.MinVersion;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.entity.Player;
 import org.bukkit.scheduler.BukkitRunnable;
 
 @Linked
+@MinVersion(19)
 public class LaufbauCommand extends SWCommand {
 
     public LaufbauCommand() {

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

@@ -30,7 +30,6 @@ 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> {
@@ -147,12 +146,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 SteamWar ids.
+     * The allowed checkers to check this schematic type denoted by a list of SteamwarUser 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 List<Integer> Checkers;
+    public final Set<Integer> Checkers;
 
     /**
      * Bundle for countdowns during the fight
@@ -247,7 +246,7 @@ public final class GameModeConfig<M, W> {
         }
 
         CheckQuestions = loader.getStringList("CheckQuestions");
-        Checkers = loader.getIntList("Checkers");
+        Checkers = loader.getIntSet("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"));
@@ -711,26 +710,13 @@ 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<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());
-
+                Set<String> materials = new HashSet<>((List<String>) entry.get("Materials"));
                 if (amount == 0) {
                     materials.forEach(material -> {
-                        Limited.put(Collections.singleton(material), 0);
+                        Limited.put(Collections.singleton(loader.materialMapper.apply(material.toUpperCase())), 0);
                     });
                 } else {
-                    Limited.put(materials, amount);
+                    Limited.put(Collections.unmodifiableSet(materials.stream().map(String::toUpperCase).map(loader.materialMapper).collect(Collectors.toSet())), amount);
                 }
             }
             SQLWrapper.impl.getMaterialWithGreaterBlastResistance(MaxBlastResistance).forEach(material -> {

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

@@ -139,6 +139,12 @@ 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,5 +251,11 @@ include("TowerRun")
 
 include("TutorialSystem")
 
+include(
+    "VelocityCore",
+    "VelocityCore:Dependencies",
+    "VelocityCore:Persistent"
+)
+
 include("TNTLeague")
 include("WebsiteBackend")