diff --git a/gradle.properties b/gradle.properties index 6e9c99f..78addc0 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,12 +4,12 @@ org.gradle.parallel=true # Fabric Properties # check these on https://fabricmc.net/use - minecraft_version=1.20.6 - yarn_mappings=1.20.6+build.3 + minecraft_version=1.21 + yarn_mappings=1.21+build.1 loader_version=0.15.11 # Mod Properties - mod_version = 2.0.0 + mod_version = 2.0.1 maven_group = eu.midnightdust archives_base_name = swordblocking release_type=release @@ -18,5 +18,5 @@ org.gradle.parallel=true # Dependencies # currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api - fabric_version=0.100.0+1.20.6 - midnightlib_version=1.5.5-fabric + fabric_version=0.100.1+1.21 + midnightlib_version=1.5.6-fabric diff --git a/src/main/java/eu/midnightdust/swordblocking/mixin/MixinHeldItemRenderer.java b/src/main/java/eu/midnightdust/swordblocking/mixin/MixinHeldItemRenderer.java index 006f381..03e5a94 100644 --- a/src/main/java/eu/midnightdust/swordblocking/mixin/MixinHeldItemRenderer.java +++ b/src/main/java/eu/midnightdust/swordblocking/mixin/MixinHeldItemRenderer.java @@ -25,6 +25,7 @@ public abstract class MixinHeldItemRenderer { if ((SwordBlockingConfig.alwaysHideShield && SwordBlockingConfig.hideShield && stack.getItem() instanceof ShieldItem) || (SwordBlockingConfig.hideShield && stack.getItem() instanceof ShieldItem && SwordBlockingClient.canWeaponBlock(entity))) ci.cancel(); } + @Inject(method = "renderFirstPersonItem", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/item/HeldItemRenderer;renderItem(Lnet/minecraft/entity/LivingEntity;Lnet/minecraft/item/ItemStack;Lnet/minecraft/client/render/model/json/ModelTransformationMode;ZLnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;I)V", shift = At.Shift.BEFORE, ordinal = 1)) public void swordblocking$blockingPosition(AbstractClientPlayerEntity player, float tickDelta, float pitch, Hand hand, float swingProgress, ItemStack item, float equipProgress, MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light, CallbackInfo ci) { if (!SwordBlockingClient.isWeaponBlocking(player) || item.getItem() instanceof ShieldItem)