diff --git a/build.gradle.kts b/build.gradle.kts index b80f941..d215846 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -5,7 +5,7 @@ plugins { } group = "de.eldoria.gridselector" -version = "1.3.1" +version = "1.3.2" allprojects { apply { @@ -45,6 +45,7 @@ allprojects { } } } + } license { diff --git a/core/build.gradle.kts b/core/build.gradle.kts index 306ce57..1db0e51 100644 --- a/core/build.gradle.kts +++ b/core/build.gradle.kts @@ -6,9 +6,9 @@ plugins { } dependencies { - compileOnly("de.eldoria", "schematicbrushreborn-api", "2.7.1") + compileOnly("de.eldoria", "schematicbrushreborn-api", "2.7.3") compileOnly("org.spigotmc", "spigot-api", "1.16.5-R0.1-SNAPSHOT") - compileOnly("com.sk89q.worldedit", "worldedit-bukkit", "7.3.6") + compileOnly("com.sk89q.worldedit", "worldedit-bukkit", "7.3.9") // PlotSquared Core API compileOnly("com.plotsquared", "PlotSquared-Core", "6.11.1") { exclude("com.intellectualsites.paster", "Paster") @@ -16,20 +16,20 @@ dependencies { exclude("com.intellectualsites.informative-annotations", "informative-annotations") } compileOnly("com.plotsquared", "PlotSquared-Bukkit", "6.11.1") { isTransitive = false } // PlotSquared Bukkit API - compileOnly("com.sk89q.worldguard", "worldguard-bukkit", "7.0.10") - compileOnly("com.fastasyncworldedit:FastAsyncWorldEdit-Core:2.11.1") { + compileOnly("com.sk89q.worldguard", "worldguard-bukkit", "7.0.12") + compileOnly("com.fastasyncworldedit:FastAsyncWorldEdit-Core:2.12.3") { exclude("com.intellectualsites.paster") exclude("org.yaml") } - compileOnly("com.fastasyncworldedit:FastAsyncWorldEdit-Bukkit:2.11.1") { + compileOnly("com.fastasyncworldedit:FastAsyncWorldEdit-Bukkit:2.12.3") { isTransitive = false exclude("org.yaml") } - testImplementation("org.junit.jupiter", "junit-jupiter-api", "5.11.0") - testImplementation("com.sk89q.worldedit", "worldedit-bukkit", "7.3.6") + testImplementation("org.junit.jupiter", "junit-jupiter-api", "5.11.4") + testImplementation("com.sk89q.worldedit", "worldedit-bukkit", "7.3.9") testImplementation("org.spigotmc", "spigot-api", "1.16.5-R0.1-SNAPSHOT") - testImplementation("de.eldoria", "eldo-util", "1.14.4") + testImplementation("de.eldoria", "schematicbrushreborn-api", "2.7.3") testRuntimeOnly("org.junit.jupiter", "junit-jupiter-engine") } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 9355b41..cea7a79 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.10-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index f5feea6..f3b75f3 100755 --- a/gradlew +++ b/gradlew @@ -86,8 +86,7 @@ done # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) -APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s -' "$PWD" ) || exit +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum diff --git a/latest/.gitignore b/latest/.gitignore new file mode 100644 index 0000000..7e3b24e --- /dev/null +++ b/latest/.gitignore @@ -0,0 +1 @@ +run/ diff --git a/latest/build.gradle.kts b/latest/build.gradle.kts index 0d05c83..77b875a 100644 --- a/latest/build.gradle.kts +++ b/latest/build.gradle.kts @@ -2,6 +2,7 @@ plugins { alias(libs.plugins.publishdata) alias(libs.plugins.shadow) `maven-publish` + alias(libs.plugins.runserver) } dependencies { @@ -38,6 +39,8 @@ tasks { shadowJar { val shadebase = "de.eldoria.schematicbrush.libs." relocate("de.eldoria.messageblocker", shadebase + "messageblocker") + relocate("com.jackson", shadebase + "jackson") + relocate("de.eldoria.eldoutilities", shadebase + "utilities") } build { @@ -55,4 +58,15 @@ tasks { into(path.toString()) rename{"gridselector.jar"} } + + runServer { + minecraftVersion("1.21.1") + downloadPlugins { + url("https://ci.athion.net/job/FastAsyncWorldEdit/lastSuccessfulBuild/artifact/artifacts/FastAsyncWorldEdit-Paper-2.12.4-SNAPSHOT-1013.jar") + url("https://download.luckperms.net/1569/bukkit/loader/LuckPerms-Bukkit-5.4.152.jar") + } + + jvmArgs("-Dcom.mojang.eula.agree=true") + } + } diff --git a/settings.gradle.kts b/settings.gradle.kts index a67ccab..e17f342 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -22,6 +22,7 @@ dependencyResolutionManagement { plugin("licenser", "org.cadixdev.licenser").version("0.6.1") plugin("shadow", "io.github.goooler.shadow").version("8.1.8") plugin("pluginyml", "net.minecrell.plugin-yml.bukkit").version("0.6.0") + plugin("runserver", "xyz.jpenilla.run-paper").version("2.3.1") } } }