From 46f85d37abfabef2115f35e1868a0f103f0e79d3 Mon Sep 17 00:00:00 2001
From: EpicKnarvik97 <kristian.knarvik@knett.no>
Date: Sat, 8 Jul 2023 17:49:39 +0200
Subject: [PATCH] Allows specifying the material tag prefix

---
 .../knarcraft/knarlib/util/MaterialHelper.java  | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/main/java/net/knarcraft/knarlib/util/MaterialHelper.java b/src/main/java/net/knarcraft/knarlib/util/MaterialHelper.java
index 3723e62..462bece 100644
--- a/src/main/java/net/knarcraft/knarlib/util/MaterialHelper.java
+++ b/src/main/java/net/knarcraft/knarlib/util/MaterialHelper.java
@@ -29,16 +29,18 @@ public final class MaterialHelper {
      * Loads the materials specified in the given list
      *
      * @param materials <p>The list of material strings to load</p>
+     * @param tagPrefix <p>The prefix differentiating a tag from a material</p>
      * @param logger    <p>The logger to use for logging parsing errors</p>
      */
-    public static @NotNull Set<Material> loadMaterialList(@NotNull List<?> materials, @NotNull Logger logger) {
+    public static @NotNull Set<Material> loadMaterialList(@NotNull List<?> materials, @NotNull String tagPrefix,
+                                                          @NotNull Logger logger) {
         Set<Material> parsedMaterials = new HashSet<>();
         for (Object value : materials) {
             if (!(value instanceof String string)) {
                 continue;
             }
 
-            parsedMaterials.addAll(loadMaterialString(string, logger));
+            parsedMaterials.addAll(loadMaterialString(string, tagPrefix, logger));
         }
         return parsedMaterials;
     }
@@ -47,13 +49,15 @@ public final class MaterialHelper {
      * Parses a string representing a material or a material tag
      *
      * @param materialString <p>The material string to parse</p>
+     * @param tagPrefix      <p>The prefix differentiating a tag from a material</p>
      * @param logger         <p>The logger to use for logging parsing errors</p>
      * @return <p>The materials defined by the material string, or an empty list if none were found</p>
      */
-    public static @NotNull Set<Material> loadMaterialString(@NotNull String materialString, @NotNull Logger logger) {
+    public static @NotNull Set<Material> loadMaterialString(@NotNull String materialString, @NotNull String tagPrefix,
+                                                            @NotNull Logger logger) {
         Set<Material> parsedMaterials = new HashSet<>();
         // Try to parse a material tag first
-        if (parseMaterialTag(parsedMaterials, materialString, logger)) {
+        if (parseMaterialTag(parsedMaterials, materialString, tagPrefix, logger)) {
             return parsedMaterials;
         }
 
@@ -73,12 +77,13 @@ public final class MaterialHelper {
      *
      * @param targetSet    <p>The set all parsed materials should be added to</p>
      * @param materialName <p>The material name that might be a material tag</p>
+     * @param tagPrefix    <p>The prefix differentiating a tag from a material</p>
      * @param logger       <p>The logger to use for logging parsing errors</p>
      * @return <p>True if a tag was found</p>
      */
     private static boolean parseMaterialTag(@NotNull Set<Material> targetSet, @NotNull String materialName,
-                                            @NotNull Logger logger) {
-        Pattern pattern = Pattern.compile("^\\+([a-zA-Z_]+)");
+                                            @NotNull String tagPrefix, @NotNull Logger logger) {
+        Pattern pattern = Pattern.compile("^" + Pattern.quote(tagPrefix) + "([a-zA-Z_]+)");
         Matcher matcher = pattern.matcher(materialName);
         if (matcher.find()) {
             // The material is a material tag