diff options
Diffstat (limited to 'src')
2 files changed, 13 insertions, 4 deletions
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 a0aee5d908..371da26102 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 @@ -48,7 +48,8 @@ public abstract class GT_Cover_AdvancedRedstoneReceiverBase extends GT_Cover_Adv AND, NAND, OR, - NOR + NOR, + SINGLE_SOURCE } public static class ReceiverData extends GT_Cover_AdvancedWirelessRedstoneBase.WirelessData { @@ -106,7 +107,7 @@ public abstract class GT_Cover_AdvancedRedstoneReceiverBase extends GT_Cover_Adv } } - private class ReceiverGUI extends WirelessGUI<ReceiverData> { + private static class ReceiverGUI extends WirelessGUI<ReceiverData> { private static final int gateModeButtonIdStart = 1; @@ -120,7 +121,9 @@ public abstract class GT_Cover_AdvancedRedstoneReceiverBase extends GT_Cover_Adv new GT_GuiIconButton(this, gateModeButtonIdStart + 2, startX + spaceX * 2, startY + spaceY * 2, GT_GuiIcon.OR_GATE) .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")); + .setTooltipText(GT_Utility.trans("006", "NOR Gate")); + new GT_GuiIconButton(this, gateModeButtonIdStart + 4, startX + spaceX * 4, startY + spaceY * 2, GT_GuiIcon.PROGRESS) + .setTooltipText("ANALOG Mode", "Only use this mode with ONE transmitter in total,", "no logic involved"); } @Override @@ -141,7 +144,7 @@ public abstract class GT_Cover_AdvancedRedstoneReceiverBase extends GT_Cover_Adv private void updateButtons() { GuiButton button; - for (int i = gateModeButtonIdStart; i < gateModeButtonIdStart + 4; ++i) { + for (int i = gateModeButtonIdStart; i < gateModeButtonIdStart + 5; ++i) { button = (GuiButton) this.buttonList.get(i); button.enabled = (button.id - gateModeButtonIdStart) != coverVariable.mode.ordinal(); } diff --git a/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedWirelessRedstoneBase.java b/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedWirelessRedstoneBase.java index 2e73ae2094..542496619f 100644 --- a/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedWirelessRedstoneBase.java +++ b/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedWirelessRedstoneBase.java @@ -60,6 +60,12 @@ public abstract class GT_Cover_AdvancedWirelessRedstoneBase<T extends GT_Cover_A return (byte) (signals.values().stream() .map(signal -> signal > 0) .reduce(false, (signalA, signalB) -> signalA || signalB) ? 0 : 15); + case SINGLE_SOURCE: + if (signals.values().isEmpty()) { + return 0; + } + + return (Byte) signals.values().toArray()[0]; default: return 0; } |