added 1.21.5 version

Author: LordTricker

gradle.properties

@@ -3,14 +3,14 @@ org.gradle.jvmargs=-Xmx1G
 org.gradle.parallel=true
 
 # Fabric Properties
-minecraft_version=1.21.1
-yarn_mappings=1.21.1+build.3
-loader_version=0.16.7
+minecraft_version=1.21.4
+yarn_mappings=1.21.4+build.8
+loader_version=0.16.10
 
 # Mod Properties
-mod_version=1.6.0-Alpha+1.21.1
+mod_version=1.6.0-Alpha+1.21.4
 maven_group=pl.lordtricker
 archives_base_name=ltrynek
 
 # Dependencies
-fabric_version=0.115.0+1.21.1
+fabric_version=0.118.0+1.21.4

src/main/java/pl/lordtricker/ltrynek/core/manager/ClientPriceListManager.java

@@ -1,8 +1,4 @@
-<<<<<<<< HEAD:src/main/java/pl/lordtricker/ltrynek/core/manager/ClientPriceListManager.java
 package pl.lordtricker.ltrynek.core.manager;
-========
-package pl.lordtricker.ltrynek.client.manager;
->>>>>>>> 86d6843 (Big update to version 1.4.0):src/client/java/pl/lordtricker/ltrynek/client/manager/ClientPriceListManager.java
 
 import pl.lordtricker.ltrynek.core.config.PriceEntry;
 import pl.lordtricker.ltrynek.core.util.CompositeKeyUtil;
@@ -14,13 +10,6 @@
 
 public class ClientPriceListManager {
 
-<<<<<<<< HEAD:src/main/java/pl/lordtricker/ltrynek/core/manager/ClientPriceListManager.java
-========
-    /**
-     * Struktura: profile -> lista wpisów typu PriceEntry.
-     * Każdy wpis zawiera: name, lore, material, enchants, maxPrice.
-     */
->>>>>>>> 86d6843 (Big update to version 1.4.0):src/client/java/pl/lordtricker/ltrynek/client/manager/ClientPriceListManager.java
     private static final Map<String, List<PriceEntry>> priceLists = new HashMap<>();
 
     private static final Map<String, Map<String, String>> customLookup = new HashMap<>();
@@ -44,12 +33,6 @@ public static String listProfiles() {
         return String.join(", ", priceLists.keySet());
     }
 
-<<<<<<<< HEAD:src/main/java/pl/lordtricker/ltrynek/core/manager/ClientPriceListManager.java
-========
-    /**
-     * Dodaje lub ustawia wpis (name, lore, material, enchants, maxPrice) w aktywnym profilu.
-     */
->>>>>>>> 86d6843 (Big update to version 1.4.0):src/client/java/pl/lordtricker/ltrynek/client/manager/ClientPriceListManager.java
     public static void addPriceEntry(PriceEntry entry) {
         String compositeKey = CompositeKeyUtil.getCompositeKeyFromEntry(entry);
 
@@ -92,7 +75,6 @@ public static void removePriceEntry(String rawItem) {
         }
     }
 
-<<<<<<<< HEAD:src/main/java/pl/lordtricker/ltrynek/core/manager/ClientPriceListManager.java
     public static PriceEntry findMatchingPriceEntry(String noColorName, List<String> loreLines, String materialId, String enchantments) {
         List<PriceEntry> entries = priceLists.get(activeProfile);
         if (entries == null) return null;
@@ -104,15 +86,6 @@ public static PriceEntry findMatchingPriceEntry(String noColorName, List<String>
         String lowerMaterialId = materialId.toLowerCase();
         String lowerEnchantments = enchantments == null ? "" : enchantments.toLowerCase();
 
-========
-    /**
-     * Wyszukuje wpis PriceEntry, który pasuje do przekazanych parametrów (name, lore, material).
-     * Jeśli chcesz uwzględnić enchanty, zmodyfikuj logikę porównania.
-     */
-    public static PriceEntry findMatchingPriceEntry(String noColorName, List<String> loreLines, String materialId, String enchantments) {
-        List<PriceEntry> entries = priceLists.get(activeProfile);
-        if (entries == null) return null;
->>>>>>>> 86d6843 (Big update to version 1.4.0):src/client/java/pl/lordtricker/ltrynek/client/manager/ClientPriceListManager.java
         for (PriceEntry pe : entries) {
             int score = 0;
 
@@ -124,16 +97,9 @@ public static PriceEntry findMatchingPriceEntry(String noColorName, List<String>
             }
 
             if (!pe.name.isEmpty()) {
-<<<<<<<< HEAD:src/main/java/pl/lordtricker/ltrynek/core/manager/ClientPriceListManager.java
                 String lowerEntryName = pe.name.toLowerCase();
                 boolean nameMatches = lowerName.contains(lowerEntryName) || lowerMaterialId.contains(lowerEntryName);
                 if (!nameMatches) {
-========
-                String lowerName = noColorName.toLowerCase();
-                String lowerMaterial = materialId.toLowerCase();
-                String lowerEntryName = pe.name.toLowerCase();
-                if (!lowerName.contains(lowerEntryName) && !lowerMaterial.contains(lowerEntryName)) {
->>>>>>>> 86d6843 (Big update to version 1.4.0):src/client/java/pl/lordtricker/ltrynek/client/manager/ClientPriceListManager.java
                     continue;
                 }
                 score += Math.min(500, lowerEntryName.length());
@@ -167,28 +133,10 @@ public static PriceEntry findMatchingPriceEntry(String noColorName, List<String>
                 bestScore = score;
                 best = pe;
             }
-<<<<<<<< HEAD:src/main/java/pl/lordtricker/ltrynek/core/manager/ClientPriceListManager.java
-========
-            if (pe.enchants != null && !pe.enchants.isEmpty()) {
-                if (enchantments == null || enchantments.isEmpty() ||
-                        !enchantments.toLowerCase().contains(pe.enchants.toLowerCase())) {
-                    continue;
-                }
-            }
-            return pe;
->>>>>>>> 86d6843 (Big update to version 1.4.0):src/client/java/pl/lordtricker/ltrynek/client/manager/ClientPriceListManager.java
         }
         return best;
     }
 
-<<<<<<<< HEAD:src/main/java/pl/lordtricker/ltrynek/core/manager/ClientPriceListManager.java
-========
-
-
-    /**
-     * Daje dostęp do wszystkich profili (przydatne np. do zapisywania w configu).
-     */
->>>>>>>> 86d6843 (Big update to version 1.4.0):src/client/java/pl/lordtricker/ltrynek/client/manager/ClientPriceListManager.java
     public static Map<String, List<PriceEntry>> getAllProfiles() {
         return priceLists;
     }
@@ -198,4 +146,4 @@ public static void clearAllProfiles() {
         customLookup.clear();
         activeProfile = "default";
     }
-}
+}

src/main/resources/fabric.mod.json

@@ -28,10 +28,10 @@
 	],
 
 	"depends": {
-		"fabricloader": ">=0.15.11",
-		"minecraft": ">=1.21 <=1.21.1",
-		"java": ">=21",
-		"fabric-api": "*"
+        "fabricloader": ">=0.15.11",
+        "minecraft": ">=1.21.3 <=1.21.5",
+        "java": ">=21",
+        "fabric-api": "*"
 	},
 	"suggests": {
 		"another-mod": "*"