From a3347969ff3b580b26ef7a0fd9a5ba90cdf509c6 Mon Sep 17 00:00:00 2001 From: Techlone Date: Mon, 8 Feb 2016 01:41:25 +0500 Subject: [PATCH 1/3] New getter 'firstItem' in IOreDictEntry --- .../main/java/minetweaker/api/oredict/IOreDictEntry.java | 3 +++ .../java/minetweaker/mc1710/oredict/MCOreDictEntry.java | 9 +++++++++ .../java/minetweaker/mc18/oredict/MCOreDictEntry.java | 9 +++++++++ 3 files changed, 21 insertions(+) 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..aa2d281 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/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/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); From bea9c285d05f8d75d836ba6e3f5432f46ef696e9 Mon Sep 17 00:00:00 2001 From: Techlone Date: Mon, 8 Feb 2016 01:43:24 +0500 Subject: [PATCH 2/3] Processing of wildcard in OreBracketHandler --- .../mc1710/brackets/OreBracketHandler.java | 19 ++++++++++++++++++- .../mc18/brackets/OreBracketHandler.java | 18 +++++++++++++++++- 2 files changed, 35 insertions(+), 2 deletions(-) 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-MC18-Main/src/main/java/minetweaker/mc18/brackets/OreBracketHandler.java b/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/brackets/OreBracketHandler.java index 5b9ecd7..70b50f6 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) { From 025cb3fac158d7d47f8e31120d93640706da2e66 Mon Sep 17 00:00:00 2001 From: Techlone Date: Mon, 8 Feb 2016 02:41:54 +0500 Subject: [PATCH 3/3] Hotfix Choosing of method --- .../src/main/java/minetweaker/api/oredict/IOreDictEntry.java | 2 +- .../main/java/minetweaker/mc18/brackets/OreBracketHandler.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 aa2d281..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,7 +26,7 @@ public interface IOreDictEntry extends IIngredient { @ZenGetter("empty") public boolean isEmpty(); - @ZenGetter("firstItem") + @ZenGetter("firstItem") public IItemStack getFirstItem(); @ZenMethod 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 70b50f6..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 @@ -84,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(