diff --git a/src/main/java/org/auraclient/auraclient/AuraClient.java b/src/main/java/org/auraclient/auraclient/AuraClient.java index 106fa91..887ff4a 100644 --- a/src/main/java/org/auraclient/auraclient/AuraClient.java +++ b/src/main/java/org/auraclient/auraclient/AuraClient.java @@ -18,7 +18,7 @@ public class AuraClient implements ModInitializer { @Override public void onInitialize() { LOGGER.info("Initializing " + MOD_ID); - + // Attempt authentication before initializing other features if (AuraApi.authenticate()) { KeyInputHandler.register(); diff --git a/src/main/java/org/auraclient/auraclient/mixin/NameTagMixin.java b/src/main/java/org/auraclient/auraclient/mixin/NameTagMixin.java index 232de27..547a2cf 100644 --- a/src/main/java/org/auraclient/auraclient/mixin/NameTagMixin.java +++ b/src/main/java/org/auraclient/auraclient/mixin/NameTagMixin.java @@ -17,7 +17,6 @@ import net.minecraft.util.Identifier; import net.minecraft.util.math.Vec3d; import net.minecraft.client.render.LightmapTextureManager; -import org.auraclient.auraclient.AuraClient; import org.auraclient.auraclient.auth.AuraApi; import org.joml.Matrix4f; import org.spongepowered.asm.mixin.Mixin; @@ -26,143 +25,155 @@ import org.spongepowered.asm.mixin.Shadow; @Mixin(EntityRenderer.class) public abstract class NameTagMixin { - private static final Identifier BADGE_TEXTURE = Identifier.of("auraclient", "textures/player-badge.png"); + private static final Identifier BADGE_TEXTURE = Identifier.of("auraclient", "textures/player-badge.png"); - @Shadow - public EntityRenderDispatcher dispatcher; + @Shadow + public EntityRenderDispatcher dispatcher; - @Overwrite - public void renderLabelIfPresent(S state, Text text, MatrixStack matrices, - VertexConsumerProvider vertexConsumers, int light) { - if (isAura(state)) { - matrices.push(); - matrices.translate(0.0f, 0.0f, 0.0f); - double y = state.nameLabelPos.y; - renderTextAtOrigin(y, text, matrices, vertexConsumers, light); - matrices.pop(); - } else { - Vec3d vec3d = state.nameLabelPos; - if (vec3d != null) { - boolean bl = !state.sneaking; - int i = "deadmau5".equals(text.getString()) ? -10 : 0; - matrices.push(); - matrices.translate(vec3d.x, vec3d.y + 0.5, vec3d.z); - matrices.multiply(this.dispatcher.getRotation()); - matrices.scale(0.025F, -0.025F, 0.025F); - Matrix4f matrix4f = matrices.peek().getPositionMatrix(); - TextRenderer textRenderer = MinecraftClient.getInstance().textRenderer; - float f = (float) (-textRenderer.getWidth(text)) / 2.0F; - int j = (int) (MinecraftClient.getInstance().options.getTextBackgroundOpacity(0.25F) - * 255.0F) << 24; - textRenderer.draw(text, f, (float) i, -2130706433, false, matrix4f, vertexConsumers, - bl ? TextLayerType.SEE_THROUGH : TextLayerType.NORMAL, j, light); - if (bl) { - textRenderer.draw(text, f, (float) i, -1, false, matrix4f, vertexConsumers, - TextLayerType.NORMAL, 0, - LightmapTextureManager.applyEmission(light, 2)); - } - - matrices.pop(); - } - } - } - - private void renderTextAtOrigin(double y, Text text, MatrixStack matrices, - VertexConsumerProvider vertexConsumers, int light) { + @Overwrite + public void renderLabelIfPresent(S state, Text text, MatrixStack matrices, + VertexConsumerProvider vertexConsumers, int light) { + if (isAura(state)) { + matrices.push(); + matrices.translate(0.0f, 0.0f, 0.0f); + double y = state.nameLabelPos.y; + renderTextAtOrigin(state, y, text, matrices, vertexConsumers, light); + matrices.pop(); + } else { + Vec3d vec3d = state.nameLabelPos; + if (vec3d != null) { + boolean bl = !state.sneaking; + int i = "deadmau5".equals(text.getString()) ? -10 : 0; matrices.push(); - - // Move up slightly - matrices.translate(0.0f, y + 0.5f, 0.0f); - - // Apply rotation to face the camera - matrices.multiply(dispatcher.getRotation()); - - // Scale text and badge to a readable size + matrices.translate(vec3d.x, vec3d.y + 0.5, vec3d.z); + matrices.multiply(this.dispatcher.getRotation()); matrices.scale(0.025F, -0.025F, 0.025F); - - // Offset the text to avoid Z-fighting - matrices.translate(0.0F, 0.0F, -0.01F); - Matrix4f matrix4f = matrices.peek().getPositionMatrix(); - net.minecraft.client.font.TextRenderer textRenderer = MinecraftClient.getInstance().textRenderer; - - float textWidth = textRenderer.getWidth(text); - float badgeSize = textWidth * 0.20f; - float totalWidth = textWidth + badgeSize + 6; - - // Adjust text position to make space for badge - float xStart = -totalWidth / 2 + badgeSize; - - // Draw a single background behind both text and badge - drawBackground(matrices, vertexConsumers, -totalWidth / 2 - 4, -1.5f, totalWidth, 10, 0x55000000); - - // Render Badge - renderBadgeIcon(matrices, vertexConsumers, xStart - badgeSize + 1, 3.4f, badgeSize); - - // Render Text with adjusted layer - textRenderer.draw(text, xStart, 0, -1, false, matrix4f, vertexConsumers, - net.minecraft.client.font.TextRenderer.TextLayerType.SEE_THROUGH, 0, - LightmapTextureManager.applyEmission(light, 2)); - - matrices.pop(); - } - - /** - * Draws a single background behind both text and badge. - */ - private void drawBackground(MatrixStack matrices, VertexConsumerProvider vertexConsumers, - float x, float y, float width, float height, int color) { - Matrix4f matrix = matrices.peek().getPositionMatrix(); - VertexConsumer vertexConsumer = vertexConsumers.getBuffer(RenderLayer.getTextBackgroundSeeThrough()); - - int a = (color >> 24) & 255; // Alpha - int r = (color >> 16) & 255; // Red - int g = (color >> 8) & 255; // Green - int b = color & 255; // Blue - - vertexConsumer.vertex(matrix, x, y + height, 0).color(r, g, b, a).texture(0, 1).light(0xF000F0) - .overlay(OverlayTexture.DEFAULT_UV).normal(0, 0, 1); - vertexConsumer.vertex(matrix, x + width, y + height, 0).color(r, g, b, a).texture(1, 1).light(0xF000F0) - .overlay(OverlayTexture.DEFAULT_UV).normal(0, 0, 1); - vertexConsumer.vertex(matrix, x + width, y, 0).color(r, g, b, a).texture(1, 0).light(0xF000F0) - .overlay(OverlayTexture.DEFAULT_UV).normal(0, 0, 1); - vertexConsumer.vertex(matrix, x, y, 0).color(r, g, b, a).texture(0, 0).light(0xF000F0) - .overlay(OverlayTexture.DEFAULT_UV).normal(0, 0, 1); - } - - private void renderBadgeIcon(MatrixStack matrices, VertexConsumerProvider vertexConsumers, float x, - float y, float size) { - matrices.push(); - - // Position badge correctly - matrices.translate(x, y, 0); - matrices.scale(size, size, size); // Scale properly - - Matrix4f matrix = matrices.peek().getPositionMatrix(); - VertexConsumer vertexConsumer = vertexConsumers - .getBuffer(RenderLayer.getEntityTranslucent(BADGE_TEXTURE)); - - int fullBright = LightmapTextureManager.MAX_LIGHT_COORDINATE; - - vertexConsumer.vertex(matrix, -0.5f, -0.5f, 0).color(255, 255, 255, 255).texture(0, 0).light(fullBright) - .overlay(OverlayTexture.DEFAULT_UV).normal(0, 0, 1); - vertexConsumer.vertex(matrix, 0.5f, -0.5f, 0).color(255, 255, 255, 255).texture(1, 0).light(fullBright) - .overlay(OverlayTexture.DEFAULT_UV).normal(0, 0, 1); - vertexConsumer.vertex(matrix, 0.5f, 0.5f, 0).color(255, 255, 255, 255).texture(1, 1).light(fullBright) - .overlay(OverlayTexture.DEFAULT_UV).normal(0, 0, 1); - vertexConsumer.vertex(matrix, -0.5f, 0.5f, 0).color(255, 255, 255, 255).texture(0, 1).light(fullBright) - .overlay(OverlayTexture.DEFAULT_UV).normal(0, 0, 1); - - matrices.pop(); - } - - private boolean isAura(S state) { - if (state instanceof PlayerEntityRenderState) { - String name = ((PlayerEntityRenderState) state).name; - AuraClient.LOGGER.info("Name: " + name); - AuraClient.LOGGER.info("Player Names: " + AuraApi.playerNames); - return AuraApi.playerNames.containsKey(name); + TextRenderer textRenderer = MinecraftClient.getInstance().textRenderer; + float f = (float) (-textRenderer.getWidth(text)) / 2.0F; + int j = (int) (MinecraftClient.getInstance().options.getTextBackgroundOpacity(0.25F) + * 255.0F) << 24; + textRenderer.draw(text, f, (float) i, -2130706433, false, matrix4f, vertexConsumers, + bl ? TextLayerType.SEE_THROUGH : TextLayerType.NORMAL, j, light); + if (bl) { + textRenderer.draw(text, f, (float) i, -1, false, matrix4f, vertexConsumers, + TextLayerType.NORMAL, 0, + LightmapTextureManager.applyEmission(light, 2)); } - return false; + + matrices.pop(); + } } -} \ No newline at end of file + } + + private void renderTextAtOrigin(S state, double y, Text text, MatrixStack matrices, + VertexConsumerProvider vertexConsumers, int light) { + matrices.push(); + + // Move up slightly + matrices.translate(0.0f, y + 0.5f, 0.0f); + + // Apply rotation to face the camera + matrices.multiply(dispatcher.getRotation()); + + // Scale text and badge to a readable size + matrices.scale(0.025F, -0.025F, 0.025F); + + // Offset the text to avoid Z-fighting + matrices.translate(0.0F, 0.0F, -0.01F); + + Matrix4f matrix4f = matrices.peek().getPositionMatrix(); + net.minecraft.client.font.TextRenderer textRenderer = MinecraftClient.getInstance().textRenderer; + + float textWidth = textRenderer.getWidth(text); + float badgeSize = textWidth * 0.20f; + float totalWidth = textWidth + badgeSize + 4; + + // Adjust text position to make space for badge + float xStart = -totalWidth / 2 + badgeSize; + + float backgroundX = -totalWidth / 2 - 3.9f; + + int j = (int) (MinecraftClient.getInstance().options.getTextBackgroundOpacity(0.25F) + * 255.0F) << 24; + + drawBackground(state, matrices, vertexConsumers, backgroundX, -1.5f, totalWidth, 10, j); + + // Render Badge + renderBadgeIcon(matrices, vertexConsumers, xStart - badgeSize + 1, 3.4f, badgeSize, state.sneaking); + + if (state.sneaking) { + textRenderer.draw(text, xStart, 0, -2130706433, false, matrix4f, vertexConsumers, + TextLayerType.NORMAL, 0, + light); + } else { + textRenderer.draw(text, xStart, 0, -1, false, matrix4f, vertexConsumers, + TextLayerType.SEE_THROUGH, 0, + LightmapTextureManager.applyEmission(light, 2)); + } + + matrices.pop(); + } + + /** + * Draws a single background behind both text and badge. + */ + private void drawBackground(S state, MatrixStack matrices, VertexConsumerProvider vertexConsumers, + float x, float y, float width, float height, int color) { + Matrix4f matrix = matrices.peek().getPositionMatrix(); + VertexConsumer vertexConsumer = vertexConsumers.getBuffer( + state.sneaking ? RenderLayer.getTextBackground() + : RenderLayer.getTextBackgroundSeeThrough()); + + int a = (color >> 24) & 255; // Alpha + int r = (color >> 16) & 255; // Red + int g = (color >> 8) & 255; // Green + int b = color & 255; // Blue + + float z = state.sneaking ? -0.04f : 0.0f; + + vertexConsumer.vertex(matrix, x, y + height, z).color(r, g, b, a).texture(0, 1).light(0xF000F0) + .overlay(OverlayTexture.DEFAULT_UV).normal(0, 0, 1); + vertexConsumer.vertex(matrix, x + width, y + height, z).color(r, g, b, a).texture(1, 1).light(0xF000F0) + .overlay(OverlayTexture.DEFAULT_UV).normal(0, 0, 1); + vertexConsumer.vertex(matrix, x + width, y, z).color(r, g, b, a).texture(1, 0).light(0xF000F0) + .overlay(OverlayTexture.DEFAULT_UV).normal(0, 0, 1); + vertexConsumer.vertex(matrix, x, y, z).color(r, g, b, a).texture(0, 0).light(0xF000F0) + .overlay(OverlayTexture.DEFAULT_UV).normal(0, 0, 1); + } + + private void renderBadgeIcon(MatrixStack matrices, VertexConsumerProvider vertexConsumers, float x, + float y, float size, boolean sneaking) { + matrices.push(); + + // Position badge correctly + matrices.translate(x, y, 0); + matrices.scale(size, size, size); + + Matrix4f matrix = matrices.peek().getPositionMatrix(); + VertexConsumer vertexConsumer = vertexConsumers.getBuffer( + RenderLayer.getEntityAlpha(BADGE_TEXTURE)); + + int light = LightmapTextureManager.MAX_LIGHT_COORDINATE; + + // If sneaking, render the badge in gray + vertexConsumer.vertex(matrix, -0.5f, -0.5f, 0).color(255, 255, 255, 255).texture(0, 0).light(light) + .overlay(OverlayTexture.DEFAULT_UV).normal(0, 0, 1); + vertexConsumer.vertex(matrix, 0.5f, -0.5f, 0).color(255, 255, 255, 255).texture(1, 0).light(light) + .overlay(OverlayTexture.DEFAULT_UV).normal(0, 0, 1); + vertexConsumer.vertex(matrix, 0.5f, 0.5f, 0).color(255, 255, 255, 255).texture(1, 1).light(light) + .overlay(OverlayTexture.DEFAULT_UV).normal(0, 0, 1); + vertexConsumer.vertex(matrix, -0.5f, 0.5f, 0).color(255, 255, 255, 255).texture(0, 1).light(light) + .overlay(OverlayTexture.DEFAULT_UV).normal(0, 0, 1); + + matrices.pop(); + } + + private boolean isAura(S state) { + if (state instanceof PlayerEntityRenderState) { + String name = ((PlayerEntityRenderState) state).name; + return AuraApi.playerNames.containsKey(name); + } + return false; + } +}