diff options
Diffstat (limited to 'runtime/src/main')
| -rw-r--r-- | runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/entrylist/EntryListStackEntry.java | 8 | ||||
| -rwxr-xr-x | runtime/src/main/resources/assets/roughlyenoughitems/lang/en_us.json | 6 |
2 files changed, 9 insertions, 5 deletions
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 26a75fbed..c4201807d 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.Component; import net.minecraft.util.Mth; import org.jetbrains.annotations.Nullable; @@ -147,7 +149,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(); @@ -181,7 +183,7 @@ public class EntryListStackEntry extends DisplayedEntryWidget { if (!this.collapsedStack.isExpanded()) { Tooltip tooltip = Tooltip.create(context.getPoint(), Component.translatable("text.rei.collapsed.entry", collapsedStack.getName())); tooltip.add(new CollapsedEntriesTooltip(collapsedStack)); - tooltip.add(Component.translatable("text.rei.collapsed.entry.hint.expand", collapsedStack.getName(), collapsedStack.getIngredient().size()) + tooltip.add(Component.translatable(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; @@ -190,7 +192,7 @@ public class EntryListStackEntry extends DisplayedEntryWidget { Tooltip tooltip = super.getCurrentTooltip(context); if (tooltip != null && this.collapsedStack != null) { - tooltip.entries().add(Mth.clamp(tooltip.entries().size() - 1, 0, tooltip.entries().size() - 1), Tooltip.entry(Component.translatable("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(Component.translatable(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", |