Skip to content

Commit 87ad632

Browse files
committed
fix some small issues
1 parent 766eac5 commit 87ad632

File tree

3 files changed

+2
-5
lines changed

3 files changed

+2
-5
lines changed

src/main/java/io/github/axolotlclient/AxolotlClient.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,7 @@ public static void addBadge(Entity entity, MatrixStack matrices){
148148
if(entity instanceof PlayerEntity){
149149

150150
if(AxolotlClient.CONFIG.showBadges.get() && AxolotlClient.isUsingClient(entity.getUuid())) {
151+
RenderSystem.enableDepthTest();
151152
MinecraftClient.getInstance().getTextureManager().bindTexture(badgeIcon);
152153

153154
int x = -(MinecraftClient.getInstance().textRenderer.getWidth(
@@ -156,7 +157,6 @@ public static void addBadge(Entity entity, MatrixStack matrices){
156157
(NickHider.Instance.hideOtherNames.get() ? NickHider.Instance.hiddenNameOthers.get(): Team.modifyText(entity.getScoreboardTeam(), entity.getName()).getString())
157158
)/2 + (AxolotlClient.CONFIG.customBadge.get() ? MinecraftClient.getInstance().textRenderer.getWidth(AxolotlClient.CONFIG.badgeText.get()): 10));
158159

159-
160160
RenderSystem.color4f(1, 1, 1, 1);
161161

162162
if(AxolotlClient.CONFIG.customBadge.get()) {
@@ -167,8 +167,6 @@ public static void addBadge(Entity entity, MatrixStack matrices){
167167
}
168168
}
169169
else DrawableHelper.drawTexture(matrices, x, 0, 0, 0, 8, 8, 8, 8);
170-
171-
172170
}
173171
}
174172
}

src/main/java/io/github/axolotlclient/mixin/MixinPlayerEntity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public MixinPlayerEntity(EntityType<?> entityType, World world) {
2424
public void getReach(Entity entity, CallbackInfo ci){
2525
if((Object)this == MinecraftClient.getInstance().player || entity.equals(MinecraftClient.getInstance().player)){
2626
ReachDisplayHud hud = (ReachDisplayHud) HudManager.getINSTANCE().get(ReachDisplayHud.ID);
27-
if(hud.isEnabled()){
27+
if(hud!=null && hud.isEnabled()){
2828
hud.updateDistance(Util.calculateDistance(super.getPos(), entity.getPos()));
2929
}
3030
}

src/main/java/io/github/axolotlclient/mixin/MixinPlayerRenderer.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
@Mixin(PlayerEntityRenderer.class)
1616
public abstract class MixinPlayerRenderer {
1717

18-
1918
@ModifyArgs(method = "renderLabelIfPresent(Lnet/minecraft/client/network/AbstractClientPlayerEntity;Lnet/minecraft/text/Text;Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;I)V",
2019
at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/entity/LivingEntityRenderer;renderLabelIfPresent(Lnet/minecraft/entity/Entity;Lnet/minecraft/text/Text;Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;I)V"))
2120
public void modifiyName(Args args){

0 commit comments

Comments
 (0)