Merge pull request 'Add Unified GameModeConfig' (#176) from UnifiedGameModeConfig into main

Reviewed-on: SteamWar/SteamWar#176
Reviewed-by: D4rkr34lm <dark@steamwar.de>
Reviewed-by: Chaoscaot <max@chaoscaot.de>

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/autostart/AutostartListener.java

@@ -129,7 +129,7 @@ public class AutostartListener implements Listener {
             if (!regionStartTime.containsKey(region)) return;
             if (!region.getTestblockArea().inRegion(block.getLocation(), true)) return;
             long tickDiff = TPSUtils.currentRealTick.get() - regionStartTime.remove(region);
-            long preFightDurationInSeconds = region.getGameModeConfig().getTimes().getPreFightDuration();
+            long preFightDurationInSeconds = region.getGameModeConfig().Times.PreFightDuration;
             RegionUtils.message(region, "AUTOSTART_MESSAGE_RESULT1", tickDiff);
             RegionUtils.message(region, "AUTOSTART_MESSAGE_RESULT2", preFightDurationInSeconds, ((preFightDurationInSeconds * 20) - tickDiff));
             RegionUtils.message(region, "AUTOSTART_MESSAGE_RESULT3");

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/design/endstone/DesignEndStone.java

@@ -29,10 +29,12 @@ import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.World;
-import org.bukkit.configuration.file.YamlConfiguration;
 import org.bukkit.entity.Player;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 public class DesignEndStone {
@@ -54,15 +56,13 @@ public class DesignEndStone {
         this.maxY = region.getBuildArea().getMaxPoint(false).getY();
         this.maxZ = region.getBuildArea().getMaxPoint(false).getZ();
 
-        limited = region.getGameModeConfig()
-                .getSchematic()
-                .getLimited()
+        limited = region.getGameModeConfig().Schematic.Limited
                 .entrySet()
                 .stream()
                 .filter(entry -> entry.getValue() == 0)
                 .flatMap(entry -> entry.getKey().stream())
                 .collect(Collectors.toSet());
-        calculateFromBottom = region.getGameModeConfig().getArena().isNoFloor();
+        calculateFromBottom = region.getGameModeConfig().Arena.NoFloor;
 
         entityServer.setCallback((player, rEntity, entityAction) -> {
             if (entityAction != REntityServer.EntityAction.ATTACK) return;

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/design/endstone/DesignEndStoneCommand.java

@@ -52,7 +52,7 @@ public class DesignEndStoneCommand extends SWCommand implements Listener {
             BauSystem.MESSAGE.send("DESIGN_ENDSTONE_REGION_ERROR", player);
             return;
         }
-        if (!region.getGameModeConfig().isLoaded()) {
+        if (!region.getGameModeConfig().loaded) {
             BauSystem.MESSAGE.send("DESIGN_ENDSTONE_REGION_ERROR", player);
             return;
         }

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/RegionScoreboardElement.java

@@ -43,8 +43,8 @@ public class RegionScoreboardElement implements ScoreboardElement {
     @Override
     public String get(Region region, Player p) {
         if (region.getType().isGlobal()) return null;
-        if (!region.getGameModeConfig().isLoaded()) return null;
-        List<String> names = region.getGameModeConfig().getServer().getChatNames();
+        if (!region.getGameModeConfig().loaded) return null;
+        List<String> names = region.getGameModeConfig().Server.ChatNames;
         if (names.isEmpty()) return null;
         return "§e" + BauSystem.MESSAGE.parse("SCOREBOARD_REGION", p) + "§8: §7" + names.get(0);
     }

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/lua/libs/RegionLib.java

@@ -51,7 +51,7 @@ public class RegionLib implements LuaLib {
             if (rg.getType().isGlobal()) {
                 return "global";
             }
-            List<String> chatNames = rg.getGameModeConfig().getServer().getChatNames();
+            List<String> chatNames = rg.getGameModeConfig().Server.ChatNames;
             if (chatNames.isEmpty()) {
                 return "unknown";
             }

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/techhider/TechHiderCommand.java

@@ -65,7 +65,7 @@ public class TechHiderCommand extends SWCommand implements Listener, ScoreboardE
         }
 
         Optional<TechHider> techHider = techHiders.computeIfAbsent(region, rg -> {
-            if (!region.getGameModeConfig().getTechhider().isActive()) {
+            if (!region.getGameModeConfig().Techhider.Active) {
                 return Optional.empty();
             }
 
@@ -74,7 +74,7 @@ public class TechHiderCommand extends SWCommand implements Listener, ScoreboardE
             TechHider current = new TechHider((p, cX, cY) -> {
                 if (rg.getBuildArea().isChunkOutside(cX, cY)) return true;
                 return !hidden.get(rg).contains(p);
-            }, region.getGameModeConfig().getTechhider().getObfuscateWith(), region.getGameModeConfig().getTechhider().getHiddenBlocks(), region.getGameModeConfig().getTechhider().getHiddenBlockEntities());
+            }, region.getGameModeConfig().Techhider.ObfuscateWith, region.getGameModeConfig().Techhider.HiddenBlocks, region.getGameModeConfig().Techhider.HiddenBlockEntities);
             current.enable();
 
             return Optional.of(current);

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/xray/XrayCommand.java

@@ -67,13 +67,13 @@ public class XrayCommand extends SWCommand implements Listener, ScoreboardElemen
         }
 
         Optional<TechHider> techHider = techHiders.computeIfAbsent(region, rg -> {
-            if (!region.getGameModeConfig().getTechhider().isActive()) {
+            if (!region.getGameModeConfig().Techhider.Active) {
                 return Optional.empty();
             }
 
             hidden.put(rg, new HashSet<>());
 
-            Set<Material> blocks = new HashSet<>(Arrays.asList(region.getGameModeConfig().getTechhider().getObfuscateWith()));
+            Set<Material> blocks = new HashSet<>(Arrays.asList(region.getGameModeConfig().Techhider.ObfuscateWith));
             if (blocks.contains(Material.END_STONE)) blocks.add(Material.END_STONE_BRICKS);
             xrayedBlocks.put(region, blocks);
             return Optional.of(createXray(rg, blocks));

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/GameModeConfig.java

@@ -1,128 +0,0 @@
-/*
- *   This file is a part of the SteamWar software.
- *
- *   Copyright (C) 2025 SteamWar.de-Serverteam
- *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU Affero General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *   GNU Affero General Public License for more details.
- *
- *   You should have received a copy of the GNU Affero General Public License
- *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package de.steamwar.bausystem.region;
-
-import de.steamwar.core.FlatteningWrapper;
-import lombok.AccessLevel;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import org.bukkit.Material;
-import org.bukkit.configuration.ConfigurationSection;
-import org.bukkit.configuration.file.FileConfiguration;
-import org.bukkit.configuration.file.YamlConfiguration;
-
-import java.io.File;
-import java.util.*;
-import java.util.stream.Collectors;
-
-@Getter
-public class GameModeConfig {
-
-    private final boolean loaded;
-
-    /**
-     * See gamemode config Times key
-     */
-    private Times Times = new Times();
-    private Schematic Schematic = new Schematic();
-    private Arena Arena = new Arena();
-    private Server Server = new Server();
-    private Techhider Techhider = new Techhider();
-
-    public GameModeConfig(File file) {
-        if (file == null || !file.exists()) {
-            loaded = false;
-            return;
-        }
-        loaded = true;
-
-        FileConfiguration config = YamlConfiguration.loadConfiguration(file);
-
-        Times.load(config.getConfigurationSection("Times"));
-        Schematic.load(config.getConfigurationSection("Schematic"));
-        Arena.load(config.getConfigurationSection("Arena"));
-        Server.load(config.getConfigurationSection("Server"));
-        Techhider.load(config.getConfigurationSection("Techhider"));
-    }
-
-    @NoArgsConstructor(access = AccessLevel.PRIVATE)
-    @Getter
-    public static class Times {
-        private int PreFightDuration = 30;
-
-        private void load(ConfigurationSection section) {
-            PreFightDuration = section.getInt("PreFightDuration", 30);
-        }
-    }
-
-    @NoArgsConstructor(access = AccessLevel.PRIVATE)
-    @Getter
-    public static class Schematic {
-        private Map<Set<Material>, Integer> Limited = new HashMap<>();
-
-        private void load(ConfigurationSection section) {
-            for(Map<?, ?> entry : section.getMapList("Limited")) {
-                int amount = (Integer) entry.get("Amount");
-                Set<String> materials = new HashSet<>((List<String>) entry.get("Materials"));
-                if (amount == 0) {
-                    materials.forEach(material -> Limited.put(Collections.singleton(Material.getMaterial(material)), 0));
-                } else {
-                    Limited.put(materials.stream().map(Material::getMaterial).collect(Collectors.toSet()), amount);
-                }
-            }
-        }
-    }
-
-    @NoArgsConstructor(access = AccessLevel.PRIVATE)
-    @Getter
-    public static class Arena {
-        private boolean NoFloor = false;
-
-        private void load(ConfigurationSection section) {
-            NoFloor = section.getBoolean("NoFloor", false);
-        }
-    }
-
-    @NoArgsConstructor(access = AccessLevel.PRIVATE)
-    @Getter
-    public static class Server {
-        private List<String> ChatNames;
-
-        private void load(ConfigurationSection section) {
-            ChatNames = section.getStringList("ChatNames");
-        }
-    }
-
-    @NoArgsConstructor(access = AccessLevel.PRIVATE)
-    @Getter
-    public static class Techhider {
-        private boolean Active = false;
-        private Material ObfuscateWith = Material.END_STONE;
-        private Set<Material> HiddenBlocks = new HashSet<>();
-        private Set<String> HiddenBlockEntities = new HashSet<>();
-
-        private void load(ConfigurationSection section) {
-            Active = section.getBoolean("Active", false);
-            ObfuscateWith = Material.getMaterial(section.getString("ObfuscateWith", "END_STONE"));
-            HiddenBlocks = section.getStringList("HiddenBlocks").stream().map(String::toUpperCase).map(FlatteningWrapper.impl::getMaterial).filter(Objects::nonNull).collect(Collectors.toUnmodifiableSet());
-            HiddenBlockEntities = Collections.unmodifiableSet(new HashSet<>(section.getStringList("HiddenBlockEntities")));
-        }
-    }
-}

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/Region.java

@@ -22,8 +22,11 @@ package de.steamwar.bausystem.region;
 import com.sk89q.worldedit.extent.clipboard.Clipboard;
 import de.steamwar.bausystem.utils.FlatteningWrapper;
 import de.steamwar.bausystem.utils.PasteBuilder;
+import de.steamwar.sql.GameModeConfig;
+import de.steamwar.sql.SchematicType;
 import lombok.NonNull;
 import org.bukkit.Location;
+import org.bukkit.Material;
 
 import javax.annotation.Nullable;
 import java.io.File;
@@ -64,7 +67,7 @@ public interface Region {
     Area getTestblockArea();
 
     @NonNull
-    GameModeConfig getGameModeConfig();
+    GameModeConfig<Material, String> getGameModeConfig();
 
     @NonNull
     RegionHistory getHistory();

BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedGlobalRegion.java

@@ -22,9 +22,11 @@ package de.steamwar.bausystem.region.fixed;
 import com.sk89q.worldedit.extent.clipboard.Clipboard;
 import de.steamwar.bausystem.region.*;
 import de.steamwar.bausystem.utils.PasteBuilder;
+import de.steamwar.sql.GameModeConfig;
 import lombok.NonNull;
 import lombok.Setter;
 import org.bukkit.Location;
+import org.bukkit.Material;
 
 import javax.annotation.Nullable;
 import java.io.File;
@@ -90,8 +92,6 @@ public final class FixedGlobalRegion implements Region {
         }
     };
 
-    private static final GameModeConfig GLOBAL_CONFIG = new GameModeConfig(null);
-
     private FixedGlobalRegion() {
     }
 
@@ -126,8 +126,8 @@ public final class FixedGlobalRegion implements Region {
     }
 
     @Override
-    public @NonNull GameModeConfig getGameModeConfig() {
-        return GLOBAL_CONFIG;
+    public @NonNull GameModeConfig<Material, String> getGameModeConfig() {
+        return GameModeConfig.getDefaults();
     }
 
     @Override

BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedRegion.java

@@ -28,9 +28,11 @@ import de.steamwar.bausystem.utils.FlatteningWrapper;
 import de.steamwar.bausystem.utils.PasteBuilder;
 import de.steamwar.bausystem.worlddata.WorldData;
 import de.steamwar.core.Core;
+import de.steamwar.sql.GameModeConfig;
 import de.steamwar.sql.SchematicType;
 import lombok.NonNull;
 import org.bukkit.Bukkit;
+import org.bukkit.Material;
 import yapion.hierarchy.types.YAPIONObject;
 
 import javax.annotation.Nullable;
@@ -57,7 +59,7 @@ public class FixedRegion implements Region {
     private final Area testblock;
     private final int floorLevel;
     private final int waterLevel;
-    private final GameModeConfig gameModeConfig;
+    private final GameModeConfig<Material, String> gameModeConfig;
     private final RegionData regionData;
     private final RegionHistory regionHistory = new RegionHistory.Impl(20);
 
@@ -336,7 +338,11 @@ public class FixedRegion implements Region {
                 break;
             }
         }
-        this.gameModeConfig = new GameModeConfig(found);
+        if (found == null) {
+            this.gameModeConfig = GameModeConfig.getDefaults();
+        } else {
+            this.gameModeConfig = GameModeConfig.getByFileName(found);
+        }
         this.regionData = new RegionData.RegionDataImpl(regionData, WorldData::write);
     }
 
@@ -371,7 +377,7 @@ public class FixedRegion implements Region {
     }
 
     @Override
-    public @NonNull GameModeConfig getGameModeConfig() {
+    public @NonNull GameModeConfig<Material, String> getGameModeConfig() {
         return gameModeConfig;
     }
 

CommonCore/SQL/build.gradle.kts

@@ -23,4 +23,6 @@ plugins {
 
 dependencies {
     compileOnly(libs.sqlite)
+
+    implementation("org.yaml:snakeyaml:2.2")
 }

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

@@ -0,0 +1,936 @@
+/*
+ *   This file is a part of the SteamWar software.
+ *
+ *   Copyright (C) 2025 SteamWar.de-Serverteam
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU Affero General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU Affero General Public License for more details.
+ *
+ *   You should have received a copy of the GNU Affero General Public License
+ *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package de.steamwar.sql;
+
+import lombok.ToString;
+
+import java.io.File;
+import java.lang.reflect.Field;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.time.Instant;
+import java.time.LocalDateTime;
+import java.util.*;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+@ToString
+public final class GameModeConfig<M, W> {
+
+    public static final Function<String, String> ToString = Function.identity();
+    public static final Function<File, String> ToStaticWarGear = __ -> "WarGear";
+    public static final Function<File, String> ToInternalName = file -> file.getName().replace(".yml", "");
+    public static final SimpleDateFormat DATE_FORMAT = new SimpleDateFormat("dd.MM.yyyy HH:mm");
+    private static final Random random = new Random();
+
+    static {
+        SchematicType.values();
+    }
+
+    private static final Map<String, GameModeConfig<?, String>> byFileName = new HashMap<>();
+    private static final Map<String, GameModeConfig<?, String>> byGameName = new HashMap<>();
+    private static final Map<SchematicType, GameModeConfig<?, String>> bySchematicType = new HashMap<>();
+
+    public static <M> GameModeConfig<M, String> getByFileName(File file) {
+        return (GameModeConfig<M, String>) byFileName.get(file.getName());
+    }
+
+    public static <M> GameModeConfig<M, String> getByGameName(String gameName) {
+        return (GameModeConfig<M, String>) byGameName.get(gameName);
+    }
+
+    public static <M> GameModeConfig<M, String> getBySchematicType(SchematicType schematicType) {
+        return (GameModeConfig<M, String>) bySchematicType.get(schematicType);
+    }
+
+    private static final GameModeConfig<?, String> DEFAULTS = SQLWrapper.impl.loadGameModeConfig(null);
+
+    public static <M> GameModeConfig<M, String> getDefaults() {
+        return (GameModeConfig<M, String>) DEFAULTS;
+    }
+
+    public final boolean loaded;
+    public final File configFile;
+
+    /**
+     * Bundle for server specific configuration values
+     */
+    public final ServerConfig Server;
+
+    /**
+     * Submission deadline for schematics in 'dd.MM.yyyy HH:mm' format
+     *
+     * @implSpec {@code null} by default
+     */
+    public final Date Deadline;
+
+    /**
+     * The questions that have to be answered to accept the schematic
+     *
+     * @implSpec Disables check schem type if missing
+     */
+    public final List<String> CheckQuestions;
+
+    /**
+     * Bundle for countdowns during the fight
+     */
+    public final TimesConfig Times;
+
+    /**
+     * Bundle for arena specific configurations. Primarily used by the FightSystem
+     */
+    public final ArenaConfig Arena;
+
+    /**
+     * Bundle for schematic configurations
+     */
+    public final SchematicConfig<M> Schematic;
+
+    /**
+     * The name of the game mode presented to the players
+     *
+     * @implSpec {@code YMLWrapper.getDefaultGameName()} by default
+     */
+    public final String GameName;
+
+    /**
+     * The months this game mode should be active and playable<br/>
+     * The empty List means all of them
+     *
+     * @implNote 1 is January - 12 is December
+     */
+    public final List<Integer> ActiveMonths;
+
+    /**
+     * The prefix used for team chats
+     *
+     * @implSpec {@code +} by default
+     */
+    public final String TeamChatPrefix;
+
+    /**
+     * Bundle for configurations for the Blue team
+     */
+    public final BlueConfig Blue;
+
+    /**
+     * Bundle for configurations for the Red team
+     */
+    public final RedConfig Red;
+
+    /**
+     * The list of active win conditions
+     */
+    public final List<W> WinConditions;
+
+    /**
+     * Bundle for configurations used by the Winconditions in the FightSystem
+     */
+    public final WinConditionParamsConfig<M> WinConditionParams;
+
+    /**
+     * Bundle for Kit specific configurations
+     */
+    public final KitsConfig<M> Kits;
+
+    /**
+     * A list of integers containing the waiting time of this enter stage in the fight
+     */
+    public final List<Integer> EnterStages;
+
+    /**
+     * Bundle for Techhider configurations
+     */
+    public final TechhiderConfig<M> Techhider;
+
+    private static final Field Schematic_TypeField;
+
+    static {
+        try {
+            Schematic_TypeField = SchematicConfig.class.getDeclaredField("Type");
+            Schematic_TypeField.setAccessible(true);
+        } catch (NoSuchFieldException e) {
+            throw new SecurityException(e.getMessage(), e);
+        }
+    }
+
+    public GameModeConfig(File file, Function<String, M> materialMapper, Function<String, W> winconditionMapper, Function<File, String> defaultGameName, boolean cacheInstance) {
+        YMLWrapper<M, W> loader = new YMLWrapper<>(file, materialMapper, winconditionMapper);
+
+        configFile = file;
+        loaded = loader.canLoad();
+        Server = new ServerConfig(loader.with("Server"));
+
+        String deadlineString = loader.getString("Deadline", null);
+        if (deadlineString != null) {
+            Date Deadline = null;
+            try {
+                Deadline = DATE_FORMAT.parse(deadlineString);
+            } catch (ParseException e) {
+                Deadline = null;
+            }
+            this.Deadline = Deadline;
+        } else {
+            Deadline = null;
+        }
+
+        CheckQuestions = loader.getStringList("CheckQuestions");
+        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"));
+        GameName = loader.getString("GameName", defaultGameName.apply(file));
+        ActiveMonths = loader.getIntList("ActiveMonths");
+        TeamChatPrefix = loader.getString("TeamChatPrefix", "+");
+        Blue = new BlueConfig(loader.with("Blue"));
+        Red = new RedConfig(loader.with("Red"));
+        WinConditions = Collections.unmodifiableList(loader.getStringList("WinConditions").stream().map(loader.winconditionMapper).collect(Collectors.toList()));
+        WinConditionParams = new WinConditionParamsConfig<>(loader.with("WinConditionParams"));
+        Kits = new KitsConfig<>(loader.with("Kits"));
+        EnterStages = loader.getIntList("EnterStages");
+        Techhider = new TechhiderConfig<>(loader.with("Techhider"));
+
+        Arena = new ArenaConfig(loader.with("Arena"), Schematic.Size, EnterStages);
+
+        if (cacheInstance) {
+            if (configFile != null) {
+                byFileName.put(configFile.getName(), (GameModeConfig) this);
+            }
+            byGameName.put(GameName, (GameModeConfig) this);
+        }
+
+        if (Schematic.Type != null) {
+            if (cacheInstance) {
+                bySchematicType.put(Schematic.Type, (GameModeConfig) this);
+                if (Schematic.Type.checkType() != null) {
+                    bySchematicType.put(Schematic.Type.checkType(), (GameModeConfig) this);
+                }
+            }
+            return;
+        }
+        if (!Schematic.loaded) return;
+        String Schematic_Type = loader.with("Schematic").getString("Type", "Normal");
+        if (Schematic_Type.equals("Normal")) return;
+        String Schematic_Shortcut = Schematic.Shortcut;
+
+        SchematicType checktype = null;
+        String material = loader.with("Schematic").getString("Material", "STONE_BUTTON");
+
+        if (!CheckQuestions.isEmpty()) {
+            checktype = new SchematicType("C" + Schematic_Type, "C" + Schematic_Shortcut, SchematicType.Type.CHECK_TYPE, null, material, true);
+        }
+        SchematicType current = new SchematicType(Schematic_Type, Schematic_Shortcut, Server.loaded ? SchematicType.Type.FIGHT_TYPE : SchematicType.Type.NORMAL, checktype, material, Deadline, Schematic.ManualCheck);
+        try {
+            Schematic_TypeField.set(Schematic, current);
+
+            if (cacheInstance) {
+                bySchematicType.put(Schematic.Type, (GameModeConfig) this);
+                if (Schematic.Type.checkType() != null) {
+                    bySchematicType.put(Schematic.Type.checkType(), (GameModeConfig) this);
+                }
+            }
+        } catch (IllegalAccessException e) {
+            throw new SecurityException(e.getMessage(), e);
+        }
+    }
+
+    @ToString
+    public static final class ServerConfig {
+
+        public final boolean loaded;
+
+        /**
+         * Base server folder
+         */
+        public final String Folder;
+
+        /**
+         * Server java archive
+         */
+        public final String ServerJar;
+
+        /**
+         * Available arenas
+         */
+        public final List<String> Maps;
+
+        /**
+         * Names to address the game mode in the chat interface
+         */
+        public final List<String> ChatNames;
+
+        /**
+         * If the Server is a Spigot server
+         *
+         * @implSpec {@code false} by default
+         */
+        public final boolean Spigot;
+
+        /**
+         * If the game mode should be marked as a historic game mode
+         *
+         * @implSpec {@code false} by default
+         */
+        public final boolean Historic;
+
+        /**
+         * If ranked matches should be available for the game mode
+         *
+         * @implSpec {@code false} by default
+         */
+        public final boolean Ranked;
+
+        private ServerConfig(YMLWrapper loader) {
+            loaded = loader.canLoad();
+            Folder = loader.getString("Folder", null);
+            ServerJar = loader.getString("ServerJar", null);
+            Maps = loader.getStringList("Maps");
+            ChatNames = loader.getStringList("ChatNames");
+            Spigot = loader.getBoolean("Spigot", false);
+            Historic = loader.getBoolean("Historic", false);
+            Ranked = loader.getBoolean("Ranked", false);
+        }
+    }
+
+    @ToString
+    public static final class TimesConfig {
+        public final boolean loaded;
+
+        /**
+         * Time in seconds the server stops after starting if nobody joins
+         *
+         * @implSpec {@code 300} by default
+         */
+        public final int NoPlayersOnlineDuration;
+
+        /**
+         * Time in seconds the team leaders have to choose their schematic
+         *
+         * @implSpec {@code 120} by default
+         */
+        public final int PreSchemPasteDuration;
+
+        /**
+         * Time in seconds for preparing
+         *
+         * @implSpec {@code 300} by default
+         */
+        public final int SetupDuration;
+
+        /**
+         * Time in seconds the final countdown is long
+         *
+         * @implSpec {@code 30} by default
+         */
+        public final int PreFightDuration;
+
+        /**
+         * Time in seconds to spectate the arena after the fight
+         *
+         * @implSpec {@code 30} by default
+         */
+        public final int SpectatorDuration;
+
+        private TimesConfig(YMLWrapper loader) {
+            loaded = loader.canLoad();
+            NoPlayersOnlineDuration = loader.getInt("NoPlayersOnlineDuration", 300);
+            PreSchemPasteDuration = loader.getInt("PreSchemPasteDuration", 120);
+            SetupDuration = loader.getInt("SetupDuration", 300);
+            PreFightDuration = loader.getInt("PreFightDuration", 30);
+            SpectatorDuration = loader.getInt("SpectatorDuration", 60);
+        }
+    }
+
+    @ToString
+    public static final class ArenaConfig {
+
+        public final boolean loaded;
+
+        /**
+         * The amount of blocks the schematics should be pasted under the surface
+         *
+         * @implSpec {@code 0} by default
+         */
+        public final int WaterDepth;
+
+        /**
+         * The outer border of the arena, measured in blocks around the schematic areas
+         */
+        public final Schem2BorderConfig Schem2Border;
+
+        /**
+         * The offset the teams spawn relative to the center of their area
+         */
+        public final SpawnOffsetConfig SpawnOffset;
+
+        /**
+         * The size of the team areas are expanded around the schematics
+         *
+         * @implSpec {@code 12} by default
+         */
+        public final int BorderFromSchematic;
+
+        /**
+         * If ground walkable, teams can walk below the lower arena border during setup
+         *
+         * @implSpec {@code true} by default
+         */
+        public final boolean GroundWalkable;
+
+        /**
+         * Disable snow and ice melting
+         *
+         * @implSpec {@code false} by default
+         */
+        public final boolean DisableSnowMelt;
+
+        /**
+         * Allow leaving the arena area as spectator
+         *
+         * @implSpec {@code false} by default
+         */
+        public final boolean Leaveable;
+
+        /**
+         * Allow missiles to fly to the enemy and not stop at the schem border.
+         *
+         * @implSpec {@code !EnterStages.isEmpty()} by default
+         */
+        public final boolean AllowMissiles;
+
+        /**
+         * Denotes that there is no floor for this GameMode
+         *
+         * @implSpec {@code false} by default
+         */
+        public final boolean NoFloor;
+
+        private ArenaConfig(YMLWrapper loader, SchematicConfig.SizeConfig Size, List<Integer> EnterStages) {
+            loaded = loader.canLoad();
+            WaterDepth = loader.getInt("WaterDepth", 0);
+            Schem2Border = new Schem2BorderConfig(loader.with("Schem2Border"));
+            SpawnOffset = new SpawnOffsetConfig(loader.with("SpawnOffset"), Size);
+            BorderFromSchematic = loader.getInt("BorderFromSchematic", 21);
+            GroundWalkable = loader.getBoolean("GroundWalkable", true);
+            DisableSnowMelt = loader.getBoolean("DisableSnowMelt", false);
+            Leaveable = loader.getBoolean("Leaveable", false);
+            AllowMissiles = loader.getBoolean("AllowMissiles", !EnterStages.isEmpty());
+            NoFloor = loader.getBoolean("NoFloor", false);
+        }
+
+        @ToString
+        public static final class Schem2BorderConfig {
+
+            public final boolean loaded;
+
+            /**
+             * @implSpec {@code 24} by default
+             */
+            public final int x;
+
+            /**
+             * @implSpec {@code 24} by default
+             */
+            public final int z;
+
+            private Schem2BorderConfig(YMLWrapper loader) {
+                loaded = loader.canLoad();
+                x = loader.getInt("x", 24);
+                z = loader.getInt("z", 24);
+            }
+        }
+
+        @ToString
+        public static final class SpawnOffsetConfig {
+
+            public final boolean loaded;
+
+            /**
+             * @implSpec {@code 0} by default
+             */
+            public final double x;
+
+            /**
+             * @implSpec {@code Schematic.Size.y} by default
+             */
+            public final double y;
+
+            /**
+             * @implSpec {@code 0} by default
+             */
+            public final double z;
+
+            private SpawnOffsetConfig(YMLWrapper loader, SchematicConfig.SizeConfig Size) {
+                loaded = loader.canLoad();
+                x = loader.getDouble("x", 0);
+                y = loader.getDouble("y", Size.y);
+                z = loader.getDouble("z", 0);
+            }
+        }
+    }
+
+    @ToString
+    public static final class SchematicConfig<M> {
+
+        public final boolean loaded;
+
+        /**
+         * The size of the schematics
+         */
+        public final SizeConfig Size;
+
+        /**
+         * Used for GameModes with a technic area
+         */
+        public final InsetConfig Inset;
+
+        /**
+         * The schematic type that can be chosen in this arena
+         *
+         * @implSpec {@code Normal} by default
+         */
+        public final SchematicType Type;
+
+        /**
+         * The schematic types that are also allowed to be chosen in this arena
+         */
+        public final List<SchematicType> SubTypes;
+
+        /**
+         * Shortcut of the schematic type
+         *
+         * @implSpec {@code ""} by default
+         */
+        public final String Shortcut;
+
+        /**
+         * Spigot (1.8) material for GUIs
+         *
+         * @implSpec {@code STONE_BUTTON} by default
+         */
+        public final M Material;
+
+        /**
+         * Manual check of schematic necessary
+         *
+         * @implSpec {@code true} by default
+         */
+        public final boolean ManualCheck;
+
+        /**
+         * If the schematics should be rotated during pasting
+         *
+         * @implSpec {@code true} by default
+         */
+        public final boolean Rotate;
+
+        /**
+         * If the schematics should be pasted aligned to the borders instead of centered
+         *
+         * @implSpec {@code false} by default
+         */
+        public final boolean PasteAligned;
+
+        /**
+         * If only public schematics are allowed
+         *
+         * @implSpec {@code false} by default
+         */
+        public final boolean OnlyPublicSchematics;
+
+        /**
+         * If the public only force should be completely disabled
+         *
+         * @implSpec {@code false} by default
+         */
+        public final boolean IgnorePublicOnly;
+
+        /**
+         * If obsidian and bedrock should be replaced during PRE_RUNNING
+         *
+         * @implSpec {@code false} by default
+         */
+        public final boolean ReplaceObsidianBedrock;
+
+        /**
+         * If the replacement should happen with block updates
+         *
+         * @implSpec {@code false} by default
+         */
+        public final boolean ReplaceWithBlockupdates;
+
+        /**
+         * If the schematic perparation arena mode is time limited
+         *
+         * @implSpec {@code false} by default
+         */
+        public final boolean UnlimitedPrepare;
+
+        /**
+         * Maximal amount of blocks allowed in the schematic
+         *
+         * @implSpec {@code 0} by default
+         */
+        public final int MaxBlocks;
+
+        /**
+         * Maximal amount of items per dispenser
+         *
+         * @implSpec {@code 128} by default
+         */
+        public final int MaxDispenserItems;
+
+        /**
+         * Maximal blast resistance for the design blocks
+         *
+         * @implSpec {@code Double.MAX_VALUE} by default
+         */
+        public final double MaxDesignBlastResistance;
+
+        /**
+         * List of limited material (combinations)<br/>
+         * List contains tags Amount (integer) and Materials (List of material names in Spigot 1.12 AND Spigot 1.15 format)
+         */
+        public final Map<Set<M>, Integer> Limited;
+
+        private SchematicConfig(YMLWrapper<M, ?> loader) {
+            loaded = loader.canLoad();
+            Size = new SizeConfig(loader.with("Size"));
+            Inset = new InsetConfig(loader.with("Inset"));
+            Type = loader.getSchematicType("Type", "Normal");
+            SubTypes = loader.getSchematicTypeList("SubTypes");
+            Shortcut = loader.getString("Shortcut", "");
+            Material = loader.getMaterial("Material", "STONE_BUTTON");
+            ManualCheck = loader.getBoolean("ManualCheck", true);
+            Rotate = loader.getBoolean("Rotate", true);
+            PasteAligned = loader.getBoolean("PasteAligned", false);
+            OnlyPublicSchematics = loader.getBoolean("OnlyPublicSchematics", false);
+            IgnorePublicOnly = loader.getBoolean("IgnorePublicOnly", false);
+            ReplaceObsidianBedrock = loader.getBoolean("ReplaceObsidianBedrock", false);
+            ReplaceWithBlockupdates = loader.getBoolean("ReplaceWithBlockupdates", false);
+            UnlimitedPrepare = loader.getBoolean("UnlimitedPrepare", false);
+            MaxBlocks = loader.getInt("MaxBlocks", 0);
+            MaxDispenserItems = loader.getInt("MaxDispenserItems", 128);
+            MaxDesignBlastResistance = loader.getDouble("MaxDesignBlastResistance", Double.MAX_VALUE);
+
+            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"));
+                if (amount == 0) {
+                    materials.forEach(material -> {
+                        Limited.put(Collections.singleton(loader.materialMapper.apply(material.toUpperCase())), 0);
+                    });
+                } else {
+                    Limited.put(Collections.unmodifiableSet(materials.stream().map(String::toUpperCase).map(loader.materialMapper).collect(Collectors.toSet())), amount);
+                }
+            }
+            this.Limited = Collections.unmodifiableMap(Limited);
+        }
+
+        @ToString
+        public static final class SizeConfig {
+
+            public final boolean loaded;
+
+            /**
+             * @implSpec {@code 0} by default
+             */
+            public final int x;
+
+            /**
+             * @implSpec {@code 0} by default
+             */
+            public final int y;
+
+            /**
+             * @implSpec {@code 0} by default
+             */
+            public final int z;
+
+            private SizeConfig(YMLWrapper loader) {
+                loaded = loader.canLoad();
+                x = loader.getInt("x", 0);
+                y = loader.getInt("y", 0);
+                z = loader.getInt("z", 0);
+            }
+        }
+
+        @ToString
+        public static final class InsetConfig {
+
+            public final boolean loaded;
+
+            /**
+             * @implSpec {@code 0} by default
+             */
+            public final int x;
+
+            /**
+             * @implSpec {@code 0} by default
+             */
+            public final int z;
+
+            /**
+             * @implSpec {@code 0} by default
+             */
+            public final int top;
+
+            /**
+             * @implSpec {@code 0} by default
+             */
+            public final int bottom;
+
+            private InsetConfig(YMLWrapper loader) {
+                loaded = loader.canLoad();
+                x = loader.getInt("x", 0);
+                z = loader.getInt("z", 0);
+                top = loader.getInt("top", 0);
+                bottom = loader.getInt("bottom", 0);
+            }
+        }
+    }
+
+    @ToString
+    public static final class BlueConfig {
+
+        public final boolean loaded;
+
+        /**
+         * @implSpec {@code Blau} by default
+         */
+        public final String Name;
+
+        /**
+         * @implSpec {@code §3} by default
+         */
+        public final String Prefix;
+
+        private BlueConfig(YMLWrapper loader) {
+            loaded = loader.canLoad();
+            Name = loader.getString("Name", "Blau");
+            Prefix = loader.getString("Prefix", "§3");
+        }
+    }
+
+    @ToString
+    public static final class RedConfig {
+
+        public final boolean loaded;
+
+        /**
+         * @implSpec {@code Rot} by default
+         */
+        public final String Name;
+
+        /**
+         * @implSpec {@code §c} by default
+         */
+        public final String Prefix;
+
+        private RedConfig(YMLWrapper loader) {
+            loaded = loader.canLoad();
+            Name = loader.getString("Name", "Rot");
+            Prefix = loader.getString("Prefix", "§c");
+        }
+    }
+
+    @ToString
+    public static final class WinConditionParamsConfig<M> {
+
+        public final boolean loaded;
+
+        /**
+         * The time of any of the timeout win conditions in seconds
+         *
+         * @implSpec {@code 1200} by default
+         */
+        public final int TimeoutTime;
+
+        /**
+         * The percentage when any of the percent win conditions limits or triggers a win
+         *
+         * @implSpec {@code 7.0} by default
+         */
+        public final double PercentWin;
+
+        /**
+         * Does the percentage still change after the start of the enter phase
+         *
+         * @implSpec {@code true} by default
+         */
+        public final boolean PercentEntern;
+
+        /**
+         * Is Blocks a whitelist (true) or blacklist (false)
+         *
+         * @implSpec {@code false} by default
+         */
+        public final boolean BlocksWhitelist;
+
+        /**
+         * Special Blocks (Valid spigot material values) used by the percent win conditions
+         */
+        public final List<M> Blocks;
+
+        /**
+         * Time for being declared TechKo without a shot given.
+         *
+         * @implSpec {@code 90} by default
+         */
+        public final int TechKoTime;
+
+        private WinConditionParamsConfig(YMLWrapper<M, ?> loader) {
+            loaded = loader.canLoad();
+            TimeoutTime = loader.getInt("TimeoutTime", 1200);
+            PercentWin = loader.getDouble("PercentWin", 7.0);
+            PercentEntern = loader.getBoolean("PercentEntern", true);
+            BlocksWhitelist = loader.getBoolean("BlocksWhitelist", false);
+            Blocks = loader.getMaterialList("Blocks");
+            TechKoTime = loader.getInt("TechKoTime", 90);
+        }
+    }
+
+    @ToString
+    public static final class KitsConfig<M> {
+
+        public final boolean loaded;
+
+        /**
+         * The kit file for this configuration
+         *
+         * @implSpec {@code kits.yml} by default
+         */
+        public final String File;
+
+        /**
+         * The default kit for team members
+         *
+         * @implSpec {@code default} by default
+         */
+        public final String MemberDefault;
+
+        /**
+         * The default kit for team leaders
+         *
+         * @implSpec {@code default} by default
+         */
+        public final String LeaderDefault;
+
+        /**
+         * If the personal kit system is active
+         *
+         * @implSpec {@code false} by default
+         */
+        public final boolean PersonalKits;
+
+        /**
+         * Items (Valid spigot material values) that are not allowed in the personal kit
+         */
+        public final List<M> ForbiddenItems;
+
+        private KitsConfig(YMLWrapper<M, ?> loader) {
+            loaded = loader.canLoad();
+            File = loader.getString("File", "kits.yml");
+            MemberDefault = loader.getString("MemberDefault", "default");
+            LeaderDefault = loader.getString("LeaderDefault", "default");
+            PersonalKits = loader.getBoolean("PersonalKits", false);
+            ForbiddenItems = loader.getMaterialList("ForbiddenItems");
+        }
+    }
+
+    @ToString
+    public static final class TechhiderConfig<M> {
+
+        public final boolean loaded;
+
+        /**
+         * Activates the tech hider
+         *
+         * @implSpec {@code false} by default
+         */
+        public final boolean Active;
+
+        /**
+         * Which block the tech hider replaces to.
+         *
+         * @implSpec {@code end_stone} by default
+         */
+        public final M ObfuscateWith;
+
+        /**
+         * A list of all hidden blocks. "water" results in the hiding of all waterlogged blocks as well.
+         */
+        public final Set<M> HiddenBlocks;
+
+        /**
+         * The block entity contents that are hidden (here with minecraft:nametag)
+         */
+        public final Set<String> HiddenBlockEntities;
+
+        private TechhiderConfig(YMLWrapper<M, ?> loader) {
+            loaded = loader.canLoad();
+            Active = loader.getBoolean("Active", false);
+            ObfuscateWith = loader.getMaterial("ObfuscateWith", "end_stone");
+            HiddenBlocks = Collections.unmodifiableSet(new HashSet<>(loader.getMaterialList("HiddenBlocks")));
+            HiddenBlockEntities = Collections.unmodifiableSet(new HashSet<>(loader.getStringList("HiddenBlockEntities")));
+        }
+    }
+
+    public boolean isAfterDeadline() {
+        return Deadline != null && Deadline.before(Date.from(Instant.now()));
+    }
+
+    public String hasMap(String map) {
+        for (String m : Server.Maps) {
+            if (m.equalsIgnoreCase(map))
+                return m;
+        }
+        return null;
+    }
+
+    public String getRandomMap() {
+        return Server.Maps.get(random.nextInt(Server.Maps.size()));
+    }
+
+    public String convertToRealMapName(String map) {
+        for (String m : Server.Maps) {
+            if (m.equalsIgnoreCase(map))
+                return m;
+        }
+        return null;
+    }
+
+    public String getChatName() {
+        return Server.ChatNames.get(0);
+    }
+
+    public boolean isActive() {
+        if (Server.ChatNames.isEmpty()) return false;
+        if (ActiveMonths.isEmpty()) return true;
+        return ActiveMonths.contains(LocalDateTime.now().getMonth().getValue());
+    }
+
+    public String getSchemTypeOrInternalName() {
+        if (Schematic.loaded) {
+            return Schematic.Type.toDB();
+        }
+        return configFile.getName().replace(".yml", "");
+    }
+}

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

@@ -21,13 +21,17 @@ package de.steamwar.sql;
 
 import de.steamwar.ImplementationProvider;
 
-import java.util.List;
-import java.util.Map;
+import java.io.File;
 
-public interface SQLWrapper {
-    SQLWrapper impl = ImplementationProvider.getImpl("de.steamwar.sql.SQLWrapperImpl");
+public interface SQLWrapper<M> {
+    SQLWrapper<?> impl = ImplementationProvider.getImpl("de.steamwar.sql.SQLWrapperImpl");
 
-    void loadSchemTypes(List<SchematicType> tmpTypes, Map<String, SchematicType> tmpFromDB);
+    File getSchemTypesFolder();
+
+    GameModeConfig<M, String> loadGameModeConfig(File file);
+
+    default void processSchematicType(GameModeConfig<?, String> gameModeConfig) {
+    }
 
     void additionalExceptionMetadata(StringBuilder builder);
 }

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

@@ -22,7 +22,9 @@ package de.steamwar.sql;
 import de.steamwar.sql.internal.SqlTypeMapper;
 import lombok.Getter;
 
+import java.io.File;
 import java.util.*;
+import java.util.stream.Collectors;
 
 public class SchematicType {
 
@@ -38,7 +40,23 @@ public class SchematicType {
 		tmpTypes.add(Normal);
 		tmpFromDB.put(Normal.name().toLowerCase(), Normal);
 
-		SQLWrapper.impl.loadSchemTypes(tmpTypes, tmpFromDB);
+        File folder = SQLWrapper.impl.getSchemTypesFolder();
+        if (folder.exists()) {
+            for (File configFile : Arrays.stream(folder.listFiles((file, name) -> name.endsWith(".yml") && !name.endsWith(".kits.yml"))).sorted().collect(Collectors.toList())) {
+                GameModeConfig<?, String> gameModeConfig = SQLWrapper.impl.loadGameModeConfig(configFile);
+                if (gameModeConfig.Schematic.Type == null) continue;
+                if (tmpFromDB.containsKey(gameModeConfig.Schematic.Type.toDB())) continue;
+                SchematicType current = gameModeConfig.Schematic.Type;
+                if (!gameModeConfig.CheckQuestions.isEmpty()) {
+                    SchematicType checkType = current.checkType;
+                    tmpTypes.add(checkType);
+                    tmpFromDB.put(checkType.toDB(), checkType);
+                }
+                tmpTypes.add(current);
+                tmpFromDB.put(current.toDB(), current);
+                SQLWrapper.impl.processSchematicType(gameModeConfig);
+            }
+        }
 
 		fromDB = Collections.unmodifiableMap(tmpFromDB);
 		types = Collections.unmodifiableList(tmpTypes);
@@ -109,6 +127,7 @@ public class SchematicType {
 	}
 
 	public static SchematicType fromDB(String input) {
+        if (fromDB == null) return null;
 		return fromDB.get(input.toLowerCase());
 	}
 

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

@@ -0,0 +1,163 @@
+/*
+ *   This file is a part of the SteamWar software.
+ *
+ *   Copyright (C) 2025 SteamWar.de-Serverteam
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU Affero General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU Affero General Public License for more details.
+ *
+ *   You should have received a copy of the GNU Affero General Public License
+ *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package de.steamwar.sql;
+
+import org.yaml.snakeyaml.Yaml;
+
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+final class YMLWrapper<M, W> {
+
+    final Function<String, M> materialMapper;
+    final Function<String, W> winconditionMapper;
+
+    private final boolean canLoad;
+    private final Map<String, Object> document;
+
+    YMLWrapper(File file, Function<String, M> materialMapper, Function<String, W> winconditionMapper) {
+        this.materialMapper = materialMapper;
+        this.winconditionMapper = winconditionMapper;
+
+        Yaml yaml = new Yaml();
+        Map<String, Object> document = Collections.emptyMap();
+        boolean canLoad = false;
+        if (file != null && file.exists() && file.isFile()) {
+            try {
+                document = yaml.load(new FileReader(file));
+                canLoad = true;
+            } catch (IOException e) {
+                // Ignore
+            }
+        }
+        this.document = document;
+        this.canLoad = canLoad;
+    }
+
+    private YMLWrapper(boolean canLoad, Map<String, Object> document, Function<String, M> materialMapper, Function<String, W> winconditionMapper) {
+        this.materialMapper = materialMapper;
+        this.winconditionMapper = winconditionMapper;
+        this.canLoad = canLoad;
+        this.document = document;
+    }
+
+    public boolean canLoad() {
+        return canLoad;
+    }
+
+    public YMLWrapper<M, W> with(String path) {
+        if (document.containsKey(path)) {
+            Object value = document.get(path);
+            if (value instanceof Map) {
+                return new YMLWrapper<>(true, (Map) value, materialMapper, winconditionMapper);
+            }
+        }
+        return new YMLWrapper<>(false, Collections.emptyMap(), materialMapper, winconditionMapper);
+    }
+
+    public <T> T get(String path, T defaultValue, Function<Object, T> mapper) {
+        Object value = this.document.get(path);
+        if (value == null) return defaultValue;
+        try {
+            T mapped = mapper.apply(value);
+            if (mapped != null) return mapped;
+        } catch (ClassCastException e) {
+            // Ignore exception
+        }
+        return defaultValue;
+    }
+
+    public String getString(String path, String defaultValue) {
+        return get(path, defaultValue, Objects::toString);
+    }
+
+    public int getInt(String path, int defaultValue) {
+        return get(path, defaultValue, Integer.class::cast);
+    }
+
+    public double getDouble(String path, double defaultValue) {
+        return get(path, defaultValue, Double.class::cast);
+    }
+
+    public boolean getBoolean(String path, boolean defaultValue) {
+        return get(path, defaultValue, Boolean.class::cast);
+    }
+
+    public SchematicType getSchematicType(String path, String defaultValue) {
+        String schematicType = getString(path, defaultValue);
+        return SchematicType.fromDB(schematicType);
+    }
+
+    public M getMaterial(String path, String defaultValue) {
+        return materialMapper.apply(getString(path, defaultValue).toUpperCase());
+    }
+
+    public <T> List<T> get(String path, Function<Object, List<T>> mapper) {
+        Object value = this.document.get(path);
+        if (value == null) return Collections.emptyList();
+        try {
+            return Collections.unmodifiableList(mapper.apply(value));
+        } catch (ClassCastException e) {
+            return Collections.emptyList();
+        }
+    }
+
+    public List<String> getStringList(String path) {
+        return get(path, o -> (List<String>) o);
+    }
+
+    public List<Integer> getIntList(String path) {
+        return get(path, o -> (List<Integer>) o);
+    }
+
+    public List<SchematicType> getSchematicTypeList(String path) {
+        List<String> list = getStringList(path);
+        if (list.isEmpty()) {
+            return Collections.emptyList();
+        } else {
+            return Collections.unmodifiableList(list.stream().map(SchematicType::fromDB).collect(Collectors.toList()));
+        }
+    }
+
+    public List<M> getMaterialList(String path) {
+        List<String> list = getStringList(path);
+        if (list.isEmpty()) {
+            return Collections.emptyList();
+        } else {
+            return Collections.unmodifiableList(list.stream().map(String::toUpperCase).map(materialMapper).collect(Collectors.toList()));
+        }
+    }
+
+    public List<Map<?, ?>> getMapList(String path) {
+        Object value = this.document.get(path);
+        if (value instanceof List) {
+            return Collections.unmodifiableList((List<Map<?, ?>>) value);
+        } else {
+            return Collections.emptyList();
+        }
+    }
+}

FightSystem/FightSystem_Core/src/config.yml

@@ -12,11 +12,11 @@ Server:
   # If ranked matches should be available for the game mode
   Ranked: false # defaults to false if missing
 
-# The questions that have to be answered to accept the schematic
-CheckQuestions: [] # Disables check schem type if missing  
+# Submission deadline for schematics in 'dd.MM.yyyy HH:mm' format
+Deadline: null # defaults to null if missing
 
-# The available schematic ranks
-Ranks: [] # Disables ranks for this schematic type if missing
+# The questions that have to be answered to accept the schematic
+CheckQuestions: [] # Disables check schem type if missing
 
 Times:
   # Time in seconds the server stops after starting if nobody joins
@@ -52,6 +52,8 @@ Arena:
   Leaveable: false # defaults to false if missing
   # Allow missiles to fly to the enemy and not stop at the schem border.
   AllowMissiles: false # defaults to true if EnterStages are present otherwise 'false'
+  # Denotes that there is no floor for this GameMode
+  NoFloor: false # defaults to false if missing
 
 Schematic:
   # The size of the schematics
@@ -59,6 +61,12 @@ Schematic:
     x: 0
     y: 0
     z: 0
+  # Used for GameModes with a technic area
+  Inset:
+    x: 0
+    z: 0
+    top: 0
+    bottom: 0
   # The schematic type that can be chosen in this arena
   Type: Normal # defaults to Normal if missing
   # The schematic types that are also allowed to be chosen in this arena
@@ -87,6 +95,8 @@ Schematic:
   MaxBlocks: 0 # defaults to 0 (ignored) if missing
   # Maximal amount of items per dispenser
   MaxDispenserItems: 128 # defaults to 128 if missing
+  # Maximal blast resistance for the design blocks
+  MaxDesignBlastResistance: 100000000 # defaults to Double.MAX_VALUE if missing
   # List of limited material (combinations)
   # List contains tags Amount (integer) and Materials (List of material names in Spigot 1.12 AND Spigot 1.15 format)
   Limited:
@@ -95,6 +105,9 @@ Schematic:
 
 # The name of the game mode presented to the players
 GameName: WarGear # defaults to WarGear if missing
+# The months this game mode should be active and playable
+# The empty List means all of them
+ActiveMonths: [] # defaults to none if missing
 # The prefix used for team chats
 TeamChatPrefix: + # defaults to + if missing
 Blue:
@@ -137,6 +150,8 @@ WinConditionParams:
   BlocksWhitelist: false # defaults to false if missing
   # Special Blocks (Valid spigot material values) used by the percent win conditions
   Blocks: [] # defaults to none if missing
+  # Time for being declared TechKo without a shot given.
+  TechKoTime: 90 # defaults to 90 if missing
 
 Kits:
   # The kit file for this configuration

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/Config.java

@@ -19,6 +19,8 @@
 
 package de.steamwar.fightsystem;
 
+import de.steamwar.sql.GameModeConfig;
+import de.steamwar.data.GameModeConfigUtils;
 import de.steamwar.fightsystem.utils.Region;
 import de.steamwar.fightsystem.winconditions.Winconditions;
 import de.steamwar.sql.*;
@@ -32,9 +34,10 @@ import org.bukkit.entity.Player;
 import org.bukkit.util.Vector;
 
 import java.io.File;
-import java.util.*;
+import java.util.Collections;
+import java.util.Set;
+import java.util.UUID;
 import java.util.logging.Level;
-import java.util.stream.Collectors;
 
 public class Config {
 
@@ -42,15 +45,7 @@ public class Config {
 
     public static final World world = Bukkit.getWorlds().get(0);
 
-    //Fight sequence
-    public static final int NoPlayerOnlineDuration;
-    public static final int PreSchemPasteDuration;
-    public static final int SetupDuration;
-    public static final int PreFightDuration;
-    public static final int SpectatorDuration;
-
-    // entern parameter
-    public static final List<Integer> EnterStages;
+    public static final GameModeConfig<Material, Winconditions> GameModeConfig;
 
     //arena parameter
     public static final Region BluePasteRegion;
@@ -69,60 +64,20 @@ public class Config {
     private static final int BlueToRedY;
     public static final int BlueToRedZ;
 
-    public static final int PreperationArea;
-    public static final int WaterDepth;
-    public static final boolean GroundWalkable;
-    public static final boolean DisableSnowMelt;
-    public static final boolean ArenaLeaveable;
-    public static final boolean AllowMissiles;
-
     //schematic parameter
-    public static final boolean RanksEnabled;
     public static final boolean OnlyPublicSchematics;
-    public static final boolean IgnorePublicOnly;
-    public static final de.steamwar.sql.SchematicType SchematicType;
-    public static final List<de.steamwar.sql.SchematicType> SubTypes;
+
     public static final boolean RedRotate;
     public static final boolean BlueRotate;
-    public static final boolean PasteAligned;
-    public static final boolean ReplaceObsidianBedrock;
-    public static final boolean ReplaceWithBlockupdates;
-    public static final boolean UnlimitedPrepare;
 
     //team parameter
     public static final String TeamRedName;
     public static final String TeamBlueName;
     public static final String TeamRedColor;
     public static final String TeamBlueColor;
-    public static final String GameName;
-    public static final String TeamChatDetection;
     public static final UUID BlueLeader;
     public static final UUID RedLeader;
 
-    //Active win conditions
-    public static final Set<Winconditions> ActiveWinconditions;
-
-    //win condition parameters
-    public static final int TimeoutTime;
-    public static final double PercentWin;
-    public static final boolean PercentEntern;
-    public static final boolean PercentBlocksWhitelist;
-    public static final Set<Material> PercentBlocks;
-    public static final int TechKoTime;
-
-    //default kits
-    public static final String MemberDefault;
-    public static final String LeaderDefault;
-    public static final boolean PersonalKits;
-    public static final Set<Material> ForbiddenItems;
-    public static final String KitFile;
-
-    //tech hider parameter
-    public static final boolean TechhiderActive;
-    public static final Set<Material> HiddenBlocks;
-    public static final Set<String> HiddenBlockEntities;
-    public static final Material ObfuscateWith;
-
     //event parameter
     public static final EventFight EventKampf;
     private static final Set<Integer> Referees;
@@ -154,7 +109,7 @@ public class Config {
             Bukkit.getLogger().log(Level.SEVERE, "Arenaconfig fehlt!");
             Bukkit.shutdown();
         }
-        FileConfiguration config = YamlConfiguration.loadConfiguration(new File(FightSystem.getPlugin().getDataFolder(), configFile));
+        GameModeConfig = new GameModeConfig<>(new File(FightSystem.getPlugin().getDataFolder(), configFile), GameModeConfigUtils.ToMaterial, Winconditions::valueOf, de.steamwar.sql.GameModeConfig.ToStaticWarGear, false);
 
         File worldConfigFile = new File(world.getWorldFolder(), "config.yml");
         if(!worldConfigFile.exists()) {
@@ -163,111 +118,37 @@ public class Config {
         }
         FileConfiguration worldconfig = YamlConfiguration.loadConfiguration(worldConfigFile);
 
-        NoPlayerOnlineDuration = config.getInt("Times.NoPlayersOnlineDuration", 300);
-        PreSchemPasteDuration = config.getInt("Times.PreSchemPasteDuration", 120);
-        SetupDuration = config.getInt("Times.SetupDuration", 300);
-        PreFightDuration = config.getInt("Times.PreFightDuration", 30);
-        SpectatorDuration = config.getInt("Times.SpectatorDuration", 30);
-
         int blueCornerX = worldconfig.getInt("BlueCorner.x");
         int blueCornerY = worldconfig.getInt("BlueCorner.y");
         int blueCornerZ = worldconfig.getInt("BlueCorner.z");
         int underBorder = worldconfig.getInt("UnderBorder", blueCornerY);
 
-        WaterDepth = config.getInt("Arena.WaterDepth", 0);
-        int schem2BorderX = config.getInt("Arena.Schem2Border.x", 24);
-        int schem2BorderZ = config.getInt("Arena.Schem2Border.z", 24);
-        PreperationArea = config.getInt("Arena.BorderFromSchematic", 12);
-        GroundWalkable = config.getBoolean("Arena.GroundWalkable", true);
-        DisableSnowMelt = config.getBoolean("Arena.DisableSnowMelt", false);
-        ArenaLeaveable = config.getBoolean("Arena.Leaveable", false);
-
-        int schemsizeX = config.getInt("Schematic.Size.x");
-        int schemsizeY = config.getInt("Schematic.Size.y");
-        int schemsizeZ = config.getInt("Schematic.Size.z");
-        RanksEnabled = !config.getStringList("Ranks").isEmpty();
-        SchematicType = de.steamwar.sql.SchematicType.fromDB(Objects.requireNonNull(config.getString("Schematic.Type", "normal")));
-        SubTypes = config.getStringList("Schematic.SubTypes").stream().map(de.steamwar.sql.SchematicType::fromDB).collect(Collectors.toList());
-        IgnorePublicOnly = config.getBoolean("Schematic.IgnorePublicOnly", false);
-        boolean rotate = config.getBoolean("Schematic.Rotate", true);
-        PasteAligned = config.getBoolean("Schematic.PasteAligned", false);
-        ReplaceObsidianBedrock = config.getBoolean("Schematic.ReplaceObsidianBedrock", false);
-        ReplaceWithBlockupdates = config.getBoolean("Schematic.ReplaceWithBlockupdates", false);
-        UnlimitedPrepare = config.getBoolean("Schematic.UnlimitedPrepare", false);
-
-        int schemInsetX = config.getInt("Schematic.Inset.x", 0);
-        int schemInsetZ = config.getInt("Schematic.Inset.z", 0);
-        int schemInsetBottom = config.getInt("Schematic.Inset.bottom", 0);
-        int schemInsetTop = config.getInt("Schematic.Inset.top", 0);
-
-        GameName = config.getString("GameName", "WarGear");
-        TeamChatDetection = config.getString("TeamChatPrefix", "+");
-
-        ActiveWinconditions = Collections.unmodifiableSet(config.getStringList("WinConditions").stream().map(Winconditions::valueOf).collect(Collectors.toSet()));
-
-        TimeoutTime = config.getInt("WinConditionParams.TimeoutTime", 1200);
-        PercentWin = config.getDouble("WinConditionParams.PercentWin", 7.0);
-        PercentEntern = config.getBoolean("WinConditionParams.PercentEntern", true);
-        PercentBlocksWhitelist = config.getBoolean("WinConditionParams.BlocksWhitelist", false);
-        PercentBlocks = Collections.unmodifiableSet(config.getStringList("WinConditionParams.Blocks").stream().map(Material::valueOf).collect(Collectors.toSet()));
-        TechKoTime = config.getInt("WinConditionParams.TechKoTime", 90);
-
-        EnterStages = Collections.unmodifiableList(config.getIntegerList("EnterStages"));
-        AllowMissiles = config.getBoolean("Arena.AllowMissiles", !EnterStages.isEmpty());
-
-        KitFile = config.getString("Kits.File", "kits.yml");
-        MemberDefault = config.getString("Kits.MemberDefault", "default");
-        LeaderDefault = config.getString("Kits.LeaderDefault", "default");
-        PersonalKits = config.getBoolean("Kits.PersonalKits", false);
-        ForbiddenItems = Collections.unmodifiableSet(config.getStringList("Kits.ForbiddenItems").stream().map(Material::valueOf).collect(Collectors.toSet()));
-
-        TechhiderActive = config.getBoolean("Techhider.Active", false);
-        ObfuscateWith = Material.getMaterial(config.getString("Techhider.ObfuscateWith", "end_stone").toUpperCase());
-        HiddenBlocks = config.getStringList("Techhider.HiddenBlocks").stream().map(String::toUpperCase).map(Material::getMaterial).collect(Collectors.toSet());
-        HiddenBlockEntities = Collections.unmodifiableSet(new HashSet<>(config.getStringList("Techhider.HiddenBlockEntities")));
-
-        if(schemsizeX < 0){
-            schemsizeX = -schemsizeX;
-            blueCornerX = blueCornerX - schemsizeX;
-        }
-        if(schemsizeY < 0){
-            schemsizeY = -schemsizeY;
-            blueCornerY = blueCornerY - schemsizeY;
-        }
-        if(schemsizeZ < 0){
-            schemsizeZ = -schemsizeZ;
-            blueCornerZ = blueCornerZ - schemsizeZ;
-        }
-
         BlueToRedX = worldconfig.getInt("BlueToRed.x", 0);
         BlueToRedY = worldconfig.getInt("BlueToRed.y", 0);
-        BlueToRedZ = worldconfig.getInt("BlueToRed.z", schemsizeZ + 50);
-        double teamBlueSpawnOffsetX = config.getDouble("Arena.SpawnOffset.x", 0);
-        double teamBlueSpawnOffsetY = config.getDouble("Arena.SpawnOffset.y", schemsizeY);
-        double teamBlueSpawnOffsetZ = config.getDouble("Arena.SpawnOffset.z", 0);
+        BlueToRedZ = worldconfig.getInt("BlueToRed.z", GameModeConfig.Schematic.Size.z + 50);
 
         int teamRedCornerX = BlueToRedX + blueCornerX;
         int teamRedCornerY = BlueToRedY + blueCornerY;
         int teamRedCornerZ = BlueToRedZ + blueCornerZ;
 
-        int teamBluePasteX = blueCornerX + schemsizeX / 2;
-        int teamBluePasteZ = blueCornerZ + schemsizeZ / 2;
+        int teamBluePasteX = blueCornerX + GameModeConfig.Schematic.Size.x / 2;
+        int teamBluePasteZ = blueCornerZ + GameModeConfig.Schematic.Size.z / 2;
         int teamRedPasteX = teamBluePasteX + BlueToRedX;
         int teamRedPasteZ = teamBluePasteZ + BlueToRedZ;
 
         TeamBlueSpawn = new Location(world,
-                teamBluePasteX + 0.5 + teamBlueSpawnOffsetX,
-                blueCornerY + 0.5 + teamBlueSpawnOffsetY,
-                teamBluePasteZ + 0.5 + teamBlueSpawnOffsetZ);
+                teamBluePasteX + 0.5 + GameModeConfig.Arena.SpawnOffset.x,
+                blueCornerY + 0.5 + GameModeConfig.Arena.SpawnOffset.y,
+                teamBluePasteZ + 0.5 + GameModeConfig.Arena.SpawnOffset.z);
 
         TeamRedSpawn = new Location(world,
-                teamRedPasteX + 0.5 - teamBlueSpawnOffsetX,
-                teamRedCornerY + 0.5 + teamBlueSpawnOffsetY,
-                teamRedPasteZ + 0.5 - teamBlueSpawnOffsetZ);
+                teamRedPasteX + 0.5 - GameModeConfig.Arena.SpawnOffset.x,
+                teamRedCornerY + 0.5 + GameModeConfig.Arena.SpawnOffset.y,
+                teamRedPasteZ + 0.5 - GameModeConfig.Arena.SpawnOffset.z);
 
         SpecSpawn = new Location(world,
                 teamBluePasteX + BlueToRedX /2.0,
-                blueCornerY + BlueToRedY /2.0 + schemsizeY/2.0,
+                blueCornerY + BlueToRedY /2.0 + GameModeConfig.Schematic.Size.y/2.0,
                 teamBluePasteZ + BlueToRedZ /2.0);
 
         Vector v1 = TeamBlueSpawn.toVector().subtract(TeamRedSpawn.toVector());
@@ -288,45 +169,45 @@ public class Config {
         int arenaMinZ;
         int arenaMaxZ;
         if(BlueToRedX > 0){
-            arenaMinX = blueCornerX - schem2BorderX;
-            arenaMaxX = teamRedCornerX + schemsizeX + schem2BorderX;
+            arenaMinX = blueCornerX - GameModeConfig.Arena.Schem2Border.x;
+            arenaMaxX = teamRedCornerX + GameModeConfig.Schematic.Size.x + GameModeConfig.Arena.Schem2Border.x;
             teamRedRotate = true;
             teamBlueRotate = false;
         }else{
-            arenaMinX = teamRedCornerX - schem2BorderX;
-            arenaMaxX = blueCornerX + schemsizeX + schem2BorderX;
+            arenaMinX = teamRedCornerX - GameModeConfig.Arena.Schem2Border.x;
+            arenaMaxX = blueCornerX + GameModeConfig.Schematic.Size.x + GameModeConfig.Arena.Schem2Border.x;
             teamRedRotate = false;
             teamBlueRotate = true;
         }
         if(BlueToRedZ > 0){
-            arenaMinZ = blueCornerZ - schem2BorderZ;
-            arenaMaxZ = teamRedCornerZ + schemsizeZ + schem2BorderZ;
+            arenaMinZ = blueCornerZ - GameModeConfig.Arena.Schem2Border.z;
+            arenaMaxZ = teamRedCornerZ + GameModeConfig.Schematic.Size.z + GameModeConfig.Arena.Schem2Border.z;
             teamRedRotate = true;
             teamBlueRotate = false;
         }else{
-            arenaMinZ = teamRedCornerZ - schem2BorderZ;
-            arenaMaxZ = blueCornerZ + schemsizeZ + schem2BorderZ;
+            arenaMinZ = teamRedCornerZ - GameModeConfig.Arena.Schem2Border.z;
+            arenaMaxZ = blueCornerZ + GameModeConfig.Schematic.Size.z + GameModeConfig.Arena.Schem2Border.z;
             if(BlueToRedZ != 0){
                 teamRedRotate = false;
                 teamBlueRotate = true;
             }
         }
-        if(!rotate){
+        if(!GameModeConfig.Schematic.Rotate){
             teamRedRotate = false;
             teamBlueRotate = false;
         }
         RedRotate = teamRedRotate;
         BlueRotate = teamBlueRotate;
 
-        RedPasteRegion = Region.fromSize(teamRedCornerX, teamRedCornerY, teamRedCornerZ, schemsizeX, schemsizeY, schemsizeZ);
-        BluePasteRegion = Region.fromSize(blueCornerX, blueCornerY, blueCornerZ, schemsizeX, schemsizeY, schemsizeZ);
+        RedPasteRegion = Region.fromSize(teamRedCornerX, teamRedCornerY, teamRedCornerZ, GameModeConfig.Schematic.Size.x, GameModeConfig.Schematic.Size.y, GameModeConfig.Schematic.Size.z);
+        BluePasteRegion = Region.fromSize(blueCornerX, blueCornerY, blueCornerZ, GameModeConfig.Schematic.Size.x, GameModeConfig.Schematic.Size.y, GameModeConfig.Schematic.Size.z);
 
-        RedExtendRegion = Region.withExtension(teamRedCornerX, teamRedCornerY, teamRedCornerZ, schemsizeX, schemsizeY, schemsizeZ, PreperationArea, PreperationArea, PreperationArea);
-        BlueExtendRegion = Region.withExtension(blueCornerX, blueCornerY, blueCornerZ, schemsizeX, schemsizeY, schemsizeZ, PreperationArea, PreperationArea, PreperationArea);
-        ArenaRegion = Region.withExtension(arenaMinX, blueCornerY, arenaMinZ, arenaMaxX - arenaMinX, schemsizeY, arenaMaxZ - arenaMinZ, 0, PreperationArea, 0);
+        RedExtendRegion = Region.withExtension(teamRedCornerX, teamRedCornerY, teamRedCornerZ, GameModeConfig.Schematic.Size.x, GameModeConfig.Schematic.Size.y, GameModeConfig.Schematic.Size.z, GameModeConfig.Arena.BorderFromSchematic, GameModeConfig.Arena.BorderFromSchematic, GameModeConfig.Arena.BorderFromSchematic);
+        BlueExtendRegion = Region.withExtension(blueCornerX, blueCornerY, blueCornerZ, GameModeConfig.Schematic.Size.x, GameModeConfig.Schematic.Size.y, GameModeConfig.Schematic.Size.z, GameModeConfig.Arena.BorderFromSchematic, GameModeConfig.Arena.BorderFromSchematic, GameModeConfig.Arena.BorderFromSchematic);
+        ArenaRegion = Region.withExtension(arenaMinX, blueCornerY, arenaMinZ, arenaMaxX - arenaMinX, GameModeConfig.Schematic.Size.y, arenaMaxZ - arenaMinZ, 0, GameModeConfig.Arena.BorderFromSchematic, 0);
         PlayerRegion = new Region(arenaMinX, underBorder, arenaMinZ, arenaMaxX, world.getMaxHeight(), arenaMaxZ);
 
-        BlueInsetRegion = new Region(BluePasteRegion.getMinX() + schemInsetX, BluePasteRegion.getMinY() + schemInsetBottom, BluePasteRegion.getMinZ() + schemInsetZ, BluePasteRegion.getMaxX() - schemInsetX, BluePasteRegion.getMaxY() - schemInsetTop, BluePasteRegion.getMaxZ() - schemInsetZ);
+        BlueInsetRegion = new Region(BluePasteRegion.getMinX() + GameModeConfig.Schematic.Inset.x, BluePasteRegion.getMinY() + GameModeConfig.Schematic.Inset.bottom, BluePasteRegion.getMinZ() + GameModeConfig.Schematic.Inset.z, BluePasteRegion.getMaxX() - GameModeConfig.Schematic.Inset.x, BluePasteRegion.getMaxY() - GameModeConfig.Schematic.Inset.top, BluePasteRegion.getMaxZ() - GameModeConfig.Schematic.Inset.z);
 
         int eventKampfID = Integer.parseInt(System.getProperty("fightID", "0"));
         if(eventKampfID >= 1){
@@ -368,11 +249,11 @@ public class Config {
             }
         }else{
             //No event
-            TeamRedColor = config.getString("Red.Prefix", "§c");
-            TeamBlueColor = config.getString("Blue.Prefix", "§9");
-            TeamRedName = config.getString("Red.Name", "Rot");
-            TeamBlueName = config.getString("Blue.Name", "Blau");
-            OnlyPublicSchematics = config.getBoolean("Schematic.OnlyPublicSchematics", false);
+            TeamRedColor = GameModeConfig.Red.Prefix;
+            TeamBlueColor = GameModeConfig.Blue.Prefix;
+            TeamRedName = GameModeConfig.Red.Name;
+            TeamBlueName = GameModeConfig.Blue.Name;
+            OnlyPublicSchematics = GameModeConfig.Schematic.OnlyPublicSchematics;
             EventTeamBlueID = 0;
             EventTeamRedID = 0;
             EventKampf = null;

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/ai/DummyAI.java

@@ -43,7 +43,7 @@ public class DummyAI extends AI {
 
     @Override
     public SchematicNode chooseSchematic() {
-        List<SchematicNode> publics = SchematicNode.getAllSchematicsOfType(0, Config.SchematicType.toDB());
+        List<SchematicNode> publics = SchematicNode.getAllSchematicsOfType(0, Config.GameModeConfig.Schematic.Type.toDB());
         return publics.get(random.nextInt(publics.size()));
     }
 

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/Commands.java

@@ -149,8 +149,8 @@ public class Commands {
             return;
 
         Kit k = null;
-        if(Config.PersonalKits){
-            PersonalKit kit = PersonalKit.get(SteamwarUser.get(p.getUniqueId()).getId(), Config.SchematicType.toDB(), kitName);
+        if(Config.GameModeConfig.Kits.PersonalKits){
+            PersonalKit kit = PersonalKit.get(SteamwarUser.get(p.getUniqueId()).getId(), Config.GameModeConfig.Schematic.Type.toDB(), kitName);
             if(kit != null){
                 kit.setInUse();
                 k = new Kit(kit);

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/GUI.java

@@ -152,8 +152,8 @@ public class GUI {
 
         List<SWListInv.SWListEntry<Kit>> entries = new ArrayList<>();
 
-        if(Config.PersonalKits){
-            List<PersonalKit> kits = PersonalKit.get(SteamwarUser.get(p.getUniqueId()).getId(), Config.SchematicType.toDB());
+        if(Config.GameModeConfig.Kits.PersonalKits){
+            List<PersonalKit> kits = PersonalKit.get(SteamwarUser.get(p.getUniqueId()).getId(), Config.GameModeConfig.Schematic.Type.toDB());
             kits.forEach(kit -> entries.add(new SWListInv.SWListEntry<>(new SWItem(Material.LEATHER_CHESTPLATE, "§e" + kit.getName(), new ArrayList<>(), kit.isInUse(), clickType -> {}), new Kit(kit))));
         }else{
             List<Kit> kitList = Kit.getAvailableKits(fightPlayer.isLeader());
@@ -169,19 +169,19 @@ public class GUI {
         if(entries.isEmpty()) {
             inv.setItem(22, new SWItem(Material.BARRIER, msg.parse("KIT_NO_KITS", p)));
         }
-        if(Config.PersonalKits){
+        if(Config.GameModeConfig.Kits.PersonalKits){
             inv.setItem(48, Material.NETHER_STAR, msg.parse("KIT_CREATE", p), clickType -> {
                 SWAnvilInv anvilInv = new SWAnvilInv(p, msg.parse("KITNAME_TITLE", p));
                 anvilInv.setItem(Material.LEATHER_CHESTPLATE);
                 anvilInv.setCallback(s -> {
                     SteamwarUser user = SteamwarUser.get(p.getUniqueId());
-                    if(PersonalKit.get(user.getId(), Config.SchematicType.toDB(), s) != null) {
+                    if(PersonalKit.get(user.getId(), Config.GameModeConfig.Schematic.Type.toDB(), s) != null) {
                         msg.sendPrefixless("KITNAME_IN_USE", p, ChatMessageType.ACTION_BAR);
                         p.closeInventory();
                         return;
                     }
                     Kit prototype = Kit.getAvailableKits(Fight.getFightPlayer(p).isLeader()).get(0);
-                    PersonalKit kit = PersonalKit.create(user.getId(), Config.SchematicType.toDB(), s, prototype.getInventory(), prototype.getArmor());
+                    PersonalKit kit = PersonalKit.create(user.getId(), Config.GameModeConfig.Schematic.Type.toDB(), s, prototype.getInventory(), prototype.getArmor());
                     PersonalKitCreator.openKitCreator(p, kit);
                 });
                 anvilInv.open();
@@ -202,14 +202,14 @@ public class GUI {
             return;
         }
 
-        int invSize = (Config.SubTypes.size() + 1) * 9;
-        SWInventory inv = new SWInventory(p, invSize, msg.parse("SCHEM_TITLE", p, Config.GameName));
-        setupSchemTypeRow(p, inv, Config.SchematicType, 0);
-        for (int i = 0; i < Config.SubTypes.size(); i++) {
-            setupSchemTypeRow(p, inv, Config.SubTypes.get(i), i + 1);
+        int invSize = (Config.GameModeConfig.Schematic.SubTypes.size() + 1) * 9;
+        SWInventory inv = new SWInventory(p, invSize, msg.parse("SCHEM_TITLE", p, Config.GameModeConfig.GameName));
+        setupSchemTypeRow(p, inv, Config.GameModeConfig.Schematic.Type, 0);
+        for (int i = 0; i < Config.GameModeConfig.Schematic.SubTypes.size(); i++) {
+            setupSchemTypeRow(p, inv, Config.GameModeConfig.Schematic.SubTypes.get(i), i + 1);
         }
         if (!Config.test() && SteamwarUser.get(p.getUniqueId()).hasPerm(UserPerm.TEAM)) {
-            SchematicNode node = SchematicNode.getSchematicNode(-1, Config.GameName, (Integer) null);
+            SchematicNode node = SchematicNode.getSchematicNode(-1, Config.GameModeConfig.GameName, (Integer) null);
             if (node != null) {
                 inv.setItem(2, new SWItem(SWItem.getMaterial(node.getItem()), msg.parse("SCHEM_DIRT", p), click -> {
                     schemSelect(p, node);

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/countdown/EnternCountdown.java

@@ -36,10 +36,10 @@ import java.util.List;
 public class EnternCountdown extends Countdown {
 
     private static int calcTime(FightPlayer fp, Countdown countdown) {
-        int time = Config.EnterStages.get(fp.getKit().getEnterStage());
+        int time = Config.GameModeConfig.EnterStages.get(fp.getKit().getEnterStage());
 
         if(countdown != null) {
-            time -= Config.TimeoutTime - countdown.getTimeLeft();
+            time -= Config.GameModeConfig.WinConditionParams.TimeoutTime - countdown.getTimeLeft();
 
             if(time < 0)
                 time = 0;

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/countdown/EventSpectateCountdown.java

@@ -32,7 +32,7 @@ import de.steamwar.linkage.Linked;
 public class EventSpectateCountdown extends Countdown {
 
     public EventSpectateCountdown() {
-        super(Config.SpectatorDuration, new Message("SHUTDOWN_COUNTDOWN"), SWSound.BLOCK_NOTE_PLING, false);
+        super(Config.GameModeConfig.Times.SpectatorDuration, new Message("SHUTDOWN_COUNTDOWN"), SWSound.BLOCK_NOTE_PLING, false);
         new StateDependentCountdown(ArenaMode.NotRestartable.contains(Config.mode) && !Config.replayserver(), FightState.Spectate, this);
     }
 

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/countdown/NoPlayersOnlineCountdown.java

@@ -31,9 +31,9 @@ import org.bukkit.Bukkit;
 public class NoPlayersOnlineCountdown extends Countdown {
 
     public NoPlayersOnlineCountdown() {
-        super(Config.NoPlayerOnlineDuration, new Message("SHUTDOWN_COUNTDOWN"), null, false);
+        super(Config.GameModeConfig.Times.NoPlayersOnlineDuration, new Message("SHUTDOWN_COUNTDOWN"), null, false);
 
-        if (!Config.ArenaLeaveable)
+        if (!Config.GameModeConfig.Arena.Leaveable)
             new StateDependentCountdown(ArenaMode.AntiReplay, FightState.PreLeaderSetup, this);
     }
 

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/countdown/PostSchemCountdown.java

@@ -30,8 +30,8 @@ import de.steamwar.linkage.Linked;
 public class PostSchemCountdown extends Countdown {
 
     public PostSchemCountdown() {
-        super(Config.SetupDuration, new Message("POST_SCHEM_COUNTDOWN"), null, false);
-        if(Config.mode == ArenaMode.PREPARE && Config.UnlimitedPrepare)
+        super(Config.GameModeConfig.Times.SetupDuration, new Message("POST_SCHEM_COUNTDOWN"), null, false);
+        if(Config.mode == ArenaMode.PREPARE && Config.GameModeConfig.Schematic.UnlimitedPrepare)
             return;
 
         new StateDependentCountdown(ArenaMode.SeriousFight, FightState.PostSchemSetup, this);

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/countdown/PreRunningCountdown.java

@@ -31,7 +31,7 @@ import de.steamwar.linkage.Linked;
 public class PreRunningCountdown extends Countdown {
 
     public PreRunningCountdown() {
-        super(Config.PreFightDuration, new Message("PRE_RUNNING_COUNTDOWN"), SWSound.BLOCK_NOTE_PLING, true);
+        super(Config.GameModeConfig.Times.PreFightDuration, new Message("PRE_RUNNING_COUNTDOWN"), SWSound.BLOCK_NOTE_PLING, true);
         new StateDependentCountdown(ArenaMode.AntiReplay, FightState.PreRunning, this);
     }
 

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/countdown/PreSchemCountdown.java

@@ -31,7 +31,7 @@ import de.steamwar.linkage.Linked;
 public class PreSchemCountdown extends Countdown {
 
     public PreSchemCountdown() {
-        super(Config.PreSchemPasteDuration, new Message("PRE_SCHEM_COUNTDOWN"), SWSound.BLOCK_NOTE_PLING, false);
+        super(Config.GameModeConfig.Times.PreSchemPasteDuration, new Message("PRE_SCHEM_COUNTDOWN"), SWSound.BLOCK_NOTE_PLING, false);
         new StateDependentCountdown(ArenaMode.AntiReplay, FightState.PreSchemSetup, this);
     }
 

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/countdown/SpectateOverCountdown.java

@@ -31,7 +31,7 @@ import de.steamwar.linkage.Linked;
 public class SpectateOverCountdown extends Countdown {
 
     public SpectateOverCountdown() {
-        super(Config.test() ? 3600 : Config.SpectatorDuration, new Message("SPECTATE_COUNTDOWN"), SWSound.BLOCK_NOTE_PLING, false);
+        super(Config.test() ? 3600 : Config.GameModeConfig.Times.SpectatorDuration, new Message("SPECTATE_COUNTDOWN"), SWSound.BLOCK_NOTE_PLING, false);
         new StateDependentCountdown(ArenaMode.Restartable.contains(Config.mode) || Config.replayserver(), FightState.Spectate, this);
     }
 

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/countdown/TimeOverCountdown.java

@@ -28,7 +28,7 @@ public class TimeOverCountdown extends Countdown {
     private final Runnable timeOver;
 
     public TimeOverCountdown(Runnable timeOver) {
-        super(Config.TimeoutTime, new Message("RUNNING_COUNTDOWN"), SWSound.BLOCK_NOTE_BASS, false);
+        super(Config.GameModeConfig.WinConditionParams.TimeoutTime, new Message("RUNNING_COUNTDOWN"), SWSound.BLOCK_NOTE_BASS, false);
         this.timeOver = timeOver;
     }
 

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/fight/Fight.java

@@ -102,7 +102,7 @@ public class Fight {
         if (Config.OnlyPublicSchematics) {
             return true;
         }
-        if (Config.IgnorePublicOnly || ArenaMode.RankedEvent.contains(Config.mode)) {
+        if (Config.GameModeConfig.Schematic.IgnorePublicOnly || ArenaMode.RankedEvent.contains(Config.mode)) {
             return false;
         }
         if (redTeam.getLeader() == null || blueTeam.getLeader() == null) {

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/fight/FightPlayer.java

@@ -53,9 +53,9 @@ public class FightPlayer {
         this.entity = entity;
         this.team = team;
         this.isOut = false;
-        kit = Kit.getKitByName(Config.MemberDefault);
-        if(Config.PersonalKits){
-            PersonalKit personalKit = PersonalKit.getKitInUse(user.getId(), Config.SchematicType.toDB());
+        kit = Kit.getKitByName(Config.GameModeConfig.Kits.MemberDefault);
+        if(Config.GameModeConfig.Kits.PersonalKits){
+            PersonalKit personalKit = PersonalKit.getKitInUse(user.getId(), Config.GameModeConfig.Schematic.Type.toDB());
             if(personalKit != null){
                 kit = new Kit(personalKit);
             }
@@ -75,7 +75,7 @@ public class FightPlayer {
     }
 
     public void startEnternCountdown(Countdown countdown) {
-        if(Config.EnterStages.size() > kit.getEnterStage() && kit.getEnterStage() >= 0)
+        if(Config.GameModeConfig.EnterStages.size() > kit.getEnterStage() && kit.getEnterStage() >= 0)
             enternCountdown = new EnternCountdown(this, countdown);
     }
 

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/fight/FightSchematic.java

@@ -115,9 +115,9 @@ public class FightSchematic extends StateDependent {
             return;
 
         if(clipboard == null){
-            List<SchematicNode> publics = SchematicNode.getAllSchematicsOfType(0, Config.SchematicType.toDB());
+            List<SchematicNode> publics = SchematicNode.getAllSchematicsOfType(0, Config.GameModeConfig.Schematic.Type.toDB());
             if(publics.isEmpty()) {
-                for (SchematicType type : Config.SubTypes) {
+                for (SchematicType type : Config.GameModeConfig.Schematic.SubTypes) {
                     publics = SchematicNode.getAllSchematicsOfType(0, type.toDB());
                     if (!publics.isEmpty()) {
                         break;
@@ -133,7 +133,7 @@ public class FightSchematic extends StateDependent {
 
         if(ArenaMode.AntiReplay.contains(Config.mode)) {
             boolean changeRotation = false;
-            if (Config.ActiveWinconditions.contains(Winconditions.RANDOM_ROTATE)) {
+            if (Config.GameModeConfig.WinConditions.contains(Winconditions.RANDOM_ROTATE)) {
                 changeRotation = new Random().nextBoolean();
                 usedRotate = rotate ^ changeRotation;
             }
@@ -163,9 +163,9 @@ public class FightSchematic extends StateDependent {
                 clipboard,
                 new Location(Config.world, region.centerX(), region.getMinY(), region.centerZ()),
                 new Vector(
-                        Config.PasteAligned && Config.BlueToRedX != 0 ? region.getSizeX()/2.0 - dims.getBlockX() : -dims.getBlockX()/2.0,
-                        Config.WaterDepth != 0 ? Config.WaterDepth - WorldeditWrapper.impl.getWaterDepth(clipboard) : 0,
-                        Config.PasteAligned && Config.BlueToRedZ != 0 ? region.getSizeZ()/2.0 - dims.getBlockZ() : -dims.getBlockZ()/2.0
+                        Config.GameModeConfig.Schematic.PasteAligned && Config.BlueToRedX != 0 ? region.getSizeX()/2.0 - dims.getBlockX() : -dims.getBlockX()/2.0,
+                        Config.GameModeConfig.Arena.WaterDepth != 0 ? Config.GameModeConfig.Arena.WaterDepth - WorldeditWrapper.impl.getWaterDepth(clipboard) : 0,
+                        Config.GameModeConfig.Schematic.PasteAligned && Config.BlueToRedZ != 0 ? region.getSizeZ()/2.0 - dims.getBlockZ() : -dims.getBlockZ()/2.0
                 ).add(new Vector(usedRotate ? 1 : 0, 0, usedRotate ? 1 : 0)),
                 new AffineTransform().rotateY(usedRotate ? 180 : 0)
         );
@@ -179,17 +179,17 @@ public class FightSchematic extends StateDependent {
 
     @Override
     public void disable() {
-        if(!Config.ReplaceObsidianBedrock || Config.mode == ArenaMode.PREPARE)
+        if(!Config.GameModeConfig.Schematic.ReplaceObsidianBedrock || Config.mode == ArenaMode.PREPARE)
             return;
 
         FreezeWorld freezer = null;
-        if(!Config.ReplaceWithBlockupdates)
+        if(!Config.GameModeConfig.Schematic.ReplaceWithBlockupdates)
             freezer = new FreezeWorld();
 
         replaceSync(Material.OBSIDIAN, Material.TNT);
         replaceSync(Material.BEDROCK, Material.SLIME_BLOCK);
 
-        if(!Config.ReplaceWithBlockupdates)
+        if(!Config.GameModeConfig.Schematic.ReplaceWithBlockupdates)
             freezer.disable();
     }
 

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/fight/FightTeam.java

@@ -56,7 +56,7 @@ import java.util.function.Consumer;
 public class FightTeam {
 
     private static void setKitButton(HotbarKit kit, boolean leader) {
-        if (Kit.getAvailableKits(leader).size() > 1 || Config.PersonalKits)
+        if (Kit.getAvailableKits(leader).size() > 1 || Config.GameModeConfig.Kits.PersonalKits)
             kit.setItem(1, "CHOOSE_KIT", new ItemBuilder(Material.LEATHER_CHESTPLATE).enchant().build(), player -> GUI.kitSelection(player, ""));
         else
             kit.setItem(1, null, null, null);
@@ -144,7 +144,7 @@ public class FightTeam {
         WorldOfColorWrapper.impl.setTeamColor(team, color);
         BountifulWrapper.impl.setNametagVisibility(team);
         team.setNameTagVisibility(NameTagVisibility.HIDE_FOR_OTHER_TEAMS);
-        if (!Config.ActiveWinconditions.contains(Winconditions.AMONG_US)) {
+        if (!Config.GameModeConfig.WinConditions.contains(Winconditions.AMONG_US)) {
             team.setAllowFriendlyFire(false);
         }
 
@@ -357,10 +357,10 @@ public class FightTeam {
         if(!silent)
             FightUI.addSubtitle("UI_LEADER_JOINS", prefix, leader.getEntity().getName());
 
-        publicsOnly = SchematicNode.getAllAccessibleSchematicsOfType(leader.getUser().getId(), Config.SchematicType.toDB()).isEmpty();
+        publicsOnly = SchematicNode.getAllAccessibleSchematicsOfType(leader.getUser().getId(), Config.GameModeConfig.Schematic.Type.toDB()).isEmpty();
 
-        if(!Config.PersonalKits)
-            leader.setKit(Kit.getKitByName(Config.LeaderDefault));
+        if(!Config.GameModeConfig.Kits.PersonalKits)
+            leader.setKit(Kit.getKitByName(Config.GameModeConfig.Kits.LeaderDefault));
 
         leader.ifPlayer(player -> {
             if(FightState.getFightState() != FightState.POST_SCHEM_SETUP)
@@ -417,7 +417,7 @@ public class FightTeam {
 
     public void setSchem(SchematicNode schematic, int revision){
         this.schematic.setSchematic(schematic, revision);
-        broadcast("SCHEMATIC_CHOSEN", Config.GameName, schematic.getName());
+        broadcast("SCHEMATIC_CHOSEN", Config.GameModeConfig.GameName, schematic.getName());
     }
 
     public void setReady(boolean ready) {

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/fight/FightWorld.java

@@ -71,7 +71,7 @@ public class FightWorld extends StateDependent {
     public static void resetWorld(){
         List<Entity> entities = new ArrayList<>();
         Recording.iterateOverEntities(Objects::nonNull, entity -> {
-            if(entity.getType() != EntityType.PLAYER && (!Config.ArenaLeaveable || Config.ArenaRegion.inRegion(entity.getLocation())))
+            if(entity.getType() != EntityType.PLAYER && (!Config.GameModeConfig.Arena.Leaveable || Config.ArenaRegion.inRegion(entity.getLocation())))
                 entities.add(entity);
         });
         entities.forEach(Entity::remove);

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/fight/HotbarKit.java

@@ -71,7 +71,7 @@ public class HotbarKit extends Kit {
         for(int i = 0; i < HOTBAR_SIZE; i++) {
             if(nameTags[i] != null) {
                 ItemMeta meta = Objects.requireNonNull(getInventory()[i].getItemMeta());
-                meta.setDisplayName(FightSystem.getMessage().parse(nameTags[i], player, Config.GameName));
+                meta.setDisplayName(FightSystem.getMessage().parse(nameTags[i], player, Config.GameModeConfig.GameName));
                 getInventory()[i].setItemMeta(meta);
             }
         }

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/fight/Kit.java

@@ -49,7 +49,7 @@ import java.util.*;
 import java.util.logging.Level;
 
 public class Kit {
-    private static final File kits = new File(FightSystem.getPlugin().getDataFolder(), Config.KitFile);
+    private static final File kits = new File(FightSystem.getPlugin().getDataFolder(), Config.GameModeConfig.Kits.File);
     private static final ArrayList<Kit> loadedKits = new ArrayList<>();
 
     protected static final Map<Player, Kit> activeKits = new HashMap<>();
@@ -179,7 +179,7 @@ public class Kit {
     }
 
     public void removeBadItems(){
-        Kit normal = Kit.getKitByName(Config.MemberDefault);
+        Kit normal = Kit.getKitByName(Config.GameModeConfig.Kits.MemberDefault);
         assert normal != null;
 
         for(int i = 0; i < inventory.length; i++){
@@ -194,7 +194,7 @@ public class Kit {
             return false;
 
         //Check for forbidden item
-        if(Config.ForbiddenItems.contains(stack.getType()))
+        if(Config.GameModeConfig.Kits.ForbiddenItems.contains(stack.getType()))
             return true;
 
         //Check for attribute modifiers
@@ -211,7 +211,7 @@ public class Kit {
                 return true; //Blocks prefilled inventories
         }
 
-        Kit normal = Kit.getKitByName(Config.MemberDefault);
+        Kit normal = Kit.getKitByName(Config.GameModeConfig.Kits.MemberDefault);
         assert normal != null;
         return !normal.isEnchantmentInKit(stack) && !stack.getEnchantments().isEmpty();
     }
@@ -303,8 +303,8 @@ public class Kit {
         }
 
         inv.setCallback(-999, click -> player.closeInventory());
-        if(Config.PersonalKits){
-            inv.setItem(49, SWItem.getMaterial("WOOD_AXE"), FightSystem.getMessage().parse("KIT_PREVIEW_EDIT", player), clickType -> PersonalKitCreator.openKitCreator(player, PersonalKit.get(SteamwarUser.get(player.getUniqueId()).getId(), Config.SchematicType.toDB(), name)));
+        if(Config.GameModeConfig.Kits.PersonalKits){
+            inv.setItem(49, SWItem.getMaterial("WOOD_AXE"), FightSystem.getMessage().parse("KIT_PREVIEW_EDIT", player), clickType -> PersonalKitCreator.openKitCreator(player, PersonalKit.get(SteamwarUser.get(player.getUniqueId()).getId(), Config.GameModeConfig.Schematic.Type.toDB(), name)));
             inv.setItem(53, Material.BARRIER, FightSystem.getMessage().parse("KIT_PREVIEW_DELETE", player), clickType -> {
                 player.closeInventory();
                 SWInventory conf = new SWInventory(player, 9, FightSystem.getMessage().parse("KIT_DELETION_CONFIRMATION", player));
@@ -312,9 +312,9 @@ public class Kit {
                 conf.setItem(0, SWItem.getDye(10), FightSystem.getMessage().parse("KIT_DELETION_DELETE", player), click -> {
                     player.closeInventory();
                     SteamwarUser user = SteamwarUser.get(player.getUniqueId());
-                    PersonalKit kit = PersonalKit.get(user.getId(), Config.SchematicType.toDB(), name);
+                    PersonalKit kit = PersonalKit.get(user.getId(), Config.GameModeConfig.Schematic.Type.toDB(), name);
                     if(kit.isInUse()) {
-                        List<PersonalKit> kits = PersonalKit.get(user.getId(), Config.SchematicType.toDB());
+                        List<PersonalKit> kits = PersonalKit.get(user.getId(), Config.GameModeConfig.Schematic.Type.toDB());
                         if(!kits.isEmpty()){
                             PersonalKit kit1 = kits.get(0);
                             kit1.setInUse();

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/ArenaBorder.java

@@ -47,7 +47,7 @@ public class ArenaBorder implements Listener {
     public ArenaBorder() {
         new StateDependentListener(ArenaMode.All, FightState.All, this);
         new StateDependentTask(ArenaMode.All, FightState.Running, this::damage, 2, 2);
-        new StateDependentListener(!Config.GroundWalkable, FightState.AntiRunning, new Listener() {
+        new StateDependentListener(!Config.GameModeConfig.Arena.GroundWalkable, FightState.AntiRunning, new Listener() {
             @EventHandler
             public void onMove(PlayerMoveEvent e) {
                 Player player = e.getPlayer();
@@ -102,7 +102,7 @@ public class ArenaBorder implements Listener {
     }
 
     private void addToSpectator(Player player) {
-        if(Config.ArenaLeaveable || !player.isOnline() || playerBorder.contains(player))
+        if(Config.GameModeConfig.Arena.Leaveable || !player.isOnline() || playerBorder.contains(player))
             return;
 
         spectatorBorder.addPlayer(player);

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/ArrowStopper.java

@@ -40,7 +40,7 @@ public class ArrowStopper {
     private static final BlockFace[] BLOCK_FACES = {BlockFace.UP, BlockFace.DOWN, BlockFace.EAST, BlockFace.WEST, BlockFace.NORTH, BlockFace.SOUTH};
 
     public ArrowStopper() {
-        new StateDependentTask(Config.TechhiderActive, FightState.Running, this::run, 1, 1);
+        new StateDependentTask(Config.GameModeConfig.Techhider.Active, FightState.Running, this::run, 1, 1);
     }
 
     private static final Class<?> entityArrow = Reflection.getClass("net.minecraft.world.entity.projectile.AbstractArrow");
@@ -87,7 +87,7 @@ public class ArrowStopper {
     }
 
     private boolean checkBlock(Block block) {
-        return Config.HiddenBlocks.contains(block.getType());
+        return Config.GameModeConfig.Techhider.HiddenBlocks.contains(block.getType());
     }
 
     private boolean invalidEntity(Projectile entity) {

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/BlockFadeListener.java

@@ -32,7 +32,7 @@ import org.bukkit.event.block.BlockFadeEvent;
 public class BlockFadeListener implements Listener {
 
     public BlockFadeListener() {
-        new StateDependentListener(Config.DisableSnowMelt, FightState.All, this);
+        new StateDependentListener(Config.GameModeConfig.Arena.DisableSnowMelt, FightState.All, this);
     }
 
     @EventHandler

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/Chat.java

@@ -51,7 +51,7 @@ public class Chat implements Listener {
         FightTeam fightTeam = Fight.getPlayerTeam(player);
         if(fightTeam != null) {
             String teamName = fightTeam.getColoredName();
-            if(message.startsWith(Config.TeamChatDetection)) {
+            if(message.startsWith(Config.GameModeConfig.TeamChatPrefix)) {
                 fightTeam.broadcastChat(player, message.substring(1));
             } else {
                 broadcastChat("PARTICIPANT_CHAT", teamName, player.getName(), message);

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/DenyWorldInteraction.java

@@ -82,13 +82,13 @@ public class DenyWorldInteraction implements Listener {
 
     @EventHandler
     public void handleEntityExplode(EntityExplodeEvent event) {
-        if(!Config.ArenaLeaveable || Config.ArenaRegion.inRegion(event.getLocation()))
+        if(!Config.GameModeConfig.Arena.Leaveable || Config.ArenaRegion.inRegion(event.getLocation()))
             event.setCancelled(true);
     }
 
     @EventHandler
     public void handleBlockBurn(BlockIgniteEvent event) {
-        if(!Config.ArenaLeaveable || Config.ArenaRegion.inRegion(event.getBlock()))
+        if(!Config.GameModeConfig.Arena.Leaveable || Config.ArenaRegion.inRegion(event.getBlock()))
             event.setCancelled(true);
     }
 

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/InFightDamage.java

@@ -39,7 +39,7 @@ import java.util.Objects;
 public class InFightDamage implements Listener {
 
     public InFightDamage() {
-        new StateDependentListener(!Config.ActiveWinconditions.contains(Winconditions.AMONG_US), FightState.Running, this);
+        new StateDependentListener(!Config.GameModeConfig.WinConditions.contains(Winconditions.AMONG_US), FightState.Running, this);
     }
 
     @EventHandler

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/JoinRequestListener.java

@@ -54,7 +54,7 @@ public class JoinRequestListener implements Listener {
         Player player = event.getPlayer();
         FightPlayer fp = Fight.getFightPlayer(player);
 
-        if (!Config.ArenaLeaveable && (fp == null || !fp.isLiving())) {
+        if (!Config.GameModeConfig.Arena.Leaveable && (fp == null || !fp.isLiving())) {
             HotbarKit.SPECTATOR_KIT.loadToPlayer(player);
         }
     }

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/LeaveableArena.java

@@ -42,7 +42,7 @@ public class LeaveableArena implements Listener {
     private final Map<Player, GameMode> spectatorsInArena = new HashMap<>();
 
     public LeaveableArena() {
-        new StateDependentListener(Config.ArenaLeaveable, FightState.All, this);
+        new StateDependentListener(Config.GameModeConfig.Arena.Leaveable, FightState.All, this);
     }
 
     @EventHandler(priority = EventPriority.MONITOR)

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/Permanent.java

@@ -99,7 +99,7 @@ public class Permanent implements Listener {
         Player player = event.getPlayer();
         FightPlayer fp = Fight.getFightPlayer(player);
 
-        if (!Config.ArenaLeaveable && fp == null) {
+        if (!Config.GameModeConfig.Arena.Leaveable && fp == null) {
             player.setGameMode(GameMode.SPECTATOR);
             spectatorTeam.addEntry(player.getName());
             player.teleport(Config.SpecSpawn);
@@ -111,13 +111,13 @@ public class Permanent implements Listener {
 
     @EventHandler(priority = EventPriority.MONITOR)
     public void handlePlayerDeath(PlayerDeathEvent event) {
-        if(!Config.ArenaLeaveable || Fight.fighting(event.getEntity()))
+        if(!Config.GameModeConfig.Arena.Leaveable || Fight.fighting(event.getEntity()))
             event.setDeathMessage(null);
     }
 
     @EventHandler(priority = EventPriority.MONITOR)
     public void handlePlayerLeave(PlayerQuitEvent event) {
-        if(!Config.ArenaLeaveable)
+        if(!Config.GameModeConfig.Arena.Leaveable)
             event.setQuitMessage(null);
     }
 
@@ -163,8 +163,8 @@ public class Permanent implements Listener {
         Player player = e.getPlayer();
 
         ItemStack stack = e.getItem().getItemStack();
-        if(Config.PersonalKits) {
-            if(Config.ForbiddenItems.contains(stack.getType())) {
+        if(Config.GameModeConfig.Kits.PersonalKits) {
+            if(Config.GameModeConfig.Kits.ForbiddenItems.contains(stack.getType())) {
                 e.setCancelled(true);
             }
         } else {
@@ -192,7 +192,7 @@ public class Permanent implements Listener {
 
     @EventHandler
     public void onWorldLoad(WorldLoadEvent e) {
-        if(!Config.ArenaLeaveable)
+        if(!Config.GameModeConfig.Arena.Leaveable)
             e.getWorld().setAutoSave(false);
     }
 

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/PersonalKitCreator.java

@@ -53,7 +53,7 @@ public class PersonalKitCreator implements Listener {
     private static final Map<HumanEntity, InventoryBackup> openKitCreators = new HashMap<>();
 
     public PersonalKitCreator(){
-        new StateDependentListener(Config.PersonalKits, FightState.Setup, this);
+        new StateDependentListener(Config.GameModeConfig.Kits.PersonalKits, FightState.Setup, this);
     }
 
     public static void openKitCreator(Player player, PersonalKit kit){

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/PistonListener.java

@@ -45,8 +45,8 @@ public class PistonListener implements Listener {
             return;
 
         //Wenn Entern aktiv ist, sollen Raketen etc. entern können
-        new StateDependentListener(!Config.AllowMissiles, FightState.All, this);
-        new StateDependentListener(Config.AllowMissiles, FightState.Setup, this);
+        new StateDependentListener(!Config.GameModeConfig.Arena.AllowMissiles, FightState.All, this);
+        new StateDependentListener(Config.GameModeConfig.Arena.AllowMissiles, FightState.Setup, this);
     }
 
     @EventHandler

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/PrepareSchem.java

@@ -85,7 +85,7 @@ public class PrepareSchem implements Listener {
                     return;
                 }
 
-                schem.setSchemtype(Config.SchematicType.checkType());
+                schem.setSchemtype(Config.GameModeConfig.Schematic.Type.checkType());
                 schem.setPrepared(true);
 
                 try{

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/Shutdown.java

@@ -38,7 +38,7 @@ public class Shutdown implements Listener {
 
     @EventHandler
     public void handlePlayerQuit(PlayerQuitEvent event) {
-        if(Config.replayserver() || Config.ArenaLeaveable)
+        if(Config.replayserver() || Config.GameModeConfig.Arena.Leaveable)
             return;
 
         //Shutdown server if nobody online

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/WaterRemover.java

@@ -42,7 +42,7 @@ import java.util.Map;
 @Linked
 public class WaterRemover implements Listener {
 
-    private static final int MIN_Y = Config.BluePasteRegion.getMinY() + Config.WaterDepth;
+    private static final int MIN_Y = Config.BluePasteRegion.getMinY() + Config.GameModeConfig.Arena.WaterDepth;
 
     private final Map<Integer, FightTeam> tnt = new HashMap<>();
 

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/record/PacketProcessor.java

@@ -90,8 +90,8 @@ public class PacketProcessor implements Listener {
     private final PacketSource source;
     private final BukkitTask task;
     private final LinkedList<Runnable> syncList = new LinkedList<>();
-    private final Set<Integer> hiddenBlockIds = Config.HiddenBlocks.stream().flatMap(m -> BlockIds.impl.materialToAllIds(m).stream()).collect(Collectors.toSet());
-    private final int obfuscateWith = BlockIds.impl.materialToId(Config.ObfuscateWith);
+    private final Set<Integer> hiddenBlockIds = Config.GameModeConfig.Techhider.HiddenBlocks.stream().flatMap(m -> BlockIds.impl.materialToAllIds(m).stream()).collect(Collectors.toSet());
+    private final int obfuscateWith = BlockIds.impl.materialToId(Config.GameModeConfig.Techhider.ObfuscateWith);
     private final FreezeWorld freezer = new FreezeWorld();
     private final REntityServer entityServer = new REntityServer();
     private final Map<Integer, REntity> entities = new HashMap<>();

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/states/OneShotStateDependent.java

@@ -36,7 +36,7 @@ public class OneShotStateDependent extends StateDependent{
     }
 
     public OneShotStateDependent(Winconditions wincondition, Set<FightState> states, Runnable runnable) {
-        super(Config.ActiveWinconditions.contains(wincondition), states);
+        super(Config.GameModeConfig.WinConditions.contains(wincondition), states);
         this.runnable = runnable;
         register();
     }

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/states/StateDependent.java

@@ -31,7 +31,7 @@ public abstract class StateDependent implements IStateDependent {
     private final boolean register;
 
     protected StateDependent(Winconditions wincondition, Set<FightState> states){
-        this(Config.ActiveWinconditions.contains(wincondition), states);
+        this(Config.GameModeConfig.WinConditions.contains(wincondition), states);
     }
 
     protected StateDependent(Set<ArenaMode> mode, Set<FightState> states){

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/states/StateDependentCountdown.java

@@ -43,7 +43,7 @@ public class StateDependentCountdown extends StateDependent {
     }
 
     public StateDependentCountdown(Winconditions wincondition, Set<FightState> states, Countdown countdown) {
-        this(Config.ActiveWinconditions.contains(wincondition), states, countdown);
+        this(Config.GameModeConfig.WinConditions.contains(wincondition), states, countdown);
     }
 
     public StateDependentCountdown(boolean active, Set<FightState> states, Countdown countdown) {

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/states/StateDependentListener.java

@@ -34,7 +34,7 @@ public class StateDependentListener extends StateDependent{
     private final Listener listener;
 
     public StateDependentListener(Winconditions wincondition, Set<FightState> states, Listener listener){
-        super(Config.ActiveWinconditions.contains(wincondition), states);
+        super(Config.GameModeConfig.WinConditions.contains(wincondition), states);
         this.listener = listener;
         register();
     }

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/states/StateDependentTask.java

@@ -37,7 +37,7 @@ public class StateDependentTask extends StateDependent {
     private BukkitTask task = null;
 
     public StateDependentTask(Winconditions wincondition, Set<FightState> states, Runnable runnable, long delay, long period){
-        this(Config.ActiveWinconditions.contains(wincondition), states, runnable, delay, period);
+        this(Config.GameModeConfig.WinConditions.contains(wincondition), states, runnable, delay, period);
     }
 
     public StateDependentTask(boolean enabled, Set<FightState> states, Runnable runnable, long delay, long period){

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/BungeeFightInfo.java

@@ -43,7 +43,7 @@ public class BungeeFightInfo {
     private void send() {
         NetworkSender.send(new FightInfoPacket(
                 Config.world.getName(),
-                Config.SchematicType.toDB(),
+                Config.GameModeConfig.Schematic.Type.toDB(),
                 "",
                 Fight.getBlueTeam().getColoredName(),
                 Fight.getRedTeam().getColoredName(),

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/FightStatistics.java

@@ -94,7 +94,7 @@ public class FightStatistics {
     private void disable() {
         FightTeam winner = FightSystem.getLastWinner();
         String windescription = FightSystem.getLastWinreason();
-        String gameMode = Config.SchematicType.toDB();
+        String gameMode = Config.GameModeConfig.Schematic.Type.toDB();
         Instant endTime = Instant.now();
 
         int blueLeader = getLeader(Fight.getBlueTeam());

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/Hull.java

@@ -42,7 +42,7 @@ public class Hull {
     private static final IntVector[] NO_BRANCHES = new IntVector[0];
 
     private static boolean isOccluding(Material material) {
-        return material.isOccluding() || Config.HiddenBlocks.contains(material);
+        return material.isOccluding() || Config.GameModeConfig.Techhider.HiddenBlocks.contains(material);
     }
 
     @Getter

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/TechHiderWrapper.java

@@ -50,7 +50,7 @@ import java.util.concurrent.ConcurrentHashMap;
 
 public class TechHiderWrapper extends StateDependent implements TechHider.LocationEvaluator, Listener {
 
-    public static final boolean ENABLED = !Config.OnlyPublicSchematics && !Config.test() && Config.TechhiderActive;
+    public static final boolean ENABLED = !Config.OnlyPublicSchematics && !Config.test() && Config.GameModeConfig.Techhider.Active;
 
     @Getter
     private final ConcurrentHashMap<Player, Region> hiddenRegion = new ConcurrentHashMap<>();
@@ -60,7 +60,7 @@ public class TechHiderWrapper extends StateDependent implements TechHider.Locati
 
     public TechHiderWrapper() {
         super(ENABLED, FightState.Schem);
-        techHider = new TechHider(this, Config.ObfuscateWith, Config.HiddenBlocks, Config.HiddenBlockEntities);
+        techHider = new TechHider(this, Config.GameModeConfig.Techhider.ObfuscateWith, Config.GameModeConfig.Techhider.HiddenBlocks, Config.GameModeConfig.Techhider.HiddenBlockEntities);
 
         try {
             key = new SecretKeySpec(Files.readAllBytes(new File(System.getProperty("user.home"), "hullhider.key").toPath()), "AES");

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionBasePercent.java

@@ -40,7 +40,7 @@ public abstract class WinconditionBasePercent extends Wincondition implements Pr
     private final Map<FightTeam, TeamPercent> teamMap = new HashMap<>();
 
     protected Consumer<FightTeam> checkWin = team -> {
-        if (getPercent(team) >= Config.PercentWin) {
+        if (getPercent(team) >= Config.GameModeConfig.WinConditionParams.PercentWin) {
             win(Fight.getOpposite(team), "WIN_PERCENT", team.getColoredName());
         }
     };
@@ -49,7 +49,7 @@ public abstract class WinconditionBasePercent extends Wincondition implements Pr
     public WinconditionBasePercent(Winconditions wincondition, String windescription) {
         super(windescription);
 
-        if (Config.ActiveWinconditions.contains(wincondition)) {
+        if (Config.GameModeConfig.WinConditions.contains(wincondition)) {
             printableWinconditions.add(this);
             percentWincondition = this;
         }
@@ -58,7 +58,7 @@ public abstract class WinconditionBasePercent extends Wincondition implements Pr
     }
 
     public Message getDisplay(FightTeam team) {
-        return new Message("BAR_PERCENT", team.getPrefix() + (Math.round(10000.0 * (1.0 - getPercent(team) / Config.PercentWin)) / 100.0));
+        return new Message("BAR_PERCENT", team.getPrefix() + (Math.round(10000.0 * (1.0 - getPercent(team) / Config.GameModeConfig.WinConditionParams.PercentWin)) / 100.0));
     }
 
     public double getPercent(FightTeam team) {
@@ -93,13 +93,13 @@ public abstract class WinconditionBasePercent extends Wincondition implements Pr
             if (
                     event.getEntityType() == EntityType.FIREBALL ||
                     !team.getExtendRegion().inRegion(event.getEntity().getLocation()) ||
-                    (!Config.PercentEntern && !Config.EnterStages.isEmpty() && Config.EnterStages.get(0) >= Wincondition.getTimeOverCountdown().getTimeLeft())
+                    (!Config.GameModeConfig.WinConditionParams.PercentEntern && !Config.GameModeConfig.EnterStages.isEmpty() && Config.GameModeConfig.EnterStages.get(0) >= Wincondition.getTimeOverCountdown().getTimeLeft())
             ) {
                 return;
             }
 
             event.blockList().forEach(block -> {
-                if (countAnyBlock || Config.PercentBlocks.contains(block.getType()) == Config.PercentBlocksWhitelist) {
+                if (countAnyBlock || Config.GameModeConfig.WinConditionParams.Blocks.contains(block.getType()) == Config.GameModeConfig.WinConditionParams.BlocksWhitelist) {
                     currentBlocks--;
                 }
             });
@@ -111,7 +111,7 @@ public abstract class WinconditionBasePercent extends Wincondition implements Pr
             totalBlocks = 0;
             countAnyBlock = false;
             team.getSchemRegion().forEach((x, y, z) -> {
-                if (Config.PercentBlocks.contains(Config.world.getBlockAt(x, y, z).getType()) == Config.PercentBlocksWhitelist)
+                if (Config.GameModeConfig.WinConditionParams.Blocks.contains(Config.world.getBlockAt(x, y, z).getType()) == Config.GameModeConfig.WinConditionParams.BlocksWhitelist)
                     totalBlocks++;
             });
             // Edge Case for DirtBlock

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionBlocks.java

@@ -57,7 +57,7 @@ public abstract class WinconditionBlocks extends Wincondition implements Printab
             }
         };
 
-        if(Config.ActiveWinconditions.contains(wincondition))
+        if(Config.GameModeConfig.WinConditions.contains(wincondition))
             printableWinconditions.add(this);
     }
 

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionComparisonTimeout.java

@@ -31,7 +31,7 @@ public abstract class WinconditionComparisonTimeout extends Wincondition {
 
     public WinconditionComparisonTimeout(Winconditions wincondition, String windescription, String winMessage, ToDoubleFunction<FightTeam> evaluate) {
         super(windescription);
-        if(Config.ActiveWinconditions.contains(wincondition)) {
+        if(Config.GameModeConfig.WinConditions.contains(wincondition)) {
             timeOverCountdown = new StateDependentCountdown(wincondition, FightState.Running, new TimeOverCountdown(() -> comparisonWin(evaluate, winMessage, "WIN_TIME_OVER")));
         }
     }

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionPoints.java

@@ -52,7 +52,7 @@ public class WinconditionPoints extends WinconditionBasePercent implements Liste
 
         new StateDependentListener(Winconditions.POINTS, FightState.Ingame, this);
 
-        if(Config.ActiveWinconditions.contains(Winconditions.POINTS)){
+        if(Config.GameModeConfig.WinConditions.contains(Winconditions.POINTS)){
             timeOverCountdown = new StateDependentCountdown(Winconditions.POINTS, FightState.Running, new TimeOverCountdown(this::timeOver));
         }
     }

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionTimeTechKO.java

@@ -43,7 +43,7 @@ import java.util.Map;
 @Linked
 public class WinconditionTimeTechKO extends Wincondition implements Listener {
 
-    private static final int TECH_KO_HALF_TIME = Config.TechKoTime/2;
+    private static final int TECH_KO_HALF_TIME = Config.GameModeConfig.WinConditionParams.TechKoTime/2;
 
     private final Map<Integer, FightTeam> spawnLocations = new HashMap<>();
     private final Map<FightTeam, TechKOCountdown> countdowns = new HashMap<>();

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionTimedDamageTechKO.java

@@ -51,7 +51,7 @@ public class WinconditionTimedDamageTechKO extends Wincondition implements Print
             @Override
             public void enable() {
                 Fight.teams().forEach(team -> {
-                    TechKOCountdown countdown = new TechKOCountdown(team, Config.TechKoTime);
+                    TechKOCountdown countdown = new TechKOCountdown(team, Config.GameModeConfig.WinConditionParams.TechKoTime);
                     countdowns.put(team, countdown);
                     countdown.enable();
                 });

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionTimeout.java

@@ -30,7 +30,7 @@ public class WinconditionTimeout extends Wincondition {
 
     public WinconditionTimeout() {
         super("Timeout");
-        if(Config.ActiveWinconditions.contains(Winconditions.TIMEOUT)){
+        if(Config.GameModeConfig.WinConditions.contains(Winconditions.TIMEOUT)){
             timeOverCountdown = new StateDependentCountdown(Winconditions.TIMEOUT, FightState.Running, new TimeOverCountdown(this::timeOver));
         }
     }

SchematicSystem/SchematicSystem_15/src/de/steamwar/schematicsystem/autocheck/AutoChecker15.java

@@ -24,7 +24,8 @@ import com.sk89q.worldedit.entity.Entity;
 import com.sk89q.worldedit.extent.clipboard.Clipboard;
 import com.sk89q.worldedit.math.BlockVector3;
 import com.sk89q.worldedit.world.block.BaseBlock;
-import de.steamwar.schematicsystem.CheckSchemType;
+import de.steamwar.sql.GameModeConfig;
+import de.steamwar.sql.SchematicType;
 import org.bukkit.Material;
 
 import java.util.*;
@@ -118,7 +119,7 @@ public class AutoChecker15 implements AutoChecker.IAutoChecker {
     }
 
     @Override
-    public AutoCheckerResult check(Clipboard clipboard, CheckSchemType type) {
+    public AutoCheckerResult check(Clipboard clipboard, GameModeConfig<Material, String> type) {
         return AutoCheckerResult.builder()
                 .type(type)
                 .height(clipboard.getDimensions().getBlockY())
@@ -130,7 +131,7 @@ public class AutoChecker15 implements AutoChecker.IAutoChecker {
     }
 
     @Override
-    public AutoCheckerResult sizeCheck(Clipboard clipboard, CheckSchemType type) {
+    public AutoCheckerResult sizeCheck(Clipboard clipboard, GameModeConfig<Material, String> type) {
         return AutoCheckerResult.builder()
                 .type(type)
                 .height(clipboard.getDimensions().getBlockY())

SchematicSystem/SchematicSystem_15/src/de/steamwar/schematicsystem/commands/schematiccommand/SchematicCommand15.java

@@ -31,10 +31,10 @@ import com.sk89q.worldedit.math.BlockVector3;
 import com.sk89q.worldedit.world.block.BaseBlock;
 import com.sk89q.worldedit.world.block.BlockState;
 import com.sk89q.worldedit.world.block.BlockTypes;
-import de.steamwar.schematicsystem.CheckSchemType;
+import de.steamwar.sql.GameModeConfig;
 import de.steamwar.schematicsystem.autocheck.AutoCheckerResult;
 import de.steamwar.schematicsystem.autocheck.BlockPos;
-import de.steamwar.schematicsystem.commands.schematiccommand.SchematicCommand;
+import de.steamwar.sql.SchematicType;
 import org.bukkit.Material;
 
 import java.util.*;
@@ -42,7 +42,7 @@ import java.util.stream.Collectors;
 
 public class SchematicCommand15 implements SchematicCommand.ISchematicCommand {
     @Override
-    public Clipboard fixClipboard(Clipboard clipboard, AutoCheckerResult result, CheckSchemType type) throws Exception {
+    public Clipboard fixClipboard(Clipboard clipboard, AutoCheckerResult result, GameModeConfig<Material, String> type) throws Exception {
         for (BlockPos blockPos : result.getBlockScanResult().getRecords()) {
             BlockVector3 vector = BlockVector3.at(blockPos.getX(), blockPos.getY(), blockPos.getZ());
             clipboard.setBlock(vector, clipboard.getFullBlock(vector).toBaseBlock(new CompoundTag(Collections.emptyMap())));
@@ -76,9 +76,9 @@ public class SchematicCommand15 implements SchematicCommand.ISchematicCommand {
             clipboard.setBlock(vector, block.toBaseBlock(builder.build()));
         }
 
-        if(type.getMaxDispenserItems() > 0 ) {
+        if(type.Schematic.MaxDispenserItems > 0 ) {
             for (Map.Entry<BlockPos, Integer> entry : result.getBlockScanResult().getDispenserItems().entrySet()) {
-                if(entry.getValue() <= type.getMaxDispenserItems()) {
+                if(entry.getValue() <= type.Schematic.MaxDispenserItems) {
                     continue;
                 }
 
@@ -90,7 +90,7 @@ public class SchematicCommand15 implements SchematicCommand.ISchematicCommand {
                 List<CompoundTag> items = tag.getList("Items", CompoundTag.class);
                 Collections.reverse(items); // To let the first item be in the Dispenser
                 List<CompoundTag> list = new ArrayList<>();
-                int diff = entry.getValue() - type.getMaxDispenserItems();
+                int diff = entry.getValue() - type.Schematic.MaxDispenserItems;
                 for (CompoundTag item : items) {
                     if(item == null) {
                         continue;
@@ -117,10 +117,9 @@ public class SchematicCommand15 implements SchematicCommand.ISchematicCommand {
         }
 
         if(!result.isLimitedBlocksOK()) {
-            Set<Material> toReplace = type.getLimits().entrySet().stream()
+            Set<Material> toReplace = type.Schematic.Limited.entrySet().stream()
                     .filter(setIntegerEntry -> setIntegerEntry.getValue() == 0)
                     .flatMap(setIntegerEntry -> setIntegerEntry.getKey().stream())
-                    .map(Material::matchMaterial)
                     .collect(Collectors.toSet());
             BlockState replaceType = Objects.requireNonNull(toReplace.contains(Material.END_STONE) ? BlockTypes.IRON_BLOCK : BlockTypes.END_STONE).getDefaultState();
             BlockVector3 min = clipboard.getMinimumPoint();

SchematicSystem/SchematicSystem_8/src/de/steamwar/schematicsystem/autocheck/AutoChecker8.java

@@ -25,7 +25,8 @@ import com.sk89q.worldedit.blocks.BaseBlock;
 import com.sk89q.worldedit.entity.Entity;
 import com.sk89q.worldedit.extent.clipboard.Clipboard;
 import com.sk89q.worldedit.regions.Region;
-import de.steamwar.schematicsystem.CheckSchemType;
+import de.steamwar.sql.GameModeConfig;
+import de.steamwar.sql.SchematicType;
 import org.bukkit.Material;
 
 import java.util.*;
@@ -148,7 +149,7 @@ public class AutoChecker8 implements AutoChecker.IAutoChecker {
     }
 
     @Override
-    public AutoCheckerResult check(Clipboard clipboard, CheckSchemType type) {
+    public AutoCheckerResult check(Clipboard clipboard, GameModeConfig<Material, String> type) {
         AutoChecker.BlockScanResult blockScanResult = new AutoChecker.BlockScanResult();
         scan(blockScanResult, clipboard);
 
@@ -163,7 +164,7 @@ public class AutoChecker8 implements AutoChecker.IAutoChecker {
     }
 
     @Override
-    public AutoCheckerResult sizeCheck(Clipboard clipboard, CheckSchemType type) {
+    public AutoCheckerResult sizeCheck(Clipboard clipboard, GameModeConfig<Material, String> type) {
         return AutoCheckerResult.builder()
                 .type(type)
                 .height(clipboard.getDimensions().getBlockY())

SchematicSystem/SchematicSystem_8/src/de/steamwar/schematicsystem/commands/schematiccommand/SchematicCommand8.java

@@ -24,14 +24,15 @@ import com.sk89q.worldedit.WorldEditException;
 import com.sk89q.worldedit.extent.clipboard.Clipboard;
 import com.sk89q.worldedit.function.operation.ForwardExtentCopy;
 import com.sk89q.worldedit.function.operation.Operations;
-import de.steamwar.schematicsystem.CheckSchemType;
+import de.steamwar.sql.GameModeConfig;
 import de.steamwar.schematicsystem.autocheck.AutoCheckerResult;
-import de.steamwar.schematicsystem.commands.schematiccommand.SchematicCommand;
+import de.steamwar.sql.SchematicType;
+import org.bukkit.Material;
 
 public class SchematicCommand8 implements SchematicCommand.ISchematicCommand {
 
     @Override
-    public Clipboard fixClipboard(Clipboard clipboard, AutoCheckerResult result, CheckSchemType type) throws Exception {
+    public Clipboard fixClipboard(Clipboard clipboard, AutoCheckerResult result, GameModeConfig<Material, String> type) throws Exception {
         return null;
     }
 

SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/CheckSchemType.java

@@ -1,113 +0,0 @@
-/*
- *   This file is a part of the SteamWar software.
- *
- *   Copyright (C) 2025 SteamWar.de-Serverteam
- *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU Affero General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *   GNU Affero General Public License for more details.
- *
- *   You should have received a copy of the GNU Affero General Public License
- *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package de.steamwar.schematicsystem;
-
-import de.steamwar.sql.SchematicType;
-import lombok.Getter;
-import org.bukkit.configuration.ConfigurationSection;
-import org.bukkit.configuration.file.YamlConfiguration;
-
-import java.io.File;
-import java.text.DateFormat;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.time.Instant;
-import java.util.*;
-
-@Getter
-public class CheckSchemType {
-
-    private static final Map<SchematicType, CheckSchemType> types = new HashMap<>();
-
-    private final int width;
-    private final int height;
-    private final int depth;
-    private final int maxDispenserItems;
-
-    private final Map<Set<String>, Integer> limits;
-    private final int maxBlocks;
-
-    private final Date deadline;
-    private final float maxBlastResistance;
-
-    private CheckSchemType(ConfigurationSection section) {
-        String name = section.getString("Schematic.Type");
-        width = section.getInt("Schematic.Size.x");
-        height = section.getInt("Schematic.Size.y");
-        depth = section.getInt("Schematic.Size.z");
-
-        maxDispenserItems = section.getInt("Schematic.MaxDispenserItems", 128);
-        maxBlocks = section.getInt("Schematic.MaxBlocks", 0);
-
-        maxBlastResistance = (float) section.getDouble("Schematic.MaxDesignBlastResistance", Double.MAX_VALUE);
-
-        limits = new HashMap<>();
-        for(Map<?, ?> entry : section.getMapList("Schematic.Limited")) {
-            int amount = (Integer) entry.get("Amount");
-            Set<String> materials = new HashSet<>((List<String>) entry.get("Materials"));
-            if(amount == 0) {
-                materials.forEach(material -> limits.put(Collections.singleton(material), 0));
-            } else {
-                limits.put(materials, amount);
-            }
-        }
-
-        String deadlineString = section.getString("deadline", null);
-        if (deadlineString != null) {
-            try {
-                SimpleDateFormat dateFormat = new SimpleDateFormat("dd.MM.yyyy HH:mm");
-                deadline = dateFormat.parse(deadlineString);
-            } catch (ParseException e) {
-                throw new SecurityException(e.getMessage(), e);
-            }
-        } else {
-            deadline = null;
-        }
-
-        types.put(SchematicType.fromDB(name.toLowerCase()), this);
-        types.put(SchematicType.fromDB("c" + name.toLowerCase()), this);
-    }
-
-    static {
-        File folder = new File(SchematicSystem.getInstance().getDataFolder().getParentFile(), "FightSystem");
-
-        if(folder.exists()) {
-            for(File configFile : folder.listFiles((file, name) -> name.endsWith(".yml") && !name.endsWith(".kits.yml"))) {
-                YamlConfiguration config = YamlConfiguration.loadConfiguration(configFile);
-                if (!config.isList("CheckQuestions") && config.getBoolean("Schematic.ManualCheck", true))
-                    continue;
-
-                new CheckSchemType(config);
-            }
-        }
-    }
-
-    public static CheckSchemType get(SchematicType type){
-        return types.get(type);
-    }
-
-    public Map<Set<String>, Integer> getLimits() {
-        return new HashMap<>(limits);
-    }
-
-    public boolean isAfterDeadline() {
-        return deadline != null && deadline.before(Date.from(Instant.now()));
-    }
-}

SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/SchematicSystem.java

@@ -22,7 +22,10 @@ package de.steamwar.schematicsystem;
 import de.steamwar.linkage.AbstractLinker;
 import de.steamwar.linkage.SpigotLinker;
 import de.steamwar.message.Message;
+import de.steamwar.sql.GameModeConfig;
+import de.steamwar.sql.SchematicType;
 import org.bukkit.Bukkit;
+import org.bukkit.Material;
 import org.bukkit.plugin.java.JavaPlugin;
 
 public class SchematicSystem extends JavaPlugin {
@@ -30,6 +33,12 @@ public class SchematicSystem extends JavaPlugin {
 
     private static SchematicSystem instance;
 
+    public static GameModeConfig<Material, String> getGameModeConfig(SchematicType type){
+        GameModeConfig<Material, String> gameModeConfig = GameModeConfig.getBySchematicType(type);
+        if (gameModeConfig.CheckQuestions.isEmpty() && gameModeConfig.Schematic.ManualCheck) return null;
+        return gameModeConfig;
+    }
+
     @Override
     public void onEnable() {
         instance = this;

SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/autocheck/AutoChecker.java

@@ -21,8 +21,9 @@ package de.steamwar.schematicsystem.autocheck;
 
 import com.sk89q.worldedit.extent.clipboard.Clipboard;
 import de.steamwar.core.VersionDependent;
-import de.steamwar.schematicsystem.CheckSchemType;
+import de.steamwar.sql.GameModeConfig;
 import de.steamwar.schematicsystem.SchematicSystem;
+import de.steamwar.sql.SchematicType;
 import lombok.Getter;
 import lombok.ToString;
 import org.bukkit.Material;
@@ -31,19 +32,19 @@ import java.util.*;
 
 public class AutoChecker {
 
-    public static AutoCheckerResult check(Clipboard clipboard, CheckSchemType type) {
+    public static AutoCheckerResult check(Clipboard clipboard, GameModeConfig<Material, String> type) {
         return impl.check(clipboard, type);
     }
 
-    public static AutoCheckerResult sizeCheck(Clipboard clipboard, CheckSchemType type) {
+    public static AutoCheckerResult sizeCheck(Clipboard clipboard, GameModeConfig<Material, String> type) {
         return impl.sizeCheck(clipboard, type);
     }
 
     private static final IAutoChecker impl = VersionDependent.getVersionImpl(SchematicSystem.getInstance());
 
     public interface IAutoChecker {
-        AutoCheckerResult check(Clipboard clipboard, CheckSchemType type);
-        AutoCheckerResult sizeCheck(Clipboard clipboard, CheckSchemType type);
+        AutoCheckerResult check(Clipboard clipboard, GameModeConfig<Material, String> type);
+        AutoCheckerResult sizeCheck(Clipboard clipboard, GameModeConfig<Material, String> type);
     }
 
     @Getter

SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/autocheck/AutoCheckerResult.java

@@ -20,8 +20,9 @@
 package de.steamwar.schematicsystem.autocheck;
 
 import de.steamwar.core.Core;
-import de.steamwar.schematicsystem.CheckSchemType;
+import de.steamwar.sql.GameModeConfig;
 import de.steamwar.schematicsystem.SchematicSystem;
+import de.steamwar.sql.SchematicType;
 import lombok.Builder;
 import lombok.Getter;
 import lombok.ToString;
@@ -29,13 +30,15 @@ import net.md_5.bungee.api.chat.ClickEvent;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
 
-import java.util.*;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
 
 @Builder
 @Getter
 @ToString
 public class AutoCheckerResult {
-    private final CheckSchemType type;
+    private final GameModeConfig<Material, String> type;
     private final int width;
     private final int height;
     private final int depth;
@@ -61,7 +64,7 @@ public class AutoCheckerResult {
     }
 
     public boolean isDispenserItemsOK() {
-        return blockScanResult.getDispenserItems().values().stream().allMatch(i -> i <= type.getMaxDispenserItems());
+        return blockScanResult.getDispenserItems().values().stream().allMatch(i -> i <= type.Schematic.MaxDispenserItems);
     }
 
     public boolean hasWarnings() {
@@ -73,25 +76,25 @@ public class AutoCheckerResult {
     }
 
     public boolean isTooWide() {
-        return width > type.getWidth();
+        return width > type.Schematic.Size.x;
     }
 
     public boolean isTooHigh() {
-        return height > type.getHeight();
+        return height > type.Schematic.Size.y;
     }
 
     public boolean isTooDeep() {
-        return depth > type.getDepth();
+        return depth > type.Schematic.Size.z;
     }
 
     public boolean isBlockCountOk() {
-        return type.getMaxBlocks() == 0 || blockScanResult.getBlockCounts().entrySet().stream().filter(entry -> entry.getKey() != Material.AIR).map(Map.Entry::getValue).reduce(Integer::sum).map(i -> i <= type.getMaxBlocks()).orElse(false);
+        return type.Schematic.MaxBlocks == 0 || blockScanResult.getBlockCounts().entrySet().stream().filter(entry -> entry.getKey() != Material.AIR).map(Map.Entry::getValue).reduce(Integer::sum).map(i -> i <= type.Schematic.MaxBlocks).orElse(false);
     }
 
     public boolean isLimitedBlocksOK() {
         try {
-            return type.getLimits().entrySet().stream()
-                    .map(setIntegerEntry -> setIntegerEntry.getKey().stream().map(Material::getMaterial).map(blockScanResult.getBlockCounts()::get).map(i -> i == null || i <= setIntegerEntry.getValue()).reduce(Boolean::logicalAnd).orElse(false))
+            return type.Schematic.Limited.entrySet().stream()
+                    .map(setIntegerEntry -> setIntegerEntry.getKey().stream().map(blockScanResult.getBlockCounts()::get).map(i -> i == null || i <= setIntegerEntry.getValue()).reduce(Boolean::logicalAnd).orElse(false))
                     .reduce(Boolean::logicalAnd).orElse(true);
         } catch (NullPointerException e) {
             return false;
@@ -99,21 +102,20 @@ public class AutoCheckerResult {
     }
 
     public boolean isDesignBlastResistanceOK() {
-        return blockScanResult.getDesignBlocks().keySet().stream().map(Material::getBlastResistance).noneMatch(i -> i > type.getMaxBlastResistance());
+        return blockScanResult.getDesignBlocks().keySet().stream().map(Material::getBlastResistance).noneMatch(i -> i > type.Schematic.MaxDesignBlastResistance);
     }
 
     public void sendErrorMessage(Player p, String schemName) {
         SchematicSystem.MESSAGE.sendPrefixless("AUTO_CHECKER_RESULT_HEADER", p, schemName);
-        if(isTooWide()) SchematicSystem.MESSAGE.sendPrefixless("AUTO_CHECKER_RESULT_WIDTH", p, width, type.getWidth());
-        if(isTooHigh()) SchematicSystem.MESSAGE.sendPrefixless("AUTO_CHECKER_RESULT_HEIGHT", p, height, type.getHeight());
-        if(isTooDeep()) SchematicSystem.MESSAGE.sendPrefixless("AUTO_CHECKER_RESULT_LENGTH", p, depth, type.getDepth());
-        if(type.getMaxBlocks() != 0 && !isBlockCountOk()) {
-            SchematicSystem.MESSAGE.sendPrefixless("AUTO_CHECKER_RESULT_BLOCKS", p, blockScanResult.getBlockCounts().values().stream().reduce(Integer::sum).orElse(0), type.getMaxBlocks());
+        if(isTooWide()) SchematicSystem.MESSAGE.sendPrefixless("AUTO_CHECKER_RESULT_WIDTH", p, width, type.Schematic.Size.x);
+        if(isTooHigh()) SchematicSystem.MESSAGE.sendPrefixless("AUTO_CHECKER_RESULT_HEIGHT", p, height, type.Schematic.Size.y);
+        if(isTooDeep()) SchematicSystem.MESSAGE.sendPrefixless("AUTO_CHECKER_RESULT_LENGTH", p, depth, type.Schematic.Size.z);
+        if(type.Schematic.MaxBlocks != 0 && !isBlockCountOk()) {
+            SchematicSystem.MESSAGE.sendPrefixless("AUTO_CHECKER_RESULT_BLOCKS", p, blockScanResult.getBlockCounts().values().stream().reduce(Integer::sum).orElse(0), type.Schematic.MaxBlocks);
         }
         if(!isLimitedBlocksOK()) {
-            type.getLimits().forEach((strings, integer) -> {
-                for (String string : strings) {
-                    Material mat = Material.matchMaterial(string);
+            type.Schematic.Limited.forEach((materials, integer) -> {
+                for (Material mat : materials) {
                     if(mat != null && blockScanResult.getBlockCounts().getOrDefault(mat, 0) > integer) {
                         if(integer == 0) {
                             SchematicSystem.MESSAGE.sendPrefixless("AUTO_CHECKER_RESULT_FORBIDDEN_BLOCK", p, mat.name());
@@ -124,13 +126,13 @@ public class AutoCheckerResult {
                 }
             });
         }
-        blockScanResult.getDispenserItems().entrySet().stream().filter(blockVector3IntegerEntry -> blockVector3IntegerEntry.getValue() > type.getMaxDispenserItems()).forEach(blockVector3IntegerEntry -> {
+        blockScanResult.getDispenserItems().entrySet().stream().filter(blockVector3IntegerEntry -> blockVector3IntegerEntry.getValue() > type.Schematic.MaxDispenserItems).forEach(blockVector3IntegerEntry -> {
             SchematicSystem.MESSAGE.sendPrefixless("AUTO_CHECKER_RESULT_TOO_MANY_DISPENSER_ITEMS", p, SchematicSystem.MESSAGE.parse("AUTO_CHECKER_RESULT_TELEPORT_HERE", p), tpCommandTo(blockVector3IntegerEntry.getKey()),
                     blockVector3IntegerEntry.getKey().getBlockX(),
                     blockVector3IntegerEntry.getKey().getBlockY(),
                     blockVector3IntegerEntry.getKey().getBlockZ(),
                     blockVector3IntegerEntry.getValue(),
-                    type.getMaxDispenserItems());
+                    type.Schematic.MaxDispenserItems);
         });
         blockScanResult.getRecords().forEach(blockVector3 -> {
             SchematicSystem.MESSAGE.sendPrefixless("AUTO_CHECKER_RESULT_RECORD", p, SchematicSystem.MESSAGE.parse("AUTO_CHECKER_RESULT_TELEPORT_HERE", p), tpCommandTo(blockVector3), blockVector3.getBlockX(), blockVector3.getBlockY(), blockVector3.getBlockZ());
@@ -146,7 +148,7 @@ public class AutoCheckerResult {
         });
         if(Core.getVersion() > 12) {
             blockScanResult.getDesignBlocks().forEach((material, poss) -> {
-                if(material.getBlastResistance() > type.getMaxBlastResistance()) {
+                if(material.getBlastResistance() > type.Schematic.MaxDesignBlastResistance) {
                     poss.forEach(pos -> {
                         SchematicSystem.MESSAGE.sendPrefixless("AUTO_CHECKER_RESULT_DESIGN_BLOCK", p, SchematicSystem.MESSAGE.parse("AUTO_CHECKER_RESULT_TELEPORT_HERE", p), tpCommandTo(pos), material.name(), pos.getBlockX(), pos.getBlockY(), pos.getBlockZ());
                     });
@@ -157,7 +159,7 @@ public class AutoCheckerResult {
             SchematicSystem.MESSAGE.sendPrefixless("AUTO_CHECKER_RESULT_ENTITY", p, SchematicSystem.MESSAGE.parse("AUTO_CHECKER_RESULT_TELEPORT_HERE", p), tpCommandTo(blockPos), blockPos.getX(), blockPos.getY(), blockPos.getZ());
         });
         if(type.isAfterDeadline()) {
-            SchematicSystem.MESSAGE.sendPrefixless("AUTO_CHECKER_RESULT_AFTER_DEADLINE", p, type.getDeadline());
+            SchematicSystem.MESSAGE.sendPrefixless("AUTO_CHECKER_RESULT_AFTER_DEADLINE", p, type.Deadline);
         }
     }
 

SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/GUI.java

@@ -23,7 +23,6 @@ import com.sk89q.worldedit.extent.clipboard.Clipboard;
 import de.steamwar.core.Core;
 import de.steamwar.data.CMDs;
 import de.steamwar.inventory.*;
-import de.steamwar.schematicsystem.CheckSchemType;
 import de.steamwar.schematicsystem.SafeSchematicNode;
 import de.steamwar.schematicsystem.SchematicSystem;
 import de.steamwar.schematicsystem.autocheck.AutoChecker;
@@ -245,7 +244,7 @@ public class GUI {
         Clipboard finalClipboard = clipboard;
         List<SchematicType> types = SchematicType.values().parallelStream()
                 .filter(SchematicType::isAssignable)
-                .filter(type -> finalClipboard == null || CheckSchemType.get(type) == null || AutoChecker.sizeCheck(finalClipboard, CheckSchemType.get(type)).fastOk())
+                .filter(type -> finalClipboard == null || SchematicSystem.getGameModeConfig(type) == null || AutoChecker.sizeCheck(finalClipboard, SchematicSystem.getGameModeConfig(type)).fastOk())
                 .collect(Collectors.toList());
 
         List<SWListInv.SWListEntry<SchematicType>> items = types.stream()

SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/SchematicCommand.java

@@ -19,20 +19,25 @@
 
 package de.steamwar.schematicsystem.commands.schematiccommand;
 
-import com.sk89q.worldedit.*;
+import com.sk89q.worldedit.EditSession;
+import com.sk89q.worldedit.WorldEditException;
 import com.sk89q.worldedit.extent.clipboard.Clipboard;
-import de.steamwar.command.*;
+import de.steamwar.command.AbstractSWCommand;
+import de.steamwar.command.SWCommand;
+import de.steamwar.command.TypeMapper;
+import de.steamwar.command.TypeValidator;
 import de.steamwar.core.VersionDependent;
+import de.steamwar.sql.GameModeConfig;
 import de.steamwar.linkage.Linked;
-import de.steamwar.schematicsystem.CheckSchemType;
 import de.steamwar.schematicsystem.SchematicSystem;
 import de.steamwar.schematicsystem.autocheck.AutoCheckerResult;
 import de.steamwar.sql.*;
+import org.bukkit.Material;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 import static de.steamwar.schematicsystem.commands.schematiccommand.SchematicCommandHelp.*;
-import static de.steamwar.schematicsystem.commands.schematiccommand.SchematicCommandUtils.*;
+import static de.steamwar.schematicsystem.commands.schematiccommand.SchematicCommandUtils.togglePublic;
 
 @SuppressWarnings("unused")
 @Linked
@@ -107,9 +112,9 @@ public class SchematicCommand extends SWCommand {
         return SchematicMapper.nodeTypeMapper();
     }
 
-    @ClassMapper(value = CheckSchemType.class, local = true)
-    public static TypeMapper<CheckSchemType> checkSchemTypeTypeMapper() {
-        return SchematicMapper.checkSchemTypeTypeMapper();
+    @ClassMapper(value = GameModeConfig.class, local = true)
+    public static TypeMapper<GameModeConfig<Material, String>> gameModeConfigTypeMapper() {
+        return SchematicMapper.gameModeConfigTypeMapper();
     }
 
     @Override
@@ -145,7 +150,7 @@ public class SchematicCommand extends SWCommand {
     public static final ISchematicCommand impl = VersionDependent.getVersionImpl(SchematicSystem.getInstance());
 
     public interface ISchematicCommand {
-        Clipboard fixClipboard(Clipboard clipboard, AutoCheckerResult result, CheckSchemType type) throws Exception;
+        Clipboard fixClipboard(Clipboard clipboard, AutoCheckerResult result, GameModeConfig<Material, String> type) throws Exception;
         void createCopy(EditSession editSession, Clipboard clipboard) throws WorldEditException;
     }
 }

SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/SchematicCommandUtils.java

@@ -20,12 +20,12 @@
 package de.steamwar.schematicsystem.commands.schematiccommand;
 
 import com.sk89q.worldedit.extent.clipboard.Clipboard;
+import de.steamwar.sql.GameModeConfig;
 import de.steamwar.inventory.SWInventory;
 import de.steamwar.inventory.SWItem;
 import de.steamwar.network.NetworkSender;
 import de.steamwar.network.packets.client.PrepareSchemPacket;
 import de.steamwar.providers.BauServerInfo;
-import de.steamwar.schematicsystem.CheckSchemType;
 import de.steamwar.schematicsystem.SchematicSystem;
 import de.steamwar.schematicsystem.autocheck.AutoChecker;
 import de.steamwar.schematicsystem.autocheck.AutoCheckerResult;
@@ -40,6 +40,7 @@ import net.md_5.bungee.api.chat.ComponentBuilder;
 import net.md_5.bungee.api.chat.HoverEvent;
 import net.md_5.bungee.api.chat.TextComponent;
 import org.bukkit.Bukkit;
+import org.bukkit.Material;
 import org.bukkit.entity.Player;
 
 import java.io.IOException;
@@ -311,7 +312,7 @@ public class SchematicCommandUtils {
         }
     }
 
-    public static void check(Player player, Clipboard clipboard, CheckSchemType type, String schemName, boolean gui) {
+    public static void check(Player player, Clipboard clipboard, GameModeConfig<Material, String> type, String schemName, boolean gui) {
         AutoCheckerResult result = AutoChecker.check(clipboard, type);
         if(!result.isOk()) {
             result.sendErrorMessage(player, schemName);
@@ -454,9 +455,9 @@ public class SchematicCommandUtils {
                 return;
             }
 
-            CheckSchemType checkSchemType = CheckSchemType.get(type);
+            GameModeConfig<Material, String> checkSchemType = SchematicSystem.getGameModeConfig(type);
             if (checkSchemType.isAfterDeadline()) {
-                SchematicSystem.MESSAGE.send("UTIL_TYPE_AFTER_DEADLINE", player, checkSchemType.getDeadline());
+                SchematicSystem.MESSAGE.send("UTIL_TYPE_AFTER_DEADLINE", player, checkSchemType.Deadline);
                 return;
             }
 

SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/SchematicMapper.java

@@ -20,11 +20,13 @@
 package de.steamwar.schematicsystem.commands.schematiccommand;
 
 import de.steamwar.command.TypeMapper;
-import de.steamwar.schematicsystem.CheckSchemType;
+import de.steamwar.sql.GameModeConfig;
+import de.steamwar.schematicsystem.SchematicSystem;
 import de.steamwar.sql.NodeMember;
 import de.steamwar.sql.SchematicNode;
 import de.steamwar.sql.SchematicType;
 import de.steamwar.sql.SteamwarUser;
+import org.bukkit.Material;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
@@ -175,16 +177,16 @@ public class SchematicMapper {
         };
     }
 
-    public static TypeMapper<CheckSchemType> checkSchemTypeTypeMapper() {
-        return new TypeMapper<CheckSchemType>() {
+    public static TypeMapper<GameModeConfig<Material, String>> gameModeConfigTypeMapper() {
+        return new TypeMapper<GameModeConfig<Material, String>>() {
             @Override
             public Collection<String> tabCompletes(CommandSender commandSender, String[] strings, String s) {
-                return SchematicType.values().stream().filter(type -> CheckSchemType.get(type) != null).map(SchematicType::name).collect(Collectors.toList());
+                return SchematicType.values().stream().filter(type -> SchematicSystem.getGameModeConfig(type) != null).map(SchematicType::name).collect(Collectors.toList());
             }
 
             @Override
-            public CheckSchemType map(CommandSender commandSender, String[] previousArguments, String s) {
-                return SchematicType.values().stream().filter(type -> type.name().equalsIgnoreCase(s)).map(CheckSchemType::get).findAny().orElse(null);
+            public GameModeConfig<Material, String> map(CommandSender commandSender, String[] previousArguments, String s) {
+                return SchematicType.values().stream().filter(type -> type.name().equalsIgnoreCase(s)).map(SchematicSystem::getGameModeConfig).findAny().orElse(null);
             }
         };
     }

SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/SchematicValidator.java

@@ -19,7 +19,6 @@
 
 package de.steamwar.schematicsystem.commands.schematiccommand;
 
-import de.steamwar.command.AbstractSWCommand;
 import de.steamwar.command.AbstractValidator;
 import de.steamwar.command.TypeValidator;
 import de.steamwar.sql.SchematicNode;

SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/parts/CheckPart.java

@@ -28,21 +28,23 @@ import com.sk89q.worldedit.session.ClipboardHolder;
 import de.steamwar.command.AbstractSWCommand;
 import de.steamwar.command.SWCommand;
 import de.steamwar.core.Core;
+import de.steamwar.sql.GameModeConfig;
 import de.steamwar.linkage.Linked;
-import de.steamwar.schematicsystem.CheckSchemType;
 import de.steamwar.schematicsystem.SchematicSystem;
 import de.steamwar.schematicsystem.autocheck.AutoChecker;
 import de.steamwar.schematicsystem.autocheck.AutoCheckerResult;
 import de.steamwar.schematicsystem.commands.schematiccommand.SchematicCommand;
 import de.steamwar.sql.SchematicData;
 import de.steamwar.sql.SchematicNode;
+import de.steamwar.sql.SchematicType;
+import org.bukkit.Material;
 import org.bukkit.entity.Player;
 
 import java.io.IOException;
 import java.util.logging.Level;
 
-import static de.steamwar.schematicsystem.commands.schematiccommand.SchematicCommandUtils.check;
 import static de.steamwar.schematicsystem.commands.schematiccommand.SchematicCommand.impl;
+import static de.steamwar.schematicsystem.commands.schematiccommand.SchematicCommandUtils.check;
 
 @AbstractSWCommand.PartOf(SchematicCommand.class)
 @Linked
@@ -52,7 +54,7 @@ public class CheckPart extends SWCommand {
     }
 
     @Register("check")
-    public void checkCommand(Player player, @Validator("isOwnerSchematicValidator") SchematicNode node, CheckSchemType type) {
+    public void checkCommand(Player player, @Validator("isOwnerSchematicValidator") SchematicNode node, GameModeConfig<Material, String> type) {
         try {
             check(player, new SchematicData(node).load(), type, node.getName(), false);
         } catch (IOException e) {
@@ -61,7 +63,7 @@ public class CheckPart extends SWCommand {
     }
 
     @Register(value = {"check", "clipboard"})
-    public void checkClipboardCommand(Player player, @ErrorMessage("UTIL_CHECK_TYPE_NOT_FOUND") CheckSchemType type) {
+    public void checkClipboardCommand(Player player, @ErrorMessage("UTIL_CHECK_TYPE_NOT_FOUND") GameModeConfig<Material, String> type) {
         try {
             check(player, WorldEdit.getInstance().getSessionManager().findByName(player.getName()).getClipboard().getClipboard(), type, "clipboard", false);
         } catch (EmptyClipboardException e) {
@@ -70,7 +72,7 @@ public class CheckPart extends SWCommand {
     }
 
     @Register(value = {"check", "selection"})
-    public void checkSelectionCommand(Player player, @ErrorMessage("UTIL_CHECK_TYPE_NOT_FOUND") CheckSchemType type) {
+    public void checkSelectionCommand(Player player, @ErrorMessage("UTIL_CHECK_TYPE_NOT_FOUND") GameModeConfig<Material, String> type) {
         try {
             Clipboard clipboard = new BlockArrayClipboard(WorldEdit.getInstance().getSessionManager().findByName(player.getName()).getSelection(new BukkitWorld(player.getWorld())));
             EditSession editSession = WorldEdit.getInstance().getEditSessionFactory().getEditSession(new BukkitWorld(player.getWorld()), -1);
@@ -86,7 +88,7 @@ public class CheckPart extends SWCommand {
     }
 
     @Register("fix")
-    public void fixSchematicCommand(Player player, @ErrorMessage("UTIL_CHECK_TYPE_NOT_FOUND") CheckSchemType type) {
+    public void fixSchematicCommand(Player player, @ErrorMessage("UTIL_CHECK_TYPE_NOT_FOUND") GameModeConfig<Material, String> type) {
         if(Core.getVersion() < 15) {
             SchematicSystem.MESSAGE.send("COMMAND_FIX_WRONG_VERSION", player);
             return;

SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/parts/ModifyPart.java

@@ -23,7 +23,6 @@ import com.sk89q.worldedit.extent.clipboard.Clipboard;
 import de.steamwar.command.AbstractSWCommand;
 import de.steamwar.command.SWCommand;
 import de.steamwar.linkage.Linked;
-import de.steamwar.schematicsystem.CheckSchemType;
 import de.steamwar.schematicsystem.SafeSchematicNode;
 import de.steamwar.schematicsystem.SchematicSystem;
 import de.steamwar.schematicsystem.autocheck.AutoChecker;
@@ -63,7 +62,7 @@ public class ModifyPart extends SWCommand {
 
         SchematicType.values().parallelStream()
                 .filter(SchematicType::isAssignable)
-                .filter(type -> finalClipboard == null || CheckSchemType.get(type) == null || AutoChecker.sizeCheck(finalClipboard, CheckSchemType.get(type)).fastOk())
+                .filter(type -> finalClipboard == null || SchematicSystem.getGameModeConfig(type) == null || AutoChecker.sizeCheck(finalClipboard, SchematicSystem.getGameModeConfig(type)).fastOk())
                 .forEach(type -> {
                     TextComponent component = new TextComponent(type.name() + " ");
                     component.setColor(ChatColor.GRAY);

SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/parts/SearchPart.java

@@ -22,8 +22,8 @@ package de.steamwar.schematicsystem.commands.schematiccommand.parts;
 import de.steamwar.command.*;
 import de.steamwar.linkage.Linked;
 import de.steamwar.schematicsystem.SchematicSystem;
-import de.steamwar.schematicsystem.commands.schematiccommand.SchematicCommandUtils;
 import de.steamwar.schematicsystem.commands.schematiccommand.SchematicCommand;
+import de.steamwar.schematicsystem.commands.schematiccommand.SchematicCommandUtils;
 import de.steamwar.sql.SchematicNode;
 import de.steamwar.sql.SchematicType;
 import de.steamwar.sql.SteamwarUser;

SpigotCore/SpigotCore_Main/src/de/steamwar/data/GameModeConfigUtils.java

@@ -0,0 +1,41 @@
+/*
+ *   This file is a part of the SteamWar software.
+ *
+ *   Copyright (C) 2025 SteamWar.de-Serverteam
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU Affero General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU Affero General Public License for more details.
+ *
+ *   You should have received a copy of the GNU Affero General Public License
+ *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package de.steamwar.data;
+
+import lombok.experimental.UtilityClass;
+import org.bukkit.Material;
+
+import java.util.function.Function;
+
+@UtilityClass
+public class GameModeConfigUtils {
+
+    public static final Function<String, Material> ToMaterial = material -> {
+        Material mat = Material.getMaterial(material);
+        if (mat == null) {
+            try {
+                mat = Material.valueOf(material);
+            } catch (IllegalArgumentException e) {
+                // Ignore
+            }
+        }
+        return mat;
+    };
+}

SpigotCore/SpigotCore_Main/src/de/steamwar/sql/SQLWrapperImpl.java

@@ -20,50 +20,24 @@
 package de.steamwar.sql;
 
 import de.steamwar.core.Core;
+import de.steamwar.data.GameModeConfigUtils;
 import org.bukkit.Bukkit;
+import org.bukkit.Material;
 import org.bukkit.World;
-import org.bukkit.configuration.file.YamlConfiguration;
 import org.bukkit.entity.Player;
 
 import java.io.File;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
 
-public class SQLWrapperImpl implements SQLWrapper {
+public class SQLWrapperImpl implements SQLWrapper<Material> {
 
     @Override
-    public void loadSchemTypes(List<SchematicType> tmpTypes, Map<String, SchematicType> tmpFromDB) {
-        File folder = new File(Core.getInstance().getDataFolder().getParentFile(), "FightSystem");
-        if(folder.exists()) {
-            for(File configFile : Arrays.stream(folder.listFiles((file, name) -> name.endsWith(".yml") && !name.endsWith(".kits.yml"))).sorted().collect(Collectors.toList())) {
-                YamlConfiguration config = YamlConfiguration.loadConfiguration(configFile);
-                if(!config.isConfigurationSection("Schematic"))
-                    continue;
+    public File getSchemTypesFolder() {
+        return new File(Core.getInstance().getDataFolder().getParentFile(), "FightSystem");
+    }
 
-                String type = config.getString("Schematic.Type");
-                assert type != null;
-                String shortcut = config.getString("Schematic.Shortcut");
-                if(tmpFromDB.containsKey(type.toLowerCase()))
-                    continue;
-
-                SchematicType checktype = null;
-                String material = config.getString("Schematic.Material", "STONE_BUTTON");
-
-                if(!config.getStringList("CheckQuestions").isEmpty()) {
-                    checktype = new SchematicType("C" + type, "C" + shortcut, SchematicType.Type.CHECK_TYPE, null, material, true);
-                    tmpTypes.add(checktype);
-                    tmpFromDB.put(checktype.toDB(), checktype);
-                }
-
-                boolean manualCheck = config.getBoolean("Schematic.ManualCheck", true);
-
-                SchematicType current = new SchematicType(type, shortcut, config.isConfigurationSection("Server") ? SchematicType.Type.FIGHT_TYPE : SchematicType.Type.NORMAL, checktype, material, manualCheck);
-                tmpTypes.add(current);
-                tmpFromDB.put(type.toLowerCase(), current);
-            }
-        }
+    @Override
+    public GameModeConfig<Material, String> loadGameModeConfig(File file) {
+        return new GameModeConfig<>(file, GameModeConfigUtils.ToMaterial, GameModeConfig.ToString, GameModeConfig.ToStaticWarGear, true);
     }
 
     private static final String SERVER_VERSION = Bukkit.getServer().getVersion();
@@ -71,10 +45,10 @@ public class SQLWrapperImpl implements SQLWrapper {
     @Override
     public void additionalExceptionMetadata(StringBuilder builder) {
         builder.append("\nPlayers: ");
-        for(Player player : Bukkit.getOnlinePlayers())
+        for (Player player : Bukkit.getOnlinePlayers())
             builder.append(player.getName()).append(" ");
         builder.append("\nWorlds: ");
-        for(World world : Bukkit.getWorlds())
+        for (World world : Bukkit.getWorlds())
             builder.append(world.getName()).append(" ");
         builder.append("\nServer: ").append(SERVER_VERSION);
     }

VelocityCore/src/de/steamwar/sql/SQLWrapperImpl.java

@@ -21,52 +21,30 @@ package de.steamwar.sql;
 
 import com.velocitypowered.api.proxy.Player;
 import com.velocitypowered.api.proxy.server.RegisteredServer;
-import de.steamwar.velocitycore.GameModeConfig;
 import de.steamwar.velocitycore.VelocityCore;
 import de.steamwar.velocitycore.commands.CheckCommand;
 
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.io.File;
 
-public class SQLWrapperImpl implements SQLWrapper {
-    private static final SimpleDateFormat deadlineFormat = new SimpleDateFormat("dd.MM.yyyy HH:mm");
-    private static Date parseDeadline(String deadline) {
-        if(deadline == null)
-            return null;
+public class SQLWrapperImpl implements SQLWrapper<String> {
 
-        try {
-            return deadlineFormat.parse(deadline);
-        } catch (ParseException e) {
-            throw new SecurityException(e.getMessage(), e);
-        }
+    @Override
+    public File getSchemTypesFolder() {
+        return new File(VelocityCore.get().getDataDirectory().getParent().toFile(), "FightSystem");
     }
 
     @Override
-    public void loadSchemTypes(List<SchematicType> tmpTypes, Map<String, SchematicType> tmpFromDB) {
-        GameModeConfig.loadAll(GameModeConfig.class, (file, config) -> {
-            if(config.getSchematic() == null || tmpFromDB.containsKey(config.getSchemType().toLowerCase()))
-                return;
+    public GameModeConfig<String, String> loadGameModeConfig(File file) {
+        return new GameModeConfig<>(file, GameModeConfig.ToString, GameModeConfig.ToString, GameModeConfig.ToInternalName, true);
+    }
 
-            String shortcut = config.getSchematic().getShortcut();
-            String material = config.getSchematic().getMaterial();
-
-            SchematicType checktype = null;
-            if(!config.getCheckQuestions().isEmpty()) {
-                checktype = new SchematicType("C" + config.getSchemType(), "C" + shortcut, SchematicType.Type.CHECK_TYPE, null, material, true);
-                tmpTypes.add(checktype);
-                tmpFromDB.put(checktype.toDB(), checktype);
-                CheckCommand.setCheckQuestions(checktype, config.getCheckQuestions());
-            }
-
-            SchematicType current = new SchematicType(config.getSchemType(), shortcut, config.getServer() != null ? SchematicType.Type.FIGHT_TYPE : SchematicType.Type.NORMAL, checktype, material, parseDeadline(config.getDeadline()), config.getSchematic().isManualCheck());
-            tmpTypes.add(current);
-            tmpFromDB.put(config.getSchemType().toLowerCase(), current);
-            if(checktype != null)
-                CheckCommand.addFightType(checktype, current);
-        });
+    @Override
+    public void processSchematicType(GameModeConfig<?, String> gameModeConfig) {
+        SchematicType type = gameModeConfig.Schematic.Type;
+        if (type.checkType() != null) {
+            CheckCommand.setCheckQuestions(type.checkType(), gameModeConfig.CheckQuestions);
+            CheckCommand.addFightType(type.checkType(), type);
+        }
     }
 
     @Override

VelocityCore/src/de/steamwar/velocitycore/ArenaMode.java

@@ -19,21 +19,22 @@
 
 package de.steamwar.velocitycore;
 
+import de.steamwar.sql.GameModeConfig;
 import de.steamwar.sql.SchematicType;
 import lombok.Getter;
+import lombok.experimental.UtilityClass;
 
-import java.time.LocalDateTime;
+import java.io.File;
 import java.util.*;
 
-public class ArenaMode extends GameModeConfig {
+@UtilityClass
+public class ArenaMode {
 
-    private static final Random random = new Random();
-
-    private static final Map<String, ArenaMode> byChat = new HashMap<>();
-    private static final Map<String, ArenaMode> byInternal = new HashMap<>();
-    private static final Map<SchematicType, ArenaMode> bySchemType = new HashMap<>();
+    private static final Map<String, GameModeConfig<String, String>> byChat = new HashMap<>();
+    private static final Map<String, GameModeConfig<String, String>> byInternal = new HashMap<>();
+    private static final Map<SchematicType, GameModeConfig<String, String>> bySchemType = new HashMap<>();
     @Getter
-    private static final List<ArenaMode> allModes = new LinkedList<>();
+    private static final List<GameModeConfig<String, String>> allModes = new LinkedList<>();
 
     static {
         init();
@@ -45,90 +46,43 @@ public class ArenaMode extends GameModeConfig {
         bySchemType.clear();
         allModes.clear();
 
-        GameModeConfig.loadAll(ArenaMode.class, (file, mode) -> {
-            if(mode.getServer() == null)
-                return;
+        File folder = new File(VelocityCore.get().getDataDirectory().getParent().toFile(), "FightSystem");
+        if(!folder.exists())
+            return;
 
-            mode.config = file.getName();
-            mode.internalName = file.getName().replace(".yml", "");
-            mode.getMaps().forEach(map -> mode.lowerToRealMapNames.put(map.toLowerCase(), map));
-            if(mode.getGameName() == null)
-                mode.setGameName(mode.internalName);
+        for(File file : Arrays.stream(folder.listFiles((file, name) -> name.endsWith(".yml") && !name.endsWith(".kits.yml"))).sorted().toList()) {
+            GameModeConfig<String, String> gameModeConfig = new GameModeConfig<>(file, GameModeConfig.ToString, GameModeConfig.ToString, GameModeConfig.ToInternalName, false);
+            if (!gameModeConfig.Server.loaded) continue;
 
-            allModes.add(mode);
-            byInternal.put(mode.internalName, mode);
-            for(String name : mode.getServer().getChatNames()){
-                byChat.put(name.toLowerCase(), mode);
+            allModes.add(gameModeConfig);
+            byInternal.put(file.getName().replace(".yml", ""), gameModeConfig);
+            for (String name : gameModeConfig.Server.ChatNames) {
+                byChat.put(name.toLowerCase(), gameModeConfig);
             }
-
-            if(mode.getSchematic() != null && mode.getSchemType() != null)
-                bySchemType.put(SchematicType.fromDB(mode.getSchemType()), mode);
-        });
+            if (gameModeConfig.Schematic.loaded && gameModeConfig.Schematic.Type != SchematicType.Normal) {
+                bySchemType.put(gameModeConfig.Schematic.Type, gameModeConfig);
+            }
+        }
     }
 
-    public static ArenaMode getByChat(String name){
+    public static GameModeConfig<String, String> getByChat(String name){
         return byChat.get(name.toLowerCase());
     }
 
-    public static ArenaMode getByInternal(String name){
+    public static GameModeConfig<String, String> getByInternal(String name){
         return byInternal.get(name);
     }
 
     public static List<String> getAllChatNames(boolean historic) {
         List<String> chatNames = new LinkedList<>();
-        for(ArenaMode mode : byInternal.values()){
-            if(mode.isActive() && historic == mode.isHistoric())
-                chatNames.addAll(mode.getServer().getChatNames());
+        for(GameModeConfig<String, String> mode : byInternal.values()){
+            if(mode.isActive() && historic == mode.Server.Historic)
+                chatNames.addAll(mode.Server.ChatNames);
         }
         return chatNames;
     }
 
-    public static ArenaMode getBySchemType(SchematicType schemType){
+    public static GameModeConfig<String, String> getBySchemType(SchematicType schemType){
         return bySchemType.get(schemType);
     }
-
-
-    private final Map<String, String> lowerToRealMapNames = new HashMap<>();
-
-    @Getter
-    private String internalName;
-    @Getter
-    private String config;
-
-    @Getter
-    private List<Integer> ActiveMonths = Collections.emptyList();
-
-    public String hasMap(String map){
-        for(String m : getMaps()) {
-            if(m.equalsIgnoreCase(map))
-                return m;
-        }
-        return null;
-    }
-
-    public String getRandomMap(){
-        return getMaps().get(random.nextInt(getMaps().size()));
-    }
-
-    public String convertToRealMapName(String map){
-        return lowerToRealMapNames.get(map.toLowerCase());
-    }
-
-    public String getChatName(){
-        return getServer().getChatNames().get(0);
-    }
-
-    public boolean isActive() {
-        if (getServer().getChatNames().isEmpty()) return false;
-        if (ActiveMonths.isEmpty()) return true;
-        return ActiveMonths.contains(LocalDateTime.now().getMonth().getValue());
-    }
-
-    public String getSchemTypeOrInternalName() {
-        Schematic schematic = getSchematic();
-        if (schematic == null) {
-            return internalName;
-        }
-        return schematic.getType();
-    }
 }

VelocityCore/src/de/steamwar/velocitycore/GameModeConfig.java

@@ -1,98 +0,0 @@
-/*
- *   This file is a part of the SteamWar software.
- *
- *   Copyright (C) 2025 SteamWar.de-Serverteam
- *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU Affero General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *   GNU Affero General Public License for more details.
- *
- *   You should have received a copy of the GNU Affero General Public License
- *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package de.steamwar.velocitycore;
-
-import lombok.Getter;
-import lombok.Setter;
-
-import java.io.File;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.function.BiConsumer;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-@Getter
-public class GameModeConfig {
-
-    private static final Pattern terminatingNumber = Pattern.compile("(\\d+)$");
-
-    public static <T extends GameModeConfig> void loadAll(Class<T> config, BiConsumer<File, T> consumer) {
-        File folder = new File(VelocityCore.get().getDataDirectory().getParent().toFile(), "FightSystem");
-        if(!folder.exists())
-            return;
-
-        for(File file : Arrays.stream(folder.listFiles((file, name) -> name.endsWith(".yml") && !name.endsWith(".kits.yml"))).sorted().toList()) {
-            consumer.accept(file, Config.load(config, file, description -> {}));
-        }
-    }
-
-    private Server Server = null;
-    private List<String> CheckQuestions = Collections.emptyList();
-    private String deadline = null;
-    private Schematic Schematic = null;
-    @Setter
-    private String GameName;
-
-    @Getter
-    public static class Server {
-        private String Folder;
-        private List<String> ChatNames = Collections.emptyList();
-        private List<String> Maps;
-        private boolean Spigot = false;
-        private boolean Ranked = false;
-        private boolean Historic = false;
-    }
-
-    @Getter
-    public static class Schematic {
-        private String Type;
-        private String Shortcut;
-        private String Material;
-        private boolean ManualCheck = true;
-    }
-
-    public ServerVersion getVersion() {
-        Matcher matcher = terminatingNumber.matcher(getServer().getFolder());
-        matcher.find();
-        return ServerVersion.valueOf((getServer().isSpigot() ? "SPIGOT_" : "PAPER_") + matcher.group(1));
-    }
-
-    public String getFolder() {
-        return getServer().getFolder();
-    }
-
-    public List<String> getMaps() {
-        return getServer().getMaps();
-    }
-
-    public boolean isHistoric() {
-        return getServer().isHistoric();
-    }
-
-    public boolean isRanked() {
-        return getServer().isRanked();
-    }
-
-    public String getSchemType() {
-        return getSchematic().getType();
-    }
-}

VelocityCore/src/de/steamwar/velocitycore/ServerStarter.java

@@ -22,6 +22,7 @@ package de.steamwar.velocitycore;
 import com.velocitypowered.api.proxy.Player;
 import com.viaversion.viaversion.api.Via;
 import com.viaversion.viaversion.velocity.platform.VelocityViaConfig;
+import de.steamwar.sql.GameModeConfig;
 import de.steamwar.messages.Chatter;
 import de.steamwar.persistent.Arenaserver;
 import de.steamwar.persistent.Bauserver;
@@ -79,16 +80,16 @@ public class ServerStarter {
     private final Set<Player> playersToSend = new HashSet<>();
     private final Map<String, String> arguments = new HashMap<>();
 
-    public ServerStarter arena(ArenaMode mode, String map) {
+    public ServerStarter arena(GameModeConfig<String, String> mode, String map) {
         portrange = ARENA_PORTS;
-        serverNameProvider = port -> mode.getGameName() + (port - portrange.start);
-        version = mode.getVersion();
+        serverNameProvider = port -> mode.GameName + (port - portrange.start);
+        version = ServerVersion.from(mode);
         allowMerge = true;
         fightMap = map;
-        gameMode = mode.getInternalName();
-        directory = new File(SERVER_PATH, mode.getFolder());
-        arguments.put("config", mode.getConfig());
-        tempWorld(SERVER_PATH + mode.getFolder() + "/arenas/" + map);
+        gameMode = mode.configFile.getName().replace(".yml", "");
+        directory = new File(SERVER_PATH, mode.Server.Folder);
+        arguments.put("config", mode.configFile.getName());
+        tempWorld(SERVER_PATH + mode.Server.Folder + "/arenas/" + map);
         startCondition = () -> {
             if(playersToSend.stream().anyMatch(player -> Subserver.isArena(Subserver.getSubserver(player)))) {
                 playersToSend.forEach(player -> Chatter.of(player).system("FIGHT_IN_ARENA"));
@@ -115,7 +116,7 @@ public class ServerStarter {
         return this;
     }
 
-    public ServerStarter test(ArenaMode mode, String map, Player owner) {
+    public ServerStarter test(GameModeConfig<String, String> mode, String map, Player owner) {
         arena(mode, map);
         buildWithTemp(owner);
         portrange = BAU_PORTS;

VelocityCore/src/de/steamwar/velocitycore/ServerVersion.java

@@ -20,6 +20,8 @@
 package de.steamwar.velocitycore;
 
 import com.velocitypowered.api.network.ProtocolVersion;
+import de.steamwar.sql.GameModeConfig;
+import de.steamwar.sql.SchematicType;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
@@ -27,6 +29,8 @@ import java.io.File;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 @Getter
 @AllArgsConstructor
@@ -108,4 +112,12 @@ public enum ServerVersion {
     public File getServerDirectory(String base) {
         return new File(ServerStarter.SERVER_PATH, base + versionSuffix);
     }
+
+    private static final Pattern terminatingNumber = Pattern.compile("(\\d+)$");
+
+    public static ServerVersion from(GameModeConfig<String, String> type) {
+        Matcher matcher = terminatingNumber.matcher(type.Server.Folder);
+        matcher.find();
+        return ServerVersion.valueOf((type.Server.Spigot ? "SPIGOT_" : "PAPER_") + matcher.group(1));
+    }
 }

VelocityCore/src/de/steamwar/velocitycore/commands/BauCommand.java

@@ -23,6 +23,7 @@ import de.steamwar.command.PreviousArguments;
 import de.steamwar.command.SWCommand;
 import de.steamwar.command.TypeMapper;
 import de.steamwar.command.TypeValidator;
+import de.steamwar.sql.GameModeConfig;
 import de.steamwar.linkage.EventMode;
 import de.steamwar.linkage.Linked;
 import de.steamwar.linkage.LinkedInstance;
@@ -32,6 +33,7 @@ import de.steamwar.messages.PlayerChatter;
 import de.steamwar.network.packets.server.BaumemberUpdatePacket;
 import de.steamwar.persistent.Bauserver;
 import de.steamwar.sql.BauweltMember;
+import de.steamwar.sql.SchematicType;
 import de.steamwar.sql.SteamwarUser;
 import de.steamwar.velocitycore.*;
 import de.steamwar.velocitycore.inventory.SWInventory;
@@ -238,7 +240,7 @@ public class BauCommand extends SWCommand {
 
     @Register("test")
     @Register("testarena")
-    public void testarena(PlayerChatter sender, @Mapper("nonHistoricArenaMode") @OptionalValue("") @AllowNull ArenaMode arenaMode, @Mapper("arenaMap") @OptionalValue("") @AllowNull String map) {
+    public void testarena(PlayerChatter sender, @Mapper("nonHistoricArenaMode") @OptionalValue("") @AllowNull GameModeConfig<String, String> arenaMode, @Mapper("arenaMap") @OptionalValue("") @AllowNull String map) {
         FightCommand.createArena(sender, "/bau testarena ", false, arenaMode, map, false, (chatter, mode, m) ->
                 new ServerStarter().test(mode, m, sender.getPlayer()).start()
         );

VelocityCore/src/de/steamwar/velocitycore/commands/BuilderCloudCommand.java

@@ -19,7 +19,9 @@
 
 package de.steamwar.velocitycore.commands;
 
+import de.steamwar.sql.GameModeConfig;
 import de.steamwar.linkage.Linked;
+import de.steamwar.sql.SchematicType;
 import de.steamwar.velocitycore.ArenaMode;
 import de.steamwar.velocitycore.ServerStarter;
 import de.steamwar.velocitycore.ServerVersion;
@@ -85,14 +87,14 @@ public class BuilderCloudCommand extends SWCommand {
     }
 
     @Register(value = "deploy", description = "BUILDERCLOUD_DEPLOY_USAGE")
-    public void deploy(Chatter sender, @Mapper("nonHistoricArenaMode") ArenaMode arenaMode, @ErrorMessage("BUILDERCLOUD_VERSION") ServerVersion version, @Mapper("map") String map) {
+    public void deploy(Chatter sender, @Mapper("nonHistoricArenaMode") GameModeConfig<String, String> arenaMode, @ErrorMessage("BUILDERCLOUD_VERSION") ServerVersion version, @Mapper("map") String map) {
         if(!mapFile(version, map).exists()) {
             sender.system("BUILDERCLOUD_UNKNOWN_MAP");
             return;
         }
 
         VelocityCore.schedule(() -> {
-            VelocityCore.local.execute("deployarena.py", arenaMode.getConfig(), Integer.toString(version.getVersionSuffix()), map);
+            VelocityCore.local.execute("deployarena.py", arenaMode.configFile.getName(), Integer.toString(version.getVersionSuffix()), map);
             ArenaMode.init();
             sender.system("BUILDERCLOUD_DEPLOY_FINISHED");
         }).schedule();

VelocityCore/src/de/steamwar/velocitycore/commands/ChallengeCommand.java

@@ -22,6 +22,7 @@ package de.steamwar.velocitycore.commands;
 import com.velocitypowered.api.proxy.Player;
 import de.steamwar.command.SWCommand;
 import de.steamwar.command.TypeValidator;
+import de.steamwar.sql.GameModeConfig;
 import de.steamwar.linkage.EventMode;
 import de.steamwar.linkage.Linked;
 import de.steamwar.messages.Chatter;
@@ -29,7 +30,7 @@ import de.steamwar.messages.Message;
 import de.steamwar.messages.PlayerChatter;
 import de.steamwar.persistent.Subserver;
 import de.steamwar.sql.IgnoreSystem;
-import de.steamwar.velocitycore.ArenaMode;
+import de.steamwar.sql.SchematicType;
 import de.steamwar.velocitycore.ServerStarter;
 import net.kyori.adventure.text.event.ClickEvent;
 
@@ -46,7 +47,7 @@ public class ChallengeCommand extends SWCommand {
     }
 
     @Register(description = "CHALLENGE_USAGE")
-    public void challenge(@Validator("arenaPlayer") PlayerChatter sender, @Validator("target") Player target, @Mapper("nonHistoricArenaMode") @OptionalValue("") @AllowNull ArenaMode arenaMode, @Mapper("arenaMap") @OptionalValue("") @AllowNull String map) {
+    public void challenge(@Validator("arenaPlayer") PlayerChatter sender, @Validator("target") Player target, @Mapper("nonHistoricArenaMode") @OptionalValue("") @AllowNull GameModeConfig<String, String> arenaMode, @Mapper("arenaMap") @OptionalValue("") @AllowNull String map) {
         FightCommand.createArena(sender, "/challenge " + target.getUsername() + " ", false, arenaMode, map, false, (chatter, mode, m) -> {
             Player p = sender.getPlayer();
             if(challenges.containsKey(target) && challenges.get(target).contains(p)){
@@ -54,7 +55,7 @@ public class ChallengeCommand extends SWCommand {
                 challenges.remove(p);
 
                 new ServerStarter().arena(mode, map).blueLeader(sender.getPlayer()).redLeader(target).callback(
-                        arena -> Chatter.broadcast().system("CHALLENGE_BROADCAST", new Message("CHALLENGE_BROADCAST_HOVER"), ClickEvent.runCommand("/arena " + arena.getServer().getName()), mode.getGameName(), p, target)
+                        arena -> Chatter.broadcast().system("CHALLENGE_BROADCAST", new Message("CHALLENGE_BROADCAST_HOVER"), ClickEvent.runCommand("/arena " + arena.getServer().getName()), mode.GameName, p, target)
                 ).start();
             }else{
                 if(!challenges.containsKey(p)){
@@ -63,8 +64,8 @@ public class ChallengeCommand extends SWCommand {
 
                 challenges.get(p).add(target);
 
-                sender.system("CHALLENGE_CHALLENGED", target, mode.getGameName());
-                Chatter.of(target).system("CHALLENGE_CHALLENGED_TARGET", p, mode.getGameName(), mode.getMaps().size() != 1 ? new Message("CHALLENGE_CHALLENGED_MAP", m) : "");
+                sender.system("CHALLENGE_CHALLENGED", target, mode.GameName);
+                Chatter.of(target).system("CHALLENGE_CHALLENGED_TARGET", p, mode.GameName, mode.Server.Maps.size() != 1 ? new Message("CHALLENGE_CHALLENGED_MAP", m) : "");
 
                 Chatter.of(target).system("CHALLENGE_ACCEPT", new Message("CHALLENGE_ACCEPT_HOVER"), ClickEvent.runCommand("/challenge " + p.getUsername() + " " + mode.getChatName() + " " + m));
             }

VelocityCore/src/de/steamwar/velocitycore/commands/CheckCommand.java

@@ -21,6 +21,7 @@ package de.steamwar.velocitycore.commands;
 
 import com.velocitypowered.api.proxy.Player;
 import de.steamwar.command.SWCommand;
+import de.steamwar.sql.GameModeConfig;
 import de.steamwar.linkage.Linked;
 import de.steamwar.messages.Chatter;
 import de.steamwar.messages.Message;
@@ -39,8 +40,8 @@ import net.kyori.adventure.text.format.NamedTextColor;
 import java.awt.*;
 import java.sql.Timestamp;
 import java.time.Instant;
-import java.util.List;
 import java.util.*;
+import java.util.List;
 import java.util.concurrent.TimeUnit;
 import java.util.function.BooleanSupplier;
 import java.util.logging.Level;
@@ -221,7 +222,7 @@ public class CheckCommand extends SWCommand {
             this.startTime = Timestamp.from(Instant.now());
             this.checkList = checkQuestions.get(schematic.getSchemtype()).listIterator();
 
-            ArenaMode mode = ArenaMode.getBySchemType(fightTypes.get(schematic.getSchemtype()));
+            GameModeConfig<String, String> mode = ArenaMode.getBySchemType(fightTypes.get(schematic.getSchemtype()));
             new ServerStarter().test(mode, mode.getRandomMap(), checker.getPlayer()).check(schematic.getId()).callback(subserver -> {
                 currentCheckers.put(checker.user().getUUID(), this);
                 currentSchems.put(schematic.getId(), this);

VelocityCore/src/de/steamwar/velocitycore/commands/FightCommand.java

@@ -21,6 +21,7 @@ package de.steamwar.velocitycore.commands;
 
 import com.velocitypowered.api.proxy.Player;
 import de.steamwar.command.SWCommand;
+import de.steamwar.sql.GameModeConfig;
 import de.steamwar.linkage.EventMode;
 import de.steamwar.linkage.Linked;
 import de.steamwar.messages.Chatter;
@@ -28,6 +29,7 @@ import de.steamwar.messages.Message;
 import de.steamwar.messages.PlayerChatter;
 import de.steamwar.persistent.Arenaserver;
 import de.steamwar.persistent.Subserver;
+import de.steamwar.sql.SchematicType;
 import de.steamwar.velocitycore.ArenaMode;
 import de.steamwar.velocitycore.ServerStarter;
 import de.steamwar.velocitycore.inventory.SWInventory;
@@ -48,8 +50,8 @@ public class FightCommand extends SWCommand {
 
     private static void getModes(Chatter sender, String precommand, boolean historic){
         Component start = Component.empty();
-        for(ArenaMode mode : ArenaMode.getAllModes()){
-            if (!mode.isActive() || mode.isHistoric() != historic)
+        for(GameModeConfig<String, String> mode : ArenaMode.getAllModes()){
+            if (!mode.isActive() || mode.Server.Historic != historic)
                 continue;
 
             String command = precommand + mode.getChatName();
@@ -64,7 +66,7 @@ public class FightCommand extends SWCommand {
         sender.sendMessage(start);
     }
 
-    static void createArena(PlayerChatter sender, String precommand, boolean allowMerging, ArenaMode arenaMode, String map, boolean historic, FightCallback callback) {
+    static void createArena(PlayerChatter sender, String precommand, boolean allowMerging, GameModeConfig<String, String> arenaMode, String map, boolean historic, FightCallback callback) {
         if (arenaMode == null) {
             getModes(sender, precommand, historic);
             return;
@@ -80,12 +82,12 @@ public class FightCommand extends SWCommand {
         }
     }
 
-    private static void suggestMerging(PlayerChatter sender, ArenaMode mode, String map, FightCallback declineMerge) {
+    private static void suggestMerging(PlayerChatter sender, GameModeConfig<String, String> mode, String map, FightCallback declineMerge) {
         Arenaserver mergable = null;
         synchronized (Subserver.getServerList()) {
             for (Subserver subserver : Subserver.getServerList()) {
                 if(subserver instanceof Arenaserver arenaserver &&
-                        (mode.getInternalName().equals(arenaserver.getMode()) && arenaserver.isAllowMerge() && arenaserver.getRegisteredServer().getPlayersConnected().size() == 1)) {
+                        (mode.configFile.getName().replace(".yml", "").equals(arenaserver.getMode()) && arenaserver.isAllowMerge() && arenaserver.getRegisteredServer().getPlayersConnected().size() == 1)) {
                     mergable = arenaserver;
                     break;
                 }
@@ -103,7 +105,7 @@ public class FightCommand extends SWCommand {
             declineMerge.run(sender, mode, map);
         });
         Arenaserver finalMergable = mergable;
-        SWItem item = new SWItem(new Message("FIGHT_MERGE_INFO", mode.getGameName(), finalMergable.getMap()), 11);
+        SWItem item = new SWItem(new Message("FIGHT_MERGE_INFO", mode.GameName, finalMergable.getMap()), 11);
         item.addLore(new Message("FIGHT_MERGE_INFO_LORE_1", finalMergable.getRegisteredServer().getPlayersConnected().toArray(new Player[1])[0].getUsername()));
         inventory.addItem(4, item, click -> {});
         inventory.addItem(8, new SWItem(new Message("FIGHT_MERGE_ACCEPT"), 10), click -> {
@@ -118,15 +120,15 @@ public class FightCommand extends SWCommand {
     }
 
     @Register
-    public void fight(@Validator("arenaPlayer") PlayerChatter sender, @Mapper("nonHistoricArenaMode") @OptionalValue("") @AllowNull ArenaMode arenaMode, @Mapper("arenaMap") @OptionalValue("") @AllowNull String map) {
+    public void fight(@Validator("arenaPlayer") PlayerChatter sender, @Mapper("nonHistoricArenaMode") @OptionalValue("") @AllowNull GameModeConfig<String, String> arenaMode, @Mapper("arenaMap") @OptionalValue("") @AllowNull String map) {
         createArena(sender, "/fight ", true, arenaMode, map, false,
                 (p, mode, m) -> new ServerStarter().arena(mode, m).blueLeader(p.getPlayer()).callback(
-                        arena -> Chatter.broadcast().system("FIGHT_BROADCAST", new Message("FIGHT_BROADCAST_HOVER", p.getPlayer().getUsername()), ClickEvent.runCommand("/arena " + arena.getServer().getName()), mode.getGameName(), p.getPlayer().getUsername())
+                        arena -> Chatter.broadcast().system("FIGHT_BROADCAST", new Message("FIGHT_BROADCAST_HOVER", p.getPlayer().getUsername()), ClickEvent.runCommand("/arena " + arena.getServer().getName()), mode.GameName, p.getPlayer().getUsername())
                 ).start()
         );
     }
 
     public interface FightCallback {
-        void run(PlayerChatter player, ArenaMode mode, String map);
+        void run(PlayerChatter player, GameModeConfig<String, String> mode, String map);
     }
 }

VelocityCore/src/de/steamwar/velocitycore/commands/HistoricCommand.java

@@ -20,12 +20,13 @@
 package de.steamwar.velocitycore.commands;
 
 import de.steamwar.command.SWCommand;
+import de.steamwar.sql.GameModeConfig;
 import de.steamwar.linkage.EventMode;
 import de.steamwar.linkage.Linked;
 import de.steamwar.messages.Chatter;
 import de.steamwar.messages.Message;
 import de.steamwar.messages.PlayerChatter;
-import de.steamwar.velocitycore.ArenaMode;
+import de.steamwar.sql.SchematicType;
 import de.steamwar.velocitycore.ServerStarter;
 import net.kyori.adventure.text.event.ClickEvent;
 
@@ -37,9 +38,9 @@ public class HistoricCommand extends SWCommand {
     }
 
     @Register
-    public void historic(@Validator("arenaPlayer") PlayerChatter player, @Mapper("historicArenaMode") @OptionalValue("") @AllowNull ArenaMode arenaMode, @Mapper("arenaMap") @OptionalValue("") @AllowNull String map) {
+    public void historic(@Validator("arenaPlayer") PlayerChatter player, @Mapper("historicArenaMode") @OptionalValue("") @AllowNull GameModeConfig<String, String> arenaMode, @Mapper("arenaMap") @OptionalValue("") @AllowNull String map) {
         FightCommand.createArena(player, "/historic ", true, arenaMode, map, true, (p, mode, m) -> new ServerStarter().arena(mode, m).blueLeader(p.getPlayer()).callback(
-                arena -> Chatter.broadcast().system("HISTORIC_BROADCAST", new Message("HISTORIC_BROADCAST_HOVER", p), ClickEvent.runCommand("/arena " + arena.getServer().getName()), mode.getGameName(), p.getPlayer())
+                arena -> Chatter.broadcast().system("HISTORIC_BROADCAST", new Message("HISTORIC_BROADCAST_HOVER", p), ClickEvent.runCommand("/arena " + arena.getServer().getName()), mode.GameName, p.getPlayer())
         ).start());
     }
 }

VelocityCore/src/de/steamwar/velocitycore/commands/RankCommand.java

@@ -20,9 +20,11 @@
 package de.steamwar.velocitycore.commands;
 
 import de.steamwar.command.SWCommand;
+import de.steamwar.sql.GameModeConfig;
 import de.steamwar.linkage.Linked;
 import de.steamwar.messages.Chatter;
 import de.steamwar.messages.Message;
+import de.steamwar.sql.SchematicType;
 import de.steamwar.sql.SteamwarUser;
 import de.steamwar.sql.UserElo;
 import de.steamwar.velocitycore.ArenaMode;
@@ -46,8 +48,8 @@ public class RankCommand extends SWCommand {
         if (!sender.user().equals(user))
             sender.prefixless("RANK_PLAYER_FOUND", user);
 
-        for(ArenaMode mode : ArenaMode.getAllModes()) {
-            if (!mode.isRanked())
+        for(GameModeConfig<String, String> mode : ArenaMode.getAllModes()) {
+            if (!mode.Server.Ranked)
                 continue;
 
             Optional<Integer> elo = UserElo.getElo(user.getId(), mode.getSchemTypeOrInternalName());

VelocityCore/src/de/steamwar/velocitycore/commands/ReplayCommand.java

@@ -19,17 +19,18 @@
 
 package de.steamwar.velocitycore.commands;
 
+import de.steamwar.command.SWCommand;
+import de.steamwar.sql.GameModeConfig;
 import de.steamwar.linkage.EventMode;
 import de.steamwar.linkage.Linked;
-import de.steamwar.velocitycore.ArenaMode;
 import de.steamwar.messages.Message;
+import de.steamwar.messages.PlayerChatter;
+import de.steamwar.sql.*;
+import de.steamwar.velocitycore.ArenaMode;
 import de.steamwar.velocitycore.ServerStarter;
 import de.steamwar.velocitycore.inventory.SWItem;
 import de.steamwar.velocitycore.inventory.SWListInv;
 import de.steamwar.velocitycore.inventory.SWStreamInv;
-import de.steamwar.command.SWCommand;
-import de.steamwar.messages.PlayerChatter;
-import de.steamwar.sql.*;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -68,7 +69,7 @@ public class ReplayCommand extends SWCommand {
         if (PunishmentCommand.isPunishedWithMessage(sender, Punishment.PunishmentType.NoFightServer))
             return;
 
-        ArenaMode mode = ArenaMode.getBySchemType(fight.getSchemType());
+        GameModeConfig<String, String> mode = ArenaMode.getBySchemType(fight.getSchemType());
         ServerStarter starter = new ServerStarter().replay(fight.getFightID()).blueLeader(sender.getPlayer());
 
         String map = mode.getRandomMap();

VelocityCore/src/de/steamwar/velocitycore/commands/TypeMappers.java

@@ -19,14 +19,16 @@
 
 package de.steamwar.velocitycore.commands;
 
-import de.steamwar.velocitycore.ArenaMode;
 import de.steamwar.command.PreviousArguments;
 import de.steamwar.command.SWCommandUtils;
 import de.steamwar.command.TypeMapper;
 import de.steamwar.command.TypeValidator;
+import de.steamwar.sql.GameModeConfig;
 import de.steamwar.messages.Chatter;
 import de.steamwar.messages.PlayerChatter;
 import de.steamwar.sql.Punishment;
+import de.steamwar.sql.SchematicType;
+import de.steamwar.velocitycore.ArenaMode;
 import lombok.experimental.UtilityClass;
 
 import java.util.Collection;
@@ -45,13 +47,13 @@ public class TypeMappers {
         return (sender, player, messageSender) -> !PunishmentCommand.isPunishedWithMessage(player, Punishment.PunishmentType.NoFightServer);
     }
 
-    private static TypeMapper<ArenaMode> arenaModeTypeMapper(boolean historic) {
+    private static TypeMapper<GameModeConfig<String, String>> arenaModeTypeMapper(boolean historic) {
         return new TypeMapper<>() {
             @Override
-            public ArenaMode map(Chatter sender, PreviousArguments previousArguments, String s) {
-                ArenaMode arenaMode = ArenaMode.getByChat(s);
+            public GameModeConfig<String, String> map(Chatter sender, PreviousArguments previousArguments, String s) {
+                GameModeConfig<String, String> arenaMode = ArenaMode.getByChat(s);
                 if (arenaMode == null) return null;
-                if (arenaMode.isHistoric() != historic) return null;
+                if (arenaMode.Server.Historic != historic) return null;
                 if (!arenaMode.isActive()) return null;
                 return arenaMode;
             }
@@ -74,9 +76,9 @@ public class TypeMappers {
             @Override
             public Collection<String> tabCompletes(Chatter sender, PreviousArguments previousArguments, String s) {
                 if (previousArguments.userArgs.length == 0) return null;
-                ArenaMode arenaMode = ArenaMode.getByChat(previousArguments.userArgs[previousArguments.userArgs.length - 1]);
+                GameModeConfig<String, String> arenaMode = ArenaMode.getByChat(previousArguments.userArgs[previousArguments.userArgs.length - 1]);
                 if (arenaMode == null) return null;
-                return arenaMode.getMaps();
+                return arenaMode.Server.Maps;
             }
         };
     }

VelocityCore/src/de/steamwar/velocitycore/listeners/ChatListener.java

@@ -29,6 +29,7 @@ import com.velocitypowered.api.proxy.ConsoleCommandSource;
 import com.velocitypowered.api.proxy.Player;
 import com.velocitypowered.api.proxy.ServerConnection;
 import com.velocitypowered.api.proxy.server.ServerInfo;
+import de.steamwar.sql.GameModeConfig;
 import de.steamwar.linkage.Linked;
 import de.steamwar.messages.Chatter;
 import de.steamwar.messages.ChatterGroup;
@@ -56,7 +57,7 @@ public class ChatListener extends BasicListener {
 
     private static final Logger cmdLogger = Logger.getLogger("Command logger");
 
-    private static final List<String> rankedModes = ArenaMode.getAllModes().stream().filter(ArenaMode::isRanked).map(ArenaMode::getSchemTypeOrInternalName).toList();
+    private static final List<String> rankedModes = ArenaMode.getAllModes().stream().filter(gameModeConfig -> gameModeConfig.Server.Ranked).map(GameModeConfig::getSchemTypeOrInternalName).toList();
 
     private static final Set<String> noLogCommands = Set.of("webpw", "webpassword", "web");