From d1b3a4099405c3ca05cf10509ab678173382543d Mon Sep 17 00:00:00 2001 From: shedaniel Date: Mon, 18 Nov 2019 19:21:00 +0800 Subject: 3.2.8 --- .../rei/gui/widget/AutoCraftingButtonWidget.java | 18 +++++++++++++++++- .../assets/roughlyenoughitems/lang/en_us.json | 1 + 2 files changed, 18 insertions(+), 1 deletion(-) (limited to 'src') 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 dbc63d91c..47e770f50 100644 --- a/src/main/java/me/shedaniel/rei/gui/widget/AutoCraftingButtonWidget.java +++ b/src/main/java/me/shedaniel/rei/gui/widget/AutoCraftingButtonWidget.java @@ -14,19 +14,33 @@ import me.shedaniel.math.impl.PointHelper; import me.shedaniel.rei.api.*; import me.shedaniel.rei.gui.toast.CopyRecipeIdentifierToast; import me.shedaniel.rei.impl.ScreenHelper; +import net.minecraft.client.MinecraftClient; 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 net.minecraft.util.math.MathHelper; +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; public class AutoCraftingButtonWidget extends ButtonWidget { + private static final Lazy 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 displaySupplier; private String extraTooltip; private List errorTooltip; @@ -161,7 +175,9 @@ public class AutoCraftingButtonWidget extends ButtonWidget { public Optional getTooltips() { String str = ""; if (errorTooltip == null) { - str += I18n.translate("text.auto_craft.move_items"); + if (IS_YOG.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"; diff --git a/src/main/resources/assets/roughlyenoughitems/lang/en_us.json b/src/main/resources/assets/roughlyenoughitems/lang/en_us.json index 371b9b823..ce1bf909c 100755 --- a/src/main/resources/assets/roughlyenoughitems/lang/en_us.json +++ b/src/main/resources/assets/roughlyenoughitems/lang/en_us.json @@ -40,6 +40,7 @@ "ordering.rei.name": "Name", "ordering.rei.item_groups": "Item Groups", "text.auto_craft.move_items": "Move Items", + "text.auto_craft.move_items.yog": "Generate NullPointerException!!", "error.rei.transfer.too_small": "Unable to move items to a %dx%d grid.", "error.rei.not.on.server": "REI is not on the server.", "error.rei.not.enough.materials": "Not enough materials.", -- cgit