Anvilcraft/resonant-induction
2
1
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Added the ability to remove salvaging options

Browse source 
In some cases this will be needed especial when other mods work with
mine. I'll need to make a system so users can add item to the processor
black list.
This commit is contained in:
DarkGuardsman 2013-09-21 19:04:24 -04:00
parent c7c13330de
commit 11f35acabe
1 changed files with 28 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
src/dark/api/ProcessorRecipes.java
View file

@ -1,12 +1,13 @@
package dark.api; package dark.api;
import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List;
import java.util.Random; import java.util.Random;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.item.Item; import net.minecraft.item.Item;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import dark.core.prefab.helpers.AutoCraftingManager; import dark.core.prefab.helpers.AutoCraftingManager;
import dark.core.prefab.helpers.Pair; import dark.core.prefab.helpers.Pair;
@ -26,6 +27,7 @@ public class ProcessorRecipes
public HashMap<Pair<Integer, Integer>, Pair<ItemStack, Float>> recipesChance = new HashMap(); public HashMap<Pair<Integer, Integer>, Pair<ItemStack, Float>> recipesChance = new HashMap();
public HashMap<Pair<Integer, Integer>, Float> recipesChanceSalvage = new HashMap(); public HashMap<Pair<Integer, Integer>, Float> recipesChanceSalvage = new HashMap();
public HashMap<Pair<Integer, Integer>, ItemStack> damagedOutput = new HashMap(); public HashMap<Pair<Integer, Integer>, ItemStack> damagedOutput = new HashMap();
public List<Pair<Integer, Integer>> canSalvage = new ArrayList();
} }
@ -71,7 +73,7 @@ public class ProcessorRecipes
if (input != null && output != null) if (input != null && output != null)
{ {
HashMap<Pair<Integer, Integer>, ItemStack> map = type.recipes; HashMap<Pair<Integer, Integer>, ItemStack> map = type.recipes;
if (map != null && !map.containsKey(new Pair<Integer,Integer>(input.itemID, input.getItemDamage()))) if (map != null && !map.containsKey(new Pair<Integer, Integer>(input.itemID, input.getItemDamage())))
{ {
map.put(new Pair<Integer, Integer>(input.itemID, input.getItemDamage()), output); map.put(new Pair<Integer, Integer>(input.itemID, input.getItemDamage()), output);
} }
@ -94,7 +96,7 @@ public class ProcessorRecipes
if (input != null && output != null) if (input != null && output != null)
{ {
HashMap<Pair<Integer, Integer>, Pair<ItemStack, Float>> map = type.recipesChance; HashMap<Pair<Integer, Integer>, Pair<ItemStack, Float>> map = type.recipesChance;
if (map != null && !map.containsKey(new Pair<Integer,Integer>(input.itemID, input.getItemDamage()))) if (map != null && !map.containsKey(new Pair<Integer, Integer>(input.itemID, input.getItemDamage())))
{ {
map.put(new Pair<Integer, Integer>(input.itemID, input.getItemDamage()), new Pair<ItemStack, Float>(output, chance)); map.put(new Pair<Integer, Integer>(input.itemID, input.getItemDamage()), new Pair<ItemStack, Float>(output, chance));
} }
@ -112,7 +114,7 @@ public class ProcessorRecipes
if (input != null && input != null) if (input != null && input != null)
{ {
HashMap<Pair<Integer, Integer>, Float> map = type.recipesChanceSalvage; HashMap<Pair<Integer, Integer>, Float> map = type.recipesChanceSalvage;
if (map != null && !map.containsKey(new Pair<Integer,Integer>(input.itemID, input.getItemDamage()))) if (map != null && !map.containsKey(new Pair<Integer, Integer>(input.itemID, input.getItemDamage())))
{ {
map.put(new Pair<Integer, Integer>(input.itemID, input.getItemDamage()), chance); map.put(new Pair<Integer, Integer>(input.itemID, input.getItemDamage()), chance);
} }
@ -132,11 +134,11 @@ public class ProcessorRecipes
HashMap<Pair<Integer, Integer>, ItemStack> map = type.damagedOutput; HashMap<Pair<Integer, Integer>, ItemStack> map = type.damagedOutput;
if (map != null) if (map != null)
{ {
if (!map.containsKey(new Pair<Integer,Integer>(input.itemID, input.getItemDamage()))) if (!map.containsKey(new Pair<Integer, Integer>(input.itemID, input.getItemDamage())))
{ {
map.put(new Pair<Integer, Integer>(input.itemID, input.getItemDamage()), output); map.put(new Pair<Integer, Integer>(input.itemID, input.getItemDamage()), output);
} }
else if (map.get(new Pair<Integer,Integer>(input.itemID, input.getItemDamage())) == null) else if (map.get(new Pair<Integer, Integer>(input.itemID, input.getItemDamage())) == null)
{ {
map.put(new Pair<Integer, Integer>(input.itemID, input.getItemDamage()), output); map.put(new Pair<Integer, Integer>(input.itemID, input.getItemDamage()), output);
} }
@ -145,6 +147,26 @@ public class ProcessorRecipes
} }
} }
/** Marks an itemstack as unsalvagable by all processors */
public static void markUnsalvagable(ItemStack stack)
{
if (stack != null)
{
for (ProcessorType type : ProcessorType.values())
{
markUnsalvagable(type, stack);
}
}
}
/** Marks an itemstack as unsalvagable by processors */
public static void markUnsalvagable(ProcessorType type, ItemStack stack)
{
if (type != null && stack != null)
{
type.canSalvage.add(new Pair<Integer, Integer>(stack.itemID, stack.getItemDamage()));
}
}
/** Converts an object input into an itemstack for use */ /** Converts an object input into an itemstack for use */
private static ItemStack convert(Object object) private static ItemStack convert(Object object)
{ {