Updated AutoSign and AltManager

Author: cev-api

src/main/java/net/wurstclient/altmanager/MicrosoftLoginManager.java

@@ -34,6 +34,7 @@
 import com.google.gson.JsonObject;
 import net.minecraft.client.User;
 import net.wurstclient.WurstClient;
+import net.wurstclient.mixinterface.IMinecraftClient;
 import net.wurstclient.util.json.JsonException;
 import net.wurstclient.util.json.JsonUtils;
 import net.wurstclient.util.json.WsonObject;
@@ -133,6 +134,8 @@ public static void loginWithRefreshToken(String refreshToken)
 		{
 			MinecraftProfile mcProfile =
 				authenticateRefreshTokenWithoutSession(refreshToken);
+			System.out.println("Refresh-token auth resolved profile: "
+				+ mcProfile.getName() + " (" + mcProfile.getUUID() + ")");
 			setSession(mcProfile);
 
 			System.out.println("Refresh-token login successful after "
@@ -658,9 +661,20 @@ private static URL createURL(String url)
 
 	private static void setSession(MinecraftProfile mcProfile)
 	{
+		IMinecraftClient imc = WurstClient.IMC;
+		User before = imc.getWurstSession();
+		String beforeName = before == null ? "<original>"
+			: before.getName() + " (" + before.getProfileId() + ")";
+		System.out.println("Applying alt session. Previous: " + beforeName);
+		
 		User session = new User(mcProfile.getName(), mcProfile.getUUID(),
 			mcProfile.getAccessToken(), Optional.empty(), Optional.empty());
 
-		WurstClient.IMC.setWurstSession(session);
+		imc.setWurstSession(session);
+		
+		User after = imc.getWurstSession();
+		String afterName = after == null ? "<original>"
+			: after.getName() + " (" + after.getProfileId() + ")";
+		System.out.println("Alt session applied. Current: " + afterName);
 	}
 }

src/main/java/net/wurstclient/altmanager/screens/AltManagerScreen.java

@@ -386,6 +386,7 @@ private void runRandomLogin()
 	{
 		IMinecraftClient imc = (IMinecraftClient)minecraft;
 		User previousSession = imc.getWurstSession();
+		boolean keepNewSession = false;
 
 		try
 		{
@@ -410,6 +411,7 @@ private void runRandomLogin()
 				try
 				{
 					altManager.login(alt);
+					keepNewSession = true;
 					clearLoginFailure(alt);
 					String name = minecraft.getUser().getName();
 					minecraft.execute(() -> {
@@ -445,7 +447,8 @@ private void runRandomLogin()
 
 		}finally
 		{
-			imc.setWurstSession(previousSession);
+			if(!keepNewSession)
+				imc.setWurstSession(previousSession);
 		}
 	}
 

src/main/java/net/wurstclient/hack/HackList.java

@@ -122,7 +122,8 @@ public final class HackList implements UpdateListener
 	public final CriticalsHack criticalsHack = new CriticalsHack();
 	public final CrystalAuraHack crystalAuraHack = new CrystalAuraHack();
 	public final DerpHack derpHack = new DerpHack();
-	public final TunnelHoleStairEspHack tunnelHoleStairEspHack = new TunnelHoleStairEspHack();
+	public final TunnelHoleStairEspHack tunnelHoleStairEspHack =
+		new TunnelHoleStairEspHack();
 	public final DolphinHack dolphinHack = new DolphinHack();
 	public final ElytraFlightHack elytraFlightHack = new ElytraFlightHack();
 	public final ElytraInfoHack elytraInfoHack = new ElytraInfoHack();

src/main/java/net/wurstclient/hacks/AutoSignHack.java

@@ -181,16 +181,15 @@ public String[] getSignText()
 			}
 		}
 
-		// If we already captured a template from the first edited sign while
-		// the
-		// hack is enabled, use that for subsequent signs.
-		if(signText != null)
-			return signText;
-		
-		// Otherwise fall back to the persisted preset, if any.
+		// Next, prefer the persisted preset text from the GUI text box.
+		// This lets text changes apply immediately without toggling the hack.
 		String preset = presetText.getValue();
 		if(preset == null || preset.isEmpty())
-			return null;
+		{
+			// If no preset text is configured, use the first manually edited
+			// sign as a temporary template while the hack stays enabled.
+			return signText;
+		}
 
 		String[] wrapped = wrapToSign(preset);
 		return wrapped == null ? null : wrapped;
@@ -407,7 +406,7 @@ public void onUpdate()
 		}
 
 		String[] oldText = readSign(signEntity);
-		if(linesMatch(oldText, newText))
+		if(signHasDesiredText(signEntity, newText))
 		{
 			auraTimer = Math.max(1, auraDelay.getValueI());
 			return;
@@ -481,6 +480,19 @@ private boolean linesMatch(String[] current, String[] desired)
 		return true;
 	}
 
+	private boolean signHasDesiredText(SignBlockEntity sign, String[] desired)
+	{
+		if(sign == null || desired == null)
+			return false;
+		
+		String[] front = readSign(sign.getFrontText());
+		if(linesMatch(front, desired))
+			return true;
+		
+		String[] back = readSign(sign.getBackText());
+		return linesMatch(back, desired);
+	}
+	
 	private boolean canUseHandNoClip()
 	{
 		if(!auraThroughWalls.isChecked())
@@ -492,15 +504,15 @@ private boolean canUseHandNoClip()
 
 	private String[] readSign(SignBlockEntity sign)
 	{
-		String[] lines = new String[MAX_LINES];
 		if(sign == null)
-		{
-			for(int i = 0; i < MAX_LINES; i++)
-				lines[i] = "";
-			return lines;
-		}
+			return readSign((SignText)null);
 
-		SignText signText = sign.getFrontText();
+		return readSign(sign.getFrontText());
+	}
+	
+	private String[] readSign(SignText signText)
+	{
+		String[] lines = new String[MAX_LINES];
 		for(int i = 0; i < MAX_LINES; i++)
 		{
 			net.minecraft.network.chat.Component component =

src/main/java/net/wurstclient/hacks/PlayerSonarHack.java

@@ -288,18 +288,18 @@ private void updatePing(BlockPos pos, String kind, String oldId,
 		ping.lastOldId = oldId;
 		ping.lastNewId = newId;
 
-		if(chatAlerts.isChecked() && now - ping.lastAlertMs >= 300L)
-		{
-			int distanceBlocks =
-				(int)Math.round(Math.sqrt(ping.pos.distToCenterSqr(
-					MC.player.getX(), MC.player.getY(), MC.player.getZ())));
-			String rangeSuffix = onlyBeyondPlayerEspRange.isChecked()
-				? String.format(" (%db away, outside %.0fb).", distanceBlocks,
-					PLAYER_ESP_LIMIT_BLOCKS)
-				: String.format(" (%db away).", distanceBlocks);
-			ChatUtils.message(String.format(
-				"PlayerSonar: %s %s -> %s at %d, %d, %d%s", ping.lastKind,
-				ping.lastOldId, ping.lastNewId, ping.pos.getX(),
+		if(chatAlerts.isChecked() && now - ping.lastAlertMs >= 300L)
+		{
+			int distanceBlocks = (int)Math
+				.round(Math.sqrt(ping.pos.distToCenterSqr(MC.player.getX(),
+					MC.player.getY(), MC.player.getZ())));
+			String rangeSuffix = onlyBeyondPlayerEspRange.isChecked()
+				? String.format(" (%db away, outside %.0fb).", distanceBlocks,
+					PLAYER_ESP_LIMIT_BLOCKS)
+				: String.format(" (%db away).", distanceBlocks);
+			ChatUtils.message(String.format(
+				"PlayerSonar: %s %s -> %s at %d, %d, %d%s", ping.lastKind,
+				ping.lastOldId, ping.lastNewId, ping.pos.getX(),
 				ping.pos.getY(), ping.pos.getZ(), rangeSuffix));
 			ping.lastAlertMs = now;
 		}

src/main/java/net/wurstclient/hacks/TunnelHoleStairEspHack.java

@@ -50,8 +50,9 @@
 
 @SearchTags({"dig spot esp", "digspot esp", "hole esp", "tunnel esp",
 	"stairs esp"})
-public final class TunnelHoleStairEspHack extends Hack implements UpdateListener,
-	RenderListener, CameraTransformViewBobbingListener, PacketInputListener
+public final class TunnelHoleStairEspHack extends Hack
+	implements UpdateListener, RenderListener,
+	CameraTransformViewBobbingListener, PacketInputListener
 {
 	private static final Direction[] CARDINALS =
 		{Direction.NORTH, Direction.SOUTH, Direction.EAST, Direction.WEST};
@@ -335,16 +336,19 @@ private void renderBoxes(PoseStack matrixStack)
 	private void renderTracers(PoseStack matrixStack, float partialTicks)
 	{
 		if(!holeBoxes.isEmpty())
-			RenderUtils.drawTracers("TunnelHoleStairESP", matrixStack, partialTicks,
-				getCenters(holeBoxes), holeColor.getColorI(0x95), false);
+			RenderUtils.drawTracers("TunnelHoleStairESP", matrixStack,
+				partialTicks, getCenters(holeBoxes), holeColor.getColorI(0x95),
+				false);
 
 		if(!tunnelBoxes.isEmpty())
-			RenderUtils.drawTracers("TunnelHoleStairESP", matrixStack, partialTicks,
-				getCenters(tunnelBoxes), tunnelColor.getColorI(0x95), false);
+			RenderUtils.drawTracers("TunnelHoleStairESP", matrixStack,
+				partialTicks, getCenters(tunnelBoxes),
+				tunnelColor.getColorI(0x95), false);
 
 		if(!stairBoxes.isEmpty())
-			RenderUtils.drawTracers("TunnelHoleStairESP", matrixStack, partialTicks,
-				getCenters(stairBoxes), stairColor.getColorI(0x95), false);
+			RenderUtils.drawTracers("TunnelHoleStairESP", matrixStack,
+				partialTicks, getCenters(stairBoxes),
+				stairColor.getColorI(0x95), false);
 	}
 
 	private ArrayList<Vec3> getCenters(ArrayList<AABB> boxes)