Skip to content
This repository was archived by the owner on Nov 28, 2025. It is now read-only.

Commit b33da17

Browse files
moehreagmoehreag
committed
fix more bugs
- some of which were only introduced in the previous commits
1 parent 622710c commit b33da17

File tree

15 files changed

+107
-66
lines changed

15 files changed

+107
-66
lines changed

‎1.16_combat-6/src/main/java/io/github/axolotlclient/mixin/EntityRendererMixin.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public abstract class EntityRendererMixin<T extends Entity> {
5555
@Inject(method = "renderLabelIfPresent", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/font/TextRenderer;draw(Lnet/minecraft/text/Text;FFIZLnet/minecraft/util/math/Matrix4f;Lnet/minecraft/client/render/VertexConsumerProvider;ZII)I", ordinal = 0))
5656
public void axolotlclient$addBadges(T entity, Text text, MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light,
5757
CallbackInfo ci) {
58-
if (entity instanceof AbstractClientPlayerEntity) {
58+
if (entity instanceof AbstractClientPlayerEntity && text.equals(entity.getDisplayName())) {
5959
if (!entity.isSneaky()) {
6060
if (AxolotlClient.CONFIG.showBadges.get() && UserRequest.getOnline(entity.getUuid().toString())) {
6161
RenderSystem.enableDepthTest();
@@ -110,7 +110,7 @@ public abstract class EntityRendererMixin<T extends Entity> {
110110
@Inject(method = "renderLabelIfPresent", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/font/TextRenderer;draw(Lnet/minecraft/text/Text;FFIZLnet/minecraft/util/math/Matrix4f;Lnet/minecraft/client/render/VertexConsumerProvider;ZII)I", ordinal = 1))
111111
public void axolotlclient$addLevel(T entity, Text string, MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light,
112112
CallbackInfo ci) {
113-
if (entity instanceof AbstractClientPlayerEntity) {
113+
if (entity instanceof AbstractClientPlayerEntity && string.equals(entity.getDisplayName())) {
114114
if (MinecraftClient.getInstance().getCurrentServerEntry() != null
115115
&& MinecraftClient.getInstance().getCurrentServerEntry().address.contains("hypixel.net")) {
116116
TextRenderer textRenderer = MinecraftClient.getInstance().textRenderer;

‎1.16_combat-6/src/main/java/io/github/axolotlclient/modules/hud/gui/hud/KeystrokeHud.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@ public class Keystroke {
302302
protected final Rectangle bounds;
303303
private final int animTime = 100;
304304
protected DrawPosition offset;
305-
private float start = -1;
305+
private long start = -1;
306306
private boolean wasPressed = false;
307307

308308
public Keystroke(Rectangle bounds, DrawPosition offset, KeyBinding key, KeystrokeRenderer render) {
@@ -318,7 +318,7 @@ public Color getFGColor() {
318318
}
319319

320320
private float getPercentPressed() {
321-
return start == -1 ? 1 : MathHelper.clamp((Util.getMeasuringTimeMs() - start) / animTime, 0, 1);
321+
return start == -1 ? 1 : MathHelper.clamp((float)(Util.getMeasuringTimeMs() - start) / animTime, 0, 1);
322322
}
323323

324324
public void render(MatrixStack matrices) {
@@ -337,7 +337,7 @@ public void renderStroke(MatrixStack matrices) {
337337
if (outline.get()) {
338338
outlineRect(matrices, rect, getOutlineColor());
339339
}
340-
if ((Util.getMeasuringTimeMs() - start) / animTime >= 1) {
340+
if ((float)(Util.getMeasuringTimeMs() - start) / animTime >= 1) {
341341
start = -1;
342342
}
343343
wasPressed = key.isPressed();

‎1.20/src/main/java/io/github/axolotlclient/mixin/EntityRendererMixin.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public abstract class EntityRendererMixin<T extends Entity> {
5757
@Inject(method = "renderLabelIfPresent", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/font/TextRenderer;draw(Lnet/minecraft/text/Text;FFIZLorg/joml/Matrix4f;Lnet/minecraft/client/render/VertexConsumerProvider;Lnet/minecraft/client/font/TextRenderer$TextLayerType;II)I", ordinal = 0))
5858
public void axolotlclient$addBadges(T entity, Text text, MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light,
5959
CallbackInfo ci) {
60-
if (entity instanceof AbstractClientPlayerEntity) {
60+
if (entity instanceof AbstractClientPlayerEntity && text.equals(entity.getDisplayName())) {
6161
if (!entity.isSneaky()) {
6262
if (AxolotlClient.CONFIG.showBadges.get() && UserRequest.getOnline(entity.getUuid().toString())) {
6363
RenderSystem.enableDepthTest();
@@ -133,7 +133,7 @@ public abstract class EntityRendererMixin<T extends Entity> {
133133
@Inject(method = "renderLabelIfPresent", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/font/TextRenderer;draw(Lnet/minecraft/text/Text;FFIZLorg/joml/Matrix4f;Lnet/minecraft/client/render/VertexConsumerProvider;Lnet/minecraft/client/font/TextRenderer$TextLayerType;II)I", ordinal = 1))
134134
public void axolotlclient$addLevel(T entity, Text string, MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light,
135135
CallbackInfo ci) {
136-
if (entity instanceof AbstractClientPlayerEntity) {
136+
if (entity instanceof AbstractClientPlayerEntity && string.equals(entity.getDisplayName())) {
137137
if (MinecraftClient.getInstance().getCurrentServerEntry() != null
138138
&& MinecraftClient.getInstance().getCurrentServerEntry().address.contains("hypixel.net")) {
139139
TextRenderer textRenderer = MinecraftClient.getInstance().textRenderer;

‎1.20/src/main/java/io/github/axolotlclient/modules/hud/gui/hud/KeystrokeHud.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@ public class Keystroke {
297297
protected final Rectangle bounds;
298298
private final int animTime = 100;
299299
protected DrawPosition offset;
300-
private float start = -1;
300+
private long start = -1;
301301
private boolean wasPressed = false;
302302

303303
public Keystroke(Rectangle bounds, DrawPosition offset, KeyBind key, KeystrokeRenderer render) {
@@ -313,7 +313,7 @@ public Color getFGColor() {
313313
}
314314

315315
private float getPercentPressed() {
316-
return start == -1 ? 1 : MathHelper.clamp((Util.getMeasuringTimeMs() - start) / animTime, 0, 1);
316+
return start == -1 ? 1 : MathHelper.clamp((float) (Util.getMeasuringTimeMs() - start) / animTime, 0, 1);
317317
}
318318

319319
public void render(GuiGraphics matrices) {
@@ -332,7 +332,7 @@ public void renderStroke(GuiGraphics matrices) {
332332
if (outline.get()) {
333333
outlineRect(matrices, rect, getOutlineColor());
334334
}
335-
if ((Util.getMeasuringTimeMs() - start) / animTime >= 1) {
335+
if ((float)(Util.getMeasuringTimeMs() - start) / animTime >= 1) {
336336
start = -1;
337337
}
338338
wasPressed = key.isPressed();

‎1.21.4/src/main/java/io/github/axolotlclient/mixin/EntityRendererMixin.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public abstract class EntityRendererMixin<T extends Entity, S extends EntityRend
5757

5858
@Inject(method = "renderNameTag", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/Font;drawInBatch(Lnet/minecraft/network/chat/Component;FFIZLorg/joml/Matrix4f;Lnet/minecraft/client/renderer/MultiBufferSource;Lnet/minecraft/client/gui/Font$DisplayMode;II)I", ordinal = 0))
5959
public void axolotlclient$addBadges(S entityRenderState, Component text, PoseStack matrices, MultiBufferSource vertexConsumers, int light, CallbackInfo ci) {
60-
if (entityRenderState instanceof PlayerRenderState state) {
60+
if (entityRenderState instanceof PlayerRenderState state && text.equals(entityRenderState.nameTag)) {
6161
if (!state.isCrouching) {
6262
if (AxolotlClient.CONFIG.showBadges.get()) {
6363
Player entity = (Player) Minecraft.getInstance().level.getEntity(state.id);
@@ -101,7 +101,7 @@ public abstract class EntityRendererMixin<T extends Entity, S extends EntityRend
101101

102102
@Inject(method = "renderNameTag", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/Font;drawInBatch(Lnet/minecraft/network/chat/Component;FFIZLorg/joml/Matrix4f;Lnet/minecraft/client/renderer/MultiBufferSource;Lnet/minecraft/client/gui/Font$DisplayMode;II)I", ordinal = 1))
103103
public void axolotlclient$addLevel(S entityRenderState, Component c, PoseStack matrices, MultiBufferSource vertexConsumers, int light, CallbackInfo ci) {
104-
if (entityRenderState instanceof PlayerRenderState state) {
104+
if (entityRenderState instanceof PlayerRenderState state && c.equals(entityRenderState.nameTag)) {
105105
if (Minecraft.getInstance().getCurrentServer() != null && Minecraft.getInstance().getCurrentServer().ip.contains("hypixel.net")) {
106106
AbstractClientPlayer entity = (AbstractClientPlayer) Minecraft.getInstance().level.getEntity(state.id);
107107
if (entity != null) {

‎1.21.4/src/main/java/io/github/axolotlclient/modules/hud/gui/hud/KeystrokeHud.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,7 @@ public class Keystroke {
295295
protected final Rectangle bounds;
296296
private final int animTime = 100;
297297
protected DrawPosition offset;
298-
private float start = -1;
298+
private long start = -1;
299299
private boolean wasPressed = false;
300300

301301
public Keystroke(Rectangle bounds, DrawPosition offset, KeyMapping key, KeystrokeRenderer render) {
@@ -311,7 +311,7 @@ public Color getFGColor() {
311311
}
312312

313313
private float getPercentPressed() {
314-
return start == -1 ? 1 : Mth.clamp((Util.getMillis() - start) / animTime, 0, 1);
314+
return start == -1 ? 1 : Mth.clamp((float)(Util.getMillis() - start) / animTime, 0, 1);
315315
}
316316

317317
public void render(GuiGraphics matrices) {
@@ -330,7 +330,7 @@ public void renderStroke(GuiGraphics matrices) {
330330
if (outline.get()) {
331331
outlineRect(matrices, rect, getOutlineColor());
332332
}
333-
if ((Util.getMillis() - start) / animTime >= 1) {
333+
if ((float)(Util.getMillis() - start) / animTime >= 1) {
334334
start = -1;
335335
}
336336
wasPressed = key.isDown();

‎1.21/src/main/java/io/github/axolotlclient/mixin/EntityRendererMixin.java‎

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,8 @@
4343
import net.minecraft.scoreboard.Team;
4444
import net.minecraft.text.Text;
4545
import net.minecraft.util.Formatting;
46-
import net.minecraft.util.Identifier;
4746
import org.joml.Matrix4f;
4847
import org.spongepowered.asm.mixin.Mixin;
49-
import org.spongepowered.asm.mixin.Unique;
5048
import org.spongepowered.asm.mixin.injection.At;
5149
import org.spongepowered.asm.mixin.injection.Inject;
5250
import org.spongepowered.asm.mixin.injection.ModifyArg;
@@ -59,7 +57,7 @@ public abstract class EntityRendererMixin<T extends Entity> {
5957
target = "Lnet/minecraft/client/font/TextRenderer;draw(Lnet/minecraft/text/Text;FFIZLorg/joml/Matrix4f;Lnet/minecraft/client/render/VertexConsumerProvider;Lnet/minecraft/client/font/TextRenderer$TextLayerType;II)I",
6058
ordinal = 0))
6159
public void axolotlclient$addBadges(Entity entity, Text text, MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light, float tickDelta, CallbackInfo ci) {
62-
if (entity instanceof AbstractClientPlayerEntity) {
60+
if (entity instanceof AbstractClientPlayerEntity && text.equals(entity.getDisplayName())) {
6361
if (!entity.isSneaky()) {
6462
if (AxolotlClient.CONFIG.showBadges.get() && UserRequest.getOnline(entity.getUuid().toString())) {
6563
RenderSystem.enableDepthTest();
@@ -107,20 +105,6 @@ public abstract class EntityRendererMixin<T extends Entity> {
107105
}
108106
}
109107

110-
@Unique
111-
void drawTexturedQuad(MatrixStack matrices, Identifier texture, int x1, int x2, int y1, int y2, int z, float u1, float u2, float v1, float v2) {
112-
RenderSystem.setShaderTexture(0, texture);
113-
RenderSystem.setShader(GameRenderer::getPositionTexShader);
114-
Matrix4f matrix4f = matrices.peek().getModel();
115-
BufferBuilder bufferBuilder =
116-
Tessellator.getInstance().begin(VertexFormat.DrawMode.QUADS, VertexFormats.POSITION_TEXTURE);
117-
bufferBuilder.xyz(matrix4f, (float) x1, (float) y1, (float) z).uv0(u1, v1);
118-
bufferBuilder.xyz(matrix4f, (float) x1, (float) y2, (float) z).uv0(u1, v2);
119-
bufferBuilder.xyz(matrix4f, (float) x2, (float) y2, (float) z).uv0(u2, v2);
120-
bufferBuilder.xyz(matrix4f, (float) x2, (float) y1, (float) z).uv0(u2, v1);
121-
BufferRenderer.drawWithShader(bufferBuilder.endOrThrow());
122-
}
123-
124108
@ModifyArg(method = "renderLabelIfPresent", at = @At(value = "INVOKE",
125109
target = "Lnet/minecraft/client/font/TextRenderer;draw(Lnet/minecraft/text/Text;FFIZLorg/joml/Matrix4f;Lnet/minecraft/client/render/VertexConsumerProvider;Lnet/minecraft/client/font/TextRenderer$TextLayerType;II)I", ordinal = 0),
126110
index = 8)
@@ -143,7 +127,7 @@ void drawTexturedQuad(MatrixStack matrices, Identifier texture, int x1, int x2,
143127
target = "Lnet/minecraft/client/font/TextRenderer;draw(Lnet/minecraft/text/Text;FFIZLorg/joml/Matrix4f;Lnet/minecraft/client/render/VertexConsumerProvider;Lnet/minecraft/client/font/TextRenderer$TextLayerType;II)I",
144128
ordinal = 1))
145129
public void axolotlclient$addLevel(Entity entity, Text string, MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light, float tickDelta, CallbackInfo ci) {
146-
if (entity instanceof AbstractClientPlayerEntity) {
130+
if (entity instanceof AbstractClientPlayerEntity && string.equals(entity.getDisplayName())) {
147131
if (MinecraftClient.getInstance().getCurrentServerEntry() != null &&
148132
MinecraftClient.getInstance().getCurrentServerEntry().address.contains("hypixel.net")) {
149133
TextRenderer textRenderer = MinecraftClient.getInstance().textRenderer;

‎1.21/src/main/java/io/github/axolotlclient/modules/hud/gui/hud/KeystrokeHud.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@ public class Keystroke {
297297
protected final Rectangle bounds;
298298
private final int animTime = 100;
299299
protected DrawPosition offset;
300-
private float start = -1;
300+
private long start = -1;
301301
private boolean wasPressed = false;
302302

303303
public Keystroke(Rectangle bounds, DrawPosition offset, KeyBind key, KeystrokeRenderer render) {
@@ -313,7 +313,7 @@ public Color getFGColor() {
313313
}
314314

315315
private float getPercentPressed() {
316-
return start == -1 ? 1 : MathHelper.clamp((Util.getMeasuringTimeMs() - start) / animTime, 0, 1);
316+
return start == -1 ? 1 : MathHelper.clamp((float)(Util.getMeasuringTimeMs() - start) / animTime, 0, 1);
317317
}
318318

319319
public void render(GuiGraphics matrices) {
@@ -332,7 +332,7 @@ public void renderStroke(GuiGraphics matrices) {
332332
if (outline.get()) {
333333
outlineRect(matrices, rect, getOutlineColor());
334334
}
335-
if ((Util.getMeasuringTimeMs() - start) / animTime >= 1) {
335+
if ((float)(Util.getMeasuringTimeMs() - start) / animTime >= 1) {
336336
start = -1;
337337
}
338338
wasPressed = key.isPressed();

‎1.8.9/src/main/java/io/github/axolotlclient/mixin/EntityRendererMixin.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public abstract class EntityRendererMixin<T extends Entity> {
6565

6666
@Inject(method = "renderNameTag(Lnet/minecraft/entity/Entity;Ljava/lang/String;DDDI)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/TextRenderer;draw(Ljava/lang/String;III)I"))
6767
public void axolotlclient$addBadges(T entity, String string, double d, double e, double f, int i, CallbackInfo ci) {
68-
if (entity instanceof ClientPlayerEntity)
68+
if (entity instanceof ClientPlayerEntity && string.equals(entity.getDisplayName().getFormattedString()))
6969
BadgeRenderer.renderNametagBadge(entity);
7070
}
7171

@@ -77,7 +77,7 @@ public abstract class EntityRendererMixin<T extends Entity> {
7777

7878
@Inject(method = "renderNameTag(Lnet/minecraft/entity/Entity;Ljava/lang/String;DDDI)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/TextRenderer;draw(Ljava/lang/String;III)I", ordinal = 1))
7979
public void axolotlclient$addLevel(T entity, String string, double d, double e, double f, int i, CallbackInfo ci) {
80-
if (entity instanceof ClientPlayerEntity) {
80+
if (entity instanceof ClientPlayerEntity && string.equals(entity.getDisplayName().getFormattedString())) {
8181
if (Util.currentServerAddressContains("hypixel.net")) {
8282
if (BedwarsMod.getInstance().isEnabled() &&
8383
BedwarsMod.getInstance().inGame() &&

‎1.8.9/src/main/java/io/github/axolotlclient/mixin/ItemEntityRendererMixin.java‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,24 +22,22 @@
2222

2323
package io.github.axolotlclient.mixin;
2424

25+
import com.llamalad7.mixinextras.sugar.Local;
2526
import com.mojang.blaze3d.platform.GlStateManager;
2627
import io.github.axolotlclient.AxolotlClient;
2728
import net.minecraft.client.render.entity.ItemEntityRenderer;
2829
import net.minecraft.client.resource.model.BakedModel;
2930
import net.minecraft.entity.ItemEntity;
30-
import net.minecraft.item.Item;
31-
import net.minecraft.item.ItemStack;
3231
import org.spongepowered.asm.mixin.Mixin;
3332
import org.spongepowered.asm.mixin.injection.At;
3433
import org.spongepowered.asm.mixin.injection.Inject;
3534
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
36-
import org.spongepowered.asm.mixin.injection.callback.LocalCapture;
3735

3836
@Mixin(ItemEntityRenderer.class)
3937
public class ItemEntityRendererMixin {
4038

41-
@Inject(method = "applyItemBobbing", at = @At(value = "INVOKE", target = "Lcom/mojang/blaze3d/platform/GlStateManager;translatef(FFF)V"), locals = LocalCapture.CAPTURE_FAILEXCEPTION, cancellable = true)
42-
private void axolotlclient$transformItems(ItemEntity itemEntity, double d, double e, double f, float g, BakedModel bakedModel, CallbackInfoReturnable<Integer> cir, ItemStack stack, Item item, boolean bl, int i) {
39+
@Inject(method = "applyItemBobbing", at = @At(value = "INVOKE", target = "Lcom/mojang/blaze3d/platform/GlStateManager;translatef(FFF)V", ordinal = 0), cancellable = true)
40+
private void axolotlclient$transformItems(ItemEntity itemEntity, double d, double e, double f, float g, BakedModel bakedModel, CallbackInfoReturnable<Integer> cir, @Local int i) {
4341
if (AxolotlClient.CONFIG.flatItems.get()) {
4442
GlStateManager.translated(d, e + 0.05, f);
4543
GlStateManager.rotatef(itemEntity.pitch, 0, 0, 1);

0 commit comments

Comments
 (0)