From 760e8d58e595150ddbf0553af80bd1656bba6421 Mon Sep 17 00:00:00 2001 From: Phillipp Glanz <6745190+TheMeinerLP@users.noreply.github.com> Date: Fri, 5 Jul 2024 22:27:50 +0200 Subject: [PATCH 1/3] Drop minor versions and improve build gradle --- build.gradle.kts | 41 ++++++++--------------------------------- settings.gradle.kts | 14 ++++++++++++-- 2 files changed, 20 insertions(+), 35 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 1d0a839..242fcd8 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -7,7 +7,7 @@ plugins { alias(libs.plugins.publishdata) alias(libs.plugins.shadow) alias(libs.plugins.paper.run) - alias(libs.plugins.bukkit.yml) + alias(libs.plugins.paper.yml) alias(libs.plugins.hangar) alias(libs.plugins.modrinth) id("olf.build-logic") @@ -27,15 +27,9 @@ if (!File("$rootDir/.git").exists()) { group = "net.onelitefeather" version = "1.4.0" -val minecraftVersion = "1.20.6" val supportedMinecraftVersions = listOf( - "1.20", - "1.20.1", - "1.20.2", - "1.20.3", - "1.20.4", - "1.20.5", "1.20.6", + "1.21" ) repositories { @@ -44,29 +38,23 @@ repositories { } dependencies { - compileOnly("io.papermc.paper:paper-api:$minecraftVersion-R0.1-SNAPSHOT") - implementation("net.kyori:adventure-text-minimessage:4.17.0") - + compileOnly(libs.paper) + implementation(libs.adventure.minimessage) // testing testImplementation(kotlin("test")) - testImplementation("io.papermc.paper:paper-api:$minecraftVersion-R0.1-SNAPSHOT") - testImplementation("com.github.seeseemelk:MockBukkit-v1.19:3.1.0") - testImplementation("io.mockk:mockk:1.13.11") + testImplementation(libs.paper) + testImplementation(libs.mock.bukkit) + testImplementation(libs.mockk) } kotlin { jvmToolchain { languageVersion.set(JavaLanguageVersion.of(21)) } - sourceSets.all { - languageSettings { - languageVersion = "2.0" - } - } } -bukkit { +paper { main = "dev.themeinerlp.attollo.Attollo" apiVersion = "1.20" authors = listOf("TheMeinerLP") @@ -78,11 +66,6 @@ bukkit { default = Default.TRUE } } - commands { - register("attollo") { - permission = "attollo.command.attollo" - } - } } publishData { @@ -116,13 +99,6 @@ tasks { pluginJars(rootProject.tasks.shadowJar.map { it.archiveFile }.get()) } } - register("runFolia") { - downloadsApiService.set(xyz.jpenilla.runtask.service.DownloadsAPIService.folia(project)) - minecraftVersion(minecraftVersion) - group = "run paper" - runDirectory.set(file("run-folia")) - jvmArgs("-DPaper.IgnoreJavaVersion=true", "-Dcom.mojang.eula.agree=true") - } } val branch = rootProject.branchName() @@ -165,7 +141,6 @@ if (!isRelease || isMainBranch) { // Only publish releases from the main branch uploadFile.set(tasks.shadowJar.flatMap { it.archiveFile }) gameVersions.addAll(supportedMinecraftVersions) loaders.add("paper") - loaders.add("bukkit") } } diff --git a/settings.gradle.kts b/settings.gradle.kts index be48965..2ca387f 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -14,14 +14,24 @@ dependencyResolutionManagement { version("publishdata", "1.4.0") version("modrinth", "2.+") version("hangar", "0.1.2") - version("bukkit.yml", "0.6.0") + version("paper.yml", "0.6.0") version("paper.run", "2.3.0") version("shadow", "8.1.7") + version("paper", "1.21-R0.1-SNAPSHOT") + version("adventure", "4.17.0") + version("mockk", "1.13.11") + version("mock.bukkit", "3.9.0") + + library("paper", "io.papermc.paper", "paper-api").versionRef("paper") + library("adventure.minimessage", "net.kyori", "adventure-text-minimessage").versionRef("adventure") + library("mockk", "io.mockk", "mockk").versionRef("mockk") + library("mock.bukkit", "com.github.seeseemelk", "MockBukkit-v1.20").versionRef("mock.bukkit") + plugin("publishdata","de.chojo.publishdata").versionRef("publishdata") plugin("modrinth", "com.modrinth.minotaur").versionRef("modrinth") plugin("hangar", "io.papermc.hangar-publish-plugin").versionRef("hangar") - plugin("bukkit.yml", "net.minecrell.plugin-yml.bukkit").versionRef("bukkit.yml") + plugin("paper.yml", "net.minecrell.plugin-yml.paper").versionRef("paper.yml") plugin("paper.run", "xyz.jpenilla.run-paper").versionRef("paper.run") plugin("shadow", "io.github.goooler.shadow").versionRef("shadow") } From 8e9c9053705857dffcb9bb7c3041339cfac24144 Mon Sep 17 00:00:00 2001 From: OneLiteFeather Date: Sun, 17 Aug 2025 18:57:27 +0200 Subject: [PATCH 2/3] Update gradle and fix building --- gradle/wrapper/gradle-wrapper.jar | Bin 43764 -> 43705 bytes gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew | 4 ++-- gradlew.bat | 4 ++-- settings.gradle.kts | 7 ++++--- 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 1b33c55baabb587c669f562ae36f953de2481846..9bbc975c742b298b441bfb90dbc124400a3751b9 100644 GIT binary patch delta 584 zcmexzm1*ZyrVZJAexH5Moc8h7)w{^+t*dqJ%=yhh23L$9JpFV=_k`zJ-?Q4DI*eSe z+ES)HSrVnWLtJ&)lO%hRkV9zl5qqWRt0e;bb zPPo`)y?HTAyZI&u&X<|2$FDHCf4;!v8}p=?Tm`^F0`u(|1ttf~&t$qP3KUSD>@TJQ zRwJ}Pim6NzEc8KA6)e;S6gs8=7IIL8sQL*MYEuRYO;Uj<%3UbMbV&^&!Zvx+LKmjT z8Zch6rYP7Tw?$Hn(UTJwWiS=$f{lB(C=e*%usDV})0AQIK~sat=ND@+Gg*Pyij!rR z*fa02W|%BsV++>4W{DKDGSIUEHd2$P+8ct!RF+CHDowUuTEZOZ%rJSQv*qOXOSPDN zT|sP-$p*_3ncsWB*qoD7JQcyZ9xan%cJP6Tb4-?AZpr*F6v98hoNaPJm@HV`yya5N z))6pqFXn@}P(3T0nEzM8*c_9KtE9o|_pFd&K35GBXP^9Kg(b6GH-z8S4GDzIl~T+b zdLd#meKKHu$5u))8cu$=GKINkGDPOUD)!0$C(BH(U!}!-e;Q0ok8Sc?V1zRO04>ts AA^-pY delta 642 zcmdmamFde>rVZJA^}0Q$xegf!xPEW^+5YDM%iT2bEgct9o+jH~+sJas#HZ=szO|** z=Pj=X_vx?W&DSwKck|WWn~hffsvnQ+42*W$b7b0$SCcOoZ`{W{^$^pk;4>8-A*-)$ z?n(Po`1$6Jn_u?t-L+tsPyZ2#X}8T6OS8pAU;kdgd+_Hw4z4TW0p9E!T+=f7-c&O% zFic^X{7^$?^Ho04eona9n#mGMxKhA=~8B%JN`M zMhm5wc-2v)$``sY$!Q`9xiU@DhI73ZxiGEKg>yIPs)NmWwMdF-ngLXpZSqV5ez36n zVkxF2rjrjWR+_xr6e6@_u@s~2uv{9vi*1pj2)BjFD+-%@&pRVP1f{O1glxTOp2-62Ph;v z`N1+vCd)9ea)af*Ol1*JCfnp$%Uu}%OuoN7g2}3C@`L5FlP#(sA=|h@iixuZC?qp^ z=L$=v$ZoI}|87Wh=&h7udff{aieKr*l+zDp?pf)_bbRvUf>kn;HCDMXNlgbbo!QRK I1x7am0No)LiU0rr diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 7705927..2a84e18 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index 23d15a9..faf9300 100755 --- a/gradlew +++ b/gradlew @@ -114,7 +114,7 @@ case "$( uname )" in #( NONSTOP* ) nonstop=true ;; esac -CLASSPATH="\\\"\\\"" +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar # Determine the Java command to use to start the JVM. @@ -213,7 +213,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \ -classpath "$CLASSPATH" \ - -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ + org.gradle.wrapper.GradleWrapperMain \ "$@" # Stop when "xargs" is not available. diff --git a/gradlew.bat b/gradlew.bat index 5eed7ee..9b42019 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -70,11 +70,11 @@ goto fail :execute @rem Setup the command line -set CLASSPATH= +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* :end @rem End local scope for the variables with windows NT shell diff --git a/settings.gradle.kts b/settings.gradle.kts index 0ad9ea9..30fec0f 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,9 +1,9 @@ rootProject.name = "Attollo" pluginManagement { repositories { + gradlePluginPortal() mavenCentral() maven("https://eldonexus.de/repository/maven-public/") - gradlePluginPortal() } } includeBuild("build-logic") @@ -16,8 +16,9 @@ dependencyResolutionManagement { version("hangar", "0.1.3") version("bukkit.yml", "0.6.0") version("paper.run", "2.3.1") - version("shadow", "8.1.7") + version("shadow", "9.0.1") version("paper", "1.21-R0.1-SNAPSHOT") + version("paper.yml", "0.7.1") version("adventure", "4.17.0") version("mockk", "1.13.11") version("mock.bukkit", "3.9.0") @@ -30,7 +31,7 @@ dependencyResolutionManagement { plugin("publishdata","de.chojo.publishdata").versionRef("publishdata") plugin("modrinth", "com.modrinth.minotaur").versionRef("modrinth") plugin("hangar", "io.papermc.hangar-publish-plugin").versionRef("hangar") - plugin("paper.yml", "net.minecrell.plugin-yml.paper").versionRef("paper.yml") + plugin("paper.yml", "de.eldoria.plugin-yml.paper").versionRef("paper.yml") plugin("paper.run", "xyz.jpenilla.run-paper").versionRef("paper.run") plugin("shadow", "com.gradleup.shadow").versionRef("shadow") } From 6c548b1ae5e5638dbe10d558e0b9fa2aee7a59b3 Mon Sep 17 00:00:00 2001 From: OneLiteFeather Date: Sun, 17 Aug 2025 19:22:07 +0200 Subject: [PATCH 3/3] Remove commented-out git command execution in runGitCommand function --- build-logic/src/main/kotlin/extensions.kt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build-logic/src/main/kotlin/extensions.kt b/build-logic/src/main/kotlin/extensions.kt index 0c696da..d9a0369 100644 --- a/build-logic/src/main/kotlin/extensions.kt +++ b/build-logic/src/main/kotlin/extensions.kt @@ -35,9 +35,9 @@ fun Project.branchName(): String { fun Project.runGitCommand(args: List): String { val byteOut = ByteArrayOutputStream() - exec { - commandLine = listOf("git") + args - standardOutput = byteOut - } +// exec { +// commandLine = listOf("git") + args +// standardOutput = byteOut +// } return byteOut.toString(Charsets.UTF_8.name()).trim() }