ChestSearch Update

Author: cev-api

README.md

@@ -108,14 +108,16 @@ I have no other experience in the field of Minecraft and have never used any oth
  - 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
+ - Able to determine and search for weapon/armor, potion and book enchantments
 - Visually search all scanned chests for content based on keywords
 - Create an ESP highlight of the chest that has your desired item or create a waypoint to track the chest down
 - Chests are auto-removed if it has been detected as broken/missing
 - Adjustable Waypoint and ESP timeout
 - Adjustable ESP and Waypoint colors
 - Adjustable search radius
+- Adjustable font size
 
-![ChestSearch](https://i.imgur.com/o5DYBqR.png)
+![ChestSearch](https://i.imgur.com/fBF3YQ0.png) ![Search](https://i.imgur.com/uRvJi9c.png)
 
 ### Breadcrumbs
 - Leaves a line trail behind you (toggle-able/pause-able).  

gradle.properties

@@ -1,7 +1,12 @@
 # Done to increase the memory available to gradle.
-org.gradle.jvmargs=-Xmx2G
+org.gradle.daemon=true
 org.gradle.parallel=true
+org.gradle.caching=true
 org.gradle.configuration-cache=true
+org.gradle.jvmargs=-Xmx8G -Dfile.encoding=UTF-8
+org.gradle.user.home=D:\\GradleCacheLocal
+
+
 
 # Fabric Properties
 # check these at https://fabricmc.net/develop/ and

src/main/java/net/wurstclient/chestsearch/ChestDatabase.java

@@ -199,6 +199,34 @@ public synchronized List<ChestEntry> search(String query)
 				if(!matched && item.nbt != null
 					&& item.nbt.toString().toLowerCase().contains(q))
 					matched = true;
+				// Also match extracted enchantment and potion ids collected
+				// by the recorder so searches like "sharpness" or "speed"
+				// will find chests containing those effects.
+				if(!matched && item.enchantments != null)
+				{
+					for(String en : item.enchantments)
+					{
+						if(en != null && en.toLowerCase().contains(q))
+						{
+							matched = true;
+							break;
+						}
+					}
+				}
+				if(!matched && item.potionEffects != null)
+				{
+					for(String pe : item.potionEffects)
+					{
+						if(pe != null && pe.toLowerCase().contains(q))
+						{
+							matched = true;
+							break;
+						}
+					}
+				}
+				if(!matched && item.primaryPotion != null
+					&& item.primaryPotion.toLowerCase().contains(q))
+					matched = true;
 			}
 			if(matched)
 				res.add(e);

src/main/java/net/wurstclient/chestsearch/ChestEntry.java

@@ -36,6 +36,24 @@ public static class ItemEntry
 		public String displayName;
 		/** Full ItemStack NBT if configured; stored as a JsonObject */
 		public JsonElement nbt;
+		/**
+		 * Optional list of enchantment ids/paths (e.g. "sharpness") extracted
+		 * when recording.
+		 */
+		public java.util.List<String> enchantments;
+		/**
+		 * Optional parallel list of enchantment levels matching the
+		 * enchantments
+		 * list. Same length as enchantments when present.
+		 */
+		public java.util.List<Integer> enchantmentLevels;
+		/**
+		 * Optional list of potion/effect ids/paths (e.g. "speed") extracted
+		 * when recording.
+		 */
+		public java.util.List<String> potionEffects;
+		/** Optional primary potion/effect name for quick categorization. */
+		public String primaryPotion;
 	}
 
 	public ChestEntry()

src/main/java/net/wurstclient/chestsearch/ChestRecorder.java

@@ -14,6 +14,16 @@
 import net.minecraft.screen.ScreenHandlerListener;
 import net.minecraft.util.math.BlockPos;
 import net.wurstclient.clickgui.screens.ChestSearchScreen;
+import net.minecraft.enchantment.Enchantment;
+import net.minecraft.enchantment.EnchantmentHelper;
+import it.unimi.dsi.fastutil.objects.Object2IntMap;
+import net.minecraft.registry.entry.RegistryEntry;
+import java.util.Set;
+import net.minecraft.component.type.PotionContentsComponent;
+import net.minecraft.component.DataComponentTypes;
+import net.minecraft.entity.effect.StatusEffectInstance;
+import net.minecraft.entity.effect.StatusEffect;
+import net.minecraft.util.Identifier;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -23,9 +33,6 @@
 import java.util.Timer;
 import java.util.TimerTask;
 
-/**
- * Captures chest contents whenever a container screen opens.
- */
 public class ChestRecorder
 {
 	private final ChestManager manager;
@@ -347,6 +354,88 @@ private void recordFromStacksInternal(String serverIp, String dimension,
 			{
 				it.nbt = null;
 			}
+			// Extract enchantment ids and potion/effect ids from the actual
+			// ItemStack where possible. This allows searching by enchantment
+			// or potion even if the textual NBT is not easily searchable.
+			try
+			{
+				// Enchantments (including enchanted books)
+				try
+				{
+					Set<Object2IntMap.Entry<RegistryEntry<Enchantment>>> enchSet =
+						EnchantmentHelper.getEnchantments(copy)
+							.getEnchantmentEntries();
+					if(enchSet != null && !enchSet.isEmpty())
+					{
+						it.enchantments = new java.util.ArrayList<>();
+						it.enchantmentLevels = new java.util.ArrayList<>();
+						for(Object2IntMap.Entry<RegistryEntry<Enchantment>> e : enchSet)
+						{
+							RegistryEntry<Enchantment> ren = e.getKey();
+							if(ren == null)
+								continue;
+							Identifier id = ren.getKey().map(k -> k.getValue())
+								.orElse(null);
+							String idStr = id != null ? id.toString()
+								: ren.getIdAsString();
+							int lvl = e.getIntValue();
+							if(idStr != null && !idStr.isBlank())
+							{
+								it.enchantments.add(idStr);
+								it.enchantmentLevels.add(Integer.valueOf(lvl));
+							}
+						}
+					}
+				}catch(Throwable ignored)
+				{}
+				
+				// Potions / effects
+				try
+				{
+					PotionContentsComponent potionContents =
+						copy.getComponents().getOrDefault(
+							DataComponentTypes.POTION_CONTENTS,
+							PotionContentsComponent.DEFAULT);
+					if(potionContents != null)
+					{
+						java.util.List<String> pe = new java.util.ArrayList<>();
+						for(StatusEffectInstance sei : potionContents
+							.getEffects())
+						{
+							RegistryEntry<StatusEffect> effEntry =
+								sei.getEffectType();
+							Identifier id = effEntry.getKey()
+								.map(k -> k.getValue()).orElse(null);
+							String idStr = id != null ? id.toString()
+								: effEntry.getIdAsString();
+							if(idStr != null && !idStr.isBlank())
+								pe.add(idStr);
+						}
+						if(!pe.isEmpty())
+						{
+							it.potionEffects = pe;
+							it.primaryPotion = pe.get(0);
+						}else
+						{
+							// fallback to base potion id
+							java.util.Optional<net.minecraft.registry.entry.RegistryEntry<net.minecraft.potion.Potion>> basePotion =
+								potionContents.potion();
+							if(basePotion.isPresent())
+							{
+								Identifier id = basePotion.get().getKey()
+									.map(k -> k.getValue()).orElse(null);
+								String idStr = id != null ? id.toString()
+									: basePotion.get().getIdAsString();
+								it.primaryPotion = idStr;
+							}
+						}
+					}
+				}catch(Throwable ignored)
+				{}
+			}catch(Throwable ignored)
+			{
+				// ignore extraction errors
+			}
 			items.add(it);
 		}
 
@@ -414,4 +503,13 @@ private void recordFromStacksInternal(String serverIp, String dimension,
 		}
 	}
 
+	private static String sanitizePath(String raw)
+	{
+		if(raw == null || raw.isEmpty())
+			return "";
+		int colon = raw.indexOf(':');
+		return colon >= 0 && colon + 1 < raw.length() ? raw.substring(colon + 1)
+			: raw;
+	}
+	
 }