From e551faabb5cadbdec5e80c68bd2845ce4a22f973 Mon Sep 17 00:00:00 2001
From: Maxim <clownl3ss@icloud.com>
Date: Sun, 9 Jun 2024 14:32:03 +0400
Subject: [PATCH] 1.20.6

---
 README.md                                             |  3 +++
 build.gradle                                          | 11 ++++++-----
 gradle.properties                                     | 10 +++++-----
 .../one/clownless/blockify/mixin/BlockifyMixin.java   |  7 ++++---
 src/main/resources/blockify.mixins.json               |  2 +-
 src/main/resources/fabric.mod.json                    |  8 ++++----
 6 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/README.md b/README.md
index 507a664..229d56d 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,5 @@
+# Version for 1.20.6 may be unstable
+
 <img src="./src/main/resources/assets/blockify/icon.png" width="150" align="left"/>
 
 ## Blockify Mod
@@ -10,6 +12,7 @@
 ![Environment](https://img.shields.io/badge/environment-client-1976d2?style=flat-square)
 [![Discord](https://img.shields.io/discord/837540892411691008?label=discord&style=flat-square)](https://discord.gg/bSgZxY3rQm)
 
+
 Fork of original [Blockify](https://github.com/BuffMage/Blockify), allows users to passthrough their Spotify information into Minecraft
 
 ### Spotify Premium is required
diff --git a/build.gradle b/build.gradle
index c1a0f45..bb00ce3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -34,7 +34,7 @@ processResources {
 
 tasks.withType(JavaCompile).configureEach {
 	// Minecraft 1.17 (21w19a) upwards uses Java 16.
-	it.options.release = 17
+	it.options.release = 21
 }
 
 java {
@@ -66,7 +66,7 @@ publishing {
 		// retrieving dependencies.
 	}
 }
-/*
+
 import com.modrinth.minotaur.dependencies.ModDependency
 modrinth {
 	token = System.getenv('MODRINTH_TOKEN')
@@ -74,9 +74,10 @@ modrinth {
 	versionNumber = project.mod_version
 	versionType = 'release'
 	uploadFile = remapJar
-	gameVersions = ['1.19.3', '1.19.4']
-	loaders = ['fabric', 'quilt']
+	gameVersions = ['1.20.6']
+	loaders = ['fabric']
+	syncBodyFrom = rootProject.file("README.md").text
 	dependencies = [
 			new ModDependency('P7dR8mSH', 'required')
 	]
-}*/
+}
diff --git a/gradle.properties b/gradle.properties
index 307c25b..9835e5a 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -3,16 +3,16 @@
 
 # Fabric Properties
 	# check these on https://fabricmc.net/use
-	minecraft_version=1.20
-	yarn_mappings=1.20+build.1
+	minecraft_version=1.20.6
+	yarn_mappings=1.20.6+build.3
 	loader_version=0.15.11
 
 # Mod Properties
-	mod_version = 1.2.4.2
+	mod_version = 1.2.5-unstable
 	maven_group = one.clownless.blockify
 	archives_base_name = blockify
 	modrinth_projectid = X5aijFqA
 
 # Dependencies
-	fabric_version=0.83.0+1.20
-	midnightlib_version=1.4.1-fabric
+	fabric_version=0.100.0+1.20.6
+	midnightlib_version=1.5.5-fabric
diff --git a/src/main/java/one/clownless/blockify/mixin/BlockifyMixin.java b/src/main/java/one/clownless/blockify/mixin/BlockifyMixin.java
index d5a356c..50490b6 100644
--- a/src/main/java/one/clownless/blockify/mixin/BlockifyMixin.java
+++ b/src/main/java/one/clownless/blockify/mixin/BlockifyMixin.java
@@ -11,6 +11,7 @@
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
+import net.minecraft.client.gl.GlDebug;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
@@ -27,8 +28,8 @@ public abstract class BlockifyMixin {
 	@Final
 	private MinecraftClient client;
 
-	@Inject(method = "<init>(Lnet/minecraft/client/MinecraftClient;Lnet/minecraft/client/render/item/ItemRenderer;)V", at = @At(value = "RETURN"))
-	private void onInit(MinecraftClient client, ItemRenderer itemRenderer, CallbackInfo ci) throws IOException
+	@Inject(at = @At("RETURN"), method = "<init>(Lnet/minecraft/client/MinecraftClient;)V")
+	private void onInit(MinecraftClient client, CallbackInfo ci) throws IOException
 	{
 		this.blockifyHUD = new BlockifyHUD(client);
 	}
@@ -36,7 +37,7 @@ private void onInit(MinecraftClient client, ItemRenderer itemRenderer, CallbackI
 	@Inject(method = "render", at = @At("HEAD"))
 	private void onDraw(DrawContext context, float tickDelta, CallbackInfo ci)
 	{
-		if (!MinecraftClient.getInstance().options.debugEnabled)
+		if (!GlDebug.isDebugMessageEnabled())
 			BlockifyHUD.draw(context);
 	}
 }
diff --git a/src/main/resources/blockify.mixins.json b/src/main/resources/blockify.mixins.json
index 17657df..8c5d0f4 100644
--- a/src/main/resources/blockify.mixins.json
+++ b/src/main/resources/blockify.mixins.json
@@ -2,7 +2,7 @@
   "required": true,
   "minVersion": "0.8",
   "package": "one.clownless.blockify.mixin",
-  "compatibilityLevel": "JAVA_17",
+  "compatibilityLevel": "JAVA_21",
   "mixins": [
   ],
   "client": [
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
index c91980b..5f64819 100644
--- a/src/main/resources/fabric.mod.json
+++ b/src/main/resources/fabric.mod.json
@@ -31,11 +31,11 @@
     "blockify.mixins.json"
   ],
   "depends": {
-    "fabricloader": ">=0.14.6",
+    "fabricloader": ">=0.15.11",
     "fabric": "*",
-    "minecraft": ">=1.19",
-    "java": ">=17",
-    "midnightlib": ">=0.5.2"
+    "minecraft": ">=1.20.6",
+    "java": ">=21",
+    "midnightlib": ">=1.5.5"
   },
   "custom": {
     "modmenu": {