From 5a3ce692c6da21cb45c12db9076cf344ad4b4f6e Mon Sep 17 00:00:00 2001 From: Matej Dipčár <492666@mail.muni.cz> Date: Wed, 21 Sep 2022 02:58:15 +0200 Subject: Implement all advanced receiver modes --- src/main/java/gregtech/api/gui/widgets/GT_GuiIcon.java | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src/main/java/gregtech/api/gui/widgets') diff --git a/src/main/java/gregtech/api/gui/widgets/GT_GuiIcon.java b/src/main/java/gregtech/api/gui/widgets/GT_GuiIcon.java index 37e1a6d960..2be46dfa14 100644 --- a/src/main/java/gregtech/api/gui/widgets/GT_GuiIcon.java +++ b/src/main/java/gregtech/api/gui/widgets/GT_GuiIcon.java @@ -30,6 +30,11 @@ public enum GT_GuiIcon implements IGuiIcon { GREEN_ARROW_DOWN(0, 32 * 5, 32 * 2), CYCLIC(0, 32 * 6, 32 * 2), + AND_GATE(0, 0, 32 * 3), + NAND_GATE(0, 32, 32 * 3), + OR_GATE(0, 32 * 2, 32 * 3), + NOR_GATE(0, 32 * 3, 32 * 3), + SLOT_DARKGRAY(1, 176, 0, 18, 18), SLOT_GRAY(1, 176, 18, 18, 18), -- cgit From b84e99b5a2f4071c0bd97524380f7aebd01811fe Mon Sep 17 00:00:00 2001 From: Matej Dipčár <492666@mail.muni.cz> Date: Fri, 23 Sep 2022 01:09:13 +0200 Subject: Add new icon for the analog mode --- .../java/gregtech/api/gui/widgets/GT_GuiIcon.java | 1 + .../GT_Cover_AdvancedRedstoneReceiverBase.java | 2 +- .../assets/gregtech/textures/gui/GuiButtons.png | Bin 9078 -> 20373 bytes 3 files changed, 2 insertions(+), 1 deletion(-) (limited to 'src/main/java/gregtech/api/gui/widgets') diff --git a/src/main/java/gregtech/api/gui/widgets/GT_GuiIcon.java b/src/main/java/gregtech/api/gui/widgets/GT_GuiIcon.java index 2be46dfa14..43fbe0711c 100644 --- a/src/main/java/gregtech/api/gui/widgets/GT_GuiIcon.java +++ b/src/main/java/gregtech/api/gui/widgets/GT_GuiIcon.java @@ -34,6 +34,7 @@ public enum GT_GuiIcon implements IGuiIcon { NAND_GATE(0, 32, 32 * 3), OR_GATE(0, 32 * 2, 32 * 3), NOR_GATE(0, 32 * 3, 32 * 3), + ANALOG_MODE(0, 32 * 4, 32 * 3), SLOT_DARKGRAY(1, 176, 0, 18, 18), SLOT_GRAY(1, 176, 18, 18, 18), diff --git a/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneReceiverBase.java b/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneReceiverBase.java index 371da26102..bf56270267 100644 --- a/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneReceiverBase.java +++ b/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneReceiverBase.java @@ -122,7 +122,7 @@ public abstract class GT_Cover_AdvancedRedstoneReceiverBase extends GT_Cover_Adv .setTooltipText(GT_Utility.trans("006", "OR Gate")); new GT_GuiIconButton(this, gateModeButtonIdStart + 3, startX + spaceX * 3, startY + spaceY * 2, GT_GuiIcon.NOR_GATE) .setTooltipText(GT_Utility.trans("006", "NOR Gate")); - new GT_GuiIconButton(this, gateModeButtonIdStart + 4, startX + spaceX * 4, startY + spaceY * 2, GT_GuiIcon.PROGRESS) + new GT_GuiIconButton(this, gateModeButtonIdStart + 4, startX + spaceX * 4, startY + spaceY * 2, GT_GuiIcon.ANALOG_MODE) .setTooltipText("ANALOG Mode", "Only use this mode with ONE transmitter in total,", "no logic involved"); } diff --git a/src/main/resources/assets/gregtech/textures/gui/GuiButtons.png b/src/main/resources/assets/gregtech/textures/gui/GuiButtons.png index 255bdc2aab..d621e199c3 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/GuiButtons.png and b/src/main/resources/assets/gregtech/textures/gui/GuiButtons.png differ -- cgit