Merge pull request #23 from BlazingTwist/1.21.0

update to 1.21.0

Author: BlazingTwist

README.md

@@ -1,7 +1,7 @@
 # ItemCounts
 
 A Minecraft [Fabric](https://fabricmc.net/) mod that displays the total amount of items in your hotbar.  
-Built for version 1.20.5
+Built for version 1.21.0
 
 [Curseforge release](https://www.curseforge.com/minecraft/mc-mods/item-counts-fabric)
 

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-	id 'fabric-loom' version '1.6-SNAPSHOT'
+	id 'fabric-loom' version '1.7-SNAPSHOT'
 	id 'maven-publish'
 }
 
@@ -29,10 +29,10 @@ dependencies {
 	// Fabric API. This is technically optional, but you probably want it anyway.
 	modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
 
-	modImplementation("me.shedaniel.cloth:cloth-config-fabric:[14.0,15.0)") {
+	modImplementation("me.shedaniel.cloth:cloth-config-fabric:[15.0,16.0)") {
 		exclude(group: "net.fabricmc.fabric-api")
 	}
-	modImplementation("com.terraformersmc:modmenu:[10.0,11.0)") {
+	modImplementation("com.terraformersmc:modmenu:[11.0,12.0)") {
 		exclude group: "net.fabricmc.fabric-api"
 	}
 

gradle.properties

@@ -3,14 +3,14 @@ org.gradle.jvmargs=-Xmx1G
 
 # Fabric Properties
 	# check these on https://fabricmc.net/versions.html
-	minecraft_version=1.20.5
-	yarn_mappings=1.20.5+build.1
-	loader_version=0.15.10
+	minecraft_version=1.21
+	yarn_mappings=1.21+build.2
+	loader_version=0.15.11
 
 # Mod Properties
 	mod_version = 1.4.1
 	maven_group = blazingtwist
 	archives_base_name = itemcounts
 
 # Dependencies
-	fabric_version=0.97.5+1.20.5
+	fabric_version=0.100.3+1.21

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

src/main/java/blazingtwist/itemcounts/mixin/InGameHudMixin.java

@@ -11,6 +11,7 @@
 import net.minecraft.client.gui.hud.InGameHud;
 import net.minecraft.client.render.DiffuseLighting;
 import net.minecraft.client.render.OverlayTexture;
+import net.minecraft.client.render.RenderTickCounter;
 import net.minecraft.client.render.VertexConsumerProvider;
 import net.minecraft.client.render.item.ItemRenderer;
 import net.minecraft.client.render.model.BakedModel;
@@ -145,12 +146,12 @@ private void renderItemAt(DrawContext context, ItemStack item, int x, int y, flo
 			"Lnet/minecraft/client/gui/DrawContext;" +
 			"I" +
 			"I" +
-			"F" +
+			"Lnet/minecraft/client/render/RenderTickCounter;" +
 			"Lnet/minecraft/entity/player/PlayerEntity;" +
 			"Lnet/minecraft/item/ItemStack;" +
 			"I" +
 			")V", at = @At("TAIL"))
-	public void onRenderHotbarItem(DrawContext context, int x, int y, float tickDelta, PlayerEntity player, ItemStack stack, int seed, CallbackInfo info) {
+	public void onRenderHotbarItem(DrawContext context, int x, int y, RenderTickCounter tickCounter, PlayerEntity player, ItemStack stack, int seed, CallbackInfo info) {
 		if (stack.isEmpty()) {
 			return;
 		}
@@ -175,7 +176,7 @@ public void onRenderHotbarItem(DrawContext context, int x, int y, float tickDelt
 					"Lnet/minecraft/client/gui/DrawContext;" +
 					"I" +
 					"I" +
-					"F" +
+					"Lnet/minecraft/client/render/RenderTickCounter;" +
 					"Lnet/minecraft/entity/player/PlayerEntity;" +
 					"Lnet/minecraft/item/ItemStack;" +
 					"I" +
@@ -193,7 +194,7 @@ public void onRenderHotbarItem(DrawContext context, int x, int y, float tickDelt
 			)
 	)
 	private void onBefore_drawHotbarItem_call_drawItemInSlot(
-			DrawContext context, int x, int y, float tickDelta, PlayerEntity player, ItemStack stack, int seed, CallbackInfo info
+			DrawContext context, int x, int y, RenderTickCounter tickCounter, PlayerEntity player, ItemStack stack, int seed, CallbackInfo info
 	) {
 		ItemCounts.mixin_drawItemCalledFromRenderHotbarItem = true;
 	}

src/main/resources/fabric.mod.json

@@ -30,9 +30,9 @@
   ],
 
   "depends": {
-    "fabricloader": ">=0.15.10",
+    "fabricloader": ">=0.15.11",
     "fabric": "*",
-    "minecraft": "~1.20.5",
+    "minecraft": "~1.21",
     "java": ">=17"
   },
   "suggests": {