Merge remote-tracking branch 'origin/8.x-1.18.2' into modularity

# Conflicts:
#	api/build.gradle
#	default-plugin/build.gradle
#	forge/src/main/java/me/shedaniel/rei/forge/PluginDetectorImpl.java
#	runtime-frontend/overlay-entries/src/main/java/me/shedaniel/rei/impl/client/gui/overlay/entries/EntryListStackEntry.java
#	runtime/src/main/java/me/shedaniel/rei/impl/client/gui/screen/AbstractDisplayViewingScreen.java
#	runtime/src/main/java/me/shedaniel/rei/impl/client/gui/screen/CompositeDisplayViewingScreen.java
#	runtime/src/main/java/me/shedaniel/rei/impl/client/gui/screen/DefaultDisplayViewingScreen.java
#	runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/InternalWidgets.java

1 files changed, 5 insertions, 3 deletions

diff --git a/runtime-frontend/overlay-entries/src/main/java/me/shedaniel/rei/impl/client/gui/overlay/entries/EntryListStackEntry.java b/runtime-frontend/overlay-entries/src/main/java/me/shedaniel/rei/impl/client/gui/overlay/entries/EntryListStackEntry.java
index a093050f5..c9d868c29 100644
--- a/runtime-frontend/overlay-entries/src/main/java/me/shedaniel/rei/impl/client/gui/overlay/entries/EntryListStackEntry.java
+++ b/runtime-frontend/overlay-entries/src/main/java/me/shedaniel/rei/impl/client/gui/overlay/entries/EntryListStackEntry.java
@@ -41,6 +41,8 @@ import me.shedaniel.rei.api.common.entry.EntryStack;
 import me.shedaniel.rei.impl.client.gui.overlay.entries.cache.CachedEntryListRender;
 import me.shedaniel.rei.impl.client.gui.overlay.widgets.DisplayedEntryWidget;
 import net.minecraft.ChatFormatting;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.client.gui.components.events.GuiEventListener;
 import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.util.Mth;
@@ -147,7 +149,7 @@ public class EntryListStackEntry extends DisplayedEntryWidget {
     
     @Override
     public boolean doMouse(Slot slot, double mouseX, double mouseY, int button) {
-        if (collapsedStack != null) {
+        if (collapsedStack != null && button == 0 && Screen.hasAltDown()) {
             parent.updatedCount++;
             collapsedStack.setExpanded(!collapsedStack.isExpanded());
             parent.updateEntriesPosition();
@@ -180,7 +182,7 @@ public class EntryListStackEntry extends DisplayedEntryWidget {
             if (!this.collapsedStack.isExpanded()) {
                 tooltip = Tooltip.create(new Point(tooltip.getX(), tooltip.getY()), 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;
@@ -189,7 +191,7 @@ public class EntryListStackEntry extends DisplayedEntryWidget {
         
         tooltip = super.apply(tooltip);
         if (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;