Port to 1.21.4 (#85)

Author: ErrorCraft

gradle.properties

@@ -3,8 +3,8 @@ org.gradle.jvmargs=-Xmx1G
 
 # Fabric Properties
 	# check these on https://fabricmc.net/develop
-	minecraft_version=1.21.3
-	yarn_mappings=1.21.3+build.2
+	minecraft_version=1.21.4
+	yarn_mappings=1.21.4+build.8
 	loader_version=0.18.4
 
 # Mod Properties
@@ -13,4 +13,4 @@ org.gradle.jvmargs=-Xmx1G
 	archives_base_name = itematic
 
 # Dependencies
-	fabric_version=0.114.1+1.21.3
+	fabric_version=0.119.4+1.21.4

src/client/java/net/errorcraft/itematic/client/item/ModelPredicateProviderWrapper.java

@@ -10,9 +10,7 @@
 import net.minecraft.client.render.RenderLayer;
 import net.minecraft.client.render.VertexConsumerProvider;
 import net.minecraft.client.util.math.MatrixStack;
-import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
-import net.minecraft.registry.tag.TagKey;
 import net.minecraft.util.Identifier;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
@@ -46,17 +44,6 @@ private void setItemBarStyles(MinecraftClient client, MatrixStack matrices, Vert
         this.itemBarStyles = ((MinecraftClientAccess) client).itematic$itemBarStyles();
     }
 
-    @Redirect(
-        method = "drawItem(Lnet/minecraft/entity/LivingEntity;Lnet/minecraft/world/World;Lnet/minecraft/item/ItemStack;IIII)V",
-        at = @At(
-            value = "INVOKE",
-            target = "Lnet/minecraft/item/ItemStack;isIn(Lnet/minecraft/registry/tag/TagKey;)Z"
-        )
-    )
-    private boolean isInForBundlesReturnFalse(ItemStack instance, TagKey<Item> tag) {
-        return false;
-    }
-
     @ModifyExpressionValue(
         method = "drawItemBar",
         at = @At(

src/client/java/net/errorcraft/itematic/mixin/client/color/item/ItemColorsExtender.java

@@ -1,20 +1,17 @@
-package net.errorcraft.itematic.mixin.client.render.entity.model;
+package net.errorcraft.itematic.mixin.client.render.entity;
 
 import net.errorcraft.itematic.item.ItemKeys;
-import net.minecraft.client.render.entity.model.SkeletonEntityModel;
+import net.minecraft.client.render.entity.AbstractSkeletonEntityRenderer;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Redirect;
 
-@Mixin(SkeletonEntityModel.class)
-public class SkeletonEntityModelExtender {
+@Mixin(AbstractSkeletonEntityRenderer.class)
+public class AbstractSkeletonEntityRendererExtender {
     @Redirect(
-        method = {
-            "getArmPose(Lnet/minecraft/client/render/entity/state/SkeletonEntityRenderState;Lnet/minecraft/util/Arm;)Lnet/minecraft/client/render/entity/model/BipedEntityModel$ArmPose;",
-            "setAngles(Lnet/minecraft/client/render/entity/state/SkeletonEntityRenderState;)V"
-        },
+        method = "updateRenderState(Lnet/minecraft/entity/mob/AbstractSkeletonEntity;Lnet/minecraft/client/render/entity/state/SkeletonEntityRenderState;F)V",
         at = @At(
             value = "INVOKE",
             target = "Lnet/minecraft/item/ItemStack;isOf(Lnet/minecraft/item/Item;)Z"

src/client/java/net/errorcraft/itematic/mixin/client/gui/DrawContextExtender.java

@@ -1,17 +1,17 @@
-package net.errorcraft.itematic.mixin.client.render.entity.model;
+package net.errorcraft.itematic.mixin.client.render.entity;
 
 import net.errorcraft.itematic.item.ItemKeys;
-import net.minecraft.client.render.entity.model.DrownedEntityModel;
+import net.minecraft.client.render.entity.DrownedEntityRenderer;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Redirect;
 
-@Mixin(DrownedEntityModel.class)
-public class DrownedEntityModelExtender {
+@Mixin(DrownedEntityRenderer.class)
+public class DrownedEntityRendererExtender {
     @Redirect(
-        method = "getArmPose(Lnet/minecraft/client/render/entity/state/ZombieEntityRenderState;Lnet/minecraft/util/Arm;)Lnet/minecraft/client/render/entity/model/BipedEntityModel$ArmPose;",
+        method = "getArmPose(Lnet/minecraft/entity/mob/DrownedEntity;Lnet/minecraft/util/Arm;)Lnet/minecraft/client/render/entity/model/BipedEntityModel$ArmPose;",
         at = @At(
             value = "INVOKE",
             target = "Lnet/minecraft/item/ItemStack;isOf(Lnet/minecraft/item/Item;)Z"

src/client/java/net/errorcraft/itematic/mixin/client/render/block/BlockRenderManagerExtender.java

@@ -13,7 +13,7 @@
 @Mixin(PlayerEntityRenderer.class)
 public class PlayerEntityRendererExtender {
     @Redirect(
-        method = "updateHandState",
+        method = "getArmPose(Lnet/minecraft/entity/player/PlayerEntity;Lnet/minecraft/item/ItemStack;Lnet/minecraft/util/Hand;)Lnet/minecraft/client/render/entity/model/BipedEntityModel$ArmPose;",
         at = @At(
             value = "INVOKE",
             target = "Lnet/minecraft/item/ItemStack;isOf(Lnet/minecraft/item/Item;)Z"
@@ -25,4 +25,15 @@ private static boolean isOfForCrossbowUseItemComponent(ItemStack instance, Item
             .filter(method -> method.type() == ShooterMethodTypes.CHARGEABLE)
             .isPresent();
     }
+
+    @Redirect(
+        method = "updateRenderState(Lnet/minecraft/client/network/AbstractClientPlayerEntity;Lnet/minecraft/client/render/entity/state/PlayerEntityRenderState;F)V",
+        at = @At(
+            value = "INVOKE",
+            target = "Lnet/minecraft/item/ItemStack;isOf(Lnet/minecraft/item/Item;)Z"
+        )
+    )
+    private static boolean isOfForSpyglassUseItemComponentCheck(ItemStack instance, Item item) {
+        return instance.itematic$hasBehavior(ItemComponentTypes.ZOOM);
+    }
 }

…y/model/SkeletonEntityModelExtender.java …tractSkeletonEntityRendererExtender.javasrc/client/java/net/errorcraft/itematic/mixin/client/render/entity/model/SkeletonEntityModelExtender.java renamed to src/client/java/net/errorcraft/itematic/mixin/client/render/entity/AbstractSkeletonEntityRendererExtender.java src/client/java/net/errorcraft/itematic/mixin/client/render/entity/model/SkeletonEntityModelExtender.java renamed to src/client/java/net/errorcraft/itematic/mixin/client/render/entity/AbstractSkeletonEntityRendererExtender.java

@@ -1,17 +1,17 @@
-package net.errorcraft.itematic.mixin.client.render.feature;
+package net.errorcraft.itematic.mixin.client.render.entity;
 
 import net.errorcraft.itematic.item.ItemKeys;
-import net.minecraft.client.render.entity.feature.WitchHeldItemFeatureRenderer;
+import net.minecraft.client.render.entity.WitchEntityRenderer;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Redirect;
 
-@Mixin(WitchHeldItemFeatureRenderer.class)
-public class WitchHeldItemFeatureRendererExtender {
+@Mixin(WitchEntityRenderer.class)
+public class WitchEntityRendererExtender {
     @Redirect(
-        method = "render(Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;ILnet/minecraft/client/render/entity/state/WitchEntityRenderState;FF)V",
+        method = "updateRenderState(Lnet/minecraft/entity/mob/WitchEntity;Lnet/minecraft/client/render/entity/state/WitchEntityRenderState;F)V",
         at = @At(
             value = "INVOKE",
             target = "Lnet/minecraft/item/ItemStack;isOf(Lnet/minecraft/item/Item;)Z"