Updated ChestSearch

Author: cev-api

README.md

@@ -191,7 +191,7 @@ I did not, nor could I copy their code directly as most are Meteor based mods. S
 ![WayPoints](https://i.imgur.com/dxFc17N.png) ![Waypoint Manager](https://i.imgur.com/K2xGVqc.png) ![Waypoint Editor](https://i.imgur.com/23i14s1.png)
 
 ### Chest Search
-- Automatically or manually scan each chest you open and store its contents in a JSON file per server (You can also disable entirely)
+- Automatically or manually scan each chest and shulker you open and store its contents in a JSON file per server (You can also disable entirely)
  - Able to detect chest changes that you make, so adding or removing items instantly updates the JSON
  - Unable to detect chest changes that other players make
  - Able to delete entries

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

@@ -12,11 +12,21 @@
 import net.minecraft.client.gui.components.Button;
 import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
 import net.minecraft.client.gui.screens.inventory.ShulkerBoxScreen;
+import net.minecraft.core.BlockPos;
 import net.minecraft.network.chat.Component;
 import net.minecraft.world.entity.player.Inventory;
 import net.minecraft.world.inventory.ShulkerBoxMenu;
+import net.minecraft.world.level.block.ShulkerBoxBlock;
+import net.minecraft.world.level.block.entity.BlockEntity;
+import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.phys.BlockHitResult;
+import net.minecraft.world.phys.HitResult;
 import net.wurstclient.WurstClient;
+import net.wurstclient.chestsearch.ChestConfig;
+import net.wurstclient.chestsearch.ChestRecorder;
+import net.wurstclient.clickgui.screens.ChestSearchScreen;
 import net.wurstclient.hacks.AutoStealHack;
+import net.wurstclient.hacks.ChestSearchHack;
 import net.wurstclient.hacks.QuickShulkerHack;
 
 @Mixin(ShulkerBoxScreen.class)
@@ -29,6 +39,18 @@ public abstract class ShulkerBoxScreenMixin
 	@Unique
 	private final QuickShulkerHack quickShulker =
 		WurstClient.INSTANCE.getHax().quickShulkerHack;
+	@Unique
+	private ChestRecorder chestRecorder;
+	@Unique
+	private BlockPos shulkerPos;
+	@Unique
+	private BlockPos shulkerClickedPos;
+	@Unique
+	private String shulkerServerIp;
+	@Unique
+	private String shulkerDimension;
+	@Unique
+	private boolean shulkerSnapshotFinalized = false;
 
 	private ShulkerBoxScreenMixin(WurstClient wurst, ShulkerBoxMenu handler,
 		Inventory inventory, Component title)
@@ -95,5 +117,190 @@ public void init()
 			quickButton.active = !quickShulker.isBusy();
 			addRenderableWidget(quickButton);
 		}
+		
+		try
+		{
+			ChestSearchHack chestSearchHack =
+				WurstClient.INSTANCE.getHax().chestSearchHack;
+			if(chestSearchHack != null && chestSearchHack.isOffMode())
+				return;
+			
+			ChestConfig cfg = new ChestConfig();
+			if(!cfg.enabled)
+				return;
+			
+			this.chestRecorder =
+				new ChestRecorder(new java.io.File(cfg.dbPath), cfg);
+			
+			String serverIp = null;
+			try
+			{
+				if(WurstClient.MC != null
+					&& WurstClient.MC.getCurrentServer() != null)
+					serverIp = WurstClient.MC.getCurrentServer().ip;
+			}catch(Throwable ignored)
+			{}
+			String dimension = null;
+			try
+			{
+				if(WurstClient.MC != null && WurstClient.MC.level != null)
+					dimension = WurstClient.MC.level.dimension().identifier()
+						.toString();
+			}catch(Throwable ignored)
+			{}
+			shulkerServerIp = serverIp;
+			shulkerDimension = dimension;
+			
+			shulkerPos = wurst$resolveShulkerPos();
+			if(shulkerPos == null)
+				return;
+			
+			try
+			{
+				if(shulkerClickedPos != null)
+				{
+					boolean cleared = ChestSearchScreen
+						.clearDecorations(dimension, shulkerClickedPos);
+					if(!cleared)
+						ChestSearchScreen.clearDecorations(dimension,
+							shulkerPos);
+				}else
+				{
+					ChestSearchScreen.clearDecorations(dimension, shulkerPos);
+				}
+			}catch(Throwable ignored)
+			{}
+			
+			ChestRecorder.Bounds bounds =
+				ChestRecorder.Bounds.of(shulkerPos, shulkerPos, null);
+			chestRecorder.onChestOpened(serverIp, dimension, shulkerPos.getX(),
+				shulkerPos.getY(), shulkerPos.getZ(), this.menu, 27,
+				java.util.Collections.emptyList(), bounds);
+		}catch(Throwable ignored)
+		{}
+	}
+	
+	@Override
+	public void removed()
+	{
+		wurst$finalizeShulkerSnapshot();
+		super.removed();
+	}
+	
+	@Unique
+	private void wurst$finalizeShulkerSnapshot()
+	{
+		if(shulkerSnapshotFinalized)
+			return;
+		shulkerSnapshotFinalized = true;
+		if(chestRecorder == null || shulkerPos == null || this.menu == null)
+			return;
+		
+		try
+		{
+			int total = this.menu.slots.size();
+			int window = Math.min(27, total);
+			java.util.List<Integer> slotOrder =
+				new java.util.ArrayList<>(window);
+			java.util.List<net.minecraft.world.item.ItemStack> region =
+				new java.util.ArrayList<>(window);
+			boolean any = false;
+			for(int i = 0; i < window; i++)
+			{
+				slotOrder.add(i);
+				var st = this.menu.slots.get(i).getItem();
+				region.add(st);
+				if(st != null && !st.isEmpty())
+					any = true;
+			}
+			if(any && !region.isEmpty())
+			{
+				ChestRecorder.Bounds bounds =
+					ChestRecorder.Bounds.of(shulkerPos, shulkerPos, null);
+				chestRecorder.recordFromStacksWithSlotOrder(shulkerServerIp,
+					shulkerDimension, shulkerPos.getX(), shulkerPos.getY(),
+					shulkerPos.getZ(), region, slotOrder, bounds);
+			}
+		}catch(Throwable ignored)
+		{}
+	}
+	
+	@Unique
+	private BlockPos wurst$resolveShulkerPos()
+	{
+		BlockPos resolvedPos = null;
+		try
+		{
+			java.lang.reflect.Method gb =
+				this.menu.getClass().getMethod("getBlockEntity");
+			Object be = gb.invoke(this.menu);
+			if(be instanceof BlockEntity)
+				resolvedPos = ((BlockEntity)be).getBlockPos();
+		}catch(Throwable ignored)
+		{}
+		
+		if(resolvedPos == null)
+		{
+			try
+			{
+				Object ctxObj = null;
+				try
+				{
+					java.lang.reflect.Method m =
+						this.menu.getClass().getMethod("getContext");
+					ctxObj = m.invoke(this.menu);
+				}catch(Throwable ignored)
+				{}
+				if(ctxObj instanceof net.minecraft.world.inventory.ContainerLevelAccess ctx)
+				{
+					BlockPos[] holder = new BlockPos[1];
+					ctx.execute((world, pos) -> holder[0] = pos);
+					resolvedPos = holder[0];
+				}
+			}catch(Throwable ignored)
+			{}
+		}
+		
+		if(resolvedPos == null)
+		{
+			try
+			{
+				HitResult hr = WurstClient.MC.hitResult;
+				if(hr instanceof BlockHitResult bhr)
+				{
+					shulkerClickedPos = bhr.getBlockPos();
+					resolvedPos = shulkerClickedPos;
+				}
+			}catch(Throwable ignored)
+			{}
+		}
+		
+		if(resolvedPos == null)
+			return null;
+		
+		BlockPos normalized = wurst$normalizeShulkerPos(resolvedPos);
+		if(shulkerClickedPos == null && resolvedPos != null)
+			shulkerClickedPos = resolvedPos;
+		return normalized;
+	}
+	
+	@Unique
+	private BlockPos wurst$normalizeShulkerPos(BlockPos pos)
+	{
+		if(pos == null || WurstClient.MC == null
+			|| WurstClient.MC.level == null)
+			return pos;
+		
+		BlockPos current = pos;
+		BlockState state = WurstClient.MC.level.getBlockState(current);
+		if(!(state.getBlock() instanceof ShulkerBoxBlock))
+		{
+			BlockPos below = current.below();
+			BlockState belowState = WurstClient.MC.level.getBlockState(below);
+			if(belowState.getBlock() instanceof ShulkerBoxBlock)
+				current = below;
+		}
+		
+		return current;
 	}
 }