From 190d29ec4eecb6508a91288639b1b6194e077fda Mon Sep 17 00:00:00 2001 From: Yannick Marcotte-Gourde Date: Fri, 28 Jul 2023 09:03:54 -0400 Subject: Less hostile user interfaces (Buffer/Filter/Input bus) (#2165) * Made Emit Energy button a CycleButtonWidget * Made Emit Redstone button a CycleButtonWidget * Made Invert Redstone button a CycleButtonWidget * Made Stocking Mode button a CycleButtonWidget * Spotless apply * Made Invert Filter button a CycleButtonWidget * public bInvertFilter -> protected invertFilter * Deduplicated filter code * Made Allow NBT button a CycleButtonWidget * Made Ignore NBT button a CycleButtonWidget * public bNBTAllowed -> private allowNbt * public bNBTAllowed -> private ignoreNbt * Grey extended tooltips * Don't hardcode multiline tooltips * Document hidden functionality * Cleaned numeric constants * Fixed string constant declaration * Named constants in filter * Unify filter redstone behavior * Fix cover filter mode being inverted so that the displayed mode is the active one * Less magic numbers * Allow right clicking recipe filter * Display only machine type in recipe filter and cycle through compatible machines * Buffer tooltips show output voltage to clarify their role as passthroughs * Added more info to Emit EU/Redstone buttons * Added Sorting mode button to buffers/filters * Added Sorting mode button and stack limit button to input buses * Don't cycle prefixes when clicking with itemstack * Fixed tooltips to work off of the inventory * Fix RecipeFilter losing filter * Support multiblock machines * Use ModularUi syncers to sync state with client Thanks minecraft7771! * Grey text for recipe filter helper text * AnimatedTooltipHandler -> EnumChatFormatting * Explicited RecipeFilter filter building * Specify color for empty slot tooltip * Don't cache new uses of GT5U.MBTT.MachineType. Also corrected MachineType::description * Removed unused getItemExtraTooltip * Multiple returns in getItemStackMachineRecipeMap --- src/main/resources/assets/gregtech/lang/en_US.lang | 29 ++++++++++++++++++--- .../gui/overlay_button/one_stack_limit.png | Bin 0 -> 10548 bytes .../textures/gui/overlay_button/sorting_mode.png | Bin 0 -> 10100 bytes 3 files changed, 26 insertions(+), 3 deletions(-) create mode 100644 src/main/resources/assets/gregtech/textures/gui/overlay_button/one_stack_limit.png create mode 100644 src/main/resources/assets/gregtech/textures/gui/overlay_button/sorting_mode.png (limited to 'src/main/resources') diff --git a/src/main/resources/assets/gregtech/lang/en_US.lang b/src/main/resources/assets/gregtech/lang/en_US.lang index 837641d937..53c226fe83 100644 --- a/src/main/resources/assets/gregtech/lang/en_US.lang +++ b/src/main/resources/assets/gregtech/lang/en_US.lang @@ -308,10 +308,33 @@ GT5U.machines.advdebugstructurewriter.gui.highlight.tooltip=Show Bounding Box GT5U.machines.advdebugstructurewriter.gui.transpose.tooltip=Transpose GT5U.machines.nei_transfer.steam.tooltip=%s steam recipes GT5U.machines.nei_transfer.voltage.tooltip=Recipes available in %s +GT5U.machines.emit_energy.tooltip=Emit energy to output side +GT5U.machines.emit_energy.tooltip.1=§7Voltage: %1$s +GT5U.machines.emit_energy.tooltip.2=§7Amperage: §e%2$d +GT5U.machines.emit_redstone_if_full.tooltip=Emit redstone if no slot is free +GT5U.machines.emit_redstone_if_full.tooltip.1=§7Free slots: §9%1$s +GT5U.machines.emit_redstone_if_full.tooltip.2=§7Emitting: §c%2$d +GT5U.machines.emit_redstone_gradually.tooltip=Emit redstone for each slot in use +GT5U.machines.emit_redstone_gradually.tooltip.1=§7Free slots: §9%1$d +GT5U.machines.emit_redstone_gradually.tooltip.2=§7Emitting: §c%2$d +GT5U.machines.invert_redstone.tooltip=Invert redstone +GT5U.machines.buffer_stocking_mode.tooltip=Enable stocking mode +GT5U.machines.buffer_stocking_mode.tooltip.extended=§7Keeps this many items in destination rather than transfer items in batches of this amount. +GT5U.machines.buffer_stocking_mode.tooltip.extended.1=§7This mode can be server unfriendly. +GT5U.machines.sorting_mode.tooltip=Sort stacks +GT5U.machines.one_stack_limit.tooltip=Limit insertion +GT5U.machines.one_stack_limit.tooltip.extended=§7Up to 1 stack of each item can be inserted +GT5U.machines.invert_filter.tooltip=Invert Filter +GT5U.machines.allow_nbt.tooltip=Allow items with NBT +GT5U.machines.allow_nbt.tooltip.extended=§7By default, all items with NBT are blocked. +GT5U.machines.ignore_nbt.tooltip=Ignore item NBT +GT5U.machines.ignore_nbt.tooltip.extended=§7By default, item NBT must match. -GT5U.recipe_filter.representation_slot.tooltip=Click with a machine to set filter -GT5U.type_filter.representation_slot.tooltip.0=left click to forward -GT5U.type_filter.representation_slot.tooltip.1=right click to back +GT5U.recipe_filter.empty_representation_slot.tooltip=§7Click with a machine to set filter +GT5U.recipe_filter.representation_slot.tooltip=§7Click to clear +GT5U.type_filter.representation_slot.tooltip=§7Left click to cycle forward +GT5U.type_filter.representation_slot.tooltip.1=§7Right click to cycle back +GT5U.type_filter.representation_slot.tooltip.2=§7Click with an item to set filter GT5U.gui.select.current=Current: GT5U.gui.button.power_switch=Power Switch diff --git a/src/main/resources/assets/gregtech/textures/gui/overlay_button/one_stack_limit.png b/src/main/resources/assets/gregtech/textures/gui/overlay_button/one_stack_limit.png new file mode 100644 index 0000000000..8ebbb994eb Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/gui/overlay_button/one_stack_limit.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/overlay_button/sorting_mode.png b/src/main/resources/assets/gregtech/textures/gui/overlay_button/sorting_mode.png new file mode 100644 index 0000000000..5f505ebfe7 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/gui/overlay_button/sorting_mode.png differ -- cgit