Add ITooltipBuilder#clear to allow advanced modifications of tooltips

mezz · Sep 3, 2024 · 95d14d0 · 95d14d0
1 parent bcc8fcc
commit 95d14d0
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 4 deletions.
diff --git a/Common/src/main/java/mezz/jei/common/gui/JeiTooltip.java b/Common/src/main/java/mezz/jei/common/gui/JeiTooltip.java
@@ -93,6 +93,12 @@ public void addAll(Collection<? extends FormattedText> components) {
 		}
 	}
 
+	@Override
+	public void clear() {
+		this.lines.clear();
+		this.typedIngredient = null;
+	}
+
 	public void addAll(JeiTooltip tooltip) {
 		lines.addAll(tooltip.lines);
 	}

diff --git a/CommonApi/src/main/java/mezz/jei/api/gui/builder/ITooltipBuilder.java b/CommonApi/src/main/java/mezz/jei/api/gui/builder/ITooltipBuilder.java
@@ -52,6 +52,13 @@ public interface ITooltipBuilder {
 	 */
 	void setIngredient(ITypedIngredient<?> typedIngredient);
 
+	/**
+	 * Remove all the lines and ingredients from this tooltip.
+	 *
+	 * @since 19.16.4
+	 */
+	void clear();
+
 	/**
 	 * @deprecated this is only for legacy tooltip support and will be removed
 	 */

diff --git a/Gui/src/main/java/mezz/jei/gui/ingredients/ListElementInfoTooltip.java b/Gui/src/main/java/mezz/jei/gui/ingredients/ListElementInfoTooltip.java
@@ -39,6 +39,11 @@ public void setIngredient(ITypedIngredient<?> typedIngredient) {
 		// ignored for the purposes of searching tooltips
 	}
 
+	@Override
+	public void clear() {
+		tooltip.clear();
+	}
+
 	@SuppressWarnings("removal")
 	@Override
 	public List<Component> toLegacyToComponents() {

diff --git a/Library/src/main/java/mezz/jei/library/gui/ingredients/RecipeSlot.java b/Library/src/main/java/mezz/jei/library/gui/ingredients/RecipeSlot.java
@@ -185,12 +185,11 @@ private <T> void getTooltip(ITooltipBuilder tooltip, ITypedIngredient<T> typedIn
 		IIngredientType<T> ingredientType = typedIngredient.getType();
 		IIngredientRenderer<T> ingredientRenderer = getIngredientRenderer(ingredientType);
 		SafeIngredientUtil.getTooltip(tooltip, ingredientManager, ingredientRenderer, typedIngredient);
+		addTagNameTooltip(tooltip, ingredientManager, typedIngredient);
+		addIngredientsToTooltip(tooltip, typedIngredient);
 		for (IRecipeSlotRichTooltipCallback tooltipCallback : this.tooltipCallbacks) {
 			tooltipCallback.onRichTooltip(this, tooltip);
 		}
-
-		addTagNameTooltip(tooltip, ingredientManager, typedIngredient);
-		addIngredientsToTooltip(tooltip, typedIngredient);
 	}
 
 	private <T> List<Component> legacyGetTooltip(ITypedIngredient<T> typedIngredient) {

diff --git a/gradle.properties b/gradle.properties
@@ -62,4 +62,4 @@ curseHomepageUrl=https://www.curseforge.com/minecraft/mc-mods/jei
 jUnitVersion=5.8.2
 
 # Version
-specificationVersion=19.16.3
+specificationVersion=19.16.4