From c0b54fae494fcd8bba476eb0153c8689a85231cc Mon Sep 17 00:00:00 2001
From: shedaniel <daniel@shedaniel.me>
Date: Mon, 20 Jan 2020 22:00:51 +0800
Subject: Fix #246

---
 .../rei/gui/widget/AutoCraftingButtonWidget.java    | 21 ++++-----------------
 1 file changed, 4 insertions(+), 17 deletions(-)

(limited to 'src/main/java/me/shedaniel/rei/gui/widget/AutoCraftingButtonWidget.java')

diff --git a/src/main/java/me/shedaniel/rei/gui/widget/AutoCraftingButtonWidget.java b/src/main/java/me/shedaniel/rei/gui/widget/AutoCraftingButtonWidget.java
index c0d37da28..062eddfdc 100644
--- a/src/main/java/me/shedaniel/rei/gui/widget/AutoCraftingButtonWidget.java
+++ b/src/main/java/me/shedaniel/rei/gui/widget/AutoCraftingButtonWidget.java
@@ -12,35 +12,22 @@ import me.shedaniel.math.api.Rectangle;
 import me.shedaniel.math.impl.PointHelper;
 import me.shedaniel.rei.api.*;
 import me.shedaniel.rei.gui.toast.CopyRecipeIdentifierToast;
+import me.shedaniel.rei.impl.ClientHelperImpl;
 import me.shedaniel.rei.impl.ScreenHelper;
-import net.minecraft.client.MinecraftClient;
+import me.shedaniel.rei.utils.CollectionUtils;
 import net.minecraft.client.gui.screen.ingame.AbstractContainerScreen;
 import net.minecraft.client.resource.language.I18n;
 import net.minecraft.util.Formatting;
 import net.minecraft.util.Identifier;
-import net.minecraft.util.Lazy;
 import org.jetbrains.annotations.ApiStatus;
 
-import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Optional;
-import java.util.UUID;
 import java.util.function.Supplier;
-import java.util.stream.Collectors;
 
 @ApiStatus.Internal
 public class AutoCraftingButtonWidget extends ButtonWidget {
     
-    private static final Lazy<Boolean> IS_YOG = new Lazy<>(() -> {
-        try {
-            if (MinecraftClient.getInstance().getSession().getProfile().getId().equals(UUID.fromString("f9546389-9415-4358-9c29-2c26b25bff5b")))
-                return true;
-            LocalDateTime now = LocalDateTime.now();
-            return now.getMonthValue() == 4 && now.getDayOfMonth() == 1;
-        } catch (Throwable throwable) {
-            return false;
-        }
-    });
     private final Supplier<RecipeDisplay> displaySupplier;
     private String extraTooltip;
     private List<String> errorTooltip;
@@ -156,14 +143,14 @@ public class AutoCraftingButtonWidget extends ButtonWidget {
     public Optional<String> getTooltips() {
         String str = "";
         if (errorTooltip == null) {
-            if (IS_YOG.get())
+            if (((ClientHelperImpl) ClientHelper.getInstance()).isYog.get())
                 str += I18n.translate("text.auto_craft.move_items.yog");
             else
                 str += I18n.translate("text.auto_craft.move_items");
         } else {
             if (errorTooltip.size() > 1)
                 str += Formatting.RED.toString() + I18n.translate("error.rei.multi.errors") + "\n";
-            str += errorTooltip.stream().map(s -> Formatting.RED.toString() + (errorTooltip.size() > 1 ? "- " : "") + I18n.translate(s)).collect(Collectors.joining("\n"));
+            str += CollectionUtils.mapAndJoinToString(errorTooltip, s -> Formatting.RED.toString() + (errorTooltip.size() > 1 ? "- " : "") + I18n.translate(s), "\n");
         }
         if (this.minecraft.options.advancedItemTooltips) {
             str += extraTooltip;
-- 
cgit