oredict wildcards

Author: brachy84

src/main/java/com/cleanroommc/groovyscript/brackets/BracketHandlerManager.java

@@ -3,6 +3,7 @@
 import com.cleanroommc.groovyscript.api.GroovyLog;
 import com.cleanroommc.groovyscript.api.IBracketHandler;
 import com.cleanroommc.groovyscript.helper.ingredient.OreDictIngredient;
+import com.cleanroommc.groovyscript.helper.ingredient.OreDictWildcardIngredient;
 import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
 import net.minecraft.block.Block;
 import net.minecraft.creativetab.CreativeTabs;
@@ -54,7 +55,7 @@ public static BracketHandler<?> getBracketHandler(String key) {
     }
 
     public static void init() {
-        registerBracketHandler("ore", OreDictIngredient::new);
+        registerBracketHandler("ore", s -> s.contains("*") ? OreDictWildcardIngredient.of(s) : new OreDictIngredient(s));
         registerBracketHandler("item", ItemBracketHandler.INSTANCE, () -> ItemStack.EMPTY);
         registerBracketHandler("liquid", BracketHandlerManager::parseFluidStack);
         registerBracketHandler("fluid", BracketHandlerManager::parseFluidStack);

src/main/java/com/cleanroommc/groovyscript/helper/ingredient/ItemsIngredient.java

@@ -7,6 +7,7 @@
 
 import java.util.Collection;
 import java.util.Collections;
+import java.util.List;
 
 public class ItemsIngredient extends IngredientBase {
 
@@ -34,7 +35,7 @@ public IIngredient exactCopy() {
 
     @Override
     public Ingredient toMcIngredient() {
-        return Ingredient.fromStacks(itemStacks.toArray(new ItemStack[0]));
+        return Ingredient.fromStacks(getMatchingStacks());
     }
 
     @Override
@@ -67,4 +68,8 @@ public boolean matches(ItemStack itemStack) {
         }
         return false;
     }
+
+    public List<ItemStack> getItemStacks() {
+        return Collections.unmodifiableList(this.itemStacks);
+    }
 }

src/main/java/com/cleanroommc/groovyscript/helper/ingredient/OreDictWildcardIngredient.java

@@ -0,0 +1,51 @@
+package com.cleanroommc.groovyscript.helper.ingredient;
+
+import com.cleanroommc.groovyscript.api.IIngredient;
+import com.cleanroommc.groovyscript.core.mixin.OreDictionaryAccessor;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.oredict.OreDictionary;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.regex.Pattern;
+
+public class OreDictWildcardIngredient extends ItemsIngredient {
+
+    private final String oreDict;
+    private final List<String> matchingOreDictionaries = new ArrayList<>();
+
+    public static OreDictWildcardIngredient of(String oreDict) {
+        List<String> matchingOreDictionaries = new ArrayList<>();
+        List<ItemStack> stacks = new ArrayList<>();
+        Pattern pattern = Pattern.compile(oreDict.replace("*", ".*"));
+
+        for (String ore : OreDictionaryAccessor.getIdToName()) {
+            if (pattern.matcher(ore).matches()) {
+                matchingOreDictionaries.add(ore);
+                for (ItemStack stack : OreDictionary.getOres(ore)) {
+                    stacks.add(stack.copy());
+                }
+            }
+        }
+        return new OreDictWildcardIngredient(oreDict, matchingOreDictionaries, stacks);
+    }
+
+    public OreDictWildcardIngredient(String oreDict, List<String> matchingOreDictionaries, List<ItemStack> itemStacks) {
+        super(itemStacks);
+        this.oreDict = oreDict;
+        this.matchingOreDictionaries.addAll(matchingOreDictionaries);
+    }
+
+    public String getOreDict() {
+        return oreDict;
+    }
+
+    public List<String> getMatchingOreDictionaries() {
+        return matchingOreDictionaries;
+    }
+
+    @Override
+    public IIngredient exactCopy() {
+        return new OreDictWildcardIngredient(this.oreDict, this.matchingOreDictionaries, getItemStacks());
+    }
+}