Now support wildcard usage on item ids for weapons/armor

Author: AzureDoom

src/main/java/com/azuredoom/classescore/data/EquipmentRules.java

@@ -3,6 +3,8 @@
 import java.util.Collections;
 import java.util.Set;
 
+import com.azuredoom.classescore.util.ItemPatternMatcher;
+
 /**
  * Defines rules for allowed weapons and armor for a specific class.
  *
@@ -33,10 +35,7 @@ public EquipmentRules(Set<String> allowedWeapons, Set<String> allowedArmor) {
      * @return true if the weapon is allowed, or if the set of allowed weapons is empty; false otherwise.
      */
     public boolean isWeaponAllowed(String weaponId) {
-        if (allowedWeapons.isEmpty()) {
-            return true;
-        }
-        return allowedWeapons.contains(weaponId);
+        return ItemPatternMatcher.matches(allowedWeapons, weaponId);
     }
 
     /**
@@ -47,9 +46,6 @@ public boolean isWeaponAllowed(String weaponId) {
      * @return true if the armor is allowed, or if the set of allowed armor is empty; false otherwise.
      */
     public boolean isArmorAllowed(String armorId) {
-        if (allowedArmor.isEmpty()) {
-            return true;
-        }
-        return allowedArmor.contains(armorId);
+        return ItemPatternMatcher.matches(allowedArmor, armorId);
     }
 }

src/main/java/com/azuredoom/classescore/gameplay/services/items/PlayerRestrictionCache.java

@@ -21,18 +21,9 @@ public class PlayerRestrictionCache {
      * @param classDef the class definition containing the class ID and equipment restriction rules
      */
     public void setClass(UUID playerId, ClassDefinition classDef) {
-        Set<String> allowedWeapons = classDef.equipmentRules().allowedWeapons();
-        if (allowedWeapons == null) {
-            allowedWeapons = Collections.emptySet();
-        }
-        Set<String> allowedArmor = classDef.equipmentRules().allowedArmor();
-        if (allowedArmor == null) {
-            allowedArmor = Collections.emptySet();
-        }
-
         states.put(
             playerId,
-            new PlayerRestrictionState(classDef.id(), Set.copyOf(allowedWeapons), Set.copyOf(allowedArmor))
+            new PlayerRestrictionState(classDef.id(), classDef.equipmentRules())
         );
     }
 
@@ -61,8 +52,7 @@ public boolean canUseWeapon(UUID playerId, String itemId) {
             return true;
         }
 
-        var allowedWeapons = state.allowedWeapons();
-        return allowedWeapons.isEmpty() || allowedWeapons.contains(itemId);
+        return state.equipmentRules().isWeaponAllowed(itemId);
     }
 
     /**
@@ -80,8 +70,7 @@ public boolean canUseArmor(UUID playerId, String itemId) {
             return true;
         }
 
-        var allowedArmor = state.allowedArmor();
-        return allowedArmor.isEmpty() || allowedArmor.contains(itemId);
+        return state.equipmentRules().isArmorAllowed(itemId);
     }
 
     /**

src/main/java/com/azuredoom/classescore/gameplay/services/items/PlayerRestrictionState.java

@@ -1,17 +1,15 @@
 package com.azuredoom.classescore.gameplay.services.items;
 
-import java.util.Set;
+import com.azuredoom.classescore.data.EquipmentRules;
 
 /**
  * Represents the state of restrictions applied to a player based on their class. This record is used to manage the
  * allowable weapons and armor items that a player can use, according to their designated class.
  *
  * @param classId        The unique identifier of the player's class.
- * @param allowedWeapons A set of item IDs representing the weapons allowed for the player's class.
- * @param allowedArmor   A set of item IDs representing the armor allowed for the player's class.
+ * @param equipmentRules The equipment rules associated with the player's class.
  */
 public record PlayerRestrictionState(
     String classId,
-    Set<String> allowedWeapons,
-    Set<String> allowedArmor
+    EquipmentRules equipmentRules
 ) {}

src/main/java/com/azuredoom/classescore/util/ItemPatternMatcher.java

@@ -0,0 +1,68 @@
+package com.azuredoom.classescore.util;
+
+import java.util.Set;
+import java.util.regex.Pattern;
+
+public final class ItemPatternMatcher {
+
+    private ItemPatternMatcher() {}
+
+    public static boolean matches(Set<String> allowedPatterns, String itemId) {
+        if (allowedPatterns == null || allowedPatterns.isEmpty()) {
+            return true;
+        }
+
+        if (itemId == null || itemId.isBlank()) {
+            return false;
+        }
+
+        for (String pattern : allowedPatterns) {
+            if (matchesPattern(pattern, itemId)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    private static boolean matchesPattern(String pattern, String itemId) {
+        if (pattern == null || pattern.isBlank()) {
+            return false;
+        }
+
+        if (!pattern.contains("*")) {
+            return pattern.equals(itemId);
+        }
+
+        String regex = toRegex(pattern);
+        return Pattern.matches(regex, itemId);
+    }
+
+    private static String toRegex(String glob) {
+        StringBuilder regex = new StringBuilder();
+        regex.append("^");
+
+        for (char c : glob.toCharArray()) {
+            switch (c) {
+                case '*' -> regex.append(".*");
+                case '.' -> regex.append("\\.");
+                case '(' -> regex.append("\\(");
+                case ')' -> regex.append("\\)");
+                case '[' -> regex.append("\\[");
+                case ']' -> regex.append("\\]");
+                case '{' -> regex.append("\\{");
+                case '}' -> regex.append("\\}");
+                case '+' -> regex.append("\\+");
+                case '?' -> regex.append("\\?");
+                case '^' -> regex.append("\\^");
+                case '$' -> regex.append("\\$");
+                case '|' -> regex.append("\\|");
+                case '\\' -> regex.append("\\\\");
+                default -> regex.append(c);
+            }
+        }
+
+        regex.append("$");
+        return regex.toString();
+    }
+}

src/main/resources/classes/blademaster.json

@@ -50,7 +50,7 @@
     }
   ],
   "equipmentRules": {
-    "allowedWeapons": ["Weapon_Sword_Adamantite", "Weapon_Sword_Crude"],
-    "allowedArmor": ["Armor_Adamantite_Chest", "Armor_Adamantite_Legs", "Armor_Adamantite_Head", "Armor_Adamantite_Hands"]
+    "allowedWeapons": ["Weapon_Sword_*"],
+    "allowedArmor": ["Armor_Adamantite_*"]
   }
 }