fix name shadow rendering while sneaking

Author: moehreag

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

@@ -104,7 +104,7 @@ public abstract class EntityRendererMixin<T extends Entity> {
 		}
 	}
 
-	@ModifyArg(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"), index = 4)
+	@ModifyArg(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), index = 4)
 	public boolean axolotlclient$enableShadows(boolean shadow) {
 		return AxolotlClient.CONFIG.useShadows.get();
 	}

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

@@ -119,14 +119,9 @@ public abstract class EntityRendererMixin<T extends Entity> {
 		}
 	}
 
-	@ModifyArg(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), index = 4)
-	private boolean enableShadows$sneaking(boolean par5, @Local Matrix4f matrix4f, @Local boolean notSneaking) {
-		matrix4f.scale(1, 1, -1);
-		return !notSneaking && AxolotlClient.CONFIG.useShadows.get();
-	}
-
 	@ModifyArg(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), index = 4)
 	private boolean enableShadows(boolean par5, @Local Matrix4f matrix4f) {
+		matrix4f.scale(1, 1, -1);
 		return AxolotlClient.CONFIG.useShadows.get();
 	}
 

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

@@ -95,7 +95,7 @@ public abstract class EntityRendererMixin<T extends Entity, S extends EntityRend
 		}
 	}
 
-	@ModifyArg(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"), index = 4)
+	@ModifyArg(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), index = 4)
 	public boolean axolotlclient$enableShadows(boolean shadow) {
 		return AxolotlClient.CONFIG.useShadows.get();
 	}

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

@@ -22,6 +22,8 @@
 
 package io.github.axolotlclient.mixin;
 
+import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
+import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
 import com.mojang.blaze3d.platform.GlStateManager;
 import com.mojang.blaze3d.vertex.BufferBuilder;
 import com.mojang.blaze3d.vertex.DefaultVertexFormat;
@@ -69,10 +71,12 @@ public abstract class EntityRendererMixin<T extends Entity> {
 			BadgeRenderer.renderNametagBadge(entity);
 	}
 
-	@Redirect(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"))
-	public int axolotlclient$forceShadows(TextRenderer instance, String text, int x, int y, int color) {
-		instance.draw(text, x, y, color, AxolotlClient.CONFIG.useShadows.get());
-		return 0;
+	@WrapOperation(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 int axolotlclient$forceShadows(TextRenderer instance, String string, int x, int y, int color, Operation<Integer> original, Entity entity) {
+		if (AxolotlClient.CONFIG.useShadows.get() && !entity.isSneaking()) {
+			return instance.draw(string, x, y, color, true);
+		}
+		return original.call(instance, string, x, y, color);
 	}
 
 	@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))

common/src/main/java/io/github/axolotlclient/api/API.java

@@ -26,10 +26,7 @@
 import java.net.URI;
 import java.net.http.*;
 import java.util.*;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
+import java.util.concurrent.*;
 import java.util.stream.Collectors;
 
 import io.github.axolotlclient.AxolotlClientCommon;
@@ -72,6 +69,8 @@ public class API {
 	private AccountSettings settings;
 	private HttpClient client;
 	private CompletableFuture<?> restartingFuture;
+	private Future<?> statusUpdateFuture;
+	private final ScheduledExecutorService statusUpdateExecutor;
 	private static final List<BiContainer<Runnable, ListenerType>> afterStartupListeners = new ArrayList<>();
 
 	public API(Logger logger, TranslationProvider translationProvider,
@@ -91,6 +90,7 @@ public API(Logger logger, TranslationProvider translationProvider,
 		handlers.add(new StatusUpdateHandler());
 		handlers.add(new ChannelInviteHandler());
 		Instance = this;
+		statusUpdateExecutor = Executors.newSingleThreadScheduledExecutor();
 		Runtime.getRuntime().addShutdownHook(new Thread(this::shutdown));
 	}
 
@@ -295,6 +295,10 @@ public void shutdown() {
 			restartingFuture.cancel(true);
 			restartingFuture = null;
 		}
+		if (statusUpdateFuture != null) {
+			statusUpdateFuture.cancel(true);
+			statusUpdateFuture = null;
+		}
 		if (isAuthenticated()) {
 			logger.debug("Shutting down API");
 			if (isSocketConnected()) {
@@ -445,27 +449,15 @@ private void startupAPI() {
 
 	private void startStatusUpdateThread() {
 		statusUpdateProvider.initialize();
-		new Thread("Status Update Thread") {
-			@Override
-			public void run() {
-				try {
-					Thread.sleep(50);
-				} catch (InterruptedException ignored) {
-				}
-				while (API.getInstance().isAuthenticated()) {
-					Request request = statusUpdateProvider.getStatus();
-					if (request != null) {
-						post(request);
-					}
-					try {
-						//noinspection BusyWait
-						Thread.sleep(Constants.STATUS_UPDATE_DELAY * 1000);
-					} catch (InterruptedException ignored) {
-
-					}
-				}
+		if (statusUpdateFuture != null) {
+			statusUpdateFuture.cancel(true);
+		}
+		statusUpdateFuture = statusUpdateExecutor.scheduleAtFixedRate(() -> {
+			Request request = statusUpdateProvider.getStatus();
+			if (request != null) {
+				post(request);
 			}
-		}.start();
+		}, 50, Constants.STATUS_UPDATE_DELAY * 1000, TimeUnit.MILLISECONDS);
 	}
 
 	public String sanitizeUUID(String uuid) {

gradle.properties

@@ -6,7 +6,7 @@ org.gradle.parallel=true
 axolotlclient.modules.all=true
 
 # Mod Properties
-version=3.1.1-rc.17
+version=3.1.1-rc.18
 
 maven_group=io.github.axolotlclient