Motschen/SwordBlocking
1
0
Fork 0
mirror of https://github.com/TeamMidnightDust/SwordBlocking.git synced 2025-12-15 14:35:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update to 1.21

Browse Source
This commit is contained in:
lowercasebtw
2024-06-13 13:07:05 -04:00
parent 95454d1c33
commit 7e2ef4d2d8
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
gradle.properties
View File

@@ -4,12 +4,12 @@ org.gradle.parallel=true
# Fabric Properties # Fabric Properties
# check these on https://fabricmc.net/use # check these on https://fabricmc.net/use
minecraft_version=1.20.6 minecraft_version=1.21
yarn_mappings=1.20.6+build.3 yarn_mappings=1.21+build.1
loader_version=0.15.11 loader_version=0.15.11
# Mod Properties # Mod Properties
mod_version = 2.0.0 mod_version = 2.0.1
maven_group = eu.midnightdust maven_group = eu.midnightdust
archives_base_name = swordblocking archives_base_name = swordblocking
release_type=release release_type=release
@@ -18,5 +18,5 @@ org.gradle.parallel=true
# Dependencies # Dependencies
# currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api # 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 fabric_version=0.100.1+1.21
midnightlib_version=1.5.5-fabric midnightlib_version=1.5.6-fabric

1
src/main/java/eu/midnightdust/swordblocking/mixin/MixinHeldItemRenderer.java
View File

@@ -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))) if ((SwordBlockingConfig.alwaysHideShield && SwordBlockingConfig.hideShield && stack.getItem() instanceof ShieldItem) || (SwordBlockingConfig.hideShield && stack.getItem() instanceof ShieldItem && SwordBlockingClient.canWeaponBlock(entity)))
ci.cancel(); 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)) @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) { 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) if (!SwordBlockingClient.isWeaponBlocking(player) || item.getItem() instanceof ShieldItem)