From 953e22fc38e91bb87fa1afdba7b8d5d506e6fa54 Mon Sep 17 00:00:00 2001 From: Octavia Togami Date: Thu, 18 Nov 2021 12:16:26 -0800 Subject: [PATCH] [Fabric] Update to 1.18-pre4 --- buildSrc/src/main/kotlin/CommonConfig.kt | 2 +- worldedit-fabric/build.gradle.kts | 8 ++++---- .../worldedit/fabric/mixin/MixinMinecraftServer.java | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/buildSrc/src/main/kotlin/CommonConfig.kt b/buildSrc/src/main/kotlin/CommonConfig.kt index 8701c8716..3159aec3f 100644 --- a/buildSrc/src/main/kotlin/CommonConfig.kt +++ b/buildSrc/src/main/kotlin/CommonConfig.kt @@ -26,7 +26,7 @@ plugins.withId("java") { the().toolchain { - languageVersion.set(JavaLanguageVersion.of(16)) + languageVersion.set(JavaLanguageVersion.of(17)) } } diff --git a/worldedit-fabric/build.gradle.kts b/worldedit-fabric/build.gradle.kts index 060115fc9..8ab00b92a 100644 --- a/worldedit-fabric/build.gradle.kts +++ b/worldedit-fabric/build.gradle.kts @@ -15,14 +15,14 @@ } } -applyPlatformAndCoreConfiguration(javaRelease = 16) +applyPlatformAndCoreConfiguration(javaRelease = 17) applyShadowConfiguration() apply(plugin = "fabric-loom") apply(plugin = "java-library") -val minecraftVersion = "1.18-pre1" -val yarnMappings = "1.18-pre1+build.6:v2" +val minecraftVersion = "1.18-pre4" +val yarnMappings = "1.18-pre3+build.5:v2" val loaderVersion = "0.12.5" 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.2+1.18") + "fabricApi"("net.fabricmc.fabric-api:fabric-api:0.42.7+1.18") // [2] Load the API dependencies from the fabric mod json... @Suppress("UNCHECKED_CAST") diff --git a/worldedit-fabric/src/main/java/com/sk89q/worldedit/fabric/mixin/MixinMinecraftServer.java b/worldedit-fabric/src/main/java/com/sk89q/worldedit/fabric/mixin/MixinMinecraftServer.java index 806757894..17ae3eea9 100644 --- a/worldedit-fabric/src/main/java/com/sk89q/worldedit/fabric/mixin/MixinMinecraftServer.java +++ b/worldedit-fabric/src/main/java/com/sk89q/worldedit/fabric/mixin/MixinMinecraftServer.java @@ -49,7 +49,7 @@ public void tick() { @Override public Path getStoragePath(Level world) { - return storageSource.getDimensionPath(world.dimension()).toPath(); + return storageSource.getDimensionPath(world.dimension()); } @Accessor