From 6392a43cd7df9953d144a604db3592aec7268ce8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roger=20D=C3=ADaz=20Vi=C3=B1olas?= <rdvdev2@gmail.com>
Date: Thu, 2 Dec 2021 13:46:45 +0100
Subject: [PATCH] 1.18 compatibility (v1.4)

---
 build.gradle                                         | 12 +++++-------
 gradle.properties                                    |  8 ++++----
 gradle/wrapper/gradle-wrapper.properties             |  2 +-
 settings.gradle                                      |  2 +-
 .../mixin/MixinMinecraftClient.java                  |  1 -
 src/main/resources/fabric.mod.json                   |  3 ++-
 6 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/build.gradle b/build.gradle
index 5b3b409..a663f0b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,10 +1,10 @@
 plugins {
-    id 'fabric-loom' version '0.8-SNAPSHOT'
+    id 'fabric-loom' version '0.10-SNAPSHOT'
     id 'maven-publish'
 }
 
-sourceCompatibility = JavaVersion.VERSION_16
-targetCompatibility = JavaVersion.VERSION_16
+sourceCompatibility = JavaVersion.VERSION_17
+targetCompatibility = JavaVersion.VERSION_17
 
 archivesBaseName = project.archives_base_name
 version = project.mod_version
@@ -29,7 +29,7 @@ tasks.withType(JavaCompile).configureEach {
 
     def targetVersion = 8
     if (JavaVersion.current().isJava9Compatible()) {
-        it.options.release = targetVersion
+        it.options.release.set(targetVersion)
     }
 }
 
@@ -70,9 +70,7 @@ publishing {
                 }
             }
 
-            artifact(remapJar) {
-                builtBy remapJar
-            }
+            from components.java
         }
     }
 
diff --git a/gradle.properties b/gradle.properties
index e5c6244..5fd9cd3 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,10 +1,10 @@
 org.gradle.jvmargs=-Xmx1G
 
-minecraft_version=1.17
-yarn_mappings=1.17+build.6
-loader_version=0.11.3
+minecraft_version=1.18
+yarn_mappings=1.18+build.1
+loader_version=0.12.8
 
-mod_version=1.3
+mod_version=1.4
 maven_group=com.rdvdev2
 archives_base_name=DisableCustomWorldsAdvice
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index f371643..e750102 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/settings.gradle b/settings.gradle
index 5b60df3..e8f0bb5 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,10 +1,10 @@
 pluginManagement {
     repositories {
-        jcenter()
         maven {
             name = 'Fabric'
             url = 'https://maven.fabricmc.net/'
         }
         gradlePluginPortal()
+        mavenCentral()
     }
 }
diff --git a/src/main/java/com/rdvdev2/disablecustomworldsadvice/mixin/MixinMinecraftClient.java b/src/main/java/com/rdvdev2/disablecustomworldsadvice/mixin/MixinMinecraftClient.java
index 43c500f..4393423 100644
--- a/src/main/java/com/rdvdev2/disablecustomworldsadvice/mixin/MixinMinecraftClient.java
+++ b/src/main/java/com/rdvdev2/disablecustomworldsadvice/mixin/MixinMinecraftClient.java
@@ -19,5 +19,4 @@ public abstract class MixinMinecraftClient {
     private boolean replaceBl2(boolean bl2) {
         return false;
     }
-
 }
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
index e0de7a6..2aef788 100644
--- a/src/main/resources/fabric.mod.json
+++ b/src/main/resources/fabric.mod.json
@@ -23,7 +23,8 @@
     "fabricloader": "*",
     "minecraft": [
       "~1.16.2",
-      "~1.17"
+      "~1.17",
+      "~1.18"
     ]
   }
 }