From 5cb4c6e24033cf337812390d99a6817d24d21eab Mon Sep 17 00:00:00 2001 From: Foghrye4 Date: Sun, 12 Feb 2017 20:43:03 +0300 Subject: Removed explosion radius limitations. Explosion calculation optimized (reduced memory usage). One more detonator and explosive pack recipe. GT6 recipes for both chemical reactors and cryogenic distiller. Max stack size of muffle furnace is limited to 32. A lot of old features are removed. --- ihl/recipes/RecipeInputOreDictionaryList.java | 241 ++++++++++++-------------- 1 file changed, 107 insertions(+), 134 deletions(-) (limited to 'ihl/recipes/RecipeInputOreDictionaryList.java') diff --git a/ihl/recipes/RecipeInputOreDictionaryList.java b/ihl/recipes/RecipeInputOreDictionaryList.java index 572f15b..e438d98 100644 --- a/ihl/recipes/RecipeInputOreDictionaryList.java +++ b/ihl/recipes/RecipeInputOreDictionaryList.java @@ -10,140 +10,113 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; -public class RecipeInputOreDictionaryList implements IRecipeInput -{ - - public final String[] input; - public final int amount; - public final Integer meta; - private List ores; - - public RecipeInputOreDictionaryList(String[] input1) - { - this(input1, 1); - } - - public RecipeInputOreDictionaryList(String[] input1, int amount1) - { - this(input1, amount1, (Integer)null); - } - - public RecipeInputOreDictionaryList(String[] input1, int amount1, Integer meta) - { - this.input = input1; - this.amount = amount1; - this.meta = meta; - } +public class RecipeInputOreDictionaryList implements IRecipeInput { + + public final String[] input; + public final int amount; + public final Integer meta; + private List ores; + + public RecipeInputOreDictionaryList(String[] input1) { + this(input1, 1); + } + + public RecipeInputOreDictionaryList(String[] input1, int amount1) { + this(input1, amount1, (Integer) null); + } + + public RecipeInputOreDictionaryList(String[] input1, int amount1, Integer meta) { + this.input = input1; + this.amount = amount1; + this.meta = meta; + } + + @Override + public boolean matches(ItemStack subject) { + List inputs = this.getOres(); + boolean useOreStackMeta = this.meta == null; + Item subjectItem = subject.getItem(); + int subjectMeta = subject.getItemDamage(); + Iterator i$ = inputs.iterator(); + Item oreItem; + int metaRequired; + + do { + do { + ItemStack oreStack; + + do { + if (!i$.hasNext()) { + return false; + } + + oreStack = i$.next(); + oreItem = oreStack.getItem(); + } while (oreItem == null); + + metaRequired = useOreStackMeta ? oreStack.getItemDamage() : this.meta.intValue(); + } while (subjectItem != oreItem); + } while (subjectMeta != metaRequired && metaRequired != 32767); + + return true; + } + + @Override + public int getAmount() { + return this.amount; + } + + @Override + public List getInputs() { + List ores = this.getOres(); + boolean hasInvalidEntries = false; + Iterator ret = ores.iterator(); + + while (ret.hasNext()) { + ItemStack i$ = ret.next(); + + if (i$.getItem() == null) { + hasInvalidEntries = true; + break; + } + } + + if (!hasInvalidEntries) { + return ores; + } else { + ArrayList ret1 = new ArrayList(ores.size()); + Iterator i$1 = ores.iterator(); + + while (i$1.hasNext()) { + ItemStack stack = i$1.next(); + + if (stack.getItem() != null) { + ret1.add(stack); + } + } + + return Collections.unmodifiableList(ret1); + } + } @Override - public boolean matches(ItemStack subject) - { - List inputs = this.getOres(); - boolean useOreStackMeta = this.meta == null; - Item subjectItem = subject.getItem(); - int subjectMeta = subject.getItemDamage(); - Iterator i$ = inputs.iterator(); - Item oreItem; - int metaRequired; - - do - { - do - { - ItemStack oreStack; - - do - { - if (!i$.hasNext()) - { - return false; - } - - oreStack = i$.next(); - oreItem = oreStack.getItem(); - } - while (oreItem == null); - - metaRequired = useOreStackMeta ? oreStack.getItemDamage() : this.meta.intValue(); - } - while (subjectItem != oreItem); - } - while (subjectMeta != metaRequired && metaRequired != 32767); - - return true; - } - - @Override - public int getAmount() - { - return this.amount; - } - - @Override - public List getInputs() - { - List ores = this.getOres(); - boolean hasInvalidEntries = false; - Iterator ret = ores.iterator(); - - while (ret.hasNext()) - { - ItemStack i$ = ret.next(); - - if (i$.getItem() == null) - { - hasInvalidEntries = true; - break; - } - } - - if (!hasInvalidEntries) - { - return ores; - } - else - { - ArrayList ret1 = new ArrayList(ores.size()); - Iterator i$1 = ores.iterator(); - - while (i$1.hasNext()) - { - ItemStack stack = i$1.next(); - - if (stack.getItem() != null) - { - ret1.add(stack); - } - } - - return Collections.unmodifiableList(ret1); - } - } - - @Override - public String toString() - { - return this.meta == null ? "RInputOreDict<" + this.amount + "x" + this.input + ">" : "RInputOreDict<" + this.amount + "x" + this.input + "@" + this.meta + ">"; - } - - private List getOres() - { - if (this.ores != null) - { - return this.ores; - } - else - { - this.ores = new ArrayList(); - for(int i=0;i ret = OreDictionary.getOres(this.input[i]); - if (ret != OreDictionary.EMPTY_LIST) - { - this.ores.addAll(ret); - } - } - return this.ores; - } - } + public String toString() { + return this.meta == null ? "RInputOreDict<" + this.amount + "x" + this.input + ">" + : "RInputOreDict<" + this.amount + "x" + this.input + "@" + this.meta + ">"; + } + + private List getOres() { + if (this.ores != null) { + return this.ores; + } else { + this.ores = new ArrayList(); + for (int i = 0; i < this.input.length; i++) { + ArrayList ret = OreDictionary.getOres(this.input[i]); + if (ret != OreDictionary.EMPTY_LIST) { + this.ores.addAll(ret); + } + } + return this.ores; + } + } } -- cgit v1.2.3