rapy fix

Author: LordTricker

gradle.properties

@@ -8,7 +8,7 @@ yarn_mappings=1.21.4+build.8
 loader_version=0.16.10
 
 # Mod Properties
-mod_version=1.5.4-Alpha+1.21.4
+mod_version=1.5.5-Alpha+1.21.4
 maven_group=pl.lordtricker
 archives_base_name=ltrynek
 

src/client/java/pl/lordtricker/ltrynek/client/config/ConfigLoader.java

@@ -40,7 +40,6 @@ public static ServersConfig loadConfig() {
                 if (config == null) {
                     config = createDefaultConfig();
                 }
-                // Ensure default for new fields
                 if (config.adsEnabled == null) {
                     config.adsEnabled = true;
                     // Persist the new default into the main config file
@@ -182,9 +181,9 @@ private static ServersConfig createDefaultConfig() {
         cfg.servers.add(server2);
 
         ServerEntry server3 = new ServerEntry();
-        server3.domains = List.of("rapy.pl");
+        server3.domains = List.of("rapy.pl", "rapy.gg", "rapysmp.pl", "jjsmp.pl");
         server3.profileName = "rapy";
-        server3.loreRegex = "(?i).*Cena.*?\\$?([\\d.,]+(?:mld|m|k)?).*";
+        server3.loreRegex = "(?i).*Cena\\s*:?\\s*(?:\\$\\s*)?((?:\\d{1,3}(?:[\\s\\u00A0.,]\\d{3})*|\\d+)(?:mld|m|k)?)(?:\\s*\\$)?.*";
         server3.highlightColor = "#00FF33";
         server3.highlightColorStack = "#FFAB00";
         server3.miniAlarmSound = "minecraft:ui.button.click";
@@ -231,4 +230,4 @@ private static ServersConfig createDefaultConfig() {
 
         return cfg;
     }
-}
+}

src/client/java/pl/lordtricker/ltrynek/client/manager/ClientPriceListManager.java

@@ -101,20 +101,39 @@ public static void removePriceEntry(String rawItem) {
     public static PriceEntry findMatchingPriceEntry(String noColorName, List<String> loreLines, String materialId, String enchantments) {
         List<PriceEntry> entries = priceLists.get(activeProfile);
         if (entries == null) return null;
+
+        PriceEntry best = null;
+        int bestScore = -1;
+
+        String lowerName = noColorName.toLowerCase();
+        String lowerMaterialId = materialId.toLowerCase();
+        String lowerEnchantments = enchantments == null ? "" : enchantments.toLowerCase();
+
         for (PriceEntry pe : entries) {
+            int score = 0;
+
+            // Material check (strict equality if provided)
             if (pe.material != null && !pe.material.isEmpty()) {
                 if (!materialId.equalsIgnoreCase(pe.material)) {
                     continue;
                 }
+                score += 1000; // prefer rules with explicit material
             }
+
+            // Name check (contains; prefer longer/ exact matches)
             if (!pe.name.isEmpty()) {
-                String lowerName = noColorName.toLowerCase();
-                String lowerMaterial = materialId.toLowerCase();
                 String lowerEntryName = pe.name.toLowerCase();
-                if (!lowerName.contains(lowerEntryName) && !lowerMaterial.contains(lowerEntryName)) {
+                boolean nameMatches = lowerName.contains(lowerEntryName) || lowerMaterialId.contains(lowerEntryName);
+                if (!nameMatches) {
                     continue;
                 }
+                score += Math.min(500, lowerEntryName.length());
+                if (lowerName.equals(lowerEntryName)) {
+                    score += 200; // exact name match bonus
+                }
             }
+
+            // Lore substring check
             if (pe.lore != null && !pe.lore.isEmpty()) {
                 boolean foundLore = false;
                 for (String line : loreLines) {
@@ -126,16 +145,23 @@ public static PriceEntry findMatchingPriceEntry(String noColorName, List<String>
                 if (!foundLore) {
                     continue;
                 }
+                score += 50;
             }
+
+            // Enchant check
             if (pe.enchants != null && !pe.enchants.isEmpty()) {
-                if (enchantments == null || enchantments.isEmpty() ||
-                        !enchantments.toLowerCase().contains(pe.enchants.toLowerCase())) {
+                if (lowerEnchantments.isEmpty() || !lowerEnchantments.contains(pe.enchants.toLowerCase())) {
                     continue;
                 }
+                score += 25;
+            }
+
+            if (score > bestScore) {
+                bestScore = score;
+                best = pe;
             }
-            return pe;
         }
-        return null;
+        return best;
     }
 
 

src/client/java/pl/lordtricker/ltrynek/client/mixin/HandledScreenMixin.java

@@ -167,7 +167,7 @@ private boolean processSlot(DrawContext context, Slot slot) {
 
 		int stackSize = stack.getCount();
 		boolean isStack = stackSize > 1;
-		double finalPrice = isStack ? (foundPrice / stackSize) : foundPrice;
+		double finalPrice = foundPrice;
 
 		if (ClientSearchListManager.isSearchActive()) {
 			String uniqueKey = slot.id + "|" + noColorName + "|" + finalPrice + "|" + stackSize;
@@ -252,7 +252,7 @@ public void run() {
 	}
 
 	private double parsePriceWithSuffix(String raw) {
-		raw = raw.trim().replace(" ", "");
+		raw = raw.trim().replaceAll("[\\s\\u00A0\\u202F]+", "");
 		String lower = raw.toLowerCase();
 		double multiplier = 1.0;
 		if (lower.endsWith("mld")) {
@@ -265,16 +265,33 @@ private double parsePriceWithSuffix(String raw) {
 			multiplier = 1000.0;
 			raw = raw.substring(0, raw.length() - 1);
 		}
-		if (!raw.contains(".")) {
-			int i = raw.indexOf(',', raw.length() - 3);
-			if (i != -1) raw = raw.substring(0, i) + "." + raw.substring(i + 1);
+		int lastDot = raw.lastIndexOf('.');
+		int lastComma = raw.lastIndexOf(',');
+		int lastSep = Math.max(lastDot, lastComma);
+		if (lastSep != -1) {
+			int digitsAfter = raw.length() - lastSep - 1;
+			if (digitsAfter > 0 && digitsAfter <= 2) {
+				String intPart = raw.substring(0, lastSep).replaceAll("[.,]", "");
+				String fracPart = raw.substring(lastSep + 1).replaceAll("[.,]", "");
+				raw = intPart + "." + fracPart;
+			} else {
+				raw = raw.replaceAll("[.,]", "");
+			}
+		} else {
+			raw = raw.replaceAll("[.,]", "");
 		}
-		raw = raw.replace(",", "");
 		try {
 			double base = Double.parseDouble(raw);
 			return base * multiplier;
 		} catch (NumberFormatException e) {
-			return -1;
+			String digitsOnly = raw.replaceAll("\\D+", "");
+			if (digitsOnly.isEmpty()) return -1;
+			try {
+				double base = Double.parseDouble(digitsOnly);
+				return base * multiplier;
+			} catch (NumberFormatException ex) {
+				return -1;
+			}
 		}
 	}