diff --git a/MineTweaker3-API/src/main/java/minetweaker/api/oredict/IOreDictEntry.java b/MineTweaker3-API/src/main/java/minetweaker/api/oredict/IOreDictEntry.java index 136f3ff..3a34a68 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/api/oredict/IOreDictEntry.java +++ b/MineTweaker3-API/src/main/java/minetweaker/api/oredict/IOreDictEntry.java @@ -26,6 +26,9 @@ public interface IOreDictEntry extends IIngredient { @ZenGetter("empty") public boolean isEmpty(); + @ZenGetter("firstItem") + public IItemStack getFirstItem(); + @ZenMethod public void add(IItemStack item); diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/brackets/OreBracketHandler.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/brackets/OreBracketHandler.java index e275493..680eb63 100644 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/brackets/OreBracketHandler.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/brackets/OreBracketHandler.java @@ -6,8 +6,11 @@ package minetweaker.mc1710.brackets; +import java.util.ArrayList; import java.util.List; +import java.util.regex.Pattern; import minetweaker.IBracketHandler; +import minetweaker.MineTweakerAPI; import minetweaker.annotations.BracketHandler; import minetweaker.mc1710.oredict.MCOreDictEntry; import minetweaker.api.oredict.IOreDictEntry; @@ -31,6 +34,20 @@ public class OreBracketHandler implements IBracketHandler { public static IOreDictEntry getOre(String name) { return new MCOreDictEntry(name); } + + public static List getOreList(String wildcardName) { + List result = new ArrayList(); + Pattern wildcardPattern = Pattern.compile(wildcardName.replaceAll("\\*", ".+")); + + for (IOreDictEntry someOreDict : MineTweakerAPI.oreDict.getEntries()) { + String oreDictName = someOreDict.getName(); + if (wildcardPattern.matcher(oreDictName).matches()) { + result.add(getOre(oreDictName)); + } + } + + return result; + } @Override public IZenSymbol resolve(IEnvironmentGlobal environment, List tokens) { @@ -67,7 +84,7 @@ public class OreBracketHandler implements IBracketHandler { IJavaMethod method = JavaMethod.get( GlobalRegistry.getTypeRegistry(), OreBracketHandler.class, - "getOre", + name.contains("*") ? "getOreList" : "getOre", String.class); return new ExpressionCallStatic( diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/oredict/MCOreDictEntry.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/oredict/MCOreDictEntry.java index e9203a9..19297da 100644 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/oredict/MCOreDictEntry.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/oredict/MCOreDictEntry.java @@ -68,6 +68,15 @@ public class MCOreDictEntry implements IOreDictEntry { } } + @Override + public IItemStack getFirstItem() { + List items = OreDictionary.getOres(id); + if (items.isEmpty()) { + return null; + } + return getIItemStackWildcardSize(items.get(0)); + } + @Override public void addAll(IOreDictEntry entry) { if (entry instanceof MCOreDictEntry) { diff --git a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/brackets/OreBracketHandler.java b/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/brackets/OreBracketHandler.java index 5b9ecd7..150900f 100644 --- a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/brackets/OreBracketHandler.java +++ b/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/brackets/OreBracketHandler.java @@ -6,9 +6,11 @@ package minetweaker.mc18.brackets; +import java.util.ArrayList; import java.util.List; - +import java.util.regex.Pattern; import minetweaker.IBracketHandler; +import minetweaker.MineTweakerAPI; import minetweaker.annotations.BracketHandler; import minetweaker.api.oredict.IOreDictEntry; import minetweaker.mc18.oredict.MCOreDictEntry; @@ -32,6 +34,20 @@ public class OreBracketHandler implements IBracketHandler { public static IOreDictEntry getOre(String name) { return new MCOreDictEntry(name); } + + public static List getOreList(String wildcardName) { + List result = new ArrayList(); + Pattern wildcardPattern = Pattern.compile(wildcardName.replaceAll("\\*", ".+")); + + for (IOreDictEntry someOreDict : MineTweakerAPI.oreDict.getEntries()) { + String oreDictName = someOreDict.getName(); + if (wildcardPattern.matcher(oreDictName).matches()) { + result.add(getOre(oreDictName)); + } + } + + return result; + } @Override public IZenSymbol resolve(IEnvironmentGlobal environment, List tokens) { @@ -68,7 +84,7 @@ public class OreBracketHandler implements IBracketHandler { IJavaMethod method = JavaMethod.get( GlobalRegistry.getTypeRegistry(), OreBracketHandler.class, - "getOre", + name.contains("*") ? "getOreList" : "getOre", String.class); return new ExpressionCallStatic( diff --git a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/oredict/MCOreDictEntry.java b/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/oredict/MCOreDictEntry.java index c981779..b523fed 100644 --- a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/oredict/MCOreDictEntry.java +++ b/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/oredict/MCOreDictEntry.java @@ -60,6 +60,15 @@ public class MCOreDictEntry implements IOreDictEntry { return OreDictionary.getOres(getName()).isEmpty(); } + @Override + public IItemStack getFirstItem() { + List items = OreDictionary.getOres(getName()); + if (items.isEmpty()) { + return null; + } + return getIItemStackWildcardSize(items.get(0)); + } + @Override public void add(IItemStack item) { ItemStack stack = getItemStack(item);