Add API V2

Signed-off-by: Chaoscaot <max@maxsp.de>

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/dev/CreateKitCommand.java

@@ -1,63 +0,0 @@
-/*
- *   This file is a part of the SteamWar software.
- *
- *   Copyright (C) 2026 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.features.dev;
-
-import de.steamwar.bausystem.BauSystem;
-import de.steamwar.command.SWCommand;
-import de.steamwar.linkage.Linked;
-import org.bukkit.configuration.file.YamlConfiguration;
-import org.bukkit.entity.Player;
-
-import java.io.File;
-import java.io.IOException;
-
-@Linked
-public class CreateKitCommand extends SWCommand {
-
-    public CreateKitCommand() {
-        super("createkit");
-        if (!BauSystem.DEV_SERVER) unregister();
-    }
-
-    @Register
-    public void onCommand(Player player, String name) {
-        YamlConfiguration yaml = new YamlConfiguration();
-
-        yaml.set("Items", player.getInventory().getContents());
-        yaml.set("Armor", player.getInventory().getArmorContents());
-        yaml.set("Effects", player.getActivePotionEffects());
-        yaml.set("LeaderAllowed", true);
-        yaml.set("MemberAllowed", true);
-        yaml.set("EnterStage", 0);
-        yaml.set("TNT", true);
-
-        YamlConfiguration kits = new YamlConfiguration();
-
-        kits.set("Kits." + name, yaml);
-
-        try {
-            kits.save(new File("new.kits.yaml"));
-
-            player.sendMessage("Kit created!");
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-    }
-}

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

@@ -67,7 +67,11 @@ public class TNTListener implements Listener, ScoreboardElement {
 
     @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
     public void onExplode(EntityExplodeEvent event) {
-        explode(event.blockList(), event.getEntity() instanceof TNTPrimed);
+        if (!(event.getEntity() instanceof TNTPrimed)) {
+            event.blockList().clear();
+            return;
+        }
+        explode(event.blockList(), true);
     }
 
     @Override

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/rendering/ViewFlag.java

@@ -135,7 +135,7 @@ public abstract class ViewFlag {
                 }
 
                 Location secoundLocation;
-                if (Math.abs(previousVelocity.getX()) >= Math.abs(previousVelocity.getZ())) {
+                if (previousVelocity.getX() >= previousVelocity.getZ()) {
                     secoundLocation = previous.getLocation().clone().add(delta.getX(), delta.getY(), 0);
                 } else {
                     secoundLocation = previous.getLocation().clone().add(0, delta.getY(), delta.getZ());
@@ -198,16 +198,6 @@ public abstract class ViewFlag {
         }
     };
 
-    public static ViewFlag HIGHLIGHT = new ViewFlag(true, false, "highlight", "h") {
-        @Override
-        public void modify(REntityServer server, List<TraceEntity> entities) {
-            for (TraceEntity entity : entities) {
-                entity.setGlowing(true);
-            }
-        }
-
-    };
-
     /**
      * Name of the flag
      */

CommonCore/SQL/src/de/steamwar/sql/AuditLog.kt

@@ -28,11 +28,11 @@ import org.jetbrains.exposed.v1.javatime.timestamp
 import java.time.Instant
 
 object AuditLogTable: IntIdTable("AuditLog", "AuditLogId") {
-    val time = timestamp("Time").index()
+    val time = timestamp("Time")
-    val server = varchar("ServerName", 255).index()
+    val server = varchar("ServerName", 255)
-    val serverOwner = reference("ServerOwner", SteamwarUserTable).nullable().index()
+    val serverOwner = reference("ServerOwner", SteamwarUserTable).nullable()
-    val actor = reference("Actor", SteamwarUserTable).index()
+    val actor = reference("Actor", SteamwarUserTable)
-    val action = enumerationByName("ActionType", 255, AuditLog.Type::class).index()
+    val action = enumerationByName("ActionType", 255, AuditLog.Type::class)
     val actionText = text("ActionText")
 }
 

CommonCore/SQL/src/de/steamwar/sql/BannedUserIPs.kt

@@ -33,8 +33,8 @@ import java.sql.Timestamp
 import java.time.Instant
 
 object BannedUserIPsTable: CompositeIdTable("BannedUserIPs") {
-    val userId = reference("UserID", SteamwarUserTable).index()
+    val userId = reference("UserID", SteamwarUserTable)
-    val timestamp = timestamp("Timestamp").index()
+    val timestamp = timestamp("Timestamp")
     val ip = varchar("IP", 45).entityId()
 
     init {

CommonCore/SQL/src/de/steamwar/sql/BauweltMember.kt

@@ -32,8 +32,8 @@ import org.jetbrains.exposed.v1.jdbc.insertIgnore
 import java.util.*
 
 object BauweltMemberTable: CompositeIdTable("BauweltMember") {
-    val bauweltId = reference("BauweltID", SteamwarUserTable).index()
+    val bauweltId = reference("BauweltID", SteamwarUserTable)
-    val memberId = reference("MemberID", SteamwarUserTable).index()
+    val memberId = reference("MemberID", SteamwarUserTable)
     val build = bool("Build")
     val worldEdit = bool("WorldEdit")
     val world = bool("World")

CommonCore/SQL/src/de/steamwar/sql/CheckedSchematic.kt

@@ -20,7 +20,6 @@
 package de.steamwar.sql
 
 import de.steamwar.sql.internal.useDb
-import org.jetbrains.exposed.v1.core.ReferenceOption
 import org.jetbrains.exposed.v1.core.SortOrder
 import org.jetbrains.exposed.v1.core.and
 import org.jetbrains.exposed.v1.core.dao.id.CompositeID
@@ -35,23 +34,19 @@ import org.jetbrains.exposed.v1.jdbc.insertIgnore
 import java.sql.Timestamp
 
 object CheckedSchematicTable: CompositeIdTable("CheckedSchematic") {
-    val nodeId = optReference("NodeId", SchematicNodeTable, onDelete = ReferenceOption.SET_NULL, onUpdate = ReferenceOption.SET_NULL).index()
+    val nodeId = optReference("NodeId", SchematicNodeTable)
-    val nodeOwner = reference("NodeOwner", SteamwarUserTable).index()
+    val nodeOwner = reference("NodeOwner", SteamwarUserTable)
-    val nodeName = varchar("NodeName", 64).entityId().index()
+    val nodeName = varchar("NodeName", 64).entityId()
-    val validator = reference("Validator", SteamwarUserTable).index()
+    val validator = reference("Validator", SteamwarUserTable)
-    val startTime = timestamp("StartTime").entityId().index()
+    val startTime = timestamp("StartTime").entityId()
     val endTime = timestamp("EndTime")
     val declineReason = text("DeclineReason")
-    val seen = bool("Seen").index()
+    val seen = bool("Seen")
     val nodeType = varchar("NodeType", 16)
 
     init {
         addIdColumn(nodeOwner)
         addIdColumn(nodeName)
-
-        index(false, nodeOwner, endTime)
-        index(false, startTime, endTime, nodeName)
-        index(false, seen, nodeOwner, startTime)
     }
 }
 

CommonCore/SQL/src/de/steamwar/sql/Event.kt

@@ -36,8 +36,8 @@ import java.time.Instant
 object EventTable : IntIdTable("Event", "EventId") {
     val name = varchar("EventName", 100).uniqueIndex()
     val deadline = timestamp("Deadline")
-    val start = timestamp("Start").index()
+    val start = timestamp("Start")
-    val end = timestamp("End").index()
+    val end = timestamp("End")
     val maxPlayers = integer("MaximumTeamMembers")
     val schemType = varchar("SchemType", 16).nullable()
     val publicsOnly = bool("PublicSchemsOnly")

CommonCore/SQL/src/de/steamwar/sql/EventFight.kt

@@ -33,17 +33,17 @@ import java.time.Instant
 import java.util.*
 
 object EventFightTable : IntIdTable("EventFight", "FightID") {
-    val eventId = reference("EventID", EventTable).index()
+    val eventId = reference("EventID", EventTable)
-    val startTime = timestamp("StartTime").index()
+    val startTime = timestamp("StartTime")
     val gamemode = text("Spielmodus")
     val map = text("Map")
-    val groupId = optReference("GroupId", EventGroupTable).index()
+    val groupId = optReference("GroupId", EventGroupTable)
-    val teamBlue = reference("TeamBlue", TeamTable).index()
+    val teamBlue = reference("TeamBlue", TeamTable)
-    val teamRed = reference("TeamRed", TeamTable).index()
+    val teamRed = reference("TeamRed", TeamTable)
     val spectatePort = integer("SpectatePort").nullable()
     val bestOf = integer("BestOf")
     val ergebnis = integer("Ergebnis")
-    val fight = optReference("Fight", FightTable).index()
+    val fight = optReference("Fight", FightTable)
 }
 
 class EventFight(id: EntityID<Int>) : IntEntity(id), Comparable<EventFight> {

CommonCore/SQL/src/de/steamwar/sql/EventGroup.kt

@@ -34,10 +34,6 @@ object EventGroupTable : IntIdTable("EventGroup", "Id") {
     val pointsPerWin = integer("PointsPerWin").default(3)
     val pointsPerLoss = integer("PointsPerLoss").default(0)
     val pointsPerDraw = integer("PointsPerDraw").default(1)
-
-    init {
-        uniqueIndex(event, name)
-    }
 }
 
 class EventGroup(id: EntityID<Int>) : IntEntity(id) {
@@ -94,7 +90,7 @@ class EventGroup(id: EntityID<Int>) : IntEntity(id) {
         set(value) {
             groupPointsPerDraw = value
         }
-    val dependents by lazy { EventRelation.getGroupRelations(this) }
+    val dependents by lazy { EventRelation.getGroupRelations(this).toList() }
     val lastFight by lazy { Optional.ofNullable(fights.maxByOrNull { it.startTime }) }
 
     fun getId() = id.value

CommonCore/SQL/src/de/steamwar/sql/EventRelation.kt

@@ -29,7 +29,7 @@ import org.jetbrains.exposed.v1.dao.IntEntityClass
 import org.jetbrains.exposed.v1.jdbc.select
 
 object EventRelationTable : IntIdTable("EventRelation") {
-    val fightId = reference("FightId", EventFightTable).index()
+    val fightId = reference("FightId", EventFightTable)
     val fightTeam = enumeration("FightTeam", EventRelation.FightTeam::class)
     val fromType = enumeration("FromType", EventRelation.FromType::class)
     val fromId = integer("FromId")
@@ -51,11 +51,11 @@ class EventRelation(id: EntityID<Int>) : IntEntity(id) {
 
         @JvmStatic
         fun getFightRelations(fight: EventFight) =
-            useDb { find { (EventRelationTable.fromId eq fight.id.value) and (EventRelationTable.fromType eq FromType.FIGHT) }.toList() }
+            useDb { find { (EventRelationTable.fromId eq fight.id.value) and (EventRelationTable.fromType eq FromType.FIGHT) } }
 
         @JvmStatic
         fun getGroupRelations(group: EventGroup) =
-            useDb { find { (EventRelationTable.fromId eq group.id.value) and (EventRelationTable.fromType eq FromType.GROUP) }.toList() }
+            useDb { find { (EventRelationTable.fromId eq group.id.value) and (EventRelationTable.fromType eq FromType.GROUP) } }
 
         @JvmStatic
         fun create(fight: EventFight, fightTeam: FightTeam, fromType: FromType, fromId: Int, fromPlace: Int) = useDb {

CommonCore/SQL/src/de/steamwar/sql/Fight.kt

@@ -34,14 +34,14 @@ import org.jetbrains.exposed.v1.jdbc.update
 import java.sql.Timestamp
 
 object FightTable : IntIdTable("Fight", "FightId") {
-    val gamemode = varchar("Gamemode", 30).index()
+    val gamemode = varchar("Gamemode", 30)
     val server = text("Server")
     val startTime = timestamp("StartTime")
     val duration = integer("Duration")
-    val blueLeader = reference("BlueLeader", SteamwarUserTable).index()
+    val blueLeader = reference("BlueLeader", SteamwarUserTable)
-    val redLeader = reference("RedLeader", SteamwarUserTable).index()
+    val redLeader = reference("RedLeader", SteamwarUserTable)
-    val blueSchem = optReference("BlueSchem", SchematicNodeTable, onDelete = ReferenceOption.SET_NULL).index()
+    val blueSchem = optReference("BlueSchem", SchematicNodeTable, onDelete = ReferenceOption.SET_NULL)
-    val redSchem = optReference("RedSchem", SchematicNodeTable, onDelete = ReferenceOption.SET_NULL).index()
+    val redSchem = optReference("RedSchem", SchematicNodeTable, onDelete = ReferenceOption.SET_NULL)
     val win = enumeration("Win", Fight.WinningTeam::class)
     val winCondition = varchar("WinCondition", 100)
     val replayAvailable = bool("ReplayAvailable")

CommonCore/SQL/src/de/steamwar/sql/FightPlayer.kt

@@ -30,7 +30,7 @@ import org.jetbrains.exposed.v1.jdbc.insertIgnore
 
 object FightPlayerTable : CompositeIdTable("FightPlayer") {
     val fightId = reference("FightId", FightTable)
-    val userId = reference("UserId", SteamwarUserTable).index()
+    val userId = reference("UserId", SteamwarUserTable)
     val team = integer("Team")
     val kit = varchar("Kit", 64)
     val kills = integer("Kills")

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

@@ -52,10 +52,6 @@ public final class GameModeConfig<M, W> {
     private static final Map<String, GameModeConfig<?, String>> byGameName;
     private static final Map<SchematicType, GameModeConfig<?, String>> bySchematicType;
 
-    public static <M> Collection<GameModeConfig<M, String>> getAll() {
-        return (Collection) byFileName.values();
-    }
-
     public static <M> GameModeConfig<M, String> getByFileName(File file) {
         return (GameModeConfig<M, String>) byFileName.get(file.getName());
     }
@@ -91,24 +87,8 @@ public final class GameModeConfig<M, W> {
         byFileName = new HashMap<>();
         byGameName = new HashMap<>();
         bySchematicType = new HashMap<>();
+        SchematicType.values();
         DEFAULTS = SQLWrapper.impl.loadGameModeConfig(null);
-        init();
-    }
-
-    public static void init() {
-        byFileName.clear();
-        byGameName.clear();
-        bySchematicType.clear();
-
-        File folder = SQLWrapper.impl.getSchemTypesFolder();
-        if (!folder.exists()) return;
-        if (!folder.isDirectory()) return;
-
-        for (File file : Objects.requireNonNull(folder.listFiles())) {
-            if (!file.getName().endsWith(".yml")) continue;
-            if (file.getName().endsWith(".kits.yml")) continue;
-            SQLWrapper.impl.loadGameModeConfig(file);
-        }
 
         byFileName.values().forEach(gameModeConfig -> {
             List<SchematicType> subTypes = Collections.unmodifiableList(gameModeConfig.Schematic.SubTypesStrings.stream()
@@ -691,9 +671,9 @@ public final class GameModeConfig<M, W> {
             loaded = loader.canLoad();
             Size = new SizeConfig(loader.with("Size"));
             Inset = new InsetConfig(loader.with("Inset"));
-            Type = null;
+            Type = loader.getSchematicType("Type", "Normal");
             SubTypesStrings = loader.getStringList("SubTypes");
-            SubTypes = new ArrayList<>();
+            SubTypes = loader.getSchematicTypeList("SubTypes");
             Shortcut = loader.getString("Shortcut", "");
             Material = loader.getMaterial("Material", "STONE_BUTTON");
             ManualCheck = loader.getBoolean("ManualCheck", true);

CommonCore/SQL/src/de/steamwar/sql/IgnoreSystem.kt

@@ -30,8 +30,8 @@ import org.jetbrains.exposed.v1.dao.CompositeEntityClass
 import java.util.*
 
 object IgnoreSystemTable: CompositeIdTable("IgnoredPlayers") {
-    val ignorer = reference("Ignorer", SteamwarUserTable).index()
+    val ignorer = reference("Ignorer", SteamwarUserTable)
-    val ignored = reference("Ignored", SteamwarUserTable).index()
+    val ignored = reference("Ignored", SteamwarUserTable)
 
     override val primaryKey = PrimaryKey(ignorer, ignored)
 

CommonCore/SQL/src/de/steamwar/sql/NodeData.kt

@@ -35,7 +35,7 @@ import java.io.InputStream
 import java.util.zip.GZIPInputStream
 
 object NodeDataTable: CompositeIdTable("NodeData") {
-    val nodeId = reference("NodeId", SchematicNodeTable).index()
+    val nodeId = reference("NodeId", SchematicNodeTable)
     val createdAt = timestamp("CreatedAt").defaultExpression(CurrentTimestamp).entityId()
     val nodeFormat = enumeration("NodeFormat", NodeData.SchematicFormat::class)
     val schemData = blob("SchemData")

CommonCore/SQL/src/de/steamwar/sql/NodeDownload.kt

@@ -20,7 +20,6 @@
 package de.steamwar.sql
 
 import de.steamwar.sql.internal.useDb
-import org.jetbrains.exposed.v1.core.ReferenceOption
 import org.jetbrains.exposed.v1.core.dao.id.EntityID
 import org.jetbrains.exposed.v1.core.dao.id.IdTable
 import org.jetbrains.exposed.v1.core.eq
@@ -33,8 +32,8 @@ import java.sql.Timestamp
 import java.time.Instant
 
 object NodeDownloadTable: IdTable<Int>("NodeDownload") {
-    override val id = reference("NodeId", SchematicNodeTable, onDelete = ReferenceOption.CASCADE).uniqueIndex()
+    override val id = reference("NodeId", SchematicNodeTable).uniqueIndex()
-    val link = varchar("Link", 255).uniqueIndex()
+    val link = varchar("Link", 255)
     val timestamp = timestamp("Timestamp").defaultExpression(CurrentTimestamp)
 }
 

CommonCore/SQL/src/de/steamwar/sql/NodeMember.kt

@@ -20,7 +20,6 @@
 package de.steamwar.sql
 
 import de.steamwar.sql.internal.useDb
-import org.jetbrains.exposed.v1.core.ReferenceOption
 import org.jetbrains.exposed.v1.core.and
 import org.jetbrains.exposed.v1.core.dao.id.CompositeID
 import org.jetbrains.exposed.v1.core.dao.id.CompositeIdTable
@@ -33,9 +32,9 @@ import java.util.*
 import kotlin.jvm.optionals.getOrNull
 
 object NodeMemberTable : CompositeIdTable("NodeMember") {
-    val node = reference("NodeId", SchematicNodeTable, onDelete = ReferenceOption.CASCADE, onUpdate = ReferenceOption.CASCADE).index()
+    val node = reference("NodeId", SchematicNodeTable)
-    val userId = reference("UserId", SteamwarUserTable).index()
+    val userId = reference("UserId", SteamwarUserTable)
-    val parentNode = optReference("ParentId", SchematicNodeTable).index()
+    val parentNode = optReference("ParentId", SchematicNodeTable)
 
     override val primaryKey = PrimaryKey(node, userId)
 

CommonCore/SQL/src/de/steamwar/sql/PersonalKit.kt

@@ -41,7 +41,6 @@ object PersonalKitTable: CompositeIdTable("PersonalKit") {
 
     init {
         addIdColumn(userId)
-        index(false, userId, gamemode)
     }
 }
 

CommonCore/SQL/src/de/steamwar/sql/Punishment.kt

@@ -34,16 +34,12 @@ import java.util.function.Consumer
 
 object PunishmentTable : IntIdTable("Punishments", "PunishmentId") {
     val userId = reference("UserId", SteamwarUserTable)
-    val punisher = reference("Punisher", SteamwarUserTable).index()
+    val punisher = reference("Punisher", SteamwarUserTable)
     val type = enumerationByName("Type", 32, Punishment.PunishmentType::class)
     val startTime = timestamp("StartTime")
     val endTime = timestamp("EndTime")
     val perma = bool("Perma")
     val reason = text("Reason")
-
-    init {
-        index(false, userId, type)
-    }
 }
 
 class Punishment(id: EntityID<Int>) : IntEntity(id) {

CommonCore/SQL/src/de/steamwar/sql/Referee.kt

@@ -30,7 +30,7 @@ import org.jetbrains.exposed.v1.dao.CompositeEntityClass
 
 object RefereeTable: CompositeIdTable("Referee") {
     val eventId = reference("EventId", EventTable)
-    val userId = reference("UserId", SteamwarUserTable).index()
+    val userId = reference("UserId", SteamwarUserTable)
 
     override val primaryKey = PrimaryKey(eventId, userId)
 

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

@@ -36,5 +36,8 @@ public interface SQLWrapper<M> {
         return Collections.emptyList();
     }
 
+    default void processSchematicType(GameModeConfig<?, String> gameModeConfig) {
+    }
+
     void additionalExceptionMetadata(StringBuilder builder);
 }

CommonCore/SQL/src/de/steamwar/sql/SchematicNode.kt

@@ -34,17 +34,13 @@ import java.util.*
 import java.util.function.Consumer
 
 object SchematicNodeTable : IntIdTable("SchematicNode", "NodeId") {
-    val owner = reference("NodeOwner", SteamwarUserTable).index()
+    val owner = reference("NodeOwner", SteamwarUserTable)
     val name = varchar("NodeName", 64)
-    val parent = optReference("ParentNode", SchematicNodeTable).index()
+    val parent = optReference("ParentNode", SchematicNodeTable)
     val lastUpdate = timestamp("LastUpdate").defaultExpression(CurrentTimestamp)
     val item = text("NodeItem")
-    val type = varchar("NodeType", 16).nullable().index()
+    val type = varchar("NodeType", 16).nullable()
     val config = integer("Config")
-
-    init {
-        uniqueIndex(parent, owner, name)
-    }
 }
 
 class SchematicNode(id: EntityID<Int>) : IntEntity(id) {

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

@@ -19,7 +19,11 @@
 
 package de.steamwar.sql
 
+import java.io.File
 import java.util.*
+import java.util.Locale
+import java.util.Locale.getDefault
+import java.util.stream.Collectors
 
 data class SchematicType(
     val name: String,
@@ -43,65 +47,58 @@ data class SchematicType(
         @JvmField
         val Normal = SchematicType("Normal", "", Type.NORMAL, null, "STONE_BUTTON", false)
 
-        private val types: MutableList<SchematicType> = mutableListOf()
+        private val types: List<SchematicType>
-        private val fromDB: MutableMap<String, SchematicType> = mutableMapOf()
+        private val fromDB: Map<String, SchematicType>?
 
         init {
-            GameModeConfig.init()
+            val tmpTypes = mutableListOf<SchematicType>()
-            init()
+            val tmpFromDB = mutableMapOf<String, SchematicType>()
+
+            tmpTypes.add(Normal)
+            tmpFromDB[Normal.toDB()] = Normal
+
+            val folder = SQLWrapper.impl.schemTypesFolder
+            if (folder.exists()) {
+                for (configFile in Arrays.stream<File?>(folder.listFiles { _, name ->
+                    name.endsWith(
+                        ".yml"
+                    ) && !name.endsWith(".kits.yml")
+                }).sorted().collect(Collectors.toList())) {
+                    val gameModeConfig = SQLWrapper.impl.loadGameModeConfig(configFile)
+                    if (gameModeConfig.Schematic.Type == null) continue
+                    if (tmpFromDB.containsKey(gameModeConfig.Schematic.Type.toDB())) continue
+                    val current = gameModeConfig.Schematic.Type
+                    if (gameModeConfig.CheckQuestions.isNotEmpty()) {
+                        val checkType = current.checkType
+                        tmpTypes.add(checkType!!)
+                        tmpFromDB[checkType.toDB()] = checkType
+                    }
+                    tmpTypes.add(current)
+                    tmpFromDB[current.toDB()] = current
+                    SQLWrapper.impl.processSchematicType(gameModeConfig)
+                }
+            }
+
+            types = tmpTypes.toList()
+            fromDB = tmpFromDB.toMap()
         }
 
         @JvmStatic
-        fun init() {
+        fun values() = types
-            types.clear()
-            fromDB.clear()
-
-            types.add(Normal)
-            fromDB[Normal.toDB()] = Normal
-
-            for (gameModeConfig in GameModeConfig.getAll<Any>()) {
-                val type = gameModeConfig.Schematic.Type
-                    ?: continue
-                if (fromDB.containsKey(type.toDB())) continue
-
-                types.add(type)
-                fromDB[type.toDB()] = type
-                if (gameModeConfig.CheckQuestions.isNotEmpty() && type.checkType != null) {
-                    types.add(type.checkType)
-                    fromDB[type.checkType.toDB()] = type.checkType
-                }
-            }
-        }
 
         @JvmStatic
-        fun values() =
+        fun fromDB(value: String) = fromDB?.let { it[value.lowercase()] }
-            types
-
-        @JvmStatic
-        fun fromDB(value: String) =
-            fromDB[value.lowercase()]
     }
 
-    fun name() =
+    fun name() = name
-        name
+    fun toDB() = name.lowercase()
 
-    fun toDB() =
+    fun check() = type == Type.CHECK_TYPE
-        name.lowercase()
+    fun fightType() = type == Type.FIGHT_TYPE
+    fun writeable() = type == Type.NORMAL
 
-    fun check() =
+    fun checkType() = if (manualCheck) checkType else this
-        type == Type.CHECK_TYPE
+    fun isAssignable() = type == Type.NORMAL || (type == Type.FIGHT_TYPE && checkType != null) || !manualCheck
-
-    fun fightType() =
-        type == Type.FIGHT_TYPE
-
-    fun writeable() =
-        type == Type.NORMAL
-
-    fun checkType() =
-        if (manualCheck) checkType else this
-
-    fun isAssignable() =
-        type == Type.NORMAL || (type == Type.FIGHT_TYPE && checkType != null) || !manualCheck
 
     enum class Type {
         NORMAL,

CommonCore/SQL/src/de/steamwar/sql/Script.kt

@@ -28,13 +28,9 @@ import org.jetbrains.exposed.v1.dao.IntEntity
 import org.jetbrains.exposed.v1.dao.IntEntityClass
 
 object ScriptTable: IntIdTable("Script") {
-    val userId = reference("UserId", SteamwarUserTable).index()
+    val userId = reference("UserId", SteamwarUserTable)
     val name = varchar("Name", 64)
     val code = text("Code")
-
-    init {
-        uniqueIndex(userId, name)
-    }
 }
 
 class Script(id: EntityID<Int>) : IntEntity(id) {

CommonCore/SQL/src/de/steamwar/sql/Session.kt

@@ -28,7 +28,7 @@ import org.jetbrains.exposed.v1.jdbc.insert
 import java.sql.Timestamp
 
 object SessionTable: Table("Session") {
-    val userId = reference("UserId", SteamwarUserTable).index()
+    val userId = reference("UserId", SteamwarUserTable)
     val startTime = timestamp("StartTime")
     val endTime = timestamp("EndTime").defaultExpression(CurrentTimestamp)
 }

CommonCore/SQL/src/de/steamwar/sql/SteamwarUser.kt

@@ -37,15 +37,15 @@ import javax.crypto.SecretKeyFactory
 import javax.crypto.spec.PBEKeySpec
 
 object SteamwarUserTable : IntIdTable("UserData", "id") {
-    val uuid = varchar("UUID", 36).uniqueIndex()
+    val uuid = varchar("UUID", 36)
-    val username = varchar("UserName", 32).index()
+    val username = varchar("UserName", 32)
-    val team = reference("Team", TeamTable).index()
+    val team = reference("Team", TeamTable)
     val leader = bool("Leader")
     val locale = varchar("Locale", 16).nullable()
     val manualLocale = bool("ManualLocale")
     val bedrock = bool("Bedrock")
     val password = text("Password").nullable()
-    val discordId = long("DiscordId").nullable().uniqueIndex()
+    val discordId = long("DiscordId").nullable()
 }
 
 class SteamwarUser(id: EntityID<Int>): IntEntity(id) {
@@ -198,7 +198,7 @@ class SteamwarUser(id: EntityID<Int>): IntEntity(id) {
 
     var discordId by SteamwarUserTable.discordId
 
-    private val punishments by lazy { Punishment.getPunishmentsOfPlayer(id.value) }
+    val punishments by lazy { Punishment.getPunishmentsOfPlayer(id.value) }
     private val perms by lazy { UserPerm.getPerms(id.value) }
     private val prefix by lazy { perms.firstOrNull { UserPerm.prefixes.containsKey(it) }?.let { UserPerm.prefixes[it]} ?: UserPerm.emptyPrefix }
 

CommonCore/SQL/src/de/steamwar/sql/Team.kt

@@ -28,9 +28,9 @@ import org.jetbrains.exposed.v1.dao.IntEntityClass
 import org.jetbrains.exposed.v1.jdbc.select
 
 object TeamTable : IntIdTable("Team", "TeamID") {
-    val kuerzel = varchar("TeamKuerzel", 10).index()
+    val kuerzel = varchar("TeamKuerzel", 10)
     val color = char("TeamColor", 1).default("8")
-    val name = varchar("TeamName", 16).index()
+    val name = varchar("TeamName", 16)
     val deleted = bool("TeamDeleted").default(false)
 }
 
@@ -66,6 +66,7 @@ class Team(id: EntityID<Int>) : IntEntity(id) {
     var deleted by TeamTable.deleted
         private set
     val members by lazy { useDb { SteamwarUserTable.select(SteamwarUserTable.id).where { SteamwarUserTable.team eq teamId }.map { it[SteamwarUserTable.id].value } } }
+    val membersUser by lazy { useDb { SteamwarUser.find { SteamwarUserTable.team eq teamId }.toList() } }
 
     fun size() = useDb { SteamwarUser.find { SteamwarUserTable.team eq teamId }.count().toInt() }
     fun disband(user: SteamwarUser) = useDb {

CommonCore/SQL/src/de/steamwar/sql/TeamTeilnahme.kt

@@ -32,8 +32,8 @@ import org.jetbrains.exposed.v1.jdbc.deleteWhere
 import org.jetbrains.exposed.v1.jdbc.insertIgnore
 
 object TeamTeilnahmeTable : CompositeIdTable("TeamTeilnahme") {
-    val teamId = reference("teamId", TeamTable).index()
+    val teamId = reference("teamId", TeamTable)
-    val eventId = reference("eventId", EventTable).index()
+    val eventId = reference("eventId", EventTable)
     val placement = integer("Placement").nullable()
 
     override val primaryKey = PrimaryKey(teamId, eventId)
@@ -79,7 +79,7 @@ class TeamTeilnahme(id: EntityID<CompositeID>) : CompositeEntity(id) {
 
         @JvmStatic
         fun getEvents(teamId: Int) = useDb {
-            find { TeamTeilnahmeTable.teamId eq teamId }.map { Event.byId(it.eventId.value) }.toSet()
+            find { TeamTeilnahmeTable.teamId eq teamId }.mapNotNull { Event.byId(it.eventId.value) }.toSet()
         }
 
         @JvmStatic

CommonCore/SQL/src/de/steamwar/sql/Token.kt

@@ -33,10 +33,10 @@ import java.sql.Timestamp
 import java.util.*
 
 object TokenTable: IntIdTable("Token") {
-    val name = varchar("Name", 64).uniqueIndex()
+    val name = varchar("Name", 64)
-    val owner = reference("Owner", SteamwarUserTable).index()
+    val owner = reference("Owner", SteamwarUserTable)
     val created = timestamp("Created").defaultExpression(CurrentTimestamp)
-    val hash = varchar("Hash", 88).uniqueIndex()
+    val hash = varchar("Hash", 88)
 }
 
 class Token(id: EntityID<Int>): IntEntity(id) {

CommonCore/SQL/src/de/steamwar/sql/UserPerm.kt

@@ -28,7 +28,7 @@ import org.jetbrains.exposed.v1.jdbc.insert
 import org.jetbrains.exposed.v1.jdbc.selectAll
 
 object UserPermTable: Table("UserPerm") {
-    val user = reference("User", SteamwarUserTable.id).index()
+    val user = reference("User", SteamwarUserTable.id)
     val perm = enumerationByName("Perm", 32, UserPerm::class)
 
     override val primaryKey = PrimaryKey(user, perm)

CommonCore/SQL/src/de/steamwar/sql/internal/KotlinDatabase.kt

@@ -67,7 +67,7 @@ object KotlinDatabase {
     }
 }
 
-fun <T> useDb(statement: JdbcTransaction.() -> T): T {
+fun <T: Any?> useDb(statement: JdbcTransaction.() -> T): T {
     KotlinDatabase.ensureConnected()
     return TransactionManager.currentOrNull()?.statement() ?: transaction(KotlinDatabase.db) {
         statement()

FightSystem/FightSystem_21/build.gradle.kts

@@ -42,5 +42,4 @@ dependencies {
 
     compileOnly(libs.fastutil)
     compileOnly(libs.authlib)
-    compileOnly(project(":FightSystem:FightSystem_14"))
 }

FightSystem/FightSystem_21/src/de/steamwar/fightsystem/listener/WindchargeStopper21.java

@@ -1,51 +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.fightsystem.listener;
-
-import de.steamwar.fightsystem.Config;
-import de.steamwar.fightsystem.states.FightState;
-import de.steamwar.fightsystem.states.StateDependentTask;
-import net.minecraft.world.entity.projectile.windcharge.WindCharge;
-import org.bukkit.Location;
-
-public class WindchargeStopper21 implements WindchargeStopper.IWindchargeStopper {
-
-    public WindchargeStopper21() {
-        new StateDependentTask(true, FightState.Running, this::run, 1, 1);
-    }
-
-    private static final int middleLine = Config.SpecSpawn.getBlockZ();
-
-    private static final Class<?> windChargeClass = WindCharge.class;
-
-    private void run() {
-        Recording.iterateOverEntities(windChargeClass::isInstance, entity -> {
-            Location location = entity.getLocation();
-            Location prevLocation = location.clone().subtract(entity.getVelocity());
-
-            boolean passedMiddle = location.getBlockZ() > middleLine && prevLocation.getBlockZ() > middleLine ||
-                    location.getBlockZ() < middleLine && prevLocation.getBlockZ() < middleLine;
-
-            if(!passedMiddle) {
-                entity.remove();
-            }
-        });
-    }
-}

FightSystem/FightSystem_21/src/de/steamwar/fightsystem/utils/FlatteningWrapper21.java

@@ -1,29 +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.fightsystem.utils;
-
-import org.bukkit.inventory.ItemStack;
-
-public class FlatteningWrapper21 extends FlatteningWrapper14 {
-    @Override
-    public boolean hasAttributeModifier(ItemStack stack) {
-        return stack.hasItemMeta() && stack.getItemMeta() != null && stack.getItemMeta().hasAttributeModifiers();
-    }
-}

FightSystem/FightSystem_21/src/de/steamwar/fightsystem/utils/ReflectionWrapper21.java

@@ -38,27 +38,6 @@ public class ReflectionWrapper21 implements ReflectionWrapper {
         FORBIDDEN_TYPES.add(DataComponentTypes.BLOCKS_ATTACKS);
         FORBIDDEN_TYPES.add(DataComponentTypes.BUNDLE_CONTENTS);
         FORBIDDEN_TYPES.add(DataComponentTypes.CUSTOM_MODEL_DATA);
-
-        FORBIDDEN_TYPES.add(DataComponentTypes.ATTRIBUTE_MODIFIERS);
-        FORBIDDEN_TYPES.add(DataComponentTypes.TOOL);
-        FORBIDDEN_TYPES.add(DataComponentTypes.WEAPON);
-        FORBIDDEN_TYPES.add(DataComponentTypes.FOOD);
-        FORBIDDEN_TYPES.add(DataComponentTypes.CONSUMABLE);
-        FORBIDDEN_TYPES.add(DataComponentTypes.POTION_CONTENTS);
-        FORBIDDEN_TYPES.add(DataComponentTypes.STORED_ENCHANTMENTS);
-        FORBIDDEN_TYPES.add(DataComponentTypes.CAN_BREAK);
-        FORBIDDEN_TYPES.add(DataComponentTypes.CAN_PLACE_ON);
-        FORBIDDEN_TYPES.add(DataComponentTypes.MAX_DAMAGE);
-        FORBIDDEN_TYPES.add(DataComponentTypes.USE_REMAINDER);
-        FORBIDDEN_TYPES.add(DataComponentTypes.USE_COOLDOWN);
-        FORBIDDEN_TYPES.add(DataComponentTypes.SUSPICIOUS_STEW_EFFECTS);
-        FORBIDDEN_TYPES.add(DataComponentTypes.CHARGED_PROJECTILES);
-        FORBIDDEN_TYPES.add(DataComponentTypes.INTANGIBLE_PROJECTILE);
-        FORBIDDEN_TYPES.add(DataComponentTypes.FIREWORKS);
-        FORBIDDEN_TYPES.add(DataComponentTypes.FIREWORK_EXPLOSION);
-        FORBIDDEN_TYPES.add(DataComponentTypes.EQUIPPABLE);
-        FORBIDDEN_TYPES.add(DataComponentTypes.REPAIR_COST);
-        FORBIDDEN_TYPES.add(DataComponentTypes.ENCHANTABLE);
     }
 
     @Override

FightSystem/FightSystem_8/src/de/steamwar/fightsystem/listener/WindchargeStopper8.java

@@ -1,23 +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.fightsystem.listener;
-
-public class WindchargeStopper8 implements WindchargeStopper.IWindchargeStopper {
-}

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

@@ -98,13 +98,11 @@ public class FightSystem extends JavaPlugin {
         new StateDependentListener(ArenaMode.All, FightState.All, BountifulWrapper.impl.newDenyArrowPickupListener());
         new OneShotStateDependent(ArenaMode.All, FightState.PreSchemSetup, () -> Fight.playSound(SWSound.BLOCK_NOTE_PLING.getSound(), 100.0f, 2.0f));
         new OneShotStateDependent(ArenaMode.Test, FightState.All, WorldEditRendererCUIEditor::new);
-        if (Core.getVersion() >= 19) {
         try {
             Bukkit.getWorlds().get(0).setGameRule(GameRule.REDUCED_DEBUG_INFO, ArenaMode.AntiTest.contains(Config.mode));
         } catch (Exception e) {
             // Ignore if failed!
         }
-        }
 
         techHider = new TechHiderWrapper();
         hullHider = new HullHider();

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

@@ -181,12 +181,7 @@ public class Permanent implements Listener {
 
     @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
     public void onExplosion(EntityExplodeEvent e) {
-        if (!(e.getEntity() instanceof TNTPrimed)) {
+        if (!(e.getEntity() instanceof TNTPrimed)) return;
-            if (Config.GameModeConfig.Schematic.Type.toDB().equals("wargearseason26")) {
-                e.blockList().clear();
-            }
-            return;
-        }
         if (!Config.GameModeConfig.Arena.WaterDamage) return;
         e.blockList().removeIf(block -> {
             if(block.getType() == Material.TNT) {

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

@@ -35,7 +35,10 @@ import org.bukkit.entity.HumanEntity;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
-import org.bukkit.event.inventory.*;
+import org.bukkit.event.inventory.InventoryAction;
+import org.bukkit.event.inventory.InventoryClickEvent;
+import org.bukkit.event.inventory.InventoryCloseEvent;
+import org.bukkit.event.inventory.InventoryOpenEvent;
 import org.bukkit.event.player.PlayerMoveEvent;
 import org.bukkit.event.player.PlayerQuitEvent;
 import org.bukkit.inventory.ItemStack;
@@ -78,8 +81,25 @@ public class PersonalKitCreator implements Listener {
         if(!openKitCreators.containsKey(e.getWhoClicked()))
             return;
 
+        Player player = (Player) e.getWhoClicked();
+        //Deny bad items
         if(Kit.isBadItem(e.getCursor()))
             e.setCancelled(true);
+
+        /* Should the inventory reset? */
+        if(e.getAction() != InventoryAction.PLACE_ALL)
+            return;
+
+        ItemStack[] items = e.getWhoClicked().getInventory().getContents();
+        for(int i = 0; i < items.length; i++){
+            ItemStack stack = items[i];
+            if(stack != null && i != e.getSlot())
+                return;
+        }
+
+        FightPlayer fightPlayer = Fight.getFightPlayer(player);
+        assert fightPlayer != null;
+        Bukkit.getScheduler().runTaskLater(FightSystem.getPlugin(), () -> fightPlayer.getKit().loadToPlayer(player), 1);
     }
 
     @EventHandler
@@ -97,11 +117,8 @@ public class PersonalKitCreator implements Listener {
         if(backup == null)
             return;
 
-        InventoryType type = e.getInventory().getType();
-        if(type != InventoryType.PLAYER && type != InventoryType.CREATIVE) {
         backup.close();
     }
-    }
 
     @EventHandler
     public void onInventoryClose(InventoryCloseEvent e) {
@@ -109,7 +126,7 @@ public class PersonalKitCreator implements Listener {
         if(backup == null)
             return;
 
-        Bukkit.getScheduler().runTaskLater(FightSystem.getPlugin(), backup::close, 1);
+        backup.close();
     }
 
     @EventHandler
@@ -134,11 +151,9 @@ public class PersonalKitCreator implements Listener {
         }
 
         private void close(){
+            openKitCreators.remove(player);
             Kit kit1 = new Kit(kit.getName(), player);
             kit1.removeBadItems();
-
-
-            openKitCreators.remove(player);
             kit1.toPersonalKit(kit);
             backup.loadToPlayer(player);
             player.setGameMode(GameMode.SURVIVAL);

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

@@ -1,35 +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.fightsystem.listener;
-
-import de.steamwar.core.VersionDependent;
-import de.steamwar.fightsystem.FightSystem;
-import de.steamwar.linkage.Linked;
-
-@Linked
-public class WindchargeStopper {
-
-    static {
-        VersionDependent.getVersionImpl(FightSystem.getPlugin());
-    }
-
-    public interface IWindchargeStopper {
-    }
-}

SchematicSystem/SchematicSystem_21/build.gradle.kts

@@ -1,37 +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/>.
- */
-
-plugins {
-    steamwar.java
-}
-
-dependencies {
-    compileOnly(project(":SpigotCore", "default"))
-    compileOnly(project(":SchematicSystem:SchematicSystem_Core", "default"))
-
-    compileOnly(libs.paperapi21) {
-        attributes {
-            // Very Hacky, but it works
-            attribute(TargetJvmVersion.TARGET_JVM_VERSION_ATTRIBUTE, 21)
-        }
-    }
-
-    compileOnly(libs.nms21)
-    compileOnly(libs.fawe21)
-}

SchematicSystem/SchematicSystem_21/src/de/steamwar/schematicsystem/autocheck/AutoChecker21.java

@@ -1,137 +0,0 @@
-/*
- *   This file is a part of the SteamWar software.
- *
- *   Copyright (C) 2026 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.autocheck;
-
-import com.sk89q.jnbt.CompoundTag;
-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.core.Core;
-import de.steamwar.sql.GameModeConfig;
-import org.bukkit.Material;
-
-import java.util.*;
-import java.util.stream.Collectors;
-
-public class AutoChecker21 implements AutoChecker.IAutoChecker {
-
-    public AutoChecker.BlockScanResult scan(Clipboard clipboard, GameModeConfig<Material, String> type) {
-        AutoChecker.BlockScanResult result = new AutoChecker.BlockScanResult();
-        BlockVector3 min = clipboard.getMinimumPoint();
-        BlockVector3 max = clipboard.getMaximumPoint();
-        for (int x = min.getBlockX(); x <= max.getBlockX(); x++) {
-            for (int y = min.getBlockY(); y <= max.getBlockY(); y++) {
-                for (int z = min.getBlockZ(); z <= max.getBlockZ(); z++) {
-                    final BaseBlock block = clipboard.getFullBlock(BlockVector3.at(x, y, z));
-                    final Material material = Material.matchMaterial(block.getBlockType().getId());
-                    if (material == null) {
-                        continue;
-                    }
-
-                    result.getBlockCounts().merge(material, 1, Integer::sum);
-
-                    if (AutoCheckerItems.impl.getInventoryMaterials().contains(material)) {
-                        checkInventory(result, block, material, new BlockPos(x, y, z), type);
-                    }
-
-                    if (x == min.getBlockX() || x == max.getBlockX() || y == max.getBlockY() || z == min.getBlockZ() || z == max.getBlockZ()) {
-                        result.getDesignBlocks().computeIfAbsent(material, m -> new ArrayList<>()).add(new BlockPos(x, y, z));
-                    }
-                }
-            }
-        }
-        return result;
-    }
-
-    private static final Map<Material, Set<Material>> itemsInInv = new EnumMap<>(Material.class);
-
-    static {
-        itemsInInv.put(Material.BUCKET, EnumSet.of(Material.DISPENSER));
-        itemsInInv.put(Material.TNT, EnumSet.of(Material.CHEST, Material.BARREL, Material.SHULKER_BOX, Material.BLACK_SHULKER_BOX, Material.BLUE_SHULKER_BOX,
-                Material.BROWN_SHULKER_BOX, Material.CYAN_SHULKER_BOX, Material.GRAY_SHULKER_BOX, Material.GREEN_SHULKER_BOX, Material.LIGHT_BLUE_SHULKER_BOX,
-                Material.LIGHT_GRAY_SHULKER_BOX, Material.LIME_SHULKER_BOX, Material.MAGENTA_SHULKER_BOX, Material.ORANGE_SHULKER_BOX,
-                Material.PINK_SHULKER_BOX, Material.PURPLE_SHULKER_BOX, Material.RED_SHULKER_BOX, Material.WHITE_SHULKER_BOX, Material.YELLOW_SHULKER_BOX));
-        itemsInInv.put(Material.FIRE_CHARGE, EnumSet.of(Material.DISPENSER));
-        itemsInInv.put(Material.ARROW, EnumSet.of(Material.DISPENSER));
-        AutoCheckerItems.impl.getAllowedMaterialsInInventory().forEach(material -> itemsInInv.put(material, AutoCheckerItems.impl.getInventoryMaterials()));
-    }
-
-    private void checkInventory(AutoChecker.BlockScanResult result, BaseBlock block, Material material, BlockPos pos, GameModeConfig<Material, String> type) {
-        CompoundTag nbt = block.getNbtData();
-        if (nbt == null) {
-            result.getDefunctNbt().add(pos);
-            return;
-        }
-
-
-        if (material == Material.JUKEBOX && nbt.getValue().containsKey("RecordItem")) {
-            result.getRecords().add(pos);
-            return;
-        }
-
-        List<CompoundTag> items = nbt.getList("Items", CompoundTag.class);
-        if (items.isEmpty())
-            return; // Leeres Inventar
-
-        int counter = 0;
-        int windChargeCount = 0;
-        for (CompoundTag item : items) {
-            if (!item.containsKey("id")) {
-                result.getDefunctNbt().add(pos);
-                continue;
-            }
-
-            Material itemType = Material.matchMaterial(item.getString("id"));
-            if (itemType == null) // Leere Slots
-                continue;
-
-            if(type.Schematic.Type.getName().equals("wargearseason26") && material == Material.DISPENSER && itemType == Material.WIND_CHARGE) {
-                windChargeCount += item.getInt("count");
-            }
-            else if (!itemsInInv.getOrDefault(itemType, EnumSet.noneOf(Material.class)).contains(material)) {
-                result.getForbiddenItems().computeIfAbsent(pos, blockVector3 -> new HashSet<>()).add(itemType);
-            } else if (material == Material.DISPENSER && (itemType == Material.ARROW || itemType == Material.FIRE_CHARGE)) {
-                counter += Core.getVersion() >= 21 ? item.getInt("count") : item.getByte("Count");
-            }
-            if (item.containsKey("tag")) {
-                result.getForbiddenNbt().computeIfAbsent(pos, blockVector3 -> new HashSet<>()).add(itemType);
-            }
-        }
-        result.getDispenserItems().put(pos, counter);
-        result.getWindChargeCount().put(pos, windChargeCount);
-    }
-
-    @Override
-    public AutoCheckerResult check(Clipboard clipboard, GameModeConfig<Material, String> type) {
-        return AutoCheckerResult.builder().type(type).height(clipboard.getDimensions().getBlockY()).width(clipboard.getDimensions().getBlockX())
-                .depth(clipboard.getDimensions().getBlockZ()).blockScanResult(scan(clipboard, type))
-                .entities(clipboard.getEntities().stream().map(Entity::getLocation)
-                        .map(blockVector3 -> new BlockPos(blockVector3.getBlockX(), blockVector3.getBlockY(), blockVector3.getBlockZ()))
-                        .collect(Collectors.toList()))
-                .build();
-    }
-
-    @Override
-    public AutoCheckerResult sizeCheck(Clipboard clipboard, GameModeConfig<Material, String> type) {
-        return AutoCheckerResult.builder().type(type).height(clipboard.getDimensions().getBlockY()).width(clipboard.getDimensions().getBlockX())
-                .depth(clipboard.getDimensions().getBlockZ()).build();
-    }
-}

SchematicSystem/SchematicSystem_21/src/de/steamwar/schematicsystem/autocheck/AutoCheckerItems21.java

@@ -1,49 +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.autocheck;
-
-import org.bukkit.Material;
-
-import java.util.EnumSet;
-import java.util.Set;
-
-public class AutoCheckerItems21 implements AutoCheckerItems {
-
-    private static final Set<Material> INVENTORY = EnumSet.of(Material.BARREL, Material.BLAST_FURNACE, Material.BREWING_STAND, Material.CAMPFIRE,
-            Material.CHEST, Material.DISPENSER, Material.DROPPER, Material.FURNACE, Material.HOPPER, Material.JUKEBOX, Material.SHULKER_BOX,
-            Material.WHITE_SHULKER_BOX, Material.ORANGE_SHULKER_BOX, Material.MAGENTA_SHULKER_BOX, Material.LIGHT_BLUE_SHULKER_BOX, Material.YELLOW_SHULKER_BOX,
-            Material.LIME_SHULKER_BOX, Material.PINK_SHULKER_BOX, Material.GRAY_SHULKER_BOX, Material.LIGHT_GRAY_SHULKER_BOX, Material.CYAN_SHULKER_BOX,
-            Material.PURPLE_SHULKER_BOX, Material.BLUE_SHULKER_BOX, Material.BROWN_SHULKER_BOX, Material.GREEN_SHULKER_BOX, Material.RED_SHULKER_BOX,
-            Material.BLACK_SHULKER_BOX, Material.SMOKER, Material.TRAPPED_CHEST);
-
-    private static final Set<Material> FLOWERS = EnumSet.of(Material.CORNFLOWER, Material.POPPY, Material.FERN, Material.DANDELION, Material.BLUE_ORCHID,
-            Material.ALLIUM, Material.AZURE_BLUET, Material.RED_TULIP, Material.ORANGE_TULIP, Material.WHITE_TULIP, Material.PINK_TULIP, Material.OXEYE_DAISY,
-            Material.LILY_OF_THE_VALLEY, Material.WITHER_ROSE, Material.SUNFLOWER, Material.DIAMOND_HORSE_ARMOR, Material.IRON_HORSE_ARMOR,
-            Material.GOLDEN_HORSE_ARMOR, Material.LEATHER_HORSE_ARMOR, Material.HONEY_BOTTLE, Material.LILAC, Material.ROSE_BUSH, Material.PEONY,
-            Material.TALL_GRASS, Material.LARGE_FERN);
-
-    @Override
-    public Set<Material> getInventoryMaterials() {
-        return INVENTORY;
-    }
-
-    @Override
-    public Set<Material> getAllowedMaterialsInInventory() {
-        return FLOWERS;
-    }
-}

SchematicSystem/SchematicSystem_Core/src/SchematicSystem.properties

@@ -262,8 +262,6 @@ AUTO_CHECKER_RESULT_BLOCKS=§7Blocks: §c{0}§7, Max: §e{1}
 AUTO_CHECKER_RESULT_UNKNOWN_MATERIAL=§7Unknown block: §c{0}
 AUTO_CHECKER_RESULT_TOO_MANY_BLOCK=§7{0}: §c{1}§7, Max: §e{2}
 AUTO_CHECKER_RESULT_FORBIDDEN_BLOCK=§7Forbidden block: §c{0}
-AUTO_CHECKER_RESULT_WIND_CHARGES=§7Windcharges: §c{0}§7, Max: §e2048
-AUTO_CHECKER_RESULT_WIND_CHARGES_DISPENSER=§7Dispenser: §c[{0}, {1}, {2}]§7, Windcharges: §c{3}§7
 AUTO_CHECKER_RESULT_FORBIDDEN_ITEM=§7Forbidden Item: [{0}, {1}, {2}] -> §c{3}
 AUTO_CHECKER_RESULT_DEFUNCT_NBT=§7Defunct NBT: §7[{0}, {1}, {2}]
 AUTO_CHECKER_RESULT_DESIGN_BLOCK=§7{0} in Design: [{1}, {2}, {3}]

SchematicSystem/SchematicSystem_Core/src/SchematicSystem_de.properties

@@ -242,8 +242,6 @@ AUTO_CHECKER_RESULT_BLOCKS=§7Blöcke: §c{0}§7, Max: §e{1}
 AUTO_CHECKER_RESULT_UNKNOWN_MATERIAL=§7Unbekannter Block: §c{0}
 AUTO_CHECKER_RESULT_TOO_MANY_BLOCK=§7{0}: §c{1}§7, Max: §e{2}
 AUTO_CHECKER_RESULT_FORBIDDEN_BLOCK=§7Verbotener Block: §c{0}
-AUTO_CHECKER_RESULT_WIND_CHARGES=§7Windcharges: §c{0}§7, Max: §e2048
-AUTO_CHECKER_RESULT_WIND_CHARGES_DISPENSER=§7Werfer: §c[{0}, {1}, {2}]§7, Windcharges: §c{3}§7
 AUTO_CHECKER_RESULT_FORBIDDEN_ITEM=§7Verbotener gegenstand: [{0}, {1}, {2}] -> §c{3}
 AUTO_CHECKER_RESULT_DEFUNCT_NBT=§7Keine NBT-Daten: §c[{0}, {1}, {2}]
 AUTO_CHECKER_RESULT_DESIGN_BLOCK=§7{0} im Design: [{1}, {2}, {3}]

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

@@ -55,7 +55,6 @@ public class AutoChecker {
         private final List<BlockPos> records = new ArrayList<>();
         private final Map<Material, List<BlockPos>> designBlocks = new EnumMap<>(Material.class);
         private final Map<BlockPos, Integer> dispenserItems = new HashMap<>();
-        private final Map<BlockPos, Integer> windChargeCount = new HashMap<>();
         private final Map<BlockPos, Set<Material>> forbiddenItems = new HashMap<>();
         private final Map<BlockPos, Set<Material>> forbiddenNbt = new HashMap<>();
     }

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

@@ -52,7 +52,6 @@ public class AutoCheckerResult {
                 isBlockCountOk() &&
                 isLimitedBlocksOK() &&
                 isDispenserItemsOK() &&
-                isWindchargeCountOK() &&
                 !type.isAfterDeadline() &&
                 entities.isEmpty() &&
                 isDesignBlastResistanceOK();
@@ -63,16 +62,6 @@ public class AutoCheckerResult {
                 !type.isAfterDeadline();
     }
 
-    public boolean isWindchargeCountOK() {
-        if( type.Schematic.Type.getName().equals("wargearseason26")) {
-            int windChargesCount = blockScanResult.getWindChargeCount().values().stream().reduce(Integer::sum).orElse(0);
-            return windChargesCount <= 2048;  
-        }
-        else {
-            return true;
-        }
-    }
-
     public boolean isDispenserItemsOK() {
         return blockScanResult.getDispenserItems().values().stream().allMatch(i -> i <= type.Schematic.MaxDispenserItems);
     }
@@ -138,19 +127,6 @@ public class AutoCheckerResult {
                 }
             });
         }
-
-        if(!isWindchargeCountOK()) {
-            int windChargesCount = blockScanResult.getWindChargeCount().values().stream().reduce(Integer::sum).orElse(0);
-            SchematicSystem.MESSAGE.sendPrefixless("AUTO_CHECKER_RESULT_WIND_CHARGES", p, windChargesCount, 2048);
-            blockScanResult.getWindChargeCount().entrySet().stream().filter(blockVector3IntegerEntry -> blockVector3IntegerEntry.getValue() > 0).forEach(blockVector3IntegerEntry -> {
-                SchematicSystem.MESSAGE.sendPrefixless("AUTO_CHECKER_RESULT_WIND_CHARGES_DISPENSER", p, SchematicSystem.MESSAGE.parse("AUTO_CHECKER_RESULT_TELEPORT_HERE", p), tpCommandTo(blockVector3IntegerEntry.getKey()),
-                        blockVector3IntegerEntry.getKey().getBlockX(),
-                        blockVector3IntegerEntry.getKey().getBlockY(),
-                        blockVector3IntegerEntry.getKey().getBlockZ(),
-                        blockVector3IntegerEntry.getValue());
-            });
-        }
-
         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(),
@@ -159,7 +135,6 @@ public class AutoCheckerResult {
                     blockVector3IntegerEntry.getValue(),
                     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());
         });

SchematicSystem/build.gradle.kts

@@ -32,5 +32,4 @@ dependencies {
     implementation(project(":SchematicSystem:SchematicSystem_15"))
     implementation(project(":SchematicSystem:SchematicSystem_19"))
     implementation(project(":SchematicSystem:SchematicSystem_20"))
-    implementation(project(":SchematicSystem:SchematicSystem_21"))
 }

SpigotCore/SpigotCore_18/src/de/steamwar/techhider/ChunkHider18.java

@@ -93,7 +93,7 @@ public class ChunkHider18 implements ChunkHider {
     private static final Reflection.Method getKey = Reflection.getTypedMethod(IRegistry.class, null, MinecraftKey.class, Object.class);
     private static final Reflection.Method getName = Reflection.getTypedMethod(MinecraftKey.class, null, String.class);
     protected boolean tileEntityVisible(Set<String> hiddenBlockEntities, Object tile) {
-        return !hiddenBlockEntities.contains(TechHider.normalizeBlockEntityId((String) getName.invoke(getKey.invoke(tileEntityTypes, entityType.get(tile)))));
+        return !hiddenBlockEntities.contains((String) getName.invoke(getKey.invoke(tileEntityTypes, entityType.get(tile))));
     }
 
     private void blocks(SectionHider section) {

SpigotCore/SpigotCore_18/src/de/steamwar/techhider/ProtocolWrapper18.java

@@ -20,11 +20,8 @@
 package de.steamwar.techhider;
 
 import de.steamwar.Reflection;
-import de.steamwar.core.Core;
-import net.minecraft.core.IRegistry;
 import net.minecraft.core.SectionPosition;
 import net.minecraft.network.protocol.game.PacketPlayOutBlockBreak;
-import net.minecraft.resources.MinecraftKey;
 import net.minecraft.world.level.block.entity.TileEntitySign;
 import net.minecraft.world.level.block.entity.TileEntityTypes;
 import net.minecraft.world.level.block.state.IBlockData;
@@ -91,14 +88,6 @@ public class ProtocolWrapper18 implements ProtocolWrapper {
         return tileEntityType.get(packet) != signType;
     }
 
-    private static final IRegistry<?> tileEntityTypes = Reflection.getField(Core.getVersion() > 18 ? Reflection.getClass("net.minecraft.core.registries.BuiltInRegistries") : IRegistry.class, IRegistry.class, 0, TileEntityTypes.class).get(null);
-    private static final Reflection.Method getKey = Reflection.getTypedMethod(IRegistry.class, null, MinecraftKey.class, Object.class);
-    private static final Reflection.Method getName = Reflection.getTypedMethod(MinecraftKey.class, null, String.class);
-    @Override
-    public String tileEntityDataType(Object packet) {
-        return TechHider.normalizeBlockEntityId((String) getName.invoke(getKey.invoke(tileEntityTypes, tileEntityType.get(packet))));
-    }
-
     @Override
     public BiFunction<Player, Object, Object> blockBreakHiderGenerator(Class<?> blockBreakPacket, TechHider techHider) {
         return (p, packet) -> {

SpigotCore/SpigotCore_19/src/de/steamwar/techhider/ProtocolWrapper19.java

@@ -19,7 +19,6 @@
 
 package de.steamwar.techhider;
 
-import de.steamwar.Reflection;
 import org.bukkit.entity.Player;
 
 import java.util.function.BiFunction;
@@ -28,7 +27,6 @@ public class ProtocolWrapper19 extends ProtocolWrapper18 {
 
     @Override
     public BiFunction<Player, Object, Object> blockBreakHiderGenerator(Class<?> blockBreakPacket, TechHider techHider) {
-        Reflection.Field<?> blockBreakPosition = Reflection.getField(blockBreakPacket, TechHider.blockPosition, 0);
+        return null;
-        return (p, packet) -> techHider.getLocationEvaluator().checkBlockPos(p, blockBreakPosition.get(packet)) == TechHider.State.SKIP ? packet : null;
     }
 }

SpigotCore/SpigotCore_21/src/de/steamwar/techhider/ChunkHider21.java

@@ -25,20 +25,16 @@ import io.netty.buffer.Unpooled;
 import net.minecraft.network.protocol.game.ClientboundLevelChunkPacketData;
 import net.minecraft.network.protocol.game.ClientboundLevelChunkWithLightPacket;
 import net.minecraft.util.SimpleBitStorage;
-import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.entity.BlockEntityType;
 import org.bukkit.entity.Player;
 
 import java.util.List;
 import java.util.Set;
-import java.util.function.IntUnaryOperator;
 import java.util.function.BiFunction;
 import java.util.function.UnaryOperator;
 import java.util.stream.Collectors;
 
 public class ChunkHider21 implements ChunkHider {
-    private static final int DIRECT_BLOCK_BITS = Math.max(9, Integer.SIZE - Integer.numberOfLeadingZeros(Block.BLOCK_STATE_REGISTRY.size() - 1));
-
     @Override
     public Class<?> mapChunkPacket() {
         return ClientboundLevelChunkWithLightPacket.class;
@@ -100,70 +96,33 @@ public class ChunkHider21 implements ChunkHider {
     private static final Reflection.Method getKey = Reflection.getTypedMethod(registry, "getKey", resourceLocation, Object.class);
     private static final Reflection.Method getName = Reflection.getTypedMethod(resourceLocation, "getPath", String.class);
     protected boolean tileEntityVisible(Set<String> hiddenBlockEntities, Object tile) {
-        return !hiddenBlockEntities.contains(TechHider.normalizeBlockEntityId((String) getName.invoke(getKey.invoke(nameField.get(null), entityType.get(tile)))));
+        return !hiddenBlockEntities.contains(getName.invoke(getKey.invoke(nameField.get(null), entityType.get(tile))));
     }
 
     private void blocks(SectionHider section) {
-        int sourceBitsPerBlock = section.readBitsPerBlock();
+        section.copyBitsPerBlock();
 
-        if(section.isSkipSection()) {
+        boolean singleValued = section.getBitsPerBlock() == 0;
-            section.writeBitsPerBlock(sourceBitsPerBlock);
-            copyBlockStorage(section);
-            return;
-        }
-
-        boolean singleValued = sourceBitsPerBlock == 0;
         if (singleValued) {
             int value = ProtocolUtils.readVarInt(section.getIn());
-            if(section.blockPrecise()) {
+            ProtocolUtils.writeVarInt(section.getOut(), !section.isSkipSection() && section.getObfuscate().contains(value) ? section.getTarget() : value);
-                writeDirectBlocks(section, DIRECT_BLOCK_BITS, ignored -> value);
-            } else {
-                section.writeBitsPerBlock(sourceBitsPerBlock);
-                ProtocolUtils.writeVarInt(section.getOut(), section.getObfuscate().contains(value) ? section.getTarget() : value);
-            }
             return;
-        } else if (sourceBitsPerBlock < 9) {
+        } else if (section.getBitsPerBlock() < 9) {
-            if(section.blockPrecise()) {
-                int[] palette = section.readPalette();
-                SimpleBitStorage values = new SimpleBitStorage(sourceBitsPerBlock, 4096, section.readNewDataArray(4096));
-                writeDirectBlocks(section, DIRECT_BLOCK_BITS, pos -> palette[values.get(pos)]);
-                return;
-            }
-
-            section.writeBitsPerBlock(sourceBitsPerBlock);
             // Indirect (paletted) storage – only present when bitsPerBlock < 9 in 1.21+
             section.processPalette();
         }
 
-        if (!section.blockPrecise() && section.isPaletted()) {
+        if (section.isSkipSection() || (!section.blockPrecise() && section.isPaletted())) {
             section.skipNewDataArray(4096);
             return;
         }
 
-        SimpleBitStorage values = new SimpleBitStorage(sourceBitsPerBlock, 4096, section.readNewDataArray(4096));
+        SimpleBitStorage values = new SimpleBitStorage(section.getBitsPerBlock(), 4096, section.readNewDataArray(4096));
-        writeDirectBlocks(section, sourceBitsPerBlock, values::get);
-    }
-
-    private void copyBlockStorage(SectionHider section) {
-        if(section.getBitsPerBlock() == 0) {
-            section.copyVarInt();
-        } else {
-            if(section.getBitsPerBlock() < 9)
-                section.skipPalette();
-
-            section.skipNewDataArray(4096);
-        }
-    }
-
-    private void writeDirectBlocks(SectionHider section, int bitsPerBlock, IntUnaryOperator source) {
-        section.writeBitsPerBlock(bitsPerBlock);
-        SimpleBitStorage values = new SimpleBitStorage(bitsPerBlock, 4096);
 
         for (int y = 0; y < 16; y++) {
             for (int z = 0; z < 16; z++) {
                 for (int x = 0; x < 16; x++) {
                     int pos = (((y * 16) + z) * 16) + x;
-                    int value = source.applyAsInt(pos);
 
                     TechHider.State test = section.test(x, y, z);
 
@@ -171,17 +130,15 @@ public class ChunkHider21 implements ChunkHider {
                         case SKIP:
                             break;
                         case CHECK:
-                            if (!section.getObfuscate().contains(value))
+                            if (!section.getObfuscate().contains(values.get(pos)))
                                 break;
                         case HIDE:
-                            value = section.getTarget();
+                            values.set(pos, section.getTarget());
                             break;
                         case HIDE_AIR:
                         default:
-                            value = section.getAir();
+                            values.set(pos, section.getAir());
                     }
-
-                    values.set(pos, value);
                 }
             }
         }

SpigotCore/SpigotCore_21/src/de/steamwar/techhider/ProtocolWrapper21.java

@@ -1,104 +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.techhider;
-
-import de.steamwar.Reflection;
-import net.minecraft.core.BlockPos;
-import net.minecraft.core.SectionPos;
-import net.minecraft.network.protocol.game.ClientboundBlockDestructionPacket;
-import net.minecraft.world.level.block.entity.BlockEntityType;
-import net.minecraft.world.level.block.state.BlockState;
-import org.bukkit.entity.Player;
-
-import java.util.ArrayList;
-import java.util.function.BiFunction;
-
-public class ProtocolWrapper21 implements ProtocolWrapper {
-
-    private static final Reflection.Field<SectionPos> multiBlockChangeChunk = Reflection.getField(TechHider.multiBlockChangePacket, SectionPos.class, 0);
-    private static final Reflection.Field<short[]> multiBlockChangePos = Reflection.getField(TechHider.multiBlockChangePacket, short[].class, 0);
-    private static final Reflection.Field<BlockState[]> multiBlockChangeBlocks = Reflection.getField(TechHider.multiBlockChangePacket, BlockState[].class, 0);
-
-    @Override
-    public BiFunction<Player, Object, Object> multiBlockChangeGenerator(TechHider techHider) {
-        return (p, packet) -> {
-            TechHider.LocationEvaluator locationEvaluator = techHider.getLocationEvaluator();
-            SectionPos sectionPos = multiBlockChangeChunk.get(packet);
-            int chunkX = sectionPos.x();
-            int chunkY = sectionPos.y();
-            int chunkZ = sectionPos.z();
-            if(locationEvaluator.skipChunkSection(p, chunkX, chunkY, chunkZ))
-                return packet;
-
-            packet = TechHider.multiBlockChangeCloner.apply(packet);
-            final short[] oldPos = multiBlockChangePos.get(packet);
-            final BlockState[] oldBlocks = multiBlockChangeBlocks.get(packet);
-            ArrayList<Short> poss = new ArrayList<>(oldPos.length);
-            ArrayList<BlockState> blocks = new ArrayList<>(oldPos.length);
-            for(int i = 0; i < oldPos.length; i++) {
-                short pos = oldPos[i];
-                BlockState block = oldBlocks[i];
-                switch(locationEvaluator.check(p, 16*chunkX + SectionPos.sectionRelativeX(pos), 16*chunkY + SectionPos.sectionRelativeY(pos), 16*chunkZ + SectionPos.sectionRelativeZ(pos))) {
-                    case SKIP:
-                        poss.add(pos);
-                        blocks.add(block);
-                        break;
-                    case CHECK:
-                        poss.add(pos);
-                        blocks.add(techHider.iBlockDataHidden(block) ? (BlockState) techHider.getObfuscationTarget() : block);
-                        break;
-                    default:
-                        break;
-                }
-            }
-
-            if(blocks.isEmpty())
-                return null;
-
-            short[] newPos = new short[poss.size()];
-            for(int i = 0; i < newPos.length; i++)
-                newPos[i] = poss.get(i);
-
-            multiBlockChangePos.set(packet, newPos);
-            multiBlockChangeBlocks.set(packet, blocks.toArray(new BlockState[0]));
-            return packet;
-        };
-    }
-
-    private static final Reflection.Field<BlockEntityType> tileEntityType = Reflection.getField(TechHider.tileEntityDataPacket, BlockEntityType.class, 0);
-
-    @Override
-    public boolean unfilteredTileEntityDataAction(Object packet) {
-        BlockEntityType type = tileEntityType.get(packet);
-        return type != BlockEntityType.SIGN && type != BlockEntityType.HANGING_SIGN;
-    }
-
-    @Override
-    public String tileEntityDataType(Object packet) {
-        return BlockEntityType.getKey(tileEntityType.get(packet)).getPath();
-    }
-
-    private static final Reflection.Field<BlockPos> blockBreakPosition = Reflection.getField(ClientboundBlockDestructionPacket.class, BlockPos.class, 0);
-
-    @Override
-    public BiFunction<Player, Object, Object> blockBreakHiderGenerator(Class<?> blockBreakPacket, TechHider techHider) {
-        return (p, packet) -> techHider.getLocationEvaluator().checkBlockPos(p, blockBreakPosition.get(packet)) == TechHider.State.SKIP ? packet : null;
-    }
-}

SpigotCore/SpigotCore_9/src/de/steamwar/techhider/ChunkHider9.java

@@ -54,7 +54,7 @@ public class ChunkHider9 extends ChunkHider8 {
             packet = mapChunkCloner.apply(packet);
             Set<String> hiddenBlockEntities = techHider.getHiddenBlockEntities();
             mapChunkBlockEntities.set(packet, ((List<?>)mapChunkBlockEntities.get(packet)).stream().filter(
-                    nbttag -> !hiddenBlockEntities.contains(TechHider.normalizeBlockEntityId((String) nbtTagGetString.invoke(nbttag, "id")))
+                    nbttag -> !hiddenBlockEntities.contains((String) nbtTagGetString.invoke(nbttag, "id"))
             ).collect(Collectors.toList()));
 
             int primaryBitMask = mapChunkBitMask.get(packet);

SpigotCore/SpigotCore_Main/src/com/comphenix/tinyprotocol/TinyProtocol.java

@@ -23,7 +23,6 @@ import de.steamwar.Reflection;
 import de.steamwar.Reflection.Field;
 import de.steamwar.core.Core;
 import io.netty.channel.*;
-import io.netty.util.ReferenceCountUtil;
 import lombok.Getter;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
@@ -38,7 +37,6 @@ import org.bukkit.plugin.Plugin;
 
 import java.util.*;
 import java.util.concurrent.CopyOnWriteArrayList;
-import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.BiFunction;
 import java.util.logging.Level;
 
@@ -59,29 +57,17 @@ public class TinyProtocol implements Listener {
 	public static final Field<List> networkManagers = Reflection.getField(serverConnection, List.class, 0, networkManager);
 
 	private static final String HANDLER_NAME = "tiny-steamwar";
-	private static final Class<?> bundlePacket = getOptionalClass("net.minecraft.network.protocol.BundlePacket");
-	private static final Class<?> clientboundBundlePacket = getOptionalClass("net.minecraft.network.protocol.game.ClientboundBundlePacket");
-	private static final Reflection.Method bundleSubPackets = bundlePacket == null ? null : Reflection.getTypedMethod(bundlePacket, null, Iterable.class);
-	private static final Reflection.Constructor clientboundBundleConstructor = clientboundBundlePacket == null ? null : Reflection.getConstructor(clientboundBundlePacket, Iterable.class);
 	public static final TinyProtocol instance = new TinyProtocol(Core.getInstance());
 
 	public static void init() {
 		//enforce init
 	}
 
-	private static Class<?> getOptionalClass(String className) {
-		try {
-			return Reflection.getClass(className);
-		} catch (IllegalArgumentException ignored) {
-			return null;
-		}
-	}
-
 	private final Plugin plugin;
 	private final List<?> connections;
 	private boolean closed;
 
-	private final Map<Class<?>, List<BiFunction<Player, Object, Object>>> packetFilters = new ConcurrentHashMap<>();
+	private final Map<Class<?>, List<BiFunction<Player, Object, Object>>> packetFilters = new HashMap<>();
 	@Getter
 	private final Map<Player, PacketInterceptor> playerInterceptors = new HashMap<>();
 
@@ -221,51 +207,31 @@ public class TinyProtocol implements Listener {
 
 		@Override
 		public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception {
-			Object originalMsg = msg;
 			try {
 				msg = filterPacket(player, msg);
 			} catch (Exception e) {
 				plugin.getLogger().log(Level.SEVERE, "Error during incoming packet processing", e);
-				msg = null;
 			}
 
 			if (msg != null) {
 				super.channelRead(ctx, msg);
-			} else {
-				ReferenceCountUtil.release(originalMsg);
 			}
 		}
 
 		@Override
 		public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise) throws Exception {
-			Object originalMsg = msg;
 			try {
 				msg = filterPacket(player, msg);
 			} catch (Exception e) {
 				plugin.getLogger().log(Level.SEVERE, "Error during outgoing packet processing", e);
-				msg = null;
 			}
 
 			if (msg != null) {
 				super.write(ctx, msg, promise);
-			} else {
-				ReferenceCountUtil.release(originalMsg);
-				promise.trySuccess();
 			}
 		}
 
 		private Object filterPacket(Player player, Object packet) {
-			packet = filterSinglePacket(player, packet);
-			if(packet == null)
-				return null;
-
-			if(clientboundBundlePacket != null && clientboundBundlePacket.isInstance(packet))
-				return filterBundlePacket(player, packet);
-
-			return packet;
-		}
-
-		private Object filterSinglePacket(Player player, Object packet) {
 			List<BiFunction<Player, Object, Object>> filters = packetFilters.getOrDefault(packet.getClass(), Collections.emptyList());
 
 			for(BiFunction<Player, Object, Object> filter : filters) {
@@ -277,33 +243,5 @@ public class TinyProtocol implements Listener {
 
 			return packet;
 		}
-
-		private Object filterBundlePacket(Player player, Object packet) {
-			if(bundleSubPackets == null || clientboundBundleConstructor == null)
-				throw new IllegalStateException("Cannot filter bundled packet " + packet.getClass().getName());
-
-			ArrayList<Object> filteredPackets = new ArrayList<>();
-			boolean changed = false;
-			for(Object subPacket : (Iterable<?>) bundleSubPackets.invoke(packet)) {
-				Object filteredPacket = filterPacket(player, subPacket);
-				if(filteredPacket == null) {
-					changed = true;
-					continue;
-				}
-
-				if(filteredPacket != subPacket)
-					changed = true;
-
-				filteredPackets.add(filteredPacket);
-			}
-
-			if(!changed)
-				return packet;
-
-			if(filteredPackets.isEmpty())
-				return null;
-
-			return clientboundBundleConstructor.invoke(filteredPackets);
-		}
 	}
 }

SpigotCore/SpigotCore_Main/src/de/steamwar/techhider/ChunkHider.java

@@ -92,17 +92,7 @@ public interface ChunkHider {
         }
 
         public void copyBitsPerBlock() {
-            bitsPerBlock = in.readUnsignedByte();
+            bitsPerBlock = in.readByte();
-            out.writeByte(bitsPerBlock);
-        }
-
-        public int readBitsPerBlock() {
-            bitsPerBlock = in.readUnsignedByte();
-            return bitsPerBlock;
-        }
-
-        public void writeBitsPerBlock(int bitsPerBlock) {
-            this.bitsPerBlock = bitsPerBlock;
             out.writeByte(bitsPerBlock);
         }
 
@@ -118,15 +108,6 @@ public interface ChunkHider {
                 copyVarInt();
         }
 
-        public int[] readPalette() {
-            int paletteLength = ProtocolUtils.readVarInt(in);
-            int[] palette = new int[paletteLength];
-            for(int i = 0; i < paletteLength; i++)
-                palette[i] = ProtocolUtils.readVarInt(in);
-
-            return palette;
-        }
-
         public void processPalette() {
             if(skipSection) {
                 skipPalette();

SpigotCore/SpigotCore_Main/src/de/steamwar/techhider/ProtocolUtils.java

@@ -98,7 +98,10 @@ public class ProtocolUtils {
     }
 
     public static int posToChunk(int c){
-        return Math.floorDiv(c, 16);
+        int chunk = c / 16;
+        if(c < 0)
+            chunk--;
+        return chunk;
     }
 
     @Deprecated

SpigotCore/SpigotCore_Main/src/de/steamwar/techhider/ProtocolWrapper.java

@@ -31,10 +31,6 @@ public interface ProtocolWrapper {
 
     boolean unfilteredTileEntityDataAction(Object packet);
 
-    default String tileEntityDataType(Object packet) {
-        return null;
-    }
-
     BiFunction<Player, Object, Object> blockBreakHiderGenerator(Class<?> blockBreakPacket, TechHider techHider);
 
     BiFunction<Player, Object, Object> multiBlockChangeGenerator(TechHider techHider);

SpigotCore/SpigotCore_Main/src/de/steamwar/techhider/TechHider.java

@@ -27,7 +27,6 @@ import org.bukkit.Material;
 import org.bukkit.entity.Player;
 
 import java.util.HashMap;
-import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
 import java.util.function.BiFunction;
@@ -68,12 +67,11 @@ public class TechHider {
     private final Set<Integer> obfuscateIds;
     @Getter
     private final Set<String> hiddenBlockEntities;
-    private boolean enabled;
 
     public TechHider(LocationEvaluator locationEvaluator, Material obfuscationTarget, Set<Material> obfuscate, Set<String> hiddenBlockEntities) {
         this.locationEvaluator = locationEvaluator;
         this.obfuscateIds = obfuscate.stream().flatMap(m -> BlockIds.impl.materialToAllIds(m).stream()).collect(Collectors.toSet());
-        this.hiddenBlockEntities = hiddenBlockEntities.stream().map(TechHider::normalizeBlockEntityId).collect(Collectors.toSet());
+        this.hiddenBlockEntities = hiddenBlockEntities;
         this.obfuscationTarget = getBlockDataByBlock.invoke(getBlockByMaterial.invoke(null, obfuscationTarget));
         this.obfuscationTargetId = BlockIds.impl.materialToId(obfuscationTarget);
 
@@ -83,11 +81,9 @@ public class TechHider {
         techhiders.put(multiBlockChangePacket, ProtocolWrapper.impl.multiBlockChangeGenerator(this));
         techhiders.put(ChunkHider.impl.mapChunkPacket(), ChunkHider.impl.chunkHiderGenerator(this));
 
-        if(Core.getVersion() > 12 && Core.getVersion() < 19 || Core.getVersion() >= 21) {
+        if(Core.getVersion() > 12 && Core.getVersion() < 19) {
             Class<?> blockBreakClass = Reflection.getClass("net.minecraft.network.protocol.game.ClientboundBlockDestructionPacket");
-            BiFunction<Player, Object, Object> blockBreakHider = ProtocolWrapper.impl.blockBreakHiderGenerator(blockBreakClass, this);
+            techhiders.put(blockBreakClass, ProtocolWrapper.impl.blockBreakHiderGenerator(blockBreakClass, this));
-            if(blockBreakHider != null)
-                techhiders.put(blockBreakClass, blockBreakHider);
         }
 
         if(Core.getVersion() > 8){
@@ -98,18 +94,10 @@ public class TechHider {
     }
 
     public void enable() {
-        if(enabled)
-            return;
-
-        enabled = true;
         techhiders.forEach(TinyProtocol.instance::addFilter);
     }
 
     public void disable() {
-        if(!enabled)
-            return;
-
-        enabled = false;
         techhiders.forEach(TinyProtocol.instance::removeFilter);
     }
 
@@ -154,8 +142,6 @@ public class TechHider {
             case SKIP:
                 return packet;
             case CHECK:
-                if(isHiddenBlockEntity(ProtocolWrapper.impl.tileEntityDataType(packet)))
-                    return null;
                 if(ProtocolWrapper.impl.unfilteredTileEntityDataAction(packet))
                     return packet;
             default:
@@ -163,19 +149,6 @@ public class TechHider {
         }
     }
 
-    public boolean isHiddenBlockEntity(String id) {
-        return hiddenBlockEntities.contains(normalizeBlockEntityId(id));
-    }
-
-    public static String normalizeBlockEntityId(String id) {
-        if(id == null)
-            return "";
-
-        id = id.toLowerCase(Locale.ROOT);
-        int namespaceSeparator = id.indexOf(':');
-        return namespaceSeparator < 0 ? id : id.substring(namespaceSeparator + 1);
-    }
-
     public enum State {
         SKIP,
         CHECK,

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

@@ -22,6 +22,7 @@ package de.steamwar.sql;
 import com.velocitypowered.api.proxy.Player;
 import com.velocitypowered.api.proxy.server.RegisteredServer;
 import de.steamwar.velocitycore.VelocityCore;
+import de.steamwar.velocitycore.commands.CheckCommand;
 
 import java.io.File;
 
@@ -37,6 +38,15 @@ public class SQLWrapperImpl implements SQLWrapper<String> {
         return new GameModeConfig<>(file, GameModeConfig.ToString, GameModeConfig.ToString, GameModeConfig.ToInternalName, true);
     }
 
+    @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
     public void additionalExceptionMetadata(StringBuilder builder) {
         builder.append("\nServers: ");

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

@@ -25,10 +25,7 @@ import lombok.Getter;
 import lombok.experimental.UtilityClass;
 
 import java.io.File;
-import java.util.HashMap;
+import java.util.*;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
 
 @UtilityClass
 public class ArenaMode {
@@ -53,12 +50,12 @@ public class ArenaMode {
         if(!folder.exists())
             return;
 
-        GameModeConfig.init();
+        for(File file : Arrays.stream(folder.listFiles((file, name) -> name.endsWith(".yml") && !name.endsWith(".kits.yml") && !name.equals("config.yml"))).sorted().toList()) {
-        SchematicType.init();
+            GameModeConfig<String, String> gameModeConfig = new GameModeConfig<>(file, GameModeConfig.ToString, GameModeConfig.ToString, GameModeConfig.ToInternalName, false);
-        for (GameModeConfig<String, String> gameModeConfig : GameModeConfig.<String>getAll()) {
             if (!gameModeConfig.Server.loaded) continue;
+
             allModes.add(gameModeConfig);
-            byInternal.put(gameModeConfig.configFile.getName().replace(".yml", ""), gameModeConfig);
+            byInternal.put(file.getName().replace(".yml", ""), gameModeConfig);
             for (String name : gameModeConfig.Server.ChatNames) {
                 byChat.put(name.toLowerCase(), gameModeConfig);
             }

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

@@ -40,7 +40,6 @@ import net.kyori.adventure.text.format.NamedTextColor;
 import java.awt.*;
 import java.sql.Timestamp;
 import java.time.Instant;
-import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
@@ -49,9 +48,20 @@ import java.util.logging.Level;
 
 @Linked
 public class CheckCommand extends SWCommand {
+    private static final Map<SchematicType, SchematicType> fightTypes = new HashMap<>();
+    private static final Map<SchematicType, List<String>> checkQuestions = new HashMap<>();
+
     private static final Map<UUID, CheckSession> currentCheckers = new HashMap<>();
     private static final Map<Integer, CheckSession> currentSchems = new HashMap<>();
 
+    public static void setCheckQuestions(SchematicType checkType, List<String> checkQuestions) {
+        CheckCommand.checkQuestions.put(checkType, checkQuestions);
+    }
+
+    public static void addFightType(SchematicType checkType, SchematicType fightType) {
+        fightTypes.put(checkType, fightType);
+    }
+
     public static boolean isChecking(Player player){
         return currentCheckers.containsKey(player.getUniqueId());
     }
@@ -137,7 +147,7 @@ public class CheckCommand extends SWCommand {
         if(!schem.getSchemtype().check()){
             VelocityCore.getLogger().log(Level.SEVERE, () -> sender.user().getUserName() + " tried to check an uncheckable schematic!");
             return;
-        }else if(schem.getOwner() == sender.user().getId() && !sender.user().hasPerm(UserPerm.ADMINISTRATION)) {
+        }else if(schem.getOwner() == sender.user().getId()) {
             sender.system("CHECK_SCHEMATIC_OWN");
             return;
         }
@@ -238,9 +248,9 @@ public class CheckCommand extends SWCommand {
             this.checker = checker;
             this.schematic = schematic;
             this.startTime = Timestamp.from(Instant.now());
-            this.checkList = GameModeConfig.getBySchematicType(schematic.getSchemtype()).CheckQuestions.listIterator();
+            this.checkList = checkQuestions.get(schematic.getSchemtype()).listIterator();
 
-            GameModeConfig<String, String> mode = GameModeConfig.getBySchematicType(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);
@@ -294,50 +304,7 @@ public class CheckCommand extends SWCommand {
         }
 
         private void accept(){
-            // TODO: This Code is only for the WGS and because YoyoNow is not available this can be removed or changed after the WGS!
+            concludeCheckSession("freigegeben", fightTypes.get(schematic.getSchemtype()), () -> {
-            if (schematic.getSchemtype().toDB().equals("cwargearseason26")) {
-                int userId = schematic.getOwner();
-                SteamwarUser user = SteamwarUser.byId(userId);
-                int teamId = user.getTeam();
-
-                SchematicNode teamFolder = SchematicNode.getSchematicNodeInNode(172325)
-                        .stream()
-                        .filter(schematicNode -> schematicNode.getName().startsWith(teamId + "_"))
-                        .findFirst()
-                        .orElse(null);
-                if (teamFolder == null) {
-                    internalAccept();
-                    return;
-                }
-
-                // Copy Schem into team folder of -1 user
-                String name = DateTimeFormatter.ofPattern("yyyy.MM.dd_HH:mm:ss").format(schematic.getLastUpdate().toLocalDateTime());
-                NodeData data = NodeData.getLatest(schematic);
-                SchematicNode node = SchematicNode.createSchematic(-1, name, teamFolder.getNodeId());
-                NodeData.saveFromStream(node, data.schemData(false), data.getNodeFormat());
-
-                // Accept the team folder schematic and set other to Normal
-                node.setSchemtype(GameModeConfig.getBySchematicType(schematic.getSchemtype()).Schematic.Type);
-
-                // Conclude by setting send in schematic to normal and broadcast
-                concludeCheckSession("freigegeben", SchematicType.Normal, () -> {
-                    Chatter owner = Chatter.of(SteamwarUser.byId(schematic.getOwner()).getUUID());
-                    owner.withPlayerOrOffline(
-                            player -> owner.system("CHECK_ACCEPTED", schematic.getSchemtype().name(), schematic.getName()),
-                            () -> DiscordAlert.send(owner, Color.GREEN, new Message("DC_TITLE_SCHEMINFO"), new Message("DC_SCHEM_ACCEPT", schematic.getName()), true)
-                    );
-                    notifyTeam(new Message("CHECK_ACCEPTED_TEAM", schematic.getName(), owner.user().getUserName()));
-
-                    return owner.getPlayer() != null;
-                });
-                return;
-            }
-
-            internalAccept();
-        }
-
-        private void internalAccept() {
-            concludeCheckSession("freigegeben", GameModeConfig.getBySchematicType(schematic.getSchemtype()).Schematic.Type, () -> {
                 Chatter owner = Chatter.of(SteamwarUser.byId(schematic.getOwner()).getUUID());
                 owner.withPlayerOrOffline(
                         player -> owner.system("CHECK_ACCEPTED", schematic.getSchemtype().name(), schematic.getName()),

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

@@ -50,7 +50,7 @@ public class WhoisCommand extends SWCommand {
 
     @Register(description = "WHOIS_USAGE")
     public void whois(Chatter sender, long id, WhoisParameterTypes... parameters) {
-        if(!sender.user().hasPerm(UserPerm.ADMINISTRATION) && !sender.user().hasPerm(UserPerm.PREFIX_DEVELOPER)) {
+        if(!sender.user().hasPerm(UserPerm.ADMINISTRATION)) {
             sender.system("UNKNOWN_PLAYER");
             return;
         }

VelocityCore/src/de/steamwar/velocitycore/tablist/Tablist.java

@@ -158,6 +158,7 @@ public class Tablist extends ChannelInboundHandlerAdapter {
 
     public void disable() {
         sendTabPacket(new ArrayList<>(directTabItems.values()), null);
+        directTabItems.clear();
         sendTabPacket(current, null);
         current.clear();
 

VelocityCore/src/de/steamwar/velocitycore/util/BauLock.java

@@ -55,7 +55,7 @@ public class BauLock {
                 break;
             case SUPERVISOR:
                 BauweltMember member = BauweltMember.getBauMember(owner.getId(), target.getId());
-                locked = member == null || !member.isSupervisor();
+                locked = !member.isSupervisor();
                 break;
             case SERVERTEAM:
                 locked = !target.hasPerm(UserPerm.TEAM);

WebsiteBackend/src/de/steamwar/routes/Auth.kt

@@ -47,12 +47,18 @@ data class UsernamePassword(val name: String, val password: String, val keepLogg
 
 fun Route.configureAuth() {
     route("/auth") {
-        val client = HttpClient(Java) {
+
-            install(ContentNegotiation) {
+        delete {
-                json()
+            call.sessions.clear<SWUserSession>()
-            }
+            call.respond(HttpStatusCode.NoContent)
         }
 
+        configureDiscordAuth()
+        configurePasswordAuth()
+    }
+}
+
+fun Route.configurePasswordAuth() {
     post {
         val request = call.receive<UsernamePassword>()
 
@@ -68,14 +74,16 @@ fun Route.configureAuth() {
         call.sessions.set(SWUserSession(user.getId()))
         call.respond(ResponseUser(user))
     }
+}
 
-        delete {
+fun Route.configureDiscordAuth() {
-            call.sessions.clear<SWUserSession>()
+    val client = HttpClient(Java) {
-            call.respond(HttpStatusCode.NoContent)
+        install(ContentNegotiation) {
+            json()
+        }
     }
 
-        route("/discord") {
+    post("/discord") {
-            post {
         val token = call.receiveText()
 
         val res = client.get("https://discord.com/api/v10/oauth2/@me") {
@@ -102,6 +110,4 @@ fun Route.configureAuth() {
         call.sessions.set(SWUserSession(user.getId()))
         call.respond(ResponseUser(user))
     }
-        }
-    }
 }

WebsiteBackend/src/de/steamwar/routes/Data.kt

@@ -75,7 +75,7 @@ data class ResponseUser(
 @Serializable
 data class ResponseUserList(val entries: List<ResponseUser>, val rows: Long)
 
-private fun Query.addUserFilter(
+fun Query.addUserFilter(
     name: String? = null,
     uuid: UUID? = null,
     team: Set<Int>? = null,

WebsiteBackend/src/de/steamwar/routes/EventFights.kt

@@ -27,6 +27,7 @@ import io.ktor.server.request.*
 import io.ktor.server.response.*
 import io.ktor.server.routing.*
 import kotlinx.serialization.Serializable
+import org.jetbrains.exposed.v1.core.ResultRow
 import java.sql.Timestamp
 import java.time.Instant
 
@@ -60,6 +61,8 @@ data class ResponseEventFight(
 @Serializable
 data class ResponseTeam(val id: Int, val name: String, val kuerzel: String, val color: String) {
     constructor(team: Team) : this(team.teamId, team.teamName, team.teamKuerzel, team.teamColor)
+
+    constructor(row: ResultRow) : this(row[TeamTable.id].value, row[TeamTable.name], row[TeamTable.kuerzel], row[TeamTable.color])
 }
 
 @Serializable

WebsiteBackend/src/de/steamwar/routes/Routes.kt

@@ -19,6 +19,12 @@
 
 package de.steamwar.routes
 
+import de.steamwar.routes.v2.configureAuthV2
+import de.steamwar.routes.v2.configureGameModeRoutes
+import de.steamwar.routes.v2.configureSchematicsV2Route
+import de.steamwar.routes.v2.configureSteamWarRoute
+import de.steamwar.routes.v2.configureTeamRoutes
+import de.steamwar.routes.v2.configureUsersRouteV2
 import io.ktor.server.application.*
 import io.ktor.server.auth.*
 import io.ktor.server.routing.*
@@ -34,6 +40,17 @@ fun Application.configureRoutes() {
             configureSchematic()
             configureAuth()
             configureAuditLog()
+            route("/v2") {
+                configureAuditLog()
+                configurePage()
+                configureEventsRoute()
+                configureAuthV2()
+                configureTeamRoutes()
+                configureSteamWarRoute()
+                configureUsersRouteV2()
+                configureSchematicsV2Route()
+                configureGameModeRoutes()
+            }
         }
     }
 }

WebsiteBackend/src/de/steamwar/routes/Schematic.kt

@@ -43,8 +43,31 @@ import java.util.*
 import java.util.zip.GZIPInputStream
 
 @Serializable
-data class ResponseSchematic(val name: String, val id: Int, val type: String?, val owner: Int, val item: String, val lastUpdate: Long, val rank: Int, val replaceColor: Boolean, val allowReplay: Boolean) {
+data class ResponseSchematic(
-    constructor(node: SchematicNode) : this(node.name, node.getId(), node.schemtype?.name(), node.owner, node.item, node.lastUpdate.time, node.rank, node.replaceColor(), node.allowReplay())
+    val name: String,
+    val id: Int,
+    val type: String?,
+    val owner: Int,
+    val item: String,
+    val lastUpdate: Long,
+    val replaceColor: Boolean,
+    val allowReplay: Boolean,
+    val members: List<ResponseUser>
+) {
+    constructor(node: SchematicNode) : this(
+        node.name,
+        node.getId(),
+        node.schemtype.name(),
+        node.owner,
+        node.item,
+        node.lastUpdate.time,
+        node.replaceColor(),
+        node.allowReplay(),
+        node.members.map {
+            ResponseUser(
+                SteamwarUser.byId(it.member)!!
+            )
+        })
 }
 
 @Serializable
@@ -72,9 +95,12 @@ fun Route.configureSchematic() {
             val node = call.receiveSchematic() ?: return@get
 
             val user = call.principal<SWAuthPrincipal>()?.user
-            if(user != null && !node.accessibleByUser(user)) {
+            if (user != null && !node.accessibleByUser(user)) {
                 call.respond(HttpStatusCode.Forbidden)
-                SWException.log("User ${user.userName} tried to download schematic ${node.name} without permission", user.id.toString())
+                SWException.log(
+                    "User ${user.userName} tried to download schematic ${node.name} without permission",
+                    user.id.toString()
+                )
                 return@get
             }
 
@@ -83,8 +109,15 @@ fun Route.configureSchematic() {
                 return@get
             }
 
-            call.response.header("Content-Disposition", "attachment; filename=\"${node.name}${data.nodeFormat.fileEnding}\"")
+            call.response.header(
-            call.respondBytes(data.schemData(false).readAllBytes(), contentType = ContentType.Application.OctetStream, status = HttpStatusCode.OK)
+                "Content-Disposition",
+                "attachment; filename=\"${node.name}${data.nodeFormat.fileEnding}\""
+            )
+            call.respondBytes(
+                data.schemData(false).readAllBytes(),
+                contentType = ContentType.Application.OctetStream,
+                status = HttpStatusCode.OK
+            )
         }
         get("/info") {
             val node = call.receiveSchematic() ?: return@get
@@ -100,18 +133,22 @@ fun Route.configureSchematic() {
             val schemName = file.name.substringBeforeLast(".")
 
             if (SchematicNode.invalidSchemName(arrayOf(schemName))) {
-                call.respond(HttpStatusCode.BadRequest, ResponseError(
+                call.respond(
+                    HttpStatusCode.BadRequest, ResponseError(
                         error = "INVALID_NAME"
-                ))
+                    )
+                )
                 return@post
             }
 
             val schemType = file.name.substringAfterLast(".")
 
             if (schemType != "schem" && schemType != "schematic") {
-                call.respond(HttpStatusCode.BadRequest, ResponseError(
+                call.respond(
+                    HttpStatusCode.BadRequest, ResponseError(
                         error = "INVALID_SUFFIX"
-                ))
+                    )
+                )
                 return@post
             }
 
@@ -146,22 +183,27 @@ fun Route.configureSchematic() {
                             .value
 
                         if (fawe.equals("2.12.3-SNAPSHOT")) {
-                            SWException.log("Schematic with Bugged Version Uploaded", """
+                            SWException.log(
+                                "Schematic with Bugged Version Uploaded", """
                             Schematic=$schemName
                             User=${user.userName}
                             Id=${user.id}
-                        """.trimIndent())
+                        """.trimIndent()
+                            )
+                        }
+                    } catch (_: Exception) {
                     }
-                    } catch (_: Exception) {}
                 }
 
                 NodeData.saveFromStream(node, content.inputStream(), version)
 
                 call.respond(ResponseSchematic(node))
             } catch (e: Exception) {
-                call.respond(HttpStatusCode.BadRequest, ResponseError(
+                call.respond(
+                    HttpStatusCode.BadRequest, ResponseError(
                         error = e.message ?: "GENERIC", code = "UPLOAD_ERROR"
-                ))
+                    )
+                )
             }
         }
     }
@@ -178,7 +220,7 @@ suspend fun ApplicationCall.receiveSchematic(fieldName: String = "code", delete:
         return null
     }
 
-    if(dl.timestamp.toInstant().plus(Duration.of(5, ChronoUnit.MINUTES)).isBefore(Instant.now())) {
+    if (dl.timestamp.toInstant().plus(Duration.of(5, ChronoUnit.MINUTES)).isBefore(Instant.now())) {
         respond(HttpStatusCode.Gone)
         return null
     }

WebsiteBackend/src/de/steamwar/routes/v2/Auth.kt

@@ -0,0 +1,46 @@
+/*
+ *   This file is a part of the SteamWar software.
+ *
+ *   Copyright (C) 2026 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.routes.v2
+
+import de.steamwar.plugins.SWUserSession
+import de.steamwar.routes.configureDiscordAuth
+import de.steamwar.routes.configurePasswordAuth
+import io.ktor.http.HttpStatusCode
+import io.ktor.server.application.call
+import io.ktor.server.response.respond
+import io.ktor.server.routing.Route
+import io.ktor.server.routing.delete
+import io.ktor.server.routing.route
+import io.ktor.server.sessions.clear
+import io.ktor.server.sessions.sessions
+
+fun Route.configureAuthV2() {
+    route("/auth") {
+        delete {
+            call.sessions.clear<SWUserSession>()
+            call.respond(HttpStatusCode.NoContent)
+        }
+
+        configureDiscordAuth()
+        route("/legacy") {
+            configurePasswordAuth()
+        }
+    }
+}

WebsiteBackend/src/de/steamwar/routes/v2/GameModes.kt

@@ -0,0 +1,55 @@
+/*
+ *   This file is a part of the SteamWar software.
+ *
+ *   Copyright (C) 2026 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.routes.v2
+
+import de.steamwar.ResponseError
+import io.ktor.http.HttpStatusCode
+import io.ktor.server.application.call
+import io.ktor.server.response.respond
+import io.ktor.server.routing.Route
+import io.ktor.server.routing.get
+import io.ktor.server.routing.route
+import org.bspfsystems.yamlconfiguration.file.YamlConfiguration
+import java.io.File
+import kotlin.io.nameWithoutExtension
+
+fun Route.configureGameModeRoutes() {
+    route("/gamemodes") {
+        get {
+            call.respond(
+                File("/configs/GameModes/").listFiles()!!
+                    .filter { it.name.endsWith(".yml") && !it.name.endsWith(".kits.yml") }
+                    .map { it.nameWithoutExtension })
+        }
+        get("/{gamemode}/maps") {
+            val gamemode = call.parameters["gamemode"]
+            if (gamemode == null) {
+                call.respond(HttpStatusCode.BadRequest, ResponseError("Invalid gamemode"))
+                return@get
+            }
+            val file = File("/configs/GameModes/$gamemode.yml")
+            if (!file.exists()) {
+                call.respond(HttpStatusCode.NotFound, ResponseError("Gamemode not found"))
+                return@get
+            }
+            call.respond(YamlConfiguration.loadConfiguration(file).getStringList("Server.Maps"))
+        }
+    }
+}

WebsiteBackend/src/de/steamwar/routes/v2/Schematics.kt

@@ -0,0 +1,210 @@
+/*
+ *   This file is a part of the SteamWar software.
+ *
+ *   Copyright (C) 2026 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.routes.v2
+
+import com.sun.tools.jdeprscan.Main.call
+import de.steamwar.ResponseError
+import de.steamwar.plugins.SWAuthPrincipal
+import de.steamwar.plugins.SWPermissionCheck
+import de.steamwar.routes.ResponseSchematic
+import de.steamwar.routes.ResponseSchematicType
+import de.steamwar.routes.UploadSchematic
+import de.steamwar.routes.nbt
+import de.steamwar.routes.receiveSchematic
+import de.steamwar.sql.NodeData
+import de.steamwar.sql.NodeData.SchematicFormat
+import de.steamwar.sql.NodeDownload
+import de.steamwar.sql.SWException
+import de.steamwar.sql.SchematicNode
+import de.steamwar.sql.SchematicType
+import dev.dewy.nbt.tags.collection.CompoundTag
+import io.ktor.http.ContentType
+import io.ktor.http.HttpStatusCode
+import io.ktor.server.application.ApplicationCall
+import io.ktor.server.application.call
+import io.ktor.server.application.install
+import io.ktor.server.auth.authentication
+import io.ktor.server.auth.principal
+import io.ktor.server.request.receive
+import io.ktor.server.response.header
+import io.ktor.server.response.respond
+import io.ktor.server.response.respondBytes
+import io.ktor.server.routing.Route
+import io.ktor.server.routing.get
+import io.ktor.server.routing.post
+import io.ktor.server.routing.route
+import java.io.BufferedInputStream
+import java.io.DataInputStream
+import java.util.Base64
+import java.util.zip.GZIPInputStream
+
+data class ListedSchematicNode(val name: String, val id: Int, val type: String)
+
+fun Route.configureSchematicsV2Route() {
+    route("/schematics") {
+        get("/types") {
+            call.respond(SchematicType.values().filter { !it.check() }
+                .map { ResponseSchematicType(it.name(), it.toDB()) })
+        }
+
+        get("/list/{path...}") {
+            val path = call.parameters.getAll("path")?.joinToString("/") ?: "/"
+
+            val user = call.authentication.principal<SWAuthPrincipal>()
+            if (user == null) {
+                call.respond(HttpStatusCode.Unauthorized)
+                return@get
+            }
+
+            val node = SchematicNode.getNodeFromPath(user.user, path)
+            call.respond(SchematicNode.list(user.user, node?.id?.value).map { ListedSchematicNode(it.name, it.id.value, it.schemtype.toDB()) })
+        }
+
+        get("/download/{code}") {
+            val node = call.receiveSchematic() ?: return@get
+
+            val user = call.principal<SWAuthPrincipal>()?.user
+            if(user != null && !node.accessibleByUser(user)) {
+                call.respond(HttpStatusCode.Forbidden)
+                SWException.log("User ${user.userName} tried to download schematic ${node.name} without permission", user.id.toString())
+                return@get
+            }
+
+            val data = NodeData.getLatest(node) ?: run {
+                call.respond(HttpStatusCode.InternalServerError)
+                return@get
+            }
+
+            call.response.header("Content-Disposition", "attachment; filename=\"${node.name}${data.nodeFormat.fileEnding}\"")
+            call.respondBytes(data.schemData(false).readAllBytes(), contentType = ContentType.Application.OctetStream, status = HttpStatusCode.OK)
+        }
+
+        post("/upload") {
+            val user = call.principal<SWAuthPrincipal>()?.user
+            if (user == null) {
+                call.respond(HttpStatusCode.Unauthorized)
+                return@post
+            }
+
+            val file = call.receive<UploadSchematic>()
+            val schemName = file.name.substringBeforeLast(".")
+
+            if (SchematicNode.invalidSchemName(arrayOf(schemName))) {
+                call.respond(HttpStatusCode.BadRequest, ResponseError(
+                    error = "INVALID_NAME"
+                ))
+                return@post
+            }
+
+            val schemType = file.name.substringAfterLast(".")
+
+            if (schemType != "schem" && schemType != "schematic") {
+                call.respond(HttpStatusCode.BadRequest, ResponseError(
+                    error = "INVALID_SUFFIX"
+                ))
+                return@post
+            }
+
+            var node = SchematicNode.getSchematicNode(user.getId(), schemName, null as Int?)
+            if (node == null) {
+                node = SchematicNode.createSchematic(user.getId(), schemName, null)
+            }
+
+            try {
+                val content = Base64.getDecoder().decode(file.content)
+
+                var schem = nbt.fromStream(DataInputStream(BufferedInputStream(GZIPInputStream(content.inputStream()))))
+
+                if (schem.size() == 1) schem = schem.first() as CompoundTag
+
+                val version = schem.let {
+                    if (it.contains("Materials"))
+                        return@let SchematicFormat.MCEDIT
+                    else if (it.contains("Blocks"))
+                        return@let SchematicFormat.SPONGE_V3
+                    else
+                        return@let SchematicFormat.SPONGE_V2
+                }
+
+                if (version == SchematicFormat.SPONGE_V3) {
+                    try {
+                        val fawe = schem.getCompound("Metadata")
+                            .getCompound("WorldEdit")
+                            .getString("Version")
+                            .value
+
+                        if (fawe.equals("2.12.3-SNAPSHOT")) {
+                            SWException.log("Schematic with Bugged Version Uploaded", """
+                            Schematic=$schemName
+                            User=${user.userName}
+                            Id=${user.id}
+                        """.trimIndent())
+                        }
+                    } catch (_: Exception) {}
+                }
+
+                NodeData.saveFromStream(node, content.inputStream(), version)
+
+                call.respond(ResponseSchematic(node))
+            } catch (e: Exception) {
+                call.respond(HttpStatusCode.BadRequest, ResponseError(
+                    error = e.message ?: "GENERIC", code = "UPLOAD_ERROR"
+                ))
+            }
+        }
+        route("/{id}") {
+            install(SWPermissionCheck) {
+                mustAuth = true
+            }
+
+            get {
+                val node = call.receiveSchem() ?: return@get
+                call.respond(ResponseSchematic(node))
+            }
+
+            post("/download") {
+                val node = call.receiveSchem() ?: return@post
+
+                call.respond(HttpStatusCode.OK, NodeDownload.getLink(node))
+            }
+        }
+    }
+}
+
+suspend fun ApplicationCall.receiveSchem(): SchematicNode? {
+    val schemId = parameters["id"]?.toIntOrNull()
+    if (schemId == null) {
+        respond(HttpStatusCode.BadRequest)
+        return null
+    }
+
+    val schem = SchematicNode.getSchematicNode(schemId)
+    if (schem == null) {
+        respond(HttpStatusCode.NotFound)
+        return null
+    }
+
+    if (!(principal<SWAuthPrincipal>()?.user?.let { schem.accessibleByUser(it) } ?: false)) {
+        respond(HttpStatusCode.Forbidden)
+        return null
+    }
+
+    return schem
+}

WebsiteBackend/src/de/steamwar/routes/v2/SteamWar.kt

@@ -0,0 +1,60 @@
+/*
+ *   This file is a part of the SteamWar software.
+ *
+ *   Copyright (C) 2026 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.routes.v2
+
+import de.steamwar.ResponseError
+import de.steamwar.routes.ResponseUser
+import de.steamwar.sql.SteamwarUser
+import de.steamwar.sql.UserPerm
+import de.steamwar.util.fetchData
+import io.ktor.http.HttpStatusCode
+import io.ktor.server.application.call
+import io.ktor.server.response.respond
+import io.ktor.server.routing.Route
+import io.ktor.server.routing.get
+import io.ktor.server.routing.route
+import java.net.InetSocketAddress
+
+fun Route.configureSteamWarRoute() {
+    route("/steamwar") {
+        get {
+            try {
+                val server = fetchData(InetSocketAddress("steamwar.de", 25565), 100)
+                call.respond(server)
+            } catch (e: Exception) {
+                e.printStackTrace()
+                call.respond(HttpStatusCode.InternalServerError, ResponseError(e.message ?: "Unknown error"))
+                return@get
+            }
+        }
+
+        get("/team") {
+            call.respond(
+                listOf(
+                    UserPerm.PREFIX_ADMIN,
+                    UserPerm.PREFIX_DEVELOPER,
+                    UserPerm.PREFIX_MODERATOR,
+                    UserPerm.PREFIX_SUPPORTER,
+                    UserPerm.PREFIX_BUILDER
+                ).associateWith { SteamwarUser.getUsersWithPerm(it) }.mapKeys { UserPerm.prefixes[it.key]!!.chatPrefix }
+                    .mapValues { it.value.map { ResponseUser(it) } })
+        }
+    }
+}

WebsiteBackend/src/de/steamwar/routes/v2/Teams.kt

@@ -0,0 +1,87 @@
+/*
+ *   This file is a part of the SteamWar software.
+ *
+ *   Copyright (C) 2026 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.routes.v2
+
+import de.steamwar.routes.ResponseEvent
+import de.steamwar.routes.ResponseTeam
+import de.steamwar.routes.ResponseUser
+import de.steamwar.sql.SteamwarUser
+import de.steamwar.sql.Team
+import de.steamwar.sql.TeamTable
+import de.steamwar.sql.TeamTeilnahme
+import de.steamwar.sql.internal.useDb
+import io.ktor.http.HttpStatusCode
+import io.ktor.server.application.call
+import io.ktor.server.response.respond
+import io.ktor.server.routing.Route
+import io.ktor.server.routing.get
+import io.ktor.server.routing.route
+import kotlinx.serialization.Serializable
+import org.jetbrains.exposed.v1.core.like
+import org.jetbrains.exposed.v1.jdbc.Query
+import org.jetbrains.exposed.v1.jdbc.andWhere
+import org.jetbrains.exposed.v1.jdbc.selectAll
+
+fun Query.addTeamFilter(teamName: String?, teamKuerzel: String?): Query {
+    teamName?.let { andWhere { TeamTable.name like "%$it%" } }
+    teamKuerzel?.let { andWhere { TeamTable.kuerzel like "%$it%" } }
+    return this
+}
+
+fun Route.configureTeamRoutes() {
+    route("/teams") {
+        get {
+            val teamName = call.request.queryParameters["name"]
+            val teamKuerzel = call.request.queryParameters["kuerzel"]
+
+            val limit = call.request.queryParameters["limit"]?.toIntOrNull() ?: 100
+            val page = call.request.queryParameters["page"]?.toIntOrNull() ?: 0
+
+            call.respond(useDb {
+                TeamTable.selectAll().addTeamFilter(teamName, teamKuerzel).limit(limit).offset((page * limit).toLong())
+                    .map { ResponseTeam(it) }
+            })
+        }
+
+        get("/{team}") {
+            @Serializable
+            data class TeamResponse(
+                val team: ResponseTeam,
+                val members: List<ResponseUser>,
+                val leaders: List<ResponseUser>,
+                val events: List<ResponseEvent>
+            )
+
+            val team = call.parameters["team"]?.toIntOrNull()?.let { Team.byId(it) }
+            if (team == null) {
+                call.respond(HttpStatusCode.NotFound)
+                return@get
+            }
+
+            call.respond(useDb {
+                TeamResponse(
+                    ResponseTeam(team),
+                    team.membersUser.map { ResponseUser(it) },
+                    team.membersUser.filter { it.leader }.map { ResponseUser(it) },
+                    TeamTeilnahme.getEvents(team.teamId).map { ResponseEvent(it) })
+            })
+        }
+    }
+}

WebsiteBackend/src/de/steamwar/routes/v2/Users.kt

@@ -0,0 +1,274 @@
+/*
+ *   This file is a part of the SteamWar software.
+ *
+ *   Copyright (C) 2026 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.routes.v2
+
+import de.steamwar.ResponseError
+import de.steamwar.data.getCachedSkin
+import de.steamwar.plugins.SWAuthPrincipal
+import de.steamwar.plugins.SWPermissionCheck
+import de.steamwar.routes.ResponseTeam
+import de.steamwar.routes.ResponseUser
+import de.steamwar.routes.ResponseUserList
+import de.steamwar.routes.UserStats
+import de.steamwar.routes.addUserFilter
+import de.steamwar.routes.catchException
+import de.steamwar.sql.Punishment
+import de.steamwar.sql.SteamwarUser
+import de.steamwar.sql.SteamwarUserTable
+import de.steamwar.sql.Team
+import de.steamwar.sql.UserPerm
+import de.steamwar.sql.internal.useDb
+import io.ktor.http.HttpStatusCode
+import io.ktor.server.application.ApplicationCall
+import io.ktor.server.application.call
+import io.ktor.server.application.install
+import io.ktor.server.auth.principal
+import io.ktor.server.request.receive
+import io.ktor.server.response.header
+import io.ktor.server.response.respond
+import io.ktor.server.response.respondFile
+import io.ktor.server.routing.Route
+import io.ktor.server.routing.delete
+import io.ktor.server.routing.get
+import io.ktor.server.routing.post
+import io.ktor.server.routing.put
+import io.ktor.server.routing.route
+import kotlinx.serialization.Serializable
+import org.jetbrains.exposed.v1.jdbc.selectAll
+import java.sql.Timestamp
+import java.time.Instant
+import java.util.UUID
+
+@Serializable
+data class ResponsePunishment(
+    val id: Int,
+    val type: Punishment.PunishmentType,
+    val reason: String,
+    val issuer: ResponseUser,
+    val startTime: Long,
+    val endTime: Long,
+    val perma: Boolean,
+    val active: Boolean
+) {
+    constructor(punishment: Punishment) : this(
+        punishment.id.value,
+        punishment.type,
+        punishment.reason,
+        ResponseUser(SteamwarUser.byId(punishment.punisher)!!),
+        punishment.startTime.toInstant().toEpochMilli(),
+        punishment.endTime.toInstant().toEpochMilli(),
+        punishment.perma,
+        punishment.isCurrent()
+    )
+}
+
+@Serializable
+data class CreatePunishment(
+    val type: Punishment.PunishmentType,
+    val reason: String,
+    val perma: Boolean,
+    val endTime: Long
+)
+
+fun Route.configureUsersRouteV2() {
+    get("/users/{user}/skin") {
+        val user = call.receiveUser()
+        if (user == null) {
+            call.respond(HttpStatusCode.BadRequest, ResponseError("Invalid user"))
+            return@get
+        }
+
+        val skin = getCachedSkin(user.uuid.toString())
+        call.response.header("X-Cache", if (skin.second) "HIT" else "MISS")
+        call.response.header("Cache-Control", "public, max-age=604800")
+        call.respondFile(skin.first)
+    }
+    get("/users/{user}/stats") {
+        val user = call.receiveUser()
+        if (user == null) {
+            call.respond(HttpStatusCode.BadRequest, ResponseError("Invalid user"))
+            return@get
+        }
+
+        val authUser = call.principal<SWAuthPrincipal>()
+
+        if (authUser == null || !(authUser.user.id == user.id || authUser.user.hasPerm(UserPerm.MODERATION))) {
+            call.respond(HttpStatusCode.Forbidden)
+            return@get
+        }
+
+        call.respond(UserStats(user))
+    }
+    route("/users") {
+        install(SWPermissionCheck) {
+            permission = UserPerm.MODERATION
+        }
+        get {
+            val name = call.request.queryParameters["name"]
+            val uuid = call.request.queryParameters["uuid"]?.let { catchException { UUID.fromString(it) } }
+            val team = call.request.queryParameters.getAll("team")?.map { it.toInt() }?.toSet()
+
+            val limit = call.request.queryParameters["limit"]?.toIntOrNull() ?: 100
+            val page = call.request.queryParameters["page"]?.toIntOrNull() ?: 0
+
+            val includePerms = call.request.queryParameters["includePerms"]?.toBoolean() ?: false
+            val includeId = call.request.queryParameters["includeId"]?.toBoolean() ?: false
+
+            call.respond(
+                useDb {
+                    ResponseUserList(
+                        SteamwarUserTable.selectAll().addUserFilter(name, uuid, team).limit(limit)
+                            .offset((page * limit).toLong())
+                            .map { ResponseUser(it, includeId, includePerms) },
+                        SteamwarUserTable.selectAll().addUserFilter(name, uuid, team).count()
+                    )
+                }
+            )
+        }
+
+        route("/{user}") {
+            get {
+                @Serializable
+                data class UserResponse(val user: ResponseUser, val team: ResponseTeam)
+
+                val user = call.receiveUser()
+                if (user == null) {
+                    call.respond(HttpStatusCode.NotFound)
+                    return@get
+                }
+
+                call.respond(
+                    useDb {
+                        UserResponse(ResponseUser(user), ResponseTeam(Team.byId(user.team)))
+                    }
+                )
+            }
+
+            put("/prefix/{prefix}") {
+                val user = call.receiveUser()
+                if (user == null) {
+                    call.respond(HttpStatusCode.BadRequest, ResponseError("Invalid user"))
+                    return@put
+                }
+
+                val prefix = call.parameters["prefix"]?.let { name -> UserPerm.entries.find { it.name == name } }
+                if (prefix == null) {
+                    call.respond(HttpStatusCode.BadRequest, ResponseError("Invalid prefix"))
+                    return@put
+                }
+
+                user.perms().filter { it.name.startsWith("PREFIX_") }.forEach {
+                    UserPerm.removePerm(user, it)
+                }
+
+                if (prefix != UserPerm.PREFIX_NONE) {
+                    UserPerm.addPerm(user, prefix)
+                }
+                call.respond(HttpStatusCode.Accepted)
+            }
+
+            route("/perms") {
+                get {
+                    val user = call.receiveUser()
+                    if (user == null) {
+                        call.respond(HttpStatusCode.BadRequest, ResponseError("Invalid user"))
+                        return@get
+                    }
+
+                    call.respond(user.perms())
+                }
+                route("/{perm}") {
+                    put {
+                        val user = call.receiveUser()
+                        if (user == null) {
+                            call.respond(HttpStatusCode.BadRequest, ResponseError("Invalid user"))
+                            return@put
+                        }
+
+                        val perm = call.parameters["perm"]?.let { name -> UserPerm.entries.find { it.name == name } }
+                        if (perm == null) {
+                            call.respond(HttpStatusCode.BadRequest, ResponseError("Invalid perm"))
+                            return@put
+                        }
+
+                        UserPerm.addPerm(user, perm)
+                        call.respond(HttpStatusCode.Accepted)
+                    }
+                    delete {
+                        val user = call.receiveUser()
+                        if (user == null) {
+                            call.respond(HttpStatusCode.BadRequest, ResponseError("Invalid user"))
+                            return@delete
+                        }
+
+                        val perm = call.parameters["perm"]?.let { name -> UserPerm.entries.find { it.name == name } }
+                        if (perm == null) {
+                            call.respond(HttpStatusCode.BadRequest, ResponseError("Invalid perm"))
+                            return@delete
+                        }
+
+                        UserPerm.removePerm(user, perm)
+                        call.respond(HttpStatusCode.Accepted)
+                    }
+                }
+            }
+        }
+
+        route("/punishments") {
+            get {
+                val user = call.receiveUser()
+                if (user == null) {
+                    call.respond(HttpStatusCode.BadRequest, ResponseError("Invalid user"))
+                    return@get
+                }
+
+                val punishments = user.punishments.toList()
+
+                call.respond(punishments.map { ResponsePunishment(it.second) })
+            }
+            post {
+                val user = call.receiveUser()
+                if (user == null) {
+                    call.respond(HttpStatusCode.BadRequest, ResponseError("Invalid user"))
+                    return@post
+                }
+
+                val punishment = call.receive<CreatePunishment>()
+                val punisher = call.principal<SWAuthPrincipal>()?.user ?: return@post
+
+                user.punish(punishment.type, Timestamp.from(Instant.ofEpochMilli(punishment.endTime)), punishment.reason, punisher.getId(), punishment.perma)
+
+                call.respond(HttpStatusCode.Accepted)
+            }
+        }
+    }
+}
+
+fun ApplicationCall.receiveUser(): SteamwarUser? {
+    val userString = parameters["user"] ?: return null
+
+    if (userString == "me") {
+        return principal<SWAuthPrincipal>()?.user
+    }
+
+    userString.toIntOrNull()?.let { return SteamwarUser.byId(it) }
+    userString.let { catchException { UUID.fromString(it) } }?.let { return SteamwarUser.get(it) }
+    return null
+}

settings.gradle.kts

@@ -101,7 +101,6 @@ dependencyResolutionManagement {
             library("hamcrest", "org.hamcrest:hamcrest:2.2")
             library("classindex", "org.atteo.classindex:classindex:3.13")
 
-
             library("spigotapi", "org.spigotmc:spigot-api:1.20-R0.1-SNAPSHOT")
             library("spigotannotations", "org.spigotmc:plugin-annotations:1.2.3-SNAPSHOT")
             library("paperapi", "io.papermc.paper:paper-api:1.19.2-R0.1-SNAPSHOT")
@@ -223,7 +222,6 @@ include(
     "SchematicSystem:SchematicSystem_15",
     "SchematicSystem:SchematicSystem_19",
     "SchematicSystem:SchematicSystem_20",
-    "SchematicSystem:SchematicSystem_21",
     "SchematicSystem:SchematicSystem_Core"
 )