Fix #1178 Duplicate recipes for carrot > fruit juice,. Fix #1169 Rend…

…ering of bronze tools, Fix #1177 Toolips for squeezer and centrifuge recipes
ForestryMC · May 15, 2016 · ba5a252 · ba5a252
1 parent 5188b5a
commit ba5a252
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 4 deletions.
diff --git a/src/main/java/forestry/core/recipes/jei/ForestryTooltipCallback.java b/src/main/java/forestry/core/recipes/jei/ForestryTooltipCallback.java
@@ -36,6 +36,10 @@ public void onTooltip(int index, boolean input, ItemStack ingredient, List<Strin
 		}
 	}
 
+	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")));

diff --git a/src/main/java/forestry/factory/PluginFactory.java b/src/main/java/forestry/factory/PluginFactory.java
@@ -268,8 +268,6 @@ public void registerRecipes() {
 		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);

diff --git a/src/main/java/forestry/factory/recipes/jei/centrifuge/CentrifugeRecipeCategory.java b/src/main/java/forestry/factory/recipes/jei/centrifuge/CentrifugeRecipeCategory.java
@@ -68,6 +68,7 @@ public void setRecipe(@Nonnull IRecipeLayout recipeLayout, @Nonnull IRecipeWrapp
 		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);
 	}

diff --git a/src/main/java/forestry/factory/recipes/jei/squeezer/SqueezerRecipeCategory.java b/src/main/java/forestry/factory/recipes/jei/squeezer/SqueezerRecipeCategory.java
@@ -70,6 +70,7 @@ public void setRecipe(@Nonnull IRecipeLayout recipeLayout, @Nonnull IRecipeWrapp
 
 		guiItemStacks.init(craftOutputSlot, false, 87, 43);
 		guiItemStacks.set(craftOutputSlot, wrapper.getOutputs());
+		tooltip.clearTooltip();
 		tooltip.addChanceTooltip(craftOutputSlot, chance);
 		setIngredients(guiItemStacks, wrapper.getInputs());
 

diff --git a/src/main/resources/assets/forestry/models/item/bronzePickaxe.json b/src/main/resources/assets/forestry/models/item/bronzePickaxe.json
@@ -1,5 +1,5 @@
 {
-    "parent": "item/generated",
+    "parent": "item/handheld",
     "textures": {
         "layer0": "forestry:items/bronzePickaxe"
     }

diff --git a/src/main/resources/assets/forestry/models/item/bronzeShovel.json b/src/main/resources/assets/forestry/models/item/bronzeShovel.json
@@ -1,5 +1,5 @@
 {
-    "parent": "item/generated",
+    "parent": "item/handheld",
     "textures": {
         "layer0": "forestry:items/bronzeShovel"
     }