Merge pull request #8 from Techlone/master

OreDict features
This commit is contained in:
Jared committed 2016-02-19 22:41:14 +02:00
commit dea355917d
5 files changed
+57 -3

No files matched your search

@@ -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);
@@ -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<IOreDictEntry> getOreList(String wildcardName) {
List<IOreDictEntry> result = new ArrayList<IOreDictEntry>();
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<Token> 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(
@@ -68,6 +68,15 @@ public class MCOreDictEntry implements IOreDictEntry {
}
}
@Override
public IItemStack getFirstItem() {
List<ItemStack> items = OreDictionary.getOres(id);
if (items.isEmpty()) {
return null;
}
return getIItemStackWildcardSize(items.get(0));
}
@Override
public void addAll(IOreDictEntry entry) {
if (entry instanceof MCOreDictEntry) {
@@ -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<IOreDictEntry> getOreList(String wildcardName) {
List<IOreDictEntry> result = new ArrayList<IOreDictEntry>();
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<Token> 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(
@@ -60,6 +60,15 @@ public class MCOreDictEntry implements IOreDictEntry {
return OreDictionary.getOres(getName()).isEmpty();
}
@Override
public IItemStack getFirstItem() {
List<ItemStack> items = OreDictionary.getOres(getName());
if (items.isEmpty()) {
return null;
}
return getIItemStackWildcardSize(items.get(0));
}
@Override
public void add(IItemStack item) {
ItemStack stack = getItemStack(item);