tilera/electrodynamics
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Wiki Activity

Made ruble to dust output random

Browse source
This commit is contained in:
DarkGuardsman 2013-10-27 04:13:17 -04:00
parent d615a8745b
commit 2dca3e5034
2 changed files with 25 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -35,6 +35,7 @@ public class ProcessorRecipes
GRINDER(), GRINDER(),
PRESS(); PRESS();
public HashMap<Pair<Integer, Integer>, ItemStack> recipes = new HashMap(); public HashMap<Pair<Integer, Integer>, ItemStack> recipes = new HashMap();
public HashMap<Pair<Integer, Integer>, Pair<Integer, Integer>> output = new HashMap();
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();
@ -76,6 +77,11 @@ public class ProcessorRecipes
* @param in - input item, stacksize is ignored * @param in - input item, stacksize is ignored
* @param out - ouput item */ * @param out - ouput item */
public static void createRecipe(ProcessorType type, Object in, Object out) public static void createRecipe(ProcessorType type, Object in, Object out)
{
createRecipe(type, in, out, 1, 1);
}
public static void createRecipe(ProcessorType type, Object in, Object out, int min, int max)
{ {
if (in != null && out != null && type != null) if (in != null && out != null && type != null)
{ {
@ -84,9 +90,11 @@ 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()))) HashMap<Pair<Integer, Integer>, Pair<Integer, Integer>> map2 = type.output;
if (map != null && output != null)
{ {
map.put(new Pair<Integer, Integer>(input.itemID, input.getItemDamage()), output); map.put(new Pair<Integer, Integer>(input.itemID, input.getItemDamage()), output);
map2.put(new Pair<Integer, Integer>(input.itemID, input.getItemDamage()), new Pair<Integer, Integer>(min, max));
} }
} }
} }
@ -210,6 +218,7 @@ public class ProcessorRecipes
return null; return null;
} }
HashMap<Pair<Integer, Integer>, ItemStack> map = type.recipes; HashMap<Pair<Integer, Integer>, ItemStack> map = type.recipes;
HashMap<Pair<Integer, Integer>, Pair<Integer, Integer>> map2 = type.output;
HashMap<Pair<Integer, Integer>, Pair<ItemStack, Float>> mapChance = type.recipesChance; HashMap<Pair<Integer, Integer>, Pair<ItemStack, Float>> mapChance = type.recipesChance;
HashMap<Pair<Integer, Integer>, Float> mapSalvage = type.recipesChanceSalvage; HashMap<Pair<Integer, Integer>, Float> mapSalvage = type.recipesChanceSalvage;
HashMap<Pair<Integer, Integer>, ItemStack> altSalvageMap = type.damagedOutput; HashMap<Pair<Integer, Integer>, ItemStack> altSalvageMap = type.damagedOutput;
@ -219,14 +228,26 @@ public class ProcessorRecipes
if (map != null) if (map != null)
{ {
ItemStack re = map.get(new Pair<Integer, Integer>(stack.itemID, -1)); ItemStack re = map.get(new Pair<Integer, Integer>(stack.itemID, -1));
Pair<Integer, Integer> range = map2.get(new Pair<Integer, Integer>(stack.itemID, -1));
if (re != null) if (re != null)
{ {
return new ItemStack[] { convert(re) }; ItemStack retm = convert(re);
if (!(range.left() == 1 && range.right() == 1))
{
retm.stackSize = range.left() + random.nextInt(range.right());
}
return new ItemStack[] { retm };
} }
re = map.get(blockSet); re = map.get(blockSet);
range = map2.get(blockSet);
if (re != null) if (re != null)
{ {
return new ItemStack[] { convert(re) }; ItemStack retm = convert(re);
if (!(range.left() == 1 && range.right() == 1))
{
retm.stackSize = range.left() + random.nextInt(range.right());
}
return new ItemStack[] { retm };
} }
} }

2
src/dark/core/common/CoreRecipeLoader.java
View file

@ -140,7 +140,7 @@ public class CoreRecipeLoader extends RecipeLoader
{ {
dust.stackSize = 2; dust.stackSize = 2;
FurnaceRecipes.smelting().addSmelting(dust.itemID, dust.getItemDamage(), ingot, 0.6f); FurnaceRecipes.smelting().addSmelting(dust.itemID, dust.getItemDamage(), ingot, 0.6f);
ProcessorRecipes.createRecipe(ProcessorType.GRINDER, rubble, dust); ProcessorRecipes.createRecipe(ProcessorType.GRINDER, rubble, dust, 1, 4);
dust.stackSize = 1; dust.stackSize = 1;
ProcessorRecipes.createRecipe(ProcessorType.GRINDER, scraps, dust); ProcessorRecipes.createRecipe(ProcessorType.GRINDER, scraps, dust);
ProcessorRecipes.createRecipe(ProcessorType.GRINDER, ingot, dust); ProcessorRecipes.createRecipe(ProcessorType.GRINDER, ingot, dust);