Resolve version fuckup with yaml

eldoriarpg · Jan 6, 2025 · bcc6159 · bcc6159
1 parent 6d3d40b
commit bcc6159
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 12 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -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")

diff --git 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")

diff --git 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)
 }

diff --git a/schematicbrushreborn-paper/.gitignore b/schematicbrushreborn-paper/.gitignore
@@ -0,0 +1 @@
+/run
diff --git 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)
 }
 
@@ -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,15 @@ tasks {
         from(shadowJar)
         destinationDir = File(path.toString())
     }
+
+    runServer {
+        minecraftVersion("1.21.4")
+        downloadPlugins {
+            url("https://ci.athion.net/job/FastAsyncWorldEdit/lastSuccessfulBuild/artifact/artifacts/FastAsyncWorldEdit-Paper-2.12.4-SNAPSHOT-1013.jar")
+        }
+
+      jvmArgs("-Dcom.mojang.eula.agree=true")
+    }
 }
 
 

diff --git 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 {

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -21,11 +21,10 @@ 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.3")
             bundle("jackson", listOf("jackson-databind", "jackson-annotations", "jackson-yaml"))
 
             // adventure
@@ -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") {