Update AttributeSwap, ChatSpam, CreativeFlight, StaffMonitor, Untouchable

Author: cev-api

README.md

@@ -11,7 +11,7 @@
 ### Download
 Pre-compiled copies are available on the [Release Page](https://github.com/cev-api/Wurst7-CevAPI/releases). 
 
-[![](https://i.imgur.com/OUs86yu.png)](https://github.com/cev-api/Wurst7-CevAPI/releases)
+[![](https://i.imgur.com/b44bIdV.png)](https://github.com/cev-api/Wurst7-CevAPI/releases)
 
 I have versions for [1.21.1](https://github.com/cev-api/Wurst7-CevAPI/tree/1.21.1), [1.21.8](https://github.com/cev-api/Wurst7-CevAPI/tree/1.21.8), [1.21.10](https://github.com/cev-api/Wurst7-CevAPI/tree/1.21.10), [1.21.11](https://github.com/cev-api/Wurst7-CevAPI/tree/1.21.11), [26.1.2](https://github.com/cev-api/Wurst7-CevAPI/tree/26.1.2) but I only update and maintain the latest; [26.2.x](https://github.com/cev-api/Wurst7-CevAPI/tree/master)
 

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

@@ -51,7 +51,7 @@ public final class AttributeSwapHack extends Hack
 
 	private final CheckboxSetting reserveTargetSlot = new CheckboxSetting(
 		"Reserve target slot",
-		"Prevents you from selecting the target slot yourself. AttributeSwap can still use it temporarily.",
+		"Prevents you from selecting the target slot yourself. If \"Only with Mace\" is on and the slot doesn't hold a mace, the reservation is lifted.",
 		false);
 
 	private final CheckboxSetting swapBack = new CheckboxSetting("Swap back",
@@ -94,7 +94,9 @@ public final class AttributeSwapHack extends Hack
 			"Only activate when MultiAura is enabled.", false);
 
 	private final CheckboxSetting onlyWithMace = new CheckboxSetting(
-		"Only with Mace", "Only swap when holding a Mace.", false);
+		"Only with Mace",
+		"Only swap when the target slot already contains a Mace. If the slot doesn't hold a mace, AttributeSwap stays off and won't reserve the slot.",
+		false);
 
 	private int backTimer;
 	private boolean awaitingBack;
@@ -391,7 +393,21 @@ public boolean canPlayerSelectHotbarSlot(int slot)
 
 	private boolean isTargetSlotReserved()
 	{
-		return isEnabled() && reserveTargetSlot.isChecked();
+		return isEnabled() && reserveTargetSlot.isChecked()
+			&& isTargetSlotUsable();
+	}
+	
+	private boolean isTargetSlotUsable()
+	{
+		if(!onlyWithMace.isChecked())
+			return true;
+		
+		int target = getTargetHotbarSlot();
+		if(target < 0 || target > 8 || MC.player == null)
+			return false;
+		
+		return MC.player.getInventory().getItem(target)
+			.getItem() instanceof MaceItem;
 	}
 
 	public int getTargetHotbarSlot()

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

@@ -11,8 +11,10 @@
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.text.BreakIterator;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Locale;
 
 import net.wurstclient.Category;
 import net.wurstclient.SearchTags;
@@ -31,6 +33,7 @@
 public final class ChatSpamHack extends Hack implements UpdateListener
 {
 	private static final int CHAT_LIMIT = 256;
+	private static final char FORMAT_CHAR = '\u00A7';
 
 	private final TextFieldSetting message = new TextFieldSetting("Message",
 		"Chat message to send repeatedly when file mode is disabled.", "",
@@ -218,9 +221,7 @@ private boolean loadMessagesFromFile()
 
 		for(String line : lines)
 		{
-			String normalized = normalizeMessage(line);
-			if(!normalized.isEmpty())
-				pendingMessages.add(normalized);
+			addMessageChunks(line);
 		}
 
 		if(pendingMessages.isEmpty())
@@ -237,10 +238,143 @@ private static String normalizeMessage(String message)
 		if(message == null)
 			return "";
 
-		String trimmed = message.replace("\r", "");
-		if(trimmed.length() > CHAT_LIMIT)
-			trimmed = trimmed.substring(0, CHAT_LIMIT);
+		return message.replace("\r", "");
+	}
+	
+	private void addMessageChunks(String message)
+	{
+		String remaining = normalizeMessage(message);
+		if(remaining.isEmpty())
+			return;
 
-		return trimmed;
+		String formattingPrefix = "";
+		while(!remaining.isEmpty())
+		{
+			int budget = CHAT_LIMIT - formattingPrefix.length();
+			if(budget <= 0)
+			{
+				formattingPrefix = "";
+				budget = CHAT_LIMIT;
+			}
+			
+			if(remaining.length() <= budget)
+			{
+				pendingMessages.add(formattingPrefix + remaining);
+				return;
+			}
+			
+			int breakPos = findPreferredBreakPosition(remaining, budget);
+			if(breakPos <= 0)
+				breakPos = findSafeHardBreak(remaining, budget);
+			
+			String chunk = remaining.substring(0, breakPos).stripTrailing();
+			if(!chunk.isEmpty())
+			{
+				pendingMessages.add(formattingPrefix + chunk);
+				formattingPrefix =
+					getActiveFormatting(formattingPrefix + chunk);
+			}
+			
+			remaining = remaining.substring(breakPos).stripLeading();
+		}
+	}
+	
+	private static int findPreferredBreakPosition(String text, int budget)
+	{
+		int sentenceBreak = findSentenceBreakPosition(text, budget);
+		if(sentenceBreak > 0)
+			return sentenceBreak;
+		
+		int wordBreak = findWhitespaceBreakPosition(text, budget);
+		if(wordBreak > 0)
+			return wordBreak;
+		
+		return -1;
+	}
+	
+	private static int findSentenceBreakPosition(String text, int budget)
+	{
+		BreakIterator iterator = BreakIterator.getSentenceInstance(Locale.ROOT);
+		iterator.setText(text);
+		
+		int best = -1;
+		for(int end = iterator.first(); end != BreakIterator.DONE; end =
+			iterator.next())
+		{
+			if(end > 0 && end <= budget)
+				best = end;
+		}
+		
+		return best;
+	}
+	
+	private static int findWhitespaceBreakPosition(String text, int budget)
+	{
+		int limit = Math.min(budget, text.length());
+		for(int i = limit; i > 0; i--)
+		{
+			if(Character.isWhitespace(text.charAt(i - 1)))
+				return i;
+		}
+		
+		return -1;
+	}
+	
+	private static int findSafeHardBreak(String text, int budget)
+	{
+		int end = Math.min(budget, text.length());
+		if(end <= 0)
+			return Math.min(1, text.length());
+		
+		if(text.charAt(end - 1) == FORMAT_CHAR)
+			end--;
+		
+		if(end <= 0)
+			end = Math.min(1, text.length());
+		
+		return end;
+	}
+	
+	private static String getActiveFormatting(String text)
+	{
+		String color = "";
+		StringBuilder styles = new StringBuilder();
+		
+		for(int i = 0; i < text.length() - 1; i++)
+		{
+			if(text.charAt(i) != FORMAT_CHAR)
+				continue;
+			
+			char code = Character.toLowerCase(text.charAt(++i));
+			if(code == 'r')
+			{
+				color = "";
+				styles.setLength(0);
+				continue;
+			}
+			
+			if(isColorCode(code))
+			{
+				color = "" + FORMAT_CHAR + code;
+				styles.setLength(0);
+				continue;
+			}
+			
+			if(isStyleCode(code) && styles.indexOf("" + FORMAT_CHAR + code) < 0)
+				styles.append(FORMAT_CHAR).append(code);
+		}
+		
+		return color + styles;
+	}
+	
+	private static boolean isColorCode(char code)
+	{
+		return code >= '0' && code <= '9' || code >= 'a' && code <= 'f';
+	}
+	
+	private static boolean isStyleCode(char code)
+	{
+		return code == 'k' || code == 'l' || code == 'm' || code == 'n'
+			|| code == 'o';
 	}
 }

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

@@ -7,7 +7,6 @@
  */
 package net.wurstclient.hacks;
 
-import net.minecraft.client.KeyMapping;
 import net.minecraft.client.player.LocalPlayer;
 import net.minecraft.world.entity.player.Abilities;
 import net.minecraft.world.phys.Vec3;
@@ -23,6 +22,8 @@
 @SearchTags({"creative flight", "CreativeFly", "creative fly"})
 public final class CreativeFlightHack extends Hack implements UpdateListener
 {
+	private static final double DESCENT_SPEED = -0.15;
+	
 	private final CheckboxSetting antiKick = new CheckboxSetting("Anti-Kick",
 		"Makes you fall a little bit every now and then to prevent you from getting kicked.",
 		false);
@@ -31,16 +32,22 @@ public final class CreativeFlightHack extends Hack implements UpdateListener
 		new SliderSetting("Anti-Kick Interval",
 			"How often Anti-Kick should prevent you from getting kicked.\n"
 				+ "Most servers will kick you after 80 ticks.",
-			30, 5, 80, 1, SliderSetting.ValueDisplay.INTEGER
+			70, 5, 80, 1, SliderSetting.ValueDisplay.INTEGER
 				.withSuffix(" ticks").withLabel(1, "1 tick"));
 
 	private final SliderSetting antiKickDistance = new SliderSetting(
 		"Anti-Kick Distance",
 		"How far Anti-Kick should make you fall.\n"
 			+ "Most servers require at least 0.032m to stop you from getting kicked.",
-		0.07, 0.01, 0.2, 0.001, ValueDisplay.DECIMAL.withSuffix("m"));
+		0.035, 0.01, 0.2, 0.001, ValueDisplay.DECIMAL.withSuffix("m"));
+	
+	private final CheckboxSetting startFlyingImmediately = new CheckboxSetting(
+		"Start flying immediately",
+		"Automatically enables CreativeFlight as soon as the hack is turned on, instead of waiting for the usual double-jump.",
+		true);
 
 	private int tickCounter = 0;
+	private boolean suppressedSneakKey;
 
 	public CreativeFlightHack()
 	{
@@ -49,16 +56,23 @@ public CreativeFlightHack()
 		addSetting(antiKick);
 		addSetting(antiKickInterval);
 		addSetting(antiKickDistance);
+		addSetting(startFlyingImmediately);
 	}
 
 	@Override
 	protected void onEnable()
 	{
 		tickCounter = 0;
+		suppressedSneakKey = false;
 
 		WURST.getHax().jetpackHack.setEnabled(false);
 		WURST.getHax().flightHack.setEnabled(false);
 
+		Abilities abilities = MC.player.getAbilities();
+		abilities.mayfly = true;
+		if(startFlyingImmediately.isChecked())
+			abilities.flying = true;
+		
 		EVENTS.add(UpdateListener.class, this);
 	}
 
@@ -74,7 +88,7 @@ protected void onDisable()
 		abilities.flying = creative && !player.onGround();
 		abilities.mayfly = creative;
 
-		restoreKeyPresses();
+		restoreSneakKey();
 	}
 
 	@Override
@@ -83,49 +97,71 @@ public void onUpdate()
 		Abilities abilities = MC.player.getAbilities();
 		abilities.mayfly = true;
 
+		handleSmoothDescent(abilities);
+		
 		if(antiKick.isChecked() && abilities.flying)
 			doAntiKick();
 	}
 
+	private void handleSmoothDescent(Abilities abilities)
+	{
+		IKeyMapping sneakKey = IKeyMapping.get(MC.options.keyShift);
+		boolean sneakDown = sneakKey.isActuallyDown();
+		
+		if(!abilities.flying || !sneakDown)
+		{
+			if(suppressedSneakKey)
+				restoreSneakKey();
+			
+			return;
+		}
+		
+		sneakKey.setDown(false);
+		suppressedSneakKey = true;
+		
+		if(IKeyMapping.get(MC.options.keyJump).isActuallyDown())
+			return;
+		
+		Vec3 velocity = MC.player.getDeltaMovement();
+		MC.player.setDeltaMovement(velocity.x, DESCENT_SPEED, velocity.z);
+	}
+	
 	private void doAntiKick()
 	{
-		if(tickCounter > antiKickInterval.getValueI() + 2)
+		if(IKeyMapping.get(MC.options.keyJump).isActuallyDown()
+			|| IKeyMapping.get(MC.options.keyShift).isActuallyDown())
+			return;
+		
+		if(tickCounter > antiKickInterval.getValueI() + 1)
 			tickCounter = 0;
 
 		switch(tickCounter)
 		{
 			case 0 ->
 			{
-				if(MC.options.keyShift.isDown() && !MC.options.keyJump.isDown())
-					tickCounter = 3;
+				Vec3 velocity = MC.player.getDeltaMovement();
+				if(velocity.y <= -antiKickDistance.getValue())
+					tickCounter = 2;
 				else
-					setMotionY(-antiKickDistance.getValue());
+					addMotionY(-antiKickDistance.getValue());
 			}
 
-			case 1 -> setMotionY(antiKickDistance.getValue());
-			
-			case 2 -> setMotionY(0);
-			
-			case 3 -> restoreKeyPresses();
+			case 1 -> addMotionY(antiKickDistance.getValue());
 		}
 
 		tickCounter++;
 	}
 
-	private void setMotionY(double motionY)
+	private void addMotionY(double motionY)
 	{
-		MC.options.keyShift.setDown(false);
-		MC.options.keyJump.setDown(false);
-		
 		Vec3 velocity = MC.player.getDeltaMovement();
-		MC.player.setDeltaMovement(velocity.x, motionY, velocity.z);
+		MC.player.setDeltaMovement(velocity.x, velocity.y + motionY,
+			velocity.z);
 	}
 
-	private void restoreKeyPresses()
+	private void restoreSneakKey()
 	{
-		KeyMapping[] keys = {MC.options.keyJump, MC.options.keyShift};
-		
-		for(KeyMapping key : keys)
-			IKeyMapping.get(key).resetPressedState();
+		IKeyMapping.get(MC.options.keyShift).resetPressedState();
+		suppressedSneakKey = false;
 	}
 }