Merge branch 'fabric-dev' into 1.14

1 files changed, 10 insertions, 0 deletions

diff --git a/src/main/java/me/shedaniel/rei/gui/widget/SpeedCraftingButtonWidget.java b/src/main/java/me/shedaniel/rei/gui/widget/SpeedCraftingButtonWidget.java
index 948c621a4..f2049919d 100644
--- a/src/main/java/me/shedaniel/rei/gui/widget/SpeedCraftingButtonWidget.java
+++ b/src/main/java/me/shedaniel/rei/gui/widget/SpeedCraftingButtonWidget.java
@@ -8,7 +8,9 @@ package me.shedaniel.rei.gui.widget;
 import me.shedaniel.rei.api.RecipeDisplay;
 import me.shedaniel.rei.api.SpeedCraftFunctional;
 import me.shedaniel.rei.client.ScreenHelper;
+import net.minecraft.ChatFormat;
 import net.minecraft.client.resource.language.I18n;
+import net.minecraft.recipe.Recipe;
 
 import java.awt.*;
 import java.util.Optional;
@@ -18,11 +20,14 @@ public class SpeedCraftingButtonWidget extends ButtonWidget {
     
     private final Supplier<RecipeDisplay> displaySupplier;
     private final SpeedCraftFunctional functional;
+    private String extraTooltip;
     
     public SpeedCraftingButtonWidget(Rectangle rectangle, String text, SpeedCraftFunctional functional, Supplier<RecipeDisplay> displaySupplier) {
         super(rectangle, text);
         this.displaySupplier = displaySupplier;
         this.functional = functional;
+        Optional<Recipe> recipe = displaySupplier.get().getRecipe();
+        extraTooltip = recipe.isPresent() ? I18n.translate("text.rei.recipe_id", ChatFormat.GRAY.toString(), recipe.get().getId().toString()) : "";
     }
     
     @Override
@@ -40,6 +45,11 @@ public class SpeedCraftingButtonWidget extends ButtonWidget {
     
     @Override
     public Optional<String> getTooltips() {
+        if (this.minecraft.options.advancedItemTooltips)
+            if (enabled)
+                return Optional.ofNullable(I18n.translate("text.speed_craft.move_items") + extraTooltip);
+            else
+                return Optional.ofNullable(I18n.translate("text.speed_craft.failed_move_items") + extraTooltip);
         if (enabled)
             return Optional.ofNullable(I18n.translate("text.speed_craft.move_items"));
         else