From f505ef60494fafbadddf99372792bdf80d9f61d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roger=20D=C3=ADaz=20Vi=C3=B1olas?= <rdvdev2@gmail.com>
Date: Sun, 6 Mar 2022 15:24:41 +0100
Subject: [PATCH] 1.18.2 compatibility (v2.0)

---
 build.gradle                                             | 9 ++-------
 gradle.properties                                        | 8 ++++----
 .../mixin/MixinMinecraftClient.java                      | 2 +-
 src/main/resources/fabric.mod.json                       | 4 +---
 4 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/build.gradle b/build.gradle
index a663f0b..d003d1c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id 'fabric-loom' version '0.10-SNAPSHOT'
+    id 'fabric-loom' version '0.11-SNAPSHOT'
     id 'maven-publish'
 }
 
@@ -25,12 +25,7 @@ processResources {
 }
 
 tasks.withType(JavaCompile).configureEach {
-    it.options.encoding = "UTF-8"
-
-    def targetVersion = 8
-    if (JavaVersion.current().isJava9Compatible()) {
-        it.options.release.set(targetVersion)
-    }
+    it.options.release.set(17)
 }
 
 jar {
diff --git a/gradle.properties b/gradle.properties
index 5fd9cd3..b305abc 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,10 +1,10 @@
 org.gradle.jvmargs=-Xmx1G
 
-minecraft_version=1.18
-yarn_mappings=1.18+build.1
-loader_version=0.12.8
+minecraft_version=1.18.2
+yarn_mappings=1.18.2+build.2
+loader_version=0.13.3
 
-mod_version=1.4
+mod_version=2.0
 maven_group=com.rdvdev2
 archives_base_name=DisableCustomWorldsAdvice
 
diff --git a/src/main/java/com/rdvdev2/disablecustomworldsadvice/mixin/MixinMinecraftClient.java b/src/main/java/com/rdvdev2/disablecustomworldsadvice/mixin/MixinMinecraftClient.java
index 4393423..ed7b03c 100644
--- a/src/main/java/com/rdvdev2/disablecustomworldsadvice/mixin/MixinMinecraftClient.java
+++ b/src/main/java/com/rdvdev2/disablecustomworldsadvice/mixin/MixinMinecraftClient.java
@@ -9,7 +9,7 @@
 public abstract class MixinMinecraftClient {
 
     @ModifyVariable(
-            method = "startIntegratedServer(Ljava/lang/String;Lnet/minecraft/util/registry/DynamicRegistryManager$Impl;Ljava/util/function/Function;Lcom/mojang/datafixers/util/Function4;ZLnet/minecraft/client/MinecraftClient$WorldLoadAction;)V",
+            method = "startIntegratedServer(Ljava/lang/String;Ljava/util/function/Function;Ljava/util/function/Function;ZLnet/minecraft/client/MinecraftClient$WorldLoadAction;)V",
             at = @At(value = "FIELD", target = "Lnet/minecraft/client/MinecraftClient$WorldLoadAction;NONE:Lnet/minecraft/client/MinecraftClient$WorldLoadAction;", ordinal = 0),
             ordinal = 2,
             index = 11,
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
index 2aef788..8afe360 100644
--- a/src/main/resources/fabric.mod.json
+++ b/src/main/resources/fabric.mod.json
@@ -22,9 +22,7 @@
   "depends": {
     "fabricloader": "*",
     "minecraft": [
-      "~1.16.2",
-      "~1.17",
-      "~1.18"
+      "~1.18.2"
     ]
   }
 }