Fix EnchantmentHandler

Author: cev-api

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

@@ -42,10 +42,10 @@ public final class AntiVoidHack extends Hack implements UpdateListener
 		"Treat the Overworld, Nether and End as if they had a solid floor below you.",
 		false);
 
-	private final SliderSetting overworldFalseFloorY = new SliderSetting(
-		"Overworld floor Y",
-		"Block Y for the fake Overworld floor. The walkable surface is one block above this.",
-		-68, -100, -64, 1, ValueDisplay.INTEGER);
+	private final SliderSetting overworldFalseFloorY = new SliderSetting(
+		"Overworld floor Y",
+		"Block Y for the fake Overworld floor. The walkable surface is one block above this.",
+		-68, -100, -64, 1, ValueDisplay.INTEGER);
 
 	private final SliderSetting netherFalseFloorY = new SliderSetting(
 		"Nether floor Y",

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

@@ -33,6 +33,8 @@
 import net.minecraft.world.inventory.AbstractContainerMenu;
 import net.minecraft.world.inventory.ChestMenu;
 import net.minecraft.world.inventory.ContainerInput;
+import net.minecraft.world.inventory.CraftingMenu;
+import net.minecraft.world.inventory.ResultSlot;
 import net.minecraft.world.inventory.Slot;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
@@ -282,6 +284,11 @@ public void renderOnHandledScreen(AbstractContainerScreen<?> screen,
 
 		if(MC.player == null || MC.gameMode == null)
 			return;
+		if(isExcludedScreen(screen))
+		{
+			clearRenderState();
+			return;
+		}
 		if(screen instanceof InventoryScreen
 			&& !showOnInventoryScreen.isChecked())
 			return;
@@ -368,6 +375,10 @@ public boolean handleMouseClick(AbstractContainerScreen<?> screen,
 	{
 		if(!lastRenderActive)
 			return false;
+		if(isExcludedScreen(screen))
+			return false;
+		if(isOverHandledSlot(screen, mouseX, mouseY))
+			return false;
 
 		// Handle scroll bar click/drag
 		if(button == 0 && isInsideScrollBar(mouseX, mouseY))
@@ -457,6 +468,34 @@ else if(hitbox.entry instanceof PotionEntry potion)
 		return isInsidePanel(mouseX, mouseY);
 	}
 
+	private boolean isOverHandledSlot(AbstractContainerScreen<?> screen,
+		double mouseX, double mouseY)
+	{
+		if(screen == null)
+			return false;
+		
+		HandledScreenAccessor accessor = (HandledScreenAccessor)screen;
+		AbstractContainerMenu handler = screen.getMenu();
+		if(handler == null || handler.slots == null)
+			return false;
+		
+		int left = accessor.getX();
+		int top = accessor.getY();
+		for(Slot slot : handler.slots)
+		{
+			if(slot == null)
+				continue;
+			
+			int slotX = left + slot.x;
+			int slotY = top + slot.y;
+			if(mouseX >= slotX && mouseX < slotX + 16 && mouseY >= slotY
+				&& mouseY < slotY + 16)
+				return true;
+		}
+		
+		return false;
+	}
+	
 	public boolean handleMouseRelease(AbstractContainerScreen<?> screen,
 		double mouseX, double mouseY, int button)
 	{
@@ -481,6 +520,8 @@ public boolean handleMouseScroll(AbstractContainerScreen<?> screen,
 	{
 		if(!lastRenderActive)
 			return false;
+		if(isExcludedScreen(screen))
+			return false;
 
 		if(!isInsidePanel(mouseX, mouseY))
 			return false;
@@ -527,6 +568,23 @@ private boolean isInsideScrollBar(double mouseX, double mouseY)
 			&& mouseY <= panelY + panelHeight;
 	}
 
+	private boolean isExcludedScreen(AbstractContainerScreen<?> screen)
+	{
+		return screen != null && screen.getMenu() instanceof CraftingMenu;
+	}
+	
+	private void clearRenderState()
+	{
+		lastRenderActive = false;
+		hitboxes.clear();
+		hoveredSlotId = -1;
+		hoverStartMs = 0L;
+		scrollBarDragging = false;
+		panelDragging = false;
+		if(SlotHighlighter.INSTANCE.isEnchantmentHandlerActive())
+			SlotHighlighter.INSTANCE.clearEnchantmentHandlerActive();
+	}
+	
 	private double getScrollThumbHeight(double trackHeight)
 	{
 		if(contentHeight <= 0 || trackHeight <= 0)
@@ -1106,7 +1164,7 @@ private void refreshEntries(AbstractContainerMenu handler)
 		for(int i = 0; i < containerSlots; i++)
 		{
 			Slot slot = slots.get(i);
-			if(slot == null || !slot.hasItem())
+			if(shouldSkipScannedSlot(slot))
 				continue;
 
 			ItemStack stack = slot.getItem();
@@ -1244,7 +1302,7 @@ private void refreshEntries(AbstractContainerMenu handler)
 		for(int i = containerSlots; i < scanSlots; i++)
 		{
 			Slot slot = slots.get(i);
-			if(slot == null || !slot.hasItem())
+			if(shouldSkipScannedSlot(slot))
 				continue;
 			ItemStack stack = slot.getItem();
 			if(stack.isEmpty())
@@ -1435,6 +1493,14 @@ private void refreshEntries(AbstractContainerMenu handler)
 			}));
 	}
 
+	private boolean shouldSkipScannedSlot(Slot slot)
+	{
+		if(slot == null || !slot.hasItem())
+			return true;
+		
+		return slot instanceof ResultSlot;
+	}
+	
 	private GearEntry buildGearEntry(Slot slot, ItemStack stack,
 		GearCategory category,
 		Set<Object2IntMap.Entry<Holder<Enchantment>>> enchantments)