From 69f5229fee98ac01d904c30d79726f99d5ef06ce Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 25 Oct 2024 19:46:06 +0000 Subject: [PATCH 1/8] Update FAWE to v2.12.0 --- core/build.gradle.kts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/build.gradle.kts b/core/build.gradle.kts index 306ce57..fdc6bcf 100644 --- a/core/build.gradle.kts +++ b/core/build.gradle.kts @@ -17,11 +17,11 @@ dependencies { } 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.fastasyncworldedit:FastAsyncWorldEdit-Core:2.12.0") { exclude("com.intellectualsites.paster") exclude("org.yaml") } - compileOnly("com.fastasyncworldedit:FastAsyncWorldEdit-Bukkit:2.11.1") { + compileOnly("com.fastasyncworldedit:FastAsyncWorldEdit-Bukkit:2.12.0") { isTransitive = false exclude("org.yaml") } From c1937c9262dd4bf3edbaa4a92e63a6769c60e13f Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 29 Dec 2024 13:09:09 +0000 Subject: [PATCH 2/8] Update FAWE to v2.12.3 (#171) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- core/build.gradle.kts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/build.gradle.kts b/core/build.gradle.kts index fdc6bcf..b75eb18 100644 --- a/core/build.gradle.kts +++ b/core/build.gradle.kts @@ -17,11 +17,11 @@ dependencies { } 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.12.0") { + compileOnly("com.fastasyncworldedit:FastAsyncWorldEdit-Core:2.12.3") { exclude("com.intellectualsites.paster") exclude("org.yaml") } - compileOnly("com.fastasyncworldedit:FastAsyncWorldEdit-Bukkit:2.12.0") { + compileOnly("com.fastasyncworldedit:FastAsyncWorldEdit-Bukkit:2.12.3") { isTransitive = false exclude("org.yaml") } From b0f9617bbb7820ccf233b6fdb0e88499bdb9c7e8 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 29 Dec 2024 16:55:21 +0000 Subject: [PATCH 3/8] Update dependency com.sk89q.worldguard:worldguard-bukkit to v7.0.12 (#174) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- core/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build.gradle.kts b/core/build.gradle.kts index b75eb18..a25142a 100644 --- a/core/build.gradle.kts +++ b/core/build.gradle.kts @@ -16,7 +16,7 @@ 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.sk89q.worldguard", "worldguard-bukkit", "7.0.12") compileOnly("com.fastasyncworldedit:FastAsyncWorldEdit-Core:2.12.3") { exclude("com.intellectualsites.paster") exclude("org.yaml") From 51d5ee4abcceb1c5f25e8dcd82e32b15e083e406 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 29 Dec 2024 16:55:49 +0000 Subject: [PATCH 4/8] Update dependency com.sk89q.worldedit:worldedit-bukkit to v7.3.9 (#173) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- core/build.gradle.kts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/build.gradle.kts b/core/build.gradle.kts index a25142a..137612d 100644 --- a/core/build.gradle.kts +++ b/core/build.gradle.kts @@ -8,7 +8,7 @@ plugins { dependencies { compileOnly("de.eldoria", "schematicbrushreborn-api", "2.7.1") 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") @@ -27,7 +27,7 @@ dependencies { } testImplementation("org.junit.jupiter", "junit-jupiter-api", "5.11.0") - testImplementation("com.sk89q.worldedit", "worldedit-bukkit", "7.3.6") + 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") testRuntimeOnly("org.junit.jupiter", "junit-jupiter-engine") From 1d9e0e3868e8b184a5f787a3d8169530a3594d8a Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 3 Jan 2025 01:08:51 +0000 Subject: [PATCH 5/8] Update dependency org.junit.jupiter:junit-jupiter-api to v5.11.4 (#177) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- core/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build.gradle.kts b/core/build.gradle.kts index 137612d..105330a 100644 --- a/core/build.gradle.kts +++ b/core/build.gradle.kts @@ -26,7 +26,7 @@ dependencies { exclude("org.yaml") } - testImplementation("org.junit.jupiter", "junit-jupiter-api", "5.11.0") + 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") From eae1b284b66541dd639e974a63954b909d372f2e Mon Sep 17 00:00:00 2001 From: Lilly <46890129+RainbowDashLabs@users.noreply.github.com> Date: Mon, 13 Jan 2025 13:47:41 +0100 Subject: [PATCH 6/8] Update library relocation --- build.gradle.kts | 3 ++- core/build.gradle.kts | 2 +- latest/.gitignore | 1 + latest/build.gradle.kts | 14 ++++++++++++++ settings.gradle.kts | 1 + 5 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 latest/.gitignore 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 105330a..93973b7 100644 --- a/core/build.gradle.kts +++ b/core/build.gradle.kts @@ -29,7 +29,7 @@ dependencies { 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.1") testRuntimeOnly("org.junit.jupiter", "junit-jupiter-engine") } 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") } } } From 07ceda33e70aa2d41317170b18684b4ac8f7560c Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 13 Jan 2025 13:51:08 +0100 Subject: [PATCH 7/8] Update dependency de.eldoria:schematicbrushreborn-api to v2.7.3 (#176) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- core/build.gradle.kts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/build.gradle.kts b/core/build.gradle.kts index 93973b7..1db0e51 100644 --- a/core/build.gradle.kts +++ b/core/build.gradle.kts @@ -6,7 +6,7 @@ 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.9") // PlotSquared Core API @@ -29,7 +29,7 @@ dependencies { 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", "schematicbrushreborn-api", "2.7.1") + testImplementation("de.eldoria", "schematicbrushreborn-api", "2.7.3") testRuntimeOnly("org.junit.jupiter", "junit-jupiter-engine") } From 79e7451c452c67ed938579cb9b1eb6ce0cd154b4 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 13 Jan 2025 12:51:59 +0000 Subject: [PATCH 8/8] Update dependency gradle to v8.12 (#178) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) 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