diff --git a/build.gradle b/build.gradle
index ae97a58..422e310 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id 'fabric-loom' version '1.5-SNAPSHOT'
+    id "fabric-loom" version "1.8.+"
     id "io.github.p03w.machete" version "1.+" // automatic jar compressing on build
     id 'maven-publish'
 }
@@ -7,7 +7,7 @@ plugins {
 sourceCompatibility = JavaVersion.VERSION_17
 targetCompatibility = JavaVersion.VERSION_17
 
-archivesBaseName = project.archives_base_name
+base.archivesName = archives_base_name
 group = project.maven_group
 
 String buildNumber = System.getenv("RUN_NUMBER")
@@ -81,24 +81,25 @@ dependencies {
 // Recipe Viewers - Create Fabric supports JEI, REI, and EMI.
     // See root gradle.properties to choose which to use at runtime.
     switch (recipe_viewer.toLowerCase(Locale.ROOT)) {
-        case "jei": modLocalRuntime("mezz.jei:jei-${minecraft_version}-fabric:${jei_version}"); break
-        case "rei": modLocalRuntime("me.shedaniel:RoughlyEnoughItems-fabric:${rei_version}"); break
-        case "emi": modLocalRuntime("dev.emi:emi:${emi_version}"); break
+        case "jei": modLocalRuntime("mezz.jei:jei-$minecraft_version-fabric:$jei_version"); break
+        case "rei": modLocalRuntime("me.shedaniel:RoughlyEnoughItems-fabric:$rei_version"); break
+        case "emi": modLocalRuntime("dev.emi:emi-fabric:$emi_version"); break
         case "disabled": break
-        default: println("Unknown recipe viewer specified: ${recipe_viewer}. Must be JEI, REI, EMI, or disabled.")
+        default: println("Unknown recipe viewer specified: $recipe_viewer. Must be JEI, REI, EMI, or disabled.")
     }
 }
 
 processResources {
     // require dependencies to be the version compiled against or newer
-    Map<String, String> properties = new HashMap<>()
-    properties.put("version", version)
-    properties.put("fabric_loader_version", fabric_loader_version)
-    properties.put("fabric_api_version", fabric_api_version)
-    properties.put("create_version", "~" + create_version.split("-")[0] + "-" + create_version.split("-")[1])
-    properties.put("minecraft_version", minecraft_version)
+    Map<String, Object> properties = [
+            "version": version,
+            "fabric_loader_version": fabric_loader_version,
+            "fabric_api_version": fabric_api_version,
+            "create_version": create_version,
+            "minecraft_version": minecraft_version
+    ]
 
-    properties.forEach((k, v) -> inputs.property(k, v))
+    inputs.properties(properties)
 
     filesMatching("fabric.mod.json") {
         expand properties
diff --git a/gradle.properties b/gradle.properties
index 9738bf4..ee5e9e3 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,35 +2,35 @@
 org.gradle.jvmargs=-Xmx1G
 
 # Fabric Properties
-	# check these on https://modmuss50.me/fabric.html
-	minecraft_version=1.20.1
-	yarn_mappings=1.20.1+build.10
-	fabric_loader_version=0.14.21
-	# check this on https://modmuss50.me/fabric.html
-	fabric_api_version=0.90.0+1.20.1
+# check these on https://modmuss50.me/fabric.html
+minecraft_version=1.20.1
+yarn_mappings=1.20.1+build.10
+fabric_loader_version=0.16.9
+# check this on https://modmuss50.me/fabric.html
+fabric_api_version=0.92.2+1.20.1
 
 # Mappings
-	# https://lambdaurora.dev/tools/import_quilt.html
-	qm_version = 23
-	# https://parchmentmc.org/docs/getting-started
-	parchment_version = 2023.09.03
+# https://lambdaurora.dev/tools/import_quilt.html
+qm_version = 23
+# https://parchmentmc.org/docs/getting-started
+parchment_version = 2023.09.03
 
 # Mod Properties
-	mod_version = 1.0
-	maven_group = ru.bitheaven
-	archives_base_name = createairfabric
+mod_version = 1.0
+maven_group = ru.bitheaven
+archives_base_name = createairfabric
 
 # Dependencies
-	# https://modrinth.com/mod/create-fabric/versions
-	create_version = 0.5.1-j-build.1631+mc1.20.1
-	# https://modrinth.com/mod/thin-air/versions
-	thinair_version = v8.1.5-1.20.1-Fabric
-	# https://modrinth.com/mod/ad-astra/versions
-	adastra_version = Xtm1uo8F
-	botarium_version = f3ATcSfq
-	# set to disabled to have none of them.
-	recipe_viewer = disabled
-	# Mod Menu - https://modrinth.com/mod/modmenu/versions
-	modmenu_version = 7.2.2
-	# LazyDFU - https://modrinth.com/mod/lazydfu/versions
-	lazydfu_version = 0.1.3
\ No newline at end of file
+# https://modrinth.com/mod/create-fabric/versions
+create_version = 0.5.1-j-build.1631+mc1.20.1
+# https://modrinth.com/mod/thin-air/versions
+thinair_version = v8.1.5-1.20.1-Fabric
+# https://modrinth.com/mod/ad-astra/versions
+adastra_version = Xtm1uo8F
+botarium_version = f3ATcSfq
+# set to disabled to have none of them.
+recipe_viewer = disabled
+# Mod Menu - https://modrinth.com/mod/modmenu/versions
+modmenu_version = 7.2.2
+# LazyDFU - https://modrinth.com/mod/lazydfu/versions
+lazydfu_version = 0.1.3
\ No newline at end of file