Fix #1178 Duplicate recipes for carrot > fruit juice,. Fix #1169 Rendering of bronze tools, Fix #1177 Toolips for squeezer and centrifuge recipes

This commit is contained in:
Nedelosk committed 2016-05-16 00:10:45 +02:00
1 parent 5188b5a3f6
commit ba5a2529df
6 files changed
+8 -4

No files matched your search

@@ -36,6 +36,10 @@ public class ForestryTooltipCallback implements ITooltipCallback<ItemStack> {
}
}
public void clearTooltip(){
tooltips.clear();
}
public void addChanceTooltip(int index, float chance) {
if (chance <= 0.0F) {
tooltips.get(index).add(TextFormatting.GRAY + String.format(Translator.translateToLocal("forestry.jei.chance"), Translator.translateToLocal("forestry.jei.chance.never")));
@@ -268,8 +268,6 @@ public class PluginFactory extends BlankForestryPlugin {
RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[]{new ItemStack(Items.CARROT)}, Fluids.JUICE.getFluid(appleJuiceAmount),
PluginCore.items.mulch.getItemStack(), appleMulchAmount);
RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[]{new ItemStack(Items.CARROT)}, Fluids.JUICE.getFluid(appleJuiceAmount),
PluginCore.items.mulch.getItemStack(), appleMulchAmount);
int seedOilAmount = ForestryAPI.activeMode.getIntegerSetting("squeezer.liquid.seed");
FluidStack seedOil = Fluids.SEED_OIL.getFluid(seedOilAmount);
RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[]{new ItemStack(Items.WHEAT_SEEDS)}, seedOil);
@@ -68,6 +68,7 @@ public class CentrifugeRecipeCategory extends ForestryRecipeCategory {
guiItemStacks.init(inputSlot, true, 4, 18);
guiItemStacks.setFromRecipe(inputSlot, recipeWrapper.getInputs());
CentrifugeRecipeWrapper centrifugeWrapper = (CentrifugeRecipeWrapper) recipeWrapper;
tooltip.clearTooltip();
setResults(centrifugeWrapper.getRecipe().getAllProducts(), (GuiItemStackGroup) guiItemStacks);
guiItemStacks.addTooltipCallback(tooltip);
}
@@ -70,6 +70,7 @@ public class SqueezerRecipeCategory extends ForestryRecipeCategory {
guiItemStacks.init(craftOutputSlot, false, 87, 43);
guiItemStacks.set(craftOutputSlot, wrapper.getOutputs());
tooltip.clearTooltip();
tooltip.addChanceTooltip(craftOutputSlot, chance);
setIngredients(guiItemStacks, wrapper.getInputs());