Add support for 1.20.3 and 1.20.4 (#2512)

* 1.20.3 * 1.20.3 ItemTypes * 1.20.3 * 1.20.3 * 1.20.4 * Fixup refractions * Move adapters to _4
IntellectualSites · Dec 8, 2023 · 6057433 · 6057433
1 parent ea6138c
commit 6057433
Show file tree

Hide file tree

Showing 28 changed files with 8,673 additions and 9 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -27,7 +27,7 @@ body:
       description: Which server version version you using? If your server version is not listed, it is not supported. Update to a supported version first.
       multiple: false
       options:
-        - '1.20.2'
+        - '1.20.4'
         - '1.20'
         - '1.19.4'
         - '1.18.2'

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -83,7 +83,7 @@ allprojects {
 }
 
 applyCommonConfiguration()
-val supportedVersions = listOf("1.17.1", "1.18.2", "1.19.4", "1.20", "1.20.2")
+val supportedVersions = listOf("1.17.1", "1.18.2", "1.19.4", "1.20", "1.20.4")
 
 tasks {
     supportedVersions.forEach {
@@ -97,7 +97,7 @@ tasks {
         }
     }
     runServer {
-        minecraftVersion("1.20.2")
+        minecraftVersion("1.20.4")
         pluginJars(*project(":worldedit-bukkit").getTasksByName("shadowJar", false).map { (it as Jar).archiveFile }
                 .toTypedArray())
 

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -2,7 +2,7 @@ rootProject.name = "FastAsyncWorldEdit"
 
 include("worldedit-libs")
 
-listOf("1_17_1", "1_18_2", "1_19_4", "1_20", "1_20_2").forEach {
+listOf("1_17_1", "1_18_2", "1_19_4", "1_20", "1_20_2", "1_20_4").forEach {
     include("worldedit-bukkit:adapters:adapter-$it")
 }
 

diff --git a/...-1_17_1/src/main/java/com/sk89q/worldedit/bukkit/adapter/ext/fawe/PaperweightAdapter.java b/...-1_17_1/src/main/java/com/sk89q/worldedit/bukkit/adapter/ext/fawe/PaperweightAdapter.java
@@ -198,7 +198,7 @@ public PaperweightAdapter() throws NoSuchFieldException, NoSuchMethodException {
         getChunkFutureMainThreadMethod.setAccessible(true);
 
         mainThreadProcessorField = ServerChunkCache.class.getDeclaredField(
-                Refraction.pickName("mainThreadProcessor", "h")
+                Refraction.pickName("mainThreadProcessor", "g")
         );
         mainThreadProcessorField.setAccessible(true);
 

diff --git a/worldedit-bukkit/adapters/adapter-1_20_4/build.gradle.kts b/worldedit-bukkit/adapters/adapter-1_20_4/build.gradle.kts
@@ -0,0 +1,17 @@
+import io.papermc.paperweight.userdev.PaperweightUserDependenciesExtension
+
+plugins {
+    java
+}
+
+applyPaperweightAdapterConfiguration()
+
+repositories {
+    gradlePluginPortal()
+}
+
+dependencies {
+    // https://repo.papermc.io/service/rest/repository/browse/maven-public/io/papermc/paper/dev-bundle/
+    the<PaperweightUserDependenciesExtension>().paperDevBundle("1.20.3-R0.1-20231207.043048-3")
+    compileOnly(libs.paperlib)
+}