diff --git a/build.gradle.kts b/build.gradle.kts index 8f50bd9d..6eb2ea1d 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -9,7 +9,7 @@ plugins { } group = "de.eldoria" -version = "2.7.2" +version = "2.7.3" var publishModules = setOf( "schematicbrushreborn-api", @@ -58,7 +58,6 @@ allprojects { compileOnly(libs.spigot.v16) compileOnly(libs.jetbrains.annotations) // Due to incompatibility by the yaml versions defined by world edit, fawe and bukkit we need to exclude it everywhere and add our own version... - compileOnly(libs.snakeyaml) compileOnly(libs.worldedit) compileOnly(libs.fawe.core) { exclude("com.intellectualsites.paster") @@ -66,7 +65,7 @@ allprojects { } compileOnly(libs.fawe.bukkit) - testImplementation(platform("org.junit:junit-bom:5.11.0")) + testImplementation(platform("org.junit:junit-bom:5.11.3")) testImplementation("org.junit.jupiter", "junit-jupiter") testImplementation(testlibs.mockbukkit) testImplementation(libs.worldedit) { diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 9355b415..cea7a793 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 f5feea6d..f3b75f3b 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/schematicbrushreborn-api/build.gradle.kts b/schematicbrushreborn-api/build.gradle.kts index facaa764..a32ca48b 100644 --- a/schematicbrushreborn-api/build.gradle.kts +++ b/schematicbrushreborn-api/build.gradle.kts @@ -23,7 +23,7 @@ publishing { url.set("https://github.com/eldoriarpg/schematicbrushreborn") developers { developer { - name.set("Florian Fülling") + name.set("Lilly Fülling") organization.set("EldoriaRPG") organizationUrl.set("https://github.com/eldoriarpg") } diff --git a/schematicbrushreborn-core/build.gradle.kts b/schematicbrushreborn-core/build.gradle.kts index 01b3ba24..3352e71c 100644 --- a/schematicbrushreborn-core/build.gradle.kts +++ b/schematicbrushreborn-core/build.gradle.kts @@ -7,6 +7,7 @@ dependencies { api(project(":schematicbrushreborn-api")) { exclude("com.fasterxml.jackson.core") exclude("com.fasterxml.jackson") + exclude("org.yaml") exclude("com.fasterxml.jackson.dataformat") exclude("net.kyori") exclude("org.jetbrains") @@ -16,14 +17,14 @@ dependencies { compileOnly(libs.jackson.yaml) compileOnly(libs.adventure.bukkit) compileOnly(libs.adventure.minimessage) - compileOnly("org.apache.logging.log4j", "log4j-slf4j2-impl", "2.23.1") - compileOnly("org.apache.logging.log4j", "log4j-core", "2.23.1") + compileOnly("org.apache.logging.log4j", "log4j-slf4j2-impl", "2.24.1") + compileOnly("org.apache.logging.log4j", "log4j-core", "2.24.1") implementation(libs.bstats) testImplementation(project(":schematicbrushreborn-api")) testImplementation(libs.jetbrains.annotations) - testImplementation("org.mockito", "mockito-core", "5.12.0") + testImplementation("org.mockito", "mockito-core", "5.14.2") testImplementation(libs.jackson.databind) } publishData { @@ -37,7 +38,7 @@ publishing { url.set("https://github.com/eldoriarpg/schematicbrushreborn") developers { developer { - name.set("Florian Fülling") + name.set("Lilly Fülling") organization.set("EldoriaRPG") organizationUrl.set("https://github.com/eldoriarpg") } diff --git a/schematicbrushreborn-core/src/main/java/de/eldoria/schematicbrush/commands/brush/Bind.java b/schematicbrushreborn-core/src/main/java/de/eldoria/schematicbrush/commands/brush/Bind.java index 9d176c11..63a77ee3 100644 --- a/schematicbrushreborn-core/src/main/java/de/eldoria/schematicbrush/commands/brush/Bind.java +++ b/schematicbrushreborn-core/src/main/java/de/eldoria/schematicbrush/commands/brush/Bind.java @@ -13,6 +13,7 @@ import de.eldoria.eldoutilities.commands.exceptions.CommandException; import de.eldoria.eldoutilities.commands.executor.IPlayerTabExecutor; import de.eldoria.eldoutilities.localization.MessageComposer; +import de.eldoria.eldoutilities.messages.MessageSender; import de.eldoria.eldoutilities.messages.Replacement; import de.eldoria.messageblocker.blocker.MessageBlocker; import de.eldoria.schematicbrush.util.WorldEditBrush; @@ -25,8 +26,6 @@ public class Bind extends AdvancedCommand implements IPlayerTabExecutor { private final Sessions sessions; private final MessageBlocker messageBlocker; - private final MiniMessage miniMessage = MiniMessage.miniMessage(); - private final BukkitAudiences audiences; public Bind(Plugin plugin, Sessions sessions, MessageBlocker messageBlocker) { super(plugin, CommandMeta.builder("bind") @@ -34,7 +33,6 @@ public Bind(Plugin plugin, Sessions sessions, MessageBlocker messageBlocker) { .build()); this.sessions = sessions; this.messageBlocker = messageBlocker; - audiences = BukkitAudiences.builder(plugin).build(); } @Override @@ -53,8 +51,10 @@ public void onCommand(@NotNull Player player, @NotNull String alias, @NotNull Ar var setcount = brush.settings().schematicSets().size(); var message = MessageComposer.create() .localeCode("commands.brush.bind.bound", Replacement.create("schematics", schematicCount), Replacement.create("sets", setcount)) - .text("[]") + .text("[") + .localeCode("words.edit") + .text("]") .build(); - messageBlocker.unblockPlayer(player).thenRun(() -> audiences.sender(player).sendMessage(miniMessage.deserialize(message))); + messageBlocker.unblockPlayer(player).thenRun(() -> messageSender().sendMessage(player, message)); } } diff --git a/schematicbrushreborn-paper-legacy/build.gradle.kts b/schematicbrushreborn-paper-legacy/build.gradle.kts index 5eb19f61..12f7cec1 100644 --- a/schematicbrushreborn-paper-legacy/build.gradle.kts +++ b/schematicbrushreborn-paper-legacy/build.gradle.kts @@ -6,9 +6,15 @@ plugins { val shadebase = "de.eldoria.schematicbrush.libs." dependencies { - implementation(project(":schematicbrushreborn-core")) - implementation(libs.bundles.jackson) - implementation(libs.bundles.utilities) + implementation(project(":schematicbrushreborn-core")) { + exclude("org.yaml", "snakeyaml") + } + implementation(libs.bundles.jackson){ + exclude("org.yaml") + } + implementation(libs.bundles.utilities){ + exclude("org.yaml") + } implementation(libs.adventure.bukkit) implementation(libs.adventure.minimessage) } @@ -26,7 +32,7 @@ publishing { url.set("https://github.com/eldoriarpg/schematicbrushreborn") developers { developer { - name.set("Florian Fülling") + name.set("Lilly Fülling") organization.set("EldoriaRPG") organizationUrl.set("https://github.com/eldoriarpg") } diff --git a/schematicbrushreborn-paper/.gitignore b/schematicbrushreborn-paper/.gitignore new file mode 100644 index 00000000..b24bf883 --- /dev/null +++ b/schematicbrushreborn-paper/.gitignore @@ -0,0 +1 @@ +/run diff --git a/schematicbrushreborn-paper/build.gradle.kts b/schematicbrushreborn-paper/build.gradle.kts index 91a1978e..aa674c9b 100644 --- a/schematicbrushreborn-paper/build.gradle.kts +++ b/schematicbrushreborn-paper/build.gradle.kts @@ -1,14 +1,17 @@ plugins { alias(libs.plugins.pluginyml.bukkit) alias(libs.plugins.shadow) + alias(libs.plugins.runserver) } val shadebase = "de.eldoria.schematicbrush.libs." dependencies { - implementation(project(":schematicbrushreborn-core")) - bukkitLibrary(libs.bundles.utilities) - bukkitLibrary(libs.bundles.jackson) + implementation(project(":schematicbrushreborn-core")) { + exclude("org.yaml", "snakeyaml") + } + implementation(libs.bundles.utilities) + implementation(libs.bundles.jackson) bukkitLibrary(libs.adventure.bukkit) } @@ -24,7 +27,7 @@ publishing { url.set("https://github.com/eldoriarpg/schematicbrushreborn") developers { developer { - name.set("Florian Fülling") + name.set("Lilly Fülling") organization.set("EldoriaRPG") organizationUrl.set("https://github.com/eldoriarpg") } @@ -58,6 +61,8 @@ tasks { shadowJar { relocate("org.bstats", shadebase + "bstats") relocate("de.eldoria.messageblocker", shadebase + "messageblocker") + relocate("com.jackson", shadebase + "jackson") + relocate("de.eldoria.eldoutilities", shadebase + "utilities") mergeServiceFiles() archiveVersion.set(rootProject.version as String) } @@ -75,6 +80,16 @@ tasks { from(shadowJar) destinationDir = File(path.toString()) } + + 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/schematicbrushreborn-spigot/build.gradle.kts b/schematicbrushreborn-spigot/build.gradle.kts index fe5c150d..ddfda205 100644 --- a/schematicbrushreborn-spigot/build.gradle.kts +++ b/schematicbrushreborn-spigot/build.gradle.kts @@ -12,7 +12,9 @@ dependencies { bukkitLibrary(libs.adventure.bukkit) bukkitLibrary(libs.adventure.minimessage) - implementation(project(":schematicbrushreborn-core")) + implementation(project(":schematicbrushreborn-core")) { + exclude("org.yaml", "snakeyaml") + } } publishData { @@ -27,7 +29,7 @@ publishing { url.set("https://github.com/eldoriarpg/schematicbrushreborn") developers { developer { - name.set("Florian Fülling") + name.set("Lilly Fülling") organization.set("EldoriaRPG") organizationUrl.set("https://github.com/eldoriarpg") } diff --git a/settings.gradle.kts b/settings.gradle.kts index 97491af8..3ac05d33 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -21,18 +21,17 @@ dependencyResolutionManagement { versionCatalogs { create("libs") { // jackson & serialization - version("jackson", "2.17.2") + version("jackson", "2.13.4") library("jackson-databind", "com.fasterxml.jackson.core","jackson-databind").versionRef("jackson") library("jackson-annotations", "com.fasterxml.jackson.core","jackson-annotations").versionRef("jackson") library("jackson-yaml", "com.fasterxml.jackson.dataformat","jackson-dataformat-yaml").versionRef("jackson") - library("snakeyaml", "org.yaml:snakeyaml:2.2") bundle("jackson", listOf("jackson-databind", "jackson-annotations", "jackson-yaml")) // adventure library("adventure-bukkit", "net.kyori:adventure-platform-bukkit:4.3.4") - library("adventure-minimessage", "net.kyori:adventure-text-minimessage:4.17.0") + library("adventure-minimessage", "net.kyori:adventure-text-minimessage:4.18.0") // utilities - version("utilities", "2.1.4") + version("utilities", "2.1.9") library("eldoutil-plugin", "de.eldoria.util","plugin").versionRef("utilities") library("eldoutil-jackson", "de.eldoria.util","jackson-configuration").versionRef("utilities") library("eldoutil-serialization", "de.eldoria.util","legacy-serialization").versionRef("utilities") @@ -42,11 +41,11 @@ dependencyResolutionManagement { bundle("utilities", listOf("eldoutil-jackson", "eldoutil-plugin", "eldoutil-serialization", "eldoutil-metrics", "eldoutil-updater", "eldoutil-crossversion")) - library("bstats", "org.bstats:bstats-bukkit:3.0.2") + library("bstats", "org.bstats:bstats-bukkit:3.1.0") library("messageblocker", "de.eldoria:messageblocker:1.1.3") // misc - library("jetbrains-annotations", "org.jetbrains:annotations:24.1.0") + library("jetbrains-annotations", "org.jetbrains:annotations:26.0.1") // minecraft version("minecraft-latest", "1.20.1-R0.1-SNAPSHOT") library("paper-latest", "io.papermc.paper", "paper-api").version("minecraft-latest") @@ -55,7 +54,7 @@ dependencyResolutionManagement { library("paper-v17", "io.papermc.paper:paper-api:1.17.1-R0.1-SNAPSHOT") library("spigot-v16", "io.papermc.paper:paper-api:1.17.1-R0.1-SNAPSHOT") // world edit - library("worldedit", "com.sk89q.worldedit:worldedit-bukkit:7.3.6") + library("worldedit", "com.sk89q.worldedit:worldedit-bukkit:7.3.8") version("fawe", "2.11.1") library("fawe-core", "com.fastasyncworldedit","FastAsyncWorldEdit-Core").versionRef("fawe") library("fawe-bukkit", "com.fastasyncworldedit","FastAsyncWorldEdit-Bukkit").versionRef("fawe") @@ -64,8 +63,8 @@ dependencyResolutionManagement { plugin("publishdata", "de.chojo.publishdata").version("1.4.0") plugin("spotless", "com.diffplug.spotless").version("6.25.0") plugin("shadow", "io.github.goooler.shadow").version("8.1.8") - plugin("pluginyml-bukkit", "net.minecrell.plugin-yml.bukkit").version("0.6.0") - //plugin("pluginyml-paper","net.minecrell.plugin-yml.paper").version( "0.5.3") + plugin("pluginyml-bukkit", "de.eldoria.plugin-yml.bukkit").version("0.6.0") + plugin("runserver", "xyz.jpenilla.run-paper").version("2.3.1") } create("testlibs") {