killed modularity, updated IC2 api

This commit is contained in:
fewizz committed 2015-04-05 11:08:54 +03:00
1 parent 370534cd1e
commit 12f51ac23a
141 files changed
+1214 -1914

No files matched your search

@@ -1,8 +1,10 @@
package ic2.api.recipe;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraftforge.oredict.OreDictionary;
@@ -24,14 +26,19 @@ public class RecipeInputOreDict implements IRecipeInput {
@Override
public boolean matches(ItemStack subject) {
List<ItemStack> inputs = OreDictionary.getOres(input);
List<ItemStack> inputs = getOres();
boolean useOreStackMeta = (meta == null);
Item subjectItem = subject.getItem();
int subjectMeta = subject.getItemDamage();
for (ItemStack input1 : inputs) {
if (input1.getItem() == null) continue; // ignore invalid
int metaRequired = meta == null ? input1.getItemDamage() : meta;
for (ItemStack oreStack : inputs) {
Item oreItem = oreStack.getItem();
if (oreItem == null) continue; // ignore invalid
if (subject.getItem() == input1.getItem() &&
(subject.getItemDamage() == metaRequired || metaRequired == OreDictionary.WILDCARD_VALUE)) {
int metaRequired = useOreStackMeta ? oreStack.getItemDamage() : meta;
if (subjectItem == oreItem &&
(subjectMeta == metaRequired || metaRequired == OreDictionary.WILDCARD_VALUE)) {
return true;
}
}
@@ -46,14 +53,27 @@ public class RecipeInputOreDict implements IRecipeInput {
@Override
public List<ItemStack> getInputs() {
List<ItemStack> ores = OreDictionary.getOres(input);
List<ItemStack> ores = getOres();
// check if we have to filter the list first
boolean hasInvalidEntries = false;
for (ItemStack stack : ores) {
if (stack.getItem() == null) {
hasInvalidEntries = true;
break;
}
}
if (!hasInvalidEntries) return ores;
List<ItemStack> ret = new ArrayList<ItemStack>(ores.size());
for (ItemStack stack : ores) {
if (stack.getItem() != null) ret.add(stack); // ignore invalid
}
return ret;
return Collections.unmodifiableList(ret);
}
@Override
@@ -65,7 +85,20 @@ public class RecipeInputOreDict implements IRecipeInput {
}
}
private List<ItemStack> getOres() {
if (ores != null) return ores;
// cache the ore list by making use of the fact that forge always uses the same list,
// unless it's EMPTY_LIST, which should never happen.
List<ItemStack> ret = OreDictionary.getOres(input);
if (ret != OreDictionary.EMPTY_LIST) ores = ret;
return ret;
}
public final String input;
public final int amount;
public final Integer meta;
private List<ItemStack> ores;
}