From 9ef6e5bd813f6ccd89008dff521d9d51ad8fb75d Mon Sep 17 00:00:00 2001 From: wizjany Date: Sat, 30 Jul 2022 01:30:27 -0400 Subject: [PATCH] MC 1.19.1 (#2159) * [Fabric] Bump versions to 1.19.1. No code changes needed. * [Bukkit] Add 1.19.1 DV to 1.19 adapter. No mapping changes. Devbundle left untouched for now. * [Forge] Bump versions to MC 1.19.1. --- .../bukkit/adapter/impl/v1_19_R1/PaperweightAdapter.java | 4 ++-- worldedit-fabric/build.gradle.kts | 6 +++--- worldedit-forge/build.gradle.kts | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/worldedit-bukkit/adapters/adapter-1.19/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v1_19_R1/PaperweightAdapter.java b/worldedit-bukkit/adapters/adapter-1.19/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v1_19_R1/PaperweightAdapter.java index 3056c309a..48f930fb9 100644 --- a/worldedit-bukkit/adapters/adapter-1.19/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v1_19_R1/PaperweightAdapter.java +++ b/worldedit-bukkit/adapters/adapter-1.19/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v1_19_R1/PaperweightAdapter.java @@ -179,8 +179,8 @@ public PaperweightAdapter() throws NoSuchFieldException, NoSuchMethodException { CraftServer.class.cast(Bukkit.getServer()); int dataVersion = CraftMagicNumbers.INSTANCE.getDataVersion(); - if (dataVersion != 3105) { - throw new UnsupportedClassVersionError("Not 1.19!"); + if (dataVersion != 3105 && dataVersion != 3117) { + throw new UnsupportedClassVersionError("Not 1.19(.1)!"); } serverWorldsField = CraftServer.class.getDeclaredField("worlds"); diff --git a/worldedit-fabric/build.gradle.kts b/worldedit-fabric/build.gradle.kts index ebd60c5a6..5d43a0071 100644 --- a/worldedit-fabric/build.gradle.kts +++ b/worldedit-fabric/build.gradle.kts @@ -21,8 +21,8 @@ apply(plugin = "fabric-loom") apply(plugin = "java-library") -val minecraftVersion = "1.19" -val loaderVersion = "0.14.6" +val minecraftVersion = "1.19.1" +val loaderVersion = "0.14.8" val fabricApiConfiguration: Configuration = configurations.create("fabricApi") @@ -48,7 +48,7 @@ "modImplementation"("net.fabricmc:fabric-loader:$loaderVersion") // [1] declare fabric-api dependency... - "fabricApi"("net.fabricmc.fabric-api:fabric-api:0.55.1+1.19") + "fabricApi"("net.fabricmc.fabric-api:fabric-api:0.58.5+1.19.1") // [2] Load the API dependencies from the fabric mod json... @Suppress("UNCHECKED_CAST") diff --git a/worldedit-forge/build.gradle.kts b/worldedit-forge/build.gradle.kts index c9c34bd0f..139142427 100644 --- a/worldedit-forge/build.gradle.kts +++ b/worldedit-forge/build.gradle.kts @@ -12,11 +12,11 @@ applyPlatformAndCoreConfiguration(javaRelease = 17) applyShadowConfiguration() -val minecraftVersion = "1.19" +val minecraftVersion = "1.19.1" val nextMajorMinecraftVersion: String = minecraftVersion.split('.').let { (useless, major) -> "$useless.${major.toInt() + 1}" } -val forgeVersion = "41.1.0" +val forgeVersion = "42.0.0" val apiClasspath = configurations.create("apiClasspath") { isCanBeResolved = true