Added Dump Button To AutoSteal

Author: cev-api

75288be12

@@ -61,6 +61,11 @@ public void store(AbstractContainerScreen<?> screen, int rows)
 		startClickingSlots(screen, rows * 9, rows * 9 + 36, false);
 	}
 
+	public void dump(AbstractContainerScreen<?> screen, int rows)
+	{
+		startDroppingSlots(screen, 0, rows * 9);
+	}
+	
 	private void startClickingSlots(AbstractContainerScreen<?> screen, int from,
 		int to, boolean steal)
 	{
@@ -72,11 +77,21 @@ private void startClickingSlots(AbstractContainerScreen<?> screen, int from,
 			.start(() -> shiftClickSlots(screen, from, to, steal));
 	}
 
+	private void startDroppingSlots(AbstractContainerScreen<?> screen, int from,
+		int to)
+	{
+		if(thread != null && thread.isAlive())
+			thread.interrupt();
+		
+		thread = Thread.ofPlatform().name("AutoSteal")
+			.uncaughtExceptionHandler((t, e) -> e.printStackTrace()).daemon()
+			.start(() -> dropSlots(screen, from, to));
+	}
+	
 	private void shiftClickSlots(AbstractContainerScreen<?> screen, int from,
 		int to, boolean steal)
 	{
-		List<Slot> slots = IntStream.range(from, to)
-			.mapToObj(i -> screen.getMenu().slots.get(i)).toList();
+		List<Slot> slots = collectSlots(screen, from, to);
 
 		if(reverseSteal.isChecked() && steal)
 			slots = slots.reversed();
@@ -162,6 +177,40 @@ private void shiftClickSlots(AbstractContainerScreen<?> screen, int from,
 			}
 	}
 
+	private void dropSlots(AbstractContainerScreen<?> screen, int from, int to)
+	{
+		List<Slot> slots = collectSlots(screen, from, to);
+		
+		for(Slot slot : slots)
+			try
+			{
+				if(slot.getItem().isEmpty())
+					continue;
+				
+				Thread.sleep(delay.getValueI());
+				
+				if(MC.screen == null)
+					break;
+				
+				screen.slotClicked(slot, slot.index, 1, ClickType.THROW);
+				
+			}catch(InterruptedException e)
+			{
+				Thread.currentThread().interrupt();
+				break;
+			}
+	}
+	
+	private List<Slot> collectSlots(AbstractContainerScreen<?> screen, int from,
+		int to)
+	{
+		int totalSlots = screen.getMenu().slots.size();
+		int safeFrom = Math.max(0, Math.min(from, totalSlots));
+		int safeTo = Math.max(safeFrom, Math.min(to, totalSlots));
+		return IntStream.range(safeFrom, safeTo)
+			.mapToObj(i -> screen.getMenu().slots.get(i)).toList();
+	}
+	
 	private java.util.Set<Item> getInventoryItemTypes()
 	{
 		java.util.Set<Item> types = new java.util.HashSet<>();

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

@@ -105,17 +105,34 @@ public void init()
 		if(!WurstClient.INSTANCE.isEnabled())
 			return;
 		final ChestSearchHack chestSearchHack = wurst$getChestSearchHack();
+		boolean autoButtonsPlaced = false;
+		final int autoButtonHeight = 12;
+		final int autoButtonY = topPos - autoButtonHeight - 4;
 		if(autoSteal.areButtonsVisible())
 		{
+			autoButtonsPlaced = true;
+			final int buttonWidth = 44;
+			final int buttonSpacing = 3;
+			final int rightMargin = 6;
+			int dumpX = leftPos + imageWidth - rightMargin - buttonWidth;
+			int storeX = dumpX - buttonSpacing - buttonWidth;
+			int stealX = storeX - buttonSpacing - buttonWidth;
+			
 			addRenderableWidget(Button
 				.builder(Component.literal("Steal"),
 					b -> autoSteal.steal(this, containerRows))
-				.bounds(leftPos + imageWidth - 108, topPos + 4, 50, 12)
+				.bounds(stealX, autoButtonY, buttonWidth, autoButtonHeight)
 				.build());
 			addRenderableWidget(Button
 				.builder(Component.literal("Store"),
 					b -> autoSteal.store(this, containerRows))
-				.bounds(leftPos + imageWidth - 56, topPos + 4, 50, 12).build());
+				.bounds(storeX, autoButtonY, buttonWidth, autoButtonHeight)
+				.build());
+			addRenderableWidget(Button
+				.builder(Component.literal("Dump"),
+					b -> autoSteal.dump(this, containerRows))
+				.bounds(dumpX, autoButtonY, buttonWidth, autoButtonHeight)
+				.build());
 		}
 		if(autoSteal.isEnabled())
 			autoSteal.steal(this, containerRows);
@@ -129,10 +146,13 @@ public void init()
 			// visually outside the chest/inventory GUI. Use the same
 			// positioning/size as the inventory screen button so it
 			// appears outside the form consistently.
+			int quickButtonY =
+				autoButtonsPlaced ? autoButtonY - 20 : topPos - 20;
 			Button quickButton = Button
 				.builder(Component.literal("QuickShulker"),
 					b -> quickShulker.triggerFromGui())
-				.bounds(leftPos + imageWidth - 90, topPos - 20, 80, 16).build();
+				.bounds(leftPos + imageWidth - 90, quickButtonY, 80, 16)
+				.build();
 			quickButton.active = !quickShulker.isBusy();
 			addRenderableWidget(quickButton);
 		}

src/main/java/net/wurstclient/mixin/GenericContainerScreenMixin.java

@@ -44,18 +44,36 @@ public void init()
 		if(!WurstClient.INSTANCE.isEnabled())
 			return;
 
+		boolean autoButtonsPlaced = false;
+		final int autoButtonHeight = 12;
+		final int autoButtonY = topPos - autoButtonHeight - 4;
 		if(autoSteal.areButtonsVisible())
 		{
+			autoButtonsPlaced = true;
+			final int buttonWidth = 44;
+			final int buttonSpacing = 3;
+			final int rightMargin = 6;
+			int dumpX = leftPos + imageWidth - rightMargin - buttonWidth;
+			int storeX = dumpX - buttonSpacing - buttonWidth;
+			int stealX = storeX - buttonSpacing - buttonWidth;
+			
 			addRenderableWidget(Button
 				.builder(Component.literal("Steal"),
 					b -> autoSteal.steal(this, 3))
-				.bounds(leftPos + imageWidth - 108, topPos + 4, 50, 12)
+				.bounds(stealX, autoButtonY, buttonWidth, autoButtonHeight)
 				.build());
 
 			addRenderableWidget(Button
 				.builder(Component.literal("Store"),
 					b -> autoSteal.store(this, 3))
-				.bounds(leftPos + imageWidth - 56, topPos + 4, 50, 12).build());
+				.bounds(storeX, autoButtonY, buttonWidth, autoButtonHeight)
+				.build());
+			
+			addRenderableWidget(Button
+				.builder(Component.literal("Dump"),
+					b -> autoSteal.dump(this, 3))
+				.bounds(dumpX, autoButtonY, buttonWidth, autoButtonHeight)
+				.build());
 		}
 
 		if(autoSteal.isEnabled())
@@ -67,10 +85,13 @@ public void init()
 			// place the QuickShulker button outside the shulker UI so it
 			// doesn't overlap the container background, matching the
 			// inventory screen placement
+			int quickButtonY =
+				autoButtonsPlaced ? autoButtonY - 20 : topPos - 20;
 			Button quickButton = Button
 				.builder(Component.literal("QuickShulker"),
 					b -> quickShulker.triggerFromGui())
-				.bounds(leftPos + imageWidth - 90, topPos - 20, 80, 16).build();
+				.bounds(leftPos + imageWidth - 90, quickButtonY, 80, 16)
+				.build();
 			quickButton.active = !quickShulker.isBusy();
 			addRenderableWidget(quickButton);
 		}