From fef8b8286039a6fa6263798699e55351c8ca5c8e Mon Sep 17 00:00:00 2001
From: tr7zw <tr7zw@live.de>
Date: Sat, 18 Mar 2023 23:31:23 +0100
Subject: [PATCH] Update to 1.19.4

---
 FPFabric/src/main/resources/fabric.mod.json              | 2 +-
 FPFabric/src/test/java/dev/tr7zw/tests/TestUtil.java     | 9 +++++----
 FPForge/src/main/resources/META-INF/mods.toml            | 2 +-
 .../firstperson/mixins/HeldItemFeatureRendererMixin.java | 4 ++--
 gradle-compose.yml                                       | 2 +-
 5 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/FPFabric/src/main/resources/fabric.mod.json b/FPFabric/src/main/resources/fabric.mod.json
index 222f6164..5be158bc 100644
--- a/FPFabric/src/main/resources/fabric.mod.json
+++ b/FPFabric/src/main/resources/fabric.mod.json
@@ -27,7 +27,7 @@
     "firstperson.mixins.json"
   ],
   "depends": {
-    "minecraft": ">=1.19.3",
+    "minecraft": ">=1.19.4",
     "fabric-api": "*"
   }
 }
\ No newline at end of file
diff --git a/FPFabric/src/test/java/dev/tr7zw/tests/TestUtil.java b/FPFabric/src/test/java/dev/tr7zw/tests/TestUtil.java
index 011a243b..6d4d535e 100644
--- a/FPFabric/src/test/java/dev/tr7zw/tests/TestUtil.java
+++ b/FPFabric/src/test/java/dev/tr7zw/tests/TestUtil.java
@@ -1,6 +1,5 @@
 package dev.tr7zw.tests;
 
-import java.io.IOException;
 import java.io.InputStream;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
@@ -14,7 +13,6 @@
 import com.google.common.collect.ImmutableMap;
 
 import dev.tr7zw.config.CustomConfigScreen;
-import net.minecraft.client.Minecraft;
 import net.minecraft.client.OptionInstance;
 import net.minecraft.client.gui.components.OptionsList;
 import net.minecraft.client.model.PlayerModel;
@@ -30,9 +28,7 @@
 import net.minecraft.client.renderer.entity.player.PlayerRenderer;
 import net.minecraft.locale.Language;
 import net.minecraft.network.chat.FormattedText;
-import net.minecraft.network.chat.Style;
 import net.minecraft.util.FormattedCharSequence;
-import net.minecraft.util.StringDecomposer;
 
 public class TestUtil {
 
@@ -94,6 +90,11 @@ public boolean isDefaultRightToLeft() {
             public FormattedCharSequence getVisualOrder(FormattedText formattedText) {
                 return null;
             }
+
+            @Override
+            public String getOrDefault(String paramString1, String paramString2) {
+                return storage.getOrDefault(paramString1, paramString2);
+            }
         };
     }
     
diff --git a/FPForge/src/main/resources/META-INF/mods.toml b/FPForge/src/main/resources/META-INF/mods.toml
index 06b04d46..ea5e313b 100644
--- a/FPForge/src/main/resources/META-INF/mods.toml
+++ b/FPForge/src/main/resources/META-INF/mods.toml
@@ -49,6 +49,6 @@ Enables the third person Model in firstperson
 [[dependencies.firstpersonmod]]
     modId="minecraft"
     mandatory=true
-    versionRange="[1.19.3,)"
+    versionRange="[1.19.4,)"
     ordering="NONE"
     side="CLIENT"
\ No newline at end of file
diff --git a/Shared/src/main/java/dev/tr7zw/firstperson/mixins/HeldItemFeatureRendererMixin.java b/Shared/src/main/java/dev/tr7zw/firstperson/mixins/HeldItemFeatureRendererMixin.java
index 7faf877b..01aca6c5 100644
--- a/Shared/src/main/java/dev/tr7zw/firstperson/mixins/HeldItemFeatureRendererMixin.java
+++ b/Shared/src/main/java/dev/tr7zw/firstperson/mixins/HeldItemFeatureRendererMixin.java
@@ -10,10 +10,10 @@
 import dev.tr7zw.firstperson.FirstPersonModelCore;
 import net.minecraft.client.player.LocalPlayer;
 import net.minecraft.client.renderer.MultiBufferSource;
-import net.minecraft.client.renderer.block.model.ItemTransforms;
 import net.minecraft.client.renderer.entity.layers.ItemInHandLayer;
 import net.minecraft.world.entity.HumanoidArm;
 import net.minecraft.world.entity.LivingEntity;
+import net.minecraft.world.item.ItemDisplayContext;
 import net.minecraft.world.item.ItemStack;
 
 /**
@@ -24,7 +24,7 @@
 public class HeldItemFeatureRendererMixin {
 
 	@Inject(at = @At("HEAD"), method = "renderArmWithItem", cancellable = true)
-	private void renderItem(LivingEntity livingEntity, ItemStack itemStack, ItemTransforms.TransformType transformType, HumanoidArm humanoidArm, PoseStack poseStack, MultiBufferSource multiBufferSource, int i, CallbackInfo ci) {
+	private void renderItem(LivingEntity livingEntity, ItemStack itemStack, ItemDisplayContext itemDisplayContext, HumanoidArm humanoidArm, PoseStack poseStack, MultiBufferSource multiBufferSource, int i, CallbackInfo ci) {
 		if (livingEntity instanceof LocalPlayer && FirstPersonModelCore.isRenderingPlayer
 				&& FirstPersonModelCore.instance.showVanillaHands()) {
 			ci.cancel();
diff --git a/gradle-compose.yml b/gradle-compose.yml
index 598aba17..a2a09519 100644
--- a/gradle-compose.yml
+++ b/gradle-compose.yml
@@ -1,5 +1,5 @@
 version: '0.0.2'
-source: "https://github.com/tr7zw/ModComposeTemplate/tree/1.19.3"
+source: "https://github.com/tr7zw/ModComposeTemplate/tree/1.19.4"
 replacements:
   name: "FirstPerson"
   id: "firstperson"