Update AutoEat, ChestSearch, MultiAura

Author: cev-api

src/main/java/net/wurstclient/clickgui/screens/ChestSearchScreen.java

@@ -18,6 +18,7 @@
 import net.minecraft.client.input.MouseButtonEvent;
 import net.minecraft.core.BlockPos;
 import net.minecraft.network.chat.Component;
+import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.phys.Vec3;
 import net.wurstclient.WurstClient;
 import net.wurstclient.chestsearch.SlotHighlighter;
@@ -26,6 +27,7 @@
 import net.wurstclient.chestsearch.ChestManager;
 import net.wurstclient.chestsearch.ChestEntry;
 import net.wurstclient.hacks.WaypointsHack;
+import net.wurstclient.hacks.EnchantmentHandlerHack;
 import net.wurstclient.waypoints.Waypoint;
 import net.wurstclient.waypoints.WaypointDimension;
 
@@ -1328,11 +1330,11 @@ else if(scrollOffset > maxScroll)
 			{
 				for(ChestEntry.ItemEntry it : matches)
 				{
+					ItemStack stack =
+						net.wurstclient.chestsearch.ChestSearchItemStacks
+							.decode(it);
 					try
 					{
-						net.minecraft.world.item.ItemStack stack =
-							net.wurstclient.chestsearch.ChestSearchItemStacks
-								.decode(it);
 						if(!stack.isEmpty())
 							context.item(stack, x + 2, lineY - 2);
 					}catch(Throwable ignored)
@@ -1363,6 +1365,32 @@ else if(scrollOffset > maxScroll)
 									: ItemNameUtils.sanitizePath(ench);
 								String baseName = ItemNameUtils
 									.buildEnchantmentName(eid, path);
+								boolean coloredName = false;
+								try
+								{
+									var handler = WurstClient.INSTANCE
+										.getHax().enchantmentHandlerHack;
+									if(handler != null && handler.isEnabled()
+										&& handler
+											.shouldColorEnchantmentsInChestSearch())
+									{
+										String colored = EnchantmentHandlerHack
+											.getColoredEnchantmentDisplay(path,
+												it.enchantmentLevels != null
+													&& ei < it.enchantmentLevels
+														.size()
+															? it.enchantmentLevels
+																.get(ei)
+																.intValue()
+															: 1);
+										if(colored != null)
+										{
+											baseName = colored;
+											coloredName = true;
+										}
+									}
+								}catch(Throwable ignored)
+								{}
 								String levelText = "";
 								try
 								{
@@ -1371,7 +1399,7 @@ else if(scrollOffset > maxScroll)
 									{
 										int lvl = it.enchantmentLevels.get(ei)
 											.intValue();
-										if(lvl > 0)
+										if(lvl > 0 && !coloredName)
 											levelText = " " + Component
 												.translatable(
 													"enchantment.level." + lvl)

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

@@ -18,8 +18,7 @@
 import net.minecraft.world.effect.MobEffectInstance;
 import net.minecraft.world.effect.MobEffects;
 import net.minecraft.world.entity.Entity;
-import net.minecraft.world.entity.TamableAnimal;
-import net.minecraft.world.entity.npc.villager.Villager;
+import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.entity.player.Inventory;
 import net.minecraft.world.food.FoodData;
 import net.minecraft.world.food.FoodProperties;
@@ -76,6 +75,22 @@ public final class AutoEatHack extends Hack implements UpdateListener
 		new CheckboxSetting("Eat while walking",
 			"description.wurst.setting.autoeat.eat_while_walking", false);
 
+	private final CheckboxSetting eatWhileFlying = new CheckboxSetting(
+		"Eat while flying", "Allows AutoEat to continue while flying.", true);
+	
+	private final CheckboxSetting eatWhileLookingAtMobs = new CheckboxSetting(
+		"Eat while looking at mobs",
+		"Allows AutoEat to continue while the crosshair is on a mob.", true);
+	
+	private final CheckboxSetting eatWhileLookingAtPlayers =
+		new CheckboxSetting("Eat while looking at players",
+			"Allows AutoEat to continue while the crosshair is on a player.",
+			false);
+	
+	private final CheckboxSetting eatThroughWalls = new CheckboxSetting(
+		"Eat through walls",
+		"Allows AutoEat to continue while the crosshair is on a wall.", true);
+	
 	private final CheckboxSetting allowHunger =
 		new CheckboxSetting("Allow hunger effect",
 			"description.wurst.setting.autoeat.allow_hunger", true);
@@ -104,6 +119,10 @@ public AutoEatHack()
 		addSetting(allowOffhand);
 
 		addSetting(eatWhileWalking);
+		addSetting(eatWhileFlying);
+		addSetting(eatWhileLookingAtMobs);
+		addSetting(eatWhileLookingAtPlayers);
+		addSetting(eatThroughWalls);
 		addSetting(allowHunger);
 		addSetting(allowPoison);
 		addSetting(allowChorus);
@@ -163,6 +182,39 @@ public void onUpdate()
 		}
 	}
 
+	/**
+	 * Used by combat hacks to yield before they perform an action that would
+	 * interfere with eating. This includes the inventory-transfer tick before
+	 * AutoEat has started using the item.
+	 */
+	public boolean shouldPauseOtherActions()
+	{
+		if(isEating())
+			return true;
+		
+		if(!shouldEat())
+			return false;
+		
+		LocalPlayer player = MC.player;
+		FoodData food = player.getFoodData();
+		int foodLevel = food.getFoodLevel();
+		int target = (int)(targetHunger.getValue() * 2);
+		int min = (int)(minHunger.getValue() * 2);
+		int injured = (int)(injuredHunger.getValue() * 2);
+		
+		int maxPoints = -1;
+		if(isInjured(player) && foodLevel < injured)
+			maxPoints = -1;
+		else if(foodLevel < min)
+			maxPoints = -1;
+		else if(foodLevel < target)
+			maxPoints = target - foodLevel;
+		else
+			return false;
+		
+		return findBestFoodSlot(maxPoints) != -1;
+	}
+	
 	private void eat(int maxPoints)
 	{
 		Inventory inventory = MC.player.getInventory();
@@ -256,12 +308,18 @@ private boolean shouldEat()
 			return false;
 
 		boolean autoFlyActive = WURST.getHax().autoFlyHack.isEnabled();
+		boolean flying = MC.player.getAbilities().flying
+			|| WURST.getHax().flightHack.isEnabled() || autoFlyActive;
+		if(flying && !eatWhileFlying.isChecked())
+			return false;
 
 		if(!eatWhileWalking.isChecked() && !autoFlyActive
 			&& (MC.player.zza != 0 || MC.player.xxa != 0))
 			return false;
 
-		if(!autoFlyActive && isClickable(MC.hitResult))
+		boolean mobCombat = WURST.getHax().multiAuraHack.isFightingMobsOnly();
+		if(!autoFlyActive && isClickable(MC.hitResult)
+			&& !(mobCombat && eatWhileLookingAtMobs.isChecked()))
 			return false;
 
 		return true;
@@ -313,8 +371,10 @@ private boolean isClickable(HitResult hitResult)
 		if(hitResult instanceof EntityHitResult)
 		{
 			Entity entity = ((EntityHitResult)hitResult).getEntity();
-			return entity instanceof Villager
-				|| entity instanceof TamableAnimal;
+			if(entity instanceof Player)
+				return !eatWhileLookingAtPlayers.isChecked();
+			
+			return !eatWhileLookingAtMobs.isChecked();
 		}
 
 		if(hitResult instanceof BlockHitResult)
@@ -324,8 +384,11 @@ private boolean isClickable(HitResult hitResult)
 				return false;
 
 			Block block = MC.level.getBlockState(pos).getBlock();
-			return block instanceof BaseEntityBlock
-				|| block instanceof CraftingTableBlock;
+			if(block instanceof BaseEntityBlock
+				|| block instanceof CraftingTableBlock)
+				return true;
+			
+			return !eatThroughWalls.isChecked();
 		}
 
 		return false;

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

@@ -115,6 +115,10 @@ public final class EnchantmentHandlerHack extends Hack
 		new CheckboxSetting("Show slot numbers", false);
 	private final CheckboxSetting colorEnchantments =
 		new CheckboxSetting("Color enchantments", true);
+	private final CheckboxSetting colorEnchantmentsInChestSearch =
+		new CheckboxSetting("Color enchantments in Chest Search",
+			"Applies EnchantmentHandler's enchantment colors to Chest Search results.",
+			true);
 	private final CheckboxSetting showColorsInTooltips =
 		new CheckboxSetting("Show colors in tool tips",
 			"Applies EnchantmentHandler's enchantment colors to item tooltips.",
@@ -200,6 +204,7 @@ public EnchantmentHandlerHack()
 		addSetting(useItemIcons);
 		addSetting(showSlotNumbers);
 		addSetting(colorEnchantments);
+		addSetting(colorEnchantmentsInChestSearch);
 		addSetting(showColorsInTooltips);
 		addSetting(iconScale);
 		addSetting(includePlayerInventory);
@@ -2026,6 +2031,12 @@ public boolean shouldShowColorsInTooltips()
 		return showColorsInTooltips.isChecked();
 	}
 
+	public boolean shouldColorEnchantmentsInChestSearch()
+	{
+		return colorEnchantments.isChecked()
+			&& colorEnchantmentsInChestSearch.isChecked();
+	}
+	
 	public static Component getColoredEnchantmentName(
 		Holder<Enchantment> holder, int level)
 	{
@@ -2036,13 +2047,25 @@ public static Component getColoredEnchantmentName(
 			.map(registryKey -> registryKey.identifier()).orElse(null);
 		String path = id != null ? id.getPath()
 			: sanitizePath(holder.getRegisteredName());
-		String display = ENCHANT_DISPLAY.get(path);
+		String display = getColoredEnchantmentDisplay(path, level);
 		if(display == null)
 			return Enchantment.getFullname(holder, level);
 
+		return Component.literal(display);
+	}
+	
+	public static String getColoredEnchantmentDisplay(String path, int level)
+	{
+		if(path == null || path.isEmpty())
+			return null;
+		
+		String display = ENCHANT_DISPLAY.get(path);
+		if(display == null)
+			return null;
+		
 		if(level > 1)
 			display += " \u00a7f" + level;
-		return Component.literal(display);
+		return display;
 	}
 
 	public static Component colorizeTooltipLine(ItemStack stack, Component line)

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

@@ -14,6 +14,7 @@
 import java.util.stream.Stream;
 import net.minecraft.world.InteractionHand;
 import net.minecraft.world.entity.Entity;
+import net.minecraft.world.entity.player.Player;
 import net.wurstclient.Category;
 import net.wurstclient.SearchTags;
 import net.wurstclient.events.RenderListener;
@@ -67,6 +68,7 @@ public final class MultiAuraHack extends Hack
 			false);
 
 	private final List<Entity> currentTargets = new ArrayList<>();
+	private final List<Entity> lastTargets = new ArrayList<>();
 
 	public MultiAuraHack()
 	{
@@ -111,13 +113,15 @@ protected void onDisable()
 		EVENTS.remove(UpdateListener.class, this);
 		EVENTS.remove(RenderListener.class, this);
 		currentTargets.clear();
+		lastTargets.clear();
 	}
 
 	@Override
 	public void onUpdate()
 	{
 		currentTargets.clear();
-		if(pauseForAutoEat.isChecked() && WURST.getHax().autoEatHack.isEating())
+		if(pauseForAutoEat.isChecked()
+			&& WURST.getHax().autoEatHack.shouldPauseOtherActions())
 			return;
 
 		speed.updateTimer();
@@ -152,7 +156,12 @@ public void onUpdate()
 		ArrayList<Entity> entities =
 			stream.collect(Collectors.toCollection(ArrayList::new));
 		if(entities.isEmpty())
+		{
+			lastTargets.clear();
 			return;
+		}
+		lastTargets.clear();
+		lastTargets.addAll(entities);
 		currentTargets.addAll(entities);
 
 		if(maceSupportActive)
@@ -191,6 +200,18 @@ public void onUpdate()
 		}
 	}
 
+	/**
+	 * Returns true when MultiAura's last target set consisted only of mobs.
+	 * AutoEat uses this because a wall hit result hides the mob behind it.
+	 */
+	public boolean isFightingMobsOnly()
+	{
+		if(!isEnabled() || lastTargets.isEmpty())
+			return false;
+		
+		return lastTargets.stream().noneMatch(Player.class::isInstance);
+	}
+	
 	@Override
 	public void onRender(PoseStack matrixStack, float partialTicks)
 	{