Upstream/ViaFabricPlus
1
0
Fork 0
mirror of https://github.com/ViaVersion/ViaFabricPlus.git synced 2024-11-25 12:25:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed armor not being visible in <= b1.7.3

Browse Source
This commit is contained in:
FlorianMichael 2023-12-03 02:27:07 +01:00
parent e2a5c3396d
commit 8d1d888684
No known key found for this signature in database
GPG Key ID: C2FB87E71C425126
1 changed files with 25 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/hud/MixinInGameHud.java
View File

@ -43,14 +43,11 @@ public abstract class MixinInGameHud {
// Removing newer elements // Removing newer elements
@Inject(method = "renderMountJumpBar", at = @At("HEAD"), cancellable = true) @Inject(method = {"renderMountJumpBar", "renderMountHealth"}, at = @At("HEAD"), cancellable = true)
private void removeMountJumpBar(JumpingMount mount, DrawContext context, int x, CallbackInfo ci) { private void removeMountJumpBar(CallbackInfo ci) {
if (VisualSettings.global().removeNewerHudElements.isEnabled()) ci.cancel(); if (VisualSettings.global().removeNewerHudElements.isEnabled()) {
} ci.cancel();
}
@Inject(method = "renderMountHealth", at = @At("HEAD"), cancellable = true)
private void removeMountHealth(DrawContext context, CallbackInfo ci) {
if (VisualSettings.global().removeNewerHudElements.isEnabled()) ci.cancel();
} }
@Inject(method = "getHeartCount", at = @At("HEAD"), cancellable = true) @Inject(method = "getHeartCount", at = @At("HEAD"), cancellable = true)
@ -63,9 +60,11 @@ public abstract class MixinInGameHud {
// Moving down all remaining elements // Moving down all remaining elements
@ModifyExpressionValue(method = "renderStatusBars", at = @At(value = "FIELD", target = "Lnet/minecraft/client/gui/hud/InGameHud;scaledHeight:I", opcode = Opcodes.GETFIELD), @ModifyExpressionValue(method = "renderStatusBars", at = @At(value = "FIELD", target = "Lnet/minecraft/client/gui/hud/InGameHud;scaledHeight:I", opcode = Opcodes.GETFIELD),
require = 0) require = 0)
private int moveHealthDown(int originalValue) { private int moveHealthDown(int originalValue) {
if (VisualSettings.global().removeNewerHudElements.isEnabled()) return originalValue + 6; if (VisualSettings.global().removeNewerHudElements.isEnabled()) {
return originalValue + 6;
}
return originalValue; return originalValue;
} }
@ -73,27 +72,33 @@ public abstract class MixinInGameHud {
from = @At(value = "INVOKE", target = "Lnet/minecraft/util/profiler/Profiler;push(Ljava/lang/String;)V"), from = @At(value = "INVOKE", target = "Lnet/minecraft/util/profiler/Profiler;push(Ljava/lang/String;)V"),
to = @At(value = "INVOKE", target = "Lnet/minecraft/util/profiler/Profiler;swap(Ljava/lang/String;)V", ordinal = 0)), index = 1, to = @At(value = "INVOKE", target = "Lnet/minecraft/util/profiler/Profiler;swap(Ljava/lang/String;)V", ordinal = 0)), index = 1,
require = 0) require = 0)
private int moveArmor(int old) { private int moveArmorNextToHealth(int oldX) {
if (VisualSettings.global().removeNewerHudElements.isEnabled()) return scaledWidth - old - 9; if (VisualSettings.global().removeNewerHudElements.isEnabled()) {
return old; return scaledWidth - oldX - 9;
}
return oldX;
} }
@ModifyArg(method = "renderStatusBars", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/DrawContext;drawGuiTexture(Lnet/minecraft/util/Identifier;IIII)V"), slice = @Slice( @ModifyArg(method = "renderStatusBars", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/DrawContext;drawGuiTexture(Lnet/minecraft/util/Identifier;IIII)V"), slice = @Slice(
from = @At(value = "INVOKE", target = "Lnet/minecraft/util/profiler/Profiler;push(Ljava/lang/String;)V"), from = @At(value = "INVOKE", target = "Lnet/minecraft/util/profiler/Profiler;push(Ljava/lang/String;)V"),
to = @At(value = "INVOKE", target = "Lnet/minecraft/util/profiler/Profiler;swap(Ljava/lang/String;)V", ordinal = 0)), index = 2, to = @At(value = "INVOKE", target = "Lnet/minecraft/util/profiler/Profiler;swap(Ljava/lang/String;)V", ordinal = 1)), index = 2,
require = 0) require = 0)
private int moveArmorDown(int old) { private int moveArmorDown(int oldY) {
if (VisualSettings.global().removeNewerHudElements.isEnabled()) return scaledWidth - 39 + 6; if (VisualSettings.global().removeNewerHudElements.isEnabled()) {
return old; return oldY + 9;
}
return oldY;
} }
@ModifyArg(method = "renderStatusBars", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/DrawContext;drawGuiTexture(Lnet/minecraft/util/Identifier;IIII)V"), slice = @Slice( @ModifyArg(method = "renderStatusBars", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/DrawContext;drawGuiTexture(Lnet/minecraft/util/Identifier;IIII)V"), slice = @Slice(
from = @At(value = "INVOKE", target = "Lnet/minecraft/util/profiler/Profiler;swap(Ljava/lang/String;)V", ordinal = 2), from = @At(value = "INVOKE", target = "Lnet/minecraft/util/profiler/Profiler;swap(Ljava/lang/String;)V", ordinal = 2),
to = @At(value = "INVOKE", target = "Lnet/minecraft/util/profiler/Profiler;pop()V")), index = 1, to = @At(value = "INVOKE", target = "Lnet/minecraft/util/profiler/Profiler;pop()V")), index = 1,
require = 0) require = 0)
private int moveAir(int old) { private int moveAir(int oldY) {
if (VisualSettings.global().removeNewerHudElements.isEnabled()) return scaledWidth - old - 9; if (VisualSettings.global().removeNewerHudElements.isEnabled()) {
return old; return scaledWidth - oldY - 9;
}
return oldY;
} }
} }