From 486c6c981799bf515484891ecf1b7e7188da31e6 Mon Sep 17 00:00:00 2001
From: shedaniel <daniel@shedaniel.me>
Date: Fri, 21 Oct 2022 16:43:38 +0800
Subject: Fix #1163

---
 .../rei/impl/client/gui/widget/entrylist/EntryListStackEntry.java | 8 +++++---
 .../src/main/resources/assets/roughlyenoughitems/lang/en_us.json  | 6 ++++--
 2 files changed, 9 insertions(+), 5 deletions(-)

(limited to 'runtime/src')

diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/entrylist/EntryListStackEntry.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/entrylist/EntryListStackEntry.java
index 31b03aca1..f0b0424d1 100644
--- a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/entrylist/EntryListStackEntry.java
+++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/entrylist/EntryListStackEntry.java
@@ -39,6 +39,8 @@ import me.shedaniel.rei.impl.client.gui.widget.CachedEntryListRender;
 import me.shedaniel.rei.impl.client.gui.widget.DisplayedEntryWidget;
 import me.shedaniel.rei.impl.common.entry.type.collapsed.CollapsedStack;
 import net.minecraft.ChatFormatting;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.util.Mth;
 import net.minecraft.world.inventory.tooltip.TooltipComponent;
@@ -148,7 +150,7 @@ public class EntryListStackEntry extends DisplayedEntryWidget {
     
     @Override
     protected boolean doAction(double mouseX, double mouseY, int button) {
-        if (collapsedStack != null) {
+        if (collapsedStack != null && button == 0 && Screen.hasAltDown()) {
             parent.updatedCount++;
             collapsedStack.setExpanded(!collapsedStack.isExpanded());
             parent.updateEntriesPosition();
@@ -182,7 +184,7 @@ public class EntryListStackEntry extends DisplayedEntryWidget {
             if (!this.collapsedStack.isExpanded()) {
                 Tooltip tooltip = Tooltip.create(point, new TranslatableComponent("text.rei.collapsed.entry", collapsedStack.getName()));
                 tooltip.add((TooltipComponent) new CollapsedEntriesTooltip(collapsedStack));
-                tooltip.add(new TranslatableComponent("text.rei.collapsed.entry.hint.expand", collapsedStack.getName(), collapsedStack.getIngredient().size())
+                tooltip.add(new TranslatableComponent(Minecraft.ON_OSX ? "text.rei.collapsed.entry.hint.expand.macos" : "text.rei.collapsed.entry.hint.expand", collapsedStack.getName(), collapsedStack.getIngredient().size())
                         .withStyle(ChatFormatting.GRAY, ChatFormatting.ITALIC));
                 ClientHelper.getInstance().appendModIdToTooltips(tooltip, collapsedStack.getModId());
                 return tooltip;
@@ -191,7 +193,7 @@ public class EntryListStackEntry extends DisplayedEntryWidget {
         
         Tooltip tooltip = super.getCurrentTooltip(point);
         if (tooltip != null && this.collapsedStack != null) {
-            tooltip.entries().add(Mth.clamp(tooltip.entries().size() - 1, 0, tooltip.entries().size() - 1), Tooltip.entry(new TranslatableComponent("text.rei.collapsed.entry.hint.collapse", collapsedStack.getName(), collapsedStack.getIngredient().size())
+            tooltip.entries().add(Mth.clamp(tooltip.entries().size() - 1, 0, tooltip.entries().size() - 1), Tooltip.entry(new TranslatableComponent(Minecraft.ON_OSX ? "text.rei.collapsed.entry.hint.collapse.macos" : "text.rei.collapsed.entry.hint.collapse", collapsedStack.getName(), collapsedStack.getIngredient().size())
                     .withStyle(ChatFormatting.GRAY, ChatFormatting.ITALIC)));
         }
         return tooltip;
diff --git a/runtime/src/main/resources/assets/roughlyenoughitems/lang/en_us.json b/runtime/src/main/resources/assets/roughlyenoughitems/lang/en_us.json
index 9b4606603..40d002df9 100755
--- a/runtime/src/main/resources/assets/roughlyenoughitems/lang/en_us.json
+++ b/runtime/src/main/resources/assets/roughlyenoughitems/lang/en_us.json
@@ -176,8 +176,10 @@
   "text.rei.changelog.error.missingChangelogFile": "Missing changelog File!",
   "text.rei.changelog.error.failedToReadChangelogFile": "Failed to read changelog File!",
   "text.rei.collapsed.entry": "Collapsed Entry: %s",
-  "text.rei.collapsed.entry.hint.expand": "Click to expand all %s (%d entries)",
-  "text.rei.collapsed.entry.hint.collapse": "Click to collapse all %s (%d entries)",
+  "text.rei.collapsed.entry.hint.expand": "Alt-Click to expand all %s (%d entries)",
+  "text.rei.collapsed.entry.hint.expand.macos": "Option-Click to expand all %s (%d entries)",
+  "text.rei.collapsed.entry.hint.collapse": "Alt-Click to collapse all %s (%d entries)",
+  "text.rei.collapsed.entry.hint.collapse.macos": "Option-Click to collapse all %s (%d entries)",
   "favorite.section.gamemode": "Game Mode",
   "favorite.section.weather": "Weather",
   "favorite.section.time": "Time",
-- 
cgit