We're 1.20.4 now

EngineHub · Dec 8, 2023 · 96cd07b · 96cd07b
1 parent 34a8c73
commit 96cd07b
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 9 deletions.
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -2,7 +2,7 @@ rootProject.name = "worldedit"
 
 include("worldedit-libs")
 
-listOf("legacy", "1.17.1", "1.18.2", "1.19.4", "1.20", "1.20.2", "1.20.3").forEach {
+listOf("legacy", "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/.../adapters/adapter-1.20.3/build.gradle.kts → .../adapters/adapter-1.20.4/build.gradle.kts b/.../adapters/adapter-1.20.3/build.gradle.kts → .../adapters/adapter-1.20.4/build.gradle.kts
@@ -4,5 +4,5 @@ applyPaperweightAdapterConfiguration()
 
 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")
+    the<PaperweightUserDependenciesExtension>().paperDevBundle("1.20.4-R0.1-20231207.202833-1")
 }
diff --git a/...ter/impl/v1_20_R3/PaperweightAdapter.java → ...ter/impl/v1_20_R3/PaperweightAdapter.java b/...ter/impl/v1_20_R3/PaperweightAdapter.java → ...ter/impl/v1_20_R3/PaperweightAdapter.java
@@ -180,8 +180,8 @@ public PaperweightAdapter() throws NoSuchFieldException, NoSuchMethodException {
         CraftServer.class.cast(Bukkit.getServer());
 
         int dataVersion = CraftMagicNumbers.INSTANCE.getDataVersion();
-        if (dataVersion != 3698) {
-            throw new UnsupportedClassVersionError("Not 1.20.3!");
+        if (dataVersion != 3698 && dataVersion != 3700) {
+            throw new UnsupportedClassVersionError("Not 1.20.(3/4)!");
         }
 
         serverWorldsField = CraftServer.class.getDeclaredField("worlds");

diff --git a/...l/v1_20_R3/PaperweightDataConverters.java → ...l/v1_20_R3/PaperweightDataConverters.java b/...l/v1_20_R3/PaperweightDataConverters.java → ...l/v1_20_R3/PaperweightDataConverters.java
diff --git a/.../impl/v1_20_R3/PaperweightFakePlayer.java → .../impl/v1_20_R3/PaperweightFakePlayer.java b/.../impl/v1_20_R3/PaperweightFakePlayer.java → .../impl/v1_20_R3/PaperweightFakePlayer.java
diff --git a/...1_20_R3/PaperweightWorldNativeAccess.java → ...1_20_R3/PaperweightWorldNativeAccess.java b/...1_20_R3/PaperweightWorldNativeAccess.java → ...1_20_R3/PaperweightWorldNativeAccess.java
diff --git a/worldedit-fabric/build.gradle.kts b/worldedit-fabric/build.gradle.kts
@@ -22,8 +22,8 @@ applyShadowConfiguration()
 apply(plugin = "fabric-loom")
 apply(plugin = "java-library")
 
-val minecraftVersion = "1.20.3"
-val loaderVersion = "0.15.0"
+val minecraftVersion = "1.20.4"
+val loaderVersion = "0.15.1"
 
 val fabricApiConfiguration: Configuration = configurations.create("fabricApi")
 
@@ -64,7 +64,7 @@ dependencies {
         .toSet()
     // [2] Request the matching dependency from fabric-loom
     for (wantedDependency in wantedDependencies) {
-        val dep = project.the<FabricApiExtension>().module(wantedDependency, "0.91.1+1.20.3")
+        val dep = project.the<FabricApiExtension>().module(wantedDependency, "0.91.1+1.20.4")
         "include"(dep)
         "modImplementation"(dep)
     }

diff --git a/worldedit-forge/build.gradle.kts b/worldedit-forge/build.gradle.kts
@@ -12,11 +12,11 @@ plugins {
 applyPlatformAndCoreConfiguration(javaRelease = 17)
 applyShadowConfiguration()
 
-val minecraftVersion = "1.20.3"
+val minecraftVersion = "1.20.4"
 val nextMajorMinecraftVersion: String = minecraftVersion.split('.').let { (useless, major) ->
     "$useless.${major.toInt() + 1}"
 }
-val forgeVersion = "49.0.2"
+val forgeVersion = "49.0.3"
 
 val apiClasspath = configurations.create("apiClasspath") {
     isCanBeResolved = true