From 9af741164c5b59c4d884aba48ebeab7db5442d63 Mon Sep 17 00:00:00 2001 From: miozune Date: Sun, 28 May 2023 18:21:42 +0900 Subject: Add new mode for void protection & implement it for more multis (#2024) * Void protection improvements * Rename methods: isXXXButtonEnabled -> supportsXXX * Adjust texture for forbidden * Add MultiBlockFeatureSupportDumpers * Fix oversight in PCBFactory * Revert void protection support for PA * Rename class: ControllerWithButtons -> ControllerWithOptionalFeatures --- src/main/resources/assets/gregtech/lang/en_US.lang | 15 ++++++++++++++- .../gregtech/textures/gui/button/standard_pressed.png | Bin 0 -> 505 bytes .../gregtech/textures/gui/overlay_button/forbidden.png | Bin 0 -> 842 bytes .../textures/gui/overlay_button/tank_void_all.png | Bin 0 -> 171 bytes .../textures/gui/overlay_button/tank_void_excess.png | Bin 0 -> 170 bytes .../gregtech/textures/gui/overlay_button/void_all.png | Bin 171 -> 0 bytes .../gregtech/textures/gui/overlay_button/void_excess.png | Bin 170 -> 0 bytes .../textures/gui/overlay_button/void_excess_all.png | Bin 0 -> 802 bytes .../textures/gui/overlay_button/void_excess_fluid.png | Bin 0 -> 784 bytes .../textures/gui/overlay_button/void_excess_item.png | Bin 0 -> 769 bytes .../textures/gui/overlay_button/void_excess_none.png | Bin 0 -> 772 bytes .../textures/gui/overlay_button/void_excess_off.png | Bin 772 -> 0 bytes .../gui/overlay_button/void_excess_off_disabled.png | Bin 729 -> 0 bytes .../textures/gui/overlay_button/void_excess_on.png | Bin 775 -> 0 bytes .../gui/overlay_button/void_excess_on_disabled.png | Bin 784 -> 0 bytes 15 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 src/main/resources/assets/gregtech/textures/gui/button/standard_pressed.png create mode 100644 src/main/resources/assets/gregtech/textures/gui/overlay_button/forbidden.png create mode 100644 src/main/resources/assets/gregtech/textures/gui/overlay_button/tank_void_all.png create mode 100644 src/main/resources/assets/gregtech/textures/gui/overlay_button/tank_void_excess.png delete mode 100644 src/main/resources/assets/gregtech/textures/gui/overlay_button/void_all.png delete mode 100644 src/main/resources/assets/gregtech/textures/gui/overlay_button/void_excess.png create mode 100644 src/main/resources/assets/gregtech/textures/gui/overlay_button/void_excess_all.png create mode 100644 src/main/resources/assets/gregtech/textures/gui/overlay_button/void_excess_fluid.png create mode 100644 src/main/resources/assets/gregtech/textures/gui/overlay_button/void_excess_item.png create mode 100644 src/main/resources/assets/gregtech/textures/gui/overlay_button/void_excess_none.png delete mode 100644 src/main/resources/assets/gregtech/textures/gui/overlay_button/void_excess_off.png delete mode 100644 src/main/resources/assets/gregtech/textures/gui/overlay_button/void_excess_off_disabled.png delete mode 100644 src/main/resources/assets/gregtech/textures/gui/overlay_button/void_excess_on.png delete mode 100644 src/main/resources/assets/gregtech/textures/gui/overlay_button/void_excess_on_disabled.png (limited to 'src/main/resources/assets') diff --git a/src/main/resources/assets/gregtech/lang/en_US.lang b/src/main/resources/assets/gregtech/lang/en_US.lang index 175b11cd6a..82afe5fa6d 100644 --- a/src/main/resources/assets/gregtech/lang/en_US.lang +++ b/src/main/resources/assets/gregtech/lang/en_US.lang @@ -211,12 +211,17 @@ GT5U.type_filter.representation_slot.tooltip.1=right click to back GT5U.gui.select.current=Current: GT5U.gui.button.power_switch=Power Switch -GT5U.gui.button.void_excess=Void Excess +GT5U.gui.button.voiding_mode=Voiding Mode: +GT5U.gui.button.voiding_mode_none=§7Void Nothing +GT5U.gui.button.voiding_mode_item=§7Void Excess §6Items +GT5U.gui.button.voiding_mode_fluid=§7Void Excess §9Fluids +GT5U.gui.button.voiding_mode_all=§7Void Excess §6Items §7and §9Fluids GT5U.gui.button.input_separation=Input Separation GT5U.gui.button.batch_mode=Batch Mode GT5U.gui.button.lock_recipe=Lock Recipe GT5U.gui.button.down_tier=Down Tier GT5U.gui.button.tier=Tier: +GT5U.gui.button.forbidden=§4Cannot change mode for this machine GT5U.item.programmed_circuit.select.header=Reprogram Circuit @@ -318,6 +323,14 @@ nei.options.tools.dump.gt5u.metatileentity=MetaTileEntity nei.options.tools.dump.gt5u.metatileentitys=MetaTileEntities nei.options.tools.dump.gt5u.material=Material nei.options.tools.dump.gt5u.materials=Materials +nei.options.tools.dump.gt5u.void_protection=Void protection missing support +nei.options.tools.dump.gt5u.void_protections=Void protection missing supports +nei.options.tools.dump.gt5u.input_separation=Input separation missing support +nei.options.tools.dump.gt5u.input_separations=Input separation missing supports +nei.options.tools.dump.gt5u.batch_mode=Batch mode missing support +nei.options.tools.dump.gt5u.batch_modes=Batch mode missing supports +nei.options.tools.dump.gt5u.recipe_locking=Recipe locking missing support +nei.options.tools.dump.gt5u.recipe_lockings=Recipe locking missing supports nei.options.tools.dump.gt5u.warn_env=You're outside of the pack. Some IDs present in the full pack might be missing in this dump. nei.options.tools.dump.gt5u.mode.0=Free nei.options.tools.dump.gt5u.mode.1=Used diff --git a/src/main/resources/assets/gregtech/textures/gui/button/standard_pressed.png b/src/main/resources/assets/gregtech/textures/gui/button/standard_pressed.png new file mode 100644 index 0000000000..9adb33eeb5 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/gui/button/standard_pressed.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/overlay_button/forbidden.png b/src/main/resources/assets/gregtech/textures/gui/overlay_button/forbidden.png new file mode 100644 index 0000000000..1cbb440882 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/gui/overlay_button/forbidden.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/overlay_button/tank_void_all.png b/src/main/resources/assets/gregtech/textures/gui/overlay_button/tank_void_all.png new file mode 100644 index 0000000000..7f0be5ec81 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/gui/overlay_button/tank_void_all.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/overlay_button/tank_void_excess.png b/src/main/resources/assets/gregtech/textures/gui/overlay_button/tank_void_excess.png new file mode 100644 index 0000000000..47b8698e53 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/gui/overlay_button/tank_void_excess.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/overlay_button/void_all.png b/src/main/resources/assets/gregtech/textures/gui/overlay_button/void_all.png deleted file mode 100644 index 7f0be5ec81..0000000000 Binary files a/src/main/resources/assets/gregtech/textures/gui/overlay_button/void_all.png and /dev/null differ diff --git a/src/main/resources/assets/gregtech/textures/gui/overlay_button/void_excess.png b/src/main/resources/assets/gregtech/textures/gui/overlay_button/void_excess.png deleted file mode 100644 index 47b8698e53..0000000000 Binary files a/src/main/resources/assets/gregtech/textures/gui/overlay_button/void_excess.png and /dev/null differ diff --git a/src/main/resources/assets/gregtech/textures/gui/overlay_button/void_excess_all.png b/src/main/resources/assets/gregtech/textures/gui/overlay_button/void_excess_all.png new file mode 100644 index 0000000000..2363260986 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/gui/overlay_button/void_excess_all.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/overlay_button/void_excess_fluid.png b/src/main/resources/assets/gregtech/textures/gui/overlay_button/void_excess_fluid.png new file mode 100644 index 0000000000..f496e3f2e1 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/gui/overlay_button/void_excess_fluid.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/overlay_button/void_excess_item.png b/src/main/resources/assets/gregtech/textures/gui/overlay_button/void_excess_item.png new file mode 100644 index 0000000000..2c5a9da6aa Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/gui/overlay_button/void_excess_item.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/overlay_button/void_excess_none.png b/src/main/resources/assets/gregtech/textures/gui/overlay_button/void_excess_none.png new file mode 100644 index 0000000000..ed7c3c92e8 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/gui/overlay_button/void_excess_none.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/overlay_button/void_excess_off.png b/src/main/resources/assets/gregtech/textures/gui/overlay_button/void_excess_off.png deleted file mode 100644 index ed7c3c92e8..0000000000 Binary files a/src/main/resources/assets/gregtech/textures/gui/overlay_button/void_excess_off.png and /dev/null differ diff --git a/src/main/resources/assets/gregtech/textures/gui/overlay_button/void_excess_off_disabled.png b/src/main/resources/assets/gregtech/textures/gui/overlay_button/void_excess_off_disabled.png deleted file mode 100644 index f16d932887..0000000000 Binary files a/src/main/resources/assets/gregtech/textures/gui/overlay_button/void_excess_off_disabled.png and /dev/null differ diff --git a/src/main/resources/assets/gregtech/textures/gui/overlay_button/void_excess_on.png b/src/main/resources/assets/gregtech/textures/gui/overlay_button/void_excess_on.png deleted file mode 100644 index 7ba3b14778..0000000000 Binary files a/src/main/resources/assets/gregtech/textures/gui/overlay_button/void_excess_on.png and /dev/null differ diff --git a/src/main/resources/assets/gregtech/textures/gui/overlay_button/void_excess_on_disabled.png b/src/main/resources/assets/gregtech/textures/gui/overlay_button/void_excess_on_disabled.png deleted file mode 100644 index 23d0190f67..0000000000 Binary files a/src/main/resources/assets/gregtech/textures/gui/overlay_button/void_excess_on_disabled.png and /dev/null differ -- cgit