diff options
author | boubou19 <miisterunknown@gmail.com> | 2023-04-01 18:11:43 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-04-01 18:11:43 +0200 |
commit | 5f50e4a36ec000657b0a1664784acf00275293c6 (patch) | |
tree | 5ef81441032735438c9fd9c620224ca58e46e537 /src/main/java/gregtech/common/covers/redstone | |
parent | 6b77557e0e87cf5afd9ebd3985323ff1249e615c (diff) | |
download | GT5-Unofficial-5f50e4a36ec000657b0a1664784acf00275293c6.tar.gz GT5-Unofficial-5f50e4a36ec000657b0a1664784acf00275293c6.tar.bz2 GT5-Unofficial-5f50e4a36ec000657b0a1664784acf00275293c6.zip |
update spotless formatting (#1827)
Diffstat (limited to 'src/main/java/gregtech/common/covers/redstone')
6 files changed, 168 insertions, 119 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 e296785cd8..bebedffaca 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 @@ -72,7 +72,9 @@ public abstract class GT_Cover_AdvancedRedstoneReceiverBase super.addUIWidgets(builder); builder.widget( new TextWidget(GT_Utility.trans("335", "Gate Mode")).setDefaultColor(COLOR_TEXT_GRAY.get()) - .setPos(startX + spaceX * 5, 4 + startY + spaceY * 2)); + .setPos( + startX + spaceX * 5, + 4 + startY + spaceY * 2)); } @SuppressWarnings("PointlessArithmeticExpression") @@ -87,48 +89,52 @@ public abstract class GT_Cover_AdvancedRedstoneReceiverBase return coverData; }, widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_GATE_AND) - .addTooltip(GT_Utility.trans("331", "AND Gate")).setPos(spaceX * 0, spaceY * 2)) - .addFollower( - CoverDataFollower_ToggleButtonWidget.ofDisableable(), - coverData -> coverData.mode == GateMode.NAND, - (coverData, state) -> { - coverData.mode = GateMode.NAND; - return coverData; - }, - widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_GATE_NAND) - .addTooltip(GT_Utility.trans("332", "NAND Gate")).setPos(spaceX * 1, spaceY * 2)) - .addFollower( - CoverDataFollower_ToggleButtonWidget.ofDisableable(), - coverData -> coverData.mode == GateMode.OR, - (coverData, state) -> { - coverData.mode = GateMode.OR; - return coverData; - }, - widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_GATE_OR) - .addTooltip(GT_Utility.trans("333", "OR Gate")).setPos(spaceX * 2, spaceY * 2)) - .addFollower( - CoverDataFollower_ToggleButtonWidget.ofDisableable(), - coverData -> coverData.mode == GateMode.NOR, - (coverData, state) -> { - coverData.mode = GateMode.NOR; - return coverData; - }, - widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_GATE_NOR) - .addTooltip(GT_Utility.trans("334", "NOR Gate")).setPos(spaceX * 3, spaceY * 2)) - .addFollower( - CoverDataFollower_ToggleButtonWidget.ofDisableable(), - coverData -> coverData.mode == GateMode.SINGLE_SOURCE, - (coverData, state) -> { - coverData.mode = GateMode.SINGLE_SOURCE; - return coverData; - }, - widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_ANALOG) - .addTooltips( - Arrays.asList( - "ANALOG Mode", - "Only use this mode with ONE transmitter in total,", - "no logic involved")) - .setPos(spaceX * 4, spaceY * 2)); + .addTooltip(GT_Utility.trans("331", "AND Gate")) + .setPos(spaceX * 0, spaceY * 2)) + .addFollower( + CoverDataFollower_ToggleButtonWidget.ofDisableable(), + coverData -> coverData.mode == GateMode.NAND, + (coverData, state) -> { + coverData.mode = GateMode.NAND; + return coverData; + }, + widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_GATE_NAND) + .addTooltip(GT_Utility.trans("332", "NAND Gate")) + .setPos(spaceX * 1, spaceY * 2)) + .addFollower( + CoverDataFollower_ToggleButtonWidget.ofDisableable(), + coverData -> coverData.mode == GateMode.OR, + (coverData, state) -> { + coverData.mode = GateMode.OR; + return coverData; + }, + widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_GATE_OR) + .addTooltip(GT_Utility.trans("333", "OR Gate")) + .setPos(spaceX * 2, spaceY * 2)) + .addFollower( + CoverDataFollower_ToggleButtonWidget.ofDisableable(), + coverData -> coverData.mode == GateMode.NOR, + (coverData, state) -> { + coverData.mode = GateMode.NOR; + return coverData; + }, + widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_GATE_NOR) + .addTooltip(GT_Utility.trans("334", "NOR Gate")) + .setPos(spaceX * 3, spaceY * 2)) + .addFollower( + CoverDataFollower_ToggleButtonWidget.ofDisableable(), + coverData -> coverData.mode == GateMode.SINGLE_SOURCE, + (coverData, state) -> { + coverData.mode = GateMode.SINGLE_SOURCE; + return coverData; + }, + widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_ANALOG) + .addTooltips( + Arrays.asList( + "ANALOG Mode", + "Only use this mode with ONE transmitter in total,", + "no logic involved")) + .setPos(spaceX * 4, spaceY * 2)); } } diff --git a/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneTransmitterBase.java b/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneTransmitterBase.java index f39b573742..e74dffb102 100644 --- a/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneTransmitterBase.java +++ b/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneTransmitterBase.java @@ -163,8 +163,10 @@ public abstract class GT_Cover_AdvancedRedstoneTransmitterBase<T extends GT_Cove } else { return ""; } - }).setSynced(false).setDefaultColor(COLOR_TEXT_GRAY.get()) - .setPos(startX + spaceX * 10, 4 + startY + spaceY * getButtonRow())); + }) + .setSynced(false) + .setDefaultColor(COLOR_TEXT_GRAY.get()) + .setPos(startX + spaceX * 10, 4 + startY + spaceY * getButtonRow())); } @Override @@ -178,8 +180,8 @@ public abstract class GT_Cover_AdvancedRedstoneTransmitterBase<T extends GT_Cove return coverData; }, widget -> widget.addTooltip(0, GT_Utility.trans("NORMAL", "Normal")) - .addTooltip(1, GT_Utility.trans("INVERTED", "Inverted")) - .setPos(spaceX * 9, spaceY * getButtonRow())); + .addTooltip(1, GT_Utility.trans("INVERTED", "Inverted")) + .setPos(spaceX * 9, spaceY * getButtonRow())); } } } 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 50302bade0..e619d72723 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 @@ -44,23 +44,34 @@ public abstract class GT_Cover_AdvancedWirelessRedstoneBase<T extends GT_Cover_A switch (mode) { case AND: - return (byte) (signals.values().stream().map(signal -> signal > 0) - .reduce(true, (signalA, signalB) -> signalA && signalB) ? 15 : 0); + return (byte) (signals.values() + .stream() + .map(signal -> signal > 0) + .reduce(true, (signalA, signalB) -> signalA && signalB) ? 15 : 0); case NAND: - return (byte) (signals.values().stream().map(signal -> signal > 0) - .reduce(true, (signalA, signalB) -> signalA && signalB) ? 0 : 15); + return (byte) (signals.values() + .stream() + .map(signal -> signal > 0) + .reduce(true, (signalA, signalB) -> signalA && signalB) ? 0 : 15); case OR: - return (byte) (signals.values().stream().map(signal -> signal > 0) - .reduce(false, (signalA, signalB) -> signalA || signalB) ? 15 : 0); + return (byte) (signals.values() + .stream() + .map(signal -> signal > 0) + .reduce(false, (signalA, signalB) -> signalA || signalB) ? 15 : 0); case NOR: - return (byte) (signals.values().stream().map(signal -> signal > 0) - .reduce(false, (signalA, signalB) -> signalA || signalB) ? 0 : 15); + return (byte) (signals.values() + .stream() + .map(signal -> signal > 0) + .reduce(false, (signalA, signalB) -> signalA || signalB) ? 0 : 15); case SINGLE_SOURCE: - if (signals.values().isEmpty()) { + if (signals.values() + .isEmpty()) { return 0; } - return signals.values().iterator().next(); + return signals.values() + .iterator() + .next(); default: return 0; } @@ -76,8 +87,9 @@ public abstract class GT_Cover_AdvancedWirelessRedstoneBase<T extends GT_Cover_A } public static void setSignalAt(UUID uuid, int frequency, long hash, byte value) { - Map<Integer, Map<Long, Byte>> frequencies = GregTech_API.sAdvancedWirelessRedstone - .computeIfAbsent(String.valueOf(uuid), k -> new ConcurrentHashMap<>()); + Map<Integer, Map<Long, Byte>> frequencies = GregTech_API.sAdvancedWirelessRedstone.computeIfAbsent( + String.valueOf(uuid), + k -> new ConcurrentHashMap<>()); Map<Long, Byte> signals = frequencies.computeIfAbsent(frequency, k -> new ConcurrentHashMap<>()); signals.put(hash, value); } @@ -238,14 +250,22 @@ public abstract class GT_Cover_AdvancedWirelessRedstoneBase<T extends GT_Cover_A addUIForDataController(dataController); builder.widget(dataController) - .widget( - new TextWidget(GT_Utility.trans("246", "Frequency")).setDefaultColor(COLOR_TEXT_GRAY.get()) - .setPos(startX + spaceX * 5, 4 + startY + spaceY * getFrequencyRow())) - .widget( - new TextWidget(GT_Utility.trans("602", "Use Private Frequency")) - .setDefaultColor(COLOR_TEXT_GRAY.get()).setPos( - startX + spaceX * privateExtraColumn, - 4 + startY + spaceY * getButtonRow())); + .widget( + new TextWidget(GT_Utility.trans("246", "Frequency")).setDefaultColor(COLOR_TEXT_GRAY.get()) + .setPos( + startX + spaceX * 5, + 4 + startY + + spaceY * getFrequencyRow())) + .widget( + new TextWidget( + GT_Utility.trans("602", "Use Private Frequency")) + .setDefaultColor( + COLOR_TEXT_GRAY.get()) + .setPos( + startX + spaceX + * privateExtraColumn, + 4 + startY + + spaceY * getButtonRow())); } protected void addUIForDataController(CoverDataControllerWidget<T> controller) { @@ -256,20 +276,24 @@ public abstract class GT_Cover_AdvancedWirelessRedstoneBase<T extends GT_Cover_A coverData.frequency = (int) MathExpression.parseMathExpression(state); return coverData; }, - widget -> widget.setOnScrollNumbers().setNumbers(0, Integer.MAX_VALUE).setFocusOnGuiOpen(true) - .setPos(1, 2 + spaceY * getFrequencyRow()).setSize(spaceX * 5 - 4, 12)) - .addFollower( - CoverDataFollower_ToggleButtonWidget.ofCheck(), - coverData -> coverData.uuid != null, - (coverData, state) -> { - if (state) { - coverData.uuid = getUIBuildContext().getPlayer().getUniqueID(); - } else { - coverData.uuid = null; - } - return coverData; - }, - widget -> widget.setPos(0, spaceY * getButtonRow())); + widget -> widget.setOnScrollNumbers() + .setNumbers(0, Integer.MAX_VALUE) + .setFocusOnGuiOpen(true) + .setPos(1, 2 + spaceY * getFrequencyRow()) + .setSize(spaceX * 5 - 4, 12)) + .addFollower( + CoverDataFollower_ToggleButtonWidget.ofCheck(), + coverData -> coverData.uuid != null, + (coverData, state) -> { + if (state) { + coverData.uuid = getUIBuildContext().getPlayer() + .getUniqueID(); + } else { + coverData.uuid = null; + } + return coverData; + }, + widget -> widget.setPos(0, spaceY * getButtonRow())); } protected abstract int getFrequencyRow(); diff --git a/src/main/java/gregtech/common/covers/redstone/GT_Cover_WirelessFluidDetector.java b/src/main/java/gregtech/common/covers/redstone/GT_Cover_WirelessFluidDetector.java index 06388602c0..af1afbe18d 100644 --- a/src/main/java/gregtech/common/covers/redstone/GT_Cover_WirelessFluidDetector.java +++ b/src/main/java/gregtech/common/covers/redstone/GT_Cover_WirelessFluidDetector.java @@ -43,8 +43,10 @@ public class GT_Cover_WirelessFluidDetector @Override public FluidTransmitterData doCoverThingsImpl(byte aSide, byte aInputRedstone, int aCoverID, FluidTransmitterData aCoverVariable, ICoverable aTileEntity, long aTimer) { - byte signal = GT_Cover_LiquidMeter - .computeSignalBasedOnFluid(aTileEntity, aCoverVariable.invert, aCoverVariable.threshold); + byte signal = GT_Cover_LiquidMeter.computeSignalBasedOnFluid( + aTileEntity, + aCoverVariable.invert, + aCoverVariable.threshold); long hash = hashCoverCoords(aTileEntity, aSide); setSignalAt(aCoverVariable.getUuid(), aCoverVariable.getFrequency(), hash, signal); @@ -145,7 +147,7 @@ public class GT_Cover_WirelessFluidDetector super.addUIWidgets(builder); builder.widget( new TextWidget(GT_Utility.trans("222", "Fluid threshold")).setDefaultColor(COLOR_TEXT_GRAY.get()) - .setPos(startX + spaceX * 5, 4 + startY)); + .setPos(startX + spaceX * 5, 4 + startY)); } @Override @@ -158,8 +160,10 @@ public class GT_Cover_WirelessFluidDetector coverData.threshold = (int) MathExpression.parseMathExpression(state); return coverData; }, - widget -> widget.setOnScrollNumbers().setNumbers(0, Integer.MAX_VALUE).setPos(1, 2) - .setSize(spaceX * 5 - 4, 12)); + widget -> widget.setOnScrollNumbers() + .setNumbers(0, Integer.MAX_VALUE) + .setPos(1, 2) + .setSize(spaceX * 5 - 4, 12)); } } } diff --git a/src/main/java/gregtech/common/covers/redstone/GT_Cover_WirelessItemDetector.java b/src/main/java/gregtech/common/covers/redstone/GT_Cover_WirelessItemDetector.java index 0b69150e86..9c1e9b2c5f 100644 --- a/src/main/java/gregtech/common/covers/redstone/GT_Cover_WirelessItemDetector.java +++ b/src/main/java/gregtech/common/covers/redstone/GT_Cover_WirelessItemDetector.java @@ -175,15 +175,21 @@ public class GT_Cover_WirelessItemDetector super.addUIWidgets(builder); builder.widget( new ItemWatcherSlotWidget().setGetter(this::getTargetItem) - .setPos(startX + spaceX * 4 - 1, startY + spaceY * 3)) - .widget( - new TextWidget(GT_Utility.trans("221", "Item threshold")) - .setDefaultColor(COLOR_TEXT_GRAY.get()) - .setPos(startX + spaceX * 5, 4 + startY + spaceY * 2)) - .widget( - new TextWidget(GT_Utility.trans("254.0", "Detect Slot")) - .setDefaultColor(COLOR_TEXT_GRAY.get()) - .setPos(startX + spaceX * 5, 4 + startY + spaceY * 3)); + .setPos(startX + spaceX * 4 - 1, startY + spaceY * 3)) + .widget( + new TextWidget(GT_Utility.trans("221", "Item threshold")) + .setDefaultColor( + COLOR_TEXT_GRAY.get()) + .setPos( + startX + spaceX * 5, + 4 + startY + spaceY * 2)) + .widget( + new TextWidget(GT_Utility.trans("254.0", "Detect Slot")) + .setDefaultColor( + COLOR_TEXT_GRAY.get()) + .setPos( + startX + spaceX * 5, + 4 + startY + spaceY * 3)); } @Override @@ -196,32 +202,36 @@ public class GT_Cover_WirelessItemDetector coverData.threshold = (int) MathExpression.parseMathExpression(state); return coverData; }, - widget -> widget.setOnScrollNumbers(1, 10, 64).setNumbers(() -> 0, this::getMaxItemCount) - .setPos(1, 2 + spaceY * 2).setSize(spaceX * 5 - 4, 12)) - .addFollower( - new CoverDataFollower_TextFieldWidget<>(), - coverData -> getSlotTextFieldContent(coverData.slot), - (coverData, state) -> { - coverData.slot = getIntFromText(state); - return coverData; - }, - widget -> widget.setOnScrollText().setValidator(val -> { - final int valSlot = getIntFromText(val); - if (valSlot > -1) { - return TextFieldWidget.format.format(Math.min(valSlot, maxSlot)); - } else { - return ALL_TEXT; - } - }).setPattern(BaseTextFieldWidget.NATURAL_NUMS).setPos(1, 2 + spaceY * 3) - .setSize(spaceX * 4 - 8, 12)); + widget -> widget.setOnScrollNumbers(1, 10, 64) + .setNumbers(() -> 0, this::getMaxItemCount) + .setPos(1, 2 + spaceY * 2) + .setSize(spaceX * 5 - 4, 12)) + .addFollower( + new CoverDataFollower_TextFieldWidget<>(), + coverData -> getSlotTextFieldContent(coverData.slot), + (coverData, state) -> { + coverData.slot = getIntFromText(state); + return coverData; + }, + widget -> widget.setOnScrollText() + .setValidator(val -> { + final int valSlot = getIntFromText(val); + if (valSlot > -1) { + return TextFieldWidget.format.format(Math.min(valSlot, maxSlot)); + } else { + return ALL_TEXT; + } + }) + .setPattern(BaseTextFieldWidget.NATURAL_NUMS) + .setPos(1, 2 + spaceY * 3) + .setSize(spaceX * 4 - 8, 12)); } private int getMaxSlot() { final ICoverable tile = getUIBuildContext().getTile(); if (tile instanceof TileEntity && !tile.isDead() && tile instanceof IGregTechTileEntity - && !(((IGregTechTileEntity) tile) - .getMetaTileEntity() instanceof GT_MetaTileEntity_DigitalChestBase)) { + && !(((IGregTechTileEntity) tile).getMetaTileEntity() instanceof GT_MetaTileEntity_DigitalChestBase)) { return tile.getSizeInventory() - 1; } else { return -1; diff --git a/src/main/java/gregtech/common/covers/redstone/GT_Cover_WirelessMaintenanceDetector.java b/src/main/java/gregtech/common/covers/redstone/GT_Cover_WirelessMaintenanceDetector.java index 085a7e1f4d..515a196b65 100644 --- a/src/main/java/gregtech/common/covers/redstone/GT_Cover_WirelessMaintenanceDetector.java +++ b/src/main/java/gregtech/common/covers/redstone/GT_Cover_WirelessMaintenanceDetector.java @@ -225,7 +225,9 @@ public class GT_Cover_WirelessMaintenanceDetector extends for (int i = 0; i < 8; i++) { builder.widget( new TextWidget(extraTexts[i]).setDefaultColor(COLOR_TEXT_GRAY.get()) - .setPos(startX + spaceX * (i % 2 == 0 ? 1 : 7), 4 + startY + spaceY * (2 + i / 2))); + .setPos( + startX + spaceX * (i % 2 == 0 ? 1 : 7), + 4 + startY + spaceY * (2 + i / 2))); } } @@ -241,9 +243,10 @@ public class GT_Cover_WirelessMaintenanceDetector extends coverData.mode = MaintenanceMode.values()[index]; return coverData; }, - widget -> widget - .setToggleTexture(GT_UITextures.OVERLAY_BUTTON_CHECKMARK, GT_UITextures.TRANSPARENT) - .setPos(spaceX * (index % 2 == 0 ? 0 : 6), spaceY * (2 + index / 2))); + widget -> widget.setToggleTexture( + GT_UITextures.OVERLAY_BUTTON_CHECKMARK, + GT_UITextures.TRANSPARENT) + .setPos(spaceX * (index % 2 == 0 ? 0 : 6), spaceY * (2 + index / 2))); } } } |