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 --- .../assets/gregtech/textures/gui/button/cover_normal.png | Bin 0 -> 685 bytes .../textures/gui/button/cover_normal_disabled.png | Bin 0 -> 324 bytes .../gregtech/textures/gui/button/cover_normal_hovered.png | Bin 0 -> 919 bytes .../assets/gregtech/textures/gui/button/standard.png | Bin 0 -> 507 bytes .../gregtech/textures/gui/button/standard_toggle.png | Bin 0 -> 541 bytes .../assets/gregtech/textures/gui/button/void_all.png | Bin 0 -> 262 bytes 6 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/main/resources/assets/gregtech/textures/gui/button/cover_normal.png create mode 100644 src/main/resources/assets/gregtech/textures/gui/button/cover_normal_disabled.png create mode 100644 src/main/resources/assets/gregtech/textures/gui/button/cover_normal_hovered.png create mode 100644 src/main/resources/assets/gregtech/textures/gui/button/standard.png create mode 100644 src/main/resources/assets/gregtech/textures/gui/button/standard_toggle.png create mode 100644 src/main/resources/assets/gregtech/textures/gui/button/void_all.png (limited to 'src/main/resources/assets/gregtech/textures/gui/button') diff --git a/src/main/resources/assets/gregtech/textures/gui/button/cover_normal.png b/src/main/resources/assets/gregtech/textures/gui/button/cover_normal.png new file mode 100644 index 0000000000..3c440474e4 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/gui/button/cover_normal.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/button/cover_normal_disabled.png b/src/main/resources/assets/gregtech/textures/gui/button/cover_normal_disabled.png new file mode 100644 index 0000000000..6ff6a1d710 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/gui/button/cover_normal_disabled.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/button/cover_normal_hovered.png b/src/main/resources/assets/gregtech/textures/gui/button/cover_normal_hovered.png new file mode 100644 index 0000000000..cdf987b74a Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/gui/button/cover_normal_hovered.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/button/standard.png b/src/main/resources/assets/gregtech/textures/gui/button/standard.png new file mode 100644 index 0000000000..ea5dbe69d2 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/gui/button/standard.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/button/standard_toggle.png b/src/main/resources/assets/gregtech/textures/gui/button/standard_toggle.png new file mode 100644 index 0000000000..f5b1a762a3 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/gui/button/standard_toggle.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/button/void_all.png b/src/main/resources/assets/gregtech/textures/gui/button/void_all.png new file mode 100644 index 0000000000..dbbb40c9e4 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/gui/button/void_all.png differ -- cgit