diff --git a/CommonCore/Linkage/build.gradle.kts b/CommonCore/Linkage/build.gradle.kts new file mode 100644 index 00000000..ed7a093d --- /dev/null +++ b/CommonCore/Linkage/build.gradle.kts @@ -0,0 +1,43 @@ +plugins { + id("java") +} + +group = "de.steamwar" +version = "" + +java { + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 +} + +tasks.compileJava { + options.encoding = "UTF-8" +} + +sourceSets { + main { + java { + srcDirs("src/") + } + resources { + srcDirs("src/") + exclude("**/*.java", "**/*.kt") + } + } + test { + java { + srcDirs("testsrc/") + } + resources { + srcDirs("testsrc/") + exclude("**/*.java", "**/*.kt") + } + } +} + +dependencies { + compileOnly("org.projectlombok:lombok:1.18.32") + annotationProcessor("org.projectlombok:lombok:1.18.32") + testCompileOnly("org.projectlombok:lombok:1.18.32") + testAnnotationProcessor("org.projectlombok:lombok:1.18.32") +} \ No newline at end of file diff --git a/CommonCore/src/de/steamwar/linkage/AllowedContexts.java b/CommonCore/Linkage/src/de/steamwar/linkage/AllowedContexts.java similarity index 100% rename from CommonCore/src/de/steamwar/linkage/AllowedContexts.java rename to CommonCore/Linkage/src/de/steamwar/linkage/AllowedContexts.java diff --git a/CommonCore/src/de/steamwar/linkage/Context.java b/CommonCore/Linkage/src/de/steamwar/linkage/Context.java similarity index 100% rename from CommonCore/src/de/steamwar/linkage/Context.java rename to CommonCore/Linkage/src/de/steamwar/linkage/Context.java diff --git a/CommonCore/src/de/steamwar/linkage/EventMode.java b/CommonCore/Linkage/src/de/steamwar/linkage/EventMode.java similarity index 100% rename from CommonCore/src/de/steamwar/linkage/EventMode.java rename to CommonCore/Linkage/src/de/steamwar/linkage/EventMode.java diff --git a/CommonCore/src/de/steamwar/linkage/LinkageProcessor.java b/CommonCore/Linkage/src/de/steamwar/linkage/LinkageProcessor.java similarity index 95% rename from CommonCore/src/de/steamwar/linkage/LinkageProcessor.java rename to CommonCore/Linkage/src/de/steamwar/linkage/LinkageProcessor.java index 29382a59..6d5d7b71 100644 --- a/CommonCore/src/de/steamwar/linkage/LinkageProcessor.java +++ b/CommonCore/Linkage/src/de/steamwar/linkage/LinkageProcessor.java @@ -1,20 +1,20 @@ /* - * This file is a part of the SteamWar software. + * This file is a part of the SteamWar software. * - * Copyright (C) 2022 SteamWar.de-Serverteam + * Copyright (C) 2024 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 . + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . */ package de.steamwar.linkage; @@ -36,7 +36,6 @@ import javax.lang.model.element.VariableElement; import javax.lang.model.type.DeclaredType; import javax.lang.model.type.TypeMirror; import javax.tools.Diagnostic; -import javax.tools.StandardLocation; import java.io.*; import java.lang.annotation.Annotation; import java.nio.file.Files; diff --git a/CommonCore/src/de/steamwar/linkage/LinkageType.java b/CommonCore/Linkage/src/de/steamwar/linkage/LinkageType.java similarity index 100% rename from CommonCore/src/de/steamwar/linkage/LinkageType.java rename to CommonCore/Linkage/src/de/steamwar/linkage/LinkageType.java diff --git a/CommonCore/src/de/steamwar/linkage/Linked.java b/CommonCore/Linkage/src/de/steamwar/linkage/Linked.java similarity index 100% rename from CommonCore/src/de/steamwar/linkage/Linked.java rename to CommonCore/Linkage/src/de/steamwar/linkage/Linked.java diff --git a/CommonCore/src/de/steamwar/linkage/LinkedInstance.java b/CommonCore/Linkage/src/de/steamwar/linkage/LinkedInstance.java similarity index 100% rename from CommonCore/src/de/steamwar/linkage/LinkedInstance.java rename to CommonCore/Linkage/src/de/steamwar/linkage/LinkedInstance.java diff --git a/CommonCore/src/de/steamwar/linkage/MaxVersion.java b/CommonCore/Linkage/src/de/steamwar/linkage/MaxVersion.java similarity index 100% rename from CommonCore/src/de/steamwar/linkage/MaxVersion.java rename to CommonCore/Linkage/src/de/steamwar/linkage/MaxVersion.java diff --git a/CommonCore/src/de/steamwar/linkage/MinVersion.java b/CommonCore/Linkage/src/de/steamwar/linkage/MinVersion.java similarity index 100% rename from CommonCore/src/de/steamwar/linkage/MinVersion.java rename to CommonCore/Linkage/src/de/steamwar/linkage/MinVersion.java diff --git a/CommonCore/src/de/steamwar/linkage/PluginCheck.java b/CommonCore/Linkage/src/de/steamwar/linkage/PluginCheck.java similarity index 100% rename from CommonCore/src/de/steamwar/linkage/PluginCheck.java rename to CommonCore/Linkage/src/de/steamwar/linkage/PluginCheck.java diff --git a/CommonCore/src/de/steamwar/linkage/api/Disable.java b/CommonCore/Linkage/src/de/steamwar/linkage/api/Disable.java similarity index 100% rename from CommonCore/src/de/steamwar/linkage/api/Disable.java rename to CommonCore/Linkage/src/de/steamwar/linkage/api/Disable.java diff --git a/CommonCore/src/de/steamwar/linkage/api/Enable.java b/CommonCore/Linkage/src/de/steamwar/linkage/api/Enable.java similarity index 100% rename from CommonCore/src/de/steamwar/linkage/api/Enable.java rename to CommonCore/Linkage/src/de/steamwar/linkage/api/Enable.java diff --git a/CommonCore/src/de/steamwar/linkage/api/Plain.java b/CommonCore/Linkage/src/de/steamwar/linkage/api/Plain.java similarity index 100% rename from CommonCore/src/de/steamwar/linkage/api/Plain.java rename to CommonCore/Linkage/src/de/steamwar/linkage/api/Plain.java diff --git a/CommonCore/src/de/steamwar/linkage/plan/BuildPlan.java b/CommonCore/Linkage/src/de/steamwar/linkage/plan/BuildPlan.java similarity index 100% rename from CommonCore/src/de/steamwar/linkage/plan/BuildPlan.java rename to CommonCore/Linkage/src/de/steamwar/linkage/plan/BuildPlan.java diff --git a/CommonCore/src/de/steamwar/linkage/plan/FieldBuilder.java b/CommonCore/Linkage/src/de/steamwar/linkage/plan/FieldBuilder.java similarity index 100% rename from CommonCore/src/de/steamwar/linkage/plan/FieldBuilder.java rename to CommonCore/Linkage/src/de/steamwar/linkage/plan/FieldBuilder.java diff --git a/CommonCore/src/de/steamwar/linkage/plan/MethodBuilder.java b/CommonCore/Linkage/src/de/steamwar/linkage/plan/MethodBuilder.java similarity index 100% rename from CommonCore/src/de/steamwar/linkage/plan/MethodBuilder.java rename to CommonCore/Linkage/src/de/steamwar/linkage/plan/MethodBuilder.java diff --git a/CommonCore/src/de/steamwar/linkage/plan/ParameterBuilder.java b/CommonCore/Linkage/src/de/steamwar/linkage/plan/ParameterBuilder.java similarity index 100% rename from CommonCore/src/de/steamwar/linkage/plan/ParameterBuilder.java rename to CommonCore/Linkage/src/de/steamwar/linkage/plan/ParameterBuilder.java diff --git a/CommonCore/src/de/steamwar/linkage/types/Disable_GENERIC.java b/CommonCore/Linkage/src/de/steamwar/linkage/types/Disable_GENERIC.java similarity index 100% rename from CommonCore/src/de/steamwar/linkage/types/Disable_GENERIC.java rename to CommonCore/Linkage/src/de/steamwar/linkage/types/Disable_GENERIC.java diff --git a/CommonCore/src/de/steamwar/linkage/types/Enable_GENERIC.java b/CommonCore/Linkage/src/de/steamwar/linkage/types/Enable_GENERIC.java similarity index 100% rename from CommonCore/src/de/steamwar/linkage/types/Enable_GENERIC.java rename to CommonCore/Linkage/src/de/steamwar/linkage/types/Enable_GENERIC.java diff --git a/CommonCore/src/de/steamwar/linkage/types/Listener_BUNGEE.java b/CommonCore/Linkage/src/de/steamwar/linkage/types/Listener_BUNGEE.java similarity index 100% rename from CommonCore/src/de/steamwar/linkage/types/Listener_BUNGEE.java rename to CommonCore/Linkage/src/de/steamwar/linkage/types/Listener_BUNGEE.java diff --git a/CommonCore/src/de/steamwar/linkage/types/Listener_SPIGOT.java b/CommonCore/Linkage/src/de/steamwar/linkage/types/Listener_SPIGOT.java similarity index 100% rename from CommonCore/src/de/steamwar/linkage/types/Listener_SPIGOT.java rename to CommonCore/Linkage/src/de/steamwar/linkage/types/Listener_SPIGOT.java diff --git a/CommonCore/src/de/steamwar/linkage/types/PacketHandler_GENERIC.java b/CommonCore/Linkage/src/de/steamwar/linkage/types/PacketHandler_GENERIC.java similarity index 100% rename from CommonCore/src/de/steamwar/linkage/types/PacketHandler_GENERIC.java rename to CommonCore/Linkage/src/de/steamwar/linkage/types/PacketHandler_GENERIC.java diff --git a/CommonCore/src/de/steamwar/linkage/types/Plain_GENERIC.java b/CommonCore/Linkage/src/de/steamwar/linkage/types/Plain_GENERIC.java similarity index 100% rename from CommonCore/src/de/steamwar/linkage/types/Plain_GENERIC.java rename to CommonCore/Linkage/src/de/steamwar/linkage/types/Plain_GENERIC.java diff --git a/CommonCore/src/de/steamwar/linkage/types/SWCommand_BUNGEE.java b/CommonCore/Linkage/src/de/steamwar/linkage/types/SWCommand_BUNGEE.java similarity index 100% rename from CommonCore/src/de/steamwar/linkage/types/SWCommand_BUNGEE.java rename to CommonCore/Linkage/src/de/steamwar/linkage/types/SWCommand_BUNGEE.java diff --git a/CommonCore/src/de/steamwar/linkage/types/SWCommand_SPIGOT.java b/CommonCore/Linkage/src/de/steamwar/linkage/types/SWCommand_SPIGOT.java similarity index 100% rename from CommonCore/src/de/steamwar/linkage/types/SWCommand_SPIGOT.java rename to CommonCore/Linkage/src/de/steamwar/linkage/types/SWCommand_SPIGOT.java diff --git a/CommonCore/Network/build.gradle.kts b/CommonCore/Network/build.gradle.kts new file mode 100644 index 00000000..f7845319 --- /dev/null +++ b/CommonCore/Network/build.gradle.kts @@ -0,0 +1,46 @@ +plugins { + id("java") +} + +group = "de.steamwar" +version = "" + +java { + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 +} + +tasks.compileJava { + options.encoding = "UTF-8" +} + +sourceSets { + main { + java { + srcDirs("src/") + } + resources { + srcDirs("src/") + exclude("**/*.java", "**/*.kt") + } + } + test { + java { + srcDirs("testsrc/") + } + resources { + srcDirs("testsrc/") + exclude("**/*.java", "**/*.kt") + } + } +} + +dependencies { + compileOnly("org.projectlombok:lombok:1.18.32") + annotationProcessor("org.projectlombok:lombok:1.18.32") + testCompileOnly("org.projectlombok:lombok:1.18.32") + testAnnotationProcessor("org.projectlombok:lombok:1.18.32") + + testImplementation("junit:junit:4.13.2") + testImplementation("org.hamcrest:hamcrest:2.2") +} \ No newline at end of file diff --git a/CommonCore/src/de/steamwar/network/packets/MetaInfos.java b/CommonCore/Network/src/de/steamwar/network/packets/MetaInfos.java similarity index 100% rename from CommonCore/src/de/steamwar/network/packets/MetaInfos.java rename to CommonCore/Network/src/de/steamwar/network/packets/MetaInfos.java diff --git a/CommonCore/src/de/steamwar/network/packets/NetworkPacket.java b/CommonCore/Network/src/de/steamwar/network/packets/NetworkPacket.java similarity index 100% rename from CommonCore/src/de/steamwar/network/packets/NetworkPacket.java rename to CommonCore/Network/src/de/steamwar/network/packets/NetworkPacket.java diff --git a/CommonCore/src/de/steamwar/network/packets/PacketHandler.java b/CommonCore/Network/src/de/steamwar/network/packets/PacketHandler.java similarity index 100% rename from CommonCore/src/de/steamwar/network/packets/PacketHandler.java rename to CommonCore/Network/src/de/steamwar/network/packets/PacketHandler.java diff --git a/CommonCore/src/de/steamwar/network/packets/client/ExecuteCommandPacket.java b/CommonCore/Network/src/de/steamwar/network/packets/client/ExecuteCommandPacket.java similarity index 100% rename from CommonCore/src/de/steamwar/network/packets/client/ExecuteCommandPacket.java rename to CommonCore/Network/src/de/steamwar/network/packets/client/ExecuteCommandPacket.java diff --git a/CommonCore/src/de/steamwar/network/packets/client/ImALobbyPacket.java b/CommonCore/Network/src/de/steamwar/network/packets/client/ImALobbyPacket.java similarity index 100% rename from CommonCore/src/de/steamwar/network/packets/client/ImALobbyPacket.java rename to CommonCore/Network/src/de/steamwar/network/packets/client/ImALobbyPacket.java diff --git a/CommonCore/src/de/steamwar/network/packets/client/InventoryCallbackPacket.java b/CommonCore/Network/src/de/steamwar/network/packets/client/InventoryCallbackPacket.java similarity index 100% rename from CommonCore/src/de/steamwar/network/packets/client/InventoryCallbackPacket.java rename to CommonCore/Network/src/de/steamwar/network/packets/client/InventoryCallbackPacket.java diff --git a/CommonCore/src/de/steamwar/network/packets/client/PrepareSchemPacket.java b/CommonCore/Network/src/de/steamwar/network/packets/client/PrepareSchemPacket.java similarity index 100% rename from CommonCore/src/de/steamwar/network/packets/client/PrepareSchemPacket.java rename to CommonCore/Network/src/de/steamwar/network/packets/client/PrepareSchemPacket.java diff --git a/CommonCore/src/de/steamwar/network/packets/client/RequestSchematicSearchPacket.java b/CommonCore/Network/src/de/steamwar/network/packets/client/RequestSchematicSearchPacket.java similarity index 100% rename from CommonCore/src/de/steamwar/network/packets/client/RequestSchematicSearchPacket.java rename to CommonCore/Network/src/de/steamwar/network/packets/client/RequestSchematicSearchPacket.java diff --git a/CommonCore/src/de/steamwar/network/packets/common/FightEndsPacket.java b/CommonCore/Network/src/de/steamwar/network/packets/common/FightEndsPacket.java similarity index 100% rename from CommonCore/src/de/steamwar/network/packets/common/FightEndsPacket.java rename to CommonCore/Network/src/de/steamwar/network/packets/common/FightEndsPacket.java diff --git a/CommonCore/src/de/steamwar/network/packets/common/FightInfoPacket.java b/CommonCore/Network/src/de/steamwar/network/packets/common/FightInfoPacket.java similarity index 100% rename from CommonCore/src/de/steamwar/network/packets/common/FightInfoPacket.java rename to CommonCore/Network/src/de/steamwar/network/packets/common/FightInfoPacket.java diff --git a/CommonCore/src/de/steamwar/network/packets/server/BaumemberUpdatePacket.java b/CommonCore/Network/src/de/steamwar/network/packets/server/BaumemberUpdatePacket.java similarity index 100% rename from CommonCore/src/de/steamwar/network/packets/server/BaumemberUpdatePacket.java rename to CommonCore/Network/src/de/steamwar/network/packets/server/BaumemberUpdatePacket.java diff --git a/CommonCore/src/de/steamwar/network/packets/server/CloseInventoryPacket.java b/CommonCore/Network/src/de/steamwar/network/packets/server/CloseInventoryPacket.java similarity index 100% rename from CommonCore/src/de/steamwar/network/packets/server/CloseInventoryPacket.java rename to CommonCore/Network/src/de/steamwar/network/packets/server/CloseInventoryPacket.java diff --git a/CommonCore/src/de/steamwar/network/packets/server/InventoryPacket.java b/CommonCore/Network/src/de/steamwar/network/packets/server/InventoryPacket.java similarity index 100% rename from CommonCore/src/de/steamwar/network/packets/server/InventoryPacket.java rename to CommonCore/Network/src/de/steamwar/network/packets/server/InventoryPacket.java diff --git a/CommonCore/src/de/steamwar/network/packets/server/LocaleInvalidationPacket.java b/CommonCore/Network/src/de/steamwar/network/packets/server/LocaleInvalidationPacket.java similarity index 100% rename from CommonCore/src/de/steamwar/network/packets/server/LocaleInvalidationPacket.java rename to CommonCore/Network/src/de/steamwar/network/packets/server/LocaleInvalidationPacket.java diff --git a/CommonCore/src/de/steamwar/network/packets/server/PingPacket.java b/CommonCore/Network/src/de/steamwar/network/packets/server/PingPacket.java similarity index 100% rename from CommonCore/src/de/steamwar/network/packets/server/PingPacket.java rename to CommonCore/Network/src/de/steamwar/network/packets/server/PingPacket.java diff --git a/CommonCore/src/de/steamwar/network/packets/server/StartingServerPacket.java b/CommonCore/Network/src/de/steamwar/network/packets/server/StartingServerPacket.java similarity index 100% rename from CommonCore/src/de/steamwar/network/packets/server/StartingServerPacket.java rename to CommonCore/Network/src/de/steamwar/network/packets/server/StartingServerPacket.java diff --git a/CommonCore/testsrc/de/steamwar/RandomGenerator.java b/CommonCore/Network/testsrc/de/steamwar/RandomGenerator.java similarity index 100% rename from CommonCore/testsrc/de/steamwar/RandomGenerator.java rename to CommonCore/Network/testsrc/de/steamwar/RandomGenerator.java diff --git a/CommonCore/testsrc/de/steamwar/network/AllPackets.java b/CommonCore/Network/testsrc/de/steamwar/network/AllPackets.java similarity index 88% rename from CommonCore/testsrc/de/steamwar/network/AllPackets.java rename to CommonCore/Network/testsrc/de/steamwar/network/AllPackets.java index fe4d10af..f4f566b3 100644 --- a/CommonCore/testsrc/de/steamwar/network/AllPackets.java +++ b/CommonCore/Network/testsrc/de/steamwar/network/AllPackets.java @@ -20,12 +20,8 @@ package de.steamwar.network; import de.steamwar.network.packets.NetworkPacket; -import de.steamwar.network.packets.client.ExecuteCommandPacket; -import de.steamwar.network.packets.client.ImALobbyPacket; -import de.steamwar.network.packets.client.InventoryCallbackPacket; -import de.steamwar.network.packets.client.PrepareSchemPacket; -import de.steamwar.network.packets.common.FightEndsPacket; -import de.steamwar.network.packets.common.FightInfoPacket; +import de.steamwar.network.packets.client.*; +import de.steamwar.network.packets.common.*; import de.steamwar.network.packets.server.*; import lombok.SneakyThrows; diff --git a/CommonCore/testsrc/de/steamwar/network/PacketHandlerTest.java b/CommonCore/Network/testsrc/de/steamwar/network/PacketHandlerTest.java similarity index 100% rename from CommonCore/testsrc/de/steamwar/network/PacketHandlerTest.java rename to CommonCore/Network/testsrc/de/steamwar/network/PacketHandlerTest.java diff --git a/CommonCore/testsrc/de/steamwar/network/PacketTest.java b/CommonCore/Network/testsrc/de/steamwar/network/PacketTest.java similarity index 100% rename from CommonCore/testsrc/de/steamwar/network/PacketTest.java rename to CommonCore/Network/testsrc/de/steamwar/network/PacketTest.java diff --git a/CommonCore/testsrc/de/steamwar/network/TestPacket.java b/CommonCore/Network/testsrc/de/steamwar/network/TestPacket.java similarity index 100% rename from CommonCore/testsrc/de/steamwar/network/TestPacket.java rename to CommonCore/Network/testsrc/de/steamwar/network/TestPacket.java diff --git a/CommonCore/testsrc/de/steamwar/network/TestPacketHandler.java b/CommonCore/Network/testsrc/de/steamwar/network/TestPacketHandler.java similarity index 100% rename from CommonCore/testsrc/de/steamwar/network/TestPacketHandler.java rename to CommonCore/Network/testsrc/de/steamwar/network/TestPacketHandler.java diff --git a/CommonCore/SQL/build.gradle.kts b/CommonCore/SQL/build.gradle.kts new file mode 100644 index 00000000..ed7a093d --- /dev/null +++ b/CommonCore/SQL/build.gradle.kts @@ -0,0 +1,43 @@ +plugins { + id("java") +} + +group = "de.steamwar" +version = "" + +java { + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 +} + +tasks.compileJava { + options.encoding = "UTF-8" +} + +sourceSets { + main { + java { + srcDirs("src/") + } + resources { + srcDirs("src/") + exclude("**/*.java", "**/*.kt") + } + } + test { + java { + srcDirs("testsrc/") + } + resources { + srcDirs("testsrc/") + exclude("**/*.java", "**/*.kt") + } + } +} + +dependencies { + compileOnly("org.projectlombok:lombok:1.18.32") + annotationProcessor("org.projectlombok:lombok:1.18.32") + testCompileOnly("org.projectlombok:lombok:1.18.32") + testAnnotationProcessor("org.projectlombok:lombok:1.18.32") +} \ No newline at end of file diff --git a/CommonCore/src/de/steamwar/ImplementationProvider.java b/CommonCore/SQL/src/de/steamwar/ImplementationProvider.java similarity index 100% rename from CommonCore/src/de/steamwar/ImplementationProvider.java rename to CommonCore/SQL/src/de/steamwar/ImplementationProvider.java diff --git a/CommonCore/src/de/steamwar/sql/BannedUserIPs.java b/CommonCore/SQL/src/de/steamwar/sql/BannedUserIPs.java similarity index 100% rename from CommonCore/src/de/steamwar/sql/BannedUserIPs.java rename to CommonCore/SQL/src/de/steamwar/sql/BannedUserIPs.java diff --git a/CommonCore/src/de/steamwar/sql/BauweltMember.java b/CommonCore/SQL/src/de/steamwar/sql/BauweltMember.java similarity index 100% rename from CommonCore/src/de/steamwar/sql/BauweltMember.java rename to CommonCore/SQL/src/de/steamwar/sql/BauweltMember.java diff --git a/CommonCore/src/de/steamwar/sql/CheckedSchematic.java b/CommonCore/SQL/src/de/steamwar/sql/CheckedSchematic.java similarity index 100% rename from CommonCore/src/de/steamwar/sql/CheckedSchematic.java rename to CommonCore/SQL/src/de/steamwar/sql/CheckedSchematic.java diff --git a/CommonCore/src/de/steamwar/sql/Event.java b/CommonCore/SQL/src/de/steamwar/sql/Event.java similarity index 100% rename from CommonCore/src/de/steamwar/sql/Event.java rename to CommonCore/SQL/src/de/steamwar/sql/Event.java diff --git a/CommonCore/src/de/steamwar/sql/EventFight.java b/CommonCore/SQL/src/de/steamwar/sql/EventFight.java similarity index 100% rename from CommonCore/src/de/steamwar/sql/EventFight.java rename to CommonCore/SQL/src/de/steamwar/sql/EventFight.java diff --git a/CommonCore/src/de/steamwar/sql/Fight.java b/CommonCore/SQL/src/de/steamwar/sql/Fight.java similarity index 100% rename from CommonCore/src/de/steamwar/sql/Fight.java rename to CommonCore/SQL/src/de/steamwar/sql/Fight.java diff --git a/CommonCore/src/de/steamwar/sql/FightPlayer.java b/CommonCore/SQL/src/de/steamwar/sql/FightPlayer.java similarity index 100% rename from CommonCore/src/de/steamwar/sql/FightPlayer.java rename to CommonCore/SQL/src/de/steamwar/sql/FightPlayer.java diff --git a/CommonCore/src/de/steamwar/sql/IgnoreSystem.java b/CommonCore/SQL/src/de/steamwar/sql/IgnoreSystem.java similarity index 100% rename from CommonCore/src/de/steamwar/sql/IgnoreSystem.java rename to CommonCore/SQL/src/de/steamwar/sql/IgnoreSystem.java diff --git a/CommonCore/src/de/steamwar/sql/Mod.java b/CommonCore/SQL/src/de/steamwar/sql/Mod.java similarity index 73% rename from CommonCore/src/de/steamwar/sql/Mod.java rename to CommonCore/SQL/src/de/steamwar/sql/Mod.java index 2a4e6981..d6ccc063 100644 --- a/CommonCore/src/de/steamwar/sql/Mod.java +++ b/CommonCore/SQL/src/de/steamwar/sql/Mod.java @@ -1,20 +1,20 @@ /* - * This file is a part of the SteamWar software. + * This file is a part of the SteamWar software. * - * Copyright (C) 2023 SteamWar.de-Serverteam + * Copyright (C) 2024 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 . + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . */ package de.steamwar.sql; @@ -53,7 +53,7 @@ public class Mod { return new Mod(platform, name, ModType.UNKLASSIFIED); } - public static List getAllModsFiltered(int page, int elementsPerPage, Mod.ModType filter) { + public static List getAllModsFiltered(int page, int elementsPerPage, ModType filter) { return Mod.getPageOfType.listSelect(filter, page * elementsPerPage, elementsPerPage); } @@ -71,7 +71,7 @@ public class Mod { @Field(def = "0") private ModType modType; - public void setModType(Mod.ModType modType) { + public void setModType(ModType modType) { set.update(modType, platform, modName); this.modType = modType; } diff --git a/CommonCore/src/de/steamwar/sql/NoClipboardException.java b/CommonCore/SQL/src/de/steamwar/sql/NoClipboardException.java similarity index 100% rename from CommonCore/src/de/steamwar/sql/NoClipboardException.java rename to CommonCore/SQL/src/de/steamwar/sql/NoClipboardException.java diff --git a/CommonCore/src/de/steamwar/sql/NodeData.java b/CommonCore/SQL/src/de/steamwar/sql/NodeData.java similarity index 100% rename from CommonCore/src/de/steamwar/sql/NodeData.java rename to CommonCore/SQL/src/de/steamwar/sql/NodeData.java diff --git a/CommonCore/src/de/steamwar/sql/NodeDownload.java b/CommonCore/SQL/src/de/steamwar/sql/NodeDownload.java similarity index 100% rename from CommonCore/src/de/steamwar/sql/NodeDownload.java rename to CommonCore/SQL/src/de/steamwar/sql/NodeDownload.java diff --git a/CommonCore/src/de/steamwar/sql/NodeMember.java b/CommonCore/SQL/src/de/steamwar/sql/NodeMember.java similarity index 100% rename from CommonCore/src/de/steamwar/sql/NodeMember.java rename to CommonCore/SQL/src/de/steamwar/sql/NodeMember.java diff --git a/CommonCore/src/de/steamwar/sql/PollAnswer.java b/CommonCore/SQL/src/de/steamwar/sql/PollAnswer.java similarity index 100% rename from CommonCore/src/de/steamwar/sql/PollAnswer.java rename to CommonCore/SQL/src/de/steamwar/sql/PollAnswer.java diff --git a/CommonCore/src/de/steamwar/sql/Punishment.java b/CommonCore/SQL/src/de/steamwar/sql/Punishment.java similarity index 86% rename from CommonCore/src/de/steamwar/sql/Punishment.java rename to CommonCore/SQL/src/de/steamwar/sql/Punishment.java index 5960dcef..73278452 100644 --- a/CommonCore/src/de/steamwar/sql/Punishment.java +++ b/CommonCore/SQL/src/de/steamwar/sql/Punishment.java @@ -1,20 +1,20 @@ /* - * This file is a part of the SteamWar software. + * This file is a part of the SteamWar software. * - * Copyright (C) 2022 SteamWar.de-Serverteam + * Copyright (C) 2024 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 . + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . */ package de.steamwar.sql; @@ -60,7 +60,7 @@ public class Punishment { return getAllPunishments.listSelect(user); } - public static boolean isPunished(SteamwarUser user, Punishment.PunishmentType type, Consumer callback) { + public static boolean isPunished(SteamwarUser user, PunishmentType type, Consumer callback) { Punishment punishment = Punishment.getPunishmentOfPlayer(user.getId(), type); if(punishment == null || !punishment.isCurrent()) { return false; diff --git a/CommonCore/src/de/steamwar/sql/Referee.java b/CommonCore/SQL/src/de/steamwar/sql/Referee.java similarity index 100% rename from CommonCore/src/de/steamwar/sql/Referee.java rename to CommonCore/SQL/src/de/steamwar/sql/Referee.java diff --git a/CommonCore/src/de/steamwar/sql/Replay.java b/CommonCore/SQL/src/de/steamwar/sql/Replay.java similarity index 100% rename from CommonCore/src/de/steamwar/sql/Replay.java rename to CommonCore/SQL/src/de/steamwar/sql/Replay.java diff --git a/CommonCore/src/de/steamwar/sql/SQLWrapper.java b/CommonCore/SQL/src/de/steamwar/sql/SQLWrapper.java similarity index 100% rename from CommonCore/src/de/steamwar/sql/SQLWrapper.java rename to CommonCore/SQL/src/de/steamwar/sql/SQLWrapper.java diff --git a/CommonCore/src/de/steamwar/sql/SWException.java b/CommonCore/SQL/src/de/steamwar/sql/SWException.java similarity index 100% rename from CommonCore/src/de/steamwar/sql/SWException.java rename to CommonCore/SQL/src/de/steamwar/sql/SWException.java diff --git a/CommonCore/src/de/steamwar/sql/SchemElo.java b/CommonCore/SQL/src/de/steamwar/sql/SchemElo.java similarity index 100% rename from CommonCore/src/de/steamwar/sql/SchemElo.java rename to CommonCore/SQL/src/de/steamwar/sql/SchemElo.java diff --git a/CommonCore/src/de/steamwar/sql/SchematicNode.java b/CommonCore/SQL/src/de/steamwar/sql/SchematicNode.java similarity index 100% rename from CommonCore/src/de/steamwar/sql/SchematicNode.java rename to CommonCore/SQL/src/de/steamwar/sql/SchematicNode.java diff --git a/CommonCore/src/de/steamwar/sql/SchematicType.java b/CommonCore/SQL/src/de/steamwar/sql/SchematicType.java similarity index 100% rename from CommonCore/src/de/steamwar/sql/SchematicType.java rename to CommonCore/SQL/src/de/steamwar/sql/SchematicType.java diff --git a/CommonCore/src/de/steamwar/sql/Script.java b/CommonCore/SQL/src/de/steamwar/sql/Script.java similarity index 100% rename from CommonCore/src/de/steamwar/sql/Script.java rename to CommonCore/SQL/src/de/steamwar/sql/Script.java diff --git a/CommonCore/src/de/steamwar/sql/Season.java b/CommonCore/SQL/src/de/steamwar/sql/Season.java similarity index 100% rename from CommonCore/src/de/steamwar/sql/Season.java rename to CommonCore/SQL/src/de/steamwar/sql/Season.java diff --git a/CommonCore/src/de/steamwar/sql/Session.java b/CommonCore/SQL/src/de/steamwar/sql/Session.java similarity index 100% rename from CommonCore/src/de/steamwar/sql/Session.java rename to CommonCore/SQL/src/de/steamwar/sql/Session.java diff --git a/CommonCore/src/de/steamwar/sql/SteamwarUser.java b/CommonCore/SQL/src/de/steamwar/sql/SteamwarUser.java similarity index 100% rename from CommonCore/src/de/steamwar/sql/SteamwarUser.java rename to CommonCore/SQL/src/de/steamwar/sql/SteamwarUser.java diff --git a/CommonCore/src/de/steamwar/sql/Team.java b/CommonCore/SQL/src/de/steamwar/sql/Team.java similarity index 100% rename from CommonCore/src/de/steamwar/sql/Team.java rename to CommonCore/SQL/src/de/steamwar/sql/Team.java diff --git a/CommonCore/src/de/steamwar/sql/TeamTeilnahme.java b/CommonCore/SQL/src/de/steamwar/sql/TeamTeilnahme.java similarity index 100% rename from CommonCore/src/de/steamwar/sql/TeamTeilnahme.java rename to CommonCore/SQL/src/de/steamwar/sql/TeamTeilnahme.java diff --git a/CommonCore/src/de/steamwar/sql/Token.java b/CommonCore/SQL/src/de/steamwar/sql/Token.java similarity index 100% rename from CommonCore/src/de/steamwar/sql/Token.java rename to CommonCore/SQL/src/de/steamwar/sql/Token.java diff --git a/CommonCore/src/de/steamwar/sql/Tutorial.java b/CommonCore/SQL/src/de/steamwar/sql/Tutorial.java similarity index 100% rename from CommonCore/src/de/steamwar/sql/Tutorial.java rename to CommonCore/SQL/src/de/steamwar/sql/Tutorial.java diff --git a/CommonCore/src/de/steamwar/sql/UserConfig.java b/CommonCore/SQL/src/de/steamwar/sql/UserConfig.java similarity index 100% rename from CommonCore/src/de/steamwar/sql/UserConfig.java rename to CommonCore/SQL/src/de/steamwar/sql/UserConfig.java diff --git a/CommonCore/src/de/steamwar/sql/UserElo.java b/CommonCore/SQL/src/de/steamwar/sql/UserElo.java similarity index 100% rename from CommonCore/src/de/steamwar/sql/UserElo.java rename to CommonCore/SQL/src/de/steamwar/sql/UserElo.java diff --git a/CommonCore/src/de/steamwar/sql/UserPerm.java b/CommonCore/SQL/src/de/steamwar/sql/UserPerm.java similarity index 100% rename from CommonCore/src/de/steamwar/sql/UserPerm.java rename to CommonCore/SQL/src/de/steamwar/sql/UserPerm.java diff --git a/CommonCore/src/de/steamwar/sql/internal/Field.java b/CommonCore/SQL/src/de/steamwar/sql/internal/Field.java similarity index 100% rename from CommonCore/src/de/steamwar/sql/internal/Field.java rename to CommonCore/SQL/src/de/steamwar/sql/internal/Field.java diff --git a/CommonCore/src/de/steamwar/sql/internal/SQLConfig.java b/CommonCore/SQL/src/de/steamwar/sql/internal/SQLConfig.java similarity index 100% rename from CommonCore/src/de/steamwar/sql/internal/SQLConfig.java rename to CommonCore/SQL/src/de/steamwar/sql/internal/SQLConfig.java diff --git a/CommonCore/src/de/steamwar/sql/internal/SelectStatement.java b/CommonCore/SQL/src/de/steamwar/sql/internal/SelectStatement.java similarity index 100% rename from CommonCore/src/de/steamwar/sql/internal/SelectStatement.java rename to CommonCore/SQL/src/de/steamwar/sql/internal/SelectStatement.java diff --git a/CommonCore/src/de/steamwar/sql/internal/SqlTypeMapper.java b/CommonCore/SQL/src/de/steamwar/sql/internal/SqlTypeMapper.java similarity index 100% rename from CommonCore/src/de/steamwar/sql/internal/SqlTypeMapper.java rename to CommonCore/SQL/src/de/steamwar/sql/internal/SqlTypeMapper.java diff --git a/CommonCore/src/de/steamwar/sql/internal/Statement.java b/CommonCore/SQL/src/de/steamwar/sql/internal/Statement.java similarity index 100% rename from CommonCore/src/de/steamwar/sql/internal/Statement.java rename to CommonCore/SQL/src/de/steamwar/sql/internal/Statement.java diff --git a/CommonCore/src/de/steamwar/sql/internal/Table.java b/CommonCore/SQL/src/de/steamwar/sql/internal/Table.java similarity index 99% rename from CommonCore/src/de/steamwar/sql/internal/Table.java rename to CommonCore/SQL/src/de/steamwar/sql/internal/Table.java index cbad10a7..ddb5adc7 100644 --- a/CommonCore/src/de/steamwar/sql/internal/Table.java +++ b/CommonCore/SQL/src/de/steamwar/sql/internal/Table.java @@ -34,7 +34,7 @@ public class Table { private final Map> fieldsByIdentifier = new HashMap<>(); final Constructor constructor; - private final Map[]> keys; + private final Map[]> keys; public Table(Class clazz) { diff --git a/CommonCore/build.gradle.kts b/CommonCore/build.gradle.kts index bf65c7f5..170f4045 100644 --- a/CommonCore/build.gradle.kts +++ b/CommonCore/build.gradle.kts @@ -19,7 +19,7 @@ plugins { id("base") - id("java") + id("java-library") } group = "de.steamwar" @@ -35,24 +35,6 @@ tasks.compileJava { } sourceSets { - main { - java { - srcDirs("src/") - } - resources { - srcDirs("src/") - exclude("**/*.java", "**/*.kt") - } - } - test { - java { - srcDirs("testsrc/") - } - resources { - srcDirs("testsrc/") - exclude("**/*.java", "**/*.kt") - } - } } dependencies { @@ -61,8 +43,9 @@ dependencies { testCompileOnly("org.projectlombok:lombok:1.18.32") testAnnotationProcessor("org.projectlombok:lombok:1.18.32") - testImplementation("junit:junit:4.13.2") - testImplementation("org.hamcrest:hamcrest:2.2") - compileOnly("org.xerial:sqlite-jdbc:3.46.0.0") + + api(project(":CommonCore:SQL")) + api(project(":CommonCore:Linkage")) + api(project(":CommonCore:Network")) } diff --git a/LobbySystem_2/src/de/steamwar/lobby/Fightserver.java b/LobbySystem_2/src/de/steamwar/lobby/Fightserver.java index 2cb4ed01..c1ee6f9e 100644 --- a/LobbySystem_2/src/de/steamwar/lobby/Fightserver.java +++ b/LobbySystem_2/src/de/steamwar/lobby/Fightserver.java @@ -19,7 +19,6 @@ package de.steamwar.lobby; -import com.google.common.io.ByteArrayDataInput; import de.steamwar.lobby.portal.FightserverPortal; import de.steamwar.network.packets.common.FightInfoPacket; import org.bukkit.Bukkit; diff --git a/build.gradle.kts b/build.gradle.kts index 6784aa86..e5070caf 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -110,12 +110,4 @@ allprojects { } sourceSets { - main { - java { - srcDirs() - } - resources { - srcDirs() - } - } } diff --git a/settings.gradle.kts b/settings.gradle.kts index c143edd1..35793338 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -22,6 +22,9 @@ rootProject.name = "SteamWar" include("CommandFramework") include("CommonCore") +include("CommonCore:SQL") +include("CommonCore:Linkage") +include("CommonCore:Network") include("FightSystem") include("FightSystem:FightSystem_8")