diff --git a/gradle.properties b/gradle.properties index f4a7bf8..656a4af 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,16 +3,16 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties # check these on https://fabricmc.net/use - minecraft_version=1.19.3 - yarn_mappings=1.19.3+build.5 - loader_version=0.14.12 + minecraft_version=1.19.4 + yarn_mappings=1.19.4+build.1 + loader_version=0.14.18 # Mod Properties - mod_version = 1.2.0 + mod_version = 1.3.0 maven_group = eu.midnightdust archives_base_name = swordblocking # 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.72.0+1.19.3 - midnightlib_version=1.1.0-fabric + fabric_version=0.76.0+1.19.4 + midnightlib_version=1.2.1-fabric diff --git a/src/main/java/eu/midnightdust/swordblocking/mixin/MixinHeldItemRenderer.java b/src/main/java/eu/midnightdust/swordblocking/mixin/MixinHeldItemRenderer.java index 4e19cd4..ebb680d 100644 --- a/src/main/java/eu/midnightdust/swordblocking/mixin/MixinHeldItemRenderer.java +++ b/src/main/java/eu/midnightdust/swordblocking/mixin/MixinHeldItemRenderer.java @@ -4,7 +4,7 @@ import eu.midnightdust.swordblocking.SwordBlockingClient; import eu.midnightdust.swordblocking.config.SwordBlockingConfig; import net.minecraft.client.render.VertexConsumerProvider; import net.minecraft.client.render.item.HeldItemRenderer; -import net.minecraft.client.render.model.json.ModelTransformation; +import net.minecraft.client.render.model.json.ModelTransformationMode; import net.minecraft.client.util.math.MatrixStack; import net.minecraft.entity.LivingEntity; import net.minecraft.item.ItemStack; @@ -16,8 +16,8 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; @Mixin(HeldItemRenderer.class) public abstract class MixinHeldItemRenderer { - @Inject(at = @At("HEAD"), cancellable = true, method = "Lnet/minecraft/client/render/item/HeldItemRenderer;renderItem(Lnet/minecraft/entity/LivingEntity;Lnet/minecraft/item/ItemStack;Lnet/minecraft/client/render/model/json/ModelTransformation$Mode;ZLnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;I)V") - public void swordblocking$hideShield(LivingEntity entity, ItemStack stack, ModelTransformation.Mode renderMode, boolean leftHanded, MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light, CallbackInfo ci) { + @Inject(at = @At("HEAD"), cancellable = true, method = "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") + public void swordblocking$hideShield(LivingEntity entity, ItemStack stack, ModelTransformationMode renderMode, boolean leftHanded, MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light, CallbackInfo ci) { if (SwordBlockingConfig.alwaysHideShield && SwordBlockingConfig.hideShield && stack.getItem() instanceof ShieldItem) ci.cancel(); else if (SwordBlockingConfig.hideShield && stack.getItem() instanceof ShieldItem && SwordBlockingClient.canWeaponBlock(entity)) ci.cancel(); } diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 395c016..a5c6b01 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -30,7 +30,7 @@ ], "depends": { - "fabric": "*", + "fabric-api": "*", "midnightlib": "*" } } diff --git a/src/main/resources/swordblocking.mixins.json b/src/main/resources/swordblocking.mixins.json index 4baa122..eee1307 100644 --- a/src/main/resources/swordblocking.mixins.json +++ b/src/main/resources/swordblocking.mixins.json @@ -1,5 +1,6 @@ { "required": true, + "minVersion": "0.8", "package": "eu.midnightdust.swordblocking.mixin", "compatibilityLevel": "JAVA_17", "client": [ @@ -11,4 +12,4 @@ "injectors": { "defaultRequire": 1 } -} \ No newline at end of file +}