Separate item and fluid tooltip callbacks (#232)

GregTechCEu · Nov 12, 2021 · 36f31d7 · 36f31d7
1 parent 0be128b
commit 36f31d7
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/src/main/java/gregtech/integration/jei/recipe/GTRecipeWrapper.java b/src/main/java/gregtech/integration/jei/recipe/GTRecipeWrapper.java
@@ -96,7 +96,7 @@ public void getIngredients(@Nonnull IIngredients ingredients) {
         }
     }
 
-    public void addTooltip(int slotIndex, boolean input, Object ingredient, List<String> tooltip) {
+    public void addItemTooltip(int slotIndex, boolean input, Object ingredient, List<String> tooltip) {
         boolean notConsumed = input && recipe.isNotConsumedInput(ingredient);
         ChanceEntry entry = input ? null : chanceOutput.get(slotIndex);
 
@@ -109,6 +109,14 @@ public void addTooltip(int slotIndex, boolean input, Object ingredient, List<Str
         }
     }
 
+    public void addFluidTooltip(int slotIndex, boolean input, Object ingredient, List<String> tooltip) {
+        boolean notConsumed = input && recipe.isNotConsumedInput(ingredient);
+
+        if (notConsumed) {
+            tooltip.add(I18n.format("gregtech.recipe.not_consumed"));
+        }
+    }
+
     @Override
     public void drawInfo(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight, int mouseX, int mouseY) {
         int yPosition = recipeHeight - getPropertyListHeight();

diff --git a/src/main/java/gregtech/integration/jei/recipe/RecipeMapCategory.java b/src/main/java/gregtech/integration/jei/recipe/RecipeMapCategory.java
@@ -160,8 +160,8 @@ public void setRecipe(IRecipeLayout recipeLayout, @Nonnull GTRecipeWrapper recip
                 }
             }
         }
-        itemStackGroup.addTooltipCallback(recipeWrapper::addTooltip);
-        fluidStackGroup.addTooltipCallback(recipeWrapper::addTooltip);
+        itemStackGroup.addTooltipCallback(recipeWrapper::addItemTooltip);
+        fluidStackGroup.addTooltipCallback(recipeWrapper::addFluidTooltip);
         itemStackGroup.set(ingredients);
         fluidStackGroup.set(ingredients);
     }