Extra fixes for Ingredients
This commit is contained in:
TheDarkDnKTv
parent
0bff996a93
commit
730b1f6e2a
3 changed files with 177 additions and 81 deletions
|
|
@ -22,7 +22,7 @@ public interface Ingredient {
|
|||
public List<ItemStack> getVariants();
|
||||
|
||||
/**
|
||||
* Determines this ingredient is consumable or not
|
||||
* Get a ingredient count
|
||||
*/
|
||||
public boolean consumable();
|
||||
public int getCount();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,79 +0,0 @@
|
|||
package gregtechmod.common.recipe;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.EnumSet;
|
||||
import java.util.HashSet;
|
||||
import java.util.List;
|
||||
|
||||
import gregtechmod.api.recipe.Ingredient;
|
||||
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraftforge.oredict.OreDictionary;
|
||||
|
||||
/** An implementation of Ingredient interface
|
||||
*
|
||||
* NEVER INCLUDE ANYTHING FROM common PACKAGE IN YOUR MODS!
|
||||
* @author TheDarkDnKTv
|
||||
*
|
||||
*/
|
||||
public class IngredientImpl implements Ingredient {
|
||||
|
||||
private HashSet<ItemStack> variants; // check out hashmap impl, may be use stackToInt with hashmap will be faster then iteration
|
||||
private EnumSet<MatchOption> options;
|
||||
private boolean consumable;
|
||||
|
||||
private IngredientImpl() {
|
||||
variants = new HashSet<>();
|
||||
options = EnumSet.noneOf(MatchOption.class);
|
||||
}
|
||||
|
||||
public static Ingredient singleton(ItemStack stack, MatchOption...options) {
|
||||
return singleton(stack, true, options);
|
||||
}
|
||||
|
||||
public static Ingredient singleton(ItemStack stack, boolean consumable, MatchOption...options) {
|
||||
IngredientImpl result = new IngredientImpl();
|
||||
result.variants.add(stack);
|
||||
for (MatchOption o : options) result.options.add(o);
|
||||
return result;
|
||||
}
|
||||
|
||||
public static Ingredient oreDict(ItemStack stack) {
|
||||
|
||||
return null; // TODO
|
||||
}
|
||||
|
||||
public static Ingredient oreDict(String name) {
|
||||
IngredientImpl result = new IngredientImpl();
|
||||
List<ItemStack> entries = OreDictionary.getOres(name);
|
||||
if (!entries.isEmpty()) {
|
||||
result.variants.addAll(entries);
|
||||
} else
|
||||
throw new IllegalArgumentException("Wrong ore dictionary key supplied: " + name);
|
||||
return result;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean match(ItemStack input) {
|
||||
// TODO Auto-generated method stub
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<ItemStack> getVariants() {
|
||||
// TODO Auto-generated method stub
|
||||
return new ArrayList<>(variants);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean consumable() {
|
||||
return consumable;
|
||||
}
|
||||
|
||||
public static enum MatchOption {
|
||||
/** Check damage match */
|
||||
DAMAGE,
|
||||
/** Check NBT match */
|
||||
NBT;
|
||||
}
|
||||
}
|
||||
175
src/main/java/gregtechmod/common/recipe/RecipeEntry.java
Normal file
175
src/main/java/gregtechmod/common/recipe/RecipeEntry.java
Normal file
|
|
@ -0,0 +1,175 @@
|
|||
package gregtechmod.common.recipe;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collection;
|
||||
import java.util.EnumSet;
|
||||
import java.util.HashSet;
|
||||
import java.util.List;
|
||||
import java.util.Set;
|
||||
|
||||
import com.google.common.collect.Collections2;
|
||||
import com.google.common.collect.Lists;
|
||||
|
||||
import gregtechmod.api.recipe.Ingredient;
|
||||
import gregtechmod.api.util.GT_Utility;
|
||||
import gregtechmod.api.util.ItemStackKey;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraftforge.oredict.OreDictionary;
|
||||
|
||||
/** An implementation of Ingredient interface
|
||||
*
|
||||
* NEVER INCLUDE ANYTHING FROM common PACKAGE IN YOUR MODS!
|
||||
* @author TheDarkDnKTv
|
||||
*/
|
||||
public class RecipeEntry implements Ingredient {
|
||||
|
||||
private HashSet<ItemStack> variants;
|
||||
private EnumSet<Match> options; // Options for matching
|
||||
private int count; // Using for non consumable
|
||||
|
||||
private RecipeEntry() {
|
||||
variants = new HashSet<>();
|
||||
options = EnumSet.noneOf(Match.class);
|
||||
count = 0;
|
||||
}
|
||||
|
||||
public static Ingredient singleton(ItemStack stack, Match...options) {
|
||||
return singleton(stack, 1, options);
|
||||
}
|
||||
|
||||
public static Ingredient singleton(ItemStack stack, int count, Match...options) {
|
||||
assert GT_Utility.isStackValid(stack) : "Stack can not be invalid or null!";
|
||||
|
||||
RecipeEntry result = new RecipeEntry();
|
||||
result.variants.add(stack.copy());
|
||||
result.count = count;
|
||||
result.addOptions(options);
|
||||
return result;
|
||||
}
|
||||
|
||||
public static Ingredient fromStacks(int count, Collection<ItemStack> stacks, Match...options) {
|
||||
if (stacks.size() > 0) {
|
||||
RecipeEntry result = new RecipeEntry();
|
||||
result.count = count;
|
||||
result.addOptions(options);
|
||||
for (ItemStack stack : stacks) {
|
||||
assert GT_Utility.isStackValid(stack) : "Stack cannot be invalid, or null!";
|
||||
result.variants.add(stack.copy());
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
throw new IllegalArgumentException("An empty stack array present " + stacks.size());
|
||||
}
|
||||
|
||||
public static Ingredient fromStacks(Collection<ItemStack> stacks, Match...options) {
|
||||
return fromStacks(1, stacks, options);
|
||||
}
|
||||
|
||||
/**
|
||||
* WARNING! If stack has several OreDict names, it will add all items of all names!
|
||||
* Fot strict tag use method below
|
||||
*/
|
||||
/**
|
||||
* @param stack
|
||||
* @param count
|
||||
* @return
|
||||
*/
|
||||
@SuppressWarnings("deprecation")
|
||||
public static Ingredient oreDict(ItemStack stack, int count, Match...options) {
|
||||
assert GT_Utility.isStackValid(stack) : "Stack can not be invalid or null!";
|
||||
|
||||
List<ItemStack> stacks = new ArrayList<>();
|
||||
int ids[] = OreDictionary.getOreIDs(stack);
|
||||
|
||||
if (ids.length > 0) {
|
||||
RecipeEntry result = new RecipeEntry();
|
||||
for (int id :ids)
|
||||
stacks.addAll(OreDictionary.getOres(id));
|
||||
// Making set of ItemStackKey first, then back again to ItemStack just for remove duplicates of items
|
||||
// Should execute by O(2n)
|
||||
Set<ItemStackKey> setOfStacks = new HashSet<>(Lists.transform(stacks, item -> ItemStackKey.from(item)));
|
||||
result.count = count;
|
||||
result.addOptions(options);
|
||||
result.variants.addAll(Collections2.transform(setOfStacks, item -> item.get()));
|
||||
|
||||
/* Tip from Arch, O(n^2 + n)
|
||||
List<Intgere> itemStacksToRemove = new ArrayList<>();
|
||||
for (int i = 0; i < stacks.size(); i++) {
|
||||
for (int j = i + 1; j < stacks.size(); j++) {
|
||||
ItemStack stack1 = stacks.get(i);
|
||||
ItemStack stack2 = stacks.get(j);
|
||||
if (ItemStack.areItemStackEqual(stack1, stack2))
|
||||
itemStacksToRemove.add(i);
|
||||
}
|
||||
}
|
||||
|
||||
for (int i = itemStacksToRemove.size()-1; i >= 0; i--)
|
||||
stacks.remove(i);
|
||||
*/
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
throw new IllegalArgumentException("Wrong ore dictionary stack supplied: " + stack);
|
||||
}
|
||||
|
||||
public static Ingredient oreDict(ItemStack stack, Match...options) {
|
||||
return oreDict(stack, 1, options);
|
||||
}
|
||||
|
||||
public static Ingredient oreDict(String name, int count, Match...options) {
|
||||
assert name != null && !name.isEmpty() : "Invalid OreDict name supplied";
|
||||
|
||||
RecipeEntry result = new RecipeEntry();
|
||||
result.count = count;
|
||||
List<ItemStack> entries = OreDictionary.getOres(name);
|
||||
if (!entries.isEmpty()) {
|
||||
result.variants.addAll(entries);
|
||||
result.addOptions(options);
|
||||
} else
|
||||
throw new IllegalArgumentException("Wrong ore dictionary key supplied: " + name);
|
||||
return result;
|
||||
}
|
||||
|
||||
public static Ingredient oreDict(String name, Match...options) {
|
||||
return oreDict(name, 1, options);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean match(ItemStack input) {
|
||||
// TODO Auto-generated method stub
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<ItemStack> getVariants() {
|
||||
return new ArrayList<>(variants);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getCount() {
|
||||
return count;
|
||||
}
|
||||
|
||||
private void addOptions(Match...options) {
|
||||
for (Match option : options) {
|
||||
if (option != null) {
|
||||
this.options.add(option);
|
||||
} else throw new IllegalArgumentException("Options can not be null!");
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* By default will match items with any damage and nbt
|
||||
* @author TheDarkDnKTv
|
||||
*
|
||||
*/
|
||||
public static enum Match {
|
||||
/** Check damage match */
|
||||
DAMAGE,
|
||||
/** Check NBT match */
|
||||
NBT;
|
||||
}
|
||||
}
|
||||
Loading…
Reference in a new issue