(1.8.9) cleanup badge rendering

Author: moehreag

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

@@ -65,7 +65,7 @@ public abstract class EntityRendererMixin<T extends Entity> {
 		}
 	}
 
-	@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 = 0))
+	@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))
 	public void axolotlclient$addBadges(T entity, String string, double d, double e, double f, int i, CallbackInfo ci) {
 		if (entity instanceof ClientPlayerEntity && string.equals(entity.getDisplayName().getFormattedString()))
 			BadgeRenderer.renderNametagBadge(entity);

1.8.9/src/main/java/io/github/axolotlclient/mixin/LivingEntityRendererMixin.java

@@ -27,7 +27,6 @@
 import io.github.axolotlclient.modules.freelook.Perspective;
 import io.github.axolotlclient.modules.hud.gui.hud.PlayerHud;
 import io.github.axolotlclient.modules.hypixel.nickhider.NickHider;
-import io.github.axolotlclient.util.BadgeRenderer;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.entity.living.player.ClientPlayerEntity;
 import net.minecraft.client.render.entity.EntityRenderDispatcher;
@@ -77,14 +76,6 @@ protected LivingEntityRendererMixin(EntityRenderDispatcher entityRenderDispatche
 		return instance.getDisplayName();
 	}
 
-	@Inject(method = "renderNameTag(Lnet/minecraft/entity/living/LivingEntity;DDD)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/TextRenderer;draw(Ljava/lang/String;III)I"))
-	public void axolotlclient$addBadge(LivingEntity livingEntity, double d, double e, double f, CallbackInfo ci) {
-		if (!NickHider.getInstance().hideOwnName.get() && livingEntity.equals(Minecraft.getInstance().player))
-			BadgeRenderer.renderNametagBadge(livingEntity);
-		else if (!NickHider.getInstance().hideOtherNames.get() && !livingEntity.equals(Minecraft.getInstance().player))
-			BadgeRenderer.renderNametagBadge(livingEntity);
-	}
-
 	@ModifyConstant(method = "setupOverlayColor(Lnet/minecraft/entity/living/LivingEntity;FZ)Z", constant = @Constant(floatValue = 1.0f, ordinal = 0))
 	private float axolotlclient$customHitColorRed(float constant) {
 		return AxolotlClient.CONFIG.hitColor.get().getRed() / 255F;

1.8.9/src/main/java/io/github/axolotlclient/util/BadgeRenderer.java

@@ -44,9 +44,6 @@ public static void renderNametagBadge(Entity entity) {
 
 		TextRenderer textRenderer = Minecraft.getInstance().textRenderer;
 
-		GlStateManager.enableDepthTest();
-		GlStateManager.depthMask(true);
-
 		int x = -(textRenderer
 			.getWidth(entity.getUuid() == Minecraft.getInstance().player.getUuid()
 				? (NickHider.getInstance().hideOwnName.get() ? NickHider.getInstance().hiddenNameSelf.get()
@@ -62,11 +59,8 @@ public static void renderNametagBadge(Entity entity) {
 		if (AxolotlClient.CONFIG.customBadge.get())
 			textRenderer.draw(AxolotlClient.CONFIG.badgeText.get(), x, 0, -1, AxolotlClient.CONFIG.useShadows.get());
 		else {
-			GlStateManager.alphaFunc(516, 0.1F);
-			GlStateManager.enableAlphaTest();
 			Minecraft.getInstance().getTextureManager().bind(AxolotlClient.badgeIcon);
 			GuiElement.drawTexture(x, 0, 0, 0, 8, 8, 8, 8);
 		}
-		GlStateManager.disableDepthTest();
 	}
 }