Merge 1.18 into 1.17

Author: DeathsGun

build.gradle

@@ -24,8 +24,8 @@ plugins {
     id "org.jetbrains.kotlin.plugin.serialization" version "1.5.30"
 }
 
-sourceCompatibility = JavaVersion.VERSION_17
-targetCompatibility = JavaVersion.VERSION_17
+sourceCompatibility = JavaVersion.VERSION_16
+targetCompatibility = JavaVersion.VERSION_16
 
 archivesBaseName = project.archives_base_name
 version = project.mod_version
@@ -65,7 +65,6 @@ test {
 
 tasks.withType(JavaCompile).configureEach {
     it.options.encoding = "UTF-8"
-    // Minecraft 1.17 (21w19a) upwards uses Java 16.
     it.options.release = 16
 }
 

gradle.properties

@@ -16,15 +16,15 @@
 org.gradle.jvmargs=-Xms2G -Xmx4G
 # Fabric Properties
 # check this on https://modmuss50.me/fabric.html
-release_target=1.18
-minecraft_version=1.18.1
-yarn_mappings=1.18.1+build.17
+release_target=1.17
+minecraft_version=1.17.1
+yarn_mappings=1.17.1+build.65
 loader_version=0.12.12
 # Mod Properties
-mod_version=1.2.1+1.18
+mod_version=1.2.1+1.17
 maven_group=xyz.deathsgun
 archives_base_name=modmanager
 # Dependencies
-modmenu_version=3.0.0
+modmenu_version=2.0.5
 # Kotlin
 fabric_kotlin_version=1.6.4+kotlin.1.5.30

src/main/kotlin/xyz/deathsgun/modmanager/ModManager.kt

@@ -62,12 +62,12 @@ class ModManager : ClientModInitializer {
 
         @JvmStatic
         fun getMinecraftReleaseTarget(): String {
-            return MinecraftClient.getInstance()?.game?.version?.releaseTarget ?: "1.18"
+            return MinecraftClient.getInstance()?.game?.version?.releaseTarget ?: "1.17"
         }
 
         @JvmStatic
         fun getMinecraftVersionId(): String {
-            return MinecraftClient.getInstance()?.game?.version?.id ?: "1.18.1"
+            return MinecraftClient.getInstance()?.game?.version?.id ?: "1.17.1"
         }
     }
 

src/main/resources/fabric.mod.json

@@ -44,7 +44,7 @@
 	"fabricloader": ">=0.12",
 	"modmenu": "~${modmenu_version}",
 	"fabric-language-kotlin": ">=${fabric_kotlin_version}",
-	"minecraft": "1.18.x",
+	"minecraft": "1.17.x",
 	"java": ">=16"
   }
 }

src/main/resources/modmanager.mixins.json

@@ -2,7 +2,7 @@
   "required": true,
   "minVersion": "0.8",
   "package": "xyz.deathsgun.modmanager.mixin",
-  "compatibilityLevel": "JAVA_17",
+  "compatibilityLevel": "JAVA_16",
   "mixins": [
   ],
   "client": [