From 9a2741128a78bb52eba50a631126e090a5a2abd8 Mon Sep 17 00:00:00 2001 From: miozune Date: Sat, 26 Nov 2022 01:45:28 +0900 Subject: Rewrite GUIs with ModularUI (#1381) * Base work for ModularUI compat * Remove useless interface * Add almost all the widgets * Invert method * Refactor NEI stack placement positions * NEI handlers on ModularUI * Add some more docs * AdvDebugStructureWriter * Fix NEI progressbar not working * PrimitiveBlastFurnace * clean * derp * clean * spotlessApply * Boilers * Buffers * clean * N by N slots containers * Fix boilers not having bucket interaction Put opening UI to individual MetaTEs * Maintenance Hatch * clean * spotlessApply * Add dependency * IndustrialApiary * Adapt to ModularUI change * Base work for covers & fix crash with MP * Fix crash with server * Rewrite base work for covers * Send initial cover data on cover GUI open so that the time of showing incorrect data will be eliminated * Covers part 1 * Rename package: ModularUI -> modularui * Rename class: GT_UIInfo -> GT_UIInfos * Fix build * Covers part2 * Fix missing client check with tile UI & fix title overlap * CoverTabLine * Move cover window creators to inner class * Fix crash with null base TE * Close GUI when tile is broken * Color cover window with tile colorization * Change signature of addUIWidgets * FluidFilter cover, FluidDisplaySlotWidget, BasicTank, BasicGenerator, Output Hatch, MicrowaveEnergyTransmitter, Teleporter, DigitalChest, DigitalTank * Add title tab * Move package: modularui -> modularui/widget * Programmed circuit + IConfigurationCircuitSupport * clean * VolumetricFlask * Remove integrated circuit overlay from recipe input slots * Input Hatch & Quadruple Input Hatch * Multiblock * Deprecate old cover GUI * BasicMachines * Finish BasicMachine & NEI * Expand DTPF NEI to 9 slots * Fix ME input bus on MP * Move AESlotWidget to public class * Move GT_Recipe_Map constructors with mNEIUnificateOutput to setter method * Move SteamTexture.Variant to outer enum * Switch to remote repository * oops * Update MUI * Update MUI * Minor refactor for change amount buttons * Display items and fluids that exceed usual count * blah * use +=, why didn't I do this * Update MUI * Move ModularUI to Base (#1510) * Move ModularUI to Base * Move most of the ModularUI functionality to `BaseTileEntity` (and `CoverableTileEntity`) * `CommonMetaTileEntity` delegates ato the MetaTileEntity * Added several interfaces (with defaults) to indicate if a tile/metatile override/implement certain behaviors. * Moved `IConfigurationCircuitSupport` interface such that it will work with BaseTileEntity or a MetaTileEntity * Address reviews Co-authored-by: miozune * Update MUI * Minor changes to NEI * Return :facepalm: * IGetTabIconSet override * Some more changes to NEI * Merge texture getter interfaces to new class GUITextureSet * Remove BBF structure picture as it's auto-buildable now * Make unified title tab style of texture angular * Expose some boiler texture getters for addon * Fix crash with cover GUI on pipe * Lower the number of recipe per page for DTPF & update MUI * Update MUI * Fix crash with middle-clicking slot on circuit selection GUI * Fix circuit selection window not syncing item from base machine * Merge GT_NEI_AssLineHandler into GT_NEI_DefaultHandler * Update MUI * Add in TecTech multi message * Allow changing the way of binding player inventory * Update MUI * Update MUI * Update MUI * Update MUI * Update MUI * Make MUI non-transitive to allow addons to use their own version * Force enable mixin * Format fluid amount tooltip * Add GUITextureSet.STEAM * Add guard against null ModularWindow creation * Add constructors for Muffler Hatch with inventory * Fix output slot on digital chest and tank allowing insertion * Don't log null ModularWindow * Add default implementation for IHasWorldObjectAndCoords#openGUI * Make openGTTileEntityUI accept MultiTE & cleanup Co-authored-by: Jason Mitchell --- src/main/resources/assets/gregtech/lang/en_US.lang | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) (limited to 'src/main/resources/assets/gregtech/lang') diff --git a/src/main/resources/assets/gregtech/lang/en_US.lang b/src/main/resources/assets/gregtech/lang/en_US.lang index 99a6c86bc0..9452189073 100644 --- a/src/main/resources/assets/gregtech/lang/en_US.lang +++ b/src/main/resources/assets/gregtech/lang/en_US.lang @@ -168,8 +168,6 @@ GT5U.machines.stalled_vent.tooltip=§4Stalled: Cannot vent steam! GT5U.machines.stalled_vent.tooltip.1=§7Right-click with a wrench to GT5U.machines.stalled_vent.tooltip.2=§7point this machine's steam GT5U.machines.stalled_vent.tooltip.3=§7vent towards an empty space. -GT5U.machines.stalled_vent.tooltip.extended=§7Progress was lost, but not -GT5U.machines.stalled_vent.tooltip.extended.1=§7the recipe's output. GT5U.machines.oreprocessor=§eRunning Mode: %s §cTime: %s s GT5U.machines.oreprocessor.void=§eVoid Stone Dust: %s GT5U.machines.industrialapiary.cancel.tooltip=§cCancel process @@ -203,8 +201,12 @@ GT5U.machines.advdebugstructurewriter.gui.size=Structure Size GT5U.machines.advdebugstructurewriter.gui.print.tooltip=Print Structure 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.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.gui.select.current=Current: @@ -263,6 +265,8 @@ GT5U.config.interface.TooltipShiftVerbosity=Tooltip verbosity (LSHIFT Down) GT5U.config.interface.TooltipShiftVerbosity.tooltip=How verbose should GregTech interface tooltips be when LSHIFT is held down?\n0: No tooltips\n1: One line tooltips only\n2: Normal tooltips\n3+: Extended tooltips [DEFAULT] GT5U.config.interface.CircuitsOrder=Circuits Order (See details) GT5U.config.interface.CircuitsOrder.tooltip=What is the order of the circuits when they are selected?\nFill in the Unique Identifier of the circuits.\nFor example: gregtech:gt.integrated_circuit +GT5U.config.interface.TitleTabStyle=Title Tab Style (See details) +GT5U.config.interface.TitleTabStyle.tooltip=Which style to use for title tab on machine GUI?\n0: text tab split-dark [DEFAULT]\n1: text tab unified\n2: item icon tab GT5U.config.preference=Client Preference GT5U.config.preference.mInputBusInitialFilter=Input Bus Initial Input Filter Status GT5U.config.preference.mInputBusInitialFilter.tooltip=Whether Input busses enable the input filter upon placed\nDoes not affect busses placed by others\nDoes not affect existing busses @@ -286,7 +290,7 @@ GT5U.config.nei.OriginalVoltage=Show original voltage when overclocked GT5U.config.waila=Waila GT5U.config.waila.WailaTransformerVoltageTier=Show voltage tier of transformer -// Cover tabs +# Cover tabs GT5U.interface.coverTabs.down=Bottom GT5U.interface.coverTabs.up=Top GT5U.interface.coverTabs.north=North @@ -1031,7 +1035,7 @@ fluid.Ammonium Dinitramide=Ammonium Dinitramide fluid.LMP-103S=LMP-103S fluid.Nitromethane=Nitromethane fluid.O-Xylene=O-Xylene -//GT_MetaGenerated_Item_98 cells +# GT_MetaGenerated_Item_98 cells fluid.UnknownNutrientAgar=Unknown Nutrient Agar fluid.SeaweedBroth=Seaweed Broth fluid.EnzymesSollution=Enzyme Solution @@ -1039,7 +1043,7 @@ fluid.escherichiakolifluid=eColi Bacteria Fluid fluid.Penicillin=Penicillin fluid.FluorecentdDNA=Fluorescent DNA fluid.Polymerase=Polymerase -//No cell, most from bart bio +# No cell, most from bart bio fluid.Monomethylhydrazine=Monomethylhydrazine fluid.binnibacteriafluid=binnibacteriafluid fluid.barnadafisarboriatorisfluid=barnadafisarboriatorisfluid @@ -1048,12 +1052,12 @@ fluid.sludge=sludge fluid.Formaldehyde=Formaldehyde fluid.tcetieisfucusserratusfluid=tcetieisfucusserratusfluid fluid.MeatExtract=MeatExtract -//No recipe +# No recipe fluid.CompressedOxygen=CompressedOxygen fluid.CompressedNitrogen=CompressedNitrogen fluid.redplasma=redplasma fluid.tile.fluidBlockSludge=fluidBlockSludge -//No Textrue +# No Texture fluid.guano=guano fluid.poo=poo fluid.sewerage=sewerage -- cgit