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/java/gregtech/common/covers/GT_Cover_ItemFilter.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/main/java/gregtech/common/covers') diff --git a/src/main/java/gregtech/common/covers/GT_Cover_ItemFilter.java b/src/main/java/gregtech/common/covers/GT_Cover_ItemFilter.java index c0cdee78a3..a142259438 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_ItemFilter.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_ItemFilter.java @@ -227,10 +227,10 @@ public class GT_Cover_ItemFilter extends GT_CoverBehaviorBase widget .setToggleTexture( - GT_UITextures.OVERLAY_BUTTON_WHITELIST, - GT_UITextures.OVERLAY_BUTTON_BLACKLIST) - .addTooltip(0, GT_Utility.trans("124.1", "Blacklist Mode")) - .addTooltip(1, GT_Utility.trans("125.1", "Whitelist Mode")) + GT_UITextures.OVERLAY_BUTTON_BLACKLIST, + GT_UITextures.OVERLAY_BUTTON_WHITELIST) + .addTooltip(0, GT_Utility.trans("125.1", "Whitelist Mode")) + .addTooltip(1, GT_Utility.trans("124.1", "Blacklist Mode")) .setPos(spaceX * 0, spaceY * 0)) .addFollower( new CoverDataFollower_SlotWidget<>(filterInvHandler, 0, true), -- cgit