From ceb8aafa98a203701ddd6e2b9db9888536268e1d Mon Sep 17 00:00:00 2001 From: Oliver Date: Mon, 19 May 2025 20:24:03 +0200 Subject: [PATCH] packets: Move factories into :packets module --- libraries/packets/build.gradle.kts | 1 - libraries/packets/factories/build.gradle.kts | 29 ------------------- .../implementations/1_20_6/build.gradle.kts | 1 + .../implementations/1_21/build.gradle.kts | 1 + .../implementations/1_21_1/build.gradle.kts | 1 + .../implementations/1_21_3/build.gradle.kts | 1 + .../implementations/1_21_4/build.gradle.kts | 1 + .../implementations/1_21_5/build.gradle.kts | 1 + .../fancysitula/factories/EntityFactory.java | 0 .../fancysitula/factories/FancySitula.java | 0 .../fancysitula/factories/PacketFactory.java | 0 .../fancysitula/factories/TeamFactory.java | 0 .../build.gradle.kts | 2 +- .../oliver/fancysitula/FancySitulaPlugin.java | 0 .../fancysitula/commands/FancySitulaCMD.java | 0 .../FancySitulaPluginBootstrapper.java | 0 .../loaders/FancySitulaPluginLoader.java | 0 plugins/fancyholograms-v2/build.gradle.kts | 2 +- plugins/fancyholograms/build.gradle.kts | 2 +- plugins/fancynpcs/build.gradle.kts | 2 +- plugins/fancyvisuals/build.gradle.kts | 2 +- settings.gradle.kts | 5 ++-- 22 files changed, 13 insertions(+), 38 deletions(-) delete mode 100644 libraries/packets/factories/build.gradle.kts rename libraries/packets/{factories => }/src/main/java/de/oliver/fancysitula/factories/EntityFactory.java (100%) rename libraries/packets/{factories => }/src/main/java/de/oliver/fancysitula/factories/FancySitula.java (100%) rename libraries/packets/{factories => }/src/main/java/de/oliver/fancysitula/factories/PacketFactory.java (100%) rename libraries/packets/{factories => }/src/main/java/de/oliver/fancysitula/factories/TeamFactory.java (100%) rename libraries/packets/{test_plugin => test-plugin}/build.gradle.kts (96%) rename libraries/packets/{test_plugin => test-plugin}/src/main/java/de/oliver/fancysitula/FancySitulaPlugin.java (100%) rename libraries/packets/{test_plugin => test-plugin}/src/main/java/de/oliver/fancysitula/commands/FancySitulaCMD.java (100%) rename libraries/packets/{test_plugin => test-plugin}/src/main/java/de/oliver/fancysitula/loaders/FancySitulaPluginBootstrapper.java (100%) rename libraries/packets/{test_plugin => test-plugin}/src/main/java/de/oliver/fancysitula/loaders/FancySitulaPluginLoader.java (100%) diff --git a/libraries/packets/build.gradle.kts b/libraries/packets/build.gradle.kts index 9cb6f25d..f41234fa 100644 --- a/libraries/packets/build.gradle.kts +++ b/libraries/packets/build.gradle.kts @@ -21,7 +21,6 @@ dependencies { compileOnly("io.papermc.paper:paper-api:1.21.5-R0.1-SNAPSHOT") implementation(project(":libraries:packets:packets-api")) - implementation(project(":libraries:packets:factories")) implementation(project(":libraries:packets:implementations:1_21_5")) implementation(project(":libraries:packets:implementations:1_21_4")) implementation(project(":libraries:packets:implementations:1_21_3")) diff --git a/libraries/packets/factories/build.gradle.kts b/libraries/packets/factories/build.gradle.kts deleted file mode 100644 index 72ca4bb9..00000000 --- a/libraries/packets/factories/build.gradle.kts +++ /dev/null @@ -1,29 +0,0 @@ -plugins { - id("java-library") -} - -dependencies { - compileOnly("io.papermc.paper:paper-api:1.21.5-R0.1-SNAPSHOT") - compileOnly(project(":libraries:packets:packets-api")) - compileOnly(project(":libraries:packets:implementations:1_20_6")) - compileOnly(project(":libraries:packets:implementations:1_21_3")) - compileOnly(project(":libraries:packets:implementations:1_21_4")) - compileOnly(project(":libraries:packets:implementations:1_21_5")) -} - -tasks { - java { - withSourcesJar() - withJavadocJar() - } - - javadoc { - options.encoding = Charsets.UTF_8.name() - } - - compileJava { - options.encoding = Charsets.UTF_8.name() - options.release = 21 - - } -} \ No newline at end of file diff --git a/libraries/packets/implementations/1_20_6/build.gradle.kts b/libraries/packets/implementations/1_20_6/build.gradle.kts index 3de5c605..a820c847 100644 --- a/libraries/packets/implementations/1_20_6/build.gradle.kts +++ b/libraries/packets/implementations/1_20_6/build.gradle.kts @@ -11,6 +11,7 @@ dependencies { paperweight.paperDevBundle("$minecraftVersion-R0.1-SNAPSHOT") compileOnly(project(":libraries:packets:packets-api")) + testImplementation(project(":libraries:packets")) testImplementation(project(":libraries:packets:packets-api")) testImplementation("org.junit.jupiter:junit-jupiter-api:5.12.2") testImplementation("org.junit.jupiter:junit-jupiter-engine:5.12.2") diff --git a/libraries/packets/implementations/1_21/build.gradle.kts b/libraries/packets/implementations/1_21/build.gradle.kts index e2c31d7b..b8912f24 100644 --- a/libraries/packets/implementations/1_21/build.gradle.kts +++ b/libraries/packets/implementations/1_21/build.gradle.kts @@ -11,6 +11,7 @@ dependencies { paperweight.paperDevBundle("$minecraftVersion-R0.1-SNAPSHOT") compileOnly(project(":libraries:packets:packets-api")) + testImplementation(project(":libraries:packets")) testImplementation(project(":libraries:packets:packets-api")) testImplementation(project(":libraries:packets:implementations:1_20_6")) testImplementation("org.junit.jupiter:junit-jupiter-api:5.12.2") diff --git a/libraries/packets/implementations/1_21_1/build.gradle.kts b/libraries/packets/implementations/1_21_1/build.gradle.kts index 7f02ec2a..ae2c6c25 100644 --- a/libraries/packets/implementations/1_21_1/build.gradle.kts +++ b/libraries/packets/implementations/1_21_1/build.gradle.kts @@ -11,6 +11,7 @@ dependencies { paperweight.paperDevBundle("$minecraftVersion-R0.1-SNAPSHOT") compileOnly(project(":libraries:packets:packets-api")) + testImplementation(project(":libraries:packets")) testImplementation(project(":libraries:packets:packets-api")) testImplementation(project(":libraries:packets:implementations:1_20_6")) testImplementation("org.junit.jupiter:junit-jupiter-api:5.12.2") diff --git a/libraries/packets/implementations/1_21_3/build.gradle.kts b/libraries/packets/implementations/1_21_3/build.gradle.kts index 3e21620d..4a4d357e 100644 --- a/libraries/packets/implementations/1_21_3/build.gradle.kts +++ b/libraries/packets/implementations/1_21_3/build.gradle.kts @@ -11,6 +11,7 @@ dependencies { paperweight.paperDevBundle("$minecraftVersion-R0.1-SNAPSHOT") compileOnly(project(":libraries:packets:packets-api")) + testImplementation(project(":libraries:packets")) testImplementation(project(":libraries:packets:packets-api")) testImplementation("org.junit.jupiter:junit-jupiter-api:5.12.2") testImplementation("org.junit.jupiter:junit-jupiter-engine:5.12.2") diff --git a/libraries/packets/implementations/1_21_4/build.gradle.kts b/libraries/packets/implementations/1_21_4/build.gradle.kts index c4ec6cc6..a657a100 100644 --- a/libraries/packets/implementations/1_21_4/build.gradle.kts +++ b/libraries/packets/implementations/1_21_4/build.gradle.kts @@ -11,6 +11,7 @@ dependencies { paperweight.paperDevBundle("$minecraftVersion-R0.1-SNAPSHOT") compileOnly(project(":libraries:packets:packets-api")) + testImplementation(project(":libraries:packets")) testImplementation(project(":libraries:packets:packets-api")) testImplementation("org.junit.jupiter:junit-jupiter-api:5.12.2") testImplementation("org.junit.jupiter:junit-jupiter-engine:5.12.2") diff --git a/libraries/packets/implementations/1_21_5/build.gradle.kts b/libraries/packets/implementations/1_21_5/build.gradle.kts index d7eb0d97..91bac798 100644 --- a/libraries/packets/implementations/1_21_5/build.gradle.kts +++ b/libraries/packets/implementations/1_21_5/build.gradle.kts @@ -9,6 +9,7 @@ dependencies { paperweight.paperDevBundle("1.21.5-R0.1-SNAPSHOT") compileOnly(project(":libraries:packets:packets-api")) + testImplementation(project(":libraries:packets")) testImplementation(project(":libraries:packets:packets-api")) testImplementation("org.junit.jupiter:junit-jupiter-api:5.12.2") testImplementation("org.junit.jupiter:junit-jupiter-engine:5.12.2") diff --git a/libraries/packets/factories/src/main/java/de/oliver/fancysitula/factories/EntityFactory.java b/libraries/packets/src/main/java/de/oliver/fancysitula/factories/EntityFactory.java similarity index 100% rename from libraries/packets/factories/src/main/java/de/oliver/fancysitula/factories/EntityFactory.java rename to libraries/packets/src/main/java/de/oliver/fancysitula/factories/EntityFactory.java diff --git a/libraries/packets/factories/src/main/java/de/oliver/fancysitula/factories/FancySitula.java b/libraries/packets/src/main/java/de/oliver/fancysitula/factories/FancySitula.java similarity index 100% rename from libraries/packets/factories/src/main/java/de/oliver/fancysitula/factories/FancySitula.java rename to libraries/packets/src/main/java/de/oliver/fancysitula/factories/FancySitula.java diff --git a/libraries/packets/factories/src/main/java/de/oliver/fancysitula/factories/PacketFactory.java b/libraries/packets/src/main/java/de/oliver/fancysitula/factories/PacketFactory.java similarity index 100% rename from libraries/packets/factories/src/main/java/de/oliver/fancysitula/factories/PacketFactory.java rename to libraries/packets/src/main/java/de/oliver/fancysitula/factories/PacketFactory.java diff --git a/libraries/packets/factories/src/main/java/de/oliver/fancysitula/factories/TeamFactory.java b/libraries/packets/src/main/java/de/oliver/fancysitula/factories/TeamFactory.java similarity index 100% rename from libraries/packets/factories/src/main/java/de/oliver/fancysitula/factories/TeamFactory.java rename to libraries/packets/src/main/java/de/oliver/fancysitula/factories/TeamFactory.java diff --git a/libraries/packets/test_plugin/build.gradle.kts b/libraries/packets/test-plugin/build.gradle.kts similarity index 96% rename from libraries/packets/test_plugin/build.gradle.kts rename to libraries/packets/test-plugin/build.gradle.kts index 50e9a9b0..9c2ffa41 100644 --- a/libraries/packets/test_plugin/build.gradle.kts +++ b/libraries/packets/test-plugin/build.gradle.kts @@ -19,8 +19,8 @@ repositories { dependencies { compileOnly("io.papermc.paper:paper-api:1.21.5-R0.1-SNAPSHOT") + implementation(project(":libraries:packets")) implementation(project(":libraries:packets:packets-api")) - implementation(project(":libraries:packets:factories")) implementation(project(":libraries:packets:implementations:1_20_6")) implementation(project(":libraries:packets:implementations:1_21_3")) implementation("de.oliver.FancyAnalytics:logger:0.0.6") diff --git a/libraries/packets/test_plugin/src/main/java/de/oliver/fancysitula/FancySitulaPlugin.java b/libraries/packets/test-plugin/src/main/java/de/oliver/fancysitula/FancySitulaPlugin.java similarity index 100% rename from libraries/packets/test_plugin/src/main/java/de/oliver/fancysitula/FancySitulaPlugin.java rename to libraries/packets/test-plugin/src/main/java/de/oliver/fancysitula/FancySitulaPlugin.java diff --git a/libraries/packets/test_plugin/src/main/java/de/oliver/fancysitula/commands/FancySitulaCMD.java b/libraries/packets/test-plugin/src/main/java/de/oliver/fancysitula/commands/FancySitulaCMD.java similarity index 100% rename from libraries/packets/test_plugin/src/main/java/de/oliver/fancysitula/commands/FancySitulaCMD.java rename to libraries/packets/test-plugin/src/main/java/de/oliver/fancysitula/commands/FancySitulaCMD.java diff --git a/libraries/packets/test_plugin/src/main/java/de/oliver/fancysitula/loaders/FancySitulaPluginBootstrapper.java b/libraries/packets/test-plugin/src/main/java/de/oliver/fancysitula/loaders/FancySitulaPluginBootstrapper.java similarity index 100% rename from libraries/packets/test_plugin/src/main/java/de/oliver/fancysitula/loaders/FancySitulaPluginBootstrapper.java rename to libraries/packets/test-plugin/src/main/java/de/oliver/fancysitula/loaders/FancySitulaPluginBootstrapper.java diff --git a/libraries/packets/test_plugin/src/main/java/de/oliver/fancysitula/loaders/FancySitulaPluginLoader.java b/libraries/packets/test-plugin/src/main/java/de/oliver/fancysitula/loaders/FancySitulaPluginLoader.java similarity index 100% rename from libraries/packets/test_plugin/src/main/java/de/oliver/fancysitula/loaders/FancySitulaPluginLoader.java rename to libraries/packets/test-plugin/src/main/java/de/oliver/fancysitula/loaders/FancySitulaPluginLoader.java diff --git a/plugins/fancyholograms-v2/build.gradle.kts b/plugins/fancyholograms-v2/build.gradle.kts index 033b43fa..785ca49f 100644 --- a/plugins/fancyholograms-v2/build.gradle.kts +++ b/plugins/fancyholograms-v2/build.gradle.kts @@ -64,8 +64,8 @@ dependencies { rootProject.subprojects .filter { it.path.startsWith(":libraries:packets:implementations") } .forEach { implementation(project(it.path)) } + implementation(project(":libraries:packets")) implementation(project(":libraries:packets:packets-api")) - implementation(project(":libraries:packets:factories")) implementation(project(":libraries:common")) implementation(project(":libraries:jdb")) implementation("de.oliver.FancyAnalytics:api:0.1.6") diff --git a/plugins/fancyholograms/build.gradle.kts b/plugins/fancyholograms/build.gradle.kts index 2a3a322d..8fc0fe75 100644 --- a/plugins/fancyholograms/build.gradle.kts +++ b/plugins/fancyholograms/build.gradle.kts @@ -68,8 +68,8 @@ dependencies { implementation(project(":libraries:common")) implementation(project(":libraries:plugin-tests")) implementation(project(":libraries:jdb")) + implementation(project(":libraries:packets")) implementation(project(":libraries:packets:packets-api")) - implementation(project(":libraries:packets:factories")) implementation("de.oliver.FancyAnalytics:api:0.1.6") implementation("de.oliver.FancyAnalytics:logger:0.0.6") diff --git a/plugins/fancynpcs/build.gradle.kts b/plugins/fancynpcs/build.gradle.kts index 8d38154f..1139672c 100644 --- a/plugins/fancynpcs/build.gradle.kts +++ b/plugins/fancynpcs/build.gradle.kts @@ -64,8 +64,8 @@ dependencies { rootProject.subprojects .filter { it.path.startsWith(":libraries:packets:implementations") } .forEach { implementation(project(it.path)) } + implementation(project(":libraries:packets")) implementation(project(":libraries:packets:packets-api")) - implementation(project(":libraries:packets:factories")) implementation(project(":libraries:common")) implementation(project(":libraries:jdb")) implementation(project(":libraries:plugin-tests")) diff --git a/plugins/fancyvisuals/build.gradle.kts b/plugins/fancyvisuals/build.gradle.kts index cc29fe0a..df74e713 100644 --- a/plugins/fancyvisuals/build.gradle.kts +++ b/plugins/fancyvisuals/build.gradle.kts @@ -34,8 +34,8 @@ dependencies { implementation(project(":libraries:common")) implementation(project(":libraries:plugin-tests")) implementation(project(":libraries:jdb")) + implementation(project(":libraries:packets")) implementation(project(":libraries:packets:packets-api")) - implementation(project(":libraries:packets:factories")) compileOnly("de.oliver.FancyAnalytics:api:0.1.6") // loaded in FancyVisualLoader compileOnly("de.oliver.FancyAnalytics:logger:0.0.6") // loaded in FancyVisualLoader diff --git a/settings.gradle.kts b/settings.gradle.kts index 0d62e007..6c29f4db 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -33,16 +33,15 @@ include(":libraries:common") include(":libraries:jdb") include(":libraries:plugin-tests") +include(":libraries:packets") include(":libraries:packets:packets-api") -include(":libraries:packets:factories") -include(":libraries:packets:implementations") +include(":libraries:packets:test-plugin") include(":libraries:packets:implementations:1_20_6") include(":libraries:packets:implementations:1_21") include(":libraries:packets:implementations:1_21_1") include(":libraries:packets:implementations:1_21_3") include(":libraries:packets:implementations:1_21_4") include(":libraries:packets:implementations:1_21_5") -include(":libraries:packets:test_plugin") include(":tools:deployment")