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 | |
| 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')
28 files changed, 1472 insertions, 1040 deletions
diff --git a/src/main/java/gregtech/common/covers/CoverInfo.java b/src/main/java/gregtech/common/covers/CoverInfo.java index 206a82ca2e..cc6d2db1e9 100644 --- a/src/main/java/gregtech/common/covers/CoverInfo.java +++ b/src/main/java/gregtech/common/covers/CoverInfo.java @@ -136,8 +136,13 @@ public final class CoverInfo { } public ISerializableObject doCoverThings(long aTickTimer, byte aRedstone) { - return getCoverBehavior() - .doCoverThings(coverSide, aRedstone, coverID, coverData, coveredTile.get(), aTickTimer); + return getCoverBehavior().doCoverThings( + coverSide, + aRedstone, + coverID, + coverData, + coveredTile.get(), + aTickTimer); } public void onBaseTEDestroyed() { @@ -219,8 +224,15 @@ public final class CoverInfo { } public boolean onCoverRightClick(EntityPlayer aPlayer, float aX, float aY, float aZ) { - return getCoverBehavior() - .onCoverRightClick(coverSide, coverID, coverData, coveredTile.get(), aPlayer, aX, aY, aZ); + return getCoverBehavior().onCoverRightClick( + coverSide, + coverID, + coverData, + coveredTile.get(), + aPlayer, + aX, + aY, + aZ); } public boolean onCoverShiftRightClick(EntityPlayer aPlayer) { @@ -228,8 +240,15 @@ public final class CoverInfo { } public ISerializableObject onCoverScrewdriverClick(EntityPlayer aPlayer, float aX, float aY, float aZ) { - return getCoverBehavior() - .onCoverScrewdriverClick(coverSide, coverID, coverData, coveredTile.get(), aPlayer, aX, aY, aZ); + return getCoverBehavior().onCoverScrewdriverClick( + coverSide, + coverID, + coverData, + coveredTile.get(), + aPlayer, + aX, + aY, + aZ); } public Block getFacadeBlock() { diff --git a/src/main/java/gregtech/common/covers/GT_Cover_Arm.java b/src/main/java/gregtech/common/covers/GT_Cover_Arm.java index 845e74d1ab..83cf48386d 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_Arm.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_Arm.java @@ -305,8 +305,10 @@ public class GT_Cover_Arm extends GT_CoverBehavior { protected void addUIWidgets(ModularWindow.Builder builder) { maxSlot = getMaxSlot(); builder.widget( - new CoverDataControllerWidget<>(this::getCoverData, this::setCoverData, GT_Cover_Arm.this) - .addFollower( + new CoverDataControllerWidget<>( + this::getCoverData, + this::setCoverData, + GT_Cover_Arm.this).addFollower( CoverDataFollower_ToggleButtonWidget.ofDisableable(), coverData -> getFlagExport(convert(coverData)) > 0, (coverData, state) -> { @@ -319,95 +321,118 @@ public class GT_Cover_Arm extends GT_CoverBehavior { } }, widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_EXPORT) - .addTooltip(GT_Utility.trans("006", "Export")) - .setPos(spaceX * 0, spaceY * 0)) - .addFollower( - CoverDataFollower_ToggleButtonWidget.ofDisableable(), - coverData -> getFlagExport(convert(coverData)) == 0, - (coverData, state) -> { - if (state) { - return new ISerializableObject.LegacyCoverData( - convert(coverData) & ~EXPORT_MASK | CONVERTED_BIT); - } else { - return new ISerializableObject.LegacyCoverData( - convert(coverData) | EXPORT_MASK | CONVERTED_BIT); - } - }, - widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_IMPORT) - .addTooltip(GT_Utility.trans("007", "Import")) - .setPos(spaceX * 1, spaceY * 0)) - .addFollower( - new CoverDataFollower_TextFieldWidget<>(), - coverData -> getTextFieldContent(getFlagInternalSlot(convert(coverData)) - 1), - (coverData, state) -> { - final int coverVariable = convert(coverData); - return new ISerializableObject.LegacyCoverData( - getFlagExport(coverVariable) - | ((getIntFromText(state) + 1) & SLOT_ID_MASK) - | (getFlagAdjacentSlot(coverVariable) << 14) - | CONVERTED_BIT); - }, - widget -> widget.setOnScrollText().setValidator(val -> { - final int valSlot = getIntFromText(val); - if (valSlot > -1) { - return TextFieldWidget.format.format(Math.min(valSlot, maxSlot)); - } else { - return ANY_TEXT; - } - }).setPattern(BaseTextFieldWidget.NATURAL_NUMS).setFocusOnGuiOpen(true) - .setPos(spaceX * 0, spaceY * 1 + 2).setSize(spaceX * 2 + 5, 12)) - .addFollower( - new CoverDataFollower_TextFieldWidget<>(), - coverData -> getTextFieldContent(getFlagAdjacentSlot(convert(coverData)) - 1), - (coverData, state) -> { - final int coverVariable = convert(coverData); - return new ISerializableObject.LegacyCoverData( - getFlagExport(coverVariable) | getFlagInternalSlot(coverVariable) - | (((getIntFromText(state) + 1) & SLOT_ID_MASK) << 14) - | CONVERTED_BIT); - }, - widget -> widget.setValidator(val -> { - final int valSlot = getIntFromText(val); - final int adjacentMaxSlot; - final ICoverable tile = getUIBuildContext().getTile(); - if (tile instanceof TileEntity && !tile.isDead()) { - TileEntity adj = tile - .getTileEntityAtSide(getUIBuildContext().getCoverSide()); - if (adj instanceof IInventory) - adjacentMaxSlot = ((IInventory) adj).getSizeInventory() - 1; - else adjacentMaxSlot = -1; - } else { - adjacentMaxSlot = -1; - } - if (valSlot > -1) { - return TextFieldWidget.format.format(Math.min(valSlot, adjacentMaxSlot)); - } else { - return ANY_TEXT; - } - }).setOnScroll((text, direction) -> { - final int val = getIntFromText(text); - int step = (GuiScreen.isShiftKeyDown() ? 50 : GuiScreen.isCtrlKeyDown() ? 5 : 1) - * direction; - return TextFieldWidget.format.format(val + step); - }).setPattern(BaseTextFieldWidget.NATURAL_NUMS).setPos(spaceX * 0, spaceY * 2 + 2) - .setSize(spaceX * 2 + 5, 12)) - .setPos(startX, startY)) - .widget( - TextWidget - .dynamicString( - () -> (convert(getCoverData()) & EXPORT_MASK) > 0 - ? GT_Utility.trans("006", "Export") - : GT_Utility.trans("007", "Import")) - .setSynced(false).setDefaultColor(COLOR_TEXT_GRAY.get()) - .setPos(startX + spaceX * 3, 4 + startY + spaceY * 0)) - .widget( - new TextWidget(GT_Utility.trans("254.1", "Internal slot#")) - .setDefaultColor(COLOR_TEXT_GRAY.get()) - .setPos(startX + spaceX * 3, 4 + startY + spaceY * 1)) - .widget( - new TextWidget(GT_Utility.trans("255", "Adjacent slot#")) - .setDefaultColor(COLOR_TEXT_GRAY.get()) - .setPos(startX + spaceX * 3, 4 + startY + spaceY * 2)); + .addTooltip(GT_Utility.trans("006", "Export")) + .setPos(spaceX * 0, spaceY * 0)) + .addFollower( + CoverDataFollower_ToggleButtonWidget.ofDisableable(), + coverData -> getFlagExport(convert(coverData)) == 0, + (coverData, state) -> { + if (state) { + return new ISerializableObject.LegacyCoverData( + convert(coverData) & ~EXPORT_MASK + | CONVERTED_BIT); + } else { + return new ISerializableObject.LegacyCoverData( + convert(coverData) | EXPORT_MASK | CONVERTED_BIT); + } + }, + widget -> widget.setStaticTexture( + GT_UITextures.OVERLAY_BUTTON_IMPORT) + .addTooltip(GT_Utility.trans("007", "Import")) + .setPos(spaceX * 1, spaceY * 0)) + .addFollower( + new CoverDataFollower_TextFieldWidget<>(), + coverData -> getTextFieldContent( + getFlagInternalSlot(convert(coverData)) - 1), + (coverData, state) -> { + final int coverVariable = convert(coverData); + return new ISerializableObject.LegacyCoverData( + getFlagExport(coverVariable) + | ((getIntFromText(state) + 1) & SLOT_ID_MASK) + | (getFlagAdjacentSlot(coverVariable) << 14) + | CONVERTED_BIT); + }, + widget -> widget.setOnScrollText() + .setValidator(val -> { + final int valSlot = getIntFromText(val); + if (valSlot > -1) { + return TextFieldWidget.format.format( + Math.min(valSlot, maxSlot)); + } else { + return ANY_TEXT; + } + }) + .setPattern(BaseTextFieldWidget.NATURAL_NUMS) + .setFocusOnGuiOpen(true) + .setPos(spaceX * 0, spaceY * 1 + 2) + .setSize(spaceX * 2 + 5, 12)) + .addFollower( + new CoverDataFollower_TextFieldWidget<>(), + coverData -> getTextFieldContent( + getFlagAdjacentSlot(convert(coverData)) - 1), + (coverData, state) -> { + final int coverVariable = convert(coverData); + return new ISerializableObject.LegacyCoverData( + getFlagExport(coverVariable) + | getFlagInternalSlot(coverVariable) + | (((getIntFromText(state) + 1) + & SLOT_ID_MASK) << 14) + | CONVERTED_BIT); + }, + widget -> widget.setValidator(val -> { + final int valSlot = getIntFromText(val); + final int adjacentMaxSlot; + final ICoverable tile = getUIBuildContext().getTile(); + if (tile instanceof TileEntity && !tile.isDead()) { + TileEntity adj = tile.getTileEntityAtSide( + getUIBuildContext().getCoverSide()); + if (adj instanceof IInventory) + adjacentMaxSlot = ((IInventory) adj).getSizeInventory() + - 1; + else adjacentMaxSlot = -1; + } else { + adjacentMaxSlot = -1; + } + if (valSlot > -1) { + return TextFieldWidget.format.format( + Math.min(valSlot, adjacentMaxSlot)); + } else { + return ANY_TEXT; + } + }) + .setOnScroll((text, direction) -> { + final int val = getIntFromText(text); + int step = (GuiScreen.isShiftKeyDown() ? 50 + : GuiScreen.isCtrlKeyDown() ? 5 : 1) + * direction; + return TextFieldWidget.format.format( + val + step); + }) + .setPattern(BaseTextFieldWidget.NATURAL_NUMS) + .setPos(spaceX * 0, spaceY * 2 + 2) + .setSize(spaceX * 2 + 5, 12)) + .setPos(startX, startY)) + .widget( + TextWidget.dynamicString( + () -> (convert(getCoverData()) & EXPORT_MASK) > 0 ? GT_Utility.trans("006", "Export") + : GT_Utility.trans("007", "Import")) + .setSynced(false) + .setDefaultColor(COLOR_TEXT_GRAY.get()) + .setPos(startX + spaceX * 3, 4 + startY + spaceY * 0)) + .widget( + new TextWidget(GT_Utility.trans("254.1", "Internal slot#")) + .setDefaultColor( + COLOR_TEXT_GRAY.get()) + .setPos( + startX + spaceX * 3, + 4 + startY + spaceY * 1)) + .widget( + new TextWidget(GT_Utility.trans("255", "Adjacent slot#")) + .setDefaultColor( + COLOR_TEXT_GRAY.get()) + .setPos( + startX + spaceX * 3, + 4 + startY + spaceY * 2)); } private int getMaxSlot() { diff --git a/src/main/java/gregtech/common/covers/GT_Cover_ControlsWork.java b/src/main/java/gregtech/common/covers/GT_Cover_ControlsWork.java index f3176896f8..6ed09dbf06 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_ControlsWork.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_ControlsWork.java @@ -212,47 +212,64 @@ public class GT_Cover_ControlsWork extends GT_CoverBehavior implements IControls 0, CoverDataFollower_ToggleButtonWidget.ofDisableable(), widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_REDSTONE_ON) - .setPos(spaceX * 0, spaceY * 0)) - .addToggleButton( - 1, - CoverDataFollower_ToggleButtonWidget.ofDisableable(), - widget -> widget - .setStaticTexture(GT_UITextures.OVERLAY_BUTTON_REDSTONE_OFF) - .setPos(spaceX * 0, spaceY * 1)) - .addToggleButton( - 2, - CoverDataFollower_ToggleButtonWidget.ofDisableable(), - widget -> widget - .setStaticTexture(GT_UITextures.OVERLAY_BUTTON_CROSS) - .setPos(spaceX * 0, spaceY * 2)) - .setPos(startX, startY)) - .widget( - new CoverDataControllerWidget<>( - this::getCoverData, - this::setCoverData, - GT_Cover_ControlsWork.this) - .addFollower( - CoverDataFollower_ToggleButtonWidget.ofCheckAndCross(), - coverData -> convert(coverData) > 2, - (coverData, state) -> new ISerializableObject.LegacyCoverData( - adjustCoverVariable(state, convert(coverData))), - widget -> widget.setPos(spaceX * 0, spaceY * 3)) - .setPos(startX, startY)) - .widget( - new TextWidget(GT_Utility.trans("243", "Enable with Redstone")) - .setDefaultColor(COLOR_TEXT_GRAY.get()) - .setPos(3 + startX + spaceX * 1, 4 + startY + spaceY * 0)) - .widget( - new TextWidget(GT_Utility.trans("244", "Disable with Redstone")) - .setDefaultColor(COLOR_TEXT_GRAY.get()) - .setPos(3 + startX + spaceX * 1, 4 + startY + spaceY * 1)) - .widget( - new TextWidget(GT_Utility.trans("245", "Disable machine")) - .setDefaultColor(COLOR_TEXT_GRAY.get()) - .setPos(3 + startX + spaceX * 1, 4 + startY + spaceY * 2)) - .widget( - new TextWidget(GT_Utility.trans("507", "Safe Mode")).setDefaultColor(COLOR_TEXT_GRAY.get()) - .setPos(3 + startX + spaceX * 1, 4 + startY + spaceY * 3)); + .setPos(spaceX * 0, spaceY * 0)) + .addToggleButton( + 1, + CoverDataFollower_ToggleButtonWidget.ofDisableable(), + widget -> widget.setStaticTexture( + GT_UITextures.OVERLAY_BUTTON_REDSTONE_OFF) + .setPos( + spaceX * 0, + spaceY * 1)) + .addToggleButton( + 2, + CoverDataFollower_ToggleButtonWidget.ofDisableable(), + widget -> widget.setStaticTexture( + GT_UITextures.OVERLAY_BUTTON_CROSS) + .setPos( + spaceX * 0, + spaceY * 2)) + .setPos(startX, startY)) + .widget( + new CoverDataControllerWidget<>( + this::getCoverData, + this::setCoverData, + GT_Cover_ControlsWork.this).addFollower( + CoverDataFollower_ToggleButtonWidget.ofCheckAndCross(), + coverData -> convert(coverData) > 2, + (coverData, state) -> new ISerializableObject.LegacyCoverData( + adjustCoverVariable(state, convert(coverData))), + widget -> widget.setPos(spaceX * 0, spaceY * 3)) + .setPos(startX, startY)) + .widget( + new TextWidget(GT_Utility.trans("243", "Enable with Redstone")) + .setDefaultColor( + COLOR_TEXT_GRAY.get()) + .setPos( + 3 + startX + + spaceX * 1, + 4 + startY + + spaceY * 0)) + .widget( + new TextWidget( + GT_Utility.trans("244", "Disable with Redstone")) + .setDefaultColor( + COLOR_TEXT_GRAY.get()) + .setPos( + 3 + startX + spaceX * 1, + 4 + startY + spaceY * 1)) + .widget( + new TextWidget(GT_Utility.trans("245", "Disable machine")) + .setDefaultColor( + COLOR_TEXT_GRAY.get()) + .setPos( + 3 + startX + spaceX * 1, + 4 + startY + spaceY * 2)) + .widget( + new TextWidget(GT_Utility.trans("507", "Safe Mode")).setDefaultColor(COLOR_TEXT_GRAY.get()) + .setPos( + 3 + startX + spaceX * 1, + 4 + startY + spaceY * 3)); } private int getNewCoverVariable(int id, int coverVariable) { diff --git a/src/main/java/gregtech/common/covers/GT_Cover_Conveyor.java b/src/main/java/gregtech/common/covers/GT_Cover_Conveyor.java index a2a0fcb8cf..e056c1c02d 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_Conveyor.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_Conveyor.java @@ -223,69 +223,100 @@ public class GT_Cover_Conveyor extends GT_CoverBehavior { 0, CoverDataFollower_ToggleButtonWidget.ofDisableable(), widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_EXPORT) - .addTooltip(GT_Utility.trans("006", "Export")) - .setPos(spaceX * 0, spaceY * 0)) - .addToggleButton( - 1, - CoverDataFollower_ToggleButtonWidget.ofDisableable(), - widget -> widget - .setStaticTexture(GT_UITextures.OVERLAY_BUTTON_IMPORT) - .addTooltip(GT_Utility.trans("007", "Import")) - .setPos(spaceX * 1, spaceY * 0)) - .addToggleButton( - 2, - CoverDataFollower_ToggleButtonWidget.ofDisableable(), - widget -> widget - .setStaticTexture(GT_UITextures.OVERLAY_BUTTON_CHECKMARK) - .addTooltip(GT_Utility.trans("224", "Always On")) - .setPos(spaceX * 0, spaceY * 1)) - .addToggleButton( - 3, - CoverDataFollower_ToggleButtonWidget.ofDisableable(), - widget -> widget - .setStaticTexture(GT_UITextures.OVERLAY_BUTTON_REDSTONE_ON) - .addTooltip( - GT_Utility.trans( - "225", - "Active with Redstone Signal")) - .setPos(spaceX * 1, spaceY * 1)) - .addToggleButton( - 4, - CoverDataFollower_ToggleButtonWidget.ofDisableable(), - widget -> widget - .setStaticTexture(GT_UITextures.OVERLAY_BUTTON_REDSTONE_OFF) - .addTooltip( - GT_Utility.trans( - "226", - "Inactive with Redstone Signal")) - .setPos(spaceX * 2, spaceY * 1)) - .addToggleButton( - 5, - CoverDataFollower_ToggleButtonWidget.ofDisableable(), - widget -> widget - .setStaticTexture(GT_UITextures.OVERLAY_BUTTON_ALLOW_INPUT) - .addTooltip(GT_Utility.trans("227", "Allow Input")) - .setPos(spaceX * 0, spaceY * 2)) - .addToggleButton( - 6, - CoverDataFollower_ToggleButtonWidget.ofDisableable(), - widget -> widget - .setStaticTexture(GT_UITextures.OVERLAY_BUTTON_BLOCK_INPUT) - .addTooltip(GT_Utility.trans("228", "Block Input")) - .setPos(spaceX * 1, spaceY * 2)) - .setPos(startX, startY)) - .widget( - new TextWidget(GT_Utility.trans("229", "Import/Export")) - .setDefaultColor(COLOR_TEXT_GRAY.get()) - .setPos(startX + spaceX * 3, 3 + startY + spaceY * 0)) - .widget( - new TextWidget(GT_Utility.trans("230", "Conditional")) - .setDefaultColor(COLOR_TEXT_GRAY.get()) - .setPos(startX + spaceX * 3, 3 + startY + spaceY * 1)) - .widget( - new TextWidget(GT_Utility.trans("231", "Enable Input")) - .setDefaultColor(COLOR_TEXT_GRAY.get()) - .setPos(startX + spaceX * 3, 3 + startY + spaceY * 2)); + .addTooltip(GT_Utility.trans("006", "Export")) + .setPos(spaceX * 0, spaceY * 0)) + .addToggleButton( + 1, + CoverDataFollower_ToggleButtonWidget.ofDisableable(), + widget -> widget.setStaticTexture( + GT_UITextures.OVERLAY_BUTTON_IMPORT) + .addTooltip( + GT_Utility.trans( + "007", + "Import")) + .setPos( + spaceX * 1, + spaceY * 0)) + .addToggleButton( + 2, + CoverDataFollower_ToggleButtonWidget.ofDisableable(), + widget -> widget.setStaticTexture( + GT_UITextures.OVERLAY_BUTTON_CHECKMARK) + .addTooltip( + GT_Utility.trans( + "224", + "Always On")) + .setPos( + spaceX * 0, + spaceY * 1)) + .addToggleButton( + 3, + CoverDataFollower_ToggleButtonWidget.ofDisableable(), + widget -> widget.setStaticTexture( + GT_UITextures.OVERLAY_BUTTON_REDSTONE_ON) + .addTooltip( + GT_Utility.trans( + "225", + "Active with Redstone Signal")) + .setPos( + spaceX * 1, + spaceY * 1)) + .addToggleButton( + 4, + CoverDataFollower_ToggleButtonWidget.ofDisableable(), + widget -> widget.setStaticTexture( + GT_UITextures.OVERLAY_BUTTON_REDSTONE_OFF) + .addTooltip( + GT_Utility.trans( + "226", + "Inactive with Redstone Signal")) + .setPos( + spaceX * 2, + spaceY * 1)) + .addToggleButton( + 5, + CoverDataFollower_ToggleButtonWidget.ofDisableable(), + widget -> widget.setStaticTexture( + GT_UITextures.OVERLAY_BUTTON_ALLOW_INPUT) + .addTooltip( + GT_Utility.trans( + "227", + "Allow Input")) + .setPos( + spaceX * 0, + spaceY * 2)) + .addToggleButton( + 6, + CoverDataFollower_ToggleButtonWidget.ofDisableable(), + widget -> widget.setStaticTexture( + GT_UITextures.OVERLAY_BUTTON_BLOCK_INPUT) + .addTooltip( + GT_Utility.trans( + "228", + "Block Input")) + .setPos( + spaceX * 1, + spaceY * 2)) + .setPos(startX, startY)) + .widget( + new TextWidget(GT_Utility.trans("229", "Import/Export")) + .setDefaultColor( + COLOR_TEXT_GRAY.get()) + .setPos( + startX + spaceX * 3, + 3 + startY + spaceY * 0)) + .widget( + new TextWidget(GT_Utility.trans("230", "Conditional")).setDefaultColor(COLOR_TEXT_GRAY.get()) + .setPos( + startX + spaceX * 3, + 3 + startY + spaceY * 1)) + .widget( + new TextWidget(GT_Utility.trans("231", "Enable Input")) + .setDefaultColor( + COLOR_TEXT_GRAY.get()) + .setPos( + startX + spaceX * 3, + 3 + startY + spaceY * 2)); } private int getNewCoverVariable(int id, int coverVariable) { diff --git a/src/main/java/gregtech/common/covers/GT_Cover_DoesWork.java b/src/main/java/gregtech/common/covers/GT_Cover_DoesWork.java index ff6741067c..c4d3364ba0 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_DoesWork.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_DoesWork.java @@ -170,34 +170,37 @@ public class GT_Cover_DoesWork extends GT_CoverBehavior { 0, CoverDataFollower_ToggleButtonWidget.ofDisableable(), widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_PROGRESS) - .setPos(spaceX * 0, spaceY * 0)) - .addToggleButton( - 1, - CoverDataFollower_ToggleButtonWidget.ofDisableable(), - widget -> widget - .setStaticTexture(GT_UITextures.OVERLAY_BUTTON_CHECKMARK) - .setPos(spaceX * 1, spaceY * 0)) - .addToggleButton( - 2, - CoverDataFollower_ToggleButtonWidget.ofRedstone(), - widget -> widget.setPos(spaceX * 0, spaceY * 1)) - .setPos(startX, startY)) - .widget( - TextWidget - .dynamicString( - () -> ((convert(getCoverData()) & 0x2) > 0) - ? GT_Utility.trans("242", "Machine idle") - : GT_Utility.trans("241", "Recipe progress")) - .setSynced(false).setDefaultColor(COLOR_TEXT_GRAY.get()) - .setPos(startX + spaceX * 3, 4 + startY + spaceY * 0)) - .widget( - TextWidget - .dynamicString( - () -> ((convert(getCoverData()) & 0x1) > 0) - ? GT_Utility.trans("INVERTED", "Inverted") - : GT_Utility.trans("NORMAL", "Normal")) - .setSynced(false).setDefaultColor(COLOR_TEXT_GRAY.get()) - .setPos(startX + spaceX * 3, 4 + startY + spaceY * 1)); + .setPos(spaceX * 0, spaceY * 0)) + .addToggleButton( + 1, + CoverDataFollower_ToggleButtonWidget.ofDisableable(), + widget -> widget.setStaticTexture( + GT_UITextures.OVERLAY_BUTTON_CHECKMARK) + .setPos( + spaceX * 1, + spaceY * 0)) + .addToggleButton( + 2, + CoverDataFollower_ToggleButtonWidget.ofRedstone(), + widget -> widget.setPos( + spaceX * 0, + spaceY * 1)) + .setPos(startX, startY)) + .widget( + TextWidget.dynamicString( + () -> ((convert(getCoverData()) & 0x2) > 0) ? GT_Utility.trans("242", "Machine idle") + : GT_Utility.trans("241", "Recipe progress")) + .setSynced(false) + .setDefaultColor(COLOR_TEXT_GRAY.get()) + .setPos(startX + spaceX * 3, 4 + startY + spaceY * 0)) + .widget( + TextWidget.dynamicString( + () -> ((convert(getCoverData()) & 0x1) > 0) + ? GT_Utility.trans("INVERTED", "Inverted") + : GT_Utility.trans("NORMAL", "Normal")) + .setSynced(false) + .setDefaultColor(COLOR_TEXT_GRAY.get()) + .setPos(startX + spaceX * 3, 4 + startY + spaceY * 1)); } private int getNewCoverVariable(int id, int coverVariable) { diff --git a/src/main/java/gregtech/common/covers/GT_Cover_Drain.java b/src/main/java/gregtech/common/covers/GT_Cover_Drain.java index a103234fea..4a08925ca4 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_Drain.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_Drain.java @@ -47,15 +47,18 @@ public class GT_Cover_Drain extends GT_CoverBehavior { if (aSide != 6) { Block tBlock = aTileEntity.getBlockAtSide(aSide); if ((aCoverVariable < 3) && ((aTileEntity instanceof IFluidHandler))) { - if ((aSide == 1) && (aTileEntity.getWorld().isRaining()) + if ((aSide == 1) && (aTileEntity.getWorld() + .isRaining()) && (aTileEntity.getWorld() - .getPrecipitationHeight(aTileEntity.getXCoord(), aTileEntity.getZCoord()) - 2 - < aTileEntity.getYCoord())) { + .getPrecipitationHeight(aTileEntity.getXCoord(), aTileEntity.getZCoord()) + - 2 < aTileEntity.getYCoord())) { int tAmount = (int) (aTileEntity.getBiome().rainfall * 10.0F); if (tAmount > 0) { ((IFluidHandler) aTileEntity).fill( ForgeDirection.getOrientation(aSide), - Materials.Water.getFluid(aTileEntity.getWorld().isThundering() ? tAmount * 2 : tAmount), + Materials.Water.getFluid( + aTileEntity.getWorld() + .isThundering() ? tAmount * 2 : tAmount), true); } } @@ -77,15 +80,20 @@ public class GT_Cover_Drain extends GT_CoverBehavior { false); } if ((tLiquid != null) && (tLiquid.getFluid() != null) - && ((aSide > 1) || ((aSide == 0) && (tLiquid.getFluid().getDensity() <= 0)) - || ((aSide == 1) && (tLiquid.getFluid().getDensity() >= 0))) + && ((aSide > 1) || ((aSide == 0) && (tLiquid.getFluid() + .getDensity() + <= 0)) + || ((aSide == 1) && (tLiquid.getFluid() + .getDensity() + >= 0))) && (((IFluidHandler) aTileEntity).fill(ForgeDirection.getOrientation(aSide), tLiquid, false) == tLiquid.amount)) { ((IFluidHandler) aTileEntity).fill(ForgeDirection.getOrientation(aSide), tLiquid, true); - aTileEntity.getWorld().setBlockToAir( - aTileEntity.getXCoord() + ForgeDirection.getOrientation(aSide).offsetX, - aTileEntity.getYCoord() + ForgeDirection.getOrientation(aSide).offsetY, - aTileEntity.getZCoord() + ForgeDirection.getOrientation(aSide).offsetZ); + aTileEntity.getWorld() + .setBlockToAir( + aTileEntity.getXCoord() + ForgeDirection.getOrientation(aSide).offsetX, + aTileEntity.getYCoord() + ForgeDirection.getOrientation(aSide).offsetY, + aTileEntity.getZCoord() + ForgeDirection.getOrientation(aSide).offsetZ); } } } @@ -94,13 +102,14 @@ public class GT_Cover_Drain extends GT_CoverBehavior { || (tBlock == Blocks.water) || (tBlock == Blocks.flowing_water) || ((tBlock instanceof IFluidBlock)))) { - aTileEntity.getWorld().setBlock( - aTileEntity.getOffsetX(aSide, 1), - aTileEntity.getOffsetY(aSide, 1), - aTileEntity.getOffsetZ(aSide, 1), - Blocks.air, - 0, - 0); + aTileEntity.getWorld() + .setBlock( + aTileEntity.getOffsetX(aSide, 1), + aTileEntity.getOffsetY(aSide, 1), + aTileEntity.getOffsetZ(aSide, 1), + Blocks.air, + 0, + 0); } } return aCoverVariable; diff --git a/src/main/java/gregtech/common/covers/GT_Cover_EUMeter.java b/src/main/java/gregtech/common/covers/GT_Cover_EUMeter.java index 53ce2bcbb3..0ded299507 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_EUMeter.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_EUMeter.java @@ -229,8 +229,10 @@ public class GT_Cover_EUMeter extends GT_CoverBehaviorBase<GT_Cover_EUMeter.EUMe final String NORMAL = GT_Utility.trans("NORMAL", "Normal"); builder.widget( - new CoverDataControllerWidget<>(this::getCoverData, this::setCoverData, GT_Cover_EUMeter.this) - .addFollower( + new CoverDataControllerWidget<>( + this::getCoverData, + this::setCoverData, + GT_Cover_EUMeter.this).addFollower( new CoverDataFollower_CycleButtonWidget<>(), coverData -> coverData.type.ordinal(), (coverData, state) -> { @@ -238,42 +240,56 @@ public class GT_Cover_EUMeter extends GT_CoverBehaviorBase<GT_Cover_EUMeter.EUMe return coverData; }, widget -> widget.setLength(EnergyType.values().length) - .addTooltip(state -> EnergyType.getEnergyType(state).getTooltip()) - .setStaticTexture(GT_UITextures.OVERLAY_BUTTON_CYCLIC) - .setPos(spaceX * 0, spaceY * 0)) - .addFollower( - CoverDataFollower_ToggleButtonWidget.ofRedstone(), - coverData -> coverData.inverted, - (coverData, state) -> { - coverData.inverted = state; - return coverData; - }, - widget -> widget.addTooltip(0, NORMAL).addTooltip(1, INVERTED) - .setPos(spaceX * 0, spaceY * 1)) - .addFollower( - new CoverDataFollower_TextFieldWidget<>(), - coverData -> String.valueOf(coverData.threshold), - (coverData, state) -> { - coverData.threshold = (long) MathExpression.parseMathExpression(state); - return coverData; - }, - widget -> widget.setOnScrollNumbersLong(1000, 100, 100000) - .setNumbersLong(() -> 0L, () -> Long.MAX_VALUE).setFocusOnGuiOpen(true) - .setPos(spaceX * 0, spaceY * 2 + 2).setSize(spaceX * 8, 12)) - .setPos(startX, startY)) - .widget( - TextWidget.dynamicString(() -> getCoverData() != null ? getCoverData().type.getTitle() : "") - .setSynced(false).setDefaultColor(COLOR_TEXT_GRAY.get()).setPos( - startX + spaceX, - 4 + startY)) - .widget( - TextWidget.dynamicString( - () -> getCoverData() != null ? getCoverData().inverted ? INVERTED : NORMAL : "") - .setSynced(false).setDefaultColor(COLOR_TEXT_GRAY.get()) - .setPos(startX + spaceX, 4 + startY + spaceY)) - .widget( - new TextWidget(GT_Utility.trans("222.1", "Energy threshold")) - .setDefaultColor(COLOR_TEXT_GRAY.get()).setPos(startX, startY + spaceY * 3 + 4)); + .addTooltip( + state -> EnergyType.getEnergyType(state) + .getTooltip()) + .setStaticTexture(GT_UITextures.OVERLAY_BUTTON_CYCLIC) + .setPos(spaceX * 0, spaceY * 0)) + .addFollower( + CoverDataFollower_ToggleButtonWidget.ofRedstone(), + coverData -> coverData.inverted, + (coverData, state) -> { + coverData.inverted = state; + return coverData; + }, + widget -> widget.addTooltip(0, NORMAL) + .addTooltip(1, INVERTED) + .setPos(spaceX * 0, spaceY * 1)) + .addFollower( + new CoverDataFollower_TextFieldWidget<>(), + coverData -> String.valueOf(coverData.threshold), + (coverData, state) -> { + coverData.threshold = (long) MathExpression.parseMathExpression( + state); + return coverData; + }, + widget -> widget.setOnScrollNumbersLong(1000, 100, 100000) + .setNumbersLong( + () -> 0L, + () -> Long.MAX_VALUE) + .setFocusOnGuiOpen(true) + .setPos(spaceX * 0, spaceY * 2 + 2) + .setSize(spaceX * 8, 12)) + .setPos(startX, startY)) + .widget( + TextWidget.dynamicString(() -> getCoverData() != null ? getCoverData().type.getTitle() : "") + .setSynced(false) + .setDefaultColor(COLOR_TEXT_GRAY.get()) + .setPos(startX + spaceX, 4 + startY)) + .widget( + TextWidget.dynamicString( + () -> getCoverData() != null ? getCoverData().inverted ? INVERTED : NORMAL : "") + .setSynced(false) + .setDefaultColor(COLOR_TEXT_GRAY.get()) + .setPos(startX + spaceX, 4 + startY + spaceY)) + .widget( + new TextWidget(GT_Utility.trans("222.1", "Energy threshold")) + .setDefaultColor( + COLOR_TEXT_GRAY.get()) + .setPos( + startX, + startY + spaceY * 3 + + 4)); } } diff --git a/src/main/java/gregtech/common/covers/GT_Cover_FacadeBase.java b/src/main/java/gregtech/common/covers/GT_Cover_FacadeBase.java index 0ac4a25fa1..80eeead660 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_FacadeBase.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_FacadeBase.java @@ -122,12 +122,13 @@ public abstract class GT_Cover_FacadeBase extends GT_CoverBehaviorBase<GT_Cover_ GT_Utility.stackToInt(aCover), new FacadeData(GT_Utility.copyAmount(1, aCover), 0)); - if (aTileEntity.isClientSide()) GT_RenderingWorld.getInstance().register( - aTileEntity.getXCoord(), - aTileEntity.getYCoord(), - aTileEntity.getZCoord(), - getTargetBlock(aCover), - getTargetMeta(aCover)); + if (aTileEntity.isClientSide()) GT_RenderingWorld.getInstance() + .register( + aTileEntity.getXCoord(), + aTileEntity.getYCoord(), + aTileEntity.getZCoord(), + getTargetBlock(aCover), + getTargetMeta(aCover)); } @Override @@ -149,8 +150,11 @@ public abstract class GT_Cover_FacadeBase extends GT_CoverBehaviorBase<GT_Cover_ if (block == null) return Textures.BlockIcons.ERROR_RENDERING[0]; // TODO: change this when *someone* made the block render in both pass if (block.getRenderBlockPass() != 0) return Textures.BlockIcons.ERROR_RENDERING[0]; - return TextureFactory.builder().setFromBlock(block, getTargetMeta(aCoverVariable.mStack)).useWorldCoord() - .setFromSide(ForgeDirection.getOrientation(aSide)).build(); + return TextureFactory.builder() + .setFromBlock(block, getTargetMeta(aCoverVariable.mStack)) + .useWorldCoord() + .setFromSide(ForgeDirection.getOrientation(aSide)) + .build(); } @Override @@ -177,12 +181,13 @@ public abstract class GT_Cover_FacadeBase extends GT_CoverBehaviorBase<GT_Cover_ @Override protected void onDataChangedImpl(byte aSide, int aCoverID, FacadeData aCoverVariable, ICoverable aTileEntity) { - if (aTileEntity.isClientSide()) GT_RenderingWorld.getInstance().register( - aTileEntity.getXCoord(), - aTileEntity.getYCoord(), - aTileEntity.getZCoord(), - getTargetBlock(aCoverVariable.mStack), - getTargetMeta(aCoverVariable.mStack)); + if (aTileEntity.isClientSide()) GT_RenderingWorld.getInstance() + .register( + aTileEntity.getXCoord(), + aTileEntity.getYCoord(), + aTileEntity.getZCoord(), + getTargetBlock(aCoverVariable.mStack), + getTargetMeta(aCoverVariable.mStack)); } @Override @@ -195,12 +200,13 @@ public abstract class GT_Cover_FacadeBase extends GT_CoverBehaviorBase<GT_Cover_ } if (aCoverVariable.mStack != null) // mStack == null -> cover removed before data reach client - GT_RenderingWorld.getInstance().unregister( - aTileEntity.getXCoord(), - aTileEntity.getYCoord(), - aTileEntity.getZCoord(), - getTargetBlock(aCoverVariable.mStack), - getTargetMeta(aCoverVariable.mStack)); + GT_RenderingWorld.getInstance() + .unregister( + aTileEntity.getXCoord(), + aTileEntity.getYCoord(), + aTileEntity.getZCoord(), + getTargetBlock(aCoverVariable.mStack), + getTargetMeta(aCoverVariable.mStack)); } } @@ -329,39 +335,51 @@ public abstract class GT_Cover_FacadeBase extends GT_CoverBehaviorBase<GT_Cover_ 0, CoverDataFollower_ToggleButtonWidget.ofCheckAndCross(), widget -> widget.setPos(spaceX * 0, spaceY * 0)) - .addToggleButton( - 1, - CoverDataFollower_ToggleButtonWidget.ofCheckAndCross(), - widget -> widget.setPos(spaceX * 0, spaceY * 1)) - .addToggleButton( - 2, - CoverDataFollower_ToggleButtonWidget.ofCheckAndCross(), - widget -> widget.setPos(spaceX * 0, spaceY * 2)) - .addToggleButton( - 3, - CoverDataFollower_ToggleButtonWidget.ofCheckAndCross(), - widget -> widget.setPos(spaceX * 0, spaceY * 3)) - .setPos(startX, startY)) - .widget( - new ItemDrawable(() -> getCoverData() != null ? getCoverData().mStack : null).asWidget() - .setPos(5, 5).setSize(16, 16)) - .widget( - TextWidget - .dynamicString( - () -> getCoverData() != null ? getCoverData().mStack.getDisplayName() : "") - .setSynced(false).setDefaultColor(COLOR_TITLE.get()).setPos(25, 9)) - .widget( - new TextWidget(GT_Utility.trans("128", "Redstone")).setDefaultColor(COLOR_TEXT_GRAY.get()) - .setPos(3 + startX + spaceX * 1, 4 + startY + spaceY * 0)) - .widget( - new TextWidget(GT_Utility.trans("129", "Energy")).setDefaultColor(COLOR_TEXT_GRAY.get()) - .setPos(3 + startX + spaceX * 1, 4 + startY + spaceY * 1)) - .widget( - new TextWidget(GT_Utility.trans("130", "Fluids")).setDefaultColor(COLOR_TEXT_GRAY.get()) - .setPos(3 + startX + spaceX * 1, 4 + startY + spaceY * 2)) - .widget( - new TextWidget(GT_Utility.trans("131", "Items")).setDefaultColor(COLOR_TEXT_GRAY.get()) - .setPos(3 + startX + spaceX * 1, 4 + startY + spaceY * 3)); + .addToggleButton( + 1, + CoverDataFollower_ToggleButtonWidget.ofCheckAndCross(), + widget -> widget.setPos(spaceX * 0, spaceY * 1)) + .addToggleButton( + 2, + CoverDataFollower_ToggleButtonWidget.ofCheckAndCross(), + widget -> widget.setPos(spaceX * 0, spaceY * 2)) + .addToggleButton( + 3, + CoverDataFollower_ToggleButtonWidget.ofCheckAndCross(), + widget -> widget.setPos(spaceX * 0, spaceY * 3)) + .setPos(startX, startY)) + .widget( + new ItemDrawable(() -> getCoverData() != null ? getCoverData().mStack : null).asWidget() + .setPos(5, 5) + .setSize( + 16, + 16)) + .widget( + TextWidget.dynamicString( + () -> getCoverData() != null ? getCoverData().mStack.getDisplayName() : "") + .setSynced(false) + .setDefaultColor(COLOR_TITLE.get()) + .setPos(25, 9)) + .widget( + new TextWidget(GT_Utility.trans("128", "Redstone")).setDefaultColor(COLOR_TEXT_GRAY.get()) + .setPos( + 3 + startX + spaceX * 1, + 4 + startY + spaceY * 0)) + .widget( + new TextWidget(GT_Utility.trans("129", "Energy")).setDefaultColor(COLOR_TEXT_GRAY.get()) + .setPos( + 3 + startX + spaceX * 1, + 4 + startY + spaceY * 1)) + .widget( + new TextWidget(GT_Utility.trans("130", "Fluids")).setDefaultColor(COLOR_TEXT_GRAY.get()) + .setPos( + 3 + startX + spaceX * 1, + 4 + startY + spaceY * 2)) + .widget( + new TextWidget(GT_Utility.trans("131", "Items")).setDefaultColor(COLOR_TEXT_GRAY.get()) + .setPos( + 3 + startX + spaceX * 1, + 4 + startY + spaceY * 3)); } @Override diff --git a/src/main/java/gregtech/common/covers/GT_Cover_FluidLimiter.java b/src/main/java/gregtech/common/covers/GT_Cover_FluidLimiter.java index 53eb3406d4..68bf59b5df 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_FluidLimiter.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_FluidLimiter.java @@ -197,19 +197,23 @@ public class GT_Cover_FluidLimiter extends GT_CoverBehaviorBase<GT_Cover_FluidLi @Override protected void addUIWidgets(ModularWindow.Builder builder) { builder.widget( - new CoverDataControllerWidget<>(this::getCoverData, this::setCoverData, GT_Cover_FluidLimiter.this) - .addFollower( + new CoverDataControllerWidget<>( + this::getCoverData, + this::setCoverData, + GT_Cover_FluidLimiter.this).addFollower( new CoverDataFollower_TextFieldWidget<>(), coverData -> String.valueOf(Math.round(coverData.threshold * 100)), (coverData, val) -> { coverData.threshold = (float) (MathExpression.parseMathExpression(val) / 100); return coverData; }, - widget -> widget.setNumbers(0, 100).setFocusOnGuiOpen(true) - .setPos(startX, startY + spaceY * 2 - 24).setSize(spaceX * 4 - 3, 12))) - .widget( - new TextWidget("Percent threshold").setDefaultColor(COLOR_TEXT_GRAY.get()) - .setPos(startX, startY + spaceY * 2 - 35)); + widget -> widget.setNumbers(0, 100) + .setFocusOnGuiOpen(true) + .setPos(startX, startY + spaceY * 2 - 24) + .setSize(spaceX * 4 - 3, 12))) + .widget( + new TextWidget("Percent threshold").setDefaultColor(COLOR_TEXT_GRAY.get()) + .setPos(startX, startY + spaceY * 2 - 35)); } } } diff --git a/src/main/java/gregtech/common/covers/GT_Cover_FluidRegulator.java b/src/main/java/gregtech/common/covers/GT_Cover_FluidRegulator.java index b02610ebf4..d02f098e3b 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_FluidRegulator.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_FluidRegulator.java @@ -113,11 +113,13 @@ public class GT_Cover_FluidRegulator extends GT_CoverBehaviorBase<GT_Cover_Fluid tTank2 = aTileEntity.getITankContainerAtSide(aSide); tTank1 = (IFluidHandler) aTileEntity; directionFrom = ForgeDirection.getOrientation(aSide); - directionTo = ForgeDirection.getOrientation(aSide).getOpposite(); + directionTo = ForgeDirection.getOrientation(aSide) + .getOpposite(); } else { tTank1 = aTileEntity.getITankContainerAtSide(aSide); tTank2 = (IFluidHandler) aTileEntity; - directionFrom = ForgeDirection.getOrientation(aSide).getOpposite(); + directionFrom = ForgeDirection.getOrientation(aSide) + .getOpposite(); directionTo = ForgeDirection.getOrientation(aSide); } if (tTank1 != null && tTank2 != null) { @@ -284,130 +286,179 @@ public class GT_Cover_FluidRegulator extends GT_CoverBehaviorBase<GT_Cover_Fluid new CoverDataControllerWidget<>( this::getCoverData, this::setCoverData, - GT_Cover_FluidRegulator.this) - .addFollower( - CoverDataFollower_ToggleButtonWidget.ofDisableable(), - coverData -> coverData.speed >= 0, - (coverData, state) -> { - coverData.speed = Math.abs(coverData.speed); - return coverData; - }, - widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_EXPORT) + GT_Cover_FluidRegulator.this).addFollower( + CoverDataFollower_ToggleButtonWidget.ofDisableable(), + coverData -> coverData.speed >= 0, + (coverData, state) -> { + coverData.speed = Math.abs(coverData.speed); + return coverData; + }, + widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_EXPORT) .addTooltip(GT_Utility.trans("006", "Export")) .setPos(spaceX * 0, spaceY * 0)) - .addFollower( - CoverDataFollower_ToggleButtonWidget.ofDisableable(), - coverData -> coverData.speed <= 0, - (coverData, state) -> { - coverData.speed = -Math.abs(coverData.speed); - return coverData; - }, - widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_IMPORT) - .addTooltip(GT_Utility.trans("007", "Import")) - .setPos(spaceX * 1, spaceY * 0)) - .addFollower( - CoverDataFollower_ToggleButtonWidget.ofDisableable(), - coverData -> coverData.condition == Conditional.Always, - (coverData, state) -> { - coverData.condition = Conditional.Always; - return coverData; - }, - widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_CHECKMARK) - .addTooltip(GT_Utility.trans("224", "Always On")) - .setPos(spaceX * 0, spaceY * 1)) - .addFollower( - CoverDataFollower_ToggleButtonWidget.ofDisableable(), - coverData -> coverData.condition == Conditional.Conditional, - (coverData, state) -> { - coverData.condition = Conditional.Conditional; - return coverData; - }, - widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_REDSTONE_ON) - .addTooltip(GT_Utility.trans("225", "Active with Redstone Signal")) - .setPos(spaceX * 1, spaceY * 1)) - .addFollower( - CoverDataFollower_ToggleButtonWidget.ofDisableable(), - coverData -> coverData.condition == Conditional.Inverted, - (coverData, state) -> { - coverData.condition = Conditional.Inverted; - return coverData; - }, - widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_REDSTONE_OFF) - .addTooltip( - GT_Utility.trans("226", "Inactive with Redstone Signal")) - .setPos(spaceX * 2, spaceY * 1)) - .addFollower( - new CoverDataFollower_TextFieldWidget<>(), - coverData -> String.valueOf(coverData.speed), - (coverData, state) -> { - coverData.speed = (int) MathExpression.parseMathExpression(state); - return coverData; - }, - widget -> widget.setOnScrollNumbersLong(1, 5, 50).setNumbersLong(val -> { - final int tickRate = getCoverData() != null ? getCoverData().tickRate - : 0; - final long maxFlow = (long) mTransferRate - * GT_Utility.clamp(tickRate, TICK_RATE_MIN, TICK_RATE_MAX); - warn.set(false); - if (val > maxFlow) { - val = maxFlow; - warn.set(true); - } else if (val < -maxFlow) { - val = -maxFlow; - warn.set(true); - } - return val; - }).setPattern(BaseTextFieldWidget.WHOLE_NUMS).setFocusOnGuiOpen(true) - .setPos(spaceX * 0, spaceY * 2 + 2).setSize(spaceX * 4 - 3, 12)) - .addFollower( - new CoverDataFollower_TextFieldWidget<>(), - coverData -> String.valueOf(coverData.tickRate), - (coverData, state) -> { - coverData.tickRate = (int) MathExpression.parseMathExpression(state); - return coverData; - }, - widget -> widget.setOnScrollNumbersLong(1, 5, 50).setNumbersLong(val -> { - final int speed = getCoverData() != null ? getCoverData().speed : 0; - warn.set(false); - if (val > TICK_RATE_MAX) { - val = (long) TICK_RATE_MAX; - warn.set(true); - } else if (Math.abs(speed) > mTransferRate * val) { - val = (long) Math.min( - TICK_RATE_MAX, - (Math.abs(speed) + mTransferRate - 1) / mTransferRate); - warn.set(true); - } else if (val < TICK_RATE_MIN) { - val = 1L; - } - return val; - }).setPattern(BaseTextFieldWidget.WHOLE_NUMS) - .setPos(spaceX * 5, spaceY * 2 + 2).setSize(spaceX * 2 - 3, 12)) - .setPos(startX, startY)) - .widget( - new TextWidget(GT_Utility.trans("229", "Import/Export")) - .setDefaultColor(COLOR_TEXT_GRAY.get()) - .setPos(startX + spaceX * 4, 4 + startY + spaceY * 0)) - .widget( - new TextWidget(GT_Utility.trans("230", "Conditional")) - .setDefaultColor(COLOR_TEXT_GRAY.get()) - .setPos(startX + spaceX * 4, 4 + startY + spaceY * 1)) - .widget( - new TextWidget(GT_Utility.trans("208", " L")).setDefaultColor(COLOR_TEXT_GRAY.get()) - .setPos(startX + spaceX * 4, 4 + startY + spaceY * 2)) - .widget( - new TextWidget(GT_Utility.trans("209", " ticks")).setDefaultColor(COLOR_TEXT_GRAY.get()) - .setPos(startX + spaceX * 7, 4 + startY + spaceY * 2)) - .widget(TextWidget.dynamicText(() -> { - FluidRegulatorData coverVariable = getCoverData(); - if (coverVariable == null) return new Text(""); - return new Text( - String.format( - GT_Utility.trans("210", "Average: %.2f L/sec"), - coverVariable.tickRate == 0 ? 0 - : coverVariable.speed * 20d / coverVariable.tickRate)).color( - warn.get() ? COLOR_TEXT_WARN.get() : COLOR_TEXT_GRAY.get()); - }).setSynced(false).setPos(startX + spaceX * 0, 4 + startY + spaceY * 3)); + .addFollower( + CoverDataFollower_ToggleButtonWidget.ofDisableable(), + coverData -> coverData.speed <= 0, + (coverData, state) -> { + coverData.speed = -Math.abs(coverData.speed); + return coverData; + }, + widget -> widget.setStaticTexture( + GT_UITextures.OVERLAY_BUTTON_IMPORT) + .addTooltip( + GT_Utility.trans( + "007", + "Import")) + .setPos(spaceX * 1, spaceY * 0)) + .addFollower( + CoverDataFollower_ToggleButtonWidget.ofDisableable(), + coverData -> coverData.condition == Conditional.Always, + (coverData, state) -> { + coverData.condition = Conditional.Always; + return coverData; + }, + widget -> widget.setStaticTexture( + GT_UITextures.OVERLAY_BUTTON_CHECKMARK) + .addTooltip( + GT_Utility.trans( + "224", + "Always On")) + .setPos(spaceX * 0, spaceY * 1)) + .addFollower( + CoverDataFollower_ToggleButtonWidget.ofDisableable(), + coverData -> coverData.condition + == Conditional.Conditional, + (coverData, state) -> { + coverData.condition = Conditional.Conditional; + return coverData; + }, + widget -> widget.setStaticTexture( + GT_UITextures.OVERLAY_BUTTON_REDSTONE_ON) + .addTooltip( + GT_Utility.trans( + "225", + "Active with Redstone Signal")) + .setPos(spaceX * 1, spaceY * 1)) + .addFollower( + CoverDataFollower_ToggleButtonWidget.ofDisableable(), + coverData -> coverData.condition + == Conditional.Inverted, + (coverData, state) -> { + coverData.condition = Conditional.Inverted; + return coverData; + }, + widget -> widget.setStaticTexture( + GT_UITextures.OVERLAY_BUTTON_REDSTONE_OFF) + .addTooltip( + GT_Utility.trans( + "226", + "Inactive with Redstone Signal")) + .setPos(spaceX * 2, spaceY * 1)) + .addFollower( + new CoverDataFollower_TextFieldWidget<>(), + coverData -> String.valueOf(coverData.speed), + (coverData, state) -> { + coverData.speed = (int) MathExpression.parseMathExpression( + state); + return coverData; + }, + widget -> widget.setOnScrollNumbersLong(1, 5, 50) + .setNumbersLong(val -> { + final int tickRate = getCoverData() + != null ? getCoverData().tickRate + : 0; + final long maxFlow = (long) mTransferRate + * GT_Utility.clamp( + tickRate, + TICK_RATE_MIN, + TICK_RATE_MAX); + warn.set(false); + if (val > maxFlow) { + val = maxFlow; + warn.set(true); + } else if (val < -maxFlow) { + val = -maxFlow; + warn.set(true); + } + return val; + }) + .setPattern( + BaseTextFieldWidget.WHOLE_NUMS) + .setFocusOnGuiOpen(true) + .setPos(spaceX * 0, spaceY * 2 + 2) + .setSize(spaceX * 4 - 3, 12)) + .addFollower( + new CoverDataFollower_TextFieldWidget<>(), + coverData -> String.valueOf(coverData.tickRate), + (coverData, state) -> { + coverData.tickRate = (int) MathExpression.parseMathExpression( + state); + return coverData; + }, + widget -> widget.setOnScrollNumbersLong(1, 5, 50) + .setNumbersLong(val -> { + final int speed = getCoverData() + != null ? getCoverData().speed + : 0; + warn.set(false); + if (val > TICK_RATE_MAX) { + val = (long) TICK_RATE_MAX; + warn.set(true); + } else if (Math.abs(speed) + > mTransferRate * val) { + val = (long) Math.min( + TICK_RATE_MAX, + (Math.abs( + speed) + + mTransferRate + - 1) + / mTransferRate); + warn.set(true); + } else + if (val < TICK_RATE_MIN) { + val = 1L; + } + return val; + }) + .setPattern( + BaseTextFieldWidget.WHOLE_NUMS) + .setPos(spaceX * 5, spaceY * 2 + 2) + .setSize(spaceX * 2 - 3, 12)) + .setPos(startX, startY)) + .widget( + new TextWidget(GT_Utility.trans("229", "Import/Export")) + .setDefaultColor( + COLOR_TEXT_GRAY.get()) + .setPos( + startX + spaceX * 4, + 4 + startY + spaceY * 0)) + .widget( + new TextWidget(GT_Utility.trans("230", "Conditional")).setDefaultColor(COLOR_TEXT_GRAY.get()) + .setPos( + startX + spaceX * 4, + 4 + startY + spaceY * 1)) + .widget( + new TextWidget(GT_Utility.trans("208", " L")).setDefaultColor(COLOR_TEXT_GRAY.get()) + .setPos( + startX + spaceX * 4, + 4 + startY + spaceY * 2)) + .widget( + new TextWidget(GT_Utility.trans("209", " ticks")).setDefaultColor(COLOR_TEXT_GRAY.get()) + .setPos( + startX + spaceX * 7, + 4 + startY + spaceY * 2)) + .widget(TextWidget.dynamicText(() -> { + FluidRegulatorData coverVariable = getCoverData(); + if (coverVariable == null) return new Text(""); + return new Text( + String.format( + GT_Utility.trans("210", "Average: %.2f L/sec"), + coverVariable.tickRate == 0 ? 0 + : coverVariable.speed * 20d / coverVariable.tickRate)).color( + warn.get() ? COLOR_TEXT_WARN.get() : COLOR_TEXT_GRAY.get()); + }) + .setSynced(false) + .setPos(startX + spaceX * 0, 4 + startY + spaceY * 3)); } } @@ -499,7 +550,9 @@ public class GT_Cover_FluidRegulator extends GT_CoverBehaviorBase<GT_Cover_Fluid @Override public void writeToByteBuf(ByteBuf aBuf) { - aBuf.writeInt(tickRate).writeInt(speed).writeByte(condition.ordinal()); + aBuf.writeInt(tickRate) + .writeInt(speed) + .writeByte(condition.ordinal()); } @Override diff --git a/src/main/java/gregtech/common/covers/GT_Cover_FluidStorageMonitor.java b/src/main/java/gregtech/common/covers/GT_Cover_FluidStorageMonitor.java index 184eb8705e..bb140b37a8 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_FluidStorageMonitor.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_FluidStorageMonitor.java @@ -81,7 +81,8 @@ public class GT_Cover_FluidStorageMonitor extends GT_CoverBehaviorBase<GT_Cover_ FluidStorageData aCoverVariable, ICoverable aTileEntity, long aTimer) { final FluidTankInfo[] tanks = getValidFluidTankInfos(aTileEntity, aCoverVariable.side); if (tanks == null) { - return aCoverVariable.disable().issueCoverUpdateIfNeeded(aTileEntity, aSide); + return aCoverVariable.disable() + .issueCoverUpdateIfNeeded(aTileEntity, aSide); } assert 0 < tanks.length; @@ -91,11 +92,13 @@ public class GT_Cover_FluidStorageMonitor extends GT_CoverBehaviorBase<GT_Cover_ final FluidTankInfo tank = tanks[aCoverVariable.slot]; if (tank == null) { - return aCoverVariable.setNullTank().issueCoverUpdateIfNeeded(aTileEntity, aSide); + return aCoverVariable.setNullTank() + .issueCoverUpdateIfNeeded(aTileEntity, aSide); } - return aCoverVariable.setFluid(tank.fluid).setScale(getTankScale(tank)) - .issueCoverUpdateIfNeeded(aTileEntity, aSide); + return aCoverVariable.setFluid(tank.fluid) + .setScale(getTankScale(tank)) + .issueCoverUpdateIfNeeded(aTileEntity, aSide); } @Override @@ -129,7 +132,9 @@ public class GT_Cover_FluidStorageMonitor extends GT_CoverBehaviorBase<GT_Cover_ }; final short[] fluidRGBA = colorToRGBA(aCoverVariable.fluid.getColor()); - final ITextureBuilder fluidTextureBuilder = TextureFactory.builder().addIcon(fluidIcon).setRGBA(fluidRGBA); + final ITextureBuilder fluidTextureBuilder = TextureFactory.builder() + .addIcon(fluidIcon) + .setRGBA(fluidRGBA); if (aCoverVariable.fluid.getLuminosity() > 0) fluidTextureBuilder.glow(); return TextureFactory.of(fluidTextureBuilder.build(), TextureFactory.of(icons[aCoverVariable.scale])); } @@ -221,7 +226,9 @@ public class GT_Cover_FluidStorageMonitor extends GT_CoverBehaviorBase<GT_Cover_ side, new FluidStack(tankInfo.fluid.getFluid(), containerItem.getCapacity(container)), false)) - .filter(fs -> GT_Utility.areFluidsEqual(fs, tankInfo.fluid)).map(fs -> fs.amount).orElse(0), + .filter(fs -> GT_Utility.areFluidsEqual(fs, tankInfo.fluid)) + .map(fs -> fs.amount) + .orElse(0), containerItem.fill( container, new FluidStack(tankInfo.fluid.getFluid(), containerItem.getCapacity(container)), @@ -242,7 +249,9 @@ public class GT_Cover_FluidStorageMonitor extends GT_CoverBehaviorBase<GT_Cover_ return null; } if (Optional.ofNullable(tank.drain(side, filledFluid, false)) - .filter(fs -> GT_Utility.areFluidsEqual(fs, filledFluid)).map(fs -> fs.amount).orElse(0) + .filter(fs -> GT_Utility.areFluidsEqual(fs, filledFluid)) + .map(fs -> fs.amount) + .orElse(0) != filledFluid.amount) { return null; } @@ -264,7 +273,7 @@ public class GT_Cover_FluidStorageMonitor extends GT_CoverBehaviorBase<GT_Cover_ if (aPlayer.isSneaking()) { aCoverVariable.setSide( ForgeDirection.values()[(aCoverVariable.side.ordinal() + 1) % ForgeDirection.values().length]) - .setSlot(0); + .setSlot(0); GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("SIDE", "Side: ") + aCoverVariable.side.name()); return aCoverVariable; } @@ -276,8 +285,8 @@ public class GT_Cover_FluidStorageMonitor extends GT_CoverBehaviorBase<GT_Cover_ if (aCoverVariable.slot < 0 || tanks.length <= aCoverVariable.slot) { aCoverVariable.setSlot(0); } else { - aCoverVariable - .setSlot((aCoverVariable.slot + tanks.length + (aPlayer.isSneaking() ? -1 : 1)) % tanks.length); + aCoverVariable.setSlot( + (aCoverVariable.slot + tanks.length + (aPlayer.isSneaking() ? -1 : 1)) % tanks.length); } GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("053", "Slot: ") + aCoverVariable.slot); return aCoverVariable; @@ -397,7 +406,8 @@ public class GT_Cover_FluidStorageMonitor extends GT_CoverBehaviorBase<GT_Cover_ } public FluidStorageData setNullTank() { - return this.setFluid((Fluid) null).setScale(0); + return this.setFluid((Fluid) null) + .setScale(0); } public FluidStorageData issueCoverUpdateIfNeeded(ICoverable tileEntity, byte side) { diff --git a/src/main/java/gregtech/common/covers/GT_Cover_Fluidfilter.java b/src/main/java/gregtech/common/covers/GT_Cover_Fluidfilter.java index 09239c0a07..65e036a110 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_Fluidfilter.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_Fluidfilter.java @@ -273,94 +273,101 @@ public class GT_Cover_Fluidfilter extends GT_CoverBehaviorBase<GT_Cover_Fluidfil 0, CoverDataFollower_ToggleButtonWidget.ofDisableable(), widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_IMPORT) - .addTooltip(GT_Utility.trans("232", "Filter Input")) - .setPos(spaceX * 0, spaceY * 0)) - .addToggleButton( - 1, - CoverDataFollower_ToggleButtonWidget.ofDisableable(), - widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_EXPORT) - .addTooltip(GT_Utility.trans("233", "Filter Output")) - .setPos(spaceX * 1, spaceY * 0)) - .addToggleButton( - 2, - CoverDataFollower_ToggleButtonWidget.ofDisableable(), - widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_BLOCK_INPUT) - .addTooltip(GT_Utility.trans("234", "Block Output")) - .setPos(spaceX * 0, spaceY * 2)) - .addToggleButton( - 3, - CoverDataFollower_ToggleButtonWidget.ofDisableable(), - widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_ALLOW_INPUT) - .addTooltip(GT_Utility.trans("235", "Allow Output")) - .setPos(spaceX * 1, spaceY * 2)) - .addToggleButton( - 4, - CoverDataFollower_ToggleButtonWidget.ofDisableable(), - widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_WHITELIST) - .addTooltip(GT_Utility.trans("236", "Whitelist Fluid")) - .setPos(spaceX * 0, spaceY * 1)) - .addToggleButton( - 5, - CoverDataFollower_ToggleButtonWidget.ofDisableable(), - widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_BLACKLIST) - .addTooltip(GT_Utility.trans("237", "Blacklist Fluid")) - .setPos(spaceX * 1, spaceY * 1)) - .addFollower( - new CoverDataFollower_SlotWidget<FluidFilterData>( - new ItemStackHandler(), - 0, - true) { - - @Override - protected void putClickedStack(ItemStack stack, int mouseButton) { - if (stack != null - && GT_Utility.getFluidFromContainerOrFluidDisplay(stack) - == null) - return; - super.putClickedStack( - GT_Utility.getFluidDisplayStack( - GT_Utility - .getFluidFromContainerOrFluidDisplay(stack), - false), - mouseButton); - } - }, - this::getFluidDisplayItem, - (coverData, stack) -> { - if (stack == null) { - coverData.mFluidID = -1; - } else { - FluidStack fluid = GT_Utility.getFluidFromDisplayStack(stack); - if (fluid != null && fluid.getFluid() != null) { - coverData.mFluidID = fluid.getFluid().getID(); - } - } - return coverData; - }, - widget -> widget.setBackground(ModularUITextures.FLUID_SLOT) - .setPos(0, spaceY * 3 + 2)) - .setPos(startX, startY)) - .widget( - new TextWidget(GT_Utility.trans("238", "Filter Direction")) - .setDefaultColor(COLOR_TEXT_GRAY.get()) - .setPos(startX + spaceX * 2, 3 + startY + spaceY * 0)) - .widget( - new TextWidget(GT_Utility.trans("239", "Filter Type")) - .setDefaultColor(COLOR_TEXT_GRAY.get()) - .setPos(startX + spaceX * 2, 3 + startY + spaceY * 1)) - .widget( - new TextWidget(GT_Utility.trans("240", "Block Flow")).setDefaultColor(COLOR_TEXT_GRAY.get()) - .setPos(startX + spaceX * 2, 3 + startY + spaceY * 2)) - .widget(TextWidget.dynamicString(() -> { - if (getCoverData() != null) { - ItemStack fluidDisplay = getFluidDisplayItem(getCoverData()); - if (fluidDisplay != null) { - return fluidDisplay.getDisplayName(); - } - } - return GT_Utility.trans("315", "Filter Empty"); - }).setSynced(false).setDefaultColor(COLOR_TITLE.get()) - .setPos(startX + spaceX + 3, 4 + startY + spaceY * 3)); + .addTooltip(GT_Utility.trans("232", "Filter Input")) + .setPos(spaceX * 0, spaceY * 0)) + .addToggleButton( + 1, + CoverDataFollower_ToggleButtonWidget.ofDisableable(), + widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_EXPORT) + .addTooltip(GT_Utility.trans("233", "Filter Output")) + .setPos(spaceX * 1, spaceY * 0)) + .addToggleButton( + 2, + CoverDataFollower_ToggleButtonWidget.ofDisableable(), + widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_BLOCK_INPUT) + .addTooltip(GT_Utility.trans("234", "Block Output")) + .setPos(spaceX * 0, spaceY * 2)) + .addToggleButton( + 3, + CoverDataFollower_ToggleButtonWidget.ofDisableable(), + widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_ALLOW_INPUT) + .addTooltip(GT_Utility.trans("235", "Allow Output")) + .setPos(spaceX * 1, spaceY * 2)) + .addToggleButton( + 4, + CoverDataFollower_ToggleButtonWidget.ofDisableable(), + widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_WHITELIST) + .addTooltip(GT_Utility.trans("236", "Whitelist Fluid")) + .setPos(spaceX * 0, spaceY * 1)) + .addToggleButton( + 5, + CoverDataFollower_ToggleButtonWidget.ofDisableable(), + widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_BLACKLIST) + .addTooltip(GT_Utility.trans("237", "Blacklist Fluid")) + .setPos(spaceX * 1, spaceY * 1)) + .addFollower( + new CoverDataFollower_SlotWidget<FluidFilterData>( + new ItemStackHandler(), + 0, + true) { + + @Override + protected void putClickedStack(ItemStack stack, int mouseButton) { + if (stack != null + && GT_Utility.getFluidFromContainerOrFluidDisplay(stack) == null) + return; + super.putClickedStack( + GT_Utility.getFluidDisplayStack( + GT_Utility.getFluidFromContainerOrFluidDisplay(stack), + false), + mouseButton); + } + }, + this::getFluidDisplayItem, + (coverData, stack) -> { + if (stack == null) { + coverData.mFluidID = -1; + } else { + FluidStack fluid = GT_Utility.getFluidFromDisplayStack(stack); + if (fluid != null && fluid.getFluid() != null) { + coverData.mFluidID = fluid.getFluid() + .getID(); + } + } + return coverData; + }, + widget -> widget.setBackground(ModularUITextures.FLUID_SLOT) + .setPos(0, spaceY * 3 + 2)) + .setPos(startX, startY)) + .widget( + new TextWidget(GT_Utility.trans("238", "Filter Direction")) + .setDefaultColor( + COLOR_TEXT_GRAY.get()) + .setPos( + startX + spaceX * 2, + 3 + startY + spaceY * 0)) + .widget( + new TextWidget(GT_Utility.trans("239", "Filter Type")).setDefaultColor(COLOR_TEXT_GRAY.get()) + .setPos( + startX + spaceX * 2, + 3 + startY + spaceY * 1)) + .widget( + new TextWidget(GT_Utility.trans("240", "Block Flow")).setDefaultColor(COLOR_TEXT_GRAY.get()) + .setPos( + startX + spaceX * 2, + 3 + startY + spaceY * 2)) + .widget(TextWidget.dynamicString(() -> { + if (getCoverData() != null) { + ItemStack fluidDisplay = getFluidDisplayItem(getCoverData()); + if (fluidDisplay != null) { + return fluidDisplay.getDisplayName(); + } + } + return GT_Utility.trans("315", "Filter Empty"); + }) + .setSynced(false) + .setDefaultColor(COLOR_TITLE.get()) + .setPos(startX + spaceX + 3, 4 + startY + spaceY * 3)); } private int getNewFilterMode(int id, FluidFilterData coverVariable) { @@ -423,13 +430,17 @@ public class GT_Cover_Fluidfilter extends GT_CoverBehaviorBase<GT_Cover_Fluidfil public NBTBase saveDataToNBT() { NBTTagCompound tNBT = new NBTTagCompound(); tNBT.setInteger("mFilterMode", mFilterMode); - if (mFluidID >= 0) tNBT.setString("mFluid", FluidRegistry.getFluid(mFluidID).getName()); + if (mFluidID >= 0) tNBT.setString( + "mFluid", + FluidRegistry.getFluid(mFluidID) + .getName()); return tNBT; } @Override public void writeToByteBuf(ByteBuf aBuf) { - aBuf.writeByte(mFilterMode).writeInt(mFluidID); + aBuf.writeByte(mFilterMode) + .writeInt(mFluidID); } @Override diff --git a/src/main/java/gregtech/common/covers/GT_Cover_ItemFilter.java b/src/main/java/gregtech/common/covers/GT_Cover_ItemFilter.java index a1378c9812..3ea7c88d8e 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_ItemFilter.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_ItemFilter.java @@ -214,37 +214,46 @@ public class GT_Cover_ItemFilter extends GT_CoverBehaviorBase<GT_Cover_ItemFilte filterInvHandler.setStackInSlot(0, setStackSize1(getCoverData().mFilter)); } builder.widget( - new CoverDataControllerWidget<>(this::getCoverData, this::setCoverData, GT_Cover_ItemFilter.this) - .addFollower( + new CoverDataControllerWidget<>( + this::getCoverData, + this::setCoverData, + GT_Cover_ItemFilter.this).addFollower( new CoverDataFollower_ToggleButtonWidget<>(), coverData -> coverData.mWhitelist, (coverData, state) -> { coverData.mWhitelist = state; return coverData; }, - widget -> widget - .setToggleTexture( - GT_UITextures.OVERLAY_BUTTON_WHITELIST, - GT_UITextures.OVERLAY_BUTTON_BLACKLIST) - .addTooltip(0, GT_Utility.trans("124.1", "Blacklist Mode")) - .addTooltip(1, GT_Utility.trans("125.1", "Whitelist Mode")) - .setPos(spaceX * 0, spaceY * 0)) - .addFollower( - new CoverDataFollower_SlotWidget<>(filterInvHandler, 0, true), - coverData -> setStackSize1(coverData.mFilter), - (coverData, stack) -> { - coverData.mFilter = setStackSize1(stack); - return coverData; - }, - widget -> widget.setBackground(GT_UITextures.SLOT_DARK_GRAY) - .setPos(spaceX * 0, spaceY * 2)) - .setPos(startX, startY)) - .widget( - new TextWidget(GT_Utility.trans("317", "Filter: ")).setDefaultColor(COLOR_TEXT_GRAY.get()) - .setPos(startX + spaceX * 0, 3 + startY + spaceY * 1)) - .widget( - new TextWidget(GT_Utility.trans("318", "Check Mode")).setDefaultColor(COLOR_TEXT_GRAY.get()) - .setPos(startX + spaceX * 2, 3 + startY + spaceY * 0)); + widget -> widget.setToggleTexture( + GT_UITextures.OVERLAY_BUTTON_WHITELIST, + GT_UITextures.OVERLAY_BUTTON_BLACKLIST) + .addTooltip(0, GT_Utility.trans("124.1", "Blacklist Mode")) + .addTooltip(1, GT_Utility.trans("125.1", "Whitelist Mode")) + .setPos(spaceX * 0, spaceY * 0)) + .addFollower( + new CoverDataFollower_SlotWidget<>( + filterInvHandler, + 0, + true), + coverData -> setStackSize1(coverData.mFilter), + (coverData, stack) -> { + coverData.mFilter = setStackSize1(stack); + return coverData; + }, + widget -> widget.setBackground( + GT_UITextures.SLOT_DARK_GRAY) + .setPos(spaceX * 0, spaceY * 2)) + .setPos(startX, startY)) + .widget( + new TextWidget(GT_Utility.trans("317", "Filter: ")).setDefaultColor(COLOR_TEXT_GRAY.get()) + .setPos( + startX + spaceX * 0, + 3 + startY + spaceY * 1)) + .widget( + new TextWidget(GT_Utility.trans("318", "Check Mode")).setDefaultColor(COLOR_TEXT_GRAY.get()) + .setPos( + startX + spaceX * 2, + 3 + startY + spaceY * 0)); } private ItemStack setStackSize1(ItemStack stack) { diff --git a/src/main/java/gregtech/common/covers/GT_Cover_ItemMeter.java b/src/main/java/gregtech/common/covers/GT_Cover_ItemMeter.java index 14607cdf09..cc3f553755 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_ItemMeter.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_ItemMeter.java @@ -135,8 +135,9 @@ public class GT_Cover_ItemMeter extends GT_CoverBehaviorBase<GT_Cover_ItemMeter. aCoverVariable.slot++; if (aCoverVariable.slot > aTileEntity.getSizeInventory()) aCoverVariable.slot = -1; - if (aCoverVariable.slot == -1) GT_Utility - .sendChatToPlayer(aPlayer, GT_Utility.trans("053", "Slot: ") + GT_Utility.trans("ALL", "All")); + if (aCoverVariable.slot == -1) GT_Utility.sendChatToPlayer( + aPlayer, + GT_Utility.trans("053", "Slot: ") + GT_Utility.trans("ALL", "All")); else GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("053", "Slot: ") + aCoverVariable.slot); } @@ -228,67 +229,84 @@ public class GT_Cover_ItemMeter extends GT_CoverBehaviorBase<GT_Cover_ItemMeter. maxSlot = getMaxSlot(); builder.widget( - new CoverDataControllerWidget<>(this::getCoverData, this::setCoverData, GT_Cover_ItemMeter.this) - .addFollower( + new CoverDataControllerWidget<>( + this::getCoverData, + this::setCoverData, + GT_Cover_ItemMeter.this).addFollower( CoverDataFollower_ToggleButtonWidget.ofRedstone(), coverData -> coverData.inverted, (coverData, state) -> { coverData.inverted = state; return coverData; }, - widget -> widget.addTooltip(0, NORMAL).addTooltip(1, INVERTED).setPos(0, 0)) - .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).setFocusOnGuiOpen(true) - .setPos(0, spaceY + 2).setSize(spaceX * 2 + 5, 12)) - .addFollower( - new CoverDataFollower_TextFieldWidget<>(), - coverData -> String.valueOf(coverData.threshold), - (coverData, state) -> { - coverData.threshold = (int) MathExpression.parseMathExpression(state); - return coverData; - }, - widget -> widget.setOnScrollNumbers(1, 10, 64).setNumbers(0, getUpperBound()) - .setPos(0, spaceY * 2 + 2).setSize(spaceX * 2 + 5, 12)) - .setPos(startX, startY)) - .widget( - new ItemWatcherSlotWidget().setGetter( - this::getTargetItem).setPos( - startX + spaceX * 8 - 4, - startY + spaceY)) - .widget( - TextWidget.dynamicString( - () -> getCoverData() != null ? getCoverData().inverted ? INVERTED : NORMAL : "") - .setSynced(false).setDefaultColor(COLOR_TEXT_GRAY.get()) - .setPos(startX + spaceX * 3, 4 + startY)) - .widget( - new TextWidget(GT_Utility.trans("254", "Detect slot#")) - .setDefaultColor(COLOR_TEXT_GRAY.get()) - .setPos(startX + spaceX * 3, 4 + startY + spaceY)) - .widget( - new TextWidget(GT_Utility.trans("221", "Item threshold")) - .setDefaultColor(COLOR_TEXT_GRAY.get()) - .setPos(startX + spaceX * 3, startY + spaceY * 2 + 4)); + widget -> widget.addTooltip(0, NORMAL) + .addTooltip(1, INVERTED) + .setPos(0, 0)) + .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) + .setFocusOnGuiOpen(true) + .setPos(0, spaceY + 2) + .setSize(spaceX * 2 + 5, 12)) + .addFollower( + new CoverDataFollower_TextFieldWidget<>(), + coverData -> String.valueOf(coverData.threshold), + (coverData, state) -> { + coverData.threshold = (int) MathExpression.parseMathExpression( + state); + return coverData; + }, + widget -> widget.setOnScrollNumbers(1, 10, 64) + .setNumbers(0, getUpperBound()) + .setPos(0, spaceY * 2 + 2) + .setSize(spaceX * 2 + 5, 12)) + .setPos(startX, startY)) + .widget( + new ItemWatcherSlotWidget().setGetter(this::getTargetItem) + .setPos(startX + spaceX * 8 - 4, startY + spaceY)) + .widget( + TextWidget.dynamicString( + () -> getCoverData() != null ? getCoverData().inverted ? INVERTED : NORMAL : "") + .setSynced(false) + .setDefaultColor(COLOR_TEXT_GRAY.get()) + .setPos(startX + spaceX * 3, 4 + startY)) + .widget( + new TextWidget(GT_Utility.trans("254", "Detect slot#")) + .setDefaultColor( + COLOR_TEXT_GRAY.get()) + .setPos( + startX + spaceX * 3, + 4 + startY + spaceY)) + .widget( + new TextWidget(GT_Utility.trans("221", "Item threshold")) + .setDefaultColor( + COLOR_TEXT_GRAY.get()) + .setPos( + startX + spaceX * 3, + startY + spaceY * 2 + 4)); } 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 Math.min(tile.getSizeInventory() - 1, SLOT_MASK - 1); else return -1; } diff --git a/src/main/java/gregtech/common/covers/GT_Cover_LiquidMeter.java b/src/main/java/gregtech/common/covers/GT_Cover_LiquidMeter.java index af062ca56b..4e54aa7cf3 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_LiquidMeter.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_LiquidMeter.java @@ -66,10 +66,9 @@ public class GT_Cover_LiquidMeter extends GT_CoverBehaviorBase<GT_Cover_LiquidMe if (tanks != null) { for (FluidTankInfo tank : tanks) { if (tank != null) { - if (tileEntity instanceof BaseMetaTileEntity && ((BaseMetaTileEntity) tileEntity) - .getMetaTileEntity() instanceof GT_MetaTileEntity_DigitalTankBase) { - max += ((GT_MetaTileEntity_DigitalTankBase) ((BaseMetaTileEntity) tileEntity) - .getMetaTileEntity()).getRealCapacity(); + if (tileEntity instanceof BaseMetaTileEntity + && ((BaseMetaTileEntity) tileEntity).getMetaTileEntity() instanceof GT_MetaTileEntity_DigitalTankBase) { + max += ((GT_MetaTileEntity_DigitalTankBase) ((BaseMetaTileEntity) tileEntity).getMetaTileEntity()).getRealCapacity(); } else max += tank.capacity; FluidStack tLiquid = tank.fluid; if (tLiquid != null) { @@ -196,60 +195,75 @@ public class GT_Cover_LiquidMeter extends GT_CoverBehaviorBase<GT_Cover_LiquidMe final int maxCapacity; if (getUIBuildContext().getTile() instanceof IFluidHandler) { - FluidTankInfo[] tanks = ((IFluidHandler) getUIBuildContext().getTile()) - .getTankInfo(ForgeDirection.UNKNOWN); - maxCapacity = Arrays.stream(tanks).mapToInt(tank -> tank.capacity).sum(); + FluidTankInfo[] tanks = ((IFluidHandler) getUIBuildContext().getTile()).getTankInfo( + ForgeDirection.UNKNOWN); + maxCapacity = Arrays.stream(tanks) + .mapToInt(tank -> tank.capacity) + .sum(); } else { maxCapacity = -1; } builder.widget( - new CoverDataControllerWidget<>(this::getCoverData, this::setCoverData, GT_Cover_LiquidMeter.this) - .addFollower( + new CoverDataControllerWidget<>( + this::getCoverData, + this::setCoverData, + GT_Cover_LiquidMeter.this).addFollower( CoverDataFollower_ToggleButtonWidget.ofRedstone(), coverData -> coverData.inverted, (coverData, state) -> { coverData.inverted = state; return coverData; }, - widget -> widget.addTooltip(0, NORMAL).addTooltip(1, INVERTED) - .setPos(spaceX * 0, spaceY * 0)) - .addFollower( - CoverDataFollower_ToggleButtonWidget.ofRedstone(), - coverData -> coverData.strong, - (coverData, state) -> { - coverData.strong = state; - return coverData; - }, - widget -> widget.addTooltip(0, WEAK).addTooltip(1, STRONG) - .setPos(spaceX * 0, spaceY * 1)) - .addFollower( - new CoverDataFollower_TextFieldWidget<>(), - coverData -> String.valueOf(coverData.threshold), - (coverData, state) -> { - coverData.threshold = (int) MathExpression.parseMathExpression(state); - return coverData; - }, - widget -> widget.setOnScrollNumbers(1000, 100, 100000) - .setNumbers(0, maxCapacity > 0 ? maxCapacity : Integer.MAX_VALUE) - .setFocusOnGuiOpen(true).setPos(spaceX * 0, spaceY * 2 + 2) - .setSize(spaceX * 4 + 5, 12)) - .setPos(startX, startY)) - .widget( - TextWidget.dynamicString( - () -> getCoverData() != null ? getCoverData().inverted ? INVERTED : NORMAL : "") - .setSynced(false).setDefaultColor(COLOR_TEXT_GRAY.get()) - .setPos(startX + spaceX * 1, 4 + startY + spaceY * 0)) - .widget( - TextWidget - .dynamicString( - () -> getCoverData() != null ? getCoverData().strong ? STRONG : WEAK : "") - .setSynced(false).setDefaultColor(COLOR_TEXT_GRAY.get()) - .setPos(startX + spaceX * 1, 4 + startY + spaceY * 1)) - .widget( - new TextWidget(GT_Utility.trans("222", "Fluid threshold")) - .setDefaultColor(COLOR_TEXT_GRAY.get()) - .setPos(startX + spaceX * 5 - 10, startY + spaceY * 2 + 4)); + widget -> widget.addTooltip(0, NORMAL) + .addTooltip(1, INVERTED) + .setPos(spaceX * 0, spaceY * 0)) + .addFollower( + CoverDataFollower_ToggleButtonWidget.ofRedstone(), + coverData -> coverData.strong, + (coverData, state) -> { + coverData.strong = state; + return coverData; + }, + widget -> widget.addTooltip(0, WEAK) + .addTooltip(1, STRONG) + .setPos(spaceX * 0, spaceY * 1)) + .addFollower( + new CoverDataFollower_TextFieldWidget<>(), + coverData -> String.valueOf(coverData.threshold), + (coverData, state) -> { + coverData.threshold = (int) MathExpression.parseMathExpression( + state); + return coverData; + }, + widget -> widget.setOnScrollNumbers(1000, 100, 100000) + .setNumbers( + 0, + maxCapacity > 0 ? maxCapacity + : Integer.MAX_VALUE) + .setFocusOnGuiOpen(true) + .setPos(spaceX * 0, spaceY * 2 + 2) + .setSize(spaceX * 4 + 5, 12)) + .setPos(startX, startY)) + .widget( + TextWidget.dynamicString( + () -> getCoverData() != null ? getCoverData().inverted ? INVERTED : NORMAL : "") + .setSynced(false) + .setDefaultColor(COLOR_TEXT_GRAY.get()) + .setPos(startX + spaceX * 1, 4 + startY + spaceY * 0)) + .widget( + TextWidget.dynamicString( + () -> getCoverData() != null ? getCoverData().strong ? STRONG : WEAK : "") + .setSynced(false) + .setDefaultColor(COLOR_TEXT_GRAY.get()) + .setPos(startX + spaceX * 1, 4 + startY + spaceY * 1)) + .widget( + new TextWidget(GT_Utility.trans("222", "Fluid threshold")) + .setDefaultColor( + COLOR_TEXT_GRAY.get()) + .setPos( + startX + spaceX * 5 - 10, + startY + spaceY * 2 + 4)); } } diff --git a/src/main/java/gregtech/common/covers/GT_Cover_NeedMaintainance.java b/src/main/java/gregtech/common/covers/GT_Cover_NeedMaintainance.java index cb8c4e691e..0387d4e4b9 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_NeedMaintainance.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_NeedMaintainance.java @@ -247,69 +247,93 @@ public class GT_Cover_NeedMaintainance extends GT_CoverBehavior { getNewCoverVariable(index, convert(coverData)))).addToggleButton( 0, CoverDataFollower_ToggleButtonWidget.ofCheck(), - widget -> widget.addTooltip(tooltipText[0]).setPos(spaceX * 0, spaceY * 0)) - .addToggleButton( - 1, - CoverDataFollower_ToggleButtonWidget.ofCheck(), - widget -> widget.addTooltip(tooltipText[1]) - .setPos(spaceX * 0, spaceY * 1)) - .addToggleButton( - 2, - CoverDataFollower_ToggleButtonWidget.ofCheck(), - widget -> widget.addTooltip(tooltipText[2]) - .setPos(spaceX * 0, spaceY * 2)) - .addToggleButton( - 3, - CoverDataFollower_ToggleButtonWidget.ofCheck(), - widget -> widget.addTooltip(tooltipText[3]) - .setPos(spaceX * 0, spaceY * 3)) - .addToggleButton( - 4, - CoverDataFollower_ToggleButtonWidget.ofCheck(), - widget -> widget.addTooltip(tooltipText[4]) - .setPos(spaceX * 4 + 4, spaceY * 0)) - .addToggleButton( - 5, - CoverDataFollower_ToggleButtonWidget.ofCheck(), - widget -> widget.addTooltip(tooltipText[5]) - .setPos(spaceX * 4 + 4, spaceY * 1)) - .addToggleButton( - 6, - CoverDataFollower_ToggleButtonWidget.ofCheck(), - widget -> widget.addTooltip(tooltipText[6]) - .setPos(spaceX * 4 + 4, spaceY * 2)) - .addToggleButton( - 7, - CoverDataFollower_ToggleButtonWidget.ofRedstone(), - widget -> widget.setPos(spaceX * 4 + 4, spaceY * 3)) - .setPos(startX, startY)) - .widget( - new TextWidget(buttonText[0]).setDefaultColor(COLOR_TEXT_GRAY.get()) - .setPos(startX + spaceX * 1, 4 + startY + spaceY * 0)) - .widget( - new TextWidget(buttonText[1]).setDefaultColor(COLOR_TEXT_GRAY.get()) - .setPos(startX + spaceX * 1, 4 + startY + spaceY * 1)) - .widget( - new TextWidget(buttonText[2]).setDefaultColor(COLOR_TEXT_GRAY.get()) - .setPos(startX + spaceX * 1, 4 + startY + spaceY * 2)) - .widget( - new TextWidget(buttonText[3]).setDefaultColor(COLOR_TEXT_GRAY.get()) - .setPos(startX + spaceX * 1, 4 + startY + spaceY * 3)) - .widget( - new TextWidget(buttonText[4]).setDefaultColor(COLOR_TEXT_GRAY.get()) - .setPos(startX + spaceX * 5 + 4, 4 + startY + spaceY * 0)) - .widget( - new TextWidget(buttonText[5]).setDefaultColor(COLOR_TEXT_GRAY.get()) - .setPos(startX + spaceX * 5 + 4, 4 + startY + spaceY * 1)) - .widget( - new TextWidget(buttonText[6]).setDefaultColor(COLOR_TEXT_GRAY.get()) - .setPos(startX + spaceX * 5 + 4, 4 + startY + spaceY * 2)) - .widget( - TextWidget - .dynamicString( - () -> isEnabled(7, convert(getCoverData())) ? buttonText[7] : buttonText[8]) - .setSynced(false).setDefaultColor(COLOR_TEXT_GRAY.get()) - .setPos(startX + spaceX * 5 + 4, 4 + startY + spaceY * 3)); + widget -> widget.addTooltip(tooltipText[0]) + .setPos(spaceX * 0, spaceY * 0)) + .addToggleButton( + 1, + CoverDataFollower_ToggleButtonWidget.ofCheck(), + widget -> widget.addTooltip( + tooltipText[1]) + .setPos( + spaceX * 0, + spaceY * 1)) + .addToggleButton( + 2, + CoverDataFollower_ToggleButtonWidget.ofCheck(), + widget -> widget.addTooltip( + tooltipText[2]) + .setPos( + spaceX * 0, + spaceY * 2)) + .addToggleButton( + 3, + CoverDataFollower_ToggleButtonWidget.ofCheck(), + widget -> widget.addTooltip( + tooltipText[3]) + .setPos( + spaceX * 0, + spaceY * 3)) + .addToggleButton( + 4, + CoverDataFollower_ToggleButtonWidget.ofCheck(), + widget -> widget.addTooltip( + tooltipText[4]) + .setPos( + spaceX * 4 + + 4, + spaceY * 0)) + .addToggleButton( + 5, + CoverDataFollower_ToggleButtonWidget.ofCheck(), + widget -> widget.addTooltip( + tooltipText[5]) + .setPos( + spaceX * 4 + + 4, + spaceY * 1)) + .addToggleButton( + 6, + CoverDataFollower_ToggleButtonWidget.ofCheck(), + widget -> widget.addTooltip( + tooltipText[6]) + .setPos( + spaceX * 4 + + 4, + spaceY * 2)) + .addToggleButton( + 7, + CoverDataFollower_ToggleButtonWidget.ofRedstone(), + widget -> widget.setPos( + spaceX * 4 + 4, + spaceY * 3)) + .setPos(startX, startY)) + .widget( + new TextWidget(buttonText[0]).setDefaultColor(COLOR_TEXT_GRAY.get()) + .setPos(startX + spaceX * 1, 4 + startY + spaceY * 0)) + .widget( + new TextWidget(buttonText[1]).setDefaultColor(COLOR_TEXT_GRAY.get()) + .setPos(startX + spaceX * 1, 4 + startY + spaceY * 1)) + .widget( + new TextWidget(buttonText[2]).setDefaultColor(COLOR_TEXT_GRAY.get()) + .setPos(startX + spaceX * 1, 4 + startY + spaceY * 2)) + .widget( + new TextWidget(buttonText[3]).setDefaultColor(COLOR_TEXT_GRAY.get()) + .setPos(startX + spaceX * 1, 4 + startY + spaceY * 3)) + .widget( + new TextWidget(buttonText[4]).setDefaultColor(COLOR_TEXT_GRAY.get()) + .setPos(startX + spaceX * 5 + 4, 4 + startY + spaceY * 0)) + .widget( + new TextWidget(buttonText[5]).setDefaultColor(COLOR_TEXT_GRAY.get()) + .setPos(startX + spaceX * 5 + 4, 4 + startY + spaceY * 1)) + .widget( + new TextWidget(buttonText[6]).setDefaultColor(COLOR_TEXT_GRAY.get()) + .setPos(startX + spaceX * 5 + 4, 4 + startY + spaceY * 2)) + .widget( + TextWidget.dynamicString( + () -> isEnabled(7, convert(getCoverData())) ? buttonText[7] : buttonText[8]) + .setSynced(false) + .setDefaultColor(COLOR_TEXT_GRAY.get()) + .setPos(startX + spaceX * 5 + 4, 4 + startY + spaceY * 3)); } private int getNewCoverVariable(int id, int coverVariable) { diff --git a/src/main/java/gregtech/common/covers/GT_Cover_PlayerDetector.java b/src/main/java/gregtech/common/covers/GT_Cover_PlayerDetector.java index 5746807247..bbfe23eb30 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_PlayerDetector.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_PlayerDetector.java @@ -68,7 +68,8 @@ public class GT_Cover_PlayerDetector extends GT_CoverBehavior { playerDetected = true; break; } - if (tEntity.getDisplayName().equalsIgnoreCase(placer)) { + if (tEntity.getDisplayName() + .equalsIgnoreCase(placer)) { if (aCoverVariable == 1) { playerDetected = true; break; @@ -187,33 +188,49 @@ public class GT_Cover_PlayerDetector extends GT_CoverBehavior { (index, coverData) -> new ISerializableObject.LegacyCoverData(index)).addToggleButton( 0, CoverDataFollower_ToggleButtonWidget.ofCheck(), - widget -> widget - .addTooltip(GT_Utility.trans("068.1", "Emit if any Player is close")) - .setPos(spaceX * 0, spaceY * 0)) - .addToggleButton( - 1, - CoverDataFollower_ToggleButtonWidget.ofCheck(), - widget -> widget - .addTooltip( - GT_Utility.trans("069.1", "Emit if other Player is close")) - .setPos(spaceX * 0, spaceY * 1)) - .addToggleButton( - 2, - CoverDataFollower_ToggleButtonWidget.ofCheck(), - widget -> widget - .addTooltip(GT_Utility.trans("070", "Emit if you are close")) - .setPos(spaceX * 0, spaceY * 2)) - .setPos(startX, startY)) - .widget( - new TextWidget(GT_Utility.trans("319", "Any player")).setDefaultColor(COLOR_TEXT_GRAY.get()) - .setPos(startX + spaceX * 1, 4 + startY + spaceY * 0)) - .widget( - new TextWidget(GT_Utility.trans("320", "Other players")) - .setDefaultColor(COLOR_TEXT_GRAY.get()) - .setPos(startX + spaceX * 1, 4 + startY + spaceY * 1)) - .widget( - new TextWidget(GT_Utility.trans("321", "Only owner")).setDefaultColor(COLOR_TEXT_GRAY.get()) - .setPos(startX + spaceX * 1, 4 + startY + spaceY * 2)); + widget -> widget.addTooltip( + GT_Utility.trans("068.1", "Emit if any Player is close")) + .setPos(spaceX * 0, spaceY * 0)) + .addToggleButton( + 1, + CoverDataFollower_ToggleButtonWidget.ofCheck(), + widget -> widget.addTooltip( + GT_Utility.trans( + "069.1", + "Emit if other Player is close")) + .setPos( + spaceX * 0, + spaceY * 1)) + .addToggleButton( + 2, + CoverDataFollower_ToggleButtonWidget.ofCheck(), + widget -> widget.addTooltip( + GT_Utility.trans( + "070", + "Emit if you are close")) + .setPos( + spaceX * 0, + spaceY * 2)) + .setPos( + startX, + startY)) + .widget( + new TextWidget(GT_Utility.trans("319", "Any player")).setDefaultColor(COLOR_TEXT_GRAY.get()) + .setPos( + startX + spaceX * 1, + 4 + startY + spaceY * 0)) + .widget( + new TextWidget(GT_Utility.trans("320", "Other players")) + .setDefaultColor( + COLOR_TEXT_GRAY.get()) + .setPos( + startX + spaceX * 1, + 4 + startY + spaceY * 1)) + .widget( + new TextWidget(GT_Utility.trans("321", "Only owner")).setDefaultColor(COLOR_TEXT_GRAY.get()) + .setPos( + startX + spaceX * 1, + 4 + startY + spaceY * 2)); } } } diff --git a/src/main/java/gregtech/common/covers/GT_Cover_Pump.java b/src/main/java/gregtech/common/covers/GT_Cover_Pump.java index 57f39d4ba6..2e23995fcf 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_Pump.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_Pump.java @@ -60,18 +60,25 @@ public class GT_Cover_Pump extends GT_CoverBehavior { FluidStack tLiquid = tTank1.drain(ForgeDirection.getOrientation(aSide), this.mTransferRate, false); if (tLiquid != null) { tLiquid = tLiquid.copy(); - tLiquid.amount = tTank2 - .fill(ForgeDirection.getOrientation(aSide).getOpposite(), tLiquid, false); + tLiquid.amount = tTank2.fill( + ForgeDirection.getOrientation(aSide) + .getOpposite(), + tLiquid, + false); if (tLiquid.amount > 0 && canTransferFluid(tLiquid)) { tTank2.fill( - ForgeDirection.getOrientation(aSide).getOpposite(), + ForgeDirection.getOrientation(aSide) + .getOpposite(), tTank1.drain(ForgeDirection.getOrientation(aSide), tLiquid.amount, true), true); } } } else { - FluidStack tLiquid = tTank2 - .drain(ForgeDirection.getOrientation(aSide).getOpposite(), this.mTransferRate, false); + FluidStack tLiquid = tTank2.drain( + ForgeDirection.getOrientation(aSide) + .getOpposite(), + this.mTransferRate, + false); if (tLiquid != null) { tLiquid = tLiquid.copy(); tLiquid.amount = tTank1.fill(ForgeDirection.getOrientation(aSide), tLiquid, false); @@ -79,7 +86,8 @@ public class GT_Cover_Pump extends GT_CoverBehavior { tTank1.fill( ForgeDirection.getOrientation(aSide), tTank2.drain( - ForgeDirection.getOrientation(aSide).getOpposite(), + ForgeDirection.getOrientation(aSide) + .getOpposite(), tLiquid.amount, true), true); @@ -245,69 +253,100 @@ public class GT_Cover_Pump extends GT_CoverBehavior { 0, CoverDataFollower_ToggleButtonWidget.ofDisableable(), widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_EXPORT) - .addTooltip(GT_Utility.trans("006", "Export")) - .setPos(spaceX * 0, spaceY * 0)) - .addToggleButton( - 1, - CoverDataFollower_ToggleButtonWidget.ofDisableable(), - widget -> widget - .setStaticTexture(GT_UITextures.OVERLAY_BUTTON_IMPORT) - .addTooltip(GT_Utility.trans("007", "Import")) - .setPos(spaceX * 1, spaceY * 0)) - .addToggleButton( - 2, - CoverDataFollower_ToggleButtonWidget.ofDisableable(), - widget -> widget - .setStaticTexture(GT_UITextures.OVERLAY_BUTTON_CHECKMARK) - .addTooltip(GT_Utility.trans("224", "Always On")) - .setPos(spaceX * 0, spaceY * 1)) - .addToggleButton( - 3, - CoverDataFollower_ToggleButtonWidget.ofDisableable(), - widget -> widget - .setStaticTexture(GT_UITextures.OVERLAY_BUTTON_REDSTONE_ON) - .addTooltip( - GT_Utility.trans( - "225", - "Active with Redstone Signal")) - .setPos(spaceX * 1, spaceY * 1)) - .addToggleButton( - 4, - CoverDataFollower_ToggleButtonWidget.ofDisableable(), - widget -> widget - .setStaticTexture(GT_UITextures.OVERLAY_BUTTON_REDSTONE_OFF) - .addTooltip( - GT_Utility.trans( - "226", - "Inactive with Redstone Signal")) - .setPos(spaceX * 2, spaceY * 1)) - .addToggleButton( - 5, - CoverDataFollower_ToggleButtonWidget.ofDisableable(), - widget -> widget - .setStaticTexture(GT_UITextures.OVERLAY_BUTTON_ALLOW_INPUT) - .addTooltip(GT_Utility.trans("227", "Allow Input")) - .setPos(spaceX * 0, spaceY * 2)) - .addToggleButton( - 6, - CoverDataFollower_ToggleButtonWidget.ofDisableable(), - widget -> widget - .setStaticTexture(GT_UITextures.OVERLAY_BUTTON_BLOCK_INPUT) - .addTooltip(GT_Utility.trans("228", "Block Input")) - .setPos(spaceX * 1, spaceY * 2)) - .setPos(startX, startY)) - .widget( - new TextWidget(GT_Utility.trans("229", "Import/Export")) - .setDefaultColor(COLOR_TEXT_GRAY.get()) - .setPos(startX + spaceX * 3, 3 + startY + spaceY * 0)) - .widget( - new TextWidget(GT_Utility.trans("230", "Conditional")) - .setDefaultColor(COLOR_TEXT_GRAY.get()) - .setPos(startX + spaceX * 3, 3 + startY + spaceY * 1)) - .widget( - new TextWidget(GT_Utility.trans("231", "Enable Input")) - .setDefaultColor(COLOR_TEXT_GRAY.get()) - .setPos(startX + spaceX * 3, 3 + startY + spaceY * 2)); + .addTooltip(GT_Utility.trans("006", "Export")) + .setPos(spaceX * 0, spaceY * 0)) + .addToggleButton( + 1, + CoverDataFollower_ToggleButtonWidget.ofDisableable(), + widget -> widget.setStaticTexture( + GT_UITextures.OVERLAY_BUTTON_IMPORT) + .addTooltip( + GT_Utility.trans( + "007", + "Import")) + .setPos( + spaceX * 1, + spaceY * 0)) + .addToggleButton( + 2, + CoverDataFollower_ToggleButtonWidget.ofDisableable(), + widget -> widget.setStaticTexture( + GT_UITextures.OVERLAY_BUTTON_CHECKMARK) + .addTooltip( + GT_Utility.trans( + "224", + "Always On")) + .setPos( + spaceX * 0, + spaceY * 1)) + .addToggleButton( + 3, + CoverDataFollower_ToggleButtonWidget.ofDisableable(), + widget -> widget.setStaticTexture( + GT_UITextures.OVERLAY_BUTTON_REDSTONE_ON) + .addTooltip( + GT_Utility.trans( + "225", + "Active with Redstone Signal")) + .setPos( + spaceX * 1, + spaceY * 1)) + .addToggleButton( + 4, + CoverDataFollower_ToggleButtonWidget.ofDisableable(), + widget -> widget.setStaticTexture( + GT_UITextures.OVERLAY_BUTTON_REDSTONE_OFF) + .addTooltip( + GT_Utility.trans( + "226", + "Inactive with Redstone Signal")) + .setPos( + spaceX * 2, + spaceY * 1)) + .addToggleButton( + 5, + CoverDataFollower_ToggleButtonWidget.ofDisableable(), + widget -> widget.setStaticTexture( + GT_UITextures.OVERLAY_BUTTON_ALLOW_INPUT) + .addTooltip( + GT_Utility.trans( + "227", + "Allow Input")) + .setPos( + spaceX * 0, + spaceY * 2)) + .addToggleButton( + 6, + CoverDataFollower_ToggleButtonWidget.ofDisableable(), + widget -> widget.setStaticTexture( + GT_UITextures.OVERLAY_BUTTON_BLOCK_INPUT) + .addTooltip( + GT_Utility.trans( + "228", + "Block Input")) + .setPos( + spaceX * 1, + spaceY * 2)) + .setPos(startX, startY)) + .widget( + new TextWidget(GT_Utility.trans("229", "Import/Export")) + .setDefaultColor( + COLOR_TEXT_GRAY.get()) + .setPos( + startX + spaceX * 3, + 3 + startY + spaceY * 0)) + .widget( + new TextWidget(GT_Utility.trans("230", "Conditional")).setDefaultColor(COLOR_TEXT_GRAY.get()) + .setPos( + startX + spaceX * 3, + 3 + startY + spaceY * 1)) + .widget( + new TextWidget(GT_Utility.trans("231", "Enable Input")) + .setDefaultColor( + COLOR_TEXT_GRAY.get()) + .setPos( + startX + spaceX * 3, + 3 + startY + spaceY * 2)); } private int getNewCoverVariable(int id, int coverVariable) { diff --git a/src/main/java/gregtech/common/covers/GT_Cover_RedstoneTransmitterInternal.java b/src/main/java/gregtech/common/covers/GT_Cover_RedstoneTransmitterInternal.java index f4b7f5fa80..968ad3f815 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_RedstoneTransmitterInternal.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_RedstoneTransmitterInternal.java @@ -27,8 +27,9 @@ public class GT_Cover_RedstoneTransmitterInternal extends GT_Cover_RedstoneWirel @Override public int doCoverThings(byte aSide, byte aInputRedstone, int aCoverID, int aCoverVariable, ICoverable aTileEntity, long aTimer) { - GregTech_API.sWirelessRedstone - .put(Integer.valueOf(aCoverVariable), Byte.valueOf(aTileEntity.getOutputRedstoneSignal(aSide))); + GregTech_API.sWirelessRedstone.put( + Integer.valueOf(aCoverVariable), + Byte.valueOf(aTileEntity.getOutputRedstoneSignal(aSide))); return aCoverVariable; } diff --git a/src/main/java/gregtech/common/covers/GT_Cover_RedstoneWirelessBase.java b/src/main/java/gregtech/common/covers/GT_Cover_RedstoneWirelessBase.java index 441201af08..88a472797b 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_RedstoneWirelessBase.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_RedstoneWirelessBase.java @@ -68,13 +68,15 @@ public abstract class GT_Cover_RedstoneWirelessBase extends GT_CoverBehavior { GregTech_API.sWirelessRedstone.put(aCoverVariable, (byte) 0); int val = GT_Utility.stackToInt(aPlayer.inventory.getCurrentItem()) - * (1 + aPlayer.inventory.getCurrentItem().getItemDamage()); + * (1 + aPlayer.inventory.getCurrentItem() + .getItemDamage()); aCoverVariable = (aCoverVariable & (PRIVATE_MASK | CHECKBOX_MASK)) | (val & PUBLIC_MASK); aTileEntity.setCoverDataAtSide(aSide, aCoverVariable); - GT_Utility - .sendChatToPlayer(aPlayer, GT_Utility.trans("081", "Frequency: ") + (aCoverVariable & PUBLIC_MASK)); + GT_Utility.sendChatToPlayer( + aPlayer, + GT_Utility.trans("081", "Frequency: ") + (aCoverVariable & PUBLIC_MASK)); return true; } return false; @@ -198,30 +200,41 @@ public abstract class GT_Cover_RedstoneWirelessBase extends GT_CoverBehavior { new CoverDataControllerWidget<>( this::getCoverData, this::setCoverData, - GT_Cover_RedstoneWirelessBase.this) - .addFollower( - new CoverDataFollower_TextFieldWidget<>(), - coverData -> String.valueOf(getFlagFrequency(convert(coverData))), - (coverData, text) -> new ISerializableObject.LegacyCoverData( - (int) MathExpression.parseMathExpression(text) - | getFlagCheckbox(convert(coverData))), - widget -> widget.setOnScrollNumbers().setNumbers(0, MAX_CHANNEL) - .setFocusOnGuiOpen(true).setPos(spaceX * 0, spaceY * 0 + 2) + GT_Cover_RedstoneWirelessBase.this).addFollower( + new CoverDataFollower_TextFieldWidget<>(), + coverData -> String.valueOf(getFlagFrequency(convert(coverData))), + (coverData, text) -> new ISerializableObject.LegacyCoverData( + (int) MathExpression.parseMathExpression(text) + | getFlagCheckbox(convert(coverData))), + widget -> widget.setOnScrollNumbers() + .setNumbers(0, MAX_CHANNEL) + .setFocusOnGuiOpen(true) + .setPos(spaceX * 0, spaceY * 0 + 2) .setSize(spaceX * 4 - 3, 12)) - .addFollower( - CoverDataFollower_ToggleButtonWidget.ofCheck(), - coverData -> getFlagCheckbox(convert(coverData)) > 0, - (coverData, state) -> new ISerializableObject.LegacyCoverData( - getFlagFrequency(convert(coverData)) | (state ? CHECKBOX_MASK : 0)), - widget -> widget.setPos(spaceX * 0, spaceY * 2)) - .setPos(startX, startY)) - .widget( - new TextWidget(GT_Utility.trans("246", "Frequency")).setDefaultColor(COLOR_TEXT_GRAY.get()) - .setPos(startX + spaceX * 4, 4 + startY + spaceY * 0)) - .widget( - new TextWidget(GT_Utility.trans("602", "Use Private Frequency")) - .setDefaultColor(COLOR_TEXT_GRAY.get()) - .setPos(startX + spaceX * 1, startY + spaceY * 2 + 4)); + .addFollower( + CoverDataFollower_ToggleButtonWidget.ofCheck(), + coverData -> getFlagCheckbox(convert(coverData)) + > 0, + (coverData, + state) -> new ISerializableObject.LegacyCoverData( + getFlagFrequency( + convert(coverData)) + | (state ? CHECKBOX_MASK + : 0)), + widget -> widget.setPos(spaceX * 0, spaceY * 2)) + .setPos(startX, startY)) + .widget( + new TextWidget(GT_Utility.trans("246", "Frequency")).setDefaultColor(COLOR_TEXT_GRAY.get()) + .setPos( + startX + spaceX * 4, + 4 + startY + spaceY * 0)) + .widget( + new TextWidget(GT_Utility.trans("602", "Use Private Frequency")).setDefaultColor( + COLOR_TEXT_GRAY.get()) + .setPos( + startX + spaceX * 1, + startY + spaceY * 2 + + 4)); } private int getFlagFrequency(int coverVariable) { diff --git a/src/main/java/gregtech/common/covers/GT_Cover_Shutter.java b/src/main/java/gregtech/common/covers/GT_Cover_Shutter.java index f1e977efad..81af7b06d4 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_Shutter.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_Shutter.java @@ -173,40 +173,65 @@ public class GT_Cover_Shutter extends GT_CoverBehavior { this::setCoverData, GT_Cover_Shutter.this, (index, coverData) -> index == convert(coverData), - (index, coverData) -> new ISerializableObject.LegacyCoverData(index)) - .addToggleButton( - 0, - CoverDataFollower_ToggleButtonWidget.ofCheck(), - widget -> widget.setPos(spaceX * 0, spaceY * 0)) - .addToggleButton( - 1, - CoverDataFollower_ToggleButtonWidget.ofCheck(), - widget -> widget.setPos(spaceX * 0, spaceY * 1)) - .addToggleButton( - 2, - CoverDataFollower_ToggleButtonWidget.ofCheck(), - widget -> widget.setPos(spaceX * 0, spaceY * 2)) - .addToggleButton( - 3, - CoverDataFollower_ToggleButtonWidget.ofCheck(), - widget -> widget.setPos(spaceX * 0, spaceY * 3)) - .setPos(startX, startY)) - .widget( - new TextWidget(GT_Utility.trans("082", "Open if work enabled")) - .setDefaultColor(COLOR_TEXT_GRAY.get()) - .setPos(3 + startX + spaceX * 1, 4 + startY + spaceY * 0)) - .widget( - new TextWidget(GT_Utility.trans("083", "Open if work disabled")) - .setDefaultColor(COLOR_TEXT_GRAY.get()) - .setPos(3 + startX + spaceX * 1, 4 + startY + spaceY * 1)) - .widget( - new TextWidget(GT_Utility.trans("084", "Only Output allowed")) - .setDefaultColor(COLOR_TEXT_GRAY.get()) - .setPos(3 + startX + spaceX * 1, 4 + startY + spaceY * 2)) - .widget( - new TextWidget(GT_Utility.trans("085", "Only Input allowed")) - .setDefaultColor(COLOR_TEXT_GRAY.get()) - .setPos(3 + startX + spaceX * 1, 4 + startY + spaceY * 3)); + (index, coverData) -> new ISerializableObject.LegacyCoverData(index)).addToggleButton( + 0, + CoverDataFollower_ToggleButtonWidget.ofCheck(), + widget -> widget.setPos(spaceX * 0, spaceY * 0)) + .addToggleButton( + 1, + CoverDataFollower_ToggleButtonWidget.ofCheck(), + widget -> widget.setPos( + spaceX * 0, + spaceY * 1)) + .addToggleButton( + 2, + CoverDataFollower_ToggleButtonWidget.ofCheck(), + widget -> widget.setPos( + spaceX * 0, + spaceY * 2)) + .addToggleButton( + 3, + CoverDataFollower_ToggleButtonWidget.ofCheck(), + widget -> widget.setPos( + spaceX * 0, + spaceY * 3)) + .setPos( + startX, + startY)) + .widget( + new TextWidget(GT_Utility.trans("082", "Open if work enabled")) + .setDefaultColor( + COLOR_TEXT_GRAY.get()) + .setPos( + 3 + startX + + spaceX * 1, + 4 + startY + + spaceY * 0)) + .widget( + new TextWidget( + GT_Utility.trans("083", "Open if work disabled")) + .setDefaultColor( + COLOR_TEXT_GRAY.get()) + .setPos( + 3 + startX + spaceX * 1, + 4 + startY + spaceY * 1)) + .widget( + new TextWidget(GT_Utility.trans("084", "Only Output allowed")) + .setDefaultColor( + COLOR_TEXT_GRAY.get()) + .setPos( + 3 + startX + + spaceX * 1, + 4 + startY + + spaceY * 2)) + .widget( + new TextWidget(GT_Utility.trans("085", "Only Input allowed")) + .setDefaultColor( + COLOR_TEXT_GRAY.get()) + .setPos( + 3 + startX + spaceX * 1, + 4 + startY + + spaceY * 3)); } } } diff --git a/src/main/java/gregtech/common/covers/GT_Cover_SolarPanel.java b/src/main/java/gregtech/common/covers/GT_Cover_SolarPanel.java index 7bd0503214..7b41aefcca 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_SolarPanel.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_SolarPanel.java @@ -32,22 +32,27 @@ public class GT_Cover_SolarPanel extends GT_CoverBehavior { int coverState = aCoverVariable & 0x3; int coverNum = aCoverVariable >> 2; if (aTimer % 100L == 0L) { - if (aTileEntity.getWorld().isThundering()) { + if (aTileEntity.getWorld() + .isThundering()) { return aTileEntity.getBiome().rainfall > 0.0F && aTileEntity.getSkyAtSide(aSide) ? Math.min(20, coverNum) << 2 : coverNum << 2; } else { - if (aTileEntity.getWorld().isRaining() && aTileEntity.getBiome().rainfall > 0.0F) { // really rains + if (aTileEntity.getWorld() + .isRaining() + && aTileEntity.getBiome().rainfall > 0.0F) { // really rains if (aTileEntity.getSkyAtSide(aSide)) coverNum = Math.min(30, coverNum); if (aTileEntity.getWorld().skylightSubtracted >= 4) { - if (aTileEntity.getWorld().isDaytime()) { + if (aTileEntity.getWorld() + .isDaytime()) { coverState = 2; } else { return coverNum << 2; } } } else { // not rains - if (aTileEntity.getWorld().isDaytime()) { + if (aTileEntity.getWorld() + .isDaytime()) { coverState = 1; } else { coverState = 2; @@ -74,7 +79,8 @@ public class GT_Cover_SolarPanel extends GT_CoverBehavior { for (int i = 0; i < aPlayer.inventory.mainInventory.length; i++) { ItemStack is = aPlayer.inventory.mainInventory[i]; if (is == null) continue; - if (is.getUnlocalizedName().equals(new ItemStack(Items.water_bucket).getUnlocalizedName())) { + if (is.getUnlocalizedName() + .equals(new ItemStack(Items.water_bucket).getUnlocalizedName())) { aPlayer.inventory.mainInventory[i] = new ItemStack(Items.bucket); if (aPlayer.inventoryContainer != null) aPlayer.inventoryContainer.detectAndSendChanges(); GT_Utility.sendChatToPlayer( @@ -100,7 +106,8 @@ public class GT_Cover_SolarPanel extends GT_CoverBehavior { for (int i = 0; i < aPlayer.inventory.mainInventory.length; i++) { ItemStack is = aPlayer.inventory.mainInventory[i]; if (is == null) continue; - if (is.getUnlocalizedName().equals(new ItemStack(Items.water_bucket).getUnlocalizedName())) { + if (is.getUnlocalizedName() + .equals(new ItemStack(Items.water_bucket).getUnlocalizedName())) { aPlayer.inventory.mainInventory[i] = new ItemStack(Items.bucket); if (aPlayer.inventoryContainer != null) aPlayer.inventoryContainer.detectAndSendChanges(); GT_Utility.sendChatToPlayer(aPlayer, "Cleaned solar panel from " + (aCoverVariable >> 2) + "% dirt"); 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))); } } } |