From db9acc4c81eb84177a2d1ef04399eaa7b2bbd486 Mon Sep 17 00:00:00 2001 From: AlexProgrammerDE <40795980+AlexProgrammerDE@users.noreply.github.com> Date: Wed, 29 Dec 2021 20:18:25 +0100 Subject: [PATCH] Finish migration --- buildSrc/src/main/kotlin/extensions.kt | 11 ++ .../kotlin/sw.shadow-conventions.gradle.kts | 8 - core/build.gradle.kts | 4 + core/pom.xml | 139 ------------------ pom.xml | 87 ----------- version_1_10/build.gradle.kts | 2 + version_1_10/pom.xml | 66 --------- version_1_11/build.gradle.kts | 2 + version_1_11/pom.xml | 66 --------- version_1_12/build.gradle.kts | 2 + version_1_12/pom.xml | 66 --------- version_1_13/build.gradle.kts | 2 + version_1_13/pom.xml | 66 --------- version_1_14/build.gradle.kts | 2 + version_1_14/pom.xml | 66 --------- version_1_15/build.gradle.kts | 2 + version_1_15/pom.xml | 66 --------- version_1_16/build.gradle.kts | 2 + version_1_16/pom.xml | 72 --------- version_1_17/build.gradle.kts | 2 + version_1_17/pom.xml | 72 --------- version_1_18/build.gradle.kts | 2 + version_1_18/pom.xml | 72 --------- version_1_7/build.gradle.kts | 2 + version_1_7/pom.xml | 66 --------- version_1_8/build.gradle.kts | 2 + version_1_8/pom.xml | 66 --------- version_1_9/build.gradle.kts | 2 + version_1_9/pom.xml | 66 --------- 29 files changed, 39 insertions(+), 1044 deletions(-) create mode 100644 buildSrc/src/main/kotlin/extensions.kt delete mode 100644 core/pom.xml delete mode 100644 pom.xml delete mode 100644 version_1_10/pom.xml delete mode 100644 version_1_11/pom.xml delete mode 100644 version_1_12/pom.xml delete mode 100644 version_1_13/pom.xml delete mode 100644 version_1_14/pom.xml delete mode 100644 version_1_15/pom.xml delete mode 100644 version_1_16/pom.xml delete mode 100644 version_1_17/pom.xml delete mode 100644 version_1_18/pom.xml delete mode 100644 version_1_7/pom.xml delete mode 100644 version_1_8/pom.xml delete mode 100644 version_1_9/pom.xml diff --git a/buildSrc/src/main/kotlin/extensions.kt b/buildSrc/src/main/kotlin/extensions.kt new file mode 100644 index 000000000..48ef93724 --- /dev/null +++ b/buildSrc/src/main/kotlin/extensions.kt @@ -0,0 +1,11 @@ +import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar +import org.gradle.api.Project +import org.gradle.kotlin.dsl.named + +fun Project.setupVersion(versionNumber: String) { + tasks.named("shadowJar").get().apply { + relocate("com.github.steveice10", "com.github.steveice10.$versionNumber") { + exclude("com.github.steveice10.mc.auth.data.GameProfile") + } + } +} diff --git a/buildSrc/src/main/kotlin/sw.shadow-conventions.gradle.kts b/buildSrc/src/main/kotlin/sw.shadow-conventions.gradle.kts index 4f3f9265d..d0bddf4f4 100644 --- a/buildSrc/src/main/kotlin/sw.shadow-conventions.gradle.kts +++ b/buildSrc/src/main/kotlin/sw.shadow-conventions.gradle.kts @@ -1,5 +1,3 @@ -import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar - plugins { id("sw.java-conventions") id("com.github.johnrengelman.shadow") @@ -17,15 +15,9 @@ tasks { shadowJar { minimize() - configureRelocations() } build { dependsOn(shadowJar) } } - -fun ShadowJar.configureRelocations() { -} - -// publishShadowJar() \ No newline at end of file diff --git a/core/build.gradle.kts b/core/build.gradle.kts index c935331e9..e5f17aaa9 100644 --- a/core/build.gradle.kts +++ b/core/build.gradle.kts @@ -15,3 +15,7 @@ dependencies { implementation("net.kyori:adventure-text-serializer-plain:4.9.3") implementation("net.kyori:adventure-text-serializer-gson:4.9.3") } + +tasks.named("jar").get().manifest { + attributes["Main-Class"] = "net.pistonmaster.serverwrecker.Main" +} diff --git a/core/pom.xml b/core/pom.xml deleted file mode 100644 index fe246b0ac..000000000 --- a/core/pom.xml +++ /dev/null @@ -1,139 +0,0 @@ - - 4.0.0 - - - net.pistonmaster - serverwrecker - 0.0.2 - ../pom.xml - - - serverwrecker-core - jar - - - install - - - org.apache.maven.plugins - maven-jar-plugin - 3.0.2 - - - - net.pistonmaster.serverwrecker.Main - - - - - - org.apache.maven.plugins - maven-shade-plugin - 3.2.4 - - false - true - - - com.formdev:flatlaf - - ** - - - - - - - package - - shade - - - - - - - - - - minecraft-libraries - Minecraft Libraries - https://libraries.minecraft.net - - - - - - net.pistonmaster - serverwrecker-common - ${project.version} - - - - net.pistonmaster - serverwrecker-protocol - ${project.version} - - - - commons-cli - commons-cli - 1.4 - - - - com.mojang - brigadier - 1.0.500 - - - - com.formdev - flatlaf - 1.4 - - - - com.formdev - flatlaf-intellij-themes - 1.4 - - - - org.pf4j - pf4j - 3.6.0 - - - - com.thealtening.api - api - 4.1.0 - - - - ch.qos.logback - logback-classic - 1.2.10 - - - - com.google.guava - guava - 21.0 - - - - net.kyori - adventure-text-serializer-plain - 4.8.1 - - - - net.kyori - adventure-text-serializer-gson - 4.8.1 - - - diff --git a/pom.xml b/pom.xml deleted file mode 100644 index d49c0e0d8..000000000 --- a/pom.xml +++ /dev/null @@ -1,87 +0,0 @@ - - 4.0.0 - - net.pistonmaster - serverwrecker - 2021 - - pom - - - version_1_7 - version_1_8 - version_1_9 - version_1_10 - version_1_11 - version_1_12 - version_1_13 - version_1_14 - version_1_15 - version_1_16 - version_1_17 - version_1_18 - core - - - ServerWrecker - 0.0.2 - Stress tester for minecraft servers - https://github.com/games647/ServerWrecker - - - UTF-8 - - 15 - 15 - - - - - - org.codehaus.mojo - versions-maven-plugin - 2.8.1 - - false - - - - maven-clean-plugin - 3.0.0 - - - auto-clean - initialize - - clean - - - - - - - - - - jitpack.io - https://jitpack.io - - - - - - org.projectlombok - lombok - 1.18.20 - provided - - - - ch.qos.logback - logback-classic - 1.2.10 - provided - - - diff --git a/version_1_10/build.gradle.kts b/version_1_10/build.gradle.kts index b5b5b141f..5e1b82f88 100644 --- a/version_1_10/build.gradle.kts +++ b/version_1_10/build.gradle.kts @@ -6,3 +6,5 @@ dependencies { implementation("com.github.AlexProgrammerDE:MCProtocolLib:1.10-SNAPSHOT") compileOnly(projects.serverwreckerCommon) } + +setupVersion("v1_10") diff --git a/version_1_10/pom.xml b/version_1_10/pom.xml deleted file mode 100644 index 691f9b405..000000000 --- a/version_1_10/pom.xml +++ /dev/null @@ -1,66 +0,0 @@ - - 4.0.0 - - - net.pistonmaster - serverwrecker - 0.0.2 - ../pom.xml - - - serverwrecker-version-1-10 - jar - - - - - org.apache.maven.plugins - maven-shade-plugin - 3.2.4 - - false - - - com.github.steveice10 - com.github.steveice10.v1_10 - - - - - *:* - - **/*.java - **/*.SF - **/*.DSA - META-INF/MANIFEST.MF - - - - - - - package - - shade - - - - - - - - - - com.github.wirefect - MCProtocolLib - 1.10-752d2d429f-1 - - - net.pistonmaster - serverwrecker-common - ${project.version} - provided - - - diff --git a/version_1_11/build.gradle.kts b/version_1_11/build.gradle.kts index 99692569b..15047d454 100644 --- a/version_1_11/build.gradle.kts +++ b/version_1_11/build.gradle.kts @@ -6,3 +6,5 @@ dependencies { implementation("com.github.AlexProgrammerDE:MCProtocolLib:1.11-SNAPSHOT") compileOnly(projects.serverwreckerCommon) } + +setupVersion("v1_11") diff --git a/version_1_11/pom.xml b/version_1_11/pom.xml deleted file mode 100644 index 22a5d3989..000000000 --- a/version_1_11/pom.xml +++ /dev/null @@ -1,66 +0,0 @@ - - 4.0.0 - - - net.pistonmaster - serverwrecker - 0.0.2 - ../pom.xml - - - serverwrecker-version-1-11 - jar - - - - - org.apache.maven.plugins - maven-shade-plugin - 3.2.4 - - false - - - com.github.steveice10 - com.github.steveice10.v1_11 - - - - - *:* - - **/*.java - **/*.SF - **/*.DSA - META-INF/MANIFEST.MF - - - - - - - package - - shade - - - - - - - - - - com.github.wirefect - MCProtocolLib - 1.11-6fc80e17c8-1 - - - net.pistonmaster - serverwrecker-common - ${project.version} - provided - - - diff --git a/version_1_12/build.gradle.kts b/version_1_12/build.gradle.kts index e1dfa0bb9..2dbeb682a 100644 --- a/version_1_12/build.gradle.kts +++ b/version_1_12/build.gradle.kts @@ -6,3 +6,5 @@ dependencies { implementation("com.github.AlexProgrammerDE:MCProtocolLib:1.12-SNAPSHOT") compileOnly(projects.serverwreckerCommon) } + +setupVersion("v1_12") diff --git a/version_1_12/pom.xml b/version_1_12/pom.xml deleted file mode 100644 index 4e7f7546d..000000000 --- a/version_1_12/pom.xml +++ /dev/null @@ -1,66 +0,0 @@ - - 4.0.0 - - - net.pistonmaster - serverwrecker - 0.0.2 - ../pom.xml - - - serverwrecker-version-1-12 - jar - - - - - org.apache.maven.plugins - maven-shade-plugin - 3.2.4 - - false - - - com.github.steveice10 - com.github.steveice10.v1_12 - - - - - *:* - - **/*.java - **/*.SF - **/*.DSA - META-INF/MANIFEST.MF - - - - - - - package - - shade - - - - - - - - - - com.github.wirefect - MCProtocolLib - 1.12-1.12.1-1-g98ee556-15 - - - net.pistonmaster - serverwrecker-common - ${project.version} - provided - - - diff --git a/version_1_13/build.gradle.kts b/version_1_13/build.gradle.kts index 5ff166503..a7988b85a 100644 --- a/version_1_13/build.gradle.kts +++ b/version_1_13/build.gradle.kts @@ -6,3 +6,5 @@ dependencies { implementation("com.github.GeyserMC:MCProtocolLib:e9307442db") compileOnly(projects.serverwreckerCommon) } + +setupVersion("v1_13") diff --git a/version_1_13/pom.xml b/version_1_13/pom.xml deleted file mode 100644 index 9b074dd9d..000000000 --- a/version_1_13/pom.xml +++ /dev/null @@ -1,66 +0,0 @@ - - 4.0.0 - - - net.pistonmaster - serverwrecker - 0.0.2 - ../pom.xml - - - serverwrecker-version-1-13 - jar - - - - - org.apache.maven.plugins - maven-shade-plugin - 3.2.4 - - false - - - com.github.steveice10 - com.github.steveice10.v1_13 - - - - - *:* - - **/*.java - **/*.SF - **/*.DSA - META-INF/MANIFEST.MF - - - - - - - package - - shade - - - - - - - - - - com.github.Steveice10 - MCProtocolLib - e9307442db - - - net.pistonmaster - serverwrecker-common - ${project.version} - provided - - - diff --git a/version_1_14/build.gradle.kts b/version_1_14/build.gradle.kts index 0c1c874cf..1e198300e 100644 --- a/version_1_14/build.gradle.kts +++ b/version_1_14/build.gradle.kts @@ -6,3 +6,5 @@ dependencies { implementation("com.github.GeyserMC:MCProtocolLib:1.14.4-2") compileOnly(projects.serverwreckerCommon) } + +setupVersion("v1_14") diff --git a/version_1_14/pom.xml b/version_1_14/pom.xml deleted file mode 100644 index b7952ffa7..000000000 --- a/version_1_14/pom.xml +++ /dev/null @@ -1,66 +0,0 @@ - - 4.0.0 - - - net.pistonmaster - serverwrecker - 0.0.2 - ../pom.xml - - - serverwrecker-version-1-14 - jar - - - - - org.apache.maven.plugins - maven-shade-plugin - 3.2.4 - - false - - - com.github.steveice10 - com.github.steveice10.v1_14 - - - - - *:* - - **/*.java - **/*.SF - **/*.DSA - META-INF/MANIFEST.MF - - - - - - - package - - shade - - - - - - - - - - com.github.Steveice10 - MCProtocolLib - 1.14.4-2 - - - net.pistonmaster - serverwrecker-common - ${project.version} - provided - - - diff --git a/version_1_15/build.gradle.kts b/version_1_15/build.gradle.kts index 602b71cef..72c0d8f42 100644 --- a/version_1_15/build.gradle.kts +++ b/version_1_15/build.gradle.kts @@ -6,3 +6,5 @@ dependencies { implementation("com.github.GeyserMC:MCProtocolLib:1.15.2-1") compileOnly(projects.serverwreckerCommon) } + +setupVersion("v1_15") diff --git a/version_1_15/pom.xml b/version_1_15/pom.xml deleted file mode 100644 index d809aa174..000000000 --- a/version_1_15/pom.xml +++ /dev/null @@ -1,66 +0,0 @@ - - 4.0.0 - - - net.pistonmaster - serverwrecker - 0.0.2 - ../pom.xml - - - serverwrecker-version-1-15 - jar - - - - - org.apache.maven.plugins - maven-shade-plugin - 3.2.4 - - false - - - com.github.steveice10 - com.github.steveice10.v1_15 - - - - - *:* - - **/*.java - **/*.SF - **/*.DSA - META-INF/MANIFEST.MF - - - - - - - package - - shade - - - - - - - - - - com.github.Steveice10 - MCProtocolLib - 1.15.2-1 - - - net.pistonmaster - serverwrecker-common - ${project.version} - provided - - - diff --git a/version_1_16/build.gradle.kts b/version_1_16/build.gradle.kts index b968a4fca..daadbb922 100644 --- a/version_1_16/build.gradle.kts +++ b/version_1_16/build.gradle.kts @@ -7,3 +7,5 @@ dependencies { compileOnly(projects.serverwreckerCommon) compileOnly("net.kyori:adventure-text-serializer-plain:4.8.1") } + +setupVersion("v1_16") diff --git a/version_1_16/pom.xml b/version_1_16/pom.xml deleted file mode 100644 index 4587dfbca..000000000 --- a/version_1_16/pom.xml +++ /dev/null @@ -1,72 +0,0 @@ - - 4.0.0 - - - net.pistonmaster - serverwrecker - 0.0.2 - ../pom.xml - - - serverwrecker-version-1-16 - jar - - - - - org.apache.maven.plugins - maven-shade-plugin - 3.2.4 - - false - - - com.github.steveice10 - com.github.steveice10.v1_16 - - - - - *:* - - **/*.java - **/*.SF - **/*.DSA - META-INF/MANIFEST.MF - - - - - - - package - - shade - - - - - - - - - - com.github.Steveice10 - MCProtocolLib - 1.16.5-2 - - - net.pistonmaster - serverwrecker-common - ${project.version} - provided - - - net.kyori - adventure-text-serializer-plain - 4.8.1 - provided - - - diff --git a/version_1_17/build.gradle.kts b/version_1_17/build.gradle.kts index d45d2a434..44f0c634e 100644 --- a/version_1_17/build.gradle.kts +++ b/version_1_17/build.gradle.kts @@ -7,3 +7,5 @@ dependencies { compileOnly(projects.serverwreckerCommon) compileOnly("net.kyori:adventure-text-serializer-plain:4.9.3") } + +setupVersion("v1_17") diff --git a/version_1_17/pom.xml b/version_1_17/pom.xml deleted file mode 100644 index 374e8f854..000000000 --- a/version_1_17/pom.xml +++ /dev/null @@ -1,72 +0,0 @@ - - 4.0.0 - - - net.pistonmaster - serverwrecker - 0.0.2 - ../pom.xml - - - serverwrecker-version-1-17 - jar - - - - - org.apache.maven.plugins - maven-shade-plugin - 3.2.4 - - false - - - com.github.steveice10 - com.github.steveice10.v1_17 - - - - - *:* - - **/*.java - **/*.SF - **/*.DSA - META-INF/MANIFEST.MF - - - - - - - package - - shade - - - - - - - - - - com.github.Steveice10 - MCProtocolLib - 1.17.1-2 - - - net.pistonmaster - serverwrecker-common - ${project.version} - provided - - - net.kyori - adventure-text-serializer-plain - 4.9.3 - provided - - - diff --git a/version_1_18/build.gradle.kts b/version_1_18/build.gradle.kts index 3fd2a04ee..c6c888227 100644 --- a/version_1_18/build.gradle.kts +++ b/version_1_18/build.gradle.kts @@ -7,3 +7,5 @@ dependencies { compileOnly(projects.serverwreckerCommon) compileOnly("net.kyori:adventure-text-serializer-plain:4.9.3") } + +setupVersion("v1_18") diff --git a/version_1_18/pom.xml b/version_1_18/pom.xml deleted file mode 100644 index c4c33ebf3..000000000 --- a/version_1_18/pom.xml +++ /dev/null @@ -1,72 +0,0 @@ - - 4.0.0 - - - net.pistonmaster - serverwrecker - 0.0.2 - ../pom.xml - - - serverwrecker-version-1-18 - jar - - - - - org.apache.maven.plugins - maven-shade-plugin - 3.2.4 - - false - - - com.github.steveice10 - com.github.steveice10.v1_18 - - - - - *:* - - **/*.java - **/*.SF - **/*.DSA - META-INF/MANIFEST.MF - - - - - - - package - - shade - - - - - - - - - - com.github.Steveice10 - MCProtocolLib - 1.18-2 - - - net.pistonmaster - serverwrecker-common - ${project.version} - provided - - - net.kyori - adventure-text-serializer-plain - 4.9.3 - provided - - - diff --git a/version_1_7/build.gradle.kts b/version_1_7/build.gradle.kts index 2b0bca2c7..fa6e6ba3b 100644 --- a/version_1_7/build.gradle.kts +++ b/version_1_7/build.gradle.kts @@ -6,3 +6,5 @@ dependencies { implementation("com.github.AlexProgrammerDE:MCProtocolLib:1.7-SNAPSHOT") compileOnly(projects.serverwreckerCommon) } + +setupVersion("v1_7") diff --git a/version_1_7/pom.xml b/version_1_7/pom.xml deleted file mode 100644 index 544b63417..000000000 --- a/version_1_7/pom.xml +++ /dev/null @@ -1,66 +0,0 @@ - - 4.0.0 - - - net.pistonmaster - serverwrecker - 0.0.2 - ../pom.xml - - - serverwrecker-version-1-7 - jar - - - - - org.apache.maven.plugins - maven-shade-plugin - 3.2.4 - - false - - - com.github.steveice10 - com.github.steveice10.v1_7 - - - - - *:* - - **/*.java - **/*.SF - **/*.DSA - META-INF/MANIFEST.MF - - - - - - - package - - shade - - - - - - - - - - com.github.wirefect - MCProtocolLib - 1.7-76ed79c7cf-1 - - - net.pistonmaster - serverwrecker-common - ${project.version} - provided - - - diff --git a/version_1_8/build.gradle.kts b/version_1_8/build.gradle.kts index fa3740098..e8eca286c 100644 --- a/version_1_8/build.gradle.kts +++ b/version_1_8/build.gradle.kts @@ -6,3 +6,5 @@ dependencies { implementation("com.github.AlexProgrammerDE:MCProtocolLib:1.8-SNAPSHOT") compileOnly(projects.serverwreckerCommon) } + +setupVersion("v1_8") diff --git a/version_1_8/pom.xml b/version_1_8/pom.xml deleted file mode 100644 index 29e76ca6a..000000000 --- a/version_1_8/pom.xml +++ /dev/null @@ -1,66 +0,0 @@ - - 4.0.0 - - - net.pistonmaster - serverwrecker - 0.0.2 - ../pom.xml - - - serverwrecker-version-1-8 - jar - - - - - org.apache.maven.plugins - maven-shade-plugin - 3.2.4 - - false - - - com.github.steveice10 - com.github.steveice10.v1_8 - - - - - *:* - - **/*.java - **/*.SF - **/*.DSA - META-INF/MANIFEST.MF - - - - - - - package - - shade - - - - - - - - - - com.github.wirefect - MCProtocolLib - 1.8-d76a51675e-1 - - - net.pistonmaster - serverwrecker-common - ${project.version} - provided - - - diff --git a/version_1_9/build.gradle.kts b/version_1_9/build.gradle.kts index 4c431fec8..63dd3bdaf 100644 --- a/version_1_9/build.gradle.kts +++ b/version_1_9/build.gradle.kts @@ -6,3 +6,5 @@ dependencies { implementation("com.github.AlexProgrammerDE:MCProtocolLib:1.9-SNAPSHOT") compileOnly(projects.serverwreckerCommon) } + +setupVersion("v1_9") diff --git a/version_1_9/pom.xml b/version_1_9/pom.xml deleted file mode 100644 index 216ab744d..000000000 --- a/version_1_9/pom.xml +++ /dev/null @@ -1,66 +0,0 @@ - - 4.0.0 - - - net.pistonmaster - serverwrecker - 0.0.2 - ../pom.xml - - - serverwrecker-version-1-9 - jar - - - - - org.apache.maven.plugins - maven-shade-plugin - 3.2.4 - - false - - - com.github.steveice10 - com.github.steveice10.v1_9 - - - - - *:* - - **/*.java - **/*.SF - **/*.DSA - META-INF/MANIFEST.MF - - - - - - - package - - shade - - - - - - - - - - com.github.wirefect - MCProtocolLib - 1.9-9c37a56c70-1 - - - net.pistonmaster - serverwrecker-common - ${project.version} - provided - - -