From 6953bc98ca0371908a3bd6cc77d21724d1982481 Mon Sep 17 00:00:00 2001
From: Jared <jaredlll08@gmail.com>
Date: Tue, 30 Nov 2021 22:26:34 +0200
Subject: [PATCH] Update to 1.18

---
 Fabric/build.gradle                         | 6 +++---
 Fabric/src/main/resources/fabric.mod.json   | 6 +++---
 Forge/src/main/resources/META-INF/mods.toml | 6 +++---
 build.gradle                                | 4 ++--
 gradle.properties                           | 8 ++++----
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/Fabric/build.gradle b/Fabric/build.gradle
index 383182b..f05365d 100644
--- a/Fabric/build.gradle
+++ b/Fabric/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id 'fabric-loom' version '0.9-SNAPSHOT'
+    id 'fabric-loom' version '0.10-SNAPSHOT'
     id 'maven-publish'
     id 'idea'
 }
@@ -20,13 +20,13 @@ loom {
             client()
             setConfigName("Fabric Client")
             ideConfigGenerated(true)
-            runDir("${this.name}/run")
+            runDir("run")
         }
         server {
             server()
             setConfigName("Fabric Server")
             ideConfigGenerated(true)
-            runDir("${this.name}/run")
+            runDir("run")
         }
     }
 }
diff --git a/Fabric/src/main/resources/fabric.mod.json b/Fabric/src/main/resources/fabric.mod.json
index a48fcc1..642ecbd 100644
--- a/Fabric/src/main/resources/fabric.mod.json
+++ b/Fabric/src/main/resources/fabric.mod.json
@@ -27,10 +27,10 @@
     ],
   
     "depends": {
-      "fabricloader": ">=0.11.3",
+      "fabricloader": ">=0.12",
       "fabric": "*",
-      "minecraft": "1.17.x",
-      "java": ">=16"
+      "minecraft": "1.18.x",
+      "java": ">=17"
     },
     "suggests": {
       "another-mod": "*"
diff --git a/Forge/src/main/resources/META-INF/mods.toml b/Forge/src/main/resources/META-INF/mods.toml
index 0c620ed..d000fe9 100644
--- a/Forge/src/main/resources/META-INF/mods.toml
+++ b/Forge/src/main/resources/META-INF/mods.toml
@@ -6,7 +6,7 @@
 # The name of the mod loader type to load - for regular FML @Mod mods it should be javafml
 modLoader="javafml" #mandatory
 # A version range to match for said mod loader - for regular FML @Mod it will be the forge version
-loaderVersion="[37,)" #mandatory This is typically bumped every Minecraft version by Forge. See our download page for lists of versions.
+loaderVersion="[38,)" #mandatory This is typically bumped every Minecraft version by Forge. See our download page for lists of versions.
 # The license for you mod. This is mandatory metadata and allows for easier comprehension of your redistributive properties.
 # Review your options at https://choosealicense.com/. All rights reserved is the default copyright stance, and is thus the default here.
 license="All rights reserved"
@@ -47,7 +47,7 @@ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed mollis lacinia magn
     # Does this dependency have to exist - if not, ordering below must be specified
     mandatory=true #mandatory
     # The version range of the dependency
-    versionRange="[37,)" #mandatory
+    versionRange="[38,)" #mandatory
     # An ordering relationship for the dependency - BEFORE or AFTER required if the relationship is not mandatory
     ordering="NONE"
     # Side this dependency is applied on - BOTH, CLIENT or SERVER
@@ -57,6 +57,6 @@ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed mollis lacinia magn
     modId="minecraft"
     mandatory=true
 # This version range declares a minimum of the current minecraft version up to but not including the next major version
-    versionRange="[1.17.1,1.18)"
+    versionRange="[1.18,1.19)"
     ordering="NONE"
     side="BOTH"
diff --git a/build.gradle b/build.gradle
index 3c9e9e0..a3c069b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,7 +2,7 @@ subprojects {
     
     apply plugin: 'java'
     
-    java.toolchain.languageVersion = JavaLanguageVersion.of(16)
+    java.toolchain.languageVersion = JavaLanguageVersion.of(17)
     java.withSourcesJar()
     java.withJavadocJar()
         
@@ -42,6 +42,6 @@ subprojects {
     tasks.withType(JavaCompile).configureEach {
     
         it.options.encoding = 'UTF-8'
-        it.options.release = 16
+        it.options.release = 17
     }
 }
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index 9b36e67..d07ff29 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -3,19 +3,19 @@ version=1.0.0
 group=com.blamejared.multiloader
 
 # Common
-minecraft_version=1.17.1
+minecraft_version=1.18
 common_runs_enabled=false
 common_client_run_name=Common Client
 common_server_run_name=Common Server
 
 
 # Forge
-forge_version=37.0.85
+forge_version=38.0.0
 //forge_ats_enabled=true
 
 # Fabric
-fabric_version=0.40.8+1.17
-fabric_loader_version=0.12.1
+fabric_version=0.43.1+1.18
+fabric_loader_version=0.12.6
 
 # Mod options
 mod_name=MultiLoader