Refactor Leaderboard to Kotlin, leveraging Exposed library for database operations, and update LeaderboardManager for compatibility.

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

.gitignore

@@ -13,6 +13,7 @@ steamwar.properties
 # VSCode
 bin/
 .vscode
+.settings
 
 # Other
 lib

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

@@ -46,6 +46,7 @@ import de.steamwar.linkage.SpigotLinker;
 import de.steamwar.message.Message;
 import lombok.Getter;
 import org.bukkit.Bukkit;
+import org.bukkit.GameRule;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
@@ -128,6 +129,8 @@ public class BauSystem extends JavaPlugin implements Listener {
         TraceRecorder.instance.init();
 
         new WorldEditRendererCUIEditor();
+
+        Bukkit.getWorlds().get(0).setGameRule(GameRule.SEND_COMMAND_FEEDBACK, false);
     }
 
     @EventHandler

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/config/BauServer.java

@@ -36,7 +36,7 @@ public class BauServer {
     private Integer owner;
 
     public UUID getOwner() {
-        return SteamwarUser.get(getOwnerID()).getUUID();
+        return SteamwarUser.byId(getOwnerID()).getUUID();
     }
 
     public int getOwnerID() {

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/bau/InfoCommand.java

@@ -47,7 +47,7 @@ public class InfoCommand extends SWCommand {
 
     @Register(description = "BAU_INFO_COMMAND_HELP")
     public void genericCommand(Player p) {
-        BauSystem.MESSAGE.send("BAU_INFO_COMMAND_OWNER", p, SteamwarUser.get(bauServer.getOwnerID()).getUserName());
+        BauSystem.MESSAGE.send("BAU_INFO_COMMAND_OWNER", p, SteamwarUser.byId(bauServer.getOwnerID()).getUserName());
         Region region = Region.getRegion(p.getLocation());
         for (Flag flag : Flag.getFlags()) {
             if (!region.getFlags().has(flag).isApplicable()) continue;
@@ -97,7 +97,7 @@ public class InfoCommand extends SWCommand {
                 st.append("§8, ");
             }
             st.append("§7");
-            st.append(SteamwarUser.get(bauweltMembers.get(i).getMemberID()).getUserName());
+            st.append(SteamwarUser.byId(bauweltMembers.get(i).getMemberID()).getUserName());
         }
         return st.toString();
     }

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

@@ -31,7 +31,6 @@ import de.steamwar.command.SWCommand;
 import de.steamwar.command.TypeMapper;
 import de.steamwar.linkage.Linked;
 import de.steamwar.linkage.LinkedInstance;
-import de.steamwar.sql.BauweltMember;
 import de.steamwar.sql.Punishment;
 import de.steamwar.sql.SchematicNode;
 import de.steamwar.sql.SteamwarUser;
@@ -198,7 +197,7 @@ public class TestblockCommand extends SWCommand {
             @Override
             public List<String> tabCompletes(CommandSender commandSender, PreviousArguments previousArguments, String s) {
                 List<String> stringList = new ArrayList<>(SchematicNode.getNodeTabcomplete(SteamwarUser.get(((Player) commandSender).getUniqueId()), s));
-                stringList.addAll(SchematicNode.getNodeTabcomplete(SteamwarUser.get(0), s));
+                stringList.addAll(SchematicNode.getNodeTabcomplete(SteamwarUser.byId(0), s));
                 return stringList;
             }
 
@@ -206,7 +205,7 @@ public class TestblockCommand extends SWCommand {
             public SchematicNode map(CommandSender commandSender, PreviousArguments previousArguments, String s) {
                 SchematicNode node = SchematicNode.getNodeFromPath(SteamwarUser.get(((Player) commandSender).getUniqueId()), s);
                 if (node == null) {
-                    node = SchematicNode.getNodeFromPath(SteamwarUser.get(0), s);
+                    node = SchematicNode.getNodeFromPath(SteamwarUser.byId(0), s);
                 }
                 return node;
             }

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/ScriptHelper.java

@@ -38,7 +38,7 @@ public class ScriptHelper {
         BookMeta meta = (BookMeta) itemStack.getItemMeta();
         if(!writeable) {
             meta.setTitle(script.getName());
-            meta.setAuthor(SteamwarUser.get(script.getUserId()).getUserName());
+            meta.setAuthor(SteamwarUser.byId(script.getUserId()).getUserName());
         }
         meta.setPages(getScriptPages(script));
         itemStack.setItemMeta(meta);

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

@@ -89,7 +89,7 @@ public class StorageLib implements LuaLib, Enable, Disable {
                 jsonObject.keySet().forEach(key -> {
                     map.put(key, fromJson(jsonObject.get(key)));
                 });
-                SteamwarUser steamwarUser = SteamwarUser.get(Integer.parseInt(playerStorage.getName().substring(0, playerStorage.getName().length() - ".json".length())));
+                SteamwarUser steamwarUser = SteamwarUser.byId(Integer.parseInt(playerStorage.getName().substring(0, playerStorage.getName().length() - ".json".length())));
                 PLAYER_STORAGE.put(steamwarUser.getUUID(), map);
             } catch (Exception e) {}
         }

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/storage/YAPIONFormatSimulatorLoader.java

@@ -54,7 +54,7 @@ public class YAPIONFormatSimulatorLoader implements SimulatorLoader {
         }
 
         String name = file.getName().substring(0, file.getName().length() - 7);
-        SteamwarUser steamwarUser = SteamwarUser.get(Integer.parseInt(name));
+        SteamwarUser steamwarUser = SteamwarUser.byId(Integer.parseInt(name));
 
         List<Simulator> simulators = new ArrayList<>();
         for (String s : yapionObject.getKeys()) {

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/MaterialLazyInit.java

@@ -87,6 +87,7 @@ public class MaterialLazyInit {
                 Block block = Bukkit.getWorlds().get(0).getBlockAt(0, 0, 0);
                 block.setType(material);
                 unmoveable = block.getPistonMoveReaction() == PistonMoveReaction.BLOCK || block.getPistonMoveReaction() == PistonMoveReaction.IGNORE || block.getState() instanceof TileState;
+                block.setType(Material.AIR);
             }
 
             if (material.isItem() && material != Material.AIR) {

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/AntiBauAddMemberFix.java

@@ -41,7 +41,7 @@ public class AntiBauAddMemberFix implements Listener {
         }
         if (BauweltMember.getBauMember(BauServer.getInstance().getOwner(), event.getPlayer().getUniqueId()) == null) {
             event.getPlayer().kickPlayer("");
-            throw new SecurityException("The player " + event.getPlayer().getName() + " joined on the server of " + SteamwarUser.get(BauServer.getInstance().getOwnerID()).getUserName() + " without being added!");
+            throw new SecurityException("The player " + event.getPlayer().getName() + " joined on the server of " + SteamwarUser.byId(BauServer.getInstance().getOwnerID()).getUserName() + " without being added!");
         }
     }
 

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

@@ -84,7 +84,12 @@ public class FixedFlagStorage implements FlagStorage {
 
     @Override
     public void clear() {
-        flagMap.clear();
+        for (Flag flag : Flag.getFlags()) {
+            if (flag == Flag.TESTBLOCK) continue;
+            if (flag == Flag.COLOR) continue;
+            if (flag == Flag.CHANGED) continue;
+            flagMap.remove(flag);
+        }
     }
 
     @Override

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

@@ -91,7 +91,12 @@ public class FixedGlobalFlagStorage implements FlagStorage {
 
     @Override
     public void clear() {
-        flagMap.clear();
+        for (Flag flag : Flag.getFlags()) {
+            if (flag == Flag.TESTBLOCK) continue;
+            if (flag == Flag.COLOR) continue;
+            if (flag == Flag.CHANGED) continue;
+            flagMap.remove(flag);
+        }
     }
 
     @Override

BauSystem/build.gradle.kts

@@ -50,5 +50,6 @@ tasks.register<DevServer>("DevBau21") {
     description = "Run a 1.21 Dev Bau"
     dependsOn(":SpigotCore:shadowJar")
     dependsOn(":BauSystem:shadowJar")
+    dependsOn(":SchematicSystem:shadowJar")
     template = "Bau21"
 }

CommonCore/SQL/build.gradle.kts

@@ -18,11 +18,26 @@
  */
 
 plugins {
-    steamwar.java
+    steamwar.kotlin
+}
+
+kotlin {
+    jvmToolchain(8)
+}
+
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
 }
 
 dependencies {
     compileOnly(libs.sqlite)
 
     implementation("org.yaml:snakeyaml:2.2")
-}
+
+    compileOnlyApi("org.jetbrains.kotlin:kotlin-stdlib:2.2.21")
+    compileOnlyApi(libs.exposedCore)
+    compileOnlyApi(libs.exposedDao)
+    compileOnlyApi(libs.exposedJdbc)
+    compileOnlyApi(libs.exposedTime)
+}

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

@@ -1,125 +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.sql;
-
-import de.steamwar.sql.internal.Field;
-import de.steamwar.sql.internal.SqlTypeMapper;
-import de.steamwar.sql.internal.Statement;
-import de.steamwar.sql.internal.Table;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NonNull;
-
-import java.sql.Timestamp;
-import java.time.Instant;
-
-@AllArgsConstructor
-public class AuditLog {
-
-    static {
-        SqlTypeMapper.nameEnumMapper(AuditLog.Type.class);
-    }
-
-    public static final String SERVER_NAME_VELOCITY = "Velocity";
-
-    private static final Table<AuditLog> table = new Table<>(AuditLog.class);
-
-    private static final Statement create = table.insertFields(true, "time", "serverName", "serverOwner", "actor", "actionType", "actionText");
-
-    @Getter
-    @Field
-    private final Timestamp time;
-
-    @Getter
-    @Field
-    private final String serverName;
-
-    @Field(nullable = true)
-    private final int serverOwner;
-
-    @Field
-    private final int actor;
-
-    @Getter
-    @Field
-    private final Type actionType;
-
-    @Getter
-    @Field
-    private final String actionText;
-
-    public enum Type {
-        JOIN,
-        LEAVE,
-        COMMAND,
-        SENSITIVE_COMMAND,
-
-        CHAT,
-        GUI_OPEN,
-        GUI_CLOSE,
-        GUI_CLICK,
-    }
-
-    private static void create(String serverName, SteamwarUser serverOwner, SteamwarUser actor, Type actionType, String text) {
-        create.insertGetKey(Timestamp.from(Instant.now()), serverName, serverOwner, actor, actionType, text);
-    }
-
-    public static void createJoin(@NonNull String jointServerName, SteamwarUser serverOwner, @NonNull SteamwarUser joinedPlayer) {
-        create(jointServerName, serverOwner, joinedPlayer, Type.JOIN, "");
-    }
-
-    public static void createLeave(@NonNull String leftServerName, SteamwarUser serverOwner, @NonNull SteamwarUser joinedPlayer) {
-        create(leftServerName, serverOwner, joinedPlayer, Type.LEAVE, "");
-    }
-
-    public static void createCommand(@NonNull String serverName, SteamwarUser serverOwner, SteamwarUser player, @NonNull String command) {
-        if (player == null) return;
-        create(serverName, serverOwner, player, Type.COMMAND, command);
-    }
-
-    public static void createSensitiveCommand(@NonNull String serverName, SteamwarUser serverOwner, SteamwarUser player, @NonNull String command) {
-        if (player == null) return;
-        create(serverName, serverOwner, player, Type.SENSITIVE_COMMAND, command);
-    }
-
-    public static void createChat(@NonNull String serverName, SteamwarUser serverOwner, @NonNull SteamwarUser chatter, @NonNull String chat) {
-        create(serverName, serverOwner, chatter, Type.CHAT, chat);
-    }
-
-    public static void createGuiOpen(@NonNull String serverName, SteamwarUser serverOwner, @NonNull SteamwarUser player, @NonNull String guiName) {
-        create(serverName, serverOwner, player, Type.GUI_OPEN, guiName);
-    }
-
-    public static void createGuiClick(@NonNull String serverName, SteamwarUser serverOwner, @NonNull SteamwarUser player, @NonNull String guiName, @NonNull String clickType, int slot, @NonNull String itemName) {
-        create(serverName, serverOwner, player, Type.GUI_CLICK, "Gui: " + guiName + "\nSlot: " + slot + "\nClickType: " + clickType + "\nItemName: " + itemName);
-    }
-
-    public static void createGuiClose(@NonNull String serverName, SteamwarUser serverOwner, @NonNull SteamwarUser player, @NonNull String guiName) {
-        create(serverName, serverOwner, player, Type.GUI_CLOSE, guiName);
-    }
-
-    public SteamwarUser getServerOwner() {
-        return SteamwarUser.get(serverOwner);
-    }
-
-    public SteamwarUser getActor() {
-        return SteamwarUser.get(actor);
-    }
-}

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

@@ -0,0 +1,121 @@
+/*
+ *   This file is a part of the SteamWar software.
+ *
+ *   Copyright (C) 2025 SteamWar.de-Serverteam
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU Affero General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU Affero General Public License for more details.
+ *
+ *   You should have received a copy of the GNU Affero General Public License
+ *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package de.steamwar.sql
+
+import de.steamwar.sql.internal.useDb
+import org.jetbrains.exposed.v1.core.dao.id.EntityID
+import org.jetbrains.exposed.v1.core.dao.id.IntIdTable
+import org.jetbrains.exposed.v1.dao.IntEntity
+import org.jetbrains.exposed.v1.dao.IntEntityClass
+import org.jetbrains.exposed.v1.javatime.timestamp
+import java.time.Instant
+
+object AuditLogTable: IntIdTable("AuditLog", "AuditLogId") {
+    val time = timestamp("Time")
+    val server = varchar("ServerName", 255)
+    val serverOwner = reference("ServerOwner", SteamwarUserTable).nullable()
+    val actor = reference("Actor", SteamwarUserTable)
+    val action = enumerationByName("ActionType", 255, AuditLog.Type::class)
+    val actionText = text("ActionText")
+}
+
+class AuditLog(id: EntityID<Int>): IntEntity(id) {
+    companion object: IntEntityClass<AuditLog>(AuditLogTable) {
+        const val SERVER_NAME_VELOCITY: String = "Velocity"
+
+        private fun create(
+            serverName: String,
+            serverOwner: SteamwarUser?,
+            actor: SteamwarUser,
+            actionType: Type,
+            text: String = ""
+        ) = useDb {
+            new {
+                this.time = Instant.now()
+                this.server = serverName
+                this.serverOwner = serverOwner?.id
+                this.actor = actor.id
+                this.action = actionType
+                this.actionText = text
+            }
+        }
+
+        @JvmStatic
+        fun createJoin(jointServerName: String, serverOwner: SteamwarUser?, joinedPlayer: SteamwarUser) = create(jointServerName, serverOwner, joinedPlayer, Type.JOIN)
+
+        @JvmStatic
+        fun createLeave(leftServerName: String, serverOwner: SteamwarUser?, joinedPlayer: SteamwarUser) = create(leftServerName, serverOwner, joinedPlayer, Type.LEAVE)
+
+        @JvmStatic
+        fun createCommand(serverName: String, serverOwner: SteamwarUser?, player: SteamwarUser?, command: String) = player?.let { create(serverName, serverOwner, it, Type.COMMAND, command) }
+
+        @JvmStatic
+        fun createSensitiveCommand(
+            serverName: String,
+            serverOwner: SteamwarUser?,
+            player: SteamwarUser?,
+            command: String
+        ) = player?.let { create(serverName, serverOwner, it, Type.SENSITIVE_COMMAND, command) }
+
+        @JvmStatic
+        fun createChat(serverName: String, serverOwner: SteamwarUser?, chatter: SteamwarUser, chat: String) = create(serverName, serverOwner, chatter, Type.CHAT, chat)
+
+        @JvmStatic
+        fun createGuiOpen(serverName: String, serverOwner: SteamwarUser?, player: SteamwarUser, guiName: String) = create(serverName, serverOwner, player, Type.GUI_OPEN, guiName)
+
+        @JvmStatic
+        fun createGuiClick(
+            serverName: String,
+            serverOwner: SteamwarUser?,
+            player: SteamwarUser,
+            guiName: String,
+            clickType: String,
+            slot: Int,
+            itemName: String
+        ) = create(
+            serverName,
+            serverOwner,
+            player,
+            Type.GUI_CLICK,
+            "Gui: $guiName\nSlot: $slot\nClickType: $clickType\nItemName: $itemName"
+        )
+
+        @JvmStatic
+        fun createGuiClose(serverName: String, serverOwner: SteamwarUser?, player: SteamwarUser, guiName: String) = create(serverName, serverOwner, player, Type.GUI_CLOSE, guiName)
+    }
+
+    var time by AuditLogTable.time
+    var server by AuditLogTable.server
+    var serverOwner by AuditLogTable.serverOwner
+    var actor by AuditLogTable.actor
+    var action by AuditLogTable.action
+    var actionText by AuditLogTable.actionText
+
+    enum class Type {
+        JOIN,
+        LEAVE,
+        COMMAND,
+        SENSITIVE_COMMAND,
+        CHAT,
+        GUI_OPEN,
+        GUI_CLOSE,
+        GUI_CLICK,
+    }
+}

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

@@ -1,67 +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.sql;
-
-import de.steamwar.sql.internal.Field;
-import de.steamwar.sql.internal.SelectStatement;
-import de.steamwar.sql.internal.Statement;
-import de.steamwar.sql.internal.Table;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-import java.sql.Timestamp;
-import java.time.Instant;
-import java.util.List;
-
-@AllArgsConstructor
-public class BannedUserIPs {
-
-    private static final Table<BannedUserIPs> table = new Table<>(BannedUserIPs.class);
-
-    private static final SelectStatement<BannedUserIPs> getByID = table.selectFields("UserID");
-    private static final SelectStatement<BannedUserIPs> getByIP = new SelectStatement<>(table, "SELECT * FROM BannedUserIPs WHERE IP = ? ORDER BY Timestamp DESC");
-    private static final Statement banIP = table.insertAll();
-    private static final Statement unbanIPs = table.deleteFields("UserID");
-
-    @Getter
-    @Field(keys = {Table.PRIMARY})
-    private final int userID;
-    @Getter
-    @Field(def = "CURRENT_TIMESTAMP")
-    private final Timestamp timestamp;
-    @Field(keys = {Table.PRIMARY})
-    private final String ip;
-
-    public static List<BannedUserIPs> get(int userID) {
-        return getByID.listSelect(userID);
-    }
-
-    public static List<BannedUserIPs> get(String ip) {
-        return getByIP.listSelect(ip);
-    }
-
-    public static void banIP(int userID, String ip){
-        banIP.update(userID, Timestamp.from(Instant.now()), ip);
-    }
-
-    public static void unbanIPs(int userID) {
-        unbanIPs.update(userID);
-    }
-}

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

@@ -0,0 +1,78 @@
+/*
+ *   This file is a part of the SteamWar software.
+ *
+ *   Copyright (C) 2025 SteamWar.de-Serverteam
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU Affero General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU Affero General Public License for more details.
+ *
+ *   You should have received a copy of the GNU Affero General Public License
+ *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package de.steamwar.sql
+
+import de.steamwar.sql.internal.useDb
+import org.jetbrains.exposed.v1.core.dao.id.CompositeID
+import org.jetbrains.exposed.v1.core.dao.id.CompositeIdTable
+import org.jetbrains.exposed.v1.core.dao.id.EntityID
+import org.jetbrains.exposed.v1.core.eq
+import org.jetbrains.exposed.v1.dao.CompositeEntity
+import org.jetbrains.exposed.v1.dao.CompositeEntityClass
+import org.jetbrains.exposed.v1.javatime.timestamp
+import org.jetbrains.exposed.v1.jdbc.deleteWhere
+import org.jetbrains.exposed.v1.jdbc.insertIgnore
+import java.sql.Timestamp
+import java.time.Instant
+
+object BannedUserIPsTable: CompositeIdTable("BannedUserIPs") {
+    val userId = reference("UserID", SteamwarUserTable)
+    val timestamp = timestamp("Timestamp")
+    val ip = varchar("IP", 45)
+
+    override val primaryKey = PrimaryKey(userId, ip)
+}
+
+class BannedUserIPs(id: EntityID<CompositeID>): CompositeEntity(id) {
+    companion object: CompositeEntityClass<BannedUserIPs>(BannedUserIPsTable) {
+
+        @JvmStatic
+        fun get(userId: Int) = useDb {
+            find { BannedUserIPsTable.userId eq userId }.toList()
+        }
+
+        @JvmStatic
+        fun get(ip: String) = useDb {
+            find { BannedUserIPsTable.ip eq ip }.toList()
+        }
+
+        @JvmStatic
+        fun banIP(userId: Int, ip: String) = useDb {
+            BannedUserIPsTable.insertIgnore {
+                it[BannedUserIPsTable.userId] = userId
+                it[BannedUserIPsTable.ip] = ip
+                it[BannedUserIPsTable.timestamp] = Instant.now()
+            }
+        }
+
+        @JvmStatic
+        fun unbanIPs(userId: Int) = useDb {
+            BannedUserIPsTable.deleteWhere { BannedUserIPsTable.userId eq userId }
+        }
+    }
+
+    val userID by BannedUserIPsTable.userId.transform({ EntityID(it, SteamwarUserTable) }, { it.value })
+    val timestamp: Timestamp by BannedUserIPsTable.timestamp.transform({ it.toInstant() }, { Timestamp.from(it) })
+    val ip by BannedUserIPsTable.ip
+
+    fun remove() = useDb {
+        delete()
+    }
+}

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

@@ -1,123 +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.sql;
-
-import de.steamwar.sql.internal.Field;
-import de.steamwar.sql.internal.SelectStatement;
-import de.steamwar.sql.internal.Statement;
-import de.steamwar.sql.internal.Table;
-import lombok.Getter;
-
-import java.util.*;
-
-public class BauweltMember {
-    private static final Map<Integer, BauweltMember> memberCache = new HashMap<>();
-
-    public static void clear() {
-        memberCache.clear();
-    }
-
-    private static final Table<BauweltMember> table = new Table<>(BauweltMember.class);
-    private static final SelectStatement<BauweltMember> getMember = table.select(Table.PRIMARY);
-    private static final SelectStatement<BauweltMember> getMembers = table.selectFields("BauweltID");
-    private static final Statement update = table.insertAll();
-    private static final Statement delete = table.delete(Table.PRIMARY);
-
-    public static void addMember(UUID ownerID, UUID memberID) {
-        new BauweltMember(SteamwarUser.get(ownerID).getId(), SteamwarUser.get(memberID).getId(), false, false).updateDB();
-    }
-
-    public static BauweltMember getBauMember(UUID ownerID, UUID memberID){
-        return getBauMember(SteamwarUser.get(ownerID).getId(), SteamwarUser.get(memberID).getId());
-    }
-
-    public static BauweltMember getBauMember(int ownerID, int memberID){
-        BauweltMember member = memberCache.get(memberID);
-        if(member != null && member.bauweltID == ownerID)
-            return member;
-        return getMember.select(ownerID, memberID);
-    }
-
-    public static List<BauweltMember> getMembers(UUID bauweltID){
-        return getMembers(SteamwarUser.get(bauweltID).getId());
-    }
-
-    public static List<BauweltMember> getMembers(int bauweltID){
-        return getMembers.listSelect(bauweltID);
-    }
-
-    @Getter
-    @Field(keys = {Table.PRIMARY})
-    private final int bauweltID;
-    @Getter
-    @Field(keys = {Table.PRIMARY})
-    private final int memberID;
-    @Getter
-    @Field(def = "0")
-    private boolean worldEdit;
-    @Getter
-    @Field(def = "0")
-    private boolean world;
-
-    public BauweltMember(int bauweltID, int memberID, boolean worldEdit, boolean world) {
-        this.bauweltID = bauweltID;
-        this.memberID = memberID;
-        this.worldEdit = worldEdit;
-        this.world = world;
-        memberCache.put(memberID, this);
-    }
-
-    public void setWorldEdit(boolean worldEdit) {
-        this.worldEdit = worldEdit;
-        updateDB();
-    }
-
-    public void setWorld(boolean world) {
-        this.world = world;
-        updateDB();
-    }
-
-    private void updateDB(){
-        update.update(bauweltID, memberID, worldEdit, world);
-    }
-
-    public void remove(){
-        delete.update(bauweltID, memberID);
-        memberCache.remove(memberID);
-    }
-
-    public boolean isBuild() {
-        return worldEdit;
-    }
-
-    public boolean isSupervisor() {
-        return world;
-    }
-
-    public void setBuild(boolean build) {
-        this.worldEdit = build;
-        updateDB();
-    }
-
-    public void setSupervisor(boolean supervisor) {
-        this.world = supervisor;
-        updateDB();
-    }
-}

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

@@ -0,0 +1,130 @@
+/*
+ *   This file is a part of the SteamWar software.
+ *
+ *   Copyright (C) 2025 SteamWar.de-Serverteam
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU Affero General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU Affero General Public License for more details.
+ *
+ *   You should have received a copy of the GNU Affero General Public License
+ *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package de.steamwar.sql
+
+import de.steamwar.sql.BauweltMemberTable.bauweltId
+import de.steamwar.sql.internal.useDb
+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
+import org.jetbrains.exposed.v1.core.dao.id.EntityID
+import org.jetbrains.exposed.v1.core.eq
+import org.jetbrains.exposed.v1.dao.CompositeEntity
+import org.jetbrains.exposed.v1.dao.CompositeEntityClass
+import org.jetbrains.exposed.v1.jdbc.insertIgnore
+import java.util.*
+
+object BauweltMemberTable: CompositeIdTable("BauweltMember") {
+    val bauweltId = reference("BauweltID", SteamwarUserTable)
+    val memberId = reference("MemberID", SteamwarUserTable)
+    val build = bool("Build")
+    val worldEdit = bool("WorldEdit")
+    val world = bool("World")
+
+    override val primaryKey = PrimaryKey(bauweltId, memberId)
+
+    init {
+        addIdColumn(bauweltId)
+        addIdColumn(memberId)
+    }
+}
+
+class BauweltMember(id: EntityID<CompositeID>): CompositeEntity(id) {
+    companion object: CompositeEntityClass<BauweltMember>(BauweltMemberTable) {
+        private val cache = mutableMapOf<Int, BauweltMember>()
+
+        private fun cache(member: BauweltMember) = cache.put(member.memberID, member)
+
+        @JvmStatic
+        fun clear() = cache.clear()
+
+        @JvmStatic
+        @Deprecated("Use addMember(ownerId: Int, newMemberId: Int)")
+        fun addMember(ownerId: UUID, newMemberId: UUID) = addMember(SteamwarUser.get(ownerId)!!.id, SteamwarUser.get(newMemberId)!!.id)
+
+        @JvmStatic
+        fun addMember(ownerId: Int, newMemberId: Int) = addMember(EntityID(ownerId, SteamwarUserTable), EntityID(newMemberId, SteamwarUserTable))
+
+        fun addMember(ownerId: EntityID<Int>, newMemberId: EntityID<Int>) = useDb {
+            BauweltMemberTable.insertIgnore {
+                it[bauweltId] = ownerId
+                it[memberId] = newMemberId
+                it[build] = false
+                it[worldEdit] = false
+                it[world] = false
+            }
+        }
+
+        @JvmStatic
+        @Deprecated("Use getBauMember(bauwelt: Int, member: Int)")
+        fun getBauMember(bauwelt: UUID, member: UUID) = useDb {
+            find { (bauweltId eq SteamwarUser.get(bauwelt)!!.id) and (BauweltMemberTable.memberId eq SteamwarUser.get(member)!!.id) }.firstOrNull()?.also { cache(it) }
+        }
+
+        @JvmStatic
+        fun getBauMember(bauwelt: Int, member: Int) = useDb {
+            find { (bauweltId eq bauwelt) and (BauweltMemberTable.memberId eq member) }.firstOrNull()?.also { cache(it) }
+        }
+
+        @JvmStatic
+        @Deprecated("Use getMembers(bauwelt: Int)")
+        fun getMembers(bauwelt: UUID) = getMembers(SteamwarUser.get(bauwelt)!!.id.value)
+
+        @JvmStatic
+        fun getMembers(bauwelt: Int) = useDb {
+            find { bauweltId eq bauwelt }.toList().also { it.forEach { cache(it) } }
+        }
+    }
+
+    val bauweltID by BauweltMemberTable.bauweltId.transform({ EntityID(it, SteamwarUserTable) }, { it.value })
+    val memberID by BauweltMemberTable.memberId.transform({ EntityID(it, SteamwarUserTable) }, { it.value })
+    private var worldEditInternal by BauweltMemberTable.worldEdit
+    var worldEdit: Boolean
+        get() = worldEditInternal
+        set(value) = useDb {
+            worldEditInternal = value
+        }
+    private var buildInternal by BauweltMemberTable.build
+    var build: Boolean
+        get() = buildInternal
+        set(value) = useDb {
+            buildInternal = value
+        }
+    private var worldInternal by BauweltMemberTable.world
+    var world: Boolean
+        get() = worldInternal
+        set(value) = useDb {
+            worldInternal = value
+        }
+    var supervisor: Boolean
+        get() = world
+        set(value) = useDb {
+            world = value
+        }
+
+    fun isBuild() = build
+    fun isSupervisor() = world
+    fun isWorldEdit() = build
+    fun isWorld() = world
+
+    fun remove() = useDb {
+        delete()
+    }
+}

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

@@ -1,101 +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.sql;
-
-import de.steamwar.sql.internal.Field;
-import de.steamwar.sql.internal.SelectStatement;
-import de.steamwar.sql.internal.Statement;
-import de.steamwar.sql.internal.Table;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-import java.sql.Timestamp;
-import java.util.List;
-import java.util.concurrent.CompletableFuture;
-
-@AllArgsConstructor
-public class CheckedSchematic {
-
-    private static final Table<CheckedSchematic> table = new Table<>(CheckedSchematic.class);
-    private static final SelectStatement<CheckedSchematic> statusOfNode = new SelectStatement<>(table, "SELECT * FROM CheckedSchematic WHERE NodeId = ? AND DeclineReason != 'Prüfvorgang abgebrochen' ORDER BY EndTime DESC");
-    private static final SelectStatement<CheckedSchematic> nodeHistory = new SelectStatement<>(table, "SELECT * FROM CheckedSchematic WHERE NodeId = ? AND DeclineReason != '' AND DeclineReason != 'Prüfvorgang abgebrochen' ORDER BY EndTime DESC");
-    private static final Statement insert = table.insertAll();
-
-    private static final SelectStatement<CheckedSchematic> getUnseen = new SelectStatement<>(table, "SELECT * FROM CheckedSchematic WHERE Seen = 0 AND NodeOwner = ? ORDER BY StartTime DESC");
-    private static final Statement updateSeen = new Statement("UPDATE CheckedSchematic SET Seen = ? WHERE StartTime = ? AND EndTime = ? AND NodeName = ?");
-
-    public static void create(SchematicNode node, int validator, Timestamp startTime, Timestamp endTime, String reason, boolean seen) {
-        insert.update(node.getId(), node.getOwner(), node.getName(), validator, startTime, endTime, reason, seen, node.getSchemtype().toDB().substring(1));
-    }
-
-    public static List<CheckedSchematic> getLastDeclinedOfNode(int node) {
-        return statusOfNode.listSelect(node);
-    }
-
-    public static List<CheckedSchematic> previousChecks(SchematicNode node) {
-        return nodeHistory.listSelect(node.getId());
-    }
-
-    public static List<CheckedSchematic> getUnseen(SteamwarUser owner) {
-        return getUnseen.listSelect(owner);
-    }
-
-    @Field(nullable = true)
-    private final Integer nodeId;
-    @Field
-    private final int nodeOwner;
-    @Field
-    private final String nodeName;
-    @Getter
-    @Field
-    private final int validator;
-    @Getter
-    @Field
-    private final Timestamp startTime;
-    @Getter
-    @Field
-    private final Timestamp endTime;
-    @Getter
-    @Field
-    private final String declineReason;
-    @Getter
-    @Field
-    private boolean seen;
-    @Getter
-    @Field
-    private final String nodeType;
-
-    public int getNode() {
-        return nodeId;
-    }
-
-    public String getSchemName() {
-        return nodeName;
-    }
-
-    public int getSchemOwner() {
-        return nodeOwner;
-    }
-
-    public void setSeen(boolean seen) {
-        this.seen = seen;
-        updateSeen.update(seen, startTime, endTime, nodeName);
-    }
-}

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

@@ -0,0 +1,100 @@
+/*
+ *   This file is a part of the SteamWar software.
+ *
+ *   Copyright (C) 2025 SteamWar.de-Serverteam
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU Affero General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU Affero General Public License for more details.
+ *
+ *   You should have received a copy of the GNU Affero General Public License
+ *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package de.steamwar.sql
+
+import de.steamwar.sql.internal.useDb
+import org.jetbrains.exposed.v1.core.SortOrder
+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
+import org.jetbrains.exposed.v1.core.dao.id.EntityID
+import org.jetbrains.exposed.v1.core.eq
+import org.jetbrains.exposed.v1.core.neq
+import org.jetbrains.exposed.v1.dao.CompositeEntity
+import org.jetbrains.exposed.v1.dao.CompositeEntityClass
+import org.jetbrains.exposed.v1.javatime.timestamp
+import org.jetbrains.exposed.v1.jdbc.insertIgnore
+import java.sql.Timestamp
+
+object CheckedSchematicTable: CompositeIdTable("CheckedSchematic") {
+    val nodeId = optReference("NodeId", SchematicNodeTable)
+    val nodeOwner = reference("NodeOwner", SteamwarUserTable)
+    val nodeName = varchar("NodeName", 64).entityId()
+    val validator = reference("Validator", SteamwarUserTable)
+    val startTime = timestamp("StartTime").entityId()
+    val endTime = timestamp("EndTime")
+    val declineReason = text("DeclineReason")
+    val seen = bool("Seen")
+    val nodeType = varchar("NodeType", 16)
+
+    init {
+        addIdColumn(nodeOwner)
+        addIdColumn(nodeName)
+    }
+}
+
+class CheckedSchematic(id: EntityID<CompositeID>): CompositeEntity(id) {
+    companion object: CompositeEntityClass<CheckedSchematic>(CheckedSchematicTable) {
+        @JvmStatic
+        fun create(node: SchematicNode, validator: Int, startTime: Timestamp, endTime: Timestamp, reason: String, seen: Boolean) = useDb {
+            CheckedSchematicTable.insertIgnore {
+                it[this.nodeId] = node.id
+                it[this.nodeOwner] = EntityID(node.owner, SteamwarUserTable)
+                it[this.nodeName] = node.name
+                it[this.validator] = EntityID(validator, SteamwarUserTable)
+                it[this.startTime] = startTime.toInstant()
+                it[this.endTime] = endTime.toInstant()
+                it[this.declineReason] = reason
+                it[this.seen] = seen
+                it[this.nodeType] = node.schemtype.toDB().substring(1)
+            }
+        }
+
+        @JvmStatic
+        fun getLastDeclinedOfNode(node: Int) = useDb {
+            find { (CheckedSchematicTable.nodeId eq node) and (CheckedSchematicTable.declineReason neq "Prüfvorgang abgebrochen") }.orderBy(CheckedSchematicTable.endTime to SortOrder.DESC).toList()
+        }
+
+        @JvmStatic
+        fun previousChecks(node: SchematicNode) = useDb {
+            find { (CheckedSchematicTable.nodeId eq node.id) and (CheckedSchematicTable.declineReason neq "") and (CheckedSchematicTable.declineReason neq "Prüfvorgang abgebrochen") }.orderBy(CheckedSchematicTable.endTime to SortOrder.DESC).toList()
+        }
+
+        @JvmStatic
+        fun getUnseen(owner: SteamwarUser) = useDb {
+            find { (CheckedSchematicTable.nodeOwner eq owner.id) and (CheckedSchematicTable.seen eq false) }.orderBy(CheckedSchematicTable.endTime to SortOrder.DESC).toList()
+        }
+    }
+
+    val node by CheckedSchematicTable.nodeId.transform({ it?.let { EntityID(it, SchematicNodeTable) } }, { it?.value })
+    val schemOwner by CheckedSchematicTable.nodeOwner.transform({ EntityID(it, SteamwarUserTable) }, { it.value })
+    val nodeName by CheckedSchematicTable.nodeName
+    val schemName get() = nodeName.value
+    val validator by CheckedSchematicTable.validator.transform({ EntityID(it, SteamwarUserTable) }, { it.value })
+    val startTimeId by CheckedSchematicTable.startTime
+    val startTime get() = Timestamp.from(startTimeId.value)
+    val endTime by CheckedSchematicTable.endTime.transform({ it.toInstant() }, { Timestamp.from(it) })
+    val declineReason by CheckedSchematicTable.declineReason
+    private var wasSeen by CheckedSchematicTable.seen
+    var seen: Boolean
+        get() = wasSeen
+        set(value) = useDb { wasSeen = value }
+    val nodeType by CheckedSchematicTable.nodeType
+}

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

@@ -1,125 +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.sql;
-
-import de.steamwar.sql.internal.Field;
-import de.steamwar.sql.internal.SelectStatement;
-import de.steamwar.sql.internal.Statement;
-import de.steamwar.sql.internal.Table;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-import java.sql.Timestamp;
-import java.time.Instant;
-import java.util.List;
-
-@AllArgsConstructor
-public class Event {
-
-    static {
-        SchematicType.Normal.name(); // Ensure SchematicType is loaded.
-    }
-
-    private static final Table<Event> table = new Table<>(Event.class);
-
-    private static final SelectStatement<Event> byCurrent = new SelectStatement<>(table, "SELECT * FROM Event WHERE Start < now() AND End > now()");
-    private static final SelectStatement<Event> byId = table.select(Table.PRIMARY);
-    private static final SelectStatement<Event> byName = table.select("eventName");
-    private static final SelectStatement<Event> byComing = new SelectStatement<>(table, "SELECT * FROM Event WHERE Start > now()");
-    private static final SelectStatement<Event> all = new SelectStatement<>(table, "SELECT * FROM Event");
-
-    private static final Statement create = table.insertFields(true, "eventName", "deadline", "start", "end", "maximumTeamMembers", "publicSchemsOnly");
-    private static final Statement update = table.update(Table.PRIMARY, "eventName", "deadline", "start", "end", "schemType", "maximumTeamMembers", "publicSchemsOnly");
-    private static final Statement delete = table.delete(Table.PRIMARY);
-
-    private static Event current = null;
-
-    public static Event get(){
-        if(current != null && current.now())
-            return current;
-
-        current = byCurrent.select();
-        return current;
-    }
-
-    public static List<Event> getAll(){
-        return all.listSelect();
-    }
-
-    public static Event create(String eventName, Timestamp start, Timestamp end){
-        return get(create.insertGetKey(eventName, start, start, end, 5, false));
-    }
-
-    public static Event get(int eventID){
-        return byId.select(eventID);
-    }
-
-    public static Event get(String eventName) {
-        return byName.select(eventName);
-    }
-
-    public static List<Event> getComing() {
-        return byComing.listSelect();
-    }
-
-    @Getter
-    @Field(keys = {Table.PRIMARY}, autoincrement = true)
-    private final int eventID;
-    @Getter
-    @Field(keys = {"eventName"})
-    private final String eventName;
-    @Getter
-    @Field
-    private final Timestamp deadline;
-    @Getter
-    @Field
-    private final Timestamp start;
-    @Getter
-    @Field
-    private final Timestamp end;
-    @Getter
-    @Field
-    private final int maximumTeamMembers;
-    @Field(nullable = true)
-    private final SchematicType schemType;
-    @Field
-    private final boolean publicSchemsOnly;
-
-    public boolean publicSchemsOnly() {
-        return publicSchemsOnly;
-    }
-
-    public SchematicType getSchematicType() {
-        return schemType;
-    }
-
-    private boolean now() {
-        Instant now = Instant.now();
-        return now.isAfter(start.toInstant()) && now.isBefore(end.toInstant());
-    }
-
-    public void update(String eventName, Timestamp deadline, Timestamp start, Timestamp end, SchematicType schemType, int maximumTeamMembers, boolean publicSchemsOnly) {
-        update.update(eventName, deadline, start, end, schemType, maximumTeamMembers, publicSchemsOnly, eventID);
-    }
-
-    public void delete() {
-        delete.update(eventID);
-    }
-}

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

@@ -0,0 +1,121 @@
+/*
+ *   This file is a part of the SteamWar software.
+ *
+ *   Copyright (C) 2025 SteamWar.de-Serverteam
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU Affero General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU Affero General Public License for more details.
+ *
+ *   You should have received a copy of the GNU Affero General Public License
+ *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package de.steamwar.sql
+
+import de.steamwar.sql.internal.useDb
+import org.jetbrains.exposed.v1.core.and
+import org.jetbrains.exposed.v1.core.dao.id.EntityID
+import org.jetbrains.exposed.v1.core.dao.id.IntIdTable
+import org.jetbrains.exposed.v1.core.eq
+import org.jetbrains.exposed.v1.core.greater
+import org.jetbrains.exposed.v1.core.lessEq
+import org.jetbrains.exposed.v1.dao.IntEntity
+import org.jetbrains.exposed.v1.dao.IntEntityClass
+import org.jetbrains.exposed.v1.javatime.timestamp
+import org.jetbrains.exposed.v1.jdbc.insertAndGetId
+import java.sql.Timestamp
+import java.time.Instant
+
+object EventTable : IntIdTable("Event", "EventId") {
+    val name = varchar("EventName", 100).uniqueIndex()
+    val deadline = timestamp("Deadline")
+    val start = timestamp("Start")
+    val end = timestamp("End")
+    val maxPlayers = integer("MaximumTeamMembers")
+    val schemType = varchar("SchemType", 16).nullable()
+    val publicsOnly = bool("PublicSchemsOnly")
+}
+
+class Event(id: EntityID<Int>) : IntEntity(id) {
+    companion object : IntEntityClass<Event>(EventTable) {
+        private var current: Event? = null
+
+        @JvmStatic
+        fun get(): Event? = if (current?.now() == true) {
+            current
+        } else useDb {
+            find { EventTable.start.lessEq(Instant.now()) and EventTable.end.greater(Instant.now()) }.firstOrNull()
+                ?.also { current == it }
+        }
+
+        @JvmStatic
+        fun getAll() = useDb { all().toList() }
+
+        @JvmStatic
+        fun create(name: String, start: Timestamp, end: Timestamp) = useDb {
+            EventTable.insertAndGetId {
+                it[this.name] = name
+                it[this.deadline] = start.toInstant()
+                it[this.start] = start.toInstant()
+                it[this.end] = end.toInstant()
+                it[this.maxPlayers] = 5
+                it[this.publicsOnly] = false
+            }.let { get(it) }
+        }
+
+        @JvmStatic
+        fun byId(id: Int) = useDb { findById(id) }
+
+        @JvmStatic
+        fun get(name: String) = useDb { find { EventTable.name eq name }.firstOrNull() }
+
+        @JvmStatic
+        fun getComing() = useDb { find { EventTable.start greater Instant.now() }.toList() }
+    }
+
+    val eventID by EventTable.id.transform({ EntityID(it, EventTable) }, { it.value })
+    var eventName by EventTable.name
+        private set
+    var deadline: Timestamp by EventTable.deadline.transform({ it.toInstant() }, { Timestamp.from(it) })
+        private set
+    var start: Timestamp by EventTable.start.transform({ it.toInstant() }, { Timestamp.from(it) })
+        private set
+    var end: Timestamp by EventTable.end.transform({ it.toInstant() }, { Timestamp.from(it) })
+        private set
+    var maximumTeamMembers by EventTable.maxPlayers
+        private set
+    var schematicType by EventTable.schemType.transform({ it?.toDB() }, { it?.let { SchematicType.fromDB(it) } })
+        private set
+    var publicSchemsOnly by EventTable.publicsOnly
+        private set
+
+    fun publicSchemsOnly() = publicSchemsOnly
+    fun now() = Instant.now().let { it.isAfter(start.toInstant()) && it.isBefore(end.toInstant()) }
+
+    fun update(
+        name: String,
+        deadline: Timestamp,
+        start: Timestamp,
+        end: Timestamp,
+        schematicType: SchematicType?,
+        maxPlayers: Int,
+        publicSchemsOnly: Boolean
+    ) = useDb {
+        this@Event.eventName = name
+        this@Event.deadline = deadline
+        this@Event.start = start
+        this@Event.end = end
+        this@Event.maximumTeamMembers = maxPlayers
+        this@Event.schematicType = schematicType
+        this@Event.publicSchemsOnly = publicSchemsOnly
+    }
+
+    override fun delete() = useDb { super.delete() }
+}

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

@@ -1,216 +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.sql;
-
-import de.steamwar.sql.internal.Field;
-import de.steamwar.sql.internal.SelectStatement;
-import de.steamwar.sql.internal.Statement;
-import de.steamwar.sql.internal.Table;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.sql.Timestamp;
-import java.util.*;
-
-import static java.time.temporal.ChronoUnit.SECONDS;
-
-@AllArgsConstructor
-public class EventFight implements Comparable<EventFight> {
-
-    private static final Table<EventFight> table = new Table<>(EventFight.class);
-    private static final SelectStatement<EventFight> byId = table.select(Table.PRIMARY);
-    private static final SelectStatement<EventFight> byGroup = new SelectStatement<EventFight>(table, "SELECT * FROM EventFight WHERE GroupID = ? ORDER BY StartTime ASC");
-    private static final SelectStatement<EventFight> byGroupLast = new SelectStatement<EventFight>(table, "SELECT * FROM EventFight WHERE GroupID = ? ORDER BY StartTime DESC LIMIT 1");
-    private static final SelectStatement<EventFight> allComing = new SelectStatement<>(table, "SELECT * FROM EventFight WHERE StartTime > now() ORDER BY StartTime ASC");
-    private static final SelectStatement<EventFight> event = new SelectStatement<>(table, "SELECT * FROM EventFight WHERE EventID = ? ORDER BY StartTime ASC");
-    private static final SelectStatement<EventFight> activeFights = new SelectStatement<>(table, "SELECT * FROM EventFight WHERE EventID IN (SELECT EventID FROM Event WHERE Start < now() and End > now()) AND Fight IS NULL AND StartTime < now()");
-    private static final Statement reschedule = table.update(Table.PRIMARY, "StartTime");
-    private static final Statement setResult = table.update(Table.PRIMARY, "Ergebnis");
-    private static final Statement setFight = table.update(Table.PRIMARY, "Fight");
-
-    private static final Statement create = table.insertFields(true, "eventID", "startTime", "spielmodus", "map", "teamBlue", "teamRed", "spectatePort");
-    private static final Statement update = table.update(Table.PRIMARY, "startTime", "spielModus", "map", "teamBlue", "teamRed", "spectatePort");
-    private static final Statement setGroup = table.update(Table.PRIMARY, "GroupID");
-    private static final Statement delete = table.delete(Table.PRIMARY);
-
-    @Getter
-    private static final Queue<EventFight> fights = new PriorityQueue<>();
-
-    public static EventFight get(int fightID) {
-        return byId.select(fightID);
-    }
-
-    public static List<EventFight> get(EventGroup group) {
-        return byGroup.listSelect(group.getId());
-    }
-
-    public static Optional<EventFight> getLast(EventGroup group) {
-        return Optional.ofNullable(byGroupLast.select(group.getId()));
-    }
-
-    public static void loadAllComingFights() {
-        fights.clear();
-        fights.addAll(allComing.listSelect());
-    }
-
-    public static List<EventFight> getEvent(int eventID) {
-        return event.listSelect(eventID);
-    }
-
-    private static List<EventFight> activeFightsCache = null;
-
-    public static void clearActiveFightsCache() {
-        activeFightsCache = null;
-    }
-
-    public static List<EventFight> getActiveFights() {
-        if (activeFightsCache == null) {
-            activeFightsCache = activeFights.listSelect();
-        }
-        return activeFightsCache;
-    }
-
-    public static EventFight create(int event, Timestamp from, String spielmodus, String map, int blueTeam, int redTeam, Integer spectatePort) {
-        return get(create.insertGetKey(event, from, spielmodus, map, blueTeam, redTeam, spectatePort));
-    }
-
-    @Getter
-    @Field
-    private final int eventID;
-    @Getter
-    @Field(keys = {Table.PRIMARY}, autoincrement = true)
-    private final int fightID;
-    @Getter
-    @Setter
-    @Field(nullable = true, def = "null")
-    private Integer groupId;
-    @Getter
-    @Setter
-    @Field
-    private Timestamp startTime;
-    @Getter
-    @Setter
-    @Field
-    private String spielmodus;
-    @Getter
-    @Setter
-    @Field
-    private String map;
-    @Getter
-    @Setter
-    @Field
-    private int teamBlue;
-    @Getter
-    @Setter
-    @Field
-    private int teamRed;
-    @Getter
-    @Setter
-    @Field(nullable = true)
-    private Integer spectatePort;
-    @Getter
-    @Setter
-    @Field(def = "1")
-    private int bestOf;
-    @Getter
-    @Field(def = "0")
-    private int ergebnis;
-    @Field(nullable = true)
-    private int fight;
-
-    public Optional<EventGroup> getGroup() {
-        return Optional.ofNullable(groupId).flatMap(EventGroup::get);
-    }
-
-    public Optional<Team> getWinner() {
-        if(ergebnis == 0)
-            return Optional.empty();
-        return Optional.ofNullable(ergebnis == 1 ? Team.get(teamBlue) : Team.get(teamRed));
-    }
-
-    public Optional<Team> getLosser() {
-        if(ergebnis == 0)
-            return Optional.empty();
-        return Optional.ofNullable(ergebnis == 1 ? Team.get(teamRed) : Team.get(teamBlue));
-    }
-
-    public List<EventRelation> getDependents() {
-        return EventRelation.getFightRelations(this);
-    }
-
-    public void setErgebnis(int winner) {
-        this.ergebnis = winner;
-        setResult.update(winner, fightID);
-    }
-
-    public void setFight(int fight) {
-        //Fight.FightID, not EventFight.FightID
-        this.fight = fight;
-        setFight.update(fight, fightID);
-    }
-
-    public void setGroup(Integer group) {
-        setGroup.update(group, fightID);
-        this.groupId = group;
-    }
-
-    public boolean hasFinished() {
-        return fight != 0 || ergebnis != 0;
-    }
-
-    public void reschedule() {
-        startTime = Timestamp.from(new Date().toInstant().plus(30, SECONDS));
-        reschedule.update(startTime, fightID);
-    }
-
-    @Override
-    public int hashCode(){
-        return fightID;
-    }
-
-    @Override
-    public boolean equals(Object o){
-        if(o == null)
-            return false;
-        if(!(o instanceof EventFight))
-            return false;
-        return fightID == ((EventFight) o).fightID;
-    }
-
-    @Override
-    public int compareTo(EventFight o) {
-        return startTime.compareTo(o.startTime);
-    }
-
-    public void update(Timestamp startTime, String spielmodus, String map, int teamBlue, int teamRed, Integer spectatePort) {
-        update.update(startTime, spielmodus, map, teamBlue, teamRed, spectatePort, fightID);
-        this.startTime = startTime;
-        this.spielmodus = spielmodus;
-        this.map = map;
-        this.teamBlue = teamBlue;
-        this.teamRed = teamRed;
-        this.spectatePort = spectatePort;
-    }
-
-    public void delete() {
-        delete.update(fightID);
-    }
-}

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

@@ -0,0 +1,188 @@
+/*
+ *   This file is a part of the SteamWar software.
+ *
+ *   Copyright (C) 2025 SteamWar.de-Serverteam
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU Affero General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU Affero General Public License for more details.
+ *
+ *   You should have received a copy of the GNU Affero General Public License
+ *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package de.steamwar.sql
+
+import de.steamwar.sql.internal.useDb
+import org.jetbrains.exposed.v1.core.*
+import org.jetbrains.exposed.v1.core.dao.id.EntityID
+import org.jetbrains.exposed.v1.core.dao.id.IntIdTable
+import org.jetbrains.exposed.v1.dao.IntEntity
+import org.jetbrains.exposed.v1.dao.IntEntityClass
+import org.jetbrains.exposed.v1.javatime.timestamp
+import org.jetbrains.exposed.v1.jdbc.insertAndGetId
+import org.jetbrains.exposed.v1.jdbc.select
+import java.sql.Timestamp
+import java.time.Instant
+import java.util.*
+
+object EventFightTable : IntIdTable("EventFight", "FightID") {
+    val eventId = reference("EventID", EventTable)
+    val startTime = timestamp("StartTime")
+    val gamemode = text("Spielmodus")
+    val map = text("Map")
+    val groupId = optReference("GroupId", EventGroupTable)
+    val teamBlue = reference("TeamBlue", TeamTable)
+    val teamRed = reference("TeamRed", TeamTable)
+    val spectatePort = integer("SpectatePort").nullable()
+    val bestOf = integer("BestOf")
+    val ergebnis = integer("Ergebnis")
+    val fight = optReference("Fight", FightTable)
+}
+
+class EventFight(id: EntityID<Int>) : IntEntity(id), Comparable<EventFight> {
+    companion object : IntEntityClass<EventFight>(EventFightTable) {
+        val fights: Queue<EventFight> = PriorityQueue()
+            @JvmStatic get
+
+        @JvmStatic
+        fun byId(fightId: Int) = useDb { findById(fightId) }
+
+        @JvmStatic
+        fun byId(group: EventGroup) = useDb {
+            find { EventFightTable.groupId eq group.id }.orderBy(EventFightTable.startTime to SortOrder.DESC).toList()
+        }
+
+        @JvmStatic
+        fun getLast(group: EventGroup) = useDb {
+            Optional.ofNullable(
+                find { EventFightTable.groupId eq group.id }.orderBy(EventFightTable.startTime to SortOrder.DESC)
+                    .firstOrNull()
+            )
+        }
+
+        @JvmStatic
+        fun loadAllComingFights() = useDb {
+            fights.clear()
+            fights.addAll(find { EventFightTable.startTime greaterEq Instant.now() }.orderBy(EventFightTable.startTime to SortOrder.ASC))
+        }
+
+        @JvmStatic
+        fun getEvent(eventId: Int) = useDb {
+            find { EventFightTable.eventId eq eventId }.orderBy(EventFightTable.startTime to SortOrder.ASC).toList()
+        }
+
+        private var activeFightsCache: List<EventFight>? = null
+
+        @JvmStatic
+        fun clearActiveFightsCache() {
+            activeFightsCache = null
+        }
+
+        @JvmStatic
+        fun getActiveFights(): List<EventFight> {
+            if (activeFightsCache == null) {
+                activeFightsCache = useDb {
+                    find {
+                        EventFightTable.fight.isNull() and (EventFightTable.startTime less Instant.now()) and (EventFightTable.eventId.inSubQuery(
+                            EventTable.select(
+                                EventTable.id
+                            )
+                                .where { (EventTable.start less Instant.now()) and (EventTable.end greater Instant.now()) }))
+                    }.orderBy(EventFightTable.startTime to SortOrder.ASC).toList()
+                }
+            }
+
+            return activeFightsCache!!
+        }
+
+        @JvmStatic
+        fun create(
+            event: Int,
+            from: Timestamp,
+            spielmodus: String,
+            map: String,
+            blueTeam: Int,
+            redTeam: Int,
+            spectatePort: Int?
+        ) = useDb {
+            get(
+                EventFightTable.insertAndGetId {
+                    it[eventId] = EntityID(event, EventTable)
+                    it[startTime] = from.toInstant()
+                    it[gamemode] = spielmodus
+                    it[EventFightTable.map] = map
+                    it[teamBlue] = EntityID(blueTeam, TeamTable)
+                    it[teamRed] = EntityID(redTeam, TeamTable)
+                    it[EventFightTable.spectatePort] = spectatePort
+                }
+            )
+        }
+    }
+
+    val fightID by EventFightTable.id.transform({ EntityID(it, EventFightTable) }, { it.value })
+    var teamBlue by EventFightTable.teamBlue.transform({ EntityID(it, TeamTable) }, { it.value })
+    var teamRed by EventFightTable.teamRed.transform({ EntityID(it, TeamTable) }, { it.value })
+    private var fightErgebnis by EventFightTable.ergebnis
+    var ergebnis: Int
+        get() = fightErgebnis
+        set(value) = useDb {
+            fightErgebnis = value
+        }
+    var eventID by EventFightTable.eventId.transform({ EntityID(it, EventTable) }, { it.value })
+    var startTime by EventFightTable.startTime.transform({ it.toInstant() }, { Timestamp.from(it) })
+    var spielmodus by EventFightTable.gamemode
+    var map by EventFightTable.map
+    var groupId by EventFightTable.groupId
+    val group by lazy { useDb { Optional.ofNullable(groupId).map { EventGroup[it] } } }
+    var spectatePort by EventFightTable.spectatePort
+    private var fightStat by EventFightTable.fight.transform({ it?.let { EntityID(it, EventFightTable) } }, { it?.value })
+    var fight: Int?
+        get() = fightStat
+        set(value) = useDb {
+            fightStat = value
+        }
+    val dependents by lazy { useDb { EventRelation.getFightRelations(this@EventFight) } }
+
+    val winner: Team?
+        get() = if (ergebnis == 1) Team[teamBlue] else if (ergebnis == 2) Team[teamRed] else null
+    val losser: Team?
+        get() = if (ergebnis == 1) Team[teamRed] else if (ergebnis == 2) Team[teamBlue] else null
+
+    fun setGroup(group: Int?) = useDb { groupId = group?.let { EntityID(it, EventGroupTable) } }
+    fun hasFinished() = fight != null || ergebnis != 0
+
+    fun reschedule() = useDb {
+        startTime = Timestamp.from(Instant.now().plusSeconds(30))
+    }
+
+    override fun hashCode() = fightID
+    override fun equals(other: Any?) = other is EventFight && other.fightID == fightID
+    override fun compareTo(other: EventFight): Int = startTime.compareTo(other.startTime)
+
+    fun update(
+        startTime: Timestamp,
+        spielmodus: String,
+        map: String,
+        teamBlue: Int,
+        teamRed: Int,
+        spectatePort: Int?
+    ) = useDb {
+        this@EventFight.startTime = startTime
+        this@EventFight.spielmodus = spielmodus
+        this@EventFight.map = map
+        this@EventFight.teamBlue = teamBlue
+        this@EventFight.teamRed = teamRed
+        this@EventFight.spectatePort = spectatePort
+    }
+
+    override fun delete() = useDb {
+        super.delete()
+    }
+}

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

@@ -1,173 +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.sql;
-
-import de.steamwar.sql.internal.*;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.util.*;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-@Getter
-@Setter
-public class EventGroup {
-    static {
-        SqlTypeMapper.ordinalEnumMapper(EventGroupType.class);
-    }
-
-    private static final Table<EventGroup> table = new Table<>(EventGroup.class);
-
-    private static final SelectStatement<EventGroup> get = table.select(Table.PRIMARY);
-    private static final SelectStatement<EventGroup> byEvent = new SelectStatement<>(table, "SELECT * FROM EventGroup WHERE EventID = ?");
-
-    private static final Statement insert = table.insertFields(true, "EventID", "Name", "Type");
-    private static final Statement update = table.update(Table.PRIMARY, "Name", "Type", "PointsPerWin", "PointsPerLoss", "PointsPerDraw");
-    private static final Statement delete = table.delete(Table.PRIMARY);
-
-    public static List<EventGroup> get(Event eventID) {
-        return byEvent.listSelect(eventID.getEventID());
-    }
-
-    public static EventGroup create(Event event, String name, EventGroupType type) {
-        int key = insert.insertGetKey(event.getEventID(), name, type);
-        return EventGroup.get(key).get();
-    }
-
-    public static Optional<EventGroup> get(int id) {
-        return Optional.ofNullable(get.select(id));
-    }
-
-    @Field(keys = Table.PRIMARY)
-    private final int id;
-
-    @Field(keys = "EVENT_NAME")
-    private int eventID;
-
-    @Field(keys = "EVENT_NAME")
-    private String name;
-
-    @Field
-    private EventGroupType type;
-
-    @Field
-    private int pointsPerWin;
-
-    @Field
-    private int pointsPerLoss;
-
-    @Field
-    private int pointsPerDraw;
-
-    public EventGroup(int id, int eventID, String name, EventGroupType type, int pointsPerWin, int pointsPerLoss, int pointsPerDraw) {
-        this.id = id;
-        this.eventID = eventID;
-        this.name = name;
-        this.type = type;
-        this.pointsPerWin = pointsPerWin;
-        this.pointsPerLoss = pointsPerLoss;
-        this.pointsPerDraw = pointsPerDraw;
-    }
-
-    private Map<Team, Integer> points;
-
-    public List<EventFight> getFights() {
-        return EventFight.get(this);
-    }
-
-    public Set<Integer> getTeamsId() {
-        return getFights().stream().flatMap(fight -> Stream.of(fight.getTeamBlue(), fight.getTeamRed()))
-                .collect(Collectors.toSet());
-    }
-
-    public Set<Team> getTeams() {
-        return getTeamsId().stream().map(Team::get).collect(Collectors.toSet());
-    }
-
-    public Optional<EventFight> getLastFight() {
-        return EventFight.getLast(this);
-    }
-
-    public List<EventRelation> getDependents() {
-        return EventRelation.getGroupRelations(this);
-    }
-
-    public Map<Team, Integer> calculatePoints() {
-        if (points == null) {
-            Map<Integer, Integer> p = getTeamsId().stream().collect(Collectors.toMap(team -> team, team -> 0));
-
-            for (EventFight fight : getFights()) {
-                int blueTeamAdd = 0;
-                int redTeamAdd = 0;
-
-                if (!fight.hasFinished()) {
-                    continue;
-                }
-
-                switch (fight.getErgebnis()) {
-                    case 1:
-                        blueTeamAdd += pointsPerWin;
-                        redTeamAdd += pointsPerLoss;
-                        break;
-                    case 2:
-                        blueTeamAdd += pointsPerLoss;
-                        redTeamAdd += pointsPerWin;
-                        break;
-                    case 0:
-                        if (fight.getFightID() != 0) {
-                            blueTeamAdd += pointsPerDraw;
-                            redTeamAdd += pointsPerDraw;
-                        }
-                        break;
-                }
-
-                p.put(fight.getTeamBlue(), p.get(fight.getTeamBlue()) + blueTeamAdd);
-                p.put(fight.getTeamRed(), p.get(fight.getTeamRed()) + redTeamAdd);
-            }
-
-            points = p.entrySet().stream().collect(Collectors.toMap(integerIntegerEntry -> Team.get(integerIntegerEntry.getKey()), Map.Entry::getValue));
-        }
-
-        return points;
-    }
-
-    public void update(String name, EventGroupType type, int pointsPerWin, int pointsPerLoss, int pointsPerDraw) {
-        update.update(name, type, pointsPerWin, pointsPerLoss, pointsPerDraw, id);
-        this.name = name;
-        this.type = type;
-        this.pointsPerWin = pointsPerWin;
-        this.pointsPerLoss = pointsPerLoss;
-        this.pointsPerDraw = pointsPerDraw;
-    }
-
-    public boolean needsTieBreak() {
-        return calculatePoints().values().stream().sorted().limit(2).distinct().count() < 2;
-    }
-
-    public void delete() {
-        delete.update(id);
-    }
-
-    public static enum EventGroupType {
-        GROUP_STAGE,
-        ELIMINATION_STAGE
-    }
-}

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

@@ -0,0 +1,153 @@
+/*
+ *   This file is a part of the SteamWar software.
+ *
+ *   Copyright (C) 2025 SteamWar.de-Serverteam
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU Affero General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU Affero General Public License for more details.
+ *
+ *   You should have received a copy of the GNU Affero General Public License
+ *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package de.steamwar.sql
+
+import de.steamwar.sql.internal.useDb
+import org.jetbrains.exposed.v1.core.dao.id.EntityID
+import org.jetbrains.exposed.v1.core.dao.id.IntIdTable
+import org.jetbrains.exposed.v1.core.eq
+import org.jetbrains.exposed.v1.dao.IntEntity
+import org.jetbrains.exposed.v1.dao.IntEntityClass
+import java.util.*
+
+object EventGroupTable : IntIdTable("EventGroup", "Id") {
+    val event = reference("EventID", EventTable)
+    val name = varchar("Name", 64)
+    val type = enumeration("Type", EventGroup.EventGroupType::class)
+    val pointsPerWin = integer("PointsPerWin").default(3)
+    val pointsPerLoss = integer("PointsPerLoss").default(0)
+    val pointsPerDraw = integer("PointsPerDraw").default(1)
+}
+
+class EventGroup(id: EntityID<Int>) : IntEntity(id) {
+    companion object : IntEntityClass<EventGroup>(EventGroupTable) {
+
+        @JvmStatic
+        fun get(event: Event) = useDb { find { EventGroupTable.event eq event.id }.toList() }
+
+        @JvmStatic
+        fun byId(groupId: Int) = useDb { Optional.ofNullable(findById(groupId)) }
+
+        @JvmStatic
+        fun create(event: Event, name: String, type: EventGroupType) = useDb {
+            new {
+                this.eventID = event.id.value
+                this.groupName = name
+                this.groupType = type
+            }
+        }
+    }
+
+    var eventID by EventGroupTable.event.transform({ EntityID(it, EventTable) }, { it.value })
+        private set
+    private var groupName by EventGroupTable.name
+    private var groupType by EventGroupTable.type
+    private var groupPointsPerWin by EventGroupTable.pointsPerWin
+    private var groupPointsPerLoss by EventGroupTable.pointsPerLoss
+    private var groupPointsPerDraw by EventGroupTable.pointsPerDraw
+    val fights by lazy { useDb { EventFight.find { EventFightTable.groupId eq id }.toList() } }
+    val teamsId by lazy { fights.flatMap { listOf(it.teamBlue, it.teamRed) }.toSet() }
+
+    var name: String
+        get() = groupName
+        set(value) {
+            groupName = value
+        }
+    var type: EventGroupType
+        get() = groupType
+        set(value) {
+            groupType = value
+        }
+    var pointsPerWin: Int
+        get() = groupPointsPerWin
+        set(value) {
+            groupPointsPerWin = value
+        }
+    var pointsPerLoss: Int
+        get() = groupPointsPerLoss
+        set(value) {
+            groupPointsPerLoss = value
+        }
+    var pointsPerDraw: Int
+        get() = groupPointsPerDraw
+        set(value) {
+            groupPointsPerDraw = value
+        }
+    val dependents by lazy { EventRelation.getGroupRelations(this) }
+    val lastFight by lazy { Optional.ofNullable(fights.maxByOrNull { it.startTime }) }
+
+    fun getId() = id.value
+
+    private var points: Map<Team, Int>? = null
+
+    fun calculatePoints(): Map<Team, Int> {
+        if (points == null) {
+            val p: MutableMap<Int, Int> = teamsId.associateWith { 0 }.toMutableMap()
+
+            for (fight in fights) {
+                var blueTeamAdd = 0
+                var redTeamAdd = 0
+
+                if (!fight.hasFinished()) {
+                    continue
+                }
+
+                when (fight.ergebnis) {
+                    1 -> {
+                        blueTeamAdd += pointsPerWin
+                        redTeamAdd += pointsPerLoss
+                    }
+                    2 -> {
+                        blueTeamAdd += pointsPerLoss
+                        redTeamAdd += pointsPerWin
+                    }
+                    0 -> if (fight.fight != null) {
+                        blueTeamAdd += pointsPerDraw
+                        redTeamAdd += pointsPerDraw
+                    }
+                }
+
+                p[fight.teamBlue] = p[fight.teamBlue]?.plus(blueTeamAdd) ?: blueTeamAdd
+                p[fight.teamRed] = p[fight.teamRed]?.plus(redTeamAdd) ?: redTeamAdd
+            }
+
+            return p.mapKeys { Team.byId(it.key) }.also { points = it }
+        } else {
+            return points!!
+        }
+    }
+
+    fun needsTieBreak() = calculatePoints().values.let { it.size == it.toSet().size }
+
+    fun update(name: String, type: EventGroupType, pointsPerWin: Int, pointsPerLoss: Int, pointsPerDraw: Int) = useDb {
+        this@EventGroup.name = name
+        this@EventGroup.type = type
+        this@EventGroup.pointsPerWin = pointsPerWin
+        this@EventGroup.pointsPerLoss = pointsPerLoss
+        this@EventGroup.pointsPerDraw = pointsPerDraw
+    }
+
+    override fun delete() = useDb { super.delete() }
+
+    enum class EventGroupType {
+        GROUP_STAGE,
+        ELIMINATION_STAGE
+    }
+}

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

@@ -1,192 +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.sql;
-
-import de.steamwar.sql.internal.*;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.util.Comparator;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-
-@AllArgsConstructor
-@Getter
-@Setter
-public class EventRelation {
-
-    static {
-        SqlTypeMapper.ordinalEnumMapper(FightTeam.class);
-        SqlTypeMapper.ordinalEnumMapper(FromType.class);
-    }
-
-    private static final Table<EventRelation> table = new Table<>(EventRelation.class);
-
-    private static final SelectStatement<EventRelation> get = new SelectStatement<>(table, "SELECT * FROM EventRelation WHERE FromType = ? AND FromId = ?");
-    private static final SelectStatement<EventRelation> byId = new SelectStatement<>(table, "SELECT * FROM EventRelation WHERE id = ?");
-    private static final SelectStatement<EventRelation> byEvent = new SelectStatement<>(table, "SELECT ER.* FROM EventRelation ER JOIN EventFight EF ON EF.fightId = ER.fightId WHERE EF.EventID = ?");
-    private static final Statement insert = table.insertFields(true, "fightId", "fightTeam", "fromType", "fromId", "fromPlace");
-    private static final Statement update = table.update(Table.PRIMARY, "fromType", "fromId", "fromPlace");
-    private static final Statement updateTeam = table.update(Table.PRIMARY, "fightTeam");
-    private static final Statement delete = table.delete(Table.PRIMARY);
-
-    public static List<EventRelation> get(Event event) {
-        return byEvent.listSelect(event.getEventID());
-    }
-
-    public static EventRelation get(int id) {
-        return byId.select(id);
-    }
-
-    public static List<EventRelation> getFightRelations(EventFight fight) {
-        return get.listSelect(FromType.FIGHT, fight.getFightID());
-    }
-
-    public static List<EventRelation> getGroupRelations(EventGroup group) {
-        return get.listSelect(FromType.GROUP, group.getId());
-    }
-
-    public static EventRelation create(EventFight fight, FightTeam fightTeam, FromType fromType, int fromId, int fromPlace) {
-        int id = insert.insertGetKey(fight.getFightID(), fightTeam, fromType, fromId, fromPlace);
-        return get(id);
-    }
-
-    @Field(keys = Table.PRIMARY)
-    private final int id;
-
-    @Field
-    private int fightId;
-
-    @Field
-    private FightTeam fightTeam;
-
-    @Field
-    private FromType fromType;
-
-    @Field
-    private int fromId;
-
-    @Field
-    private int fromPlace;
-
-    public EventFight getFight() {
-        return EventFight.get(fightId);
-    }
-
-    public Optional<EventFight> getFromFight() {
-        if(fromType == FromType.FIGHT) {
-            return Optional.of(EventFight.get(fromId));
-        } else {
-            return Optional.empty();
-        }
-    }
-
-    public Optional<EventGroup> getFromGroup() {
-        if(fromType == FromType.GROUP) {
-            return EventGroup.get(fromId);
-        } else {
-            return Optional.empty();
-        }
-    }
-
-    public void delete() {
-        delete.update(id);
-    }
-
-    public void setUpdateTeam(FightTeam team) {
-        updateTeam.update(id, team);
-        this.fightTeam = team;
-    }
-
-    public void setFromFight(EventFight fight, int place) {
-        setFrom(fight.getFightID(), place, FromType.FIGHT);
-    }
-
-    public void setFromGroup(EventGroup group, int place) {
-        setFrom(group.getId(), place, FromType.GROUP);
-    }
-
-    private void setFrom(int fightId, int place, FromType type) {
-        update.update(type, fightId, place, id);
-        this.fromType = type;
-        this.fromId = fightId;
-        this.fromPlace = place;
-    }
-
-    public Optional<Team> getAdvancingTeam() {
-        if (fromType == FromType.FIGHT) {
-            if (fromPlace == 0) {
-                return getFromFight().flatMap(EventFight::getWinner);
-            } else {
-                return getFromFight().flatMap(EventFight::getLosser);
-            }
-        } else if (fromType == FromType.GROUP) {
-            return getFromGroup().map(EventGroup::calculatePoints)
-                    .flatMap(points -> points.entrySet().stream()
-                            .sorted(Map.Entry.<Team, Integer>comparingByValue().reversed())
-                            .skip(fromPlace)
-                            .findFirst()
-                            .map(Map.Entry::getKey));
-        } else {
-            return Optional.empty();
-        }
-    }
-
-    public boolean apply() {
-        Optional<Integer> team = getAdvancingTeam().map(Team::getTeamId);
-        if(!team.isPresent())
-            return false;
-
-        EventFight fight = getFight();
-        if(fightTeam == FightTeam.RED) {
-            fight.update(
-                    fight.getStartTime(),
-                    fight.getSpielmodus(),
-                    fight.getMap(),
-                    fight.getTeamBlue(),
-                    team.get(),
-                    fight.getSpectatePort()
-            );
-        } else {
-            fight.update(
-                    fight.getStartTime(),
-                    fight.getSpielmodus(),
-                    fight.getMap(),
-                    team.get(),
-                    fight.getTeamRed(),
-                    fight.getSpectatePort()
-            );
-        }
-
-        return true;
-    }
-
-    public static enum FightTeam {
-        BLUE,
-        RED
-    }
-
-    public static enum FromType {
-        FIGHT,
-        GROUP
-    }
-}

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

@@ -0,0 +1,149 @@
+/*
+ *   This file is a part of the SteamWar software.
+ *
+ *   Copyright (C) 2025 SteamWar.de-Serverteam
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU Affero General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU Affero General Public License for more details.
+ *
+ *   You should have received a copy of the GNU Affero General Public License
+ *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package de.steamwar.sql
+
+import de.steamwar.sql.internal.useDb
+import org.jetbrains.exposed.v1.core.and
+import org.jetbrains.exposed.v1.core.dao.id.EntityID
+import org.jetbrains.exposed.v1.core.dao.id.IntIdTable
+import org.jetbrains.exposed.v1.core.eq
+import org.jetbrains.exposed.v1.dao.IntEntity
+import org.jetbrains.exposed.v1.dao.IntEntityClass
+import org.jetbrains.exposed.v1.jdbc.select
+
+object EventRelationTable : IntIdTable("EventRelation") {
+    val fightId = reference("FightId", EventFightTable)
+    val fightTeam = enumeration("FightTeam", EventRelation.FightTeam::class)
+    val fromType = enumeration("FromType", EventRelation.FromType::class)
+    val fromId = integer("FromId")
+    val fromPlace = integer("FromPlace")
+}
+
+class EventRelation(id: EntityID<Int>) : IntEntity(id) {
+    companion object : IntEntityClass<EventRelation>(EventRelationTable) {
+        @JvmStatic
+        fun get(event: Event) = useDb {
+            EventRelationTable.innerJoin(EventFightTable)
+                .select(EventRelationTable.columns)
+                .where { EventFightTable.eventId eq event.id }
+                .map { wrapRow(it) }
+        }
+
+        @JvmStatic
+        fun byId(id: Int) = useDb { findById(id) }
+
+        @JvmStatic
+        fun getFightRelations(fight: EventFight) =
+            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) } }
+
+        @JvmStatic
+        fun create(fight: EventFight, fightTeam: FightTeam, fromType: FromType, fromId: Int, fromPlace: Int) = useDb {
+            new {
+                this.fightEntityId = fight.id
+                this.fightTeam = fightTeam
+                this.fromType = fromType
+                this.fromId = fromId
+                this.fromPlace = fromPlace
+            }
+        }
+    }
+
+    var fightEntityId by EventRelationTable.fightId
+    var fightId: Int
+        get() = fightEntityId.value
+        set(value) = useDb { fightEntityId = EntityID(value, EventFightTable) }
+    val fight by lazy { useDb { EventFight[fightEntityId] } }
+    var fightTeam by EventRelationTable.fightTeam
+        private set
+    var fromType by EventRelationTable.fromType
+        private set
+    var fromId by EventRelationTable.fromId
+        private set
+
+    var fromFightId: Int?
+        get() = if (fromType == FromType.FIGHT) fromId else null
+        set(value) = useDb {
+            fromType = FromType.FIGHT
+            fromId = value!!
+        }
+    val fromFight: EventFight?
+        get() = fromFightId?.let { useDb { EventFight[it] } }
+    var fromGroupId: Int?
+        get() = if (fromType == FromType.GROUP) fromId else null
+        set(value) = useDb {
+            fromType = FromType.GROUP
+            fromId = value!!
+        }
+    val fromGroup: EventGroup?
+        get() = fromGroupId?.let { useDb { EventGroup[it] } }
+    var fromPlace by EventRelationTable.fromPlace
+        private set
+
+    fun getId() = id.value
+    fun setUpdateTeam(team: FightTeam) = useDb {
+        fightTeam = team
+    }
+
+    fun setFromFight(fight: EventFight, place: Int) = useDb {
+        fromType = FromType.FIGHT
+        fromId = fight.id.value
+        fromPlace = place
+    }
+
+    fun setFromGroup(group: EventGroup, place: Int) = useDb {
+        fromType = FromType.GROUP
+        fromId = group.id.value
+        fromPlace = place
+    }
+
+    fun getAdvancingTeam(): Team? = when(fromType) {
+        FromType.FIGHT -> if (fromPlace == 0) fromFight?.winner else fromFight?.losser
+        FromType.GROUP -> fromGroup?.calculatePoints()?.toList()?.sortedBy { (_, v) -> v }?.reversed()?.elementAt(fromPlace)?.first
+    }
+
+    fun apply(): Boolean {
+        val team = getAdvancingTeam() ?: return false
+
+        useDb {
+            when(fightTeam) {
+                FightTeam.BLUE -> fight.teamBlue = team.teamId
+                FightTeam.RED -> fight.teamRed = team.teamId
+            }
+        }
+
+        return true
+    }
+
+    override fun delete() = useDb {
+        super.delete()
+    }
+
+    enum class FightTeam {
+        BLUE, RED
+    }
+
+    enum class FromType {
+        FIGHT, GROUP
+    }
+}

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

@@ -1,134 +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.sql;
-
-import de.steamwar.sql.internal.Field;
-import de.steamwar.sql.internal.SelectStatement;
-import de.steamwar.sql.internal.Statement;
-import de.steamwar.sql.internal.Table;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-import java.sql.Timestamp;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.stream.Collectors;
-
-@AllArgsConstructor
-public class Fight {
-
-    private static final Table<Fight> table = new Table<>(Fight.class);
-    private static final SelectStatement<Fight> getPage = new SelectStatement<>(table, "SELECT f.*, (b.NodeId IS NULL OR b.Config & 2) AND (r.NodeId IS NULL OR r.Config & 2) AS ReplayAllowed FROM Fight f LEFT OUTER JOIN SchematicNode b ON f.BlueSchem = b.NodeId LEFT OUTER JOIN SchematicNode r ON f.RedSchem = r.NodeId ORDER BY FightID DESC LIMIT ?, ?");
-    private static final SelectStatement<Fight> getById = new SelectStatement<>(table, "SELECT f.*, (b.NodeId IS NULL OR b.Config & 2) AND (r.NodeId IS NULL OR r.Config & 2) AS ReplayAllowed FROM Fight f LEFT OUTER JOIN SchematicNode b ON f.BlueSchem = b.NodeId LEFT OUTER JOIN SchematicNode r ON f.RedSchem = r.NodeId WHERE FightId = ?");
-    private static final Statement insert = table.insertFields(true, "GameMode", "Server", "StartTime", "Duration", "BlueLeader", "RedLeader", "BlueSchem", "RedSchem", "Win", "WinCondition");
-    private static final Statement updateReplayAvailable = table.update(Table.PRIMARY, "ReplayAvailable");
-
-    public static List<Fight> getPage(int page, int elementsPerPage) {
-        List<Fight> fights = getPage.listSelect(page * elementsPerPage, elementsPerPage);
-
-        List<FightPlayer> fightPlayers = FightPlayer.batchGet(fights.stream().map(f -> f.fightID));
-        for(Fight fight : fights) {
-            fight.initPlayers(fightPlayers);
-        }
-
-        SteamwarUser.batchCache(fightPlayers.stream().map(FightPlayer::getUserID).collect(Collectors.toSet()));
-        return fights;
-    }
-
-    public static Fight getById(int fightID) {
-        return getById.select(fightID);
-    }
-
-    public static int create(String gamemode, String server, Timestamp starttime, int duration, int blueleader, int redleader, Integer blueschem, Integer redschem, int win, String wincondition){
-        return insert.insertGetKey(gamemode, server, starttime, duration, blueleader, redleader, blueschem, redschem, win, wincondition);
-    }
-
-    public static void markReplayAvailable(int fightID) {
-        updateReplayAvailable.update(true, fightID);
-    }
-
-    @Getter
-    @Field(keys = {Table.PRIMARY}, autoincrement = true)
-    private final int fightID;
-    @Field
-    private final String gameMode;
-    @Getter
-    @Field
-    private final String server;
-    @Getter
-    @Field
-    private final Timestamp startTime;
-    @Field
-    private final int duration;
-    @Field
-    private final int blueLeader;
-    @Field
-    private final int redLeader;
-    @Field(nullable = true)
-    private final Integer blueSchem;
-    @Field(nullable = true)
-    private final Integer redSchem;
-    @Getter
-    @Field
-    private final int win;
-    @Field
-    private final String wincondition;
-    @Field
-    private final boolean replayAvailable;
-    @Field // Virtual field for easy select
-    private final boolean replayAllowed;
-
-    @Getter
-    private final List<FightPlayer> bluePlayers = new ArrayList<>();
-    @Getter
-    private final List<FightPlayer> redPlayers = new ArrayList<>();
-
-    public SchematicType getSchemType() {
-        return SchematicType.fromDB(gameMode);
-    }
-
-    public SteamwarUser getBlueLeader() {
-        return SteamwarUser.get(blueLeader);
-    }
-
-    public SteamwarUser getRedLeader() {
-        return SteamwarUser.get(redLeader);
-    }
-
-    public boolean replayAllowed() {
-        return replayExists() && replayAllowed;
-    }
-
-    public boolean replayExists() {
-        return getSchemType() != null && replayAvailable;
-    }
-
-    private void initPlayers(List<FightPlayer> fightPlayers) {
-        for(FightPlayer fp : fightPlayers) {
-            if(fp.getFightID() != fightID)
-                continue;
-
-            if(fp.getTeam() == 1)
-                bluePlayers.add(fp);
-            else
-                redPlayers.add(fp);
-        }
-    }
-}

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

@@ -0,0 +1,162 @@
+/*
+ *   This file is a part of the SteamWar software.
+ *
+ *   Copyright (C) 2025 SteamWar.de-Serverteam
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU Affero General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU Affero General Public License for more details.
+ *
+ *   You should have received a copy of the GNU Affero General Public License
+ *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package de.steamwar.sql
+
+import de.steamwar.sql.internal.useDb
+import org.jetbrains.exposed.v1.core.IntegerColumnType
+import org.jetbrains.exposed.v1.core.ReferenceOption
+import org.jetbrains.exposed.v1.core.SortOrder
+import org.jetbrains.exposed.v1.core.dao.id.EntityID
+import org.jetbrains.exposed.v1.core.dao.id.IntIdTable
+import org.jetbrains.exposed.v1.core.eq
+import org.jetbrains.exposed.v1.dao.IntEntity
+import org.jetbrains.exposed.v1.dao.IntEntityClass
+import org.jetbrains.exposed.v1.javatime.timestamp
+import org.jetbrains.exposed.v1.jdbc.insertAndGetId
+import org.jetbrains.exposed.v1.jdbc.update
+import java.sql.Timestamp
+
+object FightTable : IntIdTable("Fight", "FightId") {
+    val gamemode = varchar("Gamemode", 30)
+    val server = text("Server")
+    val startTime = timestamp("StartTime")
+    val duration = integer("Duration")
+    val blueLeader = reference("BlueLeader", SteamwarUserTable)
+    val redLeader = reference("RedLeader", SteamwarUserTable)
+    val blueSchem = optReference("BlueSchem", SchematicNodeTable, onDelete = ReferenceOption.SET_NULL)
+    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")
+}
+
+class Fight(id: EntityID<Int>) : IntEntity(id) {
+    companion object : IntEntityClass<Fight>(FightTable) {
+        @JvmStatic
+        fun getById(id: Int) = useDb { get(id) }
+
+        @JvmStatic
+        fun create(
+            gamemode: String,
+            server: String,
+            starttime: Timestamp,
+            duration: Int,
+            blueleader: Int,
+            redleader: Int,
+            blueschem: Int?,
+            redschem: Int?,
+            win: Int,
+            wincondition: String
+        ): Int = useDb {
+            FightTable.insertAndGetId {
+                it[FightTable.gamemode] = gamemode
+                it[FightTable.server] = server
+                it[FightTable.startTime] = starttime.toInstant()
+                it[FightTable.duration] = duration
+                it[FightTable.blueLeader] = EntityID(blueleader, SteamwarUserTable)
+                it[FightTable.redLeader] = EntityID(redleader, SteamwarUserTable)
+                it[FightTable.blueSchem] = blueschem?.let { EntityID(it, SchematicNodeTable) }
+                it[FightTable.redSchem] = redschem?.let { EntityID(it, SchematicNodeTable) }
+                it[FightTable.win] = WinningTeam.entries[win]
+                it[FightTable.winCondition] = wincondition
+            }.value
+        }
+
+        @JvmStatic
+        fun getPage(page: Int, pageSize: Int): List<Fight> = useDb {
+            val fights = all().orderBy(FightTable.startTime to SortOrder.DESC).limit(pageSize).offset((pageSize * page).toLong())
+
+            val fightPlayer = FightPlayer.batchGet(fights.map { it.id.value })
+            for (fight in fights) {
+                fight.initPlayers(fightPlayer)
+            }
+
+            SteamwarUser.batchCache(fightPlayer.map { it.userID }.toMutableSet())
+            fights.toList()
+        }
+
+        @JvmStatic
+        fun markReplayAvailable(id: Int) = useDb {
+            FightTable.update({ FightTable.id eq id }) {
+                it[replayAvailable] = true
+            }
+        }
+    }
+
+    val fightID by FightTable.id.transform({ EntityID(it, FightTable) }, { it.value })
+    val gameMode by FightTable.gamemode
+    val server by FightTable.server
+    val startTime by FightTable.startTime.transform({ it.toInstant() }, { Timestamp.from(it) })
+    val duration by FightTable.duration
+    val blueLeaderId by FightTable.blueLeader
+    val blueLeader by lazy { useDb { SteamwarUser[blueLeaderId] } }
+    val redLeaderId by FightTable.redLeader
+    val redLeader by lazy { useDb { SteamwarUser[redLeaderId] } }
+    val blueSchem by FightTable.blueSchem
+    val redSchem by FightTable.redSchem
+    val winner by FightTable.win
+    val win: Int
+        get() = winner.ordinal
+    val winCondition by FightTable.winCondition
+    val replayAvailable by FightTable.replayAvailable
+
+    val schemType: SchematicType?
+        get() = SchematicType.fromDB(gameMode)
+
+    val replayAllowed by lazy {
+        replayExists() && useDb {
+            exec(
+                "SELECT (b.NodeId IS NULL OR b.Config & 2) AND (r.NodeId IS NULL OR r.Config & 2) AS ReplayAllowed FROM Fight f LEFT OUTER JOIN SchematicNode b ON f.BlueSchem = b.NodeId LEFT OUTER JOIN SchematicNode r ON f.RedSchem = r.NodeId WHERE FightId = ?",
+                args = listOf(IntegerColumnType() to this@Fight.id.value)
+            ) {
+                if (it.next()) {
+                    it.getBoolean("ReplayAllowed")
+                } else {
+                    false
+                }
+            } ?: false
+        }
+    }
+
+    fun replayExists() = schemType != null && replayAvailable
+    fun replayAllowed() = replayAllowed
+
+    lateinit var bluePlayers: List<FightPlayer>
+    lateinit var redPlayers: List<FightPlayer>
+
+    private fun initPlayers(fightPlayers: List<FightPlayer>) {
+        val blue = mutableListOf<FightPlayer>()
+        val red = mutableListOf<FightPlayer>()
+
+        for (player in fightPlayers.filter { it.fightID == id.value }) {
+            if (player.team == 1)
+                blue.add(player)
+            else
+                red.add(player)
+        }
+
+        bluePlayers = blue
+        redPlayers = red
+    }
+
+    enum class WinningTeam {
+        NONE, BLUE, RED;
+    }
+}

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

@@ -1,65 +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.sql;
-
-import de.steamwar.sql.internal.Field;
-import de.steamwar.sql.internal.SelectStatement;
-import de.steamwar.sql.internal.Statement;
-import de.steamwar.sql.internal.Table;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-import java.util.List;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-@AllArgsConstructor
-public class FightPlayer {
-
-    private static final Table<FightPlayer> table = new Table<>(FightPlayer.class);
-    private static final Statement create = table.insertAll();
-    private static final SelectStatement<FightPlayer> batchGet = new SelectStatement<>(table, "SELECT * FROM FightPlayer WHERE FightID IN ?");
-
-    @Getter
-    @Field(keys = {Table.PRIMARY})
-    private final int fightID;
-    @Getter
-    @Field(keys = {Table.PRIMARY})
-    private final int userID;
-    @Getter
-    @Field
-    private final int team;
-    @Field
-    private final String kit;
-    @Field
-    private final int kills;
-    @Field
-    private final boolean isOut;
-
-    public static void create(int fightID, int userID, boolean blue, String kit, int kills, boolean isOut) {
-        create.update(fightID, userID, blue ? 1 : 2, kit, kills, isOut);
-    }
-
-    public static List<FightPlayer> batchGet(Stream<Integer> fightIds) {
-        try (SelectStatement<FightPlayer> batch = new SelectStatement<>(table, "SELECT * FROM FightPlayer WHERE FightID IN (" + fightIds.map(Object::toString).collect(Collectors.joining(", ")) + ")")) {
-            return batch.listSelect();
-        }
-    }
-}

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

@@ -0,0 +1,80 @@
+/*
+ *   This file is a part of the SteamWar software.
+ *
+ *   Copyright (C) 2025 SteamWar.de-Serverteam
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU Affero General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU Affero General Public License for more details.
+ *
+ *   You should have received a copy of the GNU Affero General Public License
+ *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package de.steamwar.sql
+
+import de.steamwar.sql.internal.useDb
+import org.jetbrains.exposed.v1.core.dao.id.CompositeID
+import org.jetbrains.exposed.v1.core.dao.id.CompositeIdTable
+import org.jetbrains.exposed.v1.core.dao.id.EntityID
+import org.jetbrains.exposed.v1.core.inList
+import org.jetbrains.exposed.v1.dao.CompositeEntity
+import org.jetbrains.exposed.v1.dao.CompositeEntityClass
+import org.jetbrains.exposed.v1.jdbc.insertIgnore
+
+object FightPlayerTable : CompositeIdTable("FightPlayer") {
+    val fightId = reference("FightId", FightTable)
+    val userId = reference("UserId", SteamwarUserTable)
+    val team = integer("Team")
+    val kit = varchar("Kit", 64)
+    val kills = integer("Kills")
+    val out = bool("IsOut")
+
+    init {
+        addIdColumn(fightId)
+        addIdColumn(userId)
+    }
+}
+
+class FightPlayer(id: EntityID<CompositeID>) : CompositeEntity(id) {
+    companion object : CompositeEntityClass<FightPlayer>(FightPlayerTable) {
+        @JvmStatic
+        fun create(
+            fightId: Int,
+            userId: Int,
+            blue: Boolean,
+            kit: String,
+            kills: Int,
+            out: Boolean
+        ) = useDb {
+            FightPlayerTable.insertIgnore {
+                it[this.fightId] = fightId
+                it[this.userId] = userId
+                it[this.team] = if (blue) 1 else 2
+                it[this.kit] = kit
+                it[this.kills] = kills
+                it[this.out] = out
+            }
+        }
+
+        @JvmStatic
+        fun batchGet(fightIds: List<Int>) = useDb {
+            find { FightPlayerTable.fightId inList fightIds.toList() }.toList()
+        }
+    }
+
+    val fightID by FightPlayerTable.fightId.transform({ EntityID(it, FightTable) }, { it.value })
+    val userID by FightPlayerTable.userId.transform({ EntityID(it, SteamwarUserTable) }, { it.value })
+    val team by FightPlayerTable.team
+    val kit by FightPlayerTable.kit
+    val kills by FightPlayerTable.kills
+    val out by FightPlayerTable.out
+
+    fun isOut() = out
+}

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

@@ -35,11 +35,19 @@ import java.util.stream.Collectors;
 public final class GameModeConfig<M, W> {
 
     public static final Function<String, String> ToString = Function.identity();
-    public static final Function<File, String> ToStaticWarGear = __ -> "WarGear";
-    public static final Function<File, String> ToInternalName = file -> file != null ? file.getName().replace(".yml", "") : "WarGear";
+    public static final Function<File, String> ToStaticWarGear = GameModeConfig::constWarGear;
+    public static final Function<File, String> ToInternalName = GameModeConfig::internalName;
     public static final SimpleDateFormat DATE_FORMAT = new SimpleDateFormat("dd.MM.yyyy HH:mm");
     private static final Random random = new Random();
 
+    private static String constWarGear(File f) {
+        return "WarGear";
+    }
+
+    private static String internalName(File f) {
+        return f != null ? f.getName().replace(".yml", "") : constWarGear(null);
+    }
+
     private static final Map<String, GameModeConfig<?, String>> byFileName;
     private static final Map<String, GameModeConfig<?, String>> byGameName;
     private static final Map<SchematicType, GameModeConfig<?, String>> bySchematicType;
@@ -63,11 +71,15 @@ public final class GameModeConfig<M, W> {
     }
 
     private static final Field Schematic_TypeField;
+    private static final Field Schematic_SubTypesField;
 
     static {
         try {
             Schematic_TypeField = SchematicConfig.class.getDeclaredField("Type");
             Schematic_TypeField.setAccessible(true);
+
+            Schematic_SubTypesField = SchematicConfig.class.getDeclaredField("SubTypes");
+            Schematic_SubTypesField.setAccessible(true);
         } catch (NoSuchFieldException e) {
             throw new SecurityException(e.getMessage(), e);
         }
@@ -77,6 +89,18 @@ public final class GameModeConfig<M, W> {
         bySchematicType = new HashMap<>();
         SchematicType.values();
         DEFAULTS = SQLWrapper.impl.loadGameModeConfig(null);
+
+        byFileName.values().forEach(gameModeConfig -> {
+            List<SchematicType> subTypes = Collections.unmodifiableList(gameModeConfig.Schematic.SubTypesStrings.stream()
+                    .map(SchematicType::fromDB)
+                    .filter(Objects::nonNull)
+                    .collect(Collectors.toList()));
+            try {
+                Schematic_SubTypesField.set(gameModeConfig.Schematic, subTypes);
+            } catch (IllegalAccessException e) {
+                throw new SecurityException(e.getMessage(), e);
+            }
+        });
     }
 
     public final boolean loaded;
@@ -516,6 +540,8 @@ public final class GameModeConfig<M, W> {
          */
         public final SchematicType Type;
 
+        private final List<String> SubTypesStrings;
+
         /**
          * The schematic types that are also allowed to be chosen in this arena
          */
@@ -605,6 +631,13 @@ public final class GameModeConfig<M, W> {
          */
         public final int MaxDispenserItems;
 
+        /**
+         * Maximal blast resistance for the blocks
+         *
+         * @implSpec {@code Double.MAX_VALUE} by default
+         */
+        public final double MaxBlastResistance;
+
         /**
          * Maximal blast resistance for the design blocks
          *
@@ -623,6 +656,7 @@ public final class GameModeConfig<M, W> {
             Size = new SizeConfig(loader.with("Size"));
             Inset = new InsetConfig(loader.with("Inset"));
             Type = loader.getSchematicType("Type", "Normal");
+            SubTypesStrings = loader.getStringList("SubTypes");
             SubTypes = loader.getSchematicTypeList("SubTypes");
             Shortcut = loader.getString("Shortcut", "");
             Material = loader.getMaterial("Material", "STONE_BUTTON");
@@ -636,6 +670,7 @@ public final class GameModeConfig<M, W> {
             UnlimitedPrepare = loader.getBoolean("UnlimitedPrepare", false);
             MaxBlocks = loader.getInt("MaxBlocks", 0);
             MaxDispenserItems = loader.getInt("MaxDispenserItems", 128);
+            MaxBlastResistance = loader.getDouble("MaxBlastResistance", Double.MAX_VALUE);
             MaxDesignBlastResistance = loader.getDouble("MaxDesignBlastResistance", Double.MAX_VALUE);
 
             Map<Set<M>, Integer> Limited = new HashMap<>();
@@ -650,6 +685,10 @@ public final class GameModeConfig<M, W> {
                     Limited.put(Collections.unmodifiableSet(materials.stream().map(String::toUpperCase).map(loader.materialMapper).collect(Collectors.toSet())), amount);
                 }
             }
+            SQLWrapper.impl.getMaterialWithGreaterBlastResistance(MaxBlastResistance).forEach(material -> {
+                if (Limited.entrySet().stream().anyMatch(entry -> entry.getKey().contains(material))) return;
+                Limited.put(Collections.singleton((M) material), 0);
+            });
             this.Limited = Collections.unmodifiableMap(Limited);
         }
 

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

@@ -1,59 +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.sql;
-
-import de.steamwar.sql.internal.Field;
-import de.steamwar.sql.internal.SelectStatement;
-import de.steamwar.sql.internal.Statement;
-import de.steamwar.sql.internal.Table;
-import lombok.AllArgsConstructor;
-
-import java.sql.ResultSet;
-import java.util.UUID;
-
-@AllArgsConstructor
-public class IgnoreSystem {
-
-    private static final Table<IgnoreSystem> table = new Table<>(IgnoreSystem.class, "IgnoredPlayers");
-    private static final SelectStatement<IgnoreSystem> select = table.select(Table.PRIMARY);
-    private static final Statement insert = table.insertAll();
-    private static final Statement delete = table.delete(Table.PRIMARY);
-
-    @Field(keys = {Table.PRIMARY})
-    private final int ignorer;
-    @Field(keys = {Table.PRIMARY})
-    private final int ignored;
-
-    public static boolean isIgnored(UUID ignorer, UUID ignored){
-        return isIgnored(SteamwarUser.get(ignorer), SteamwarUser.get(ignored));
-    }
-
-    public static boolean isIgnored(SteamwarUser ignorer, SteamwarUser ignored) {
-        return select.select(ResultSet::next, ignorer.getId(), ignored.getId());
-    }
-
-    public static void ignore(SteamwarUser ignorer, SteamwarUser ignored) {
-        insert.update(ignorer.getId(), ignored.getId());
-    }
-
-    public static void unIgnore(SteamwarUser ignorer, SteamwarUser ignored) {
-        delete.update(ignorer.getId(), ignored.getId());
-    }
-}

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

@@ -0,0 +1,74 @@
+/*
+ *   This file is a part of the SteamWar software.
+ *
+ *   Copyright (C) 2025 SteamWar.de-Serverteam
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU Affero General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU Affero General Public License for more details.
+ *
+ *   You should have received a copy of the GNU Affero General Public License
+ *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package de.steamwar.sql
+
+import de.steamwar.sql.internal.useDb
+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
+import org.jetbrains.exposed.v1.core.dao.id.EntityID
+import org.jetbrains.exposed.v1.core.eq
+import org.jetbrains.exposed.v1.dao.CompositeEntity
+import org.jetbrains.exposed.v1.dao.CompositeEntityClass
+import java.util.*
+
+object IgnoreSystemTable: CompositeIdTable("IgnoredPlayers") {
+    val ignorer = reference("Ignorer", SteamwarUserTable)
+    val ignored = reference("Ignored", SteamwarUserTable)
+
+    override val primaryKey = PrimaryKey(ignorer, ignored)
+
+    init {
+        addIdColumn(ignorer)
+        addIdColumn(ignored)
+    }
+}
+
+class IgnoreSystem(id: EntityID<CompositeID>) : CompositeEntity(id) {
+    var ignorer by IgnoreSystemTable.ignorer
+    var ignored by IgnoreSystemTable.ignored
+
+    companion object : CompositeEntityClass<IgnoreSystem>(IgnoreSystemTable) {
+        @JvmStatic
+        fun isIgnored(ignorer: UUID, ignored: UUID) = useDb { isIgnored(SteamwarUser.get(ignorer)!!, SteamwarUser.get(ignored)!!) }
+
+        @JvmStatic
+        fun isIgnored(ignorer: SteamwarUser, ignored: SteamwarUser) = useDb {
+            find {
+                (IgnoreSystemTable.ignorer eq ignorer.id) and (IgnoreSystemTable.ignored eq ignored.id)
+            }.firstOrNull() != null
+        }
+
+        @JvmStatic
+        fun ignore(ignorer: SteamwarUser, ignored: SteamwarUser) = useDb {
+            new {
+                this.ignorer = ignorer.id
+                this.ignored = ignored.id
+            }
+        }
+
+        @JvmStatic
+        fun unIgnore(ignorer: SteamwarUser, ignored: SteamwarUser) = useDb {
+            find {
+                (IgnoreSystemTable.ignorer eq ignorer.id) and (IgnoreSystemTable.ignored eq ignored.id)
+            }.firstOrNull()?.delete()
+        }
+    }
+}

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

@@ -0,0 +1,96 @@
+/*
+ *   This file is a part of the SteamWar software.
+ *
+ *   Copyright (C) 2025 SteamWar.de-Serverteam
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU Affero General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU Affero General Public License for more details.
+ *
+ *   You should have received a copy of the GNU Affero General Public License
+ *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package de.steamwar.sql
+
+import de.steamwar.sql.internal.useDb
+import org.jetbrains.exposed.v1.core.SortOrder
+import org.jetbrains.exposed.v1.core.and
+import org.jetbrains.exposed.v1.core.count
+import org.jetbrains.exposed.v1.core.dao.id.CompositeID
+import org.jetbrains.exposed.v1.core.dao.id.CompositeIdTable
+import org.jetbrains.exposed.v1.core.dao.id.EntityID
+import org.jetbrains.exposed.v1.core.eq
+import org.jetbrains.exposed.v1.core.lessSubQuery
+import org.jetbrains.exposed.v1.dao.CompositeEntity
+import org.jetbrains.exposed.v1.dao.CompositeEntityClass
+import org.jetbrains.exposed.v1.javatime.CurrentTimestamp
+import org.jetbrains.exposed.v1.javatime.timestamp
+import org.jetbrains.exposed.v1.jdbc.select
+
+object LeaderboardTable : CompositeIdTable("Leaderboard") {
+    val userId = reference("UserId", SteamwarUserTable)
+    val name = varchar("Name", 64).entityId()
+    val time = long("Time")
+    val updatedAt = timestamp("UpdatedAt").defaultExpression(CurrentTimestamp)
+    val bestTime = bool("BestTime")
+}
+
+class Leaderboard(id: EntityID<CompositeID>) : CompositeEntity(id) {
+    companion object : CompositeEntityClass<Leaderboard>(LeaderboardTable) {
+        @JvmStatic
+        fun getLeaderboard(name: String) = useDb {
+            find { LeaderboardTable.name eq name }.orderBy(LeaderboardTable.time to SortOrder.ASC).limit(5).toList()
+        }
+
+        @JvmStatic
+        fun getPlayerTime(user: SteamwarUser, name: String) = useDb {
+            findById(CompositeID {
+                it[LeaderboardTable.userId] = user.id.value
+                it[LeaderboardTable.name] = name
+            })
+        }
+
+        @JvmStatic
+        fun getPlayerPlacement(user: SteamwarUser, name: String) = useDb {
+            LeaderboardTable.select(LeaderboardTable.time.count())
+                .where {
+                    (LeaderboardTable.name eq name) and (LeaderboardTable.time lessSubQuery LeaderboardTable.select(
+                        LeaderboardTable.time
+                    ).where { (LeaderboardTable.userId eq user.id.value) and (LeaderboardTable.name eq name) })
+                }
+                .firstOrNull()?.get(LeaderboardTable.time.count())?.toInt() ?: Int.MAX_VALUE
+        }
+
+        @JvmStatic
+        fun upsert(userId: Int, name: String, time: Long, bestTime: Boolean) = useDb {
+            findByIdAndUpdate(CompositeID {
+                it[LeaderboardTable.userId] = userId
+                it[LeaderboardTable.name] = name
+            }) {
+                it.time = time
+                it.bestTime = bestTime
+            } ?: new(
+                CompositeID {
+                    it[LeaderboardTable.userId] = userId
+                    it[LeaderboardTable.name] = name
+                }
+            ) {
+                this.time = time
+                this.bestTime = bestTime
+            }
+        }
+    }
+
+    val user by LeaderboardTable.userId.transform({ EntityID(it, SteamwarUserTable) }, { it.value })
+    val name by LeaderboardTable.name
+    var time by LeaderboardTable.time
+    var updatedAt by LeaderboardTable.updatedAt
+    var bestTime by LeaderboardTable.bestTime
+}

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

@@ -1,101 +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.sql;
-
-import de.steamwar.sql.internal.*;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-import java.util.List;
-
-@AllArgsConstructor
-public class Mod {
-
-    static {
-        SqlTypeMapper.ordinalEnumMapper(Platform.class);
-        SqlTypeMapper.ordinalEnumMapper(ModType.class);
-    }
-
-    private static final Table<Mod> table = new Table<>(Mod.class, "Mods");
-    private static final SelectStatement<Mod> get = table.select(Table.PRIMARY);
-    private static final SelectStatement<Mod> findFirst = new SelectStatement<>(table, "SELECT * FROM Mods WHERE ModType = 0 LIMIT 1");
-    private static final SelectStatement<Mod> getPageOfType = new SelectStatement<>(table, "SELECT * FROM Mods WHERE ModType = ? ORDER BY ModName DESC LIMIT ?, ?");
-    private static final Statement insert = table.insert(Table.PRIMARY);
-    private static final Statement set = table.update(Table.PRIMARY, "ModType");
-
-    public static Mod get(String name, Platform platform) {
-        return get.select(platform, name);
-    }
-
-    public static Mod getOrCreate(String name, Platform platform) {
-        Mod mod = get(name, platform);
-        if(mod != null)
-            return mod;
-
-        insert.update(platform, name);
-        return new Mod(platform, name, ModType.UNKLASSIFIED);
-    }
-
-    public static List<Mod> getAllModsFiltered(int page, int elementsPerPage, ModType filter) {
-        return Mod.getPageOfType.listSelect(filter, page * elementsPerPage, elementsPerPage);
-    }
-
-    public static Mod findFirstMod() {
-        return findFirst.select();
-    }
-
-    @Getter
-    @Field(keys = {Table.PRIMARY})
-    private final Platform platform;
-    @Getter
-    @Field(keys = {Table.PRIMARY})
-    private final String modName;
-    @Getter
-    @Field(def = "0")
-    private ModType modType;
-
-    public void setModType(ModType modType) {
-        set.update(modType, platform, modName);
-        this.modType = modType;
-    }
-
-    public enum Platform {
-        FORGE,
-        LABYMOD,
-        FABRIC
-    }
-
-    public enum ModType {
-        UNKLASSIFIED("7"),
-        GREEN("a"),
-        YELLOW("e"),
-        RED("c"),
-        YOUTUBER_ONLY("6");
-
-        ModType(String colorcode) {
-            this.colorcode = colorcode;
-        }
-        private final String colorcode;
-
-        public String getColorCode() {
-            return colorcode;
-        }
-    }
-}

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

@@ -0,0 +1,88 @@
+/*
+ *   This file is a part of the SteamWar software.
+ *
+ *   Copyright (C) 2025 SteamWar.de-Serverteam
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU Affero General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU Affero General Public License for more details.
+ *
+ *   You should have received a copy of the GNU Affero General Public License
+ *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package de.steamwar.sql
+
+import de.steamwar.sql.internal.useDb
+import org.jetbrains.exposed.v1.core.SortOrder
+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
+import org.jetbrains.exposed.v1.core.dao.id.EntityID
+import org.jetbrains.exposed.v1.core.eq
+import org.jetbrains.exposed.v1.dao.CompositeEntity
+import org.jetbrains.exposed.v1.dao.CompositeEntityClass
+
+object ModTable : CompositeIdTable("Mods") {
+    val platform = enumeration("Platform", Mod.Platform::class)
+    val modName = varchar("ModName", 100)
+    val modeType = enumerationByName("ModType", 10, Mod.ModType::class)
+}
+
+class Mod(id: EntityID<CompositeID>) : CompositeEntity(id) {
+    companion object : CompositeEntityClass<Mod>(ModTable) {
+        @JvmStatic
+        fun get(modName: String, platform: Platform) = useDb {
+            find { ModTable.platform eq platform and (ModTable.modName eq modName) }.firstOrNull()
+        }
+
+        @JvmStatic
+        fun getOrCreate(modName: String, platform: Platform) = useDb {
+            get(modName, platform) ?: new {
+                this.platform = platform
+                this.modName = modName
+                this.type = ModType.UNKLASSIFIED
+            }
+        }
+
+        @JvmStatic
+        fun getAllModsFiltered(page: Int, elementsPerPage: Int, filter: ModType) = useDb {
+            find { ModTable.modeType eq filter }.limit(elementsPerPage).offset((elementsPerPage * page).toLong())
+                .orderBy(
+                    ModTable.modName to SortOrder.DESC
+                ).toList()
+        }
+
+        @JvmStatic
+        fun findFirstMod() = useDb {
+            find { ModTable.modeType eq ModType.UNKLASSIFIED }.limit(1).firstOrNull()
+        }
+    }
+
+    var platform by ModTable.platform
+    var modName by ModTable.modName
+    private var type by ModTable.modeType
+    var modType: ModType
+        get() = type
+        set(value) = useDb { type = value }
+
+    enum class Platform {
+        FORGE,
+        LABYMOD,
+        FABRIC
+    }
+
+    enum class ModType(val colorCode: String) {
+        UNKLASSIFIED("7"),
+        GREEN("a"),
+        YELLOW("e"),
+        RED("c"),
+        YOUTUBER_ONLY("6");
+    }
+}

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

@@ -1,137 +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.sql;
-
-import de.steamwar.sql.internal.*;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-import javax.swing.plaf.nimbus.State;
-import java.io.*;
-import java.sql.PreparedStatement;
-import java.sql.Timestamp;
-import java.time.Instant;
-import java.util.List;
-import java.util.Optional;
-import java.util.zip.GZIPInputStream;
-
-@AllArgsConstructor
-@Getter
-public class NodeData {
-    static {
-        new SqlTypeMapper<>(PipedInputStream.class, "BLOB", (rs, identifier) -> { throw new SecurityException("PipedInputStream is write only datatype"); }, PreparedStatement::setBinaryStream);
-        new SqlTypeMapper<>(ByteArrayInputStream.class, "BLOB", (rs, identifier) -> { throw new SecurityException("ByteArrayInputStream is write only datatype"); }, PreparedStatement::setBinaryStream);
-        new SqlTypeMapper<>(BufferedInputStream.class, "BLOB", (rs, identifier) -> { throw new SecurityException("BufferedInputStream is write only datatype"); }, PreparedStatement::setBinaryStream);
-
-        SqlTypeMapper.ordinalEnumMapper(SchematicFormat.class);
-    }
-
-    private static final Table<NodeData> table = new Table<>(NodeData.class);
-
-    private static final Statement updateDatabase = new Statement("INSERT INTO NodeData(NodeId, NodeFormat, SchemData) VALUES (?, ?, ?)", true);
-    private static final Statement selSchemData = new Statement("SELECT SchemData FROM NodeData WHERE NodeId = ? AND CreatedAt = ?");
-    private static final Statement delete = table.delete(Table.PRIMARY);
-
-    private static final SelectStatement<NodeData> get = new SelectStatement<>(table, "SELECT NodeId, CreatedAt, NodeFormat FROM NodeData WHERE NodeId = ? ORDER BY CreatedAt ");
-    private static final Statement getRevisions = new Statement("SELECT COUNT(DISTINCT CreatedAt) as CNT FROM NodeData WHERE NodeId = ?");
-    private static final SelectStatement<NodeData> getLatest = new SelectStatement<>(table, "SELECT NodeId, CreatedAt, NodeFormat FROM NodeData WHERE NodeId = ? ORDER BY CreatedAt DESC LIMIT 1");
-
-    public static NodeData getLatest(SchematicNode node) {
-        if (node.isDir()) throw new IllegalArgumentException("Node is dir");
-        return Optional.ofNullable(getLatest.select(node)).orElseGet(() -> new NodeData(node.getId(), Timestamp.from(Instant.now()), SchematicFormat.MCEDIT));
-    }
-
-    public static List<NodeData> get(SchematicNode node) {
-        return get.listSelect(node);
-    }
-
-    public static NodeData get(SchematicNode node, int revision) {
-        return get.listSelect(node).get(revision - 1);
-    }
-
-    public static int getRevisions(SchematicNode node) {
-        return getRevisions.select(rs -> {
-            if (rs.next()) {
-                return rs.getInt("CNT");
-            } else {
-                return 0;
-            }
-        }, node);
-    }
-
-    public static void saveFromStream(SchematicNode node, InputStream blob, SchematicFormat format) {
-        updateDatabase.update(node.getId(), format, blob);
-    }
-
-    @Field(keys = {Table.PRIMARY})
-    private final int nodeId;
-
-    @Field(keys = {Table.PRIMARY})
-    private Timestamp createdAt;
-
-    @Field
-    private SchematicFormat nodeFormat;
-
-    public InputStream schemData() throws IOException {
-        return schemData(true);
-    }
-
-    public InputStream schemData(boolean decompress) throws IOException {
-        try {
-            return selSchemData.select(rs -> {
-                rs.next();
-                InputStream schemData = rs.getBinaryStream("SchemData");
-                try {
-                    if(rs.wasNull() || schemData.available() == 0) {
-                        throw new SecurityException("SchemData is null");
-                    }
-                    if (decompress) {
-                        return new GZIPInputStream(schemData);
-                    } else {
-                        return schemData;
-                    }
-                } catch (IOException e) {
-                    throw new SecurityException("SchemData is wrong", e);
-                }
-            }, nodeId, createdAt);
-        } catch (Exception e) {
-            throw new IOException(e);
-        }
-    }
-
-    @Deprecated
-    public void saveFromStream(InputStream blob, SchematicFormat newFormat) {
-        saveFromStream(SchematicNode.getSchematicNode(nodeId), blob, newFormat);
-    }
-
-    public void delete() {
-        delete.update(nodeId, createdAt);
-    }
-
-    @AllArgsConstructor
-    @Getter
-    public enum SchematicFormat {
-        MCEDIT(".schematic"),
-        SPONGE_V2(".schem"),
-        SPONGE_V3(".schem");
-
-        private final String fileEnding;
-    }
-}

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

@@ -0,0 +1,100 @@
+/*
+ *   This file is a part of the SteamWar software.
+ *
+ *   Copyright (C) 2025 SteamWar.de-Serverteam
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU Affero General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU Affero General Public License for more details.
+ *
+ *   You should have received a copy of the GNU Affero General Public License
+ *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package de.steamwar.sql
+
+import de.steamwar.sql.internal.useDb
+import org.jetbrains.exposed.v1.core.SortOrder
+import org.jetbrains.exposed.v1.core.dao.id.CompositeID
+import org.jetbrains.exposed.v1.core.dao.id.CompositeIdTable
+import org.jetbrains.exposed.v1.core.dao.id.EntityID
+import org.jetbrains.exposed.v1.core.eq
+import org.jetbrains.exposed.v1.core.statements.api.ExposedBlob
+import org.jetbrains.exposed.v1.dao.CompositeEntity
+import org.jetbrains.exposed.v1.dao.CompositeEntityClass
+import org.jetbrains.exposed.v1.javatime.CurrentTimestamp
+import org.jetbrains.exposed.v1.javatime.timestamp
+import org.jetbrains.exposed.v1.jdbc.insert
+import java.io.InputStream
+import java.util.zip.GZIPInputStream
+
+object NodeDataTable: CompositeIdTable("NodeData") {
+    val nodeId = reference("NodeId", SchematicNodeTable)
+    val createdAt = timestamp("CreatedAt").defaultExpression(CurrentTimestamp).entityId()
+    val nodeFormat = enumeration("NodeFormat", NodeData.SchematicFormat::class)
+    val schemData = blob("SchemData")
+
+    override val primaryKey = PrimaryKey(nodeId, createdAt)
+
+    init {
+        addIdColumn(nodeId)
+    }
+}
+
+class NodeData(id: EntityID<CompositeID>): CompositeEntity(id) {
+    val nodeId by NodeDataTable.nodeId
+    val createdAt by NodeDataTable.createdAt
+    val nodeFormat by NodeDataTable.nodeFormat
+    val schemData by NodeDataTable.schemData
+
+    companion object: CompositeEntityClass<NodeData>(NodeDataTable) {
+        @JvmStatic
+        fun getLatest(node: SchematicNode) = useDb {
+            find { (NodeDataTable.nodeId eq node.nodeId) }.orderBy(NodeDataTable.createdAt to SortOrder.DESC).firstOrNull()
+        }
+
+        @JvmStatic
+        fun get(node: SchematicNode) = useDb {
+            find { (NodeDataTable.nodeId eq node.nodeId) }.orderBy(NodeDataTable.createdAt to SortOrder.ASC).toList()
+        }
+
+        @JvmStatic
+        fun get(node: SchematicNode, revision: Int) = useDb {
+            find { NodeDataTable.nodeId eq node.nodeId }.orderBy(NodeDataTable.createdAt to SortOrder.ASC).toList().get(revision - 1)
+        }
+
+        @JvmStatic
+        fun getRevisions(node: SchematicNode) = useDb {
+            count(NodeDataTable.nodeId eq node.nodeId).toInt()
+        }
+
+        @JvmStatic
+        fun saveFromStream(node: SchematicNode, blob: InputStream, format: SchematicFormat) = useDb {
+            NodeDataTable.insert {
+                it[NodeDataTable.nodeId] = EntityID(node.getId(), SchematicNodeTable)
+                it[NodeDataTable.nodeFormat] = format
+                it[NodeDataTable.schemData] = ExposedBlob(blob.readBytes())
+            }
+        }
+    }
+
+    fun schemData(decompress: Boolean) = useDb {
+        schemData.inputStream.let { if(decompress) GZIPInputStream(it) else it }
+    }
+
+    fun schemData() = schemData(true)
+
+    override fun delete() = useDb { super.delete() }
+
+    enum class SchematicFormat(val fileEnding: String) {
+        MCEDIT(".schematic"),
+        SPONGE_V2(".schem"),
+        SPONGE_V3(".schem");
+    }
+}

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

@@ -1,86 +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.sql;
-
-import de.steamwar.sql.internal.Field;
-import de.steamwar.sql.internal.SelectStatement;
-import de.steamwar.sql.internal.Statement;
-import de.steamwar.sql.internal.Table;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-import java.sql.Timestamp;
-import java.time.Instant;
-
-@AllArgsConstructor
-public class NodeDownload {
-
-    private static final char[] HEX = new char[]{'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F' };
-    private static final String LINK_BASE = "https://api.steamwar.de/download/";
-
-    private static final Table<NodeDownload> table = new Table<>(NodeDownload.class);
-    private static final Statement insert = table.insertFields("NodeId", "Link");
-
-    private static final SelectStatement<NodeDownload> select = table.selectFields("link");
-
-    private static final Statement delete = table.delete(Table.PRIMARY);
-
-    public static NodeDownload get(String link) {
-        return select.select(link);
-    }
-
-    @Getter
-    @Field(keys = {Table.PRIMARY})
-    private final int nodeId;
-    @Field
-    private final String link;
-    @Field(def = "CURRENT_TIMESTAMP")
-    @Getter
-    private final Timestamp timestamp;
-
-    public static String getLink(SchematicNode schem){
-        if(schem.isDir())
-            throw new SecurityException("Can not Download Directorys");
-        MessageDigest digest;
-        try {
-            digest = MessageDigest.getInstance("SHA-1");
-        } catch (NoSuchAlgorithmException e) {
-            throw new SecurityException(e);
-        }
-        digest.reset();
-        digest.update((Instant.now().toString() + schem.getOwner() + schem.getId()).getBytes());
-        String hash = base16encode(digest.digest());
-        insert.update(schem.getId(), hash);
-        return LINK_BASE + hash;
-    }
-
-    public static String base16encode(byte[] byteArray) {
-        StringBuilder hexBuffer = new StringBuilder(byteArray.length * 2);
-        for (byte b : byteArray)
-            hexBuffer.append(HEX[(b >>> 4) & 0xF]).append(HEX[b & 0xF]);
-        return hexBuffer.toString();
-    }
-
-    public void delete() {
-        delete.update(nodeId);
-    }
-}

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

@@ -0,0 +1,76 @@
+/*
+ *   This file is a part of the SteamWar software.
+ *
+ *   Copyright (C) 2025 SteamWar.de-Serverteam
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU Affero General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU Affero General Public License for more details.
+ *
+ *   You should have received a copy of the GNU Affero General Public License
+ *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package de.steamwar.sql
+
+import de.steamwar.sql.internal.useDb
+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
+import org.jetbrains.exposed.v1.dao.IntEntity
+import org.jetbrains.exposed.v1.dao.IntEntityClass
+import org.jetbrains.exposed.v1.javatime.CurrentTimestamp
+import org.jetbrains.exposed.v1.javatime.timestamp
+import java.security.MessageDigest
+import java.sql.Timestamp
+import java.time.Instant
+
+object NodeDownloadTable: IdTable<Int>("NodeDownload") {
+    override val id = reference("NodeId", SchematicNodeTable).uniqueIndex()
+    val link = varchar("Link", 255)
+    val timestamp = timestamp("Timestamp").defaultExpression(CurrentTimestamp)
+}
+
+class NodeDownload(id: EntityID<Int>) : IntEntity(id) {
+    companion object : IntEntityClass<NodeDownload>(NodeDownloadTable) {
+        const val LINK_BASE = "https://api.steamwar.de/download/"
+
+        @JvmStatic
+        fun getLink(schem: SchematicNode): String {
+            if (schem.isDir())
+                throw IllegalArgumentException("Cannot get link for directory")
+
+            val digest = MessageDigest.getInstance("SHA-1")
+            digest.update("${Instant.now()}${schem.owner}${schem.nodeId}".toByteArray())
+            val hash = digest.digest().joinToString("") { "%02x".format(it) }
+            useDb {
+                findByIdAndUpdate(schem.id.value) {
+                    it.link = hash
+                } ?: new {
+                    nodeId = schem.id.value
+                    link = hash
+                }
+            }
+            return "${LINK_BASE}${hash}"
+        }
+
+        @JvmStatic
+        fun get(link: String) = useDb {
+            find { NodeDownloadTable.link eq link }.firstOrNull()
+        }
+    }
+
+    var nodeId by NodeDownloadTable.id.transform({ EntityID(it, SchematicNodeTable) }, { it.value })
+    var link by NodeDownloadTable.link
+    var timestamp by NodeDownloadTable.timestamp.transform({ it.toInstant() }, { Timestamp.from(it) })
+
+    override fun delete() = useDb {
+        super.delete()
+    }
+}

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

@@ -1,95 +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.sql;
-
-import de.steamwar.sql.internal.Field;
-import de.steamwar.sql.internal.SelectStatement;
-import de.steamwar.sql.internal.Statement;
-import de.steamwar.sql.internal.Table;
-import lombok.AllArgsConstructor;
-
-import java.util.HashSet;
-import java.util.Optional;
-import java.util.Set;
-
-@AllArgsConstructor
-public class NodeMember {
-
-    public static void init() {
-        // enforce class initialization
-    }
-
-    private static final Table<NodeMember> table = new Table<>(NodeMember.class);
-    private static final SelectStatement<NodeMember> getNodeMember = table.select(Table.PRIMARY);
-    private static final SelectStatement<NodeMember> getNodeMembers = table.selectFields("NodeId");
-    private static final SelectStatement<NodeMember> getSchematics = table.selectFields("UserId");
-    private static final Statement create = table.insert(Table.PRIMARY);
-    private static final Statement delete = table.delete(Table.PRIMARY);
-    private static final Statement updateParent = table.update(Table.PRIMARY, "ParentId");
-
-    @Field(keys = {Table.PRIMARY})
-    private final int nodeId;
-    @Field(keys = {Table.PRIMARY})
-    private final int userId;
-    @Field(nullable = true, def = "null")
-    private Integer parentId;
-
-    public int getNode() {
-        return nodeId;
-    }
-
-    public int getMember() {
-        return userId;
-    }
-
-    public Optional<Integer> getParent() {
-        return Optional.ofNullable(parentId);
-    }
-
-    public void delete() {
-        delete.update(nodeId, userId);
-    }
-
-    public static NodeMember createNodeMember(int node, int member) {
-        create.update(node, member);
-        return new NodeMember(node, member, null);
-    }
-
-    public static NodeMember getNodeMember(int node, SteamwarUser member) {
-        return getNodeMember(node, member.getId());
-    }
-
-    public static NodeMember getNodeMember(int node, int member) {
-        return getNodeMember.select(node, member);
-    }
-
-    public static Set<NodeMember> getNodeMembers(int node) {
-        return new HashSet<>(getNodeMembers.listSelect(node));
-    }
-
-    public static Set<NodeMember> getSchematics(int member) {
-        return new HashSet<>(getSchematics.listSelect(member));
-    }
-
-    public void setParentId(Integer parentId) {
-        this.parentId = parentId;
-        updateParent.update(this.parentId, nodeId, userId);
-    }
-}

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

@@ -0,0 +1,92 @@
+/*
+ *   This file is a part of the SteamWar software.
+ *
+ *   Copyright (C) 2025 SteamWar.de-Serverteam
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU Affero General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU Affero General Public License for more details.
+ *
+ *   You should have received a copy of the GNU Affero General Public License
+ *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package de.steamwar.sql
+
+import de.steamwar.sql.internal.useDb
+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
+import org.jetbrains.exposed.v1.core.dao.id.EntityID
+import org.jetbrains.exposed.v1.core.eq
+import org.jetbrains.exposed.v1.dao.CompositeEntity
+import org.jetbrains.exposed.v1.dao.CompositeEntityClass
+import org.jetbrains.exposed.v1.jdbc.insertIgnore
+import java.util.*
+import kotlin.jvm.optionals.getOrNull
+
+object NodeMemberTable : CompositeIdTable("NodeMember") {
+    val node = reference("NodeId", SchematicNodeTable)
+    val userId = reference("UserId", SteamwarUserTable)
+    val parentNode = optReference("ParentId", SchematicNodeTable)
+
+    override val primaryKey = PrimaryKey(node, userId)
+
+    init {
+        addIdColumn(node)
+        addIdColumn(userId)
+    }
+}
+
+class NodeMember(id: EntityID<CompositeID>) : CompositeEntity(id) {
+    companion object : CompositeEntityClass<NodeMember>(NodeMemberTable) {
+        @JvmStatic
+        fun createNodeMember(node: Int, member: Int): NodeMember = useDb {
+            NodeMemberTable.insertIgnore {
+                it[this.node] = EntityID(node, SchematicNodeTable)
+                it[this.userId] = EntityID(member, SteamwarUserTable)
+            }
+            getNodeMember(node, member) ?: throw IllegalStateException("NodeMember not created")
+        }
+
+        @JvmStatic
+        fun createNodeMember(node: Int, member: SteamwarUser) = createNodeMember(node, member.id.value)
+
+        @JvmStatic
+        fun getNodeMember(node: Int, member: Int) = useDb {
+            find { (NodeMemberTable.node eq node) and (NodeMemberTable.userId eq member) }.firstOrNull()
+        }
+
+        @JvmStatic
+        fun getNodeMember(node: Int, member: SteamwarUser) = getNodeMember(node, member.id.value)
+
+        @JvmStatic
+        fun getNodeMembers(node: Int) = useDb { find { NodeMemberTable.node eq node }.toSet() }
+
+        @JvmStatic
+        fun getSchematics(member: Int) = useDb { find { NodeMemberTable.userId eq member }.toSet() }
+
+        @JvmStatic
+        fun init() = Unit
+    }
+
+    val node by NodeMemberTable.node.transform({ EntityID(it, SchematicNodeTable) }, { it.value })
+    val member by NodeMemberTable.userId.transform({ EntityID(it, SteamwarUserTable) }, { it.value })
+    var parent by NodeMemberTable.parentNode.transform(
+        { it.map { EntityID(it, SchematicNodeTable) }.getOrNull() },
+        { Optional.ofNullable(it?.value) })
+
+    fun setParentId(id: Int?) {
+        parent = Optional.ofNullable(id)
+    }
+
+    override fun delete() = useDb {
+        super.delete()
+    }
+}

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

@@ -0,0 +1,117 @@
+/*
+ *   This file is a part of the SteamWar software.
+ *
+ *   Copyright (C) 2025 SteamWar.de-Serverteam
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU Affero General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU Affero General Public License for more details.
+ *
+ *   You should have received a copy of the GNU Affero General Public License
+ *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package de.steamwar.sql
+
+import de.steamwar.sql.internal.useDb
+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
+import org.jetbrains.exposed.v1.core.dao.id.EntityID
+import org.jetbrains.exposed.v1.core.eq
+import org.jetbrains.exposed.v1.dao.CompositeEntity
+import org.jetbrains.exposed.v1.dao.CompositeEntityClass
+import org.jetbrains.exposed.v1.jdbc.insert
+
+object PersonalKitTable: CompositeIdTable("PersonalKit") {
+    val userId = reference("UserId", SteamwarUserTable)
+    val gamemode = varchar("Gamemode", 64).entityId()
+    val kitName = varchar("Name", 64).entityId()
+    val inventory = text("Inventory")
+    val armor = text("Armor")
+    val inUse = bool("InUse")
+
+    override val primaryKey = PrimaryKey(userId, gamemode, kitName)
+
+    init {
+        addIdColumn(userId)
+    }
+}
+
+class InternalKit(id: EntityID<CompositeID>): CompositeEntity(id) {
+    companion object: CompositeEntityClass<InternalKit>(PersonalKitTable) {
+        @JvmStatic
+        fun get(userId: Int, gamemode: String) = useDb {
+            find { PersonalKitTable.userId eq userId and (PersonalKitTable.gamemode eq gamemode) and (PersonalKitTable.inUse eq true) }
+                .toList()
+        }
+
+        @JvmStatic
+        fun get(userId: Int, gamemode: String, kitName: String) = useDb {
+            find { PersonalKitTable.userId eq userId and (PersonalKitTable.gamemode eq gamemode) and (PersonalKitTable.kitName eq kitName) and (PersonalKitTable.inUse eq true) }
+                .firstOrNull()
+        }
+
+        @JvmStatic
+        fun create(userId: Int, gamemode: String, kitName: String, rawInventory: String, rawArmor: String) = useDb {
+            new(
+                CompositeID {
+                    it[PersonalKitTable.userId] = EntityID(userId, SteamwarUserTable)
+                    it[PersonalKitTable.gamemode] = gamemode
+                    it[PersonalKitTable.kitName] = kitName
+                }
+            ) {
+                this.inventory = rawInventory
+                this.armor = rawArmor
+                this.inUse = true
+            }
+        }
+
+        @JvmStatic
+        fun getKitInUse(userId: Int, gamemode: String) = useDb {
+            find { PersonalKitTable.userId eq userId and (PersonalKitTable.gamemode eq gamemode) and (PersonalKitTable.inUse eq true) }
+                .firstOrNull()
+        }
+    }
+
+    var userID by PersonalKitTable.userId.transform({ EntityID(it, SteamwarUserTable) }, { it.value })
+        private set
+    private var gameMode by PersonalKitTable.gamemode
+    val gamemode: String
+        get() = gameMode.value
+
+    var kitName by PersonalKitTable.kitName
+        private set
+    val name: String
+        get() = kitName.value
+
+    var rawInventory by PersonalKitTable.inventory
+        private set
+    var rawArmor by PersonalKitTable.armor
+        private set
+    var inUse by PersonalKitTable.inUse
+        private set
+
+    var inventory: String
+        get() = rawInventory
+        set(value) = useDb { rawInventory = value }
+    var armor: String
+        get() = rawArmor
+        set(value) = useDb { rawArmor = value }
+
+    fun setDefault() = useDb {
+        find { PersonalKitTable.userId eq userID and (PersonalKitTable.gamemode eq gameMode) and (PersonalKitTable.inUse eq true) }
+            .forEach { it.inUse = false }
+        inUse = true
+    }
+
+    override fun delete() = useDb {
+        super.delete()
+    }
+}

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

@@ -1,77 +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.sql;
-
-import de.steamwar.sql.internal.Field;
-import de.steamwar.sql.internal.SelectStatement;
-import de.steamwar.sql.internal.Statement;
-import de.steamwar.sql.internal.Table;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.util.HashMap;
-import java.util.Map;
-
-@AllArgsConstructor
-public class PollAnswer {
-
-    @Getter
-    @Setter
-    private static String currentPoll;
-
-    private static final Table<PollAnswer> table = new Table<>(PollAnswer.class);
-
-    private static final SelectStatement<PollAnswer> get = table.select(Table.PRIMARY);
-    private static final Statement getResults = new Statement("SELECT Count(UserID) AS Times, Answer FROM PollAnswer WHERE Question = ? GROUP BY Answer ORDER BY Times ASC");
-    private static final Statement insert = table.insertAll();
-
-    @Field(keys = {Table.PRIMARY})
-    private final int userID;
-    @Field(keys = {Table.PRIMARY})
-    private final String question;
-    @Field(def = "0")
-    private int answer;
-
-    public static PollAnswer get(int userID) {
-        PollAnswer answer = get.select(userID, currentPoll);
-        if(answer == null)
-            return new PollAnswer(userID, currentPoll, 0);
-        return answer;
-    }
-
-    public static Map<Integer, Integer> getCurrentResults() {
-        return getResults.select(rs -> {
-            Map<Integer, Integer> retMap = new HashMap<>();
-            while (rs.next())
-                retMap.put(rs.getInt("Answer")-1, rs.getInt("Times"));
-            return retMap;
-        }, currentPoll);
-    }
-
-    public boolean hasAnswered(){
-        return answer != 0;
-    }
-
-    public void setAnswer(int answer){
-        this.answer = answer;
-        insert.update(userID, question, answer);
-    }
-}

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

@@ -0,0 +1,78 @@
+/*
+ *   This file is a part of the SteamWar software.
+ *
+ *   Copyright (C) 2025 SteamWar.de-Serverteam
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU Affero General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU Affero General Public License for more details.
+ *
+ *   You should have received a copy of the GNU Affero General Public License
+ *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package de.steamwar.sql
+
+import de.steamwar.sql.internal.useDb
+import org.jetbrains.exposed.v1.core.VarCharColumnType
+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
+import org.jetbrains.exposed.v1.core.dao.id.EntityID
+import org.jetbrains.exposed.v1.core.eq
+import org.jetbrains.exposed.v1.dao.CompositeEntity
+import org.jetbrains.exposed.v1.dao.CompositeEntityClass
+
+object PollAnswerTable: CompositeIdTable("PollAnswer") {
+    val userId = reference("UserID", SteamwarUserTable)
+    val question = varchar("Question", 150)
+    val answer = integer("Answer")
+}
+
+class PollAnswer(id: EntityID<CompositeID>): CompositeEntity(id) {
+    var userId by PollAnswerTable.userId
+        private set
+    var question by PollAnswerTable.question
+        private set
+    private var answerId by PollAnswerTable.answer
+    var answer: Int
+        get() = answerId
+        set(value) = useDb {
+            answerId = value
+        }
+
+    companion object: CompositeEntityClass<PollAnswer>(PollAnswerTable) {
+        @JvmStatic
+        var currentPoll: String? = null
+
+        @JvmStatic
+        fun get(userId: Int) = useDb {
+            find { (PollAnswerTable.userId eq userId) and (PollAnswerTable.question eq currentPoll!!) }.firstOrNull()
+                ?: new {
+                    this.userId = EntityID(userId, SteamwarUserTable)
+                    this.question = currentPoll!!
+                    this.answerId = 0
+                }
+        }
+
+        @JvmStatic
+        fun getCurrentResults(): Map<Int, Int> = useDb {
+            exec("SELECT Count(UserID) AS Times, Answer FROM PollAnswer WHERE Question = ? GROUP BY Answer ORDER BY Times ASC",
+                args = listOf(VarCharColumnType() to currentPoll!!)) {
+                val result = mutableMapOf<Int, Int>()
+                while (it.next()) {
+                    result[it.getInt("Answer")] = it.getInt("Times")
+                }
+                result
+            } ?: emptyMap()
+        }
+    }
+
+    fun hasAnswered() = answerId != 0
+}

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

@@ -1,140 +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.sql;
-
-import de.steamwar.sql.internal.*;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.RequiredArgsConstructor;
-
-import java.sql.Timestamp;
-import java.time.Instant;
-import java.time.format.DateTimeFormatter;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Consumer;
-import java.util.stream.Collectors;
-
-@AllArgsConstructor
-public class Punishment {
-
-    static {
-        SqlTypeMapper.nameEnumMapper(PunishmentType.class);
-    }
-
-    public static final Timestamp PERMA_TIME = Timestamp.from(Instant.ofEpochSecond(946674800));
-
-    private static final Table<Punishment> table = new Table<>(Punishment.class, "Punishments");
-    private static final SelectStatement<Punishment> getPunishments = new SelectStatement<>(table, "SELECT * FROM Punishments WHERE PunishmentId IN (SELECT MAX(PunishmentId) FROM Punishments WHERE UserId = ? GROUP BY Type)");
-    private static final SelectStatement<Punishment> getPunishment = new SelectStatement<>(table, "SELECT * FROM Punishments WHERE UserId = ? AND Type = ? ORDER BY PunishmentId DESC LIMIT 1");
-    private static final SelectStatement<Punishment> getAllPunishments = new SelectStatement<>(table, "SELECT * FROM Punishments WHERE UserId = ? ORDER BY `PunishmentId` DESC");
-    private static final Statement insert = table.insertFields(true, "UserId", "Punisher", "Type", "EndTime", "Perma", "Reason");
-
-    public static Punishment getPunishmentOfPlayer(int user, PunishmentType type) {
-        return getPunishment.select(user, type);
-    }
-
-    public static Map<PunishmentType, Punishment> getPunishmentsOfPlayer(int user) {
-        return getPunishments.listSelect(user).stream().collect(Collectors.toMap(Punishment::getType, punishment -> punishment));
-    }
-
-    public static List<Punishment> getAllPunishmentsOfPlayer(int user) {
-        return getAllPunishments.listSelect(user);
-    }
-
-    public static boolean isPunished(SteamwarUser user, PunishmentType type, Consumer<Punishment> callback) {
-        Punishment punishment = Punishment.getPunishmentOfPlayer(user.getId(), type);
-        if(punishment == null || !punishment.isCurrent()) {
-            return false;
-        } else {
-            callback.accept(punishment);
-            return true;
-        }
-    }
-
-    public static Punishment createPunishment(int user, int executor, PunishmentType type, String reason, Timestamp endTime, boolean perma) {
-        if(perma && !endTime.equals(PERMA_TIME)) {
-            throw new IllegalArgumentException("Permanent punishments must have an end time of `Punishment.PERMA_TIME`");
-        }
-        int punishmentId = insert.insertGetKey(user, executor, type.name(), endTime, perma, reason);
-        return new Punishment(punishmentId, user, executor, type, Timestamp.from(Instant.now()), endTime, perma, reason);
-    }
-
-    @Field(keys = {Table.PRIMARY}, autoincrement = true)
-    private final int punishmentId;
-    @Field
-    @Getter
-    private final int userId;
-    @Field
-    @Getter
-    private final int punisher;
-    @Field
-    @Getter
-    private final PunishmentType type;
-    @Field
-    @Getter
-    private final Timestamp startTime;
-    @Field
-    @Getter
-    private final Timestamp endTime;
-    @Field
-    @Getter
-    private final boolean perma;
-    @Field
-    @Getter
-    private final String reason;
-
-    @Deprecated // Not multiling, misleading title
-    public String getBantime(Timestamp endTime, boolean perma) {
-        if (perma) {
-            return "permanent";
-        } else {
-            return endTime.toLocalDateTime().format(DateTimeFormatter.ofPattern("dd.MM.yyyy HH:mm"));
-        }
-    }
-
-    public boolean isCurrent() {
-        return isPerma() || getEndTime().after(new Date());
-    }
-
-    @AllArgsConstructor
-    @RequiredArgsConstructor
-    @Getter
-    public enum PunishmentType {
-        Ban(UserPerm.TEAM, "BAN_TEAM", "BAN_PERMA", "BAN_UNTIL", "UNBAN_ERROR", "UNBAN"),
-        Mute( UserPerm.TEAM, "MUTE_TEAM", "MUTE_PERMA", "MUTE_UNTIL", "UNMUTE_ERROR", "UNMUTE"),
-        NoSchemReceiving(UserPerm.MODERATION, "NOSCHEMRECEIVING_TEAM", "NOSCHEMRECEIVING_PERMA", "NOSCHEMRECEIVING_UNTIL", "UNNOSCHEMRECEIVING_ERROR", "UNNOSCHEMRECEIVING"),
-        NoSchemSharing(UserPerm.MODERATION, "NOSCHEMSHARING_TEAM", "NOSCHEMSHARING_PERMA", "NOSCHEMSHARING_UNTIL", "UNNOSCHEMSHARING_ERROR", "UNNOSCHEMSHARING"),
-        NoSchemSubmitting(UserPerm.TEAM, "NOSCHEMSUBMITTING_TEAM", "NOSCHEMSUBMITTING_PERMA", "NOSCHEMSUBMITTING_UNTIL", "UNNOSCHEMSUBMITTING_ERROR", "UNNOSCHEMSUBMITTING"),
-        NoDevServer(UserPerm.PREFIX_DEVELOPER, "NODEVSERVER_TEAM", "NODEVSERVER_PERMA", "NODEVSERVER_UNTIL", "UNNODEVSERVER_ERROR", "UNNODEVSERVER"),
-        NoFightServer(UserPerm.MODERATION, "NOFIGHTSERVER_TEAM", "NOFIGHTSERVER_PERMA", "NOFIGHTSERVER_UNTIL", "UNNOFIGHTSERVER_ERROR", "UNNOFIGHTSERVER"),
-        NoTeamServer(UserPerm.MODERATION, "NOTEAMSERVER_TEAM", "NOTEAMSERVER_PERMA", "NOTEAMSERVER_UNTIL", "UNNOTEAMSERVER_ERROR", "UNNOTEAMSERVER"),
-        Note(UserPerm.TEAM, "NOTE_TEAM", null, null, null, null, true);
-
-        private final UserPerm userPerm;
-        private final String teamMessage;
-        private final String playerMessagePerma;
-        private final String playerMessageUntil;
-        private final String usageNotPunished;
-        private final String unpunishmentMessage;
-        private boolean multi = false;
-    }
-}

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

@@ -0,0 +1,186 @@
+/*
+ *   This file is a part of the SteamWar software.
+ *
+ *   Copyright (C) 2025 SteamWar.de-Serverteam
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU Affero General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU Affero General Public License for more details.
+ *
+ *   You should have received a copy of the GNU Affero General Public License
+ *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package de.steamwar.sql
+
+import de.steamwar.sql.internal.useDb
+import org.jetbrains.exposed.v1.core.*
+import org.jetbrains.exposed.v1.core.dao.id.EntityID
+import org.jetbrains.exposed.v1.core.dao.id.IntIdTable
+import org.jetbrains.exposed.v1.dao.IntEntity
+import org.jetbrains.exposed.v1.dao.IntEntityClass
+import org.jetbrains.exposed.v1.javatime.timestamp
+import org.jetbrains.exposed.v1.jdbc.select
+import java.sql.Timestamp
+import java.time.Instant
+import java.util.*
+import java.util.function.Consumer
+
+object PunishmentTable : IntIdTable("Punishments", "PunishmentId") {
+    val userId = reference("UserId", SteamwarUserTable)
+    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")
+}
+
+class Punishment(id: EntityID<Int>) : IntEntity(id) {
+    companion object : IntEntityClass<Punishment>(PunishmentTable) {
+        @JvmField
+        val PERMA_TIME: Timestamp = Timestamp.from(Instant.ofEpochSecond(946674800))
+
+        @JvmStatic
+        fun getPunsihmentOfPlayer(user: Int, type: PunishmentType) = useDb {
+            find { (PunishmentTable.userId eq user) and (PunishmentTable.type eq type) }.orderBy(PunishmentTable.id to SortOrder.DESC)
+                .firstOrNull()
+        }
+
+        @JvmStatic
+        fun getPunishmentsOfPlayer(user: Int) = useDb {
+            find {
+                PunishmentTable.id inSubQuery PunishmentTable.select(PunishmentTable.id.max())
+                    .where { PunishmentTable.userId eq user }.groupBy(
+                        PunishmentTable.type
+                    )
+            }.associateBy { it.type }.toMutableMap()
+        }
+
+        @JvmStatic
+        fun getAllPunishmentsOfPlayer(user: Int) = useDb {
+            find { PunishmentTable.userId eq user }.orderBy(PunishmentTable.id to SortOrder.DESC).toList()
+        }
+
+        @JvmStatic
+        fun isPunished(user: SteamwarUser, type: PunishmentType, callback: Consumer<Punishment>): Boolean = useDb {
+            val punishment = getPunsihmentOfPlayer(user.id.value, type) ?: return@useDb false
+
+            if (punishment.isCurrent()) {
+                callback.accept(punishment)
+                return@useDb true
+            }
+
+            return@useDb false
+        }
+
+        @JvmStatic
+        fun createPunishment(
+            user: Int,
+            executor: Int,
+            type: PunishmentType,
+            reason: String,
+            endTime: Timestamp,
+            perma: Boolean
+        ) = useDb {
+            new {
+                this.userId = user
+                this.punisher = executor
+                this.type = type
+                this.startTime = Timestamp.from(Instant.now())
+                this.endTime = endTime
+                this.perma = perma
+                this.reason = reason
+            }
+        }
+    }
+
+    var userId by PunishmentTable.userId.transform({ EntityID(it, SteamwarUserTable) }, { it.value })
+        private set
+    var punisher by PunishmentTable.punisher.transform({ EntityID(it, SteamwarUserTable) }, { it.value })
+        private set
+    var type by PunishmentTable.type
+        private set
+    var startTime by PunishmentTable.startTime.transform({ it.toInstant() }, { Timestamp.from(it) })
+        private set
+    var endTime by PunishmentTable.endTime.transform({ it.toInstant() }, { Timestamp.from(it) })
+        private set
+    var perma by PunishmentTable.perma
+        private set
+    var reason by PunishmentTable.reason
+        private set
+
+    fun isPerma() = perma
+
+    fun isCurrent() = perma || endTime.after(Date())
+
+    enum class PunishmentType(
+        val teamMessage: String?,
+        val playerMessagePerma: String?,
+        val playerMessageUntil: String?,
+        val usageNotPunished: String?,
+        val unpunishmentMessage: String?,
+        val userPerm: UserPerm,
+        val multi: Boolean = false
+    ) {
+        Ban("BAN_TEAM", "BAN_PERMA", "BAN_UNTIL", "UNBAN_ERROR", "UNBAN", UserPerm.TEAM),
+        Mute("MUTE_TEAM", "MUTE_PERMA", "MUTE_UNTIL", "UNMUTE_ERROR", "UNMUTE", UserPerm.TEAM),
+        NoSchemReceiving(
+            "NOSCHEMRECEIVING_TEAM",
+            "NOSCHEMRECEIVING_PERMA",
+            "NOSCHEMRECEIVING_UNTIL",
+            "UNNOSCHEMRECEIVING_ERROR",
+            "UNNOSCHEMRECEIVING",
+            UserPerm.MODERATION
+        ),
+        NoSchemSharing(
+            "NOSCHEMSHARING_TEAM",
+            "NOSCHEMSHARING_PERMA",
+            "NOSCHEMSHARING_UNTIL",
+            "UNNOSCHEMSHARING_ERROR",
+            "UNNOSCHEMSHARING",
+            UserPerm.MODERATION
+        ),
+        NoSchemSubmitting(
+            "NOSCHEMSUBMITTING_TEAM",
+            "NOSCHEMSUBMITTING_PERMA",
+            "NOSCHEMSUBMITTING_UNTIL",
+            "UNNOSCHEMSUBMITTING_ERROR",
+            "UNNOSCHEMSUBMITTING",
+            UserPerm.TEAM
+        ),
+        NoDevServer(
+            "NODEVSERVER_TEAM",
+            "NODEVSERVER_PERMA",
+            "NODEVSERVER_UNTIL",
+            "UNNODEVSERVER_ERROR",
+            "UNNODEVSERVER",
+            UserPerm.PREFIX_DEVELOPER
+        ),
+        NoFightServer(
+            "NOFIGHTSERVER_TEAM",
+            "NOFIGHTSERVER_PERMA",
+            "NOFIGHTSERVER_UNTIL",
+            "UNNOFIGHTSERVER_ERROR",
+            "UNNOFIGHTSERVER",
+            UserPerm.MODERATION
+        ),
+        NoTeamServer(
+            "NOTEAMSERVER_TEAM",
+            "NOTEAMSERVER_PERMA",
+            "NOTEAMSERVER_UNTIL",
+            "UNNOTEAMSERVER_ERROR",
+            "UNNOTEAMSERVER",
+            UserPerm.MODERATION
+        ),
+        Note("NOTE_TEAM", null, null, null, null, UserPerm.TEAM, true);
+
+        fun isMulti() = multi
+    }
+}

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

@@ -1,56 +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.sql;
-
-import de.steamwar.sql.internal.Field;
-import de.steamwar.sql.internal.SelectStatement;
-import de.steamwar.sql.internal.Statement;
-import de.steamwar.sql.internal.Table;
-import lombok.AllArgsConstructor;
-
-import java.util.Set;
-import java.util.stream.Collectors;
-
-@AllArgsConstructor
-public class Referee {
-
-    private static final Table<Referee> table = new Table<>(Referee.class);
-    private static final SelectStatement<Referee> byEvent = table.selectFields("eventID");
-
-    private static final Statement insert = table.insertAll();
-    private static final Statement delete = table.delete("eventReferee");
-
-    public static void add(int eventID, int userID) {
-        insert.update(eventID, userID);
-    }
-
-    public static void remove(int eventID, int userID) {
-        delete.update(eventID, userID);
-    }
-
-    public static Set<Integer> get(int eventID) {
-        return byEvent.listSelect(eventID).stream().map(referee -> referee.userID).collect(Collectors.toSet());
-    }
-
-    @Field(keys = {"eventReferee"})
-    private final int eventID;
-    @Field(keys = {"eventReferee"})
-    private final int userID;
-}

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

@@ -0,0 +1,66 @@
+/*
+ *   This file is a part of the SteamWar software.
+ *
+ *   Copyright (C) 2025 SteamWar.de-Serverteam
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU Affero General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU Affero General Public License for more details.
+ *
+ *   You should have received a copy of the GNU Affero General Public License
+ *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package de.steamwar.sql
+
+import de.steamwar.sql.internal.useDb
+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
+import org.jetbrains.exposed.v1.core.dao.id.EntityID
+import org.jetbrains.exposed.v1.core.eq
+import org.jetbrains.exposed.v1.dao.CompositeEntity
+import org.jetbrains.exposed.v1.dao.CompositeEntityClass
+
+object RefereeTable: CompositeIdTable("Referee") {
+    val eventId = reference("EventId", EventTable)
+    val userId = reference("UserId", SteamwarUserTable)
+
+    override val primaryKey = PrimaryKey(eventId, userId)
+
+    init {
+        addIdColumn(eventId)
+        addIdColumn(userId)
+    }
+}
+
+class Referee(id: EntityID<CompositeID>): CompositeEntity(id) {
+    companion object: CompositeEntityClass<Referee>(RefereeTable) {
+        @JvmStatic
+        fun add(eventId: Int, userId: Int) = useDb {
+            new {
+                this.eventID = eventId
+                this.userID = userId
+            }
+        }
+
+        @JvmStatic
+        fun remove(eventId: Int, userId: Int) = useDb {
+            find { (RefereeTable.eventId eq eventId) and (RefereeTable.userId eq userId) }.firstOrNull()?.delete()
+        }
+
+        @JvmStatic
+        fun get(event: Int) = useDb {
+            find { RefereeTable.eventId eq event }.map { it.userID }.toSet()
+        }
+    }
+
+    var eventID by RefereeTable.eventId.transform({ EntityID(it, EventTable) }, { it.value })
+    var userID by RefereeTable.userId.transform({ EntityID(it, SteamwarUserTable) }, { it.value })
+}

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

@@ -22,6 +22,8 @@ package de.steamwar.sql;
 import de.steamwar.ImplementationProvider;
 
 import java.io.File;
+import java.util.Collections;
+import java.util.List;
 
 public interface SQLWrapper<M> {
     SQLWrapper<?> impl = ImplementationProvider.getImpl("de.steamwar.sql.SQLWrapperImpl");
@@ -30,6 +32,10 @@ public interface SQLWrapper<M> {
 
     GameModeConfig<M, String> loadGameModeConfig(File file);
 
+    default List<M> getMaterialWithGreaterBlastResistance(double maxBlastResistance) {
+        return Collections.emptyList();
+    }
+
     default void processSchematicType(GameModeConfig<?, String> gameModeConfig) {
     }
 

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

@@ -1,68 +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.sql;
-
-import de.steamwar.sql.internal.Field;
-import de.steamwar.sql.internal.Statement;
-import de.steamwar.sql.internal.Table;
-import lombok.AllArgsConstructor;
-
-import java.io.File;
-import java.sql.Timestamp;
-
-@AllArgsConstructor
-public class SWException {
-
-    public static void init() {
-        // force class initialialisation
-    }
-
-    private static final String CWD = System.getProperty("user.dir");
-    private static final String SERVER_NAME = new File(CWD).getName();
-
-    private static final Table<SWException> table = new Table<>(SWException.class, "Exception");
-    private static final Statement insert = table.insertFields(true, "server", "message", "stacktrace");
-
-    @Field(keys = {Table.PRIMARY}, autoincrement = true)
-    private final int id;
-    @Field(def = "CURRENT_TIMESTAMP")
-    private final Timestamp time;
-    @Field
-    private final String server;
-    @Field
-    private final String message;
-    @Field
-    private final String stacktrace;
-
-    public static void log(String message, String stacktrace){
-        insert.update(SERVER_NAME, generateMessage(message), stacktrace);
-    }
-
-    public static int logGetId(String message, String stacktrace) {
-        return insert.insertGetKey(SERVER_NAME, generateMessage(message), stacktrace);
-    }
-
-    private static String generateMessage(String message) {
-        StringBuilder msgBuilder = new StringBuilder(message);
-        SQLWrapper.impl.additionalExceptionMetadata(msgBuilder);
-        msgBuilder.append("\nCWD: ").append(CWD);
-        return msgBuilder.toString();
-    }
-}

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

@@ -0,0 +1,72 @@
+/*
+ *   This file is a part of the SteamWar software.
+ *
+ *   Copyright (C) 2025 SteamWar.de-Serverteam
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU Affero General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU Affero General Public License for more details.
+ *
+ *   You should have received a copy of the GNU Affero General Public License
+ *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package de.steamwar.sql
+
+import de.steamwar.sql.internal.useDb
+import org.jetbrains.exposed.v1.core.dao.id.IntIdTable
+import org.jetbrains.exposed.v1.javatime.CurrentTimestamp
+import org.jetbrains.exposed.v1.javatime.timestamp
+import org.jetbrains.exposed.v1.jdbc.insert
+import org.jetbrains.exposed.v1.jdbc.insertAndGetId
+import java.io.File
+
+object ExceptionTable: IntIdTable("Exception") {
+    val time = timestamp("Time").defaultExpression(CurrentTimestamp)
+    val server = text("Server")
+    val message = text("Message")
+    val stackTrace = text("StackTrace")
+}
+
+class SWException {
+    companion object {
+        val cwd = System.getProperty("user.dir")
+        val serverName = File(cwd).name
+
+        @JvmStatic
+        fun init() = Unit
+
+        @JvmStatic
+        fun log(message: String, stacktrace: String) = useDb {
+            ExceptionTable.insert {
+                it[ExceptionTable.server] = serverName
+                it[ExceptionTable.message] = generateMessage(message)
+                it[ExceptionTable.stackTrace] = stacktrace
+            }
+
+            Unit
+        }
+
+        @JvmStatic
+        fun logGetId(message: String, stacktrace: String) = useDb {
+            ExceptionTable.insertAndGetId {
+                it[ExceptionTable.server] = serverName
+                it[ExceptionTable.message] = generateMessage(message)
+                it[ExceptionTable.stackTrace] = stacktrace
+            }.value
+        }
+
+        fun generateMessage(message: String): String {
+            val msgBuilder = StringBuilder(message)
+            SQLWrapper.impl.additionalExceptionMetadata(msgBuilder)
+            msgBuilder.append("\nCWD: ").append(cwd)
+            return msgBuilder.toString()
+        }
+    }
+}

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

@@ -1,56 +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.sql;
-
-import de.steamwar.sql.internal.Field;
-import de.steamwar.sql.internal.SelectStatement;
-import de.steamwar.sql.internal.Statement;
-import de.steamwar.sql.internal.Table;
-import lombok.AllArgsConstructor;
-
-@AllArgsConstructor
-public class SchemElo {
-    private static final int ELO_DEFAULT = 1000;
-
-    private static final Table<SchemElo> table = new Table<>(SchemElo.class);
-    private static final SelectStatement<SchemElo> select = table.select(Table.PRIMARY);
-    private static final Statement setElo = table.insertAll();
-
-    public static int getElo(SchematicNode node, int season) {
-        SchemElo elo = select.select(node, season);
-        return elo != null ? elo.elo : 0;
-    }
-
-    public static int getCurrentElo(int schemID) {
-        SchemElo elo = select.select(schemID, Season.getSeason());
-        return elo != null ? elo.elo : ELO_DEFAULT;
-    }
-
-    public static void setElo(int schemID, int elo) {
-        setElo.update(schemID, elo, Season.getSeason());
-    }
-
-    @Field(keys = {Table.PRIMARY})
-    private final int schemId;
-    @Field
-    private final int elo;
-    @Field(keys = {Table.PRIMARY})
-    private final int season;
-}

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

@@ -0,0 +1,74 @@
+/*
+ *   This file is a part of the SteamWar software.
+ *
+ *   Copyright (C) 2025 SteamWar.de-Serverteam
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU Affero General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU Affero General Public License for more details.
+ *
+ *   You should have received a copy of the GNU Affero General Public License
+ *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package de.steamwar.sql
+
+import de.steamwar.sql.internal.useDb
+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
+import org.jetbrains.exposed.v1.core.dao.id.EntityID
+import org.jetbrains.exposed.v1.core.eq
+import org.jetbrains.exposed.v1.dao.CompositeEntity
+import org.jetbrains.exposed.v1.dao.CompositeEntityClass
+import org.jetbrains.exposed.v1.jdbc.insertIgnore
+
+object SchemEloTable: CompositeIdTable("SchemElo") {
+    val schemId = reference("SchemId", SchematicNodeTable)
+    val season = integer("Season").entityId()
+    val elo = integer("Elo")
+
+    override val primaryKey = PrimaryKey(schemId, season)
+
+    init {
+        addIdColumn(schemId)
+    }
+}
+
+class SchemElo(id: EntityID<CompositeID>): CompositeEntity(id) {
+    companion object: CompositeEntityClass<SchemElo>(SchemEloTable) {
+        @JvmStatic
+        fun getElo(node: SchematicNode, season: Int, defaultElo: Int = 0) = useDb {
+            find { (SchemEloTable.schemId eq node.id) and (SchemEloTable.season eq season) }.firstOrNull()?.elo ?: defaultElo
+        }
+
+        @JvmStatic
+        fun getCurrentElo(schemId: Int) = getElo(SchematicNode.byId(schemId)!!, Season.getSeason())
+
+        @JvmStatic
+        fun setElo(node: Int, elo: Int) = useDb {
+            findByIdAndUpdate(CompositeID {
+                it[SchemEloTable.schemId] = node
+                it[SchemEloTable.season] = Season.getSeason()
+            }) {
+                it.elo = elo
+            } ?: SchemEloTable.insertIgnore {
+                it[SchemEloTable.schemId] = node
+                it[SchemEloTable.season] = Season.getSeason()
+                it[SchemEloTable.elo] = elo
+            }
+
+            return@useDb
+        }
+    }
+
+    var node by SchemEloTable.schemId
+    var season by SchemEloTable.season
+    var elo by SchemEloTable.elo
+}

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

@@ -1,634 +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.sql;
-
-import de.steamwar.sql.internal.*;
-import lombok.Getter;
-
-import java.sql.Timestamp;
-import java.time.Instant;
-import java.util.*;
-import java.util.function.Predicate;
-
-public class SchematicNode {
-
-    static {
-        SchematicType.Normal.name(); // Ensure SchematicType is loaded.
-        new SqlTypeMapper<>(SchematicNode.class, null, (rs, identifier) -> {
-            throw new SecurityException("SchematicNode cannot be used as type (recursive select)");
-        }, (st, index, value) -> st.setInt(index, value.nodeId));
-    }
-
-    private static final Map<Integer, Map<String, List<String>>> TAB_CACHE = new HashMap<>();
-
-    public static void clear() {
-        TAB_CACHE.clear();
-    }
-
-    private static final String nodeSelector = "SELECT NodeId, NodeOwner, NodeOwner AS EffectiveOwner, NodeName, ParentNode, LastUpdate, NodeItem, NodeType, NodeRank, Config FROM SchematicNode ";
-
-    private static final Table<SchematicNode> table = new Table<>(SchematicNode.class);
-    private static final Statement create = table.insertFields(true, "NodeOwner", "NodeName", "ParentNode", "NodeItem",
-            "NodeType");
-    private static final Statement update = table.update(Table.PRIMARY, "NodeName", "ParentNode", "NodeItem",
-            "NodeType", "NodeRank", "Config");
-    private static final Statement delete = table.delete(Table.PRIMARY);
-
-    private static final SelectStatement<SchematicNode> byId = new SelectStatement<>(table,
-            nodeSelector + "WHERE NodeId = ?");
-    private static final SelectStatement<SchematicNode> byOwnerNameParent = new SelectStatement<>(table,
-            nodeSelector + "WHERE NodeOwner = ? AND NodeName = ? AND ParentNode " + Statement.NULL_SAFE_EQUALS + "?");
-    private static final SelectStatement<SchematicNode> byParent = new SelectStatement<>(table,
-            nodeSelector + "WHERE ParentNode" + Statement.NULL_SAFE_EQUALS + "? ORDER BY NodeName");
-    private static final SelectStatement<SchematicNode> dirsByParent = new SelectStatement<>(table, nodeSelector
-            + "WHERE ParentNode" + Statement.NULL_SAFE_EQUALS + "? AND NodeType is NULL ORDER BY NodeName");
-    private static final SelectStatement<SchematicNode> byOwnerType = new SelectStatement<>(table,
-            nodeSelector + "WHERE NodeOwner = ? AND NodeType = ? ORDER BY NodeName");
-    private static final SelectStatement<SchematicNode> byType = new SelectStatement<>(table,
-            nodeSelector + "WHERE NodeType = ? ORDER BY NodeName");
-    private static final SelectStatement<SchematicNode> all = new SelectStatement<>(table,
-            "WITH RECURSIVE Nodes AS (SELECT NodeId, ParentId as ParentNode FROM NodeMember WHERE UserId = ? UNION SELECT NodeId, ParentNode FROM SchematicNode WHERE NodeOwner = ?), RSN AS ( SELECT NodeId, ParentNode FROM Nodes UNION SELECT SN.NodeId, SN.ParentNode FROM SchematicNode SN, RSN WHERE SN.ParentNode = RSN.NodeId ) SELECT SN.*, ? AS EffectiveOwner FROM RSN INNER JOIN SchematicNode SN ON RSN.NodeId = SN.NodeId");
-    private static final SelectStatement<SchematicNode> list = new SelectStatement<>(table,
-            "SELECT SchematicNode.NodeId, NodeOwner, ? AS EffectiveOwner, NodeName, NM.ParentId AS ParentNode, LastUpdate, NodeItem, NodeType, NodeRank, Config FROM SchematicNode INNER JOIN NodeMember NM on SchematicNode.NodeId = NM.NodeId WHERE NM.ParentId "
-                    + Statement.NULL_SAFE_EQUALS
-                    + "? AND NM.UserId = ? UNION ALL SELECT SchematicNode.NodeId, NodeOwner, ? AS EffectiveOwner, NodeName, ParentNode, LastUpdate, NodeItem, NodeType, NodeRank, Config FROM SchematicNode WHERE (? IS NULL AND ParentNode IS NULL AND NodeOwner = ?) OR (? IS NOT NULL AND ParentNode = ?) ORDER BY NodeName");
-    private static final SelectStatement<SchematicNode> byParentName = new SelectStatement<>(table,
-            "SELECT SchematicNode.NodeId, NodeOwner, ? AS EffectiveOwner, NodeName, NM.ParentId AS ParentNode, LastUpdate, NodeItem, NodeType, NodeRank, Config FROM SchematicNode INNER JOIN NodeMember NM on SchematicNode.NodeId = NM.NodeId WHERE NM.ParentId "
-                    + Statement.NULL_SAFE_EQUALS
-                    + "? AND NM.UserId = ? AND SchematicNode.NodeName = ? UNION ALL SELECT SchematicNode.NodeId, NodeOwner, ? AS EffectiveOwner, NodeName, ParentNode, LastUpdate, NodeItem, NodeType, NodeRank, Config FROM SchematicNode WHERE ((? IS NULL AND ParentNode IS NULL AND NodeOwner = ?) OR (? IS NOT NULL AND ParentNode = ?)) AND NodeName = ?");
-    private static final SelectStatement<SchematicNode> schematicAccessibleForUser = new SelectStatement<>(table,
-            "WITH RECURSIVE Nodes AS (SELECT NodeId, ParentId as ParentNode FROM NodeMember WHERE UserId = ? UNION SELECT NodeId, ParentNode FROM SchematicNode WHERE NodeOwner = ?), RSN AS ( SELECT NodeId, ParentNode FROM Nodes UNION SELECT SN.NodeId, SN.ParentNode FROM SchematicNode SN, RSN WHERE SN.ParentNode = RSN.NodeId ) SELECT SN.*, ? AS EffectiveOwner FROM RSN INNER JOIN SchematicNode SN ON RSN.NodeId = SN.NodeId WHERE NodeId = ?");
-    private static final SelectStatement<SchematicNode> accessibleByUserTypeInParent = new SelectStatement<>(table,
-            "WITH RECURSIVE RSASN AS(WITH RECURSIVE RSAN AS (WITH RSANH AS (WITH RECURSIVE RSA AS (SELECT SN.NodeId, NM.ParentId FROM SchematicNode SN LEFT JOIN NodeMember NM on SN.NodeId = NM.NodeId WHERE NM.UserId = ? UNION SELECT SN.NodeId, SN.ParentNode FROM SchematicNode SN INNER JOIN RSA ON RSA.NodeId = SN.ParentNode) SELECT * FROM RSA UNION SELECT NodeId, ParentNode FROM SchematicNode WHERE NodeOwner = ?) SELECT * FROM RSANH UNION SELECT SN.NodeId, SN.ParentNode FROM RSANH JOIN SchematicNode SN ON SN.ParentNode = RSANH.NodeId) SELECT RSAN.NodeId, RSAN.ParentId FROM RSAN JOIN SchematicNode SN ON SN.NodeId = RSAN.NodeId WHERE NodeType = ? UNION SELECT SN.NodeId, SN.ParentNode FROM SchematicNode SN JOIN RSASN ON SN.NodeId = RSASN.ParentId) SELECT SN.*, ? as EffectiveOwner, RSASN.ParentId AS ParentNode FROM RSASN JOIN SchematicNode SN ON SN.NodeId = RSASN.NodeId WHERE RSASN.ParentId"
-                    + Statement.NULL_SAFE_EQUALS + "? ORDER BY NodeName");
-    private static final SelectStatement<SchematicNode> accessibleByUserType = new SelectStatement<>(table,
-            "WITH RECURSIVE Nodes AS (SELECT NodeId, ParentId as ParentNode FROM NodeMember WHERE UserId = ? UNION SELECT NodeId, ParentNode FROM SchematicNode WHERE NodeOwner = ?), RSN AS ( SELECT NodeId, ParentNode FROM Nodes UNION SELECT SN.NodeId, SN.ParentNode FROM SchematicNode SN, RSN WHERE SN.ParentNode = RSN.NodeId ) SELECT SN.*, ? AS EffectiveOwner FROM RSN INNER JOIN SchematicNode SN ON RSN.NodeId = SN.NodeId WHERE NodeType = ?");
-    private static final SelectStatement<SchematicNode> byIdAndUser = new SelectStatement<>(table,
-            "SELECT NodeId, NodeOwner, ? AS EffectiveOwner, NodeName, ParentNode, LastUpdate, NodeItem, NodeType, NodeRank, Config FROM SchematicNode WHERE NodeId = ?");
-    private static final SelectStatement<SchematicNode> allParentsOfNode = new SelectStatement<>(table,
-            "WITH RECURSIVE R AS (SELECT NodeId, ParentNode FROM EffectiveSchematicNode WHERE NodeId = ? AND EffectiveOwner = ? UNION SELECT E.NodeId, E.ParentNode FROM R, EffectiveSchematicNode E WHERE R.ParentNode = E.NodeId AND E.EffectiveOwner = ?) SELECT SN.NodeId, SN.NodeOwner, ? AS EffectiveOwner, SN.NodeName, R.ParentNode, SN.LastUpdate, SN.NodeItem, SN.NodeType, SN.NodeRank, SN.Config FROM R INNER JOIN SchematicNode SN ON SN.NodeId = R.NodeId");
-
-    static {
-        NodeMember.init();
-    }
-
-    @Field(keys = { Table.PRIMARY }, autoincrement = true)
-    private final int nodeId;
-    @Field(keys = { "OwnerNameParent" })
-    private final int nodeOwner;
-    @Field(def = "0")
-    @Getter
-    private final int effectiveOwner;
-    @Field(keys = { "OwnerNameParent" })
-    private String nodeName;
-    @Field(keys = { "OwnerNameParent" }, nullable = true)
-    private Integer parentNode;
-    @Field(def = "CURRENT_TIMESTAMP")
-    private Timestamp lastUpdate;
-    @Field(def = "''")
-    private String nodeItem;
-    @Field(def = "'normal'", nullable = true)
-    private SchematicType nodeType;
-    @Field(def = "0")
-    private int nodeRank;
-    @Field
-    private int config;
-
-    private String brCache;
-
-    public SchematicNode(
-            int nodeId,
-            int nodeOwner,
-            int effectiveOwner,
-            String nodeName,
-            Integer parentNode,
-            Timestamp lastUpdate,
-            String nodeItem,
-            SchematicType nodeType,
-            int nodeRank,
-            int config) {
-        this.nodeId = nodeId;
-        this.nodeOwner = nodeOwner;
-        this.effectiveOwner = effectiveOwner;
-        this.nodeName = nodeName;
-        this.parentNode = parentNode;
-        this.nodeItem = nodeItem;
-        this.nodeType = nodeType;
-        this.lastUpdate = lastUpdate;
-        this.nodeRank = nodeRank;
-        this.config = config;
-    }
-
-    public static List<SchematicNode> getAll(SteamwarUser user) {
-        return all.listSelect(user, user, user);
-    }
-
-    public static Map<Integer, List<SchematicNode>> getAllMap(SteamwarUser user) {
-        return map(getAll(user));
-    }
-
-    public static List<SchematicNode> list(SteamwarUser user, Integer schematicId) {
-        return list.listSelect(user, schematicId, user, user, schematicId, user, schematicId, schematicId);
-    }
-
-    public static SchematicNode byParentName(SteamwarUser user, Integer schematicId, String name) {
-        return byParentName.select(user, schematicId, user, name, user, schematicId, user, schematicId, schematicId,
-                name);
-    }
-
-    public static List<SchematicNode> accessibleByUserType(SteamwarUser user, SchematicType type) {
-        return accessibleByUserType.listSelect(user, user, user, type);
-    }
-
-    public static Map<Integer, List<SchematicNode>> accessibleByUserTypeMap(SteamwarUser user, SchematicType type) {
-        return map(accessibleByUserType(user, type));
-    }
-
-    public static boolean schematicAccessibleForUser(SteamwarUser user, Integer schematicId) {
-        return schematicAccessibleForUser.select(user, user, user, schematicId) != null;
-    }
-
-    public static List<SchematicNode> accessibleByUserTypeParent(SteamwarUser user, SchematicType type,
-            Integer parentId) {
-        return accessibleByUserTypeInParent.listSelect(user, user, type, user, parentId);
-    }
-
-    public static SchematicNode byIdAndUser(SteamwarUser user, Integer id) {
-        return byIdAndUser.select(user, id);
-    }
-
-    public static List<SchematicNode> parentsOfNode(SteamwarUser user, Integer id) {
-        return allParentsOfNode.listSelect(id, user, user, user);
-    }
-
-    private static Map<Integer, List<SchematicNode>> map(List<SchematicNode> in) {
-        Map<Integer, List<SchematicNode>> map = new HashMap<>();
-        for (SchematicNode effectiveSchematicNode : in) {
-            map.computeIfAbsent(effectiveSchematicNode.getOptionalParent().orElse(0), k -> new ArrayList<>())
-                    .add(effectiveSchematicNode);
-        }
-        return map;
-    }
-
-    public static SchematicNode createSchematic(int owner, String name, Integer parent) {
-        return createSchematicNode(owner, name, parent, SchematicType.Normal.toDB(), "");
-    }
-
-    public static SchematicNode createSchematicDirectory(int owner, String name, Integer parent) {
-        return createSchematicNode(owner, name, parent, null, "");
-    }
-
-    public static SchematicNode createSchematicNode(int owner, String name, Integer parent, String type, String item) {
-        if (parent != null && parent == 0)
-            parent = null;
-        int nodeId = create.insertGetKey(owner, name, parent, item, type);
-        return getSchematicNode(nodeId);
-    }
-
-    public static SchematicNode getSchematicNode(int owner, String name, SchematicNode parent) {
-        return getSchematicNode(owner, name, parent.getId());
-    }
-
-    public static SchematicNode getSchematicNode(int owner, String name, Integer parent) {
-        return byOwnerNameParent.select(owner, name, parent);
-    }
-
-    public static List<SchematicNode> getSchematicNodeInNode(SchematicNode parent) {
-        return getSchematicNodeInNode(parent.getId());
-    }
-
-    public static List<SchematicNode> getSchematicNodeInNode(Integer parent) {
-        return byParent.listSelect(parent);
-    }
-
-    public static List<SchematicNode> getSchematicDirectoryInNode(Integer parent) {
-        return dirsByParent.listSelect(parent);
-    }
-
-    @Deprecated
-    public static SchematicNode getSchematicDirectory(String name, SchematicNode parent) {
-        return getSchematicNode(name, parent.getId());
-    }
-
-    @Deprecated
-    public static SchematicNode getSchematicDirectory(String name, Integer parent) {
-        return getSchematicNode(name, parent);
-    }
-
-    public static SchematicNode getSchematicNode(String name, Integer parent) {
-        return byParentName.select(name, parent);
-    }
-
-    public static SchematicNode getSchematicNode(int id) {
-        return byId.select(id);
-    }
-
-    public static List<SchematicNode> getAccessibleSchematicsOfTypeInParent(int owner, String schemType,
-            Integer parent) {
-        return accessibleByUserTypeParent(SteamwarUser.get(owner), SchematicType.fromDB(schemType), parent);
-    }
-
-    public static List<SchematicNode> getAllAccessibleSchematicsOfType(int user, String schemType) {
-        return accessibleByUserType(SteamwarUser.get(user), SchematicType.fromDB(schemType));
-    }
-
-    public static List<SchematicNode> getAllSchematicsOfType(int owner, String schemType) {
-        return byOwnerType.listSelect(owner, schemType);
-    }
-
-    @Deprecated
-    public static List<SchematicNode> getAllSchematicsOfType(String schemType) {
-        return byType.listSelect(schemType);
-    }
-
-    public static List<SchematicNode> getAllSchematicsOfType(SchematicType schemType) {
-        return byType.listSelect(schemType);
-    }
-
-    public static List<SchematicNode> deepGet(Integer parent, Predicate<SchematicNode> filter) {
-        List<SchematicNode> finalList = new ArrayList<>();
-        List<SchematicNode> nodes = SchematicNode.getSchematicNodeInNode(parent);
-        nodes.forEach(node -> {
-            if (node.isDir()) {
-                finalList.addAll(deepGet(node.getId(), filter));
-            } else {
-                if (filter.test(node))
-                    finalList.add(node);
-            }
-        });
-        return finalList;
-    }
-
-    @Deprecated
-    public static List<SchematicNode> getSchematicsAccessibleByUser(int user, Integer parent) {
-        return list(SteamwarUser.get(user), parent);
-    }
-
-    @Deprecated
-    public static List<SchematicNode> getAllSchematicsAccessibleByUser(int user) {
-        return getAll(SteamwarUser.get(user));
-    }
-
-    public static List<SchematicNode> getAllParentsOfNode(SchematicNode node) {
-        return getAllParentsOfNode(node.getId());
-    }
-
-    public static List<SchematicNode> getAllParentsOfNode(int node) {
-        return allParentsOfNode.listSelect(node);
-    }
-
-    public static SchematicNode getNodeFromPath(SteamwarUser user, String s) {
-        if (s.startsWith("/")) {
-            s = s.substring(1);
-        }
-        if (s.endsWith("/")) {
-            s = s.substring(0, s.length() - 1);
-        }
-        if (s.isEmpty()) {
-            return null;
-        }
-        if (s.contains("/")) {
-            String[] layers = s.split("/");
-            Optional<SchematicNode> currentNode = Optional
-                    .ofNullable(SchematicNode.byParentName(user, null, layers[0]));
-            for (int i = 1; i < layers.length; i++) {
-                int finalI = i;
-                Optional<SchematicNode> node = currentNode.map(effectiveSchematicNode -> SchematicNode
-                        .byParentName(user, effectiveSchematicNode.getId(), layers[finalI]));
-                if (!node.isPresent()) {
-                    return null;
-                } else {
-                    currentNode = node;
-                    if (!currentNode.map(SchematicNode::isDir).orElse(false) && i != layers.length - 1) {
-                        return null;
-                    }
-                }
-            }
-            return currentNode.orElse(null);
-        } else {
-            return SchematicNode.byParentName(user, null, s);
-        }
-    }
-
-    public static List<SchematicNode> filterSchems(int user, Predicate<SchematicNode> filter) {
-        List<SchematicNode> finalList = new ArrayList<>();
-        List<SchematicNode> nodes = getSchematicsAccessibleByUser(user, null);
-        nodes.forEach(node -> {
-            if (node.isDir()) {
-                finalList.addAll(deepGet(node.getId(), filter));
-            } else {
-                if (filter.test(node))
-                    finalList.add(node);
-            }
-        });
-        return finalList;
-    }
-
-    public int getId() {
-        return nodeId;
-    }
-
-    public int getOwner() {
-        return nodeOwner;
-    }
-
-    public String getName() {
-        return nodeName;
-    }
-
-    public void setName(String name) {
-        this.nodeName = name;
-        updateDB();
-    }
-
-    public Integer getParent() {
-        return parentNode;
-    }
-
-    public Optional<Integer> getOptionalParent() {
-        return Optional.ofNullable(parentNode);
-    }
-
-    public void setParent(Integer parent) {
-        this.parentNode = parent;
-        updateDB();
-    }
-
-    public String getItem() {
-        if (nodeItem.isEmpty()) {
-            return isDir() ? "CHEST" : "CAULDRON_ITEM";
-        }
-        return nodeItem;
-    }
-
-    public void setItem(String item) {
-        this.nodeItem = item;
-        updateDB();
-    }
-
-    @Deprecated
-    public String getType() {
-        return nodeType.name();
-    }
-
-    @Deprecated
-    public void setType(String type) {
-        if (isDir())
-            throw new SecurityException("Node is Directory");
-        this.nodeType = SchematicType.fromDB(type);
-        updateDB();
-    }
-
-    public boolean isDir() {
-        return nodeType == null;
-    }
-
-    public String getFileEnding() {
-        if (isDir())
-            throw new SecurityException("Node is Directory");
-        return NodeData.getLatest(this).getNodeFormat().getFileEnding();
-    }
-
-    public int getRank() {
-        if (isDir())
-            throw new SecurityException("Node is Directory");
-        return nodeRank;
-    }
-
-    @Deprecated
-    public int getRankUnsafe() {
-        return nodeRank;
-    }
-
-    public void setRank(int rank) {
-        if (isDir())
-            throw new SecurityException("Node is Directory");
-        this.nodeRank = rank;
-    }
-
-    public SchematicType getSchemtype() {
-        if (isDir())
-            throw new SecurityException("Is Directory");
-        return nodeType;
-    }
-
-    public void setSchemtype(SchematicType type) {
-        if (isDir())
-            throw new SecurityException("Is Directory");
-        this.nodeType = type;
-        updateDB();
-    }
-
-    public boolean replaceColor() {
-        return getConfig(ConfigFlags.REPLACE_COLOR);
-    }
-
-    public void setReplaceColor(boolean replaceColor) {
-        if (isDir())
-            throw new SecurityException("Is Directory");
-        setConfig(ConfigFlags.REPLACE_COLOR, replaceColor);
-    }
-
-    public boolean allowReplay() {
-        return getConfig(ConfigFlags.ALLOW_REPLAY);
-    }
-
-    public void setAllowReplay(boolean allowReplay) {
-        if (isDir())
-            throw new SecurityException("Is Directory");
-        setConfig(ConfigFlags.ALLOW_REPLAY, allowReplay);
-    }
-
-    public boolean isPrepared() {
-        return getConfig(ConfigFlags.IS_PREPARED);
-    }
-
-    public void setPrepared(boolean prepared) {
-        if (isDir())
-            throw new SecurityException("Is Directory");
-        setConfig(ConfigFlags.IS_PREPARED, prepared);
-    }
-
-    public boolean getConfig(ConfigFlags flag) {
-        return (config & (1 << flag.ordinal())) != 0;
-    }
-
-    public void setConfig(ConfigFlags flag, boolean value) {
-        if (value) {
-            config |= (1 << flag.ordinal());
-        } else {
-            config &= ~(1 << flag.ordinal());
-        }
-        updateDB();
-    }
-
-    public SchematicNode getParentNode() {
-        if (parentNode == null)
-            return null;
-        return SchematicNode.getSchematicNode(parentNode);
-    }
-
-    public int getElo(int season) {
-        return SchemElo.getElo(this, season);
-    }
-
-    public boolean accessibleByUser(SteamwarUser user) {
-        return NodeMember.getNodeMember(nodeId, user) != null;
-    }
-
-    public Set<NodeMember> getMembers() {
-        return NodeMember.getNodeMembers(nodeId);
-    }
-
-    public Timestamp getLastUpdate() {
-        return lastUpdate;
-    }
-
-    private void updateDB() {
-        this.lastUpdate = Timestamp.from(Instant.now());
-        update.update(nodeName, parentNode, nodeItem, nodeType, nodeRank, config, nodeId);
-        TAB_CACHE.clear();
-    }
-
-    public void delete() {
-        delete.update(nodeId);
-    }
-
-    @Override
-    public int hashCode() {
-        return nodeId;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (!(obj instanceof SchematicNode))
-            return false;
-
-        return ((SchematicNode) obj).getId() == nodeId;
-    }
-
-    public String generateBreadcrumbs(SteamwarUser user) {
-        return byIdAndUser(user, nodeId).generateBreadcrumbs();
-    }
-
-    public String generateBreadcrumbs(String split, SteamwarUser user) {
-        return byIdAndUser(user, nodeId).generateBreadcrumbs(split);
-    }
-
-    public String generateBreadcrumbs() {
-        if (brCache == null) {
-            brCache = generateBreadcrumbs("/");
-        }
-        return brCache;
-    }
-
-    public String generateBreadcrumbs(String split) {
-        StringBuilder builder = new StringBuilder(getName());
-        Optional<SchematicNode> currentNode = Optional.of(this);
-        if (currentNode.map(SchematicNode::isDir).orElse(false)) {
-            builder.append(split);
-        }
-        while (currentNode.isPresent()) {
-            currentNode = currentNode
-                    .flatMap(schematicNode -> Optional
-                            .ofNullable(NodeMember.getNodeMember(schematicNode.getId(), effectiveOwner))
-                            .map(NodeMember::getParent).orElse(schematicNode.getOptionalParent()))
-                    .map(SchematicNode::getSchematicNode);
-            currentNode.ifPresent(node -> builder.insert(0, split).insert(0, node.getName()));
-        }
-        return builder.toString();
-    }
-
-    public List<Map.Entry<String, Integer>> generateBreadcrumbsMap(SteamwarUser user) {
-        List<Map.Entry<String, Integer>> map = new ArrayList<>();
-        Optional<SchematicNode> currentNode = Optional.of(this);
-        if (currentNode.map(SchematicNode::isDir).orElse(false)) {
-            map.add(new AbstractMap.SimpleEntry<>(getName(), getId()));
-        }
-        while (currentNode.isPresent()) {
-            currentNode = currentNode
-                    .flatMap(schematicNode -> Optional
-                            .ofNullable(NodeMember.getNodeMember(schematicNode.getId(), effectiveOwner))
-                            .map(NodeMember::getParent).orElse(schematicNode.getOptionalParent()))
-                    .map(SchematicNode::getSchematicNode);
-            currentNode.ifPresent(node -> map.add(0, new AbstractMap.SimpleEntry<>(node.getName(), node.getId())));
-        }
-        return map;
-    }
-
-    private static final List<String> FORBIDDEN_NAMES = Collections.unmodifiableList(Arrays.asList("public"));
-
-    public static boolean invalidSchemName(String[] layers) {
-        for (String layer : layers) {
-            if (layer.isEmpty()) {
-                return true;
-            }
-            if (layer.contains("/") ||
-                    layer.contains("\\") ||
-                    layer.contains("<") ||
-                    layer.contains(">") ||
-                    layer.contains("^") ||
-                    layer.contains("°") ||
-                    layer.contains("'") ||
-                    layer.contains("\"") ||
-                    layer.contains(" ")) {
-                return true;
-            }
-            if (FORBIDDEN_NAMES.contains(layer.toLowerCase())) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    public static List<String> getNodeTabcomplete(SteamwarUser user, String s) {
-        boolean sws = s.startsWith("/");
-        if (sws) {
-            s = s.substring(1);
-        }
-        int index = s.lastIndexOf("/");
-        String cacheKey = index == -1 ? "" : s.substring(0, index);
-        if (TAB_CACHE.containsKey(user.getId()) && TAB_CACHE.get(user.getId()).containsKey(cacheKey)) {
-            return new ArrayList<>(TAB_CACHE.get(user.getId()).get(cacheKey));
-        }
-        List<String> list = new ArrayList<>();
-        if (s.contains("/")) {
-            String preTab = s.substring(0, s.lastIndexOf("/") + 1);
-            SchematicNode pa = SchematicNode.getNodeFromPath(user, preTab);
-            if (pa == null)
-                return new ArrayList<>();
-            List<SchematicNode> nodes = SchematicNode.list(user, pa.getId());
-            String br = pa.generateBreadcrumbs();
-            nodes.forEach(node -> list.add((sws ? "/" : "") + br + node.getName() + (node.isDir() ? "/" : "")));
-        } else {
-            List<SchematicNode> nodes = SchematicNode.list(user, null);
-            nodes.forEach(node -> list.add((sws ? "/" : "") + node.getName() + (node.isDir() ? "/" : "")));
-        }
-        list.remove("//copy");
-        TAB_CACHE.computeIfAbsent(user.getId(), integer -> new HashMap<>()).putIfAbsent(cacheKey, list);
-        return list;
-    }
-
-    public static enum ConfigFlags {
-        REPLACE_COLOR,
-        ALLOW_REPLAY,
-        IS_PREPARED
-    }
-}

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

@@ -0,0 +1,436 @@
+/*
+ *   This file is a part of the SteamWar software.
+ *
+ *   Copyright (C) 2025 SteamWar.de-Serverteam
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU Affero General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU Affero General Public License for more details.
+ *
+ *   You should have received a copy of the GNU Affero General Public License
+ *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package de.steamwar.sql
+
+import de.steamwar.sql.internal.fromSql
+import de.steamwar.sql.internal.useDb
+import org.jetbrains.exposed.v1.core.*
+import org.jetbrains.exposed.v1.core.dao.id.EntityID
+import org.jetbrains.exposed.v1.core.dao.id.IntIdTable
+import org.jetbrains.exposed.v1.dao.IntEntity
+import org.jetbrains.exposed.v1.dao.IntEntityClass
+import org.jetbrains.exposed.v1.javatime.CurrentTimestamp
+import org.jetbrains.exposed.v1.javatime.timestamp
+import org.jetbrains.exposed.v1.jdbc.insertAndGetId
+import java.sql.Timestamp
+import java.util.*
+import java.util.function.Consumer
+
+object SchematicNodeTable : IntIdTable("SchematicNode", "NodeId") {
+    val owner = reference("NodeOwner", SteamwarUserTable)
+    val name = varchar("NodeName", 64)
+    val parent = optReference("ParentNode", SchematicNodeTable)
+    val lastUpdate = timestamp("LastUpdate").defaultExpression(CurrentTimestamp)
+    val item = text("NodeItem")
+    val type = varchar("NodeType", 16).nullable()
+    val config = integer("Config")
+}
+
+class SchematicNode(id: EntityID<Int>) : IntEntity(id) {
+    companion object : IntEntityClass<SchematicNode>(SchematicNodeTable) {
+        private val fieldIndex: Map<Expression<*>, Int> =
+            SchematicNodeTable.columns.mapIndexed { index, column -> column to index }.toMap()
+
+        private val FORBIDDEN_NAMES = listOf("public")
+        private val FORBIDDEN_CHARS = listOf('/', '\\', '<', '>', '^', '°', '\'', '"', ' ')
+
+        val tabCache = mutableMapOf<Int, MutableMap<String, List<String>>>()
+
+        @JvmStatic
+        fun clear() = tabCache.clear()
+
+        private fun List<SchematicNode>.mapToIds(): Map<Int, SchematicNode> = this.associateBy { it.nodeId }
+
+        @JvmStatic
+        fun getAll(user: SteamwarUser) = fromSql(
+            "WITH RECURSIVE Nodes AS (SELECT NodeId, ParentId as ParentNode FROM NodeMember WHERE UserId = ? UNION SELECT NodeId, ParentNode FROM SchematicNode WHERE NodeOwner = ?), RSN AS ( SELECT NodeId, ParentNode FROM Nodes UNION SELECT SN.NodeId, SN.ParentNode FROM SchematicNode SN, RSN WHERE SN.ParentNode = RSN.NodeId ) SELECT SN.* FROM RSN INNER JOIN SchematicNode SN ON RSN.NodeId = SN.NodeId",
+            listOf(
+                IntegerColumnType() to user.getId(),
+                IntegerColumnType() to user.getId()
+            ),
+            fieldIndex
+        )
+
+        @JvmStatic
+        fun getAllMap(user: SteamwarUser) = getAll(user).mapToIds()
+
+        @JvmStatic
+        fun list(user: SteamwarUser, schematicId: Int?) = fromSql(
+            "SELECT SchematicNode.NodeId, NodeOwner, NodeName, NM.ParentId AS ParentNode, LastUpdate, NodeItem, NodeType, NodeRank, Config FROM SchematicNode INNER JOIN NodeMember NM on SchematicNode.NodeId = NM.NodeId WHERE NM.ParentId <=> ? AND NM.UserId = ? UNION ALL SELECT SchematicNode.NodeId, NodeOwner, NodeName, ParentNode, LastUpdate, NodeItem, NodeType, NodeRank, Config FROM SchematicNode WHERE (? IS NULL AND ParentNode IS NULL AND NodeOwner = ?) OR (? IS NOT NULL AND ParentNode = ?) ORDER BY NodeName",
+            listOf(
+                IntegerColumnType() to schematicId,
+                IntegerColumnType() to user.getId(),
+                IntegerColumnType() to schematicId,
+                IntegerColumnType() to user.getId(),
+                IntegerColumnType() to schematicId,
+                IntegerColumnType() to schematicId,
+            ), fieldIndex
+        )
+
+        @JvmStatic
+        fun byParentName(user: SteamwarUser, schematicId: Int?, name: String) = fromSql(
+            "SELECT SchematicNode.NodeId, NodeOwner, NodeName, NM.ParentId AS ParentNode, LastUpdate, NodeItem, NodeType, NodeRank, Config FROM SchematicNode INNER JOIN NodeMember NM on SchematicNode.NodeId = NM.NodeId WHERE NM.ParentId <=> ? AND NM.UserId = ? AND SchematicNode.NodeName = ? UNION ALL SELECT SchematicNode.NodeId, NodeOwner, NodeName, ParentNode, LastUpdate, NodeItem, NodeType, NodeRank, Config FROM SchematicNode WHERE ((? IS NULL AND ParentNode IS NULL AND NodeOwner = ?) OR (? IS NOT NULL AND ParentNode = ?)) AND NodeName = ?",
+            listOf(
+                IntegerColumnType() to schematicId,
+                IntegerColumnType() to user.getId(),
+                VarCharColumnType() to name,
+                IntegerColumnType() to schematicId,
+                IntegerColumnType() to user.getId(),
+                IntegerColumnType() to schematicId,
+                IntegerColumnType() to schematicId,
+                VarCharColumnType() to name,
+            ), fieldIndex
+        ).firstOrNull()
+
+        @JvmStatic
+        fun accessibleByUserType(user: SteamwarUser, type: SchematicType) = fromSql(
+            "WITH RECURSIVE Nodes AS (SELECT NodeId, ParentId as ParentNode FROM NodeMember WHERE UserId = ? UNION SELECT NodeId, ParentNode FROM SchematicNode WHERE NodeOwner = ?), RSN AS ( SELECT NodeId, ParentNode FROM Nodes UNION SELECT SN.NodeId, SN.ParentNode FROM SchematicNode SN, RSN WHERE SN.ParentNode = RSN.NodeId ) SELECT SN.*, ? AS EffectiveOwner FROM RSN INNER JOIN SchematicNode SN ON RSN.NodeId = SN.NodeId WHERE NodeType = ?",
+            listOf(
+                IntegerColumnType() to user.getId(),
+                IntegerColumnType() to user.getId(),
+                IntegerColumnType() to user.getId(),
+                VarCharColumnType() to type.toDB(),
+            ), fieldIndex
+        )
+
+        @JvmStatic
+        fun accessibleByUserTypeMap(user: SteamwarUser, type: SchematicType) =
+            accessibleByUserType(user, type).mapToIds()
+
+        @JvmStatic
+        fun schematicAccessibleForUser(user: SteamwarUser, schematicId: Int?) = fromSql(
+            "WITH RECURSIVE Nodes AS (SELECT NodeId, ParentId as ParentNode FROM NodeMember WHERE UserId = ? UNION SELECT NodeId, ParentNode FROM SchematicNode WHERE NodeOwner = ?), RSN AS ( SELECT NodeId, ParentNode FROM Nodes UNION SELECT SN.NodeId, SN.ParentNode FROM SchematicNode SN, RSN WHERE SN.ParentNode = RSN.NodeId ) SELECT SN.*, ? AS EffectiveOwner FROM RSN INNER JOIN SchematicNode SN ON RSN.NodeId = SN.NodeId WHERE NodeId = ?",
+            listOf(
+                IntegerColumnType() to user.getId(),
+                IntegerColumnType() to user.getId(),
+                IntegerColumnType() to user.getId(),
+                IntegerColumnType() to schematicId,
+            ),
+            fieldIndex
+        ).isNotEmpty()
+
+        @JvmStatic
+        fun accessibleByUserTypeParent(user: SteamwarUser, type: SchematicType, parentId: Int?) = fromSql(
+            "WITH RECURSIVE RSASN AS(WITH RECURSIVE RSAN AS (WITH RSANH AS (WITH RECURSIVE RSA AS (SELECT SN.NodeId, NM.ParentId FROM SchematicNode SN LEFT JOIN NodeMember NM on SN.NodeId = NM.NodeId WHERE NM.UserId = ? UNION SELECT SN.NodeId, SN.ParentNode FROM SchematicNode SN INNER JOIN RSA ON RSA.NodeId = SN.ParentNode) SELECT * FROM RSA UNION SELECT NodeId, ParentNode FROM SchematicNode WHERE NodeOwner = ?) SELECT * FROM RSANH UNION SELECT SN.NodeId, SN.ParentNode FROM RSANH JOIN SchematicNode SN ON SN.ParentNode = RSANH.NodeId) SELECT RSAN.NodeId, RSAN.ParentId FROM RSAN JOIN SchematicNode SN ON SN.NodeId = RSAN.NodeId WHERE NodeType = ? UNION SELECT SN.NodeId, SN.ParentNode FROM SchematicNode SN JOIN RSASN ON SN.NodeId = RSASN.ParentId) SELECT SN.*, ? as EffectiveOwner, RSASN.ParentId AS ParentNode FROM RSASN JOIN SchematicNode SN ON SN.NodeId = RSASN.NodeId WHERE RSASN.ParentId <=> ? ORDER BY NodeName",
+            listOf(
+                IntegerColumnType() to user.getId(),
+                IntegerColumnType() to user.getId(),
+                VarCharColumnType() to type.toDB(),
+                IntegerColumnType() to user.getId(),
+                IntegerColumnType() to parentId,
+            ), fieldIndex
+        )
+
+        @JvmStatic
+        @Deprecated("Use byId")
+        fun byIdAndUser(ignored: SteamwarUser, id: Int) = useDb {
+            findById(id)
+        }
+
+        @JvmStatic
+        fun parentsOfNode(user: SteamwarUser, id: Int) = fromSql(
+            "WITH RECURSIVE R AS (SELECT NodeId, ParentNode FROM EffectiveSchematicNode WHERE NodeId = ? UNION SELECT E.NodeId, E.ParentNode FROM R, EffectiveSchematicNode E WHERE R.ParentNode = E.NodeId AND E.EffectiveOwner = ?) SELECT SN.NodeId, SN.NodeOwner, SN.NodeName, R.ParentNode, SN.LastUpdate, SN.NodeItem, SN.NodeType, SN.NodeRank, SN.Config FROM R INNER JOIN SchematicNode SN ON SN.NodeId = R.NodeId",
+            listOf(
+                IntegerColumnType() to id,
+                IntegerColumnType() to user.getId(),
+                IntegerColumnType() to user.getId(),
+            ), fieldIndex
+        )
+
+        @JvmStatic
+        fun createSchematic(owner: Int, name: String, parent: Int?) = createSchematicNode(
+            owner, name, parent,
+            SchematicType.Normal.toDB(), ""
+        )
+
+        @JvmStatic
+        fun createSchematicDirectory(owner: Int, name: String, parent: Int?) =
+            createSchematicNode(owner, name, parent, null, "")
+
+        @JvmStatic
+        fun createSchematicNode(owner: Int, name: String, parent: Int?, type: String?, item: String) = useDb {
+            val id = SchematicNodeTable.insertAndGetId {
+                it[this.owner] = EntityID(owner, SteamwarUserTable)
+                it[this.name] = name
+                it[this.parent] =
+                    parent?.let { p -> if (p == 0) null else p }?.let { p -> EntityID(p, SchematicNodeTable) }
+                it[this.item] = item
+                it[this.type] = type
+            }
+            return@useDb findById(id) ?: throw IllegalStateException("SchematicNode $id not found")
+        }
+
+        @JvmStatic
+        fun byId(id: Int) = useDb { findById(id) }
+
+        @JvmStatic
+        fun getSchematicNode(owner: Int, name: String, parent: Int?) = useDb {
+            find { (SchematicNodeTable.owner eq owner) and (SchematicNodeTable.name eq name) and (SchematicNodeTable.parent eq parent) }.firstOrNull()
+        }
+
+        @JvmStatic
+        fun getSchematicNode(owner: Int, name: String, parent: SchematicNode) =
+            getSchematicNode(owner, name, parent.nodeId)
+
+        @JvmStatic
+        fun getSchematicNodeInNode(parent: Int?) = useDb {
+            find { (SchematicNodeTable.parent eq parent) }.orderBy(SchematicNodeTable.name to SortOrder.ASC).toList()
+        }
+
+        @JvmStatic
+        fun getSchematicNodeInNode(parent: SchematicNode) = getSchematicNodeInNode(parent.nodeId)
+
+        @JvmStatic
+        fun getSchematicNode(name: String, parent: Int?) = useDb {
+            find { (SchematicNodeTable.name eq name) and (SchematicNodeTable.parent eq parent) }.firstOrNull()
+        }
+
+        @JvmStatic
+        fun getSchematicNode(id: Int) = byId(id)
+
+        @JvmStatic
+        fun getAllAccessibleSchematicsOfType(user: Int, type: String) =
+            accessibleByUserType(SteamwarUser.byId(user)!!, SchematicType.fromDB(type)!!)
+
+        @JvmStatic
+        fun getAllSchematicsAccessibleByUser(user: Int) = getAll(SteamwarUser.byId(user)!!)
+
+        @JvmStatic
+        fun getAllSchematicsOfType(owner: Int, type: String) = useDb {
+            find { (SchematicNodeTable.owner eq owner) and (SchematicNodeTable.type eq type) }.orderBy(
+                SchematicNodeTable.name to SortOrder.ASC
+            ).toList()
+        }
+
+        @JvmStatic
+        fun getAllSchematicsOfType(type: SchematicType) = useDb {
+            find { (SchematicNodeTable.type eq type.toDB()) }.orderBy(SchematicNodeTable.name to SortOrder.ASC).toList()
+        }
+
+        @JvmStatic
+        fun deepGet(parent: Int?, filter: (node: SchematicNode) -> Boolean): List<SchematicNode> =
+            getSchematicNodeInNode(parent)
+                .flatMap {
+                    return@flatMap if (it.isDir()) {
+                        deepGet(it.nodeId, filter)
+                    } else {
+                        if (filter(it)) listOf(it) else listOf()
+                    }
+                }
+
+        @JvmStatic
+        fun getNodeFromPath(user: SteamwarUser, path: String): SchematicNode? {
+            var s = path
+            if (s.startsWith("/")) {
+                s = s.drop(1)
+            }
+            if (s.endsWith("/")) {
+                s = s.dropLast(1)
+            }
+            if (s.isEmpty()) return null
+            if (s.contains("/")) {
+                val layers: Array<String?> = s.split("/".toRegex()).dropLastWhile { it.isEmpty() }.toTypedArray()
+                var currentNode = byParentName(user, null, layers[0]!!)
+                for (i in 1..<layers.size) {
+                    val node = currentNode?.let { n -> byParentName(user, n.getId(), layers[i]!!) }
+                    if (node == null) {
+                        return null
+                    } else {
+                        currentNode = node
+                        if (!currentNode.isDir() && i != layers.size - 1
+                        ) {
+                            return null
+                        }
+                    }
+                }
+                return currentNode
+            } else {
+                return byParentName(user, null, s)
+            }
+        }
+
+        @JvmStatic
+        fun invalidSchemName(layers: Array<String>) = layers.any {
+            it.isEmpty() || FORBIDDEN_CHARS.any { c -> c in it } || FORBIDDEN_NAMES.any { n -> n == it.lowercase() }
+        }
+
+        @JvmStatic
+        fun getNodeTabcomplete(user: SteamwarUser, s: String): List<String> {
+            var s = s
+            val sws = s.startsWith("/")
+            if (sws) {
+                s = s.substring(1)
+            }
+            val index = s.lastIndexOf("/")
+            val cacheKey = if (index == -1) "" else s.take(index)
+            tabCache[user.getId()]?.get(cacheKey)?.also { return it }
+
+            val list = mutableListOf<String>()
+            if (s.contains("/")) {
+                val preTab = s.take(s.lastIndexOf("/") + 1)
+                val pa = getNodeFromPath(user, preTab) ?: return emptyList()
+                val nodes: List<SchematicNode> = list(user, pa.getId())
+                val br = pa.generateBreadcrumbs(user)
+                nodes.forEach(Consumer { node: SchematicNode? -> list.add((if (sws) "/" else "") + br + node!!.name + (if (node.isDir()) "/" else "")) })
+            } else {
+                val nodes: List<SchematicNode?> = list(user, null)
+                nodes.forEach(Consumer { node: SchematicNode? -> list.add((if (sws) "/" else "") + node!!.name + (if (node.isDir()) "/" else "")) })
+            }
+            list.remove("//copy")
+            tabCache.computeIfAbsent(user.getId()) { i -> mutableMapOf() }.putIfAbsent(cacheKey, list)
+            return list
+        }
+    }
+
+    val nodeId by SchematicNodeTable.id.transform({ EntityID(it, SchematicNodeTable) }, { it.value })
+    val nodeOwner by SchematicNodeTable.owner
+    val owner: Int get() = nodeOwner.value
+    private var nodeName by SchematicNodeTable.name
+    var name: String
+        get() = nodeName
+        set(value) = useDb {
+            nodeName = value
+        }
+    private var parentNodeId by SchematicNodeTable.parent
+    var parent: Int?
+        get() = parentNodeId?.value
+        set(value) = useDb {
+            parentNodeId = value?.let { EntityID(it, SchematicNodeTable) }
+        }
+    val parentNode: SchematicNode?
+        get() = parent?.let { findById(it) }
+
+    val optionalParent: Optional<Int> get() = Optional.ofNullable(parent)
+    var lastUpdate by SchematicNodeTable.lastUpdate.transform({ it.toInstant() }, { Timestamp.from(it) })
+    private var nodeItem by SchematicNodeTable.item
+    var item: String
+        get() = nodeItem.ifEmpty {
+            if (isDir()) "CHEST" else "CAULDRON_ITEM"
+        }
+        set(value) = useDb {
+            nodeItem = value
+        }
+    private var nodeType by SchematicNodeTable.type
+    var schemtype: SchematicType
+        get() = checkDir { SchematicType.fromDB(nodeType!!)!! }
+        set(value) = checkDir { useDb { nodeType = value.toDB() } }
+    var config by SchematicNodeTable.config
+
+    val members: Set<NodeMember> by lazy { NodeMember.getNodeMembers(nodeId) }
+    private lateinit var breadcrumbs: String
+
+    fun getFileEnding(): String = checkDir { NodeData.getLatest(this)!!.nodeFormat.fileEnding }
+    fun getId() = nodeId
+    fun isDir() = nodeType == null
+
+    private fun <T> checkDir(block: () -> T): T {
+        if (isDir()) {
+            throw IllegalStateException("Node is a directory")
+        }
+
+        return block()
+    }
+
+    fun replaceColor() = getConfig(ConfigFlags.REPLACE_COLOR)
+    fun setReplaceColor(value: Boolean) = setConfig(ConfigFlags.REPLACE_COLOR, value)
+
+    fun allowReplay() = getConfig(ConfigFlags.ALLOW_REPLAY)
+    fun setAllowReplay(value: Boolean) = setConfig(ConfigFlags.ALLOW_REPLAY, value)
+
+    fun isPrepared() = getConfig(ConfigFlags.IS_PREPARED)
+    fun setPrepared(value: Boolean) = setConfig(ConfigFlags.IS_PREPARED, value)
+
+    fun getConfig(flag: ConfigFlags) = config and (1 shl flag.ordinal) != 0
+    fun setConfig(flag: ConfigFlags, value: Boolean) = useDb {
+        config = if (value) {
+            config or (1 shl flag.ordinal)
+        } else {
+            config and (1 shl flag.ordinal).inv()
+        }
+    }
+
+    fun getElo(season: Int) = SchemElo.getElo(this, season)
+
+    override fun delete() = useDb {
+        super.delete()
+    }
+
+    override fun hashCode() = nodeId
+
+    override fun equals(other: Any?): Boolean {
+        if (other !is SchematicNode) return false
+        return nodeId == other.nodeId
+    }
+
+    fun generateBreadcrumbs(user: SteamwarUser): String {
+        if (!this::breadcrumbs.isInitialized) {
+            breadcrumbs = generateBreadcrumbs("/", user)
+        }
+        return breadcrumbs
+    }
+
+    fun generateBreadcrumbs(split: String, user: SteamwarUser): String = useDb {
+        val builder: StringBuilder = StringBuilder(name)
+        if (isDir()) {
+            builder.append(split)
+        }
+        var currentNode: SchematicNode? = this@SchematicNode
+        while (currentNode != null) {
+            currentNode = currentNode
+                .let {
+                    NodeMember.getNodeMember(it.nodeId, user.getId())
+                        ?.parent?.orElse(null) ?: it.parent
+                }
+                ?.let { findById(it) }
+                ?.also {
+                    builder.insert(0, split).insert(0, it.name)
+                }
+        }
+        return@useDb builder.toString()
+    }
+
+    fun generateBreadcrumbsMap(user: SteamwarUser): List<Pair<String, Int>> = useDb {
+        val map = mutableListOf<Pair<String, Int>>()
+        var currentNode: SchematicNode? = this@SchematicNode
+        while (currentNode != null) {
+            currentNode = currentNode
+                .also {
+                    map.add(0, Pair(it.name, it.nodeId))
+                }
+                .let {
+                    NodeMember.getNodeMember(it.nodeId, user.getId())
+                        ?.parent?.orElse(null) ?: it.parent
+                }
+                ?.let { findById(it) }
+        }
+        return@useDb map
+    }
+
+    fun accessibleByUser(user: SteamwarUser) = schematicAccessibleForUser(user, nodeId)
+
+    enum class ConfigFlags {
+        REPLACE_COLOR,
+        ALLOW_REPLAY,
+        IS_PREPARED
+    }
+
+    @Deprecated("Removed")
+    var rank = 0
+}

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

@@ -1,143 +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.sql;
-
-import de.steamwar.sql.internal.SqlTypeMapper;
-import lombok.Getter;
-
-import java.io.File;
-import java.util.*;
-import java.util.stream.Collectors;
-
-public class SchematicType {
-
-	public static final SchematicType Normal = new SchematicType("Normal", "", Type.NORMAL, null, "STONE_BUTTON", false);
-
-	private static final Map<String, SchematicType> fromDB;
-	private static final List<SchematicType> types;
-
-	static {
-		List<SchematicType> tmpTypes = new LinkedList<>();
-		Map<String, SchematicType> tmpFromDB = new HashMap<>();
-
-		tmpTypes.add(Normal);
-		tmpFromDB.put(Normal.name().toLowerCase(), Normal);
-
-        File folder = SQLWrapper.impl.getSchemTypesFolder();
-        if (folder.exists()) {
-            for (File configFile : Arrays.stream(folder.listFiles((file, name) -> name.endsWith(".yml") && !name.endsWith(".kits.yml"))).sorted().collect(Collectors.toList())) {
-                GameModeConfig<?, String> gameModeConfig = SQLWrapper.impl.loadGameModeConfig(configFile);
-                if (gameModeConfig.Schematic.Type == null) continue;
-                if (tmpFromDB.containsKey(gameModeConfig.Schematic.Type.toDB())) continue;
-                SchematicType current = gameModeConfig.Schematic.Type;
-                if (!gameModeConfig.CheckQuestions.isEmpty()) {
-                    SchematicType checkType = current.checkType;
-                    tmpTypes.add(checkType);
-                    tmpFromDB.put(checkType.toDB(), checkType);
-                }
-                tmpTypes.add(current);
-                tmpFromDB.put(current.toDB(), current);
-                SQLWrapper.impl.processSchematicType(gameModeConfig);
-            }
-        }
-
-		fromDB = Collections.unmodifiableMap(tmpFromDB);
-		types = Collections.unmodifiableList(tmpTypes);
-	}
-
-	static {
-		new SqlTypeMapper<>(SchematicType.class, "VARCHAR(16)", (rs, identifier) -> {
-			String t = rs.getString(identifier);
-			return t != null ? fromDB.get(t) : null;
-		}, (st, index, value) -> st.setString(index, value.toDB()));
-	}
-
-	private final String name;
-	@Getter
-	private final String kuerzel;
-	private final Type type;
-	private final SchematicType checkType;
-	@Getter
-	private final String material;
-	@Getter
-	private final Date deadline;
-    @Getter
-    private final boolean manualCheck;
-
-	SchematicType(String name, String kuerzel, Type type, SchematicType checkType, String material, boolean manualCheck){
-		this(name, kuerzel, type, checkType, material, null, manualCheck);
-	}
-
-	SchematicType(String name, String kuerzel, Type type, SchematicType checkType, String material, Date deadline, boolean manualCheck){
-		this.name = name;
-		this.kuerzel = kuerzel;
-		this.type = type;
-		this.checkType = checkType;
-		this.material = material;
-		this.deadline = deadline;
-        this.manualCheck = manualCheck;
-	}
-
-	public boolean isAssignable(){
-		return type == Type.NORMAL || (type == Type.FIGHT_TYPE && checkType != null) || !manualCheck;
-	}
-
-	public SchematicType checkType(){
-        if (!manualCheck) {
-            return this;
-        }
-		return checkType;
-	}
-
-	public boolean check(){
-		return type == Type.CHECK_TYPE;
-	}
-
-	public boolean fightType(){
-		return type == Type.FIGHT_TYPE;
-	}
-
-	public boolean writeable(){
-		return type == Type.NORMAL;
-	}
-
-	public String name(){
-		return name;
-	}
-
-	public String toDB(){
-		return name.toLowerCase();
-	}
-
-	public static SchematicType fromDB(String input) {
-        if (fromDB == null) return null;
-		return fromDB.get(input.toLowerCase());
-	}
-
-	public static List<SchematicType> values(){
-		return types;
-	}
-
-	enum Type{
-		NORMAL,
-		CHECK_TYPE,
-		FIGHT_TYPE
-	}
-}

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

@@ -0,0 +1,108 @@
+/*
+ *   This file is a part of the SteamWar software.
+ *
+ *   Copyright (C) 2025 SteamWar.de-Serverteam
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU Affero General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU Affero General Public License for more details.
+ *
+ *   You should have received a copy of the GNU Affero General Public License
+ *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package de.steamwar.sql
+
+import 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,
+    val kuerzel: String,
+    val type: Type,
+    val checkType: SchematicType?,
+    val material: String,
+    val deadline: Date?,
+    val manualCheck: Boolean,
+) {
+    constructor(
+        name: String,
+        kuerzel: String,
+        type: Type,
+        checkType: SchematicType?,
+        material: String,
+        manualCheck: Boolean
+    ) : this(name, kuerzel, type, checkType, material, null, manualCheck)
+
+    companion object {
+        @JvmField
+        val Normal = SchematicType("Normal", "", Type.NORMAL, null, "STONE_BUTTON", false)
+
+        private val types: List<SchematicType>
+        private val fromDB: Map<String, SchematicType>?
+
+        init {
+            val tmpTypes = mutableListOf<SchematicType>()
+            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 values() = types
+
+        @JvmStatic
+        fun fromDB(value: String) = fromDB?.let { it[value.lowercase()] }
+    }
+
+    fun name() = name
+    fun toDB() = name.lowercase()
+
+    fun check() = type == Type.CHECK_TYPE
+    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,
+        CHECK_TYPE,
+        FIGHT_TYPE
+    }
+}

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

@@ -1,84 +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.sql;
-
-import de.steamwar.sql.internal.Field;
-import de.steamwar.sql.internal.SelectStatement;
-import de.steamwar.sql.internal.Statement;
-import de.steamwar.sql.internal.Table;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-import java.util.List;
-
-@AllArgsConstructor
-@Getter
-public class Script {
-
-    private static final Table<Script> table = new Table<>(Script.class);
-
-    private static final SelectStatement<Script> byId = table.select(Table.PRIMARY);
-    private static final SelectStatement<Script> byUserName = table.select("nameUser");
-    private static final SelectStatement<Script> byUser = table.selectFields("userId");
-
-    private static final Statement insert = table.insertFields(true, "userId", "name", "code");
-    private static final Statement updateName = table.update(Table.PRIMARY, "name");
-    private static final Statement updateCode = table.update(Table.PRIMARY, "code");
-    private static final Statement delete = table.delete(Table.PRIMARY);
-
-    public static Script get(int id) {
-        return byId.select(id);
-    }
-
-    public static Script get(SteamwarUser user, String name) {
-        return byUserName.select(user, name);
-    }
-
-    public static Script create(SteamwarUser user, String name, String code) {
-        return new Script(insert.insertGetKey(user, name, code), user.getId(), name, code);
-    }
-
-    public static List<Script> list(SteamwarUser user) {
-        return byUser.listSelect(user);
-    }
-
-    @Field(keys = Table.PRIMARY, autoincrement = true)
-    private final int id;
-    @Field(keys = "nameUser")
-    private final int userId;
-    @Field(keys = "nameUser")
-    private String name;
-    @Field
-    private String code;
-
-    public void setName(String name) {
-        this.name = name;
-        updateName.update(name, id);
-    }
-
-    public void setCode(String code) {
-        this.code = code;
-        updateCode.update(code, id);
-    }
-
-    public void delete() {
-        delete.update(id);
-    }
-}

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

@@ -0,0 +1,75 @@
+/*
+ *   This file is a part of the SteamWar software.
+ *
+ *   Copyright (C) 2025 SteamWar.de-Serverteam
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU Affero General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU Affero General Public License for more details.
+ *
+ *   You should have received a copy of the GNU Affero General Public License
+ *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package de.steamwar.sql
+
+import de.steamwar.sql.internal.useDb
+import org.jetbrains.exposed.v1.core.and
+import org.jetbrains.exposed.v1.core.dao.id.EntityID
+import org.jetbrains.exposed.v1.core.dao.id.IntIdTable
+import org.jetbrains.exposed.v1.core.eq
+import org.jetbrains.exposed.v1.dao.IntEntity
+import org.jetbrains.exposed.v1.dao.IntEntityClass
+
+object ScriptTable: IntIdTable("Script") {
+    val userId = reference("UserId", SteamwarUserTable)
+    val name = varchar("Name", 64)
+    val code = text("Code")
+}
+
+class Script(id: EntityID<Int>) : IntEntity(id) {
+    companion object : IntEntityClass<Script>(ScriptTable) {
+        @JvmStatic
+        fun byId(id: Int) = useDb { findById(id) }
+
+        @JvmStatic
+        fun get(user: SteamwarUser, name: String) = useDb {
+            find { ScriptTable.userId eq user.id and (ScriptTable.name eq name) }.firstOrNull()
+        }
+
+        @JvmStatic
+        fun create(user: SteamwarUser, name: String, code: String) = useDb {
+            new {
+                this.userId = user.id.value
+                this.scriptName = name
+                this.scriptCode = code
+            }
+        }
+
+        @JvmStatic
+        fun list(user: SteamwarUser) = useDb {
+            find { ScriptTable.userId eq user.id }.toList()
+        }
+    }
+
+    fun getId() = id.value
+    var userId by ScriptTable.userId.transform({ EntityID(it, SteamwarUserTable) }, { it.value })
+    private var scriptName by ScriptTable.name
+    private var scriptCode by ScriptTable.code
+
+    var name: String
+        get() = scriptName
+        set(value) = useDb { scriptName = value }
+
+    var code: String
+        get() = scriptCode
+        set(value) = useDb { scriptCode = value }
+
+    override fun delete() = useDb { super.delete() }
+}

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

@@ -46,14 +46,14 @@ public class Season {
         if (season == -1) return "";
         int yearSeason = season % 3;
         int year = (season - yearSeason) / 3;
-        return String.format("%d-%d", year, yearSeason);
+        return String.format("%d-%d", year, yearSeason + 1);
     }
 
     public static int convertSeasonToNumber(String season){
         if (season.isEmpty()) return -1;
         String[] split = season.split("-");
         try {
-            return Integer.parseInt(split[0]) * 3 + Integer.parseInt(split[1]);
+            return Integer.parseInt(split[0]) * 3 + Integer.parseInt(split[1]) - 1;
         } catch (NumberFormatException e) {
             return -1;
         }

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

@@ -1,45 +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.sql;
-
-import de.steamwar.sql.internal.Field;
-import de.steamwar.sql.internal.Statement;
-import de.steamwar.sql.internal.Table;
-import lombok.AllArgsConstructor;
-
-import java.sql.Timestamp;
-
-@AllArgsConstructor
-public class Session {
-
-    private static final Table<Session> table = new Table<>(Session.class);
-    private static final Statement insert = table.insert(Table.PRIMARY);
-
-    public static void insertSession(int userID, Timestamp startTime){
-        insert.update(userID, startTime);
-    }
-
-    @Field(keys = {Table.PRIMARY})
-    private int userId;
-    @Field(keys = {Table.PRIMARY})
-    private Timestamp startTime;
-    @Field(def = "CURRENT_TIMESTAMP")
-    private Timestamp endTime;
-}

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

@@ -0,0 +1,44 @@
+/*
+ *   This file is a part of the SteamWar software.
+ *
+ *   Copyright (C) 2025 SteamWar.de-Serverteam
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU Affero General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU Affero General Public License for more details.
+ *
+ *   You should have received a copy of the GNU Affero General Public License
+ *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package de.steamwar.sql
+
+import de.steamwar.sql.internal.useDb
+import org.jetbrains.exposed.v1.core.Table
+import org.jetbrains.exposed.v1.core.dao.id.EntityID
+import org.jetbrains.exposed.v1.javatime.CurrentTimestamp
+import org.jetbrains.exposed.v1.javatime.timestamp
+import org.jetbrains.exposed.v1.jdbc.insert
+import java.sql.Timestamp
+
+object SessionTable: Table("Session") {
+    val userId = reference("UserId", SteamwarUserTable)
+    val startTime = timestamp("StartTime")
+    val endTime = timestamp("EndTime").defaultExpression(CurrentTimestamp)
+}
+
+object Session {
+    @JvmStatic
+    fun insertSession(userId: Int, startTime: Timestamp) = useDb {
+        SessionTable.insert {
+            it[SessionTable.userId] = EntityID(userId, SteamwarUserTable)
+            it[SessionTable.startTime] = startTime.toInstant()
+        }
+    }
+}

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

@@ -1,389 +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.sql;
-
-import de.steamwar.sql.internal.*;
-import lombok.Getter;
-
-import javax.crypto.SecretKeyFactory;
-import javax.crypto.spec.PBEKeySpec;
-import java.security.NoSuchAlgorithmException;
-import java.security.SecureRandom;
-import java.security.spec.InvalidKeySpecException;
-import java.sql.Timestamp;
-import java.util.*;
-import java.util.function.Consumer;
-import java.util.logging.Level;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-public class SteamwarUser {
-    private static final SecureRandom random = new SecureRandom();
-    private static final SecretKeyFactory factory;
-
-	static {
-        try {
-            factory = SecretKeyFactory.getInstance("PBKDF2WithHmacSHA512");
-        } catch (NoSuchAlgorithmException e) {
-            throw new SecurityException(e);
-        }
-
-        new SqlTypeMapper<>(UUID.class, "CHAR(36)", (rs, identifier) -> UUID.fromString(rs.getString(identifier)), (st, index, value) -> st.setString(index, value.toString()));
-		new SqlTypeMapper<>(Locale.class, "VARCHAR(32)", (rs, identifier) -> {
-			String l = rs.getString(identifier);
-			return l != null ? Locale.forLanguageTag(l) : null;
-		}, (st, index, value) -> st.setString(index, value.toLanguageTag()));
-		new SqlTypeMapper<>(SteamwarUser.class, null, (rs, identifier) -> { throw new SecurityException("SteamwarUser cannot be used as type (recursive select)"); }, (st, index, value) -> st.setInt(index, value.id));
-	}
-
-	private static final Table<SteamwarUser> table = new Table<>(SteamwarUser.class, "UserData");
-	private static final Statement insert = table.insertFields("UUID", "UserName");
-	private static final SelectStatement<SteamwarUser> byID = table.selectFields("id");
-	private static final SelectStatement<SteamwarUser> byUUID = table.selectFields("UUID");
-	private static final SelectStatement<SteamwarUser> byName = table.selectFields("UserName");
-	private static final SelectStatement<SteamwarUser> byDiscord = table.selectFields("DiscordId");
-	private static final SelectStatement<SteamwarUser> byTeam = table.selectFields("Team");
-	private static final SelectStatement<SteamwarUser> getUsersWithPerm = new SelectStatement<>(table, "SELECT S.* FROM UserData S JOIN UserPerm P ON S.id = P.User WHERE P.Perm = ?");
-	private static final SelectStatement<SteamwarUser> getAll = new SelectStatement<SteamwarUser>(table, "SELECT * FROM UserData");
-
-	private static final Statement updateName = table.update(Table.PRIMARY, "UserName");
-    private static final Statement updatePassword = table.update(Table.PRIMARY, "Password");
-	private static final Statement updateLocale = table.update(Table.PRIMARY, "Locale", "ManualLocale");
-	private static final Statement updateTeam = table.update(Table.PRIMARY, "Team");
-	private static final Statement updateLeader = table.update(Table.PRIMARY, "Leader");
-	private static final Statement updateDiscord = table.update(Table.PRIMARY, "DiscordId");
-
-	private static final Statement getPlaytime = new Statement("SELECT SUM(UNIX_TIMESTAMP(EndTime) - UNIX_TIMESTAMP(StartTime)) as Playtime FROM Session WHERE UserID = ?");
-	private static final Statement getFirstjoin = new Statement("SELECT MIN(StartTime) AS FirstJoin FROM Session WHERE UserID = ?");
-	private static final Statement getLastonline = new Statement("SELECT MAX(EndTime) AS LastOnline FROM Session WHERE UserID = ?");
-
-	private static final Map<Integer, SteamwarUser> usersById = new HashMap<>();
-	private static final Map<UUID, SteamwarUser> usersByUUID = new HashMap<>();
-	private static final Map<String, SteamwarUser> usersByName = new HashMap<>();
-	private static final Map<Long, SteamwarUser> usersByDiscord = new HashMap<>();
-	public static void clear() {
-		usersById.clear();
-		usersByName.clear();
-		usersByUUID.clear();
-		usersByDiscord.clear();
-	}
-
-	public static void invalidate(int userId) {
-		SteamwarUser user = usersById.remove(userId);
-		if (user == null)
-			return;
-		usersByName.remove(user.getUserName());
-		usersByUUID.remove(user.getUUID());
-		usersByDiscord.remove(user.getDiscordId());
-	}
-
-	public static SteamwarUser get(String userName){
-		SteamwarUser user = usersByName.get(userName.toLowerCase());
-		if(user != null)
-			return user;
-		return byName.select(userName);
-	}
-
-	public static SteamwarUser get(UUID uuid){
-		SteamwarUser user = usersByUUID.get(uuid);
-		if(user != null)
-			return user;
-		return byUUID.select(uuid);
-	}
-
-	public static SteamwarUser get(int id) {
-		SteamwarUser user = usersById.get(id);
-		if(user != null)
-			return user;
-		return byID.select(id);
-	}
-
-	public static SteamwarUser get(Long discordId) {
-		if(usersByDiscord.containsKey(discordId))
-			return usersByDiscord.get(discordId);
-		return byDiscord.select(discordId);
-	}
-
-	public static SteamwarUser getOrCreate(UUID uuid, String name, Consumer<UUID> newPlayer) {
-		SteamwarUser user = get(uuid);
-
-		if (user != null) {
-			if (!user.userName.equals(name)) {
-				updateName.update(name, user.id);
-				user.userName = name;
-			}
-
-			return user;
-		} else {
-			insert.update(uuid, name);
-			newPlayer.accept(uuid);
-			return get(uuid);
-		}
-	}
-
-	public static List<SteamwarUser> getUsersWithPerm(UserPerm userPerm) {
-		return getUsersWithPerm.listSelect(userPerm);
-	}
-
-    public static List<SteamwarUser> getServerTeam() {
-        return Stream.of(getUsersWithPerm(UserPerm.PREFIX_ADMIN),
-                        getUsersWithPerm(UserPerm.PREFIX_DEVELOPER),
-                        getUsersWithPerm(UserPerm.PREFIX_MODERATOR),
-                        getUsersWithPerm(UserPerm.PREFIX_SUPPORTER),
-                        getUsersWithPerm(UserPerm.PREFIX_BUILDER)
-                )
-                .flatMap(Collection::stream)
-                .collect(Collectors.toList());
-    }
-
-	public static List<SteamwarUser> getTeam(int teamId) {
-		return byTeam.listSelect(teamId);
-	}
-
-	public static void batchCache(Set<Integer> ids) {
-		ids.removeIf(usersById::containsKey);
-		if(ids.isEmpty())
-			return;
-
-		try (SelectStatement<SteamwarUser> batch = new SelectStatement<>(table, "SELECT * FROM UserData WHERE id IN (" + ids.stream().map(Object::toString).collect(Collectors.joining(", ")) + ")")) {
-			batch.listSelect();
-		}
-	}
-
-	@Getter
-	@Field(keys = {Table.PRIMARY}, autoincrement = true)
-	private final int id;
-	@Field(keys = {"uuid"})
-	private final UUID uuid;
-	@Getter
-	@Field
-	private String userName;
-    @Field(nullable = true)
-    private String password;
-    @Getter
-	@Field(def = "0")
-	private int team;
-	@Getter
-	@Field(def = "0")
-	private boolean leader;
-	@Field(nullable = true)
-	private Locale locale;
-	@Field(def = "0")
-	private boolean manualLocale;
-	@Getter
-	@Field(keys = {"discordId"}, nullable = true)
-	private Long discordId;
-
-	private Map<Punishment.PunishmentType, Punishment> punishments = null;
-	private Set<UserPerm> permissions = null;
-	private UserPerm.Prefix prefix = null;
-
-	public SteamwarUser(int id, UUID uuid, String userName, String password, int team, boolean leader, Locale locale, boolean manualLocale, Long discordId) {
-		this.id = id;
-		this.uuid = uuid;
-		this.userName = userName;
-        this.password = password;
-		this.team = team;
-		this.leader = leader;
-		this.locale = locale;
-		this.manualLocale = manualLocale;
-		this.discordId = discordId != null && discordId != 0 ? discordId : null;
-
-		usersById.put(id, this);
-		usersByName.put(userName.toLowerCase(), this);
-		usersByUUID.put(uuid, this);
-		if (this.discordId != null) {
-			usersByDiscord.put(discordId, this);
-		}
-	}
-
-	public UUID getUUID() {
-		return uuid;
-	}
-
-	public Locale getLocale() {
-		if(locale != null)
-			return locale;
-		return Locale.getDefault();
-	}
-
-	public Punishment getPunishment(Punishment.PunishmentType type) {
-		initPunishments();
-		return punishments.getOrDefault(type, null);
-	}
-
-	public boolean isPunished(Punishment.PunishmentType punishment) {
-		initPunishments();
-		if (!punishments.containsKey(punishment)) {
-			return false;
-		}
-		if (!punishments.get(punishment).isCurrent()) {
-			if (punishment == Punishment.PunishmentType.Ban) {
-				BannedUserIPs.unbanIPs(id);
-			}
-			punishments.remove(punishment);
-			return false;
-		}
-		return true;
-	}
-
-	public boolean hasPerm(UserPerm perm) {
-		initPerms();
-		return permissions.contains(perm);
-	}
-
-	public Set<UserPerm> perms() {
-		initPerms();
-		return permissions;
-	}
-
-	public UserPerm.Prefix prefix() {
-		initPerms();
-		return prefix;
-	}
-
-	public double getOnlinetime() {
-		return getPlaytime.select(rs -> {
-			if (rs.next() && rs.getBigDecimal("Playtime") != null)
-				return rs.getBigDecimal("Playtime").doubleValue();
-			return 0.0;
-		}, id);
-	}
-
-	public Timestamp getFirstjoin() {
-		return getFirstjoin.select(rs -> {
-			if (rs.next())
-				return rs.getTimestamp("FirstJoin");
-			return null;
-		}, id);
-	}
-
-	public Timestamp getLastOnline() {
-		return getLastonline.select(rs -> {
-			if (rs.next())
-				return rs.getTimestamp("LastOnline");
-			return null;
-		}, id);
-	}
-
-	public void punish(Punishment.PunishmentType punishment, Timestamp time, String banReason, int from, boolean perma) {
-		initPunishments();
-		punishments.remove(punishment);
-		punishments.put(punishment, Punishment.createPunishment(id, from, punishment, banReason, time, perma));
-	}
-
-	public void setTeam(int team) {
-		this.team = team;
-		updateTeam.update(team, id);
-		setLeader(false);
-	}
-
-	public void setLeader(boolean leader) {
-		this.leader = leader;
-		updateLeader.update(leader, id);
-	}
-
-	public void setLocale(Locale locale, boolean manualLocale) {
-		if (locale == null || (this.manualLocale && !manualLocale))
-			return;
-
-		this.locale = locale;
-		this.manualLocale = manualLocale;
-		updateLocale.update(locale.toLanguageTag(), manualLocale, id);
-	}
-
-	public void setDiscordId(Long discordId) {
-		usersByDiscord.remove(this.discordId);
-		this.discordId = discordId;
-		updateDiscord.update(discordId, id);
-		if (discordId != null) {
-			usersByDiscord.put(discordId, this);
-		}
-	}
-
-    public void setPassword(String password) {
-        try {
-            byte[] salt = new byte[16];
-            random.nextBytes(salt);
-            String saltString = Base64.getEncoder().encodeToString(salt);
-
-            byte[] hash = generateHash(password, salt);
-            String hashString = Base64.getEncoder().encodeToString(hash);
-            this.password = hashString + ":" + saltString;
-            updatePassword.update(this.password, id);
-        } catch (Exception e) {
-            throw new SecurityException(e);
-        }
-    }
-
-    public boolean verifyPassword(String password) {
-        try {
-            if (!hasPassword()) {
-                return false;
-            }
-
-            String[] parts = this.password.split(":");
-            if (parts.length != 2) {
-                SQLConfig.impl.getLogger().log(Level.SEVERE ,"Invalid password hash for user {0} ({1})", new Object[]{userName, id});
-                return false;
-            }
-
-            String hashString = parts[0];
-            byte[] realHash = Base64.getDecoder().decode(hashString);
-            String saltString = parts[1];
-            byte[] salt = Base64.getDecoder().decode(saltString);
-            byte[] hash = generateHash(password, salt);
-            return Arrays.equals(realHash, hash);
-        } catch (Exception e) {
-            SQLConfig.impl.getLogger().log(Level.SEVERE, "Error while verifying password for user " + userName + " (" + id + ")", e);
-            return false;
-        }
-    }
-
-	public boolean hasPassword() {
-		return this.password != null;
-	}
-
-    private byte[] generateHash(String password, byte[] salt)
-            throws InvalidKeySpecException {
-        PBEKeySpec spec = new PBEKeySpec(password.toCharArray(), salt, 65536, 512);
-        return factory.generateSecret(spec).getEncoded();
-
-    }
-
-	private void initPunishments() {
-		if(punishments != null)
-			return;
-
-		punishments = Punishment.getPunishmentsOfPlayer(id);
-	}
-
-	private void initPerms() {
-		if(permissions != null)
-			return;
-
-		permissions = UserPerm.getPerms(id);
-		prefix = permissions.stream().filter(UserPerm.prefixes::containsKey).findAny().map(UserPerm.prefixes::get).orElse(UserPerm.emptyPrefix);
-	}
-
-    public static List<SteamwarUser> getAll() {
-        return getAll.listSelect();
-    }
-}

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

@@ -0,0 +1,289 @@
+/*
+ *   This file is a part of the SteamWar software.
+ *
+ *   Copyright (C) 2025 SteamWar.de-Serverteam
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU Affero General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU Affero General Public License for more details.
+ *
+ *   You should have received a copy of the GNU Affero General Public License
+ *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package de.steamwar.sql
+
+import de.steamwar.sql.internal.useDb
+import org.jetbrains.exposed.v1.core.JoinType
+import org.jetbrains.exposed.v1.core.dao.id.EntityID
+import org.jetbrains.exposed.v1.core.dao.id.IntIdTable
+import org.jetbrains.exposed.v1.core.eq
+import org.jetbrains.exposed.v1.core.inList
+import org.jetbrains.exposed.v1.dao.IntEntity
+import org.jetbrains.exposed.v1.dao.IntEntityClass
+import org.jetbrains.exposed.v1.jdbc.insert
+import org.jetbrains.exposed.v1.jdbc.select
+import java.security.SecureRandom
+import java.sql.Timestamp
+import java.util.*
+import java.util.function.Consumer
+import javax.crypto.SecretKeyFactory
+import javax.crypto.spec.PBEKeySpec
+
+object SteamwarUserTable : IntIdTable("UserData", "id") {
+    val uuid = varchar("UUID", 36)
+    val username = varchar("UserName", 32)
+    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()
+}
+
+class SteamwarUser(id: EntityID<Int>): IntEntity(id) {
+    companion object: IntEntityClass<SteamwarUser>(SteamwarUserTable) {
+        private val random = SecureRandom()
+        private val factory = SecretKeyFactory.getInstance("PBKDF2WithHmacSHA512")
+
+        private val byId = mutableMapOf<Int, SteamwarUser>()
+        private val byUUID = mutableMapOf<UUID, SteamwarUser>()
+        private val byDiscordId = mutableMapOf<Long, SteamwarUser>()
+        private val byUsername = mutableMapOf<String, SteamwarUser>()
+
+        @JvmStatic
+        fun clear() {
+            byId.clear()
+            byUUID.clear()
+            byDiscordId.clear()
+            byUsername.clear()
+        }
+
+        @JvmStatic
+        fun invalidate(userId: Int) {
+            val user = byId.remove(userId)
+            if(user != null) {
+                byUUID.remove(user.getUUID())
+                byDiscordId.remove(user.discordId)
+                byUsername.remove(user.userName)
+            }
+        }
+
+        @JvmStatic
+        fun byId(id: Int) = byId[id] ?: useDb { findById(id)?.also { cache(it) } }
+
+        @JvmStatic
+        fun get(uuid: UUID) = byUUID[uuid] ?: useDb { find { SteamwarUserTable.uuid eq uuid.toString() }.firstOrNull()?.also { cache(it) } }
+
+        @JvmStatic
+        fun get(discordId: Long) = byDiscordId[discordId] ?: useDb { find { SteamwarUserTable.discordId eq discordId }.firstOrNull()?.also { cache(it) } }
+
+        @JvmStatic
+        fun get(username: String) = byUsername[username] ?: useDb { find { SteamwarUserTable.username eq username }.firstOrNull()?.also { cache(it) } }
+
+        private fun cache(user: SteamwarUser) {
+            byId[user.getId()] = user
+            byUUID[user.getUUID()] = user
+            user.discordId?.let { byDiscordId[it] = user }
+            byUsername[user.userName] = user
+        }
+
+        @JvmStatic
+        fun getOrCreate(uuid: UUID, name: String, newPlayer: Consumer<UUID>): SteamwarUser {
+            val user = get(uuid)
+
+            return if (user != null) {
+                if (user.userName != name) {
+                    useDb {
+                        user.userName = name
+                    }
+                }
+
+                user
+            } else {
+                useDb {
+                    SteamwarUserTable.insert {
+                        it[SteamwarUserTable.uuid] = uuid.toString()
+                        it[username] = name
+                    }
+                }
+
+                newPlayer.accept(uuid)
+                get(uuid) ?: error("User $uuid not found after creation!")
+            }
+        }
+
+        @JvmStatic
+        fun getUsersWithPerm(perm: UserPerm) = useDb {
+            UserPermTable.join(SteamwarUserTable, JoinType.INNER, UserPermTable.user, SteamwarUserTable.id)
+                .select(SteamwarUserTable.fields).where { UserPermTable.perm eq perm }.map { wrapRow(it) }
+        }
+
+        @JvmStatic
+        fun getServerTeam() = useDb { listOf(
+            getUsersWithPerm(UserPerm.PREFIX_ADMIN),
+            getUsersWithPerm(UserPerm.PREFIX_DEVELOPER),
+            getUsersWithPerm(UserPerm.PREFIX_MODERATOR),
+            getUsersWithPerm(UserPerm.PREFIX_SUPPORTER),
+            getUsersWithPerm(UserPerm.PREFIX_BUILDER),
+        ).flatten() }
+
+        @JvmStatic
+        fun getTeam(teamId: Int) = useDb {
+            find { SteamwarUserTable.team eq teamId }.toList()
+        }
+
+        @JvmStatic
+        fun batchCache(ids: MutableSet<Int>) {
+            ids.removeIf(byId::containsKey)
+            if(ids.isEmpty()) return
+
+            useDb {
+                find { SteamwarUserTable.id inList ids }.forEach { cache(it) }
+            }
+        }
+    }
+
+    val uuid: UUID by SteamwarUserTable.uuid.transform({ it.toString() }, { UUID.fromString(it) })
+    var userName by SteamwarUserTable.username
+    private var teamInternal by SteamwarUserTable.team
+    var team: Int
+        get() = teamInternal.value
+        set(value) = useDb {
+            teamInternal = EntityID(value, TeamTable)
+            leaderInternal = false
+        }
+
+    private var leaderInternal by SteamwarUserTable.leader
+    var leader: Boolean
+        get() = leaderInternal
+        set(value) = useDb {
+            leaderInternal = value
+        }
+    fun isLeader() = leader
+
+    var locale: Locale by SteamwarUserTable.locale
+        .transform({ it.toLanguageTag() }, { it?.let { Locale.forLanguageTag(it) } ?: Locale.getDefault()})
+    var manualLocale by SteamwarUserTable.manualLocale
+    var bedrock by SteamwarUserTable.bedrock
+    private var passwordInternal by SteamwarUserTable.password
+    var password: String?
+        get() = passwordInternal
+        set(value) {
+            if(value == null) {
+                useDb {
+                    passwordInternal = null
+                }
+                return
+            }
+
+            val salt = ByteArray(16)
+            random.nextBytes(salt)
+            val saltString = Base64.getEncoder().encode(salt)
+
+            val hash = generateHash(value, salt)
+            val hashString = Base64.getEncoder().encode(hash)
+
+            useDb {
+                passwordInternal = "$hashString:$saltString"
+            }
+        }
+
+    var discordId by SteamwarUserTable.discordId
+
+    private 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 }
+
+    fun getUUID(): UUID = uuid
+    fun getId() = id.value
+
+    fun getPunishment(punishment: Punishment.PunishmentType) = punishments[punishment]
+    fun isPunished(punishment: Punishment.PunishmentType) = getPunishment(punishment)
+        ?.let {
+            if (!it.isCurrent()) {
+                if (punishment == Punishment.PunishmentType.Ban) {
+                    BannedUserIPs.unbanIPs(id.value)
+                }
+                punishments.remove(punishment)
+                return@let false
+            }
+
+            return@let true
+        } ?: false
+
+    fun hasPerm(perm: UserPerm) = perms.contains(perm)
+    fun perms() = perms
+    fun prefix() = prefix
+
+    fun getOnlinetime() = useDb {
+        exec("SELECT SUM(UNIX_TIMESTAMP(EndTime) - UNIX_TIMESTAMP(StartTime)) as Playtime FROM Session WHERE UserID = ${this@SteamwarUser.id.value}") { rs ->
+            return@exec if (rs.next()) {
+                rs.getBigDecimal("Playtime").toDouble()
+            } else {
+                0.0
+            }
+        } ?: 0.0
+    }
+
+    fun getFirstjoin() = useDb {
+        exec("SELECT MIN(StartTime) AS FirstJoin FROM Session WHERE UserID = ${this@SteamwarUser.id.value}") { rs ->
+            return@exec if (rs.next()) {
+                rs.getTimestamp("FirstJoin")
+            } else { null }
+        }
+    }
+
+    fun getLastOnline() = useDb {
+        exec("SELECT MAX(EndTime) AS LastOnline FROM Session WHERE UserID = ${this@SteamwarUser.id.value}") { rs ->
+            return@exec if (rs.next()) {
+                rs.getTimestamp("LastOnline")
+            } else { null }
+        }
+    }
+
+    fun punish(punishment: Punishment.PunishmentType, time: Timestamp, reason: String, from: Int, perma: Boolean) = useDb {
+        punishments.remove(punishment)
+        punishments[punishment] = Punishment.createPunishment(this@SteamwarUser.id.value, from, punishment, reason, time, perma)
+    }
+
+    fun setLocale(locale: Locale?, manualeLocale: Boolean) {
+        if (locale == null || (this.manualLocale && !manualLocale)) return
+
+        useDb {
+            this@SteamwarUser.locale = locale
+            this@SteamwarUser.manualLocale = manualeLocale
+        }
+    }
+
+    fun setDiscordId(discordId: Long) {
+        byDiscordId.remove(this.discordId)
+        useDb {
+            this@SteamwarUser.discordId = discordId
+        }
+        byDiscordId[discordId] = this
+    }
+
+    fun verifyPassword(password: String): Boolean {
+        if (!hasPassword()) return false
+
+        val (hashString, saltString) = this.password!!.split(':')
+
+        val hash = Base64.getDecoder().decode(hashString)
+        val salt = Base64.getDecoder().decode(saltString)
+
+        return hash.contentEquals(generateHash(password, salt))
+    }
+
+    fun hasPassword() = password != null
+
+    fun generateHash(password: String, salt: ByteArray): ByteArray =
+        PBEKeySpec(password.toCharArray(), salt, 65536, 512).let { factory.generateSecret(it).encoded }
+}

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

@@ -1,140 +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.sql;
-
-import de.steamwar.sql.internal.Field;
-import de.steamwar.sql.internal.SelectStatement;
-import de.steamwar.sql.internal.Statement;
-import de.steamwar.sql.internal.Table;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-@AllArgsConstructor
-public class Team {
-
-    private static final Map<Integer, Team> teamCache = new HashMap<>();
-
-    public static void clear() {
-        teamCache.clear();
-    }
-
-    private static final Table<Team> table = new Table<>(Team.class);
-    private static final SelectStatement<Team> byId = table.select(Table.PRIMARY);
-    private static final SelectStatement<Team> byName = new SelectStatement<>(table, "SELECT * FROM Team WHERE (lower(TeamName) = ? OR lower(TeamKuerzel) = ?) AND NOT TeamDeleted");
-    private static final SelectStatement<Team> all = table.selectFields("TeamDeleted");
-    private static final Statement insert = table.insertFields("TeamKuerzel", "TeamName");
-    private static final Statement update = table.update(Table.PRIMARY, "TeamKuerzel", "TeamName", "TeamColor", "Address", "Port");
-    private static final Statement delete = table.update(Table.PRIMARY, "TeamDeleted");
-    private static final Statement getSize = new Statement("SELECT COUNT(id) FROM UserData WHERE Team = ?");
-
-    @Field(keys = {Table.PRIMARY}, autoincrement = true)
-    @Getter
-    private final int teamId;
-    @Field
-    @Getter
-    private String teamKuerzel;
-    @Field
-    @Getter
-    private String teamName;
-    @Field(def = "'8'")
-    @Getter
-    private String teamColor;
-    @Field(nullable = true)
-    @Getter
-    private String address;
-    @Field(def = "'25565'")
-    @Getter
-    private int port;
-    @Field(def = "0")
-    private boolean teamDeleted;
-
-    public static void create(String kuerzel, String name){
-        insert.update(kuerzel, name);
-    }
-
-    public static Team get(int id) {
-        return teamCache.computeIfAbsent(id, byId::select);
-    }
-
-    public static Team get(String name){
-        // No cache lookup due to low frequency use
-        name = name.toLowerCase();
-        return byName.select(name, name);
-    }
-
-    public static List<Team> getAll(){
-        clear();
-        List<Team> teams = all.listSelect(false);
-        teams.forEach(team -> teamCache.put(team.getTeamId(), team));
-        return teams;
-    }
-
-    public List<Integer> getMembers(){
-        return SteamwarUser.getTeam(teamId).stream().map(SteamwarUser::getId).collect(Collectors.toList());
-    }
-
-    public int size(){
-        return getSize.select(rs -> {
-            rs.next();
-            return rs.getInt("COUNT(id)");
-        }, teamId);
-    }
-
-    public void disband(SteamwarUser user){
-        user.setLeader(false);
-        delete.update(true, teamId);
-        teamCache.remove(teamId);
-        TeamTeilnahme.deleteFuture(teamId);
-    }
-
-    public void setTeamKuerzel(String teamKuerzel) {
-        this.teamKuerzel = teamKuerzel;
-        updateDB();
-    }
-
-    public void setTeamName(String teamName) {
-        this.teamName = teamName;
-        updateDB();
-    }
-
-    public void setTeamColor(String teamColor) {
-        this.teamColor = teamColor;
-        updateDB();
-    }
-
-    public void setAddress(String address) {
-        this.address = address;
-        updateDB();
-    }
-
-    public void setPort(int port) {
-        this.port = port;
-        updateDB();
-    }
-
-    private void updateDB(){
-        update.update(teamKuerzel, teamName, teamColor, address, port, teamId);
-    }
-}

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

@@ -0,0 +1,113 @@
+/*
+ *   This file is a part of the SteamWar software.
+ *
+ *   Copyright (C) 2025 SteamWar.de-Serverteam
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU Affero General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU Affero General Public License for more details.
+ *
+ *   You should have received a copy of the GNU Affero General Public License
+ *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package de.steamwar.sql
+
+import de.steamwar.sql.internal.useDb
+import org.jetbrains.exposed.v1.core.dao.id.EntityID
+import org.jetbrains.exposed.v1.core.dao.id.IntIdTable
+import org.jetbrains.exposed.v1.core.eq
+import org.jetbrains.exposed.v1.core.lowerCase
+import org.jetbrains.exposed.v1.core.or
+import org.jetbrains.exposed.v1.dao.IntEntity
+import org.jetbrains.exposed.v1.dao.IntEntityClass
+import org.jetbrains.exposed.v1.jdbc.select
+
+object TeamTable : IntIdTable("Team", "TeamID") {
+    val kuerzel = varchar("TeamKuerzel", 10)
+    val color = char("TeamColor", 1)
+    val name = varchar("TeamName", 16)
+    val deleted = bool("TeamDeleted")
+    val address = text("Address")
+    val port = ushort("Port")
+}
+
+class Team(id: EntityID<Int>) : IntEntity(id) {
+    companion object : IntEntityClass<Team>(TeamTable) {
+        private val teamCache = mutableMapOf<Int, Team>()
+
+        @JvmStatic
+        fun clear() = teamCache.clear()
+
+        @JvmStatic
+        fun byId(id: Int) = teamCache.computeIfAbsent(id) { useDb { Team[id] } }
+
+        @JvmStatic
+        fun get(name: String) = useDb { find { TeamTable.name.lowerCase() eq name.lowercase() or (TeamTable.kuerzel.lowerCase() eq name.lowercase()) }.firstOrNull() }
+
+        @JvmStatic
+        fun getAll() = useDb { all().toList() }
+
+        @JvmStatic
+        fun create(kuerzel: String, name: String) = useDb {
+            new {
+                this.kuerzel = kuerzel
+                this.name = name
+            }
+        }
+    }
+
+    val teamId by TeamTable.id.transform({ EntityID(it, TeamTable) }, { it.value })
+    private var kuerzel by TeamTable.kuerzel
+    private var color by TeamTable.color
+    private var name by TeamTable.name
+    var deleted by TeamTable.deleted
+        private set
+    private var teamAddress by TeamTable.address
+    private var teamPort by TeamTable.port
+    val members by lazy { useDb { SteamwarUserTable.select(SteamwarUserTable.id).where { SteamwarUserTable.team eq teamId }.map { it[SteamwarUserTable.id].value } } }
+
+    fun size() = useDb { SteamwarUser.find { SteamwarUserTable.team eq teamId }.count().toInt() }
+    fun disband(user: SteamwarUser) = useDb {
+        user.team = 0
+        deleted = true
+        teamCache.remove(teamId)
+        TeamTeilnahme.deleteFuture(teamId)
+    }
+
+    var teamKuerzel: String
+        get() = kuerzel
+        set(value) = useDb {
+            kuerzel = value
+        }
+
+    var teamColor: String
+        get() = color
+        set(value) = useDb {
+            color = value
+        }
+
+    var teamName: String
+        get() = name
+        set(value) = useDb {
+            name = value
+        }
+
+    var address: String
+        get() = teamAddress
+        set(value) = useDb {
+            teamAddress = value
+        }
+
+    var port: Int
+        get() = teamPort.toInt()
+        set(value) = useDb {
+            teamPort = value.toUShort()
+        }
+}

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

@@ -1,70 +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.sql;
-
-import de.steamwar.sql.internal.Field;
-import de.steamwar.sql.internal.SelectStatement;
-import de.steamwar.sql.internal.Statement;
-import de.steamwar.sql.internal.Table;
-import lombok.AllArgsConstructor;
-
-import java.util.Set;
-import java.util.stream.Collectors;
-
-@AllArgsConstructor
-public class TeamTeilnahme {
-
-    private static final Table<TeamTeilnahme> table = new Table<>(TeamTeilnahme.class);
-    private static final SelectStatement<TeamTeilnahme> select = table.select(Table.PRIMARY);
-    private static final SelectStatement<TeamTeilnahme> selectTeams = table.selectFields("EventID");
-    private static final SelectStatement<TeamTeilnahme> selectEvents = table.selectFields("TeamID");
-    private static final Statement insert = table.insert(Table.PRIMARY);
-    private static final Statement delete = table.delete(Table.PRIMARY);
-    private static final Statement deleteFuture = new Statement("DELETE t FROM TeamTeilnahme t INNER JOIN Event e ON t.EventID = e.EventID WHERE t.TeamID = ? AND e.Start > NOW()");
-
-    @Field(keys = {Table.PRIMARY})
-    private final int teamId;
-    @Field(keys = {Table.PRIMARY})
-    private final int eventId;
-
-    public static boolean nimmtTeil(int teamID, int eventID){
-        return select.select(teamID, eventID) != null;
-    }
-
-    public static void teilnehmen(int teamID, int eventID){
-        insert.update(teamID, eventID);
-    }
-
-    public static void notTeilnehmen(int teamID, int eventID){
-        delete.update(teamID, eventID);
-    }
-
-    public static void deleteFuture(int teamID) {
-        deleteFuture.update(teamID);
-    }
-
-    public static Set<Team> getTeams(int eventID){
-        return selectTeams.listSelect(eventID).stream().map(tt -> Team.get(tt.teamId)).collect(Collectors.toSet()); // suboptimal performance (O(n) database queries)
-    }
-
-    public static Set<Event> getEvents(int teamID){
-        return selectEvents.listSelect(teamID).stream().map(tt -> Event.get(tt.eventId)).collect(Collectors.toSet()); // suboptimal performance (O(n) database queries)
-    }
-}

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

@@ -0,0 +1,97 @@
+/*
+ *   This file is a part of the SteamWar software.
+ *
+ *   Copyright (C) 2025 SteamWar.de-Serverteam
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU Affero General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU Affero General Public License for more details.
+ *
+ *   You should have received a copy of the GNU Affero General Public License
+ *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package de.steamwar.sql
+
+import de.steamwar.sql.internal.useDb
+import org.jetbrains.exposed.v1.core.IntegerColumnType
+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
+import org.jetbrains.exposed.v1.core.dao.id.EntityID
+import org.jetbrains.exposed.v1.core.eq
+import org.jetbrains.exposed.v1.dao.CompositeEntity
+import org.jetbrains.exposed.v1.dao.CompositeEntityClass
+import org.jetbrains.exposed.v1.jdbc.deleteWhere
+import org.jetbrains.exposed.v1.jdbc.insertIgnore
+
+object TeamTeilnahmeTable : CompositeIdTable("TeamTeilnahme") {
+    val teamId = reference("teamId", TeamTable)
+    val eventId = reference("eventId", EventTable)
+    val placement = integer("Placement").nullable()
+
+    override val primaryKey = PrimaryKey(teamId, eventId)
+
+    init {
+        addIdColumn(teamId)
+        addIdColumn(eventId)
+    }
+}
+
+class TeamTeilnahme(id: EntityID<CompositeID>) : CompositeEntity(id) {
+    companion object : CompositeEntityClass<TeamTeilnahme>(TeamTeilnahmeTable) {
+        @JvmStatic
+        fun nimmtTeil(teamId: Int, eventId: Int) = useDb {
+            find { (TeamTeilnahmeTable.teamId eq teamId) and (TeamTeilnahmeTable.eventId eq eventId) }.firstOrNull() != null
+        }
+
+        @JvmStatic
+        fun teilnehmen(teamId: Int, eventId: Int) = useDb {
+            TeamTeilnahmeTable.insertIgnore {
+                it[TeamTeilnahmeTable.teamId] = teamId
+                it[TeamTeilnahmeTable.eventId] = eventId
+            }
+        }
+
+        @JvmStatic
+        fun notTeilnehmen(teamId: Int, eventId: Int) = useDb {
+            TeamTeilnahmeTable.deleteWhere { (TeamTeilnahmeTable.teamId eq teamId) and (TeamTeilnahmeTable.eventId eq eventId) }
+        }
+
+        @JvmStatic
+        fun deleteFuture(teamId: Int) = useDb {
+            exec(
+                "DELETE t FROM TeamTeilnahme t INNER JOIN Event e ON t.EventID = e.EventID WHERE t.TeamID = ? AND e.Start > NOW()",
+                args = listOf(IntegerColumnType() to teamId)
+            )
+        }
+
+        @JvmStatic
+        fun getTeams(eventId: Int) = useDb {
+            find { TeamTeilnahmeTable.eventId eq eventId }.map { Team.byId(it.teamId.value) }.toSet()
+        }
+
+        @JvmStatic
+        fun getEvents(teamId: Int) = useDb {
+            find { TeamTeilnahmeTable.teamId eq teamId }.map { Event.byId(it.eventId.value) }.toSet()
+        }
+
+        @JvmStatic
+        fun getPlacement(team: Team, event: Event) = useDb {
+            get(CompositeID {
+                it[TeamTeilnahmeTable.teamId] = team.id
+                it[TeamTeilnahmeTable.eventId] = event.id
+            }).placement
+        }
+    }
+
+    val teamId by TeamTeilnahmeTable.teamId
+    val eventId by TeamTeilnahmeTable.eventId
+    var placement by TeamTeilnahmeTable.placement
+}

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

@@ -1,110 +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.sql;
-
-import de.steamwar.sql.internal.Field;
-import de.steamwar.sql.internal.SelectStatement;
-import de.steamwar.sql.internal.Statement;
-import de.steamwar.sql.internal.Table;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.SneakyThrows;
-import lombok.ToString;
-
-import java.security.MessageDigest;
-import java.security.SecureRandom;
-import java.sql.Timestamp;
-import java.util.Base64;
-import java.util.List;
-
-@AllArgsConstructor
-@Getter
-@ToString
-public class Token {
-    private static final Table<Token> table = new Table<>(Token.class);
-    private static final Statement insert = table.insertFields(true, "Name", "Owner", "Hash");
-    private static final SelectStatement<Token> get = table.select(Table.PRIMARY);
-    private static final SelectStatement<Token> listUser = table.selectFields("owner");
-    private static final SelectStatement<Token> getHash = table.selectFields("hash");
-    private static final Statement delete = table.delete(Table.PRIMARY);
-
-    @SneakyThrows
-    private static String getHash(String code) {
-        return Base64.getEncoder().encodeToString(MessageDigest.getInstance("SHA-512").digest(code.getBytes()));
-    }
-
-    @SneakyThrows
-    public static String createToken(String name, SteamwarUser owner) {
-        SecureRandom random = new SecureRandom();
-        byte[] bytes = new byte[20];
-        random.nextBytes(bytes);
-
-        String code = Base64.getEncoder().encodeToString(bytes);
-
-        String hash = getHash(code);
-        create(name, owner, hash);
-        return code;
-    }
-
-    public static Token getTokenByCode(String code) {
-        String hash = getHash(code);
-        return get(hash);
-    }
-
-    public static Token create(String name, SteamwarUser owner, String hash) {
-        int id = insert.insertGetKey(name, owner, hash);
-        return get(id);
-    }
-
-    public static Token get(int id) {
-        return get.select(id);
-    }
-
-    public static List<Token> listUser(SteamwarUser owner) {
-        return listUser.listSelect(owner);
-    }
-
-    public static Token get(String hash) {
-        return getHash.select(hash);
-    }
-
-    public static void delete(Token id) {
-        delete.update(id.getId());
-    }
-
-    @Field(keys = Table.PRIMARY, autoincrement = true)
-    private final int id;
-    @Field(keys = "NameOwner")
-    private final String name;
-    @Field(keys = "NameOwner")
-    private final int owner;
-    @Field
-    private final Timestamp created;
-    @Field
-    private final String hash;
-
-    public void delete() {
-        delete(this);
-    }
-
-    public SteamwarUser getOwner() {
-        return SteamwarUser.get(owner);
-    }
-}

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

@@ -0,0 +1,93 @@
+/*
+ *   This file is a part of the SteamWar software.
+ *
+ *   Copyright (C) 2025 SteamWar.de-Serverteam
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU Affero General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU Affero General Public License for more details.
+ *
+ *   You should have received a copy of the GNU Affero General Public License
+ *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package de.steamwar.sql
+
+import de.steamwar.sql.internal.useDb
+import org.jetbrains.exposed.v1.core.dao.id.EntityID
+import org.jetbrains.exposed.v1.core.dao.id.IntIdTable
+import org.jetbrains.exposed.v1.core.eq
+import org.jetbrains.exposed.v1.dao.IntEntity
+import org.jetbrains.exposed.v1.dao.IntEntityClass
+import org.jetbrains.exposed.v1.javatime.CurrentTimestamp
+import org.jetbrains.exposed.v1.javatime.timestamp
+import java.security.MessageDigest
+import java.security.SecureRandom
+import java.sql.Timestamp
+import java.util.*
+
+object TokenTable: IntIdTable("Token") {
+    val name = varchar("Name", 64)
+    val owner = reference("Owner", SteamwarUserTable)
+    val created = timestamp("Created").defaultExpression(CurrentTimestamp)
+    val hash = varchar("Hash", 88)
+}
+
+class Token(id: EntityID<Int>): IntEntity(id) {
+    companion object : IntEntityClass<Token>(TokenTable) {
+        private fun getHash(code: String) = Base64.getEncoder().encodeToString(MessageDigest.getInstance("SHA-512").digest(code.toByteArray()))
+
+        @JvmStatic
+        fun createToken(name: String, owner: SteamwarUser): String {
+            val random = SecureRandom();
+            val bytes = ByteArray(20)
+            random.nextBytes(bytes)
+
+            val code = Base64.getEncoder().encodeToString(bytes)
+
+            val hash = getHash(code)
+
+            useDb {
+                new {
+                    this.name = name
+                    this.owner = owner
+                    this.hash = hash
+                }
+            }
+
+            return code
+        }
+
+        @JvmStatic
+        fun getTokenByCode(code: String) = get(getHash(code))
+
+        @JvmStatic
+        fun get(hash: String) = useDb {
+            find { TokenTable.hash eq hash }.firstOrNull()
+        }
+
+        @JvmStatic
+        fun listUser(user: SteamwarUser) = useDb {
+            find { TokenTable.owner eq user.id }.toList()
+        }
+    }
+
+    var name by TokenTable.name
+        private set
+    var owner by TokenTable.owner.memoizedTransform({ it.id }, { SteamwarUser.byId(it.value)!! })
+        private set
+    var created by TokenTable.created.transform({ it.toInstant() }, { Timestamp.from(it) })
+        private set
+    var hash by TokenTable.hash
+        private set
+
+    override fun delete() = useDb {
+        super.delete()
+    }
+}

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

@@ -1,73 +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.sql;
-
-import de.steamwar.sql.internal.Field;
-import de.steamwar.sql.internal.SelectStatement;
-import de.steamwar.sql.internal.Statement;
-import de.steamwar.sql.internal.Table;
-import lombok.AllArgsConstructor;
-
-import java.util.UUID;
-
-@AllArgsConstructor
-public class UserConfig {
-
-    private static final Table<UserConfig> table = new Table<>(UserConfig.class);
-    private static final SelectStatement<UserConfig> select = table.select(Table.PRIMARY);
-    private static final Statement insert = table.insertAll();
-    private static final Statement delete = table.delete(Table.PRIMARY);
-
-    @Field(keys = {Table.PRIMARY})
-    private final int user;
-    @Field(keys = {Table.PRIMARY})
-    private final String config;
-    @Field
-    private final String value;
-
-    public static String getConfig(UUID player, String config) {
-        return getConfig(SteamwarUser.get(player).getId(), config);
-    }
-
-    public static String getConfig(int player, String config) {
-        UserConfig value = select.select(player, config);
-        return value != null ? value.value : null;
-    }
-
-    public static void updatePlayerConfig(UUID uuid, String config, String value) {
-        updatePlayerConfig(SteamwarUser.get(uuid).getId(), config, value);
-    }
-
-    public static void updatePlayerConfig(int id, String config, String value) {
-        if (value == null) {
-            removePlayerConfig(id, config);
-            return;
-        }
-        insert.update(id, config, value);
-    }
-
-    public static void removePlayerConfig(UUID uuid, String config) {
-        removePlayerConfig(SteamwarUser.get(uuid).getId(), config);
-    }
-
-    public static void removePlayerConfig(int id, String config) {
-        delete.update(id, config);
-    }
-}

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

@@ -0,0 +1,83 @@
+/*
+ *   This file is a part of the SteamWar software.
+ *
+ *   Copyright (C) 2025 SteamWar.de-Serverteam
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU Affero General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU Affero General Public License for more details.
+ *
+ *   You should have received a copy of the GNU Affero General Public License
+ *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package de.steamwar.sql
+
+import de.steamwar.sql.internal.useDb
+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
+import org.jetbrains.exposed.v1.core.dao.id.EntityID
+import org.jetbrains.exposed.v1.core.eq
+import org.jetbrains.exposed.v1.dao.CompositeEntity
+import org.jetbrains.exposed.v1.dao.CompositeEntityClass
+import org.jetbrains.exposed.v1.jdbc.upsert
+import java.util.*
+
+object UserConfigTable: CompositeIdTable("UserConfig") {
+    val userId = reference("User", SteamwarUserTable)
+    val config = varchar("Config", 32).entityId()
+    val value = text("Value", eagerLoading = true)
+
+    override val primaryKey = PrimaryKey(userId, config)
+
+    init {
+        addIdColumn(userId)
+    }
+}
+
+class UserConfig(id: EntityID<CompositeID>): CompositeEntity(id) {
+    val userId by UserConfigTable.userId
+    val config by UserConfigTable.config
+    var value by UserConfigTable.value
+
+    companion object: CompositeEntityClass<UserConfig>(UserConfigTable) {
+        @JvmStatic
+        fun getConfig(userId: Int, config: String) = useDb {
+            find { (UserConfigTable.userId eq userId) and (UserConfigTable.config eq config) }.firstOrNull()?.value
+        }
+
+        @JvmStatic
+        fun getConfig(user: UUID, config: String) = getConfig(SteamwarUser.get(user)!!.id.value, config)
+
+        @JvmStatic
+        fun updatePlayerConfig(id: Int, config: String, value: String?) = useDb {
+            if (value == null) {
+                removePlayerConfig(id, config)
+            } else {
+                UserConfigTable.upsert {
+                    it[UserConfigTable.userId] = id
+                    it[UserConfigTable.config] = config
+                    it[UserConfigTable.value] = value
+                }
+            }
+        }
+
+        @JvmStatic
+        fun updatePlayerConfig(user: UUID, config: String, value: String?) = updatePlayerConfig(SteamwarUser.get(user)!!.id.value, config, value)
+
+        @JvmStatic
+        fun removePlayerConfig(id: Int, config: String) = useDb {
+            find { (UserConfigTable.userId eq id) and (UserConfigTable.config eq config) }.firstOrNull()?.delete()
+        }
+
+        @JvmStatic
+        fun removePlayerConfig(user: UUID, config: String) = removePlayerConfig(SteamwarUser.get(user)!!.id.value, config)
+    }
+}

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

@@ -1,152 +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.sql;
-
-import de.steamwar.sql.internal.Field;
-import de.steamwar.sql.internal.SelectStatement;
-import de.steamwar.sql.internal.Statement;
-import de.steamwar.sql.internal.Table;
-import lombok.AllArgsConstructor;
-
-import java.util.*;
-import java.util.concurrent.ConcurrentHashMap;
-
-@AllArgsConstructor
-public class UserElo {
-
-    private static final int ELO_DEFAULT = 0;
-
-    private static final Map<String, Map<Integer, Optional<Integer>>> gameModeUserEloCache = new ConcurrentHashMap<>();
-    private static final Map<Integer, String> emblemCache = new ConcurrentHashMap<>();
-
-    public static void clear() {
-        gameModeUserEloCache.clear();
-        emblemCache.clear();
-    }
-
-    private static final Table<UserElo> table = new Table<>(UserElo.class);
-    private static final SelectStatement<UserElo> getElo = table.select(Table.PRIMARY);
-    private static final Statement setElo = table.insertAll();
-
-    private static final Statement place = new Statement("SELECT COUNT(*) AS Place FROM UserElo WHERE GameMode = ? AND Elo > ? AND Season = ?");
-    private static final Statement fightsOfSeason = new Statement("SELECT COUNT(*) AS Fights FROM FightPlayer INNER JOIN Fight F on FightPlayer.FightID = F.FightID WHERE UserID = ? AND GameMode = ? AND UNIX_TIMESTAMP(StartTime) + Duration >= UNIX_TIMESTAMP(?)");
-
-    @Field(keys = {Table.PRIMARY})
-    private final int season;
-    @Field(keys = {Table.PRIMARY})
-    private final String gameMode;
-    @Field(keys = {Table.PRIMARY})
-    private final int userId;
-    @Field
-    private final int elo;
-
-    public static int getEloOrDefault(int userID, String gameMode) {
-        return getElo(userID, gameMode).orElse(ELO_DEFAULT);
-    }
-
-    public static Optional<Integer> getElo(int userID, String gameMode) {
-        return gameModeUserEloCache.computeIfAbsent(gameMode, gm -> new HashMap<>()).computeIfAbsent(userID, uid -> Optional.ofNullable(getElo.select(Season.getSeason(), gameMode, userID)).map(userElo -> userElo.elo));
-    }
-
-    public static int getFightsOfSeason(int userID, String gameMode) {
-        return fightsOfSeason.select(rs -> {
-            if (rs.next())
-                return rs.getInt("Fights");
-            return 0;
-        }, userID, gameMode, Season.getSeasonStart());
-    }
-
-    public static void setElo(int userId, String gameMode, int elo) {
-        emblemCache.remove(userId);
-        gameModeUserEloCache.getOrDefault(gameMode, Collections.emptyMap()).remove(userId);
-        setElo.update(Season.getSeason(), gameMode, userId, elo);
-    }
-
-    public static int getPlacement(int elo, String gameMode) {
-        return place.select(rs -> {
-            if (rs.next())
-                return rs.getInt("Place") + 1;
-            return -1;
-        }, gameMode, elo, Season.getSeason());
-    }
-
-    public static String getEmblem(SteamwarUser user, List<String> rankedModes) {
-        return emblemCache.computeIfAbsent(user.getId(), userId -> {
-            int emblemProgression = -1;
-            for (String mode : rankedModes) {
-                if (UserElo.getFightsOfSeason(userId, mode) == 0) continue;
-                int progression = getProgression(userId, mode);
-                if (progression > emblemProgression) {
-                    emblemProgression = progression;
-                }
-            }
-            return toEmblem(emblemProgression);
-        });
-    }
-
-    public static String getEmblemProgression(String gameMode, int userId) {
-        switch (getProgression(userId, gameMode)) {
-            case -1:
-                return "§8❱❱❱❱ ❂";
-            case 0:
-                return "§e❱§8❱❱❱ ❂";
-            case 1:
-                return "§e❱❱§8❱❱ ❂";
-            case 2:
-                return "§e❱❱❱§8❱ ❂";
-            case 3:
-                return "§e❱❱❱❱§8 ❂";
-            case 4:
-                return "§8❱❱❱❱ §5❂";
-            default:
-                throw new SecurityException("Progression is not in range");
-        }
-    }
-
-    public static int getProgression(int userId, String gameMode) {
-        int elo = getElo(userId, gameMode).orElse(-1);
-        if (elo < 0) return -1;
-
-        if (elo < 150) return 0;
-        if (elo < 350) return 1;
-        if (elo < 600) return 2;
-        if (elo < 900) return 3;
-        return 4;
-    }
-
-    public static String toEmblem(int progression) {
-        switch(progression) {
-            case -1:
-                return "";
-            case 0:
-                return "§e❱ ";
-            case 1:
-                return "§e❱❱ ";
-            case 2:
-                return "§e❱❱❱ ";
-            case 3:
-                return "§e❱❱❱❱ ";
-            case 4:
-                return "§5❂ ";
-            default:
-                throw new SecurityException("Progression out of range");
-        }
-    }
-}

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

@@ -0,0 +1,170 @@
+/*
+ *   This file is a part of the SteamWar software.
+ *
+ *   Copyright (C) 2025 SteamWar.de-Serverteam
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU Affero General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU Affero General Public License for more details.
+ *
+ *   You should have received a copy of the GNU Affero General Public License
+ *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package de.steamwar.sql
+
+import de.steamwar.sql.internal.useDb
+import org.jetbrains.exposed.v1.core.*
+import org.jetbrains.exposed.v1.core.dao.id.CompositeID
+import org.jetbrains.exposed.v1.core.dao.id.CompositeIdTable
+import org.jetbrains.exposed.v1.core.dao.id.EntityID
+import org.jetbrains.exposed.v1.dao.CompositeEntity
+import org.jetbrains.exposed.v1.dao.CompositeEntityClass
+import org.jetbrains.exposed.v1.jdbc.insertIgnore
+import org.jetbrains.exposed.v1.jdbc.select
+import java.util.concurrent.ConcurrentHashMap
+
+object UserEloTable : CompositeIdTable("UserElo") {
+    val season = integer("Season").entityId()
+    val gameMode = varchar("GameMode", 16).entityId()
+    val userId = reference("UserID", SteamwarUserTable)
+    val elo = integer("Elo")
+
+    override val primaryKey = PrimaryKey(season, gameMode, userId)
+
+    init {
+        addIdColumn(season)
+        addIdColumn(gameMode)
+    }
+}
+
+class UserElo(id: EntityID<CompositeID>) : CompositeEntity(id) {
+    companion object : CompositeEntityClass<UserElo>(UserEloTable) {
+        private const val ELO_DEFAULT = 0
+
+        private val gameModeUserEloCache: MutableMap<String, MutableMap<Int, Int?>> = ConcurrentHashMap()
+        private val emblemCache: MutableMap<Int, String> = ConcurrentHashMap()
+
+        @JvmStatic
+        fun clear() {
+            gameModeUserEloCache.clear()
+            emblemCache.clear()
+        }
+
+        @JvmStatic
+        fun getEloOrDefault(userId: Int, gameMode: String) =
+            getElo(userId, gameMode) ?: ELO_DEFAULT
+
+        @JvmStatic
+        fun getElo(userId: Int, gameMode: String) =
+            gameModeUserEloCache.getOrPut(gameMode) { mutableMapOf() }
+                .getOrPut(userId) { getEloFromDb(userId, gameMode)?.elo }
+
+        private fun getEloFromDb(userId: Int, gameMode: String) = useDb {
+            find { (UserEloTable.userId eq userId) and (UserEloTable.gameMode eq gameMode) and (UserEloTable.season eq Season.getSeason()) }.firstOrNull()
+        }
+
+        @JvmStatic
+        fun getFightsOfSeason(userId: Int, gamemode: String) = useDb {
+            exec(
+                "SELECT COUNT(*) AS Fights FROM FightPlayer INNER JOIN Fight F on FightPlayer.FightID = F.FightID WHERE UserID = ? AND GameMode = ? AND UNIX_TIMESTAMP(StartTime) + Duration >= UNIX_TIMESTAMP(?)",
+                args = listOf(
+                    IntegerColumnType() to userId,
+                    VarCharColumnType() to gamemode,
+                    VarCharColumnType() to Season.getSeasonStart()
+                )
+            ) {
+                return@exec if (it.next()) {
+                    it.getInt("Fights")
+                } else {
+                    0
+                }
+            } ?: 0
+        }
+
+        @JvmStatic
+        fun setElo(userId: Int, gameMode: String, elo: Int) {
+            emblemCache.remove(userId)
+            gameModeUserEloCache.getOrDefault(gameMode, mutableMapOf()).remove(userId)
+            useDb {
+                findByIdAndUpdate(CompositeID {
+                    it[UserEloTable.userId] = userId
+                    it[UserEloTable.gameMode] = gameMode
+                    it[UserEloTable.season] = Season.getSeason()
+                }) {
+                    it.elo = elo
+                } ?: UserEloTable.insertIgnore {
+                    it[UserEloTable.userId] = userId
+                    it[UserEloTable.gameMode] = gameMode
+                    it[UserEloTable.season] = Season.getSeason()
+                    it[UserEloTable.elo] = elo
+                }
+            }
+        }
+
+        @JvmStatic
+        fun getPlacement(elo: Int, gamemode: String) = useDb {
+            UserEloTable.select(UserEloTable.userId.count()).where {
+                (UserEloTable.gameMode eq gamemode) and (UserEloTable.elo greater elo) and (UserEloTable.season eq Season.getSeason())
+            }.firstOrNull()?.get(UserEloTable.userId.count())?.let { it + 1 }?.toInt() ?: -1
+        }
+
+        @JvmStatic
+        fun getEmblem(user: SteamwarUser, rankedModes: List<String>) =
+            emblemCache.getOrPut(user.id.value) {
+                var emblemProgression = -1
+                for (mode in rankedModes) {
+                    if (getFightsOfSeason(user.id.value, mode) == 0) continue
+                    val progression = getProgression(user.id.value, mode)
+                    if (progression > emblemProgression) {
+                        emblemProgression = progression
+                    }
+                }
+                return toEmblem(emblemProgression)
+            }
+
+        @JvmStatic
+        fun getEmblemProgression(gameMode: String, userId: Int): String =
+            when (getProgression(userId, gameMode)) {
+                -1 -> "§8❱❱❱❱ ❂"
+                0 -> "§e❱§8❱❱❱ ❂"
+                1 -> "§e❱❱§8❱❱ ❂"
+                2 -> "§e❱❱❱§8❱ ❂"
+                3 -> "§e❱❱❱❱§8 ❂"
+                4 -> "§8❱❱❱❱ §5❂"
+                else -> throw SecurityException("Progression is not in range")
+            }
+
+
+        @JvmStatic
+        fun getProgression(userId: Int, gameMode: String) = useDb { getElo(userId, gameMode) ?: -1 }.let {
+            when {
+                it < 0 -> -1
+                it < 150 -> 0
+                it < 350 -> 1
+                it < 600 -> 2
+                it < 900 -> 3
+                else -> 4
+            }
+        }
+
+        @JvmStatic
+        fun toEmblem(progression: Int) = when (progression) {
+            -1 -> ""
+            0 -> "§e❱ "
+            1 -> "§e❱❱ "
+            2 -> "§e❱❱❱ "
+            3 -> "§e❱❱❱❱ "
+            4 -> "§5❂ "
+            else -> throw SecurityException("Progression out of range")
+        }
+    }
+
+    var elo by UserEloTable.elo
+}

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

@@ -1,98 +0,0 @@
-/*
- *   This file is a part of the SteamWar software.
- *
- *   Copyright (C) 2025 SteamWar.de-Serverteam
- *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU Affero General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *   GNU Affero General Public License for more details.
- *
- *   You should have received a copy of the GNU Affero General Public License
- *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package de.steamwar.sql;
-
-import de.steamwar.sql.internal.*;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-import java.util.*;
-import java.util.stream.Collectors;
-
-public enum UserPerm {
-    PREFIX_NONE, // special value, not stored in database
-    PREFIX_YOUTUBER,
-    PREFIX_GUIDE,
-    PREFIX_BUILDER,
-    PREFIX_SUPPORTER,
-    PREFIX_MODERATOR,
-    PREFIX_DEVELOPER,
-    PREFIX_ADMIN,
-
-    RESTRICTED_MODS,
-    COLOR_CHAT,
-    TEAM,
-    TICKET_LOG,
-    BUILD,
-    CHECK,
-    MODERATION,
-    ADMINISTRATION;
-
-    public static final Map<UserPerm, Prefix> prefixes;
-    public static final Prefix emptyPrefix;
-    static {
-        // https://www.digminecraft.com/lists/color_list_pc.php
-        SqlTypeMapper.nameEnumMapper(UserPerm.class);
-        Map<UserPerm, Prefix> p = new EnumMap<>(UserPerm.class);
-        emptyPrefix = new Prefix("§7", "");
-        p.put(PREFIX_NONE, emptyPrefix);
-        p.put(PREFIX_YOUTUBER, new Prefix("§7", "YT"));
-        p.put(PREFIX_GUIDE, new Prefix("§x§e§7§6§2§e§d", "Guide")); // E762ED
-
-        p.put(PREFIX_SUPPORTER, new Prefix("§x§6§0§9§5§F§B", "Sup")); // 6095FB
-        p.put(PREFIX_MODERATOR, new Prefix("§x§F§F§A§2§5§C", "Mod")); // FFA25C
-        p.put(PREFIX_BUILDER, new Prefix("§x§6§0§F§F§6§A", "Arch")); // 60FF6A
-        p.put(PREFIX_DEVELOPER, new Prefix("§x§0§B§B§C§B§3", "Dev")); // 0BBCB3
-        p.put(PREFIX_ADMIN, new Prefix("§x§F§F§2§B§2§4", "Admin")); // FF2B24
-        prefixes = Collections.unmodifiableMap(p);
-    }
-
-    private static final Table<UserPermTable> table = new Table<>(UserPermTable.class, "UserPerm");
-    private static final SelectStatement<UserPermTable> getPerms = table.selectFields("user");
-    private static final Statement addPerm = table.insertAll();
-    private static final Statement removePerm = table.delete(Table.PRIMARY);
-
-    public static Set<UserPerm> getPerms(int user) {
-        return getPerms.listSelect(user).stream().map(up -> up.perm).collect(Collectors.toSet());
-    }
-
-    public static void addPerm(SteamwarUser user, UserPerm perm) {
-        addPerm.update(user, perm);
-    }
-
-    public static void removePerm(SteamwarUser user, UserPerm perm) {
-        removePerm.update(user, perm);
-    }
-
-    @Getter
-    @AllArgsConstructor
-    public static class Prefix {
-        private final String colorCode;
-        private final String chatPrefix;
-    }
-
-    @AllArgsConstructor
-    public static class UserPermTable {
-        @Field(keys = {Table.PRIMARY})
-        private final int user;
-        @Field(keys = {Table.PRIMARY})
-        private final UserPerm perm;
-    }
-}

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

@@ -0,0 +1,93 @@
+/*
+ *   This file is a part of the SteamWar software.
+ *
+ *   Copyright (C) 2025 SteamWar.de-Serverteam
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU Affero General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU Affero General Public License for more details.
+ *
+ *   You should have received a copy of the GNU Affero General Public License
+ *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package de.steamwar.sql
+
+import de.steamwar.sql.internal.useDb
+import org.jetbrains.exposed.v1.core.Table
+import org.jetbrains.exposed.v1.core.and
+import org.jetbrains.exposed.v1.core.eq
+import org.jetbrains.exposed.v1.jdbc.deleteWhere
+import org.jetbrains.exposed.v1.jdbc.insert
+import org.jetbrains.exposed.v1.jdbc.selectAll
+
+object UserPermTable: Table("UserPerm") {
+    val user = reference("User", SteamwarUserTable.id)
+    val perm = enumerationByName("Perm", 32, UserPerm::class)
+
+    override val primaryKey = PrimaryKey(user, perm)
+}
+
+enum class UserPerm {
+    PREFIX_NONE, // special value, not stored in database
+    PREFIX_YOUTUBER,
+    PREFIX_GUIDE,
+    PREFIX_BUILDER,
+    PREFIX_SUPPORTER,
+    PREFIX_MODERATOR,
+    PREFIX_DEVELOPER,
+    PREFIX_ADMIN,
+
+    RESTRICTED_MODS,
+    COLOR_CHAT,
+    TEAM,
+    TICKET_LOG,
+    BUILD,
+    CHECK,
+    MODERATION,
+    ADMINISTRATION;
+
+    companion object {
+        @JvmField
+        val emptyPrefix = Prefix("§7", "")
+        @JvmField
+        val prefixes = mapOf(
+            PREFIX_NONE to emptyPrefix,
+            PREFIX_YOUTUBER to Prefix("§7", "YT"),
+            PREFIX_GUIDE to Prefix("§x§e§7§6§2§e§d", "Guide"), // E762ED
+            PREFIX_SUPPORTER to Prefix("§x§6§0§9§5§F§B", "Sup"), // 6095FB
+            PREFIX_MODERATOR to Prefix("§x§F§F§A§2§5§C", "Mod"), // FFA25C
+            PREFIX_BUILDER to Prefix("§x§6§0§F§F§6§A", "Arch"), // 60FF6A
+            PREFIX_DEVELOPER to Prefix("§x§0§B§B§C§B§3", "Dev"), // 0BBCB3
+            PREFIX_ADMIN to Prefix("§x§F§F§2§B§2§4", "Admin"), // FF2B24
+        )
+
+        @JvmStatic
+        fun getPerms(id: Int) = useDb {
+            UserPermTable.selectAll().where { UserPermTable.user eq id }.map { it[UserPermTable.perm] }.toSet()
+        }
+
+        @JvmStatic
+        fun addPerm(user: SteamwarUser, perm: UserPerm) = useDb {
+            UserPermTable.insert {
+                it[UserPermTable.user] = user.getId()
+                it[UserPermTable.perm] = perm
+            }
+        }
+
+        @JvmStatic
+        fun removePerm(user: SteamwarUser, perm: UserPerm) = useDb {
+            UserPermTable.deleteWhere {
+                (UserPermTable.user eq user.getId()) and (UserPermTable.perm eq perm)
+            }
+        }
+    }
+
+    data class Prefix(val colorCode: String, val chatPrefix: String)
+}

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

@@ -100,7 +100,15 @@ final class YMLWrapper<M, W> {
     }
 
     public double getDouble(String path, double defaultValue) {
-        return get(path, defaultValue, Double.class::cast);
+        return get(path, defaultValue, o -> {
+            if (o instanceof Integer) {
+                return (Double) (double) (Integer) o;
+            } else if (o instanceof Double) {
+                return (Double) o;
+            } else {
+                throw new ClassCastException(o + " is not a double or integer");
+            }
+        });
     }
 
     public boolean getBoolean(String path, boolean defaultValue) {
@@ -139,7 +147,7 @@ final class YMLWrapper<M, W> {
         if (list.isEmpty()) {
             return Collections.emptyList();
         } else {
-            return Collections.unmodifiableList(list.stream().map(SchematicType::fromDB).collect(Collectors.toList()));
+            return Collections.unmodifiableList(list.stream().map(SchematicType::fromDB).filter(Objects::nonNull).collect(Collectors.toList()));
         }
     }
 

CommonCore/SQL/src/de/steamwar/sql/internal/Field.java

@@ -1,34 +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.sql.internal;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-@Target(ElementType.FIELD)
-@Retention(RetentionPolicy.RUNTIME)
-public @interface Field {
-    String[] keys() default {};
-    String def() default "";
-    boolean nullable() default false;
-    boolean autoincrement() default false;
-}

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

@@ -0,0 +1,88 @@
+/*
+ *   This file is a part of the SteamWar software.
+ *
+ *   Copyright (C) 2025 SteamWar.de-Serverteam
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU Affero General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU Affero General Public License for more details.
+ *
+ *   You should have received a copy of the GNU Affero General Public License
+ *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package de.steamwar.sql.internal
+
+import org.intellij.lang.annotations.Language
+import org.jetbrains.exposed.v1.core.ColumnType
+import org.jetbrains.exposed.v1.core.Expression
+import org.jetbrains.exposed.v1.core.ResultRow
+import org.jetbrains.exposed.v1.core.statements.StatementType
+import org.jetbrains.exposed.v1.dao.IntEntity
+import org.jetbrains.exposed.v1.dao.IntEntityClass
+import org.jetbrains.exposed.v1.jdbc.Database
+import org.jetbrains.exposed.v1.jdbc.JdbcTransaction
+import org.jetbrains.exposed.v1.jdbc.statements.jdbc.JdbcResult
+import org.jetbrains.exposed.v1.jdbc.transactions.TransactionManager
+import org.jetbrains.exposed.v1.jdbc.transactions.transaction
+import java.io.File
+import java.util.*
+
+object KotlinDatabase {
+    var db: Database? = null
+
+    fun ensureConnected() {
+        if(db != null) return
+
+        val file = File(System.getProperty("user.home"), "mysql.properties")
+
+        val properties = Properties()
+        properties.load(file.inputStream())
+
+        val host = properties.getProperty("host")
+        val port = properties.getProperty("port")
+        val database = properties.getProperty("database")
+        val username = properties.getProperty("user")
+        val password = properties.getProperty("password")
+
+        db = Database.connect(
+            "jdbc:mysql://$host:$port/$database",
+            driver = "com.mysql.cj.jdbc.Driver",
+            user = username,
+            password = password
+        )
+    }
+
+    fun close() {
+        db?.connector()?.close()
+        TransactionManager.defaultDatabase?.let { TransactionManager.closeAndUnregister(it) }
+        db = null
+    }
+}
+
+fun <T: Any?> useDb(statement: JdbcTransaction.() -> T): T {
+    KotlinDatabase.ensureConnected()
+    return TransactionManager.currentOrNull()?.statement() ?: transaction(KotlinDatabase.db) {
+        statement()
+    }
+}
+
+fun <T : IntEntity> IntEntityClass<T>.fromSql(
+    @Language("MySQL") stmt: String,
+    args: List<Pair<ColumnType<*>, Any?>>,
+    fieldIndex: Map<Expression<*>, Int>
+): List<T> = useDb {
+    exec(stmt, explicitStatementType = StatementType.SELECT, args = args) {
+        val list = mutableListOf<T>()
+        while (it.next()) {
+            list.add(wrapRow(ResultRow.create(JdbcResult(it), fieldIndex)))
+        }
+        list
+    } ?: listOf()
+}

CommonCore/SQL/src/de/steamwar/sql/internal/SQLConfig.java

@@ -29,6 +29,4 @@ public interface SQLConfig {
     Logger getLogger();
 
     int maxConnections();
-
-
 }

CommonCore/SQL/src/de/steamwar/sql/internal/SelectStatement.java

@@ -1,72 +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.sql.internal;
-
-import java.lang.reflect.InvocationTargetException;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.stream.Collectors;
-
-public class SelectStatement<T> extends Statement {
-    private final Table<T> table;
-
-    SelectStatement(Table<T> table, String... kfields) {
-        this(table, "SELECT " + Arrays.stream(table.fields).map(f -> f.identifier).collect(Collectors.joining(", ")) + " FROM " + table.name + " WHERE " + Arrays.stream(kfields).map(f -> f + " = ?").collect(Collectors.joining(" AND ")));
-    }
-
-    public SelectStatement(Table<T> table, String sql) {
-        super(sql);
-        this.table = table;
-    }
-
-    public T select(Object... values) {
-        return select(rs -> {
-            if (rs.next())
-                return read(rs);
-            return null;
-        }, values);
-    }
-
-    public List<T> listSelect(Object... values) {
-        return select(rs -> {
-            List<T> result = new ArrayList<>();
-            while (rs.next())
-                result.add(read(rs));
-
-            return result;
-        }, values);
-    }
-
-    private T read(ResultSet rs) throws SQLException {
-        Object[] params = new Object[table.fields.length];
-        for(int i = 0; i < params.length; i++) {
-            params[i] = table.fields[i].read(rs);
-        }
-
-        try {
-            return table.constructor.newInstance(params);
-        } catch (InstantiationException | IllegalAccessException | InvocationTargetException e) {
-            throw new SecurityException(e);
-        }
-    }
-}

CommonCore/SQL/src/de/steamwar/sql/internal/SqlTypeMapper.java

@@ -1,115 +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.sql.internal;
-
-import java.io.InputStream;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Timestamp;
-import java.util.Arrays;
-import java.util.IdentityHashMap;
-import java.util.Map;
-
-public final class SqlTypeMapper<T> {
-    private static final Map<Class<?>, SqlTypeMapper<?>> mappers = new IdentityHashMap<>();
-
-    public static <T> SqlTypeMapper<T> getMapper(Class<?> clazz) {
-        SqlTypeMapper<T> result = (SqlTypeMapper<T>) mappers.get(clazz);
-
-        if(result == null)
-            throw new SecurityException("Unregistered mapper requested: " + clazz.getName());
-
-        return result;
-    }
-
-    public static <T extends Enum<T>> void ordinalEnumMapper(Class<T> type) {
-        T[] enumConstants = type.getEnumConstants();
-        new SqlTypeMapper<>(
-                type,
-                "INTEGER(" + (int)Math.ceil(enumConstants.length/256.0) + ")",
-                (rs, identifier) -> enumConstants[rs.getInt(identifier)],
-                (st, index, value) -> st.setInt(index, value.ordinal())
-        );
-    }
-
-    public static <T extends Enum<T>> void nameEnumMapper(Class<T> type) {
-        new SqlTypeMapper<>(
-                type,
-                "VARCHAR(" + Arrays.stream(type.getEnumConstants()).map(e -> e.name().length()).max(Integer::compareTo).orElse(0) + ")",
-                (rs, identifier) -> Enum.valueOf(type, rs.getString(identifier)),
-                (st, index, value) -> st.setString(index, value.name())
-        );
-    }
-
-    static {
-        primitiveMapper(boolean.class, Boolean.class, "BOOLEAN", ResultSet::getBoolean, PreparedStatement::setBoolean);
-        primitiveMapper(byte.class, Byte.class, "INTEGER(1)", ResultSet::getByte, PreparedStatement::setByte);
-        primitiveMapper(short.class, Short.class, "INTEGER(2)", ResultSet::getShort, PreparedStatement::setShort);
-        primitiveMapper(int.class, Integer.class, "INTEGER", ResultSet::getInt, PreparedStatement::setInt);
-        primitiveMapper(long.class, Long.class, "INTEGER(8)", ResultSet::getLong, PreparedStatement::setLong);
-        primitiveMapper(float.class, Float.class, "REAL", ResultSet::getFloat, PreparedStatement::setFloat);
-        primitiveMapper(double.class, Double.class, "REAL", ResultSet::getDouble, PreparedStatement::setDouble);
-        new SqlTypeMapper<>(String.class, "TEXT", ResultSet::getString, PreparedStatement::setString);
-        new SqlTypeMapper<>(Timestamp.class, "TIMESTAMP", ResultSet::getTimestamp, PreparedStatement::setTimestamp);
-        new SqlTypeMapper<>(InputStream.class, "BLOB", ResultSet::getBinaryStream, PreparedStatement::setBinaryStream);
-    }
-
-    private static <T> void primitiveMapper(Class<T> primitive, Class<T> wrapped, String sqlType, SQLReader<T> reader, SQLWriter<T> writer) {
-        new SqlTypeMapper<>(primitive, sqlType, reader, writer);
-        new SqlTypeMapper<>(wrapped, sqlType, (rs, identifier) -> {
-            T value = reader.read(rs, identifier);
-            return rs.wasNull() ? null : value;
-        }, writer);
-    }
-
-    private final String sqlType;
-    private final SQLReader<T> reader;
-    private final SQLWriter<T> writer;
-
-    public SqlTypeMapper(Class<T> clazz, String sqlType, SQLReader<T> reader, SQLWriter<T> writer) {
-        this.sqlType = sqlType;
-        this.reader = reader;
-        this.writer = writer;
-        mappers.put(clazz, this);
-    }
-
-    public T read(ResultSet rs, String identifier) throws SQLException {
-        return reader.read(rs, identifier);
-    }
-
-    public void write(PreparedStatement st, int index, Object value) throws SQLException {
-        writer.write(st, index, (T) value);
-    }
-
-    public String sqlType() {
-        return sqlType;
-    }
-
-    @FunctionalInterface
-    public interface SQLReader<T> {
-        T read(ResultSet rs, String identifier) throws SQLException;
-    }
-
-    @FunctionalInterface
-    public interface SQLWriter<T> {
-        void write(PreparedStatement st, int index, T value) throws SQLException;
-    }
-}

CommonCore/SQL/src/de/steamwar/sql/internal/Statement.java

@@ -1,298 +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.sql.internal;
-
-import java.io.File;
-import java.io.FileReader;
-import java.io.IOException;
-import java.sql.*;
-import java.util.*;
-import java.util.function.Consumer;
-import java.util.function.Supplier;
-import java.util.function.UnaryOperator;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-public class Statement implements AutoCloseable {
-
-    private static final Logger logger = SQLConfig.impl.getLogger();
-
-    private static final List<Statement> statements = new ArrayList<>();
-    private static final Deque<Connection> connections = new ArrayDeque<>();
-    private static final int MAX_CONNECTIONS;
-    private static final Supplier<Connection> conProvider;
-    static final Consumer<Table<?>> schemaCreator;
-    static final String ON_DUPLICATE_KEY;
-    static final UnaryOperator<String> upsertWrapper;
-    public static final String NULL_SAFE_EQUALS;
-
-    private static final boolean MYSQL_MODE;
-    private static final boolean PRODUCTION_DATABASE;
-
-    static {
-        File file = new File(System.getProperty("user.home"), "mysql.properties");
-        MYSQL_MODE = file.exists();
-
-        if(MYSQL_MODE) {
-            Properties properties = new Properties();
-            try {
-                properties.load(new FileReader(file));
-            } catch (IOException e) {
-                throw new SecurityException("Could not load SQL connection", e);
-            }
-
-            String url = "jdbc:mysql://" + properties.getProperty("host") + ":" + properties.getProperty("port") + "/" + properties.getProperty("database") + "?useServerPrepStmts=true";
-            String user = properties.getProperty("user");
-            String password = properties.getProperty("password");
-
-            PRODUCTION_DATABASE = "production".equals(properties.getProperty("database"));
-            MAX_CONNECTIONS = SQLConfig.impl.maxConnections();
-            conProvider = () -> {
-                try {
-                    return DriverManager.getConnection(url, user, password);
-                } catch (SQLException e) {
-                    throw new SecurityException("Could not create MySQL connection", e);
-                }
-            };
-            schemaCreator = table -> {};
-            ON_DUPLICATE_KEY = " ON DUPLICATE KEY UPDATE ";
-            upsertWrapper = f -> f + " = VALUES(" + f + ")";
-            NULL_SAFE_EQUALS = " <=> ";
-        } else {
-            Connection connection;
-
-            try {
-                Class.forName("org.sqlite.JDBC");
-                connection = DriverManager.getConnection("jdbc:sqlite:" + System.getProperty("user.home") + "/standalone.db");
-            } catch (SQLException | ClassNotFoundException e) {
-                throw new SecurityException("Could not create sqlite connection", e);
-            }
-
-            PRODUCTION_DATABASE = false;
-            MAX_CONNECTIONS = 1;
-            conProvider = () -> connection;
-            schemaCreator = Table::ensureExistanceInSqlite;
-            ON_DUPLICATE_KEY = " ON CONFLICT DO UPDATE SET ";
-            upsertWrapper = f -> f + " = " + f;
-            NULL_SAFE_EQUALS = " IS ";
-        }
-    }
-
-    private static volatile int connectionBudget = MAX_CONNECTIONS;
-
-    public static void closeAll() {
-        synchronized (connections) {
-            while(connectionBudget < MAX_CONNECTIONS) {
-                if(connections.isEmpty())
-                    waitOnConnections();
-                else
-                    closeConnection(aquireConnection());
-            }
-        }
-    }
-
-    public static boolean mysqlMode() {
-        return MYSQL_MODE;
-    }
-
-    public static boolean productionDatabase() {
-        return PRODUCTION_DATABASE;
-    }
-
-    private final boolean returnGeneratedKeys;
-    private final String sql;
-    private final Map<Connection, PreparedStatement> cachedStatements = new HashMap<>();
-
-    public Statement(String sql) {
-        this(sql, false);
-    }
-
-    public Statement(String sql, boolean returnGeneratedKeys) {
-        this.sql = sql;
-        this.returnGeneratedKeys = returnGeneratedKeys;
-        synchronized (statements) {
-            statements.add(this);
-        }
-    }
-
-    public <T> T select(ResultSetUser<T> user, Object... objects) {
-        return withConnection(st -> {
-            boolean res = st.execute();
-            if(!res) {
-                throw new SecurityException("No result set for select statement");
-            }
-            ResultSet rs = st.getResultSet();
-            T result = user.use(rs);
-            rs.close();
-            return result;
-        }, objects);
-    }
-
-    public void update(Object... objects) {
-        withConnection(PreparedStatement::executeUpdate, objects);
-    }
-
-    public int insertGetKey(Object... objects) {
-        return withConnection(st -> {
-            st.executeUpdate();
-            ResultSet rs = st.getGeneratedKeys();
-            rs.next();
-            return rs.getInt(1);
-        }, objects);
-    }
-
-    public String getSql() {
-        return sql;
-    }
-
-    private <T> T withConnection(SQLRunnable<T> runnable, Object... objects) {
-        Connection connection = aquireConnection();
-        T result;
-
-        try {
-            result = tryWithConnection(connection, runnable, objects);
-        } catch (Throwable e) {
-            if(connectionInvalid(connection)) {
-                closeConnection(connection);
-
-                return withConnection(runnable, objects);
-            } else {
-                synchronized (connections) {
-                    connections.push(connection);
-                    connections.notify();
-                }
-
-                throw new SecurityException("Failing sql statement", e);
-            }
-        }
-
-        synchronized (connections) {
-            connections.push(connection);
-            connections.notify();
-        }
-
-        return result;
-    }
-
-    private boolean connectionInvalid(Connection connection) {
-        try {
-            return connection.isClosed() || !connection.isValid(1);
-        } catch (SQLException e) {
-            logger.log(Level.INFO, "Could not check SQL connection status", e); // No database logging possible at this state
-            return true;
-        }
-    }
-
-    private <T> T tryWithConnection(Connection connection, SQLRunnable<T> runnable, Object... objects) throws SQLException {
-        PreparedStatement st = cachedStatements.get(connection);
-        if(st == null) {
-            if(returnGeneratedKeys)
-                st = connection.prepareStatement(sql, java.sql.Statement.RETURN_GENERATED_KEYS);
-            else
-                st = connection.prepareStatement(sql);
-            cachedStatements.put(connection, st);
-        }
-
-        for (int i = 0; i < objects.length; i++) {
-            Object o = objects[i];
-            if(o != null)
-                SqlTypeMapper.getMapper(o.getClass()).write(st, i+1, o);
-            else
-                st.setNull(i+1, Types.NULL);
-        }
-
-        return runnable.run(st);
-    }
-
-    @Override
-    public void close() {
-        cachedStatements.values().forEach(st -> closeStatement(st, false));
-        cachedStatements.clear();
-        synchronized (statements) {
-            statements.remove(this);
-        }
-    }
-
-    private void close(Connection connection) {
-        PreparedStatement st = cachedStatements.remove(connection);
-        if(st != null)
-            closeStatement(st, true);
-    }
-
-    private static Connection aquireConnection() {
-        synchronized (connections) {
-            while(connections.isEmpty() && connectionBudget <= 0)
-                waitOnConnections();
-
-            if(!connections.isEmpty()) {
-                return connections.pop();
-            } else {
-                Connection connection = conProvider.get();
-                connectionBudget--;
-                return connection;
-            }
-        }
-    }
-
-    private static void closeConnection(Connection connection) {
-        synchronized (statements) {
-            for (Statement statement : statements) {
-                statement.close(connection);
-            }
-        }
-        try {
-            connection.close();
-        } catch (SQLException e) {
-            logger.log(Level.INFO, "Could not close connection", e);
-        }
-
-        synchronized (connections) {
-            connectionBudget++;
-            connections.notify();
-        }
-    }
-
-    private static void waitOnConnections() {
-        synchronized (connections) {
-            try {
-                connections.wait();
-            } catch (InterruptedException e) {
-                Thread.currentThread().interrupt();
-            }
-        }
-    }
-
-    private static void closeStatement(PreparedStatement st, boolean silent) {
-        try {
-            st.close();
-        } catch (SQLException e) {
-            if(!silent)
-                logger.log(Level.INFO, "Could not close statement", e);
-        }
-    }
-
-    public interface ResultSetUser<T> {
-        T use(ResultSet rs) throws SQLException;
-    }
-
-    private interface SQLRunnable<T> {
-        T run(PreparedStatement st) throws SQLException;
-    }
-}

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

@@ -0,0 +1,60 @@
+/*
+ *   This file is a part of the SteamWar software.
+ *
+ *   Copyright (C) 2025 SteamWar.de-Serverteam
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU Affero General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU Affero General Public License for more details.
+ *
+ *   You should have received a copy of the GNU Affero General Public License
+ *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package de.steamwar.sql.internal
+
+import de.steamwar.sql.SteamwarUser
+import org.jetbrains.exposed.v1.core.BooleanColumnType
+import org.jetbrains.exposed.v1.core.IntegerColumnType
+import org.jetbrains.exposed.v1.core.LongColumnType
+import org.jetbrains.exposed.v1.core.VarCharColumnType
+import org.jetbrains.exposed.v1.jdbc.name
+import org.jetbrains.exposed.v1.jdbc.transactions.TransactionManager
+import java.sql.ResultSet
+import java.sql.SQLException
+
+data class Statement(val statement: String) {
+    companion object {
+        @JvmStatic
+        fun closeAll() = KotlinDatabase.close()
+
+        @JvmStatic
+        fun productionDatabase() = TransactionManager.defaultDatabase?.name == "production"
+    }
+
+    fun <T> select(user: ResultSetUser<T>, vararg args: Any): T? = useDb {
+        exec(statement, args = args.map { getArgType(it) }) {
+            user.use(it)
+        }
+    }
+
+    private fun getArgType(obj: Any) = when(obj) {
+        is String -> VarCharColumnType() to obj
+        is Int -> IntegerColumnType() to obj
+        is Long -> LongColumnType() to obj
+        is Boolean -> BooleanColumnType() to obj
+        is SteamwarUser -> IntegerColumnType() to obj.id.value
+        else -> error("Unknown type: ${obj::class.simpleName}")
+    }
+
+    interface ResultSetUser<T> {
+        @Throws(SQLException::class)
+        fun use(rs: ResultSet): T?
+    }
+}

CommonCore/SQL/src/de/steamwar/sql/internal/Table.java

@@ -1,141 +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.sql.internal;
-
-import java.lang.reflect.Constructor;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.*;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-
-public class Table<T> {
-    public static final String PRIMARY = "primary";
-
-    final String name;
-    final TableField<?>[] fields;
-    private final Map<String, TableField<?>> fieldsByIdentifier = new HashMap<>();
-    final Constructor<T> constructor;
-
-    private final Map<String, TableField<?>[]> keys;
-
-
-    public Table(Class<T> clazz) {
-        this(clazz, clazz.getSimpleName());
-    }
-
-    public Table(Class<T> clazz, String name) {
-        this.name = name;
-        this.fields = Arrays.stream(clazz.getDeclaredFields()).filter(field -> field.isAnnotationPresent(Field.class)).map(TableField::new).toArray(TableField[]::new);
-        try {
-            this.constructor = clazz.getDeclaredConstructor(Arrays.stream(clazz.getDeclaredFields()).filter(field -> field.isAnnotationPresent(Field.class)).map(java.lang.reflect.Field::getType).toArray(Class[]::new));
-        } catch (NoSuchMethodException e) {
-            throw new SecurityException(e);
-        }
-
-        keys = Arrays.stream(fields).flatMap(field -> Arrays.stream(field.field.keys())).distinct().collect(Collectors.toMap(Function.identity(), key -> Arrays.stream(fields).filter(field -> Arrays.asList(field.field.keys()).contains(key)).toArray(TableField[]::new)));
-
-        for (TableField<?> field : fields) {
-            fieldsByIdentifier.put(field.identifier.toLowerCase(), field);
-        }
-
-        Statement.schemaCreator.accept(this);
-    }
-
-    public SelectStatement<T> select(String name) {
-        return selectFields(keyFields(name));
-    }
-    public SelectStatement<T> selectFields(String... kfields) {
-        return new SelectStatement<>(this, kfields);
-    }
-
-    public Statement update(String name, String... fields) {
-        return updateFields(fields, keyFields(name));
-    }
-
-    public Statement updateField(String field, String... kfields) {
-        return updateFields(new String[]{field}, kfields);
-    }
-
-    public Statement updateFields(String[] fields, String... kfields) {
-        return new Statement("UPDATE " + name + " SET " + Arrays.stream(fields).map(f -> f + " = ?").collect(Collectors.joining(", ")) + " WHERE " + Arrays.stream(kfields).map(f -> f + " = ?").collect(Collectors.joining(" AND ")));
-    }
-
-    public Statement insert(String name) {
-        return insertFields(keyFields(name));
-    }
-
-    public Statement insertAll() {
-        return insertAll(false);
-    }
-
-    public Statement insertAll(boolean returnGeneratedKeys) {
-        return insertFields(returnGeneratedKeys, Arrays.stream(fields).map(f -> f.identifier).toArray(String[]::new));
-    }
-
-    public Statement insertFields(String... fields) {
-        return insertFields(false, fields);
-    }
-
-    public Statement insertFields(boolean returnGeneratedKeys, String... fields) {
-        List<String> nonKeyFields = Arrays.stream(fields).filter(f -> fieldsByIdentifier.get(f.toLowerCase()).field.keys().length == 0).collect(Collectors.toList());
-        return new Statement("INSERT INTO " + name + " (" + String.join(", ", fields) + ") VALUES (" + Arrays.stream(fields).map(f -> "?").collect(Collectors.joining(", ")) + ")" + (nonKeyFields.isEmpty() ? "" : Statement.ON_DUPLICATE_KEY + nonKeyFields.stream().map(Statement.upsertWrapper).collect(Collectors.joining(", "))), returnGeneratedKeys);
-    }
-
-    public Statement delete(String name) {
-        return deleteFields(keyFields(name));
-    }
-
-    public Statement deleteFields(String... kfields) {
-        return new Statement("DELETE FROM " + name + " WHERE " + Arrays.stream(kfields).map(f -> f + " = ?").collect(Collectors.joining(" AND ")));
-    }
-
-    void ensureExistanceInSqlite() {
-        try (Statement statement = new Statement(
-                "CREATE TABLE IF NOT EXISTS " + name + "(" +
-                        Arrays.stream(fields).map(field -> field.identifier + " " + field.mapper.sqlType() + (field.field.nullable() ? " DEFAULT NULL" : " NOT NULL") + (field.field.nullable() || field.field.def().equals("") ? "" : " DEFAULT " + field.field.def())).collect(Collectors.joining(", ")) +
-                        keys.entrySet().stream().map(key -> (key.getKey().equals(PRIMARY) ? ", PRIMARY KEY(" : ", UNIQUE (") + Arrays.stream(key.getValue()).map(field -> field.identifier).collect(Collectors.joining(", ")) + ")").collect(Collectors.joining(" ")) +
-                ")")) {
-            statement.update();
-        }
-    }
-
-    private String[] keyFields(String name) {
-        return Arrays.stream(keys.get(name)).map(f -> f.identifier).toArray(String[]::new);
-    }
-
-    static class TableField<T> {
-
-        final String identifier;
-
-        final SqlTypeMapper<T> mapper;
-        private final Field field;
-
-        private TableField(java.lang.reflect.Field field) {
-            this.identifier = field.getName();
-            this.mapper = SqlTypeMapper.getMapper(field.getType());
-            this.field = field.getAnnotation(Field.class);
-        }
-
-        T read(ResultSet rs) throws SQLException {
-            return mapper.read(rs, identifier);
-        }
-    }
-}

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

@@ -0,0 +1,11 @@
+package de.steamwar.fightsystem.utils;
+
+import net.minecraft.server.MinecraftServer;
+
+public class TpsWarper21 implements TpsWarper {
+
+  @Override
+  public void warp(float tps) {
+    MinecraftServer.getServer().tickRateManager().setTickRate(tps);
+  }
+}

FightSystem/FightSystem_8/src/de/steamwar/fightsystem/utils/TpsWarper8.java

@@ -0,0 +1,11 @@
+package de.steamwar.fightsystem.utils;
+
+import de.steamwar.core.TPSWarpUtils;
+
+public class TpsWarper8 implements TpsWarper {
+
+  @Override
+  public void warp(float tps) {
+    TPSWarpUtils.warp(tps);
+  }
+}

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

@@ -211,15 +211,15 @@ public class Config {
 
         int eventKampfID = Integer.parseInt(System.getProperty("fightID", "0"));
         if(eventKampfID >= 1){
-            EventKampf = EventFight.get(eventKampfID);
+            EventKampf = EventFight.byId(eventKampfID);
             if(EventKampf == null){
                 Bukkit.getLogger().log(Level.SEVERE, "Failed to load EventFight");
                 Bukkit.shutdown();
             }
 
             assert EventKampf != null;
-            Team team1 = Team.get(EventKampf.getTeamBlue());
-            Team team2 = Team.get(EventKampf.getTeamRed());
+            Team team1 = Team.byId(EventKampf.getTeamBlue());
+            Team team2 = Team.byId(EventKampf.getTeamRed());
 
             if(team1 == null || team2 == null){
                 Bukkit.getLogger().log(Level.SEVERE, "Failed to load Team");
@@ -239,7 +239,7 @@ public class Config {
             LiveReplay = SpectatePort != 0;
             Referees = Referee.get(Config.EventKampf.getEventID());
 
-            Event event = Event.get(EventKampf.getEventID());
+            Event event = Event.byId(EventKampf.getEventID());
             if(BothTeamsPublic) {
                 OnlyPublicSchematics = true;
                 MaximumTeamMembers = Integer.MAX_VALUE;

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

@@ -58,7 +58,7 @@ public class InfoCommand implements CommandExecutor {
 
             if(team.getSchematic() != 0) {
                 SchematicNode schematic = SchematicNode.getSchematicNode(team.getSchematic());
-                FightSystem.getMessage().send("INFO_SCHEMATIC", player, team.getColoredName(), schematic.getName(), SteamwarUser.get(schematic.getOwner()).getUserName(), schematic.getRank());
+                FightSystem.getMessage().send("INFO_SCHEMATIC", player, team.getColoredName(), schematic.getName(), SteamwarUser.byId(schematic.getOwner()).getUserName(), schematic.getRank());
             }
         }
         return false;

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

@@ -1,20 +1,18 @@
 /*
- *   This file is a part of the SteamWar software.
+ * This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2025 SteamWar.de-Serverteam
+ * 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 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.
+ * 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/>.
+ * 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.commands;
@@ -24,6 +22,7 @@ import de.steamwar.fightsystem.ArenaMode;
 import de.steamwar.fightsystem.FightSystem;
 import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.StateDependentCommand;
+import de.steamwar.fightsystem.utils.TpsWarper;
 import de.steamwar.linkage.Linked;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
@@ -39,15 +38,17 @@ public class TPSWarpCommand implements CommandExecutor {
 
     @Override
     public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        double tps;
+        float tps;
         try {
-            tps = Double.parseDouble(args[0]);
+            tps = Float.parseFloat(args[0]);
         } catch (NumberFormatException | ArrayIndexOutOfBoundsException e) {
             FightSystem.getMessage().send("TPSWARP_HELP", sender);
             return false;
         }
 
-        TPSWarpUtils.warp(tps);
+        TpsWarper warper = TpsWarper.impl;
+        warper.warp(tps);
+
         FightSystem.getMessage().broadcastActionbar("TPSWARP_SET", tps);
         return false;
     }

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

@@ -94,7 +94,7 @@ public class FightPlayer {
     }
 
     public SteamwarUser getUser() {
-        return SteamwarUser.get(id);
+        return SteamwarUser.byId(id);
     }
 
     public void ifAI(Consumer<AI> function) {

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

@@ -243,7 +243,7 @@ public class PacketProcessor implements Listener {
         int userId = source.readInt();
 
         execSync(() -> {
-            SteamwarUser user = SteamwarUser.get(userId);
+            SteamwarUser user = SteamwarUser.byId(userId);
             addREntity(entityId, new RPlayer(entityServer, user.getUUID(), user.getUserName(), Config.SpecSpawn));
             team.addEntry(user.getUserName());
 
@@ -549,7 +549,7 @@ public class PacketProcessor implements Listener {
     }
 
     private void pasteForTeam(int teamId, FightTeam fightTeam){
-        Team team = Team.get(teamId);
+        Team team = Team.byId(teamId);
         fightTeam.setPrefixAndName("§" + team.getTeamColor(), team.getTeamKuerzel());
         fightTeam.pasteTeamName();
     }

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

@@ -0,0 +1,10 @@
+package de.steamwar.fightsystem.utils;
+
+import de.steamwar.core.VersionDependent;
+import de.steamwar.fightsystem.FightSystem;
+
+public interface TpsWarper {
+  TpsWarper impl = VersionDependent.getVersionImpl(FightSystem.getPlugin());
+
+  void warp(float tps);
+}

KotlinCore/build.gradle.kts

@@ -27,11 +27,17 @@ tasks.build {
 }
 
 tasks.shadowJar {
-    exclude("org/**")
+    exclude("org/intellij/**")
 }
 
 dependencies {
-    compileOnly(libs.paperapi21)
-    compileOnly(libs.nms21)
+    compileOnly(libs.spigotapi)
     compileOnly(project(":SpigotCore"))
+
+    implementation(libs.exposedCore)
+    implementation(libs.exposedDao)
+    implementation(libs.exposedJdbc)
+    implementation(libs.exposedTime)
+    implementation(libs.mysql)
+    implementation("org.slf4j:slf4j-simple:2.0.17")
 }

KotlinCore/src/plugin.yml

@@ -2,4 +2,4 @@ name: KotlinCore
 version: '2.0.0'
 main: de.steamwar.kotlin.KotlinCore
 load: POSTWORLD
-api-version: '1.21'
+api-version: '1.13'