From 6760ad7115660dbafc42d71aca44d42e8306b76b Mon Sep 17 00:00:00 2001 From: wizjany Date: Tue, 30 Nov 2021 11:53:14 -0500 Subject: [PATCH] Bump version numbers and stuff for 1.18 release. --- .../adapters/adapter-1.18/build.gradle.kts | 11 +---------- .../adapter/impl/v1_18_R1/PaperweightAdapter.java | 2 +- worldedit-bukkit/build.gradle.kts | 2 +- worldedit-fabric/build.gradle.kts | 8 ++++---- 4 files changed, 7 insertions(+), 16 deletions(-) diff --git a/worldedit-bukkit/adapters/adapter-1.18/build.gradle.kts b/worldedit-bukkit/adapters/adapter-1.18/build.gradle.kts index 8e6b5dd91..55690c1a7 100644 --- a/worldedit-bukkit/adapters/adapter-1.18/build.gradle.kts +++ b/worldedit-bukkit/adapters/adapter-1.18/build.gradle.kts @@ -1,14 +1,5 @@ applyPaperweightAdapterConfiguration() -repositories { - // For now, dev-bundle comes from mavenLocal. - mavenLocal { - content { - includeGroup("io.papermc.paper") - } - } -} - dependencies { - paperDevBundle("1.18-rc3-R0.1-SNAPSHOT") + paperDevBundle("1.18-R0.1-20211130.164241-2") } diff --git a/worldedit-bukkit/adapters/adapter-1.18/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v1_18_R1/PaperweightAdapter.java b/worldedit-bukkit/adapters/adapter-1.18/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v1_18_R1/PaperweightAdapter.java index b91765df3..7aa53b88c 100644 --- a/worldedit-bukkit/adapters/adapter-1.18/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v1_18_R1/PaperweightAdapter.java +++ b/worldedit-bukkit/adapters/adapter-1.18/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v1_18_R1/PaperweightAdapter.java @@ -186,7 +186,7 @@ public PaperweightAdapter() throws NoSuchFieldException, NoSuchMethodException { CraftServer.class.cast(Bukkit.getServer()); int dataVersion = CraftMagicNumbers.INSTANCE.getDataVersion(); - if (dataVersion != 2858) { // 1.18 release should be 2859 + if (dataVersion != 2860) { throw new UnsupportedClassVersionError("Not 1.18!"); } diff --git a/worldedit-bukkit/build.gradle.kts b/worldedit-bukkit/build.gradle.kts index 77fb6571d..f5fe1cd68 100644 --- a/worldedit-bukkit/build.gradle.kts +++ b/worldedit-bukkit/build.gradle.kts @@ -55,7 +55,7 @@ "compileOnly"("io.papermc.paper:paper-api:1.17-R0.1-SNAPSHOT") { exclude(group = "org.slf4j", module = "slf4j-api") } - "implementation"("io.papermc:paperlib:1.0.8-SNAPSHOT") + "implementation"("io.papermc:paperlib:1.0.7") "compileOnly"("com.sk89q:dummypermscompat:1.10") "implementation"("org.bstats:bstats-bukkit:2.1.0") "implementation"("it.unimi.dsi:fastutil") diff --git a/worldedit-fabric/build.gradle.kts b/worldedit-fabric/build.gradle.kts index 8ab00b92a..ce0be43bf 100644 --- a/worldedit-fabric/build.gradle.kts +++ b/worldedit-fabric/build.gradle.kts @@ -21,9 +21,9 @@ apply(plugin = "fabric-loom") apply(plugin = "java-library") -val minecraftVersion = "1.18-pre4" -val yarnMappings = "1.18-pre3+build.5:v2" -val loaderVersion = "0.12.5" +val minecraftVersion = "1.18" +val yarnMappings = "1.18+build.1:v2" +val loaderVersion = "0.12.6" val fabricApiConfiguration: Configuration = configurations.create("fabricApi") @@ -49,7 +49,7 @@ "modImplementation"("net.fabricmc:fabric-loader:$loaderVersion") // [1] declare fabric-api dependency... - "fabricApi"("net.fabricmc.fabric-api:fabric-api:0.42.7+1.18") + "fabricApi"("net.fabricmc.fabric-api:fabric-api:0.43.1+1.18") // [2] Load the API dependencies from the fabric mod json... @Suppress("UNCHECKED_CAST")