From c2d28cbf7028ffed2f56169adbce3f03cc0c5b49 Mon Sep 17 00:00:00 2001 From: Unknown Date: Tue, 19 Mar 2019 14:25:15 +0800 Subject: v2.5 Beta --- .../rei/gui/widget/SpeedCraftingButtonWidget.java | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'src/main/java/me/shedaniel/rei/gui/widget/SpeedCraftingButtonWidget.java') 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 f3bc8658b..09571a246 100644 --- a/src/main/java/me/shedaniel/rei/gui/widget/SpeedCraftingButtonWidget.java +++ b/src/main/java/me/shedaniel/rei/gui/widget/SpeedCraftingButtonWidget.java @@ -2,13 +2,12 @@ package me.shedaniel.rei.gui.widget; import me.shedaniel.rei.api.RecipeDisplay; import me.shedaniel.rei.api.SpeedCraftFunctional; -import me.shedaniel.rei.client.ClientHelper; import me.shedaniel.rei.client.ScreenHelper; import net.minecraft.client.MinecraftClient; import net.minecraft.client.resource.language.I18n; import java.awt.*; -import java.util.Arrays; +import java.util.Optional; import java.util.function.Supplier; public class SpeedCraftingButtonWidget extends ButtonWidget { @@ -33,11 +32,13 @@ public class SpeedCraftingButtonWidget extends ButtonWidget { public void draw(int mouseX, int mouseY, float partialTicks) { this.enabled = functional != null && functional.acceptRecipe(ScreenHelper.getLastContainerScreen(), displaySupplier.get()); super.draw(mouseX, mouseY, partialTicks); - if (getBounds().contains(mouseX, mouseY)) - if (enabled) - ScreenHelper.getLastOverlay().addTooltip(new QueuedTooltip(ClientHelper.getMouseLocation(), Arrays.asList(I18n.translate("text.speed_craft.move_items")))); - else - ScreenHelper.getLastOverlay().addTooltip(new QueuedTooltip(ClientHelper.getMouseLocation(), Arrays.asList(I18n.translate("text.speed_craft.failed_move_items")))); } + @Override + public Optional getTooltips() { + if (enabled) + return Optional.ofNullable(I18n.translate("text.speed_craft.move_items")); + else + return Optional.ofNullable(I18n.translate("text.speed_craft.failed_move_items")); + } } -- cgit