diff --git a/.gitignore b/.gitignore index 9d6ebb2..64c2dda 100644 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,9 @@ /README.txt /CREDITS-fml.txt /forge-1.7.2* +/logs/* +/config/* +/configs/* /bin/* diff --git a/src/main/java/modtweaker2/mods/forestry/handlers/Centrifuge.java b/src/main/java/modtweaker2/mods/forestry/handlers/Centrifuge.java index 204dbfb..69e355c 100644 --- a/src/main/java/modtweaker2/mods/forestry/handlers/Centrifuge.java +++ b/src/main/java/modtweaker2/mods/forestry/handlers/Centrifuge.java @@ -38,12 +38,15 @@ public class Centrifuge { * @param output List of items to produce with associated chance * @param timePerItem time per item to process * @param ingredient item input + * @param output List of percentages to produce a item (same order as in item list) */ @ZenMethod public static void addRecipe(WeightedItemStack[] output, int timePerItem, IItemStack ingredient, @Optional int[] chances) { Map products = new HashMap(); + int i = 0; for (WeightedItemStack product : output) { - products.put(toStack(product.getStack()), product.getChance()); + products.put(toStack(product.getStack()), ((float) chances[i] / 100)); + i++; } MineTweakerAPI.apply(new Add(new CentrifugeRecipe(timePerItem, toStack(ingredient), products))); } diff --git a/src/main/java/modtweaker2/mods/forestry/handlers/Fermenter.java b/src/main/java/modtweaker2/mods/forestry/handlers/Fermenter.java index bb764cc..ca0580a 100644 --- a/src/main/java/modtweaker2/mods/forestry/handlers/Fermenter.java +++ b/src/main/java/modtweaker2/mods/forestry/handlers/Fermenter.java @@ -44,8 +44,8 @@ public class Fermenter { * Note: the actual consumption of fluid input depends on the fermentation fuel * * @param fluidOutput type of fluid produced - * @param fluidInput type of fluid required in input * @param resource organic item + * @param fluidInput type of fluid required in input * @param fermentationValue amount of inputFluid on organic item requires * @param fluidOutputModifier Output multiplier (this is usually a from the input fluid */