From 72068135428ce3f291169d7eabeebdcd764a9908 Mon Sep 17 00:00:00 2001
From: glossnyx <arnohovhannisyan0@gmail.com>
Date: Tue, 22 Feb 2022 14:37:54 -0800
Subject: [PATCH] update to 1.18

---
 .github/workflows/deploy.yml         |  1 +
 gradle.properties                    | 12 ++++++------
 settings.gradle.kts                  |  4 ++--
 src/main/resources/disco.mixins.json |  4 ++--
 src/main/resources/fabric.mod.json   |  2 +-
 5 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index d044c26..ceec52a 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -16,3 +16,4 @@ jobs:
         uses: glossnyx/actions/deploy-minecraft-mod@main
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
+          java-version: 17
diff --git a/gradle.properties b/gradle.properties
index d3d91cc..a287fe2 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -6,12 +6,12 @@ id=disco
 title=Disco
 author=glossnyx
 description=Modular music disc loader
-version=2.0.4
+version=2.0.5
 
 # Versions (https://modmuss50.me/fabric.html)
-minecraft=1.17.1
-yarn=1.17.1+build.63
-loader=0.12.3
+minecraft=1.18.1
+yarn=1.18.1+build.22
+loader=0.13.3
 
-fabric_api=0.41.0+1.17
-fabric_kotlin=1.6.5+kotlin.1.5.31
+fabric_api=0.46.0+1.18
+fabric_kotlin=1.7.1+kotlin.1.6.10
diff --git a/settings.gradle.kts b/settings.gradle.kts
index cb4b14d..d689260 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -5,7 +5,7 @@ pluginManagement {
 	}
 
 	plugins {
-		id("fabric-loom") version "0.9-SNAPSHOT"
-		kotlin("jvm") version "1.5.31"
+		id("fabric-loom") version "0.11-SNAPSHOT"
+		kotlin("jvm") version "1.6.10"
 	}
 }
diff --git a/src/main/resources/disco.mixins.json b/src/main/resources/disco.mixins.json
index 86f7506..4a06ec7 100644
--- a/src/main/resources/disco.mixins.json
+++ b/src/main/resources/disco.mixins.json
@@ -2,9 +2,9 @@
 	"required": true,
 	"minVersion": "0.8",
 	"package": "io.glossnyx.disco.mixin",
-	"compatibilityLevel": "JAVA_8",
+	"compatibilityLevel": "JAVA_17",
 	"mixins": ["LootTableAccessor"],
 	"injectors": {
 		"defaultRequire": 1
 	}
-}
\ No newline at end of file
+}
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
index 64cfe54..87f94c1 100644
--- a/src/main/resources/fabric.mod.json
+++ b/src/main/resources/fabric.mod.json
@@ -17,7 +17,7 @@
 	},
 	"mixins": ["${id}.mixins.json"],
 	"depends": {
-		"minecraft": "1.17.x",
+		"minecraft": "1.18.x",
 		"fabricloader": "*",
 		"fabric-resource-loader-v0": "*",
 		"fabric-loot-tables-v1": "*",