diff options
Diffstat (limited to 'src/main/java/gregtech/common/covers')
42 files changed, 1737 insertions, 2134 deletions
diff --git a/src/main/java/gregtech/common/covers/CoverInfo.java b/src/main/java/gregtech/common/covers/CoverInfo.java index cc6d2db1e9..0c3cf6986f 100644 --- a/src/main/java/gregtech/common/covers/CoverInfo.java +++ b/src/main/java/gregtech/common/covers/CoverInfo.java @@ -49,7 +49,7 @@ public final class CoverInfo { coverID = aNBT.getInteger(NBT_ID); coverBehavior = GregTech_API.getCoverBehaviorNew(coverID); coverData = aNBT.hasKey(NBT_DATA) ? coverBehavior.createDataObject(aNBT.getTag(NBT_DATA)) - : coverBehavior.createDataObject(); + : coverBehavior.createDataObject(); coveredTile = new WeakReference<>(aTile); } @@ -136,13 +136,8 @@ 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() { @@ -167,11 +162,11 @@ public final class CoverInfo { public ModularWindow createWindow(EntityPlayer player) { final GT_CoverUIBuildContext buildContext = new GT_CoverUIBuildContext( - player, - coverID, - coverSide, - coveredTile.get(), - true); + player, + coverID, + coverSide, + coveredTile.get(), + true); return getCoverBehavior().createWindow(buildContext); } @@ -224,15 +219,8 @@ 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) { @@ -240,15 +228,8 @@ 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 83cf48386d..d7600e0927 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_Arm.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_Arm.java @@ -53,13 +53,13 @@ public class GT_Cover_Arm extends GT_CoverBehavior { @Override public boolean isRedstoneSensitive(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity, - long aTimer) { + long aTimer) { return false; } @Override public int doCoverThings(byte aSide, byte aInputRedstone, int aCoverID, int aCoverVariable, ICoverable aTileEntity, - long aTimer) { + long aTimer) { if ((((aTileEntity instanceof IMachineProgress)) && (!((IMachineProgress) aTileEntity).isAllowedToWork()))) { return aCoverVariable; } @@ -90,24 +90,9 @@ public class GT_Cover_Arm extends GT_CoverBehavior { if (fromSlot > 0 && toSlot > 0) { if (fromTile instanceof IInventory && toTile instanceof IInventory) movedItems = GT_Utility.moveFromSlotToSlot( - (IInventory) fromTile, - (IInventory) toTile, - fromSlot - 1, - toSlot - 1, - null, - false, - (byte) 64, - (byte) 1, - (byte) 64, - (byte) 1); - } else if (toSlot > 0) { - byte side; - if ((aCoverVariable & EXPORT_MASK) > 0) side = aSide; - else side = GT_Utility.getOppositeSide(aSide); - movedItems = GT_Utility.moveOneItemStackIntoSlot( - fromTile, - toTile, - side, + (IInventory) fromTile, + (IInventory) toTile, + fromSlot - 1, toSlot - 1, null, false, @@ -115,21 +100,36 @@ public class GT_Cover_Arm extends GT_CoverBehavior { (byte) 1, (byte) 64, (byte) 1); + } else if (toSlot > 0) { + byte side; + if ((aCoverVariable & EXPORT_MASK) > 0) side = aSide; + else side = GT_Utility.getOppositeSide(aSide); + movedItems = GT_Utility.moveOneItemStackIntoSlot( + fromTile, + toTile, + side, + toSlot - 1, + null, + false, + (byte) 64, + (byte) 1, + (byte) 64, + (byte) 1); } else if (fromSlot > 0) { byte toSide; if ((aCoverVariable & EXPORT_MASK) > 0) toSide = aSide; else toSide = GT_Utility.getOppositeSide(aSide); if (fromTile instanceof IInventory) movedItems = GT_Utility.moveFromSlotToSide( - (IInventory) fromTile, - toTile, - fromSlot - 1, - toSide, - null, - false, - (byte) 64, - (byte) 1, - (byte) 64, - (byte) 1); + (IInventory) fromTile, + toTile, + fromSlot - 1, + toSide, + null, + false, + (byte) 64, + (byte) 1, + (byte) 64, + (byte) 1); } else { byte fromSide, toSide; if ((aCoverVariable & EXPORT_MASK) > 0) { @@ -140,16 +140,16 @@ public class GT_Cover_Arm extends GT_CoverBehavior { toSide = aSide; } movedItems = GT_Utility.moveOneItemStack( - fromTile, - toTile, - fromSide, - toSide, - null, - false, - (byte) 64, - (byte) 1, - (byte) 64, - (byte) 1); + fromTile, + toTile, + fromSide, + toSide, + null, + false, + (byte) 64, + (byte) 1, + (byte) 64, + (byte) 1); } return aCoverVariable; @@ -157,7 +157,7 @@ public class GT_Cover_Arm extends GT_CoverBehavior { @Override public int onCoverScrewdriverclick(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity, - EntityPlayer aPlayer, float aX, float aY, float aZ) { + EntityPlayer aPlayer, float aX, float aY, float aZ) { int step = 0; if (GT_Utility.getClickedFacingCoords(aSide, aX, aY, aZ)[0] >= 0.5F) { step += aPlayer.isSneaking() ? 256 : 16; @@ -171,8 +171,8 @@ public class GT_Cover_Arm extends GT_CoverBehavior { @Override protected boolean onCoverRightClickImpl(byte aSide, int aCoverID, - ISerializableObject.LegacyCoverData aCoverVariable, ICoverable aTileEntity, EntityPlayer aPlayer, float aX, - float aY, float aZ) { + ISerializableObject.LegacyCoverData aCoverVariable, ICoverable aTileEntity, EntityPlayer aPlayer, float aX, + float aY, float aZ) { int step = (GT_Utility.getClickedFacingCoords(aSide, aX, aY, aZ)[0] >= 0.5F) ? 1 : -1; int tCoverVariable = getNewVar(aCoverVariable.get(), step); sendMessageToPlayer(aPlayer, tCoverVariable); @@ -183,7 +183,7 @@ public class GT_Cover_Arm extends GT_CoverBehavior { @Override @SuppressWarnings("deprecation") public boolean onCoverRightclick(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity, - EntityPlayer aPlayer, float aX, float aY, float aZ) { + EntityPlayer aPlayer, float aX, float aY, float aZ) { int step = (GT_Utility.getClickedFacingCoords(aSide, aX, aY, aZ)[0] >= 0.5F) ? 1 : -1; aCoverVariable = getNewVar(aCoverVariable, step); sendMessageToPlayer(aPlayer, aCoverVariable); @@ -193,11 +193,10 @@ public class GT_Cover_Arm extends GT_CoverBehavior { private void sendMessageToPlayer(EntityPlayer aPlayer, int var) { if ((var & EXPORT_MASK) != 0) GT_Utility.sendChatToPlayer( - aPlayer, - GT_Utility.trans("001", "Puts out into adjacent Slot #") + (((var >> 14) & SLOT_ID_MASK) - 1)); - else GT_Utility.sendChatToPlayer( - aPlayer, - GT_Utility.trans("002", "Grabs in for own Slot #") + ((var & SLOT_ID_MASK) - 1)); + aPlayer, + GT_Utility.trans("001", "Puts out into adjacent Slot #") + (((var >> 14) & SLOT_ID_MASK) - 1)); + else GT_Utility + .sendChatToPlayer(aPlayer, GT_Utility.trans("002", "Grabs in for own Slot #") + ((var & SLOT_ID_MASK) - 1)); } private int getNewVar(int var, int step) { @@ -305,134 +304,111 @@ 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( - 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_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)); + new CoverDataControllerWidget<>(this::getCoverData, this::setCoverData, GT_Cover_Arm.this).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_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)); } 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 8349dde2ee..872371a355 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_ControlsWork.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_ControlsWork.java @@ -37,7 +37,7 @@ public class GT_Cover_ControlsWork extends GT_CoverBehavior implements IControls @Override public int doCoverThings(byte aSide, byte aInputRedstone, int aCoverID, int aCoverVariable, ICoverable aTileEntity, - long aTimer) { + long aTimer) { if (!makeSureOnlyOne(aSide, aTileEntity)) return 0; if (aTileEntity instanceof IMachineProgress machine) { if (aCoverVariable < 2) { @@ -53,14 +53,14 @@ public class GT_Cover_ControlsWork extends GT_CoverBehavior implements IControls if (!mPlayerNotified) { mPlayerNotified = true; GT_Utility.sendChatToPlayer( - lastPlayer, - aTileEntity.getInventoryName() + "at " - + String.format( - "(%d,%d,%d)", - aTileEntity.getXCoord(), - aTileEntity.getYCoord(), - aTileEntity.getZCoord()) - + " shut down."); + lastPlayer, + aTileEntity.getInventoryName() + "at " + + String.format( + "(%d,%d,%d)", + aTileEntity.getXCoord(), + aTileEntity.getYCoord(), + aTileEntity.getZCoord()) + + " shut down."); } return 2; } else { @@ -73,7 +73,7 @@ public class GT_Cover_ControlsWork extends GT_CoverBehavior implements IControls @Override protected boolean isRedstoneSensitiveImpl(byte aSide, int aCoverID, - ISerializableObject.LegacyCoverData aCoverVariable, ICoverable aTileEntity, long aTimer) { + ISerializableObject.LegacyCoverData aCoverVariable, ICoverable aTileEntity, long aTimer) { return aCoverVariable.get() != 2; // always off, so no redstone needed either } @@ -119,7 +119,7 @@ public class GT_Cover_ControlsWork extends GT_CoverBehavior implements IControls @Override public boolean onCoverRemoval(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity, - boolean aForced) { + boolean aForced) { if ((aTileEntity instanceof IMachineProgress)) { ((IMachineProgress) aTileEntity).enableWorking(); ((IMachineProgress) aTileEntity).setWorkDataValue((byte) 0); @@ -129,7 +129,7 @@ public class GT_Cover_ControlsWork extends GT_CoverBehavior implements IControls @Override public int onCoverScrewdriverclick(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity, - EntityPlayer aPlayer, float aX, float aY, float aZ) { + EntityPlayer aPlayer, float aX, float aY, float aZ) { aCoverVariable = (aCoverVariable + (aPlayer.isSneaking() ? -1 : 1)) % 5; if (aCoverVariable < 0) { aCoverVariable = 2; @@ -200,75 +200,54 @@ public class GT_Cover_ControlsWork extends GT_CoverBehavior implements IControls @SuppressWarnings("PointlessArithmeticExpression") @Override protected void addUIWidgets(ModularWindow.Builder builder) { - builder.widget( + builder + .widget( new CoverDataControllerWidget.CoverDataIndexedControllerWidget_ToggleButtons<>( - this::getCoverData, - this::setCoverData, - GT_Cover_ControlsWork.this, - (id, coverData) -> !getClickable(id, convert(coverData)), - (id, coverData) -> new ISerializableObject.LegacyCoverData( - getNewCoverVariable(id, convert(coverData)))).addToggleButton( - 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)); + this::getCoverData, + this::setCoverData, + GT_Cover_ControlsWork.this, + (id, coverData) -> !getClickable(id, convert(coverData)), + (id, coverData) -> new ISerializableObject.LegacyCoverData( + getNewCoverVariable(id, convert(coverData)))) + .addToggleButton( + 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)); } 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 ac99e56005..80d7dff6ae 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_Conveyor.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_Conveyor.java @@ -49,13 +49,13 @@ public class GT_Cover_Conveyor extends GT_CoverBehavior { @Override public boolean isRedstoneSensitive(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity, - long aTimer) { + long aTimer) { return false; } @Override public int doCoverThings(byte aSide, byte aInputRedstone, int aCoverID, int aCoverVariable, ICoverable aTileEntity, - long aTimer) { + long aTimer) { if ((aCoverVariable % 6 > 1) && ((aTileEntity instanceof IMachineProgress))) { if (((IMachineProgress) aTileEntity).isAllowedToWork() != aCoverVariable % 6 < 4) { return aCoverVariable; @@ -68,24 +68,24 @@ public class GT_Cover_Conveyor extends GT_CoverBehavior { final byte toSide = aCoverVariable % 2 == 0 ? GT_Utility.getOppositeSide(aSide) : aSide; moveMultipleItemStacks( - fromEntity, - toEntity, - fromSide, - toSide, - null, - false, - (byte) 64, - (byte) 1, - (byte) 64, - (byte) 1, - this.mMaxStacks); + fromEntity, + toEntity, + fromSide, + toSide, + null, + false, + (byte) 64, + (byte) 1, + (byte) 64, + (byte) 1, + this.mMaxStacks); return aCoverVariable; } @Override public int onCoverScrewdriverclick(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity, - EntityPlayer aPlayer, float aX, float aY, float aZ) { + EntityPlayer aPlayer, float aX, float aY, float aZ) { aCoverVariable = (aCoverVariable + (aPlayer.isSneaking() ? -1 : 1)) % 12; if (aCoverVariable < 0) { aCoverVariable = 11; @@ -100,15 +100,12 @@ public class GT_Cover_Conveyor extends GT_CoverBehavior { case 6 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("012", "Export allow Input")); case 7 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("013", "Import allow Output")); case 8 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("014", "Export allow Input (conditional)")); - case 9 -> GT_Utility.sendChatToPlayer( - aPlayer, - GT_Utility.trans("015", "Import allow Output (conditional)")); - case 10 -> GT_Utility.sendChatToPlayer( - aPlayer, - GT_Utility.trans("016", "Export allow Input (invert cond)")); - case 11 -> GT_Utility.sendChatToPlayer( - aPlayer, - GT_Utility.trans("017", "Import allow Output (invert cond)")); + case 9 -> GT_Utility + .sendChatToPlayer(aPlayer, GT_Utility.trans("015", "Import allow Output (conditional)")); + case 10 -> GT_Utility + .sendChatToPlayer(aPlayer, GT_Utility.trans("016", "Export allow Input (invert cond)")); + case 11 -> GT_Utility + .sendChatToPlayer(aPlayer, GT_Utility.trans("017", "Import allow Output (invert cond)")); } return aCoverVariable; } @@ -194,111 +191,67 @@ public class GT_Cover_Conveyor extends GT_CoverBehavior { @SuppressWarnings("PointlessArithmeticExpression") @Override protected void addUIWidgets(ModularWindow.Builder builder) { - builder.widget( + builder + .widget( new CoverDataControllerWidget.CoverDataIndexedControllerWidget_ToggleButtons<>( - this::getCoverData, - this::setCoverData, - GT_Cover_Conveyor.this, - (id, coverData) -> !getClickable(id, convert(coverData)), - (id, coverData) -> new ISerializableObject.LegacyCoverData( - getNewCoverVariable(id, convert(coverData)))).addToggleButton( - 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)); + this::getCoverData, + this::setCoverData, + GT_Cover_Conveyor.this, + (id, coverData) -> !getClickable(id, convert(coverData)), + (id, coverData) -> new ISerializableObject.LegacyCoverData( + getNewCoverVariable(id, convert(coverData)))) + .addToggleButton( + 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)); } private int getNewCoverVariable(int id, int coverVariable) { diff --git a/src/main/java/gregtech/common/covers/GT_Cover_Crafting.java b/src/main/java/gregtech/common/covers/GT_Cover_Crafting.java index 4a5c254ee1..139317110b 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_Crafting.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_Crafting.java @@ -25,23 +25,23 @@ public class GT_Cover_Crafting extends GT_CoverBehavior { @Override public boolean isRedstoneSensitive(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity, - long aTimer) { + long aTimer) { return false; } @Override public boolean onCoverRightclick(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity, - EntityPlayer aPlayer, float aX, float aY, float aZ) { + EntityPlayer aPlayer, float aX, float aY, float aZ) { if ((aPlayer instanceof EntityPlayerMP)) { ((EntityPlayerMP) aPlayer).getNextWindowId(); ((EntityPlayerMP) aPlayer).playerNetServerHandler.sendPacket( - new S2DPacketOpenWindow(((EntityPlayerMP) aPlayer).currentWindowId, 1, "Crafting", 9, true)); + new S2DPacketOpenWindow(((EntityPlayerMP) aPlayer).currentWindowId, 1, "Crafting", 9, true)); aPlayer.openContainer = new ContainerWorkbench( - aPlayer.inventory, - aPlayer.worldObj, - aTileEntity.getXCoord(), - aTileEntity.getYCoord(), - aTileEntity.getZCoord()) { + aPlayer.inventory, + aPlayer.worldObj, + aTileEntity.getXCoord(), + aTileEntity.getYCoord(), + aTileEntity.getZCoord()) { @Override public boolean canInteractWith(EntityPlayer player) { 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 01d95f1664..367f070848 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_DoesWork.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_DoesWork.java @@ -33,29 +33,29 @@ public class GT_Cover_DoesWork extends GT_CoverBehavior { @Override public boolean isRedstoneSensitive(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity, - long aTimer) { + long aTimer) { return false; } @Override public int doCoverThings(byte aSide, byte aInputRedstone, int aCoverID, int aCoverVariable, ICoverable aTileEntity, - long aTimer) { + long aTimer) { if ((aTileEntity instanceof IMachineProgress)) { if (aCoverVariable < 2) { int tScale = ((IMachineProgress) aTileEntity).getMaxProgress() / 15; if ((tScale > 0) && (((IMachineProgress) aTileEntity).hasThingsToDo())) { aTileEntity.setOutputRedstoneSignal( - aSide, - aCoverVariable % 2 == 0 ? (byte) (((IMachineProgress) aTileEntity).getProgress() / tScale) - : (byte) (15 - ((IMachineProgress) aTileEntity).getProgress() / tScale)); + aSide, + aCoverVariable % 2 == 0 ? (byte) (((IMachineProgress) aTileEntity).getProgress() / tScale) + : (byte) (15 - ((IMachineProgress) aTileEntity).getProgress() / tScale)); } else { aTileEntity.setOutputRedstoneSignal(aSide, (byte) (aCoverVariable % 2 == 0 ? 0 : 15)); } } else { aTileEntity.setOutputRedstoneSignal( - aSide, - (byte) ((aCoverVariable % 2 == 0 ? 1 : 0) - != (((IMachineProgress) aTileEntity).getMaxProgress() == 0 ? 1 : 0) ? 0 : 15)); + aSide, + (byte) ((aCoverVariable % 2 == 0 ? 1 : 0) + != (((IMachineProgress) aTileEntity).getMaxProgress() == 0 ? 1 : 0) ? 0 : 15)); } } else { aTileEntity.setOutputRedstoneSignal(aSide, (byte) 0); @@ -65,7 +65,7 @@ public class GT_Cover_DoesWork extends GT_CoverBehavior { @Override public int onCoverScrewdriverclick(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity, - EntityPlayer aPlayer, float aX, float aY, float aZ) { + EntityPlayer aPlayer, float aX, float aY, float aZ) { aCoverVariable = (aCoverVariable + (aPlayer.isSneaking() ? -1 : 1)) % 4; if (aCoverVariable < 0) { aCoverVariable = 3; @@ -115,7 +115,7 @@ public class GT_Cover_DoesWork extends GT_CoverBehavior { @Override public boolean manipulatesSidedRedstoneOutput(byte aSide, int aCoverID, int aCoverVariable, - ICoverable aTileEntity) { + ICoverable aTileEntity) { return true; } @@ -155,48 +155,46 @@ public class GT_Cover_DoesWork extends GT_CoverBehavior { @SuppressWarnings("PointlessArithmeticExpression") @Override protected void addUIWidgets(ModularWindow.Builder builder) { - builder.widget( + builder + .widget( new CoverDataControllerWidget.CoverDataIndexedControllerWidget_ToggleButtons<>( - this::getCoverData, - this::setCoverData, - GT_Cover_DoesWork.this, - (id, coverData) -> isEnabled(id, convert(coverData)), - (id, coverData) -> new ISerializableObject.LegacyCoverData( - getNewCoverVariable(id, convert(coverData)))).addToggleButton( - 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)); + this::getCoverData, + this::setCoverData, + GT_Cover_DoesWork.this, + (id, coverData) -> isEnabled(id, convert(coverData)), + (id, coverData) -> new ISerializableObject.LegacyCoverData( + getNewCoverVariable(id, convert(coverData)))) + .addToggleButton( + 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)); } 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 5f5381a141..82c6e78c57 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_Drain.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_Drain.java @@ -32,13 +32,13 @@ public class GT_Cover_Drain extends GT_CoverBehavior { @Override public boolean isRedstoneSensitive(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity, - long aTimer) { + long aTimer) { return false; } @Override public int doCoverThings(byte aSide, byte aInputRedstone, int aCoverID, int aCoverVariable, ICoverable aTileEntity, - long aTimer) { + long aTimer) { if ((aCoverVariable % 3 > 1) && ((aTileEntity instanceof IMachineProgress))) { if (((IMachineProgress) aTileEntity).isAllowedToWork() != aCoverVariable % 3 < 2) { return aCoverVariable; @@ -48,68 +48,65 @@ public class GT_Cover_Drain extends GT_CoverBehavior { Block tBlock = aTileEntity.getBlockAtSide(aSide); if ((aCoverVariable < 3) && ((aTileEntity instanceof IFluidHandler))) { if ((aSide == 1) && (aTileEntity.getWorld() - .isRaining()) - && (aTileEntity.getWorld() - .getPrecipitationHeight(aTileEntity.getXCoord(), aTileEntity.getZCoord()) - - 2 < aTileEntity.getYCoord())) { + .isRaining()) + && (aTileEntity.getWorld() + .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), - true); + ForgeDirection.getOrientation(aSide), + Materials.Water.getFluid( + aTileEntity.getWorld() + .isThundering() ? tAmount * 2 : tAmount), + true); } } FluidStack tLiquid = null; if (tBlock != null) { if (((tBlock == Blocks.water) || (tBlock == Blocks.flowing_water)) - && (aTileEntity.getMetaIDAtSide(aSide) == 0)) { + && (aTileEntity.getMetaIDAtSide(aSide) == 0)) { tLiquid = Materials.Water.getFluid(1000L); } else if (((tBlock == Blocks.lava) || (tBlock == Blocks.flowing_lava)) - && (aTileEntity.getMetaIDAtSide(aSide) == 0)) { - tLiquid = Materials.Lava.getFluid(1000L); - } else - if ((tBlock instanceof IFluidBlock)) { + && (aTileEntity.getMetaIDAtSide(aSide) == 0)) { + tLiquid = Materials.Lava.getFluid(1000L); + } else if ((tBlock instanceof IFluidBlock)) { tLiquid = ((IFluidBlock) tBlock).drain( - aTileEntity.getWorld(), - aTileEntity.getOffsetX(aSide, 1), - aTileEntity.getOffsetY(aSide, 1), - aTileEntity.getOffsetZ(aSide, 1), - false); + aTileEntity.getWorld(), + aTileEntity.getOffsetX(aSide, 1), + aTileEntity.getOffsetY(aSide, 1), + aTileEntity.getOffsetZ(aSide, 1), + false); } if ((tLiquid != null) && (tLiquid.getFluid() != null) - && ((aSide > 1) || ((aSide == 0) && (tLiquid.getFluid() - .getDensity() - <= 0)) - || ((aSide == 1) && (tLiquid.getFluid() - .getDensity() - >= 0))) - && (((IFluidHandler) aTileEntity).fill(ForgeDirection.getOrientation(aSide), tLiquid, false) - == tLiquid.amount)) { + && ((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); + .setBlockToAir( + aTileEntity.getXCoord() + ForgeDirection.getOrientation(aSide).offsetX, + aTileEntity.getYCoord() + ForgeDirection.getOrientation(aSide).offsetY, + aTileEntity.getZCoord() + ForgeDirection.getOrientation(aSide).offsetZ); } } } if ((aCoverVariable >= 3) && (tBlock != null) - && ((tBlock == Blocks.lava) || (tBlock == Blocks.flowing_lava) - || (tBlock == Blocks.water) - || (tBlock == Blocks.flowing_water) - || ((tBlock instanceof IFluidBlock)))) { + && ((tBlock == Blocks.lava) || (tBlock == Blocks.flowing_lava) + || (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); + .setBlock( + aTileEntity.getOffsetX(aSide, 1), + aTileEntity.getOffsetY(aSide, 1), + aTileEntity.getOffsetZ(aSide, 1), + Blocks.air, + 0, + 0); } } return aCoverVariable; @@ -117,7 +114,7 @@ public class GT_Cover_Drain extends GT_CoverBehavior { @Override public int onCoverScrewdriverclick(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity, - EntityPlayer aPlayer, float aX, float aY, float aZ) { + EntityPlayer aPlayer, float aX, float aY, float aZ) { aCoverVariable = (aCoverVariable + (aPlayer.isSneaking() ? -1 : 1)) % 6; if (aCoverVariable < 0) { aCoverVariable = 5; 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 a57544e55c..613e1e546d 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_EUMeter.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_EUMeter.java @@ -58,7 +58,7 @@ public class GT_Cover_EUMeter extends GT_CoverBehaviorBase<GT_Cover_EUMeter.EUMe @Override protected EUMeterData doCoverThingsImpl(byte aSide, byte aInputRedstone, int aCoverID, EUMeterData aCoverVariable, - ICoverable aTileEntity, long aTimer) { + ICoverable aTileEntity, long aTimer) { final long stored = aCoverVariable.type.getTileEntityStoredEnergy(aTileEntity); final long capacity = aCoverVariable.type.getTileEntityEnergyCapacity(aTileEntity); @@ -93,9 +93,9 @@ public class GT_Cover_EUMeter extends GT_CoverBehaviorBase<GT_Cover_EUMeter.EUMe @Override protected EUMeterData onCoverScrewdriverClickImpl(byte aSide, int aCoverID, EUMeterData aCoverVariable, - ICoverable aTileEntity, EntityPlayer aPlayer, float aX, float aY, float aZ) { + ICoverable aTileEntity, EntityPlayer aPlayer, float aX, float aY, float aZ) { int num = (aCoverVariable.getNum() + (aPlayer.isSneaking() ? -1 : 1) + EnergyType.values().length * 2) - % (EnergyType.values().length * 2); + % (EnergyType.values().length * 2); switch (num) { case 0 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("031", "Normal Universal Storage")); case 1 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("032", "Inverted Universal Storage")); @@ -107,12 +107,11 @@ public class GT_Cover_EUMeter extends GT_CoverBehaviorBase<GT_Cover_EUMeter.EUMe case 7 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("038", "Inverted Average Electric Input")); case 8 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("039", "Normal Average Electric Output")); case 9 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("040", "Inverted Average Electric Output")); - case 10 -> GT_Utility.sendChatToPlayer( - aPlayer, - GT_Utility.trans("041", "Normal Electricity Storage(Including Batteries)")); + case 10 -> GT_Utility + .sendChatToPlayer(aPlayer, GT_Utility.trans("041", "Normal Electricity Storage(Including Batteries)")); case 11 -> GT_Utility.sendChatToPlayer( - aPlayer, - GT_Utility.trans("042", "Inverted Electricity Storage(Including Batteries)")); + aPlayer, + GT_Utility.trans("042", "Inverted Electricity Storage(Including Batteries)")); } aCoverVariable.setNum(num); return aCoverVariable; @@ -121,7 +120,7 @@ public class GT_Cover_EUMeter extends GT_CoverBehaviorBase<GT_Cover_EUMeter.EUMe // region Static Result Methods @Override protected boolean isRedstoneSensitiveImpl(byte aSide, int aCoverID, EUMeterData aCoverVariable, - ICoverable aTileEntity, long aTimer) { + ICoverable aTileEntity, long aTimer) { return false; } @@ -137,31 +136,31 @@ public class GT_Cover_EUMeter extends GT_CoverBehaviorBase<GT_Cover_EUMeter.EUMe @Override protected boolean letsFluidInImpl(byte aSide, int aCoverID, EUMeterData aCoverVariable, Fluid aFluid, - ICoverable aTileEntity) { + ICoverable aTileEntity) { return true; } @Override protected boolean letsFluidOutImpl(byte aSide, int aCoverID, EUMeterData aCoverVariable, Fluid aFluid, - ICoverable aTileEntity) { + ICoverable aTileEntity) { return true; } @Override protected boolean letsItemsInImpl(byte aSide, int aCoverID, EUMeterData aCoverVariable, int aSlot, - ICoverable aTileEntity) { + ICoverable aTileEntity) { return true; } @Override protected boolean letsItemsOutImpl(byte aSide, int aCoverID, EUMeterData aCoverVariable, int aSlot, - ICoverable aTileEntity) { + ICoverable aTileEntity) { return true; } @Override protected boolean manipulatesSidedRedstoneOutputImpl(byte aSide, int aCoverID, EUMeterData aCoverVariable, - ICoverable aTileEntity) { + ICoverable aTileEntity) { return true; } @@ -205,67 +204,57 @@ 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 CoverDataFollower_CycleButtonWidget<>(), - coverData -> coverData.type.ordinal(), - (coverData, state) -> { - coverData.type = EnergyType.getEnergyType(state); - 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)); + new CoverDataControllerWidget<>(this::getCoverData, this::setCoverData, GT_Cover_EUMeter.this) + .addFollower( + new CoverDataFollower_CycleButtonWidget<>(), + coverData -> coverData.type.ordinal(), + (coverData, state) -> { + coverData.type = EnergyType.getEnergyType(state); + 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)); } } @@ -353,34 +342,34 @@ public class GT_Cover_EUMeter extends GT_CoverBehaviorBase<GT_Cover_EUMeter.EUMe private enum EnergyType { UNIVERSAL_STORAGE(GT_Utility.trans("301", "Universal"), GT_Utility.trans("256", "Universal Storage"), - ICoverable::getUniversalEnergyStored, ICoverable::getUniversalEnergyCapacity), + ICoverable::getUniversalEnergyStored, ICoverable::getUniversalEnergyCapacity), ELECTRICITY_STORAGE(GT_Utility.trans("302", "Int. EU"), GT_Utility.trans("257", "Electricity Storage"), - ICoverable::getStoredEU, ICoverable::getEUCapacity), + ICoverable::getStoredEU, ICoverable::getEUCapacity), STEAM_STORAGE(GT_Utility.trans("303", "Steam"), GT_Utility.trans("258", "Steam Storage"), - ICoverable::getStoredSteam, ICoverable::getSteamCapacity), + ICoverable::getStoredSteam, ICoverable::getSteamCapacity), AVERAGE_ELECTRIC_INPUT(GT_Utility.trans("304", "Avg. Input"), GT_Utility.trans("259", "Average Electric Input"), - ICoverable::getAverageElectricInput, (te) -> te.getInputVoltage() * te.getInputAmperage()), + ICoverable::getAverageElectricInput, (te) -> te.getInputVoltage() * te.getInputAmperage()), AVERAGE_ELECTRIC_OUTPUT(GT_Utility.trans("305", "Avg. Output"), - GT_Utility.trans("260", "Average Electric Output"), ICoverable::getAverageElectricOutput, - (te) -> te.getOutputVoltage() * te.getOutputAmperage()), + GT_Utility.trans("260", "Average Electric Output"), ICoverable::getAverageElectricOutput, + (te) -> te.getOutputVoltage() * te.getOutputAmperage()), ELECTRICITY_STORAGE_INCLUDING_BATTERIES(GT_Utility.trans("306", "EU stored"), - GT_Utility.trans("261", "Electricity Storage(Including Batteries)"), (te) -> { - if (te instanceof IGregTechTileEntity) { - IMetaTileEntity mte = ((IGregTechTileEntity) te).getMetaTileEntity(); - if (mte instanceof GT_MetaTileEntity_BasicBatteryBuffer buffer) { - return buffer.getStoredEnergy()[0]; - } + GT_Utility.trans("261", "Electricity Storage(Including Batteries)"), (te) -> { + if (te instanceof IGregTechTileEntity) { + IMetaTileEntity mte = ((IGregTechTileEntity) te).getMetaTileEntity(); + if (mte instanceof GT_MetaTileEntity_BasicBatteryBuffer buffer) { + return buffer.getStoredEnergy()[0]; } - return te.getStoredEU(); - }, (te) -> { - if (te instanceof IGregTechTileEntity) { - IMetaTileEntity mte = ((IGregTechTileEntity) te).getMetaTileEntity(); - if (mte instanceof GT_MetaTileEntity_BasicBatteryBuffer buffer) { - return buffer.getStoredEnergy()[1]; - } + } + return te.getStoredEU(); + }, (te) -> { + if (te instanceof IGregTechTileEntity) { + IMetaTileEntity mte = ((IGregTechTileEntity) te).getMetaTileEntity(); + if (mte instanceof GT_MetaTileEntity_BasicBatteryBuffer buffer) { + return buffer.getStoredEnergy()[1]; } - return te.getEUCapacity(); - }); + } + return te.getEUCapacity(); + }); private final String title; private final String tooltip; @@ -388,7 +377,7 @@ public class GT_Cover_EUMeter extends GT_CoverBehaviorBase<GT_Cover_EUMeter.EUMe private final Function<ICoverable, Long> getTileEntityEnergyCapacityFunc; EnergyType(String title, String tooltip, Function<ICoverable, Long> getTileEntityStoredEnergyFunc, - Function<ICoverable, Long> getTileEntityEnergyCapacityFunc) { + Function<ICoverable, Long> getTileEntityEnergyCapacityFunc) { this.title = title; this.tooltip = tooltip; this.getTileEntityStoredEnergyFunc = getTileEntityStoredEnergyFunc; 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 66d5eae5e5..87ceb05204 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_FacadeBase.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_FacadeBase.java @@ -58,26 +58,26 @@ public abstract class GT_Cover_FacadeBase extends GT_CoverBehaviorBase<GT_Cover_ @Override protected FacadeData onCoverScrewdriverClickImpl(byte aSide, int aCoverID, FacadeData aCoverVariable, - ICoverable aTileEntity, EntityPlayer aPlayer, float aX, float aY, float aZ) { + ICoverable aTileEntity, EntityPlayer aPlayer, float aX, float aY, float aZ) { aCoverVariable.mFlags = ((aCoverVariable.mFlags + 1) & 15); GT_Utility.sendChatToPlayer( - aPlayer, - ((aCoverVariable.mFlags & 1) != 0 ? GT_Utility.trans("128.1", "Redstone ") : "") - + ((aCoverVariable.mFlags & 2) != 0 ? GT_Utility.trans("129.1", "Energy ") : "") - + ((aCoverVariable.mFlags & 4) != 0 ? GT_Utility.trans("130.1", "Fluids ") : "") - + ((aCoverVariable.mFlags & 8) != 0 ? GT_Utility.trans("131.1", "Items ") : "")); + aPlayer, + ((aCoverVariable.mFlags & 1) != 0 ? GT_Utility.trans("128.1", "Redstone ") : "") + + ((aCoverVariable.mFlags & 2) != 0 ? GT_Utility.trans("129.1", "Energy ") : "") + + ((aCoverVariable.mFlags & 4) != 0 ? GT_Utility.trans("130.1", "Fluids ") : "") + + ((aCoverVariable.mFlags & 8) != 0 ? GT_Utility.trans("131.1", "Items ") : "")); return aCoverVariable; } @Override protected boolean letsRedstoneGoInImpl(byte aSide, int aCoverID, FacadeData aCoverVariable, - ICoverable aTileEntity) { + ICoverable aTileEntity) { return (aCoverVariable.mFlags & 1) != 0; } @Override protected boolean letsRedstoneGoOutImpl(byte aSide, int aCoverID, FacadeData aCoverVariable, - ICoverable aTileEntity) { + ICoverable aTileEntity) { return (aCoverVariable.mFlags & 1) != 0; } @@ -93,42 +93,42 @@ public abstract class GT_Cover_FacadeBase extends GT_CoverBehaviorBase<GT_Cover_ @Override protected boolean letsFluidInImpl(byte aSide, int aCoverID, FacadeData aCoverVariable, Fluid aFluid, - ICoverable aTileEntity) { + ICoverable aTileEntity) { return (aCoverVariable.mFlags & 4) != 0; } @Override protected boolean letsFluidOutImpl(byte aSide, int aCoverID, FacadeData aCoverVariable, Fluid aFluid, - ICoverable aTileEntity) { + ICoverable aTileEntity) { return (aCoverVariable.mFlags & 4) != 0; } @Override protected boolean letsItemsInImpl(byte aSide, int aCoverID, FacadeData aCoverVariable, int aSlot, - ICoverable aTileEntity) { + ICoverable aTileEntity) { return (aCoverVariable.mFlags & 8) != 0; } @Override protected boolean letsItemsOutImpl(byte aSide, int aCoverID, FacadeData aCoverVariable, int aSlot, - ICoverable aTileEntity) { + ICoverable aTileEntity) { return (aCoverVariable.mFlags & 8) != 0; } @Override public void placeCover(byte aSide, ItemStack aCover, ICoverable aTileEntity) { aTileEntity.setCoverIdAndDataAtSide( - aSide, - GT_Utility.stackToInt(aCover), - new FacadeData(GT_Utility.copyAmount(1, aCover), 0)); + aSide, + 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)); + .register( + aTileEntity.getXCoord(), + aTileEntity.getYCoord(), + aTileEntity.getZCoord(), + getTargetBlock(aCover), + getTargetMeta(aCover)); } @Override @@ -138,23 +138,23 @@ public abstract class GT_Cover_FacadeBase extends GT_CoverBehaviorBase<GT_Cover_ @Override protected ITexture getSpecialCoverFGTextureImpl(byte aSide, int aCoverID, FacadeData aCoverVariable, - ICoverable aTileEntity) { + ICoverable aTileEntity) { return getSpecialCoverTextureImpl(aSide, aCoverID, aCoverVariable, aTileEntity); } @Override protected ITexture getSpecialCoverTextureImpl(byte aSide, int aCoverID, FacadeData aCoverVariable, - ICoverable aTileEntity) { + ICoverable aTileEntity) { if (GT_Utility.isStackInvalid(aCoverVariable.mStack)) return Textures.BlockIcons.ERROR_RENDERING[0]; Block block = getTargetBlock(aCoverVariable.mStack); 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(); + .setFromBlock(block, getTargetMeta(aCoverVariable.mStack)) + .useWorldCoord() + .setFromSide(ForgeDirection.getOrientation(aSide)) + .build(); } @Override @@ -175,19 +175,19 @@ public abstract class GT_Cover_FacadeBase extends GT_CoverBehaviorBase<GT_Cover_ @Override protected boolean isDataNeededOnClientImpl(byte aSide, int aCoverID, FacadeData aCoverVariable, - ICoverable aTileEntity) { + ICoverable aTileEntity) { return true; } @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)); + .register( + aTileEntity.getXCoord(), + aTileEntity.getYCoord(), + aTileEntity.getZCoord(), + getTargetBlock(aCoverVariable.mStack), + getTargetMeta(aCoverVariable.mStack)); } @Override @@ -201,18 +201,18 @@ 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)); + .unregister( + aTileEntity.getXCoord(), + aTileEntity.getYCoord(), + aTileEntity.getZCoord(), + getTargetBlock(aCoverVariable.mStack), + getTargetMeta(aCoverVariable.mStack)); } } @Override protected boolean onCoverRightClickImpl(byte aSide, int aCoverID, FacadeData aCoverVariable, ICoverable aTileEntity, - EntityPlayer aPlayer, float aX, float aY, float aZ) { + EntityPlayer aPlayer, float aX, float aY, float aZ) { // in case cover data didn't hit client somehow. maybe he had a ridiculous view distance aTileEntity.issueCoverUpdate(aSide); return super.onCoverRightClickImpl(aSide, aCoverID, aCoverVariable, aTileEntity, aPlayer, aX, aY, aZ); @@ -323,63 +323,52 @@ public abstract class GT_Cover_FacadeBase extends GT_CoverBehaviorBase<GT_Cover_ @Override protected void addUIWidgets(ModularWindow.Builder builder) { builder.widget( - new CoverDataControllerWidget.CoverDataIndexedControllerWidget_ToggleButtons<>( - this::getCoverData, - this::setCoverData, - GT_Cover_FacadeBase.this, - this::isEnabled, - (id, coverData) -> { - coverData.mFlags = getNewCoverVariable(id, coverData); - return coverData; - }).addToggleButton( - 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)); + new CoverDataControllerWidget.CoverDataIndexedControllerWidget_ToggleButtons<>( + this::getCoverData, + this::setCoverData, + GT_Cover_FacadeBase.this, + this::isEnabled, + (id, coverData) -> { + coverData.mFlags = getNewCoverVariable(id, coverData); + return coverData; + }).addToggleButton( + 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)); } @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 bf82af3ad2..199d22407a 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_FluidLimiter.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_FluidLimiter.java @@ -46,7 +46,7 @@ public class GT_Cover_FluidLimiter extends GT_CoverBehaviorBase<GT_Cover_FluidLi @Override protected FluidLimiterData onCoverScrewdriverClickImpl(byte aSide, int aCoverID, FluidLimiterData aCoverVariable, - ICoverable aTileEntity, EntityPlayer aPlayer, float aX, float aY, float aZ) { + ICoverable aTileEntity, EntityPlayer aPlayer, float aX, float aY, float aZ) { if (aTileEntity instanceof IFluidHandler) { adjustThreshold(aCoverVariable, !aPlayer.isSneaking()); GT_Utility.sendChatToPlayer(aPlayer, String.format("Threshold: %f", aCoverVariable.threshold)); @@ -56,13 +56,13 @@ public class GT_Cover_FluidLimiter extends GT_CoverBehaviorBase<GT_Cover_FluidLi @Override protected boolean letsFluidInImpl(byte aSide, int aCoverID, FluidLimiterData aCoverVariable, Fluid aFluid, - ICoverable aTileEntity) { + ICoverable aTileEntity) { return allowsFluidIn(aCoverVariable, aTileEntity); } @Override protected boolean alwaysLookConnectedImpl(byte aSide, int aCoverID, FluidLimiterData aCoverVariable, - ICoverable aTileEntity) { + ICoverable aTileEntity) { return true; } @@ -196,23 +196,21 @@ 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 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)); + 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)); } } } 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 d233d741ae..e4459c06db 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_FluidRegulator.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_FluidRegulator.java @@ -94,13 +94,13 @@ public class GT_Cover_FluidRegulator extends GT_CoverBehaviorBase<GT_Cover_Fluid @Override protected boolean isRedstoneSensitiveImpl(byte aSide, int aCoverID, FluidRegulatorData aCoverVariable, - ICoverable aTileEntity, long aTimer) { + ICoverable aTileEntity, long aTimer) { return aCoverVariable.condition.isRedstoneSensitive(); } @Override protected FluidRegulatorData doCoverThingsImpl(byte aSide, byte aInputRedstone, int aCoverID, - FluidRegulatorData aCoverVariable, ICoverable aTileEntity, long aTimer) { + FluidRegulatorData aCoverVariable, ICoverable aTileEntity, long aTimer) { if (aCoverVariable.speed == 0 || !aCoverVariable.condition.isAllowedToWork(aSide, aCoverID, aTileEntity)) { return aCoverVariable; } @@ -114,12 +114,12 @@ public class GT_Cover_FluidRegulator extends GT_CoverBehaviorBase<GT_Cover_Fluid tTank1 = (IFluidHandler) aTileEntity; directionFrom = ForgeDirection.getOrientation(aSide); directionTo = ForgeDirection.getOrientation(aSide) - .getOpposite(); + .getOpposite(); } else { tTank1 = aTileEntity.getITankContainerAtSide(aSide); tTank2 = (IFluidHandler) aTileEntity; directionFrom = ForgeDirection.getOrientation(aSide) - .getOpposite(); + .getOpposite(); directionTo = ForgeDirection.getOrientation(aSide); } if (tTank1 != null && tTank2 != null) { @@ -148,25 +148,25 @@ public class GT_Cover_FluidRegulator extends GT_CoverBehaviorBase<GT_Cover_Fluid } if (tTickRate == 1) { GT_Utility.sendChatToPlayer( - aPlayer, - GT_Utility.trans("048", "Pump speed: ") + tSpeed - + GT_Utility.trans("049", "L/tick ") - + tSpeed * 20 - + GT_Utility.trans("050", "L/sec")); + aPlayer, + GT_Utility.trans("048", "Pump speed: ") + tSpeed + + GT_Utility.trans("049", "L/tick ") + + tSpeed * 20 + + GT_Utility.trans("050", "L/sec")); } else { GT_Utility.sendChatToPlayer( - aPlayer, - String.format( - GT_Utility.trans("207", "Pump speed: %dL every %d ticks, %.2f L/sec on average"), - tSpeed, - tTickRate, - tSpeed * 20d / tTickRate)); + aPlayer, + String.format( + GT_Utility.trans("207", "Pump speed: %dL every %d ticks, %.2f L/sec on average"), + tSpeed, + tTickRate, + tSpeed * 20d / tTickRate)); } } @Override public FluidRegulatorData onCoverScrewdriverClickImpl(byte aSide, int aCoverID, FluidRegulatorData aCoverVariable, - ICoverable aTileEntity, EntityPlayer aPlayer, float aX, float aY, float aZ) { + ICoverable aTileEntity, EntityPlayer aPlayer, float aX, float aY, float aZ) { if (GT_Utility.getClickedFacingCoords(aSide, aX, aY, aZ)[0] >= 0.5F) { adjustSpeed(aPlayer, aCoverVariable, aPlayer.isSneaking() ? 256 : 16); } else { @@ -177,7 +177,7 @@ public class GT_Cover_FluidRegulator extends GT_CoverBehaviorBase<GT_Cover_Fluid @Override protected boolean onCoverRightClickImpl(byte aSide, int aCoverID, FluidRegulatorData aCoverVariable, - ICoverable aTileEntity, EntityPlayer aPlayer, float aX, float aY, float aZ) { + ICoverable aTileEntity, EntityPlayer aPlayer, float aX, float aY, float aZ) { if (GT_Utility.getClickedFacingCoords(aSide, aX, aY, aZ)[0] >= 0.5F) { adjustSpeed(aPlayer, aCoverVariable, 1); } else { @@ -192,55 +192,55 @@ public class GT_Cover_FluidRegulator extends GT_CoverBehaviorBase<GT_Cover_Fluid @Override public boolean letsRedstoneGoInImpl(byte aSide, int aCoverID, FluidRegulatorData aCoverVariable, - ICoverable aTileEntity) { + ICoverable aTileEntity) { return true; } @Override public boolean letsRedstoneGoOutImpl(byte aSide, int aCoverID, FluidRegulatorData aCoverVariable, - ICoverable aTileEntity) { + ICoverable aTileEntity) { return true; } @Override public boolean letsEnergyInImpl(byte aSide, int aCoverID, FluidRegulatorData aCoverVariable, - ICoverable aTileEntity) { + ICoverable aTileEntity) { return true; } @Override public boolean letsEnergyOutImpl(byte aSide, int aCoverID, FluidRegulatorData aCoverVariable, - ICoverable aTileEntity) { + ICoverable aTileEntity) { return true; } @Override public boolean letsItemsInImpl(byte aSide, int aCoverID, FluidRegulatorData aCoverVariable, int aSlot, - ICoverable aTileEntity) { + ICoverable aTileEntity) { return true; } @Override public boolean letsItemsOutImpl(byte aSide, int aCoverID, FluidRegulatorData aCoverVariable, int aSlot, - ICoverable aTileEntity) { + ICoverable aTileEntity) { return true; } @Override public boolean letsFluidInImpl(byte aSide, int aCoverID, FluidRegulatorData aCoverVariable, Fluid aFluid, - ICoverable aTileEntity) { + ICoverable aTileEntity) { return allowFluid; } @Override public boolean letsFluidOutImpl(byte aSide, int aCoverID, FluidRegulatorData aCoverVariable, Fluid aFluid, - ICoverable aTileEntity) { + ICoverable aTileEntity) { return allowFluid; } @Override protected boolean alwaysLookConnectedImpl(byte aSide, int aCoverID, FluidRegulatorData aCoverVariable, - ICoverable aTileEntity) { + ICoverable aTileEntity) { return true; } @@ -283,182 +283,133 @@ public class GT_Cover_FluidRegulator extends GT_CoverBehaviorBase<GT_Cover_Fluid AtomicBoolean warn = new AtomicBoolean(false); builder.widget( - 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) - .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)); + 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) + .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)); } } @@ -483,7 +434,7 @@ public class GT_Cover_FluidRegulator extends GT_CoverBehaviorBase<GT_Cover_Fluid @Override boolean isAllowedToWork(byte aSide, int aCoverID, ICoverable aTileEntity) { return !(aTileEntity instanceof IMachineProgress) - || !((IMachineProgress) aTileEntity).isAllowedToWork(); + || !((IMachineProgress) aTileEntity).isAllowedToWork(); } }; 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 3457649957..81c41bf59a 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_FluidStorageMonitor.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_FluidStorageMonitor.java @@ -56,11 +56,11 @@ import io.netty.buffer.ByteBuf; public class GT_Cover_FluidStorageMonitor extends GT_CoverBehaviorBase<GT_Cover_FluidStorageMonitor.FluidStorageData> { private static final IIconContainer[] icons = new IIconContainer[] { OVERLAY_FLUID_STORAGE_MONITOR0, - OVERLAY_FLUID_STORAGE_MONITOR1, OVERLAY_FLUID_STORAGE_MONITOR2, OVERLAY_FLUID_STORAGE_MONITOR3, - OVERLAY_FLUID_STORAGE_MONITOR4, OVERLAY_FLUID_STORAGE_MONITOR5, OVERLAY_FLUID_STORAGE_MONITOR6, - OVERLAY_FLUID_STORAGE_MONITOR7, OVERLAY_FLUID_STORAGE_MONITOR8, OVERLAY_FLUID_STORAGE_MONITOR9, - OVERLAY_FLUID_STORAGE_MONITOR10, OVERLAY_FLUID_STORAGE_MONITOR11, OVERLAY_FLUID_STORAGE_MONITOR12, - OVERLAY_FLUID_STORAGE_MONITOR13, OVERLAY_FLUID_STORAGE_MONITOR14, }; + OVERLAY_FLUID_STORAGE_MONITOR1, OVERLAY_FLUID_STORAGE_MONITOR2, OVERLAY_FLUID_STORAGE_MONITOR3, + OVERLAY_FLUID_STORAGE_MONITOR4, OVERLAY_FLUID_STORAGE_MONITOR5, OVERLAY_FLUID_STORAGE_MONITOR6, + OVERLAY_FLUID_STORAGE_MONITOR7, OVERLAY_FLUID_STORAGE_MONITOR8, OVERLAY_FLUID_STORAGE_MONITOR9, + OVERLAY_FLUID_STORAGE_MONITOR10, OVERLAY_FLUID_STORAGE_MONITOR11, OVERLAY_FLUID_STORAGE_MONITOR12, + OVERLAY_FLUID_STORAGE_MONITOR13, OVERLAY_FLUID_STORAGE_MONITOR14, }; public GT_Cover_FluidStorageMonitor() { super(FluidStorageData.class); @@ -78,11 +78,11 @@ public class GT_Cover_FluidStorageMonitor extends GT_CoverBehaviorBase<GT_Cover_ @Override protected FluidStorageData doCoverThingsImpl(byte aSide, byte aInputRedstone, int aCoverID, - FluidStorageData aCoverVariable, ICoverable aTileEntity, long aTimer) { + FluidStorageData aCoverVariable, ICoverable aTileEntity, long aTimer) { final FluidTankInfo[] tanks = getValidFluidTankInfos(aTileEntity, aCoverVariable.side); if (tanks == null) { return aCoverVariable.disable() - .issueCoverUpdateIfNeeded(aTileEntity, aSide); + .issueCoverUpdateIfNeeded(aTileEntity, aSide); } assert 0 < tanks.length; @@ -93,23 +93,23 @@ 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); + .issueCoverUpdateIfNeeded(aTileEntity, aSide); } return aCoverVariable.setFluid(tank.fluid) - .setScale(getTankScale(tank)) - .issueCoverUpdateIfNeeded(aTileEntity, aSide); + .setScale(getTankScale(tank)) + .issueCoverUpdateIfNeeded(aTileEntity, aSide); } @Override protected ITexture getSpecialCoverFGTextureImpl(byte aSide, int aCoverID, FluidStorageData aCoverVariable, - ICoverable aTileEntity) { + ICoverable aTileEntity) { return getSpecialCoverTextureImpl(aSide, aCoverID, aCoverVariable, aTileEntity); } @Override protected ITexture getSpecialCoverTextureImpl(byte aSide, int aCoverID, FluidStorageData aCoverVariable, - ICoverable aTileEntity) { + ICoverable aTileEntity) { if (aCoverVariable.slot == -1 || aCoverVariable.fluid == null || aCoverVariable.scale == 0) { return TextureFactory.of(OVERLAY_FLUID_STORAGE_MONITOR0); } @@ -133,15 +133,15 @@ 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); + .addIcon(fluidIcon) + .setRGBA(fluidRGBA); if (aCoverVariable.fluid.getLuminosity() > 0) fluidTextureBuilder.glow(); return TextureFactory.of(fluidTextureBuilder.build(), TextureFactory.of(icons[aCoverVariable.scale])); } @Override protected boolean onCoverRightClickImpl(byte aSide, int aCoverID, FluidStorageData aCoverVariable, - ICoverable aTileEntity, EntityPlayer aPlayer, float aX, float aY, float aZ) { + ICoverable aTileEntity, EntityPlayer aPlayer, float aX, float aY, float aZ) { if (aPlayer == null || aPlayer.worldObj == null || aPlayer.worldObj.isRemote) { return false; } @@ -182,7 +182,7 @@ public class GT_Cover_FluidStorageMonitor extends GT_CoverBehaviorBase<GT_Cover_ } protected static ItemStack fillToTank(@Nonnull ItemStack container, @Nonnull IFluidHandler tank, - ForgeDirection side) { + ForgeDirection side) { final FluidStack fluidToFill = GT_Utility.getFluidForFilledItem(container, true); if (fluidToFill == null || fluidToFill.getFluid() == null || fluidToFill.amount <= 0) { return null; @@ -209,7 +209,7 @@ public class GT_Cover_FluidStorageMonitor extends GT_CoverBehaviorBase<GT_Cover_ } protected static ItemStack fillToContainer(@Nonnull ItemStack container, @Nonnull FluidTankInfo tankInfo, - @Nonnull IFluidHandler tank, ForgeDirection side) { + @Nonnull IFluidHandler tank, ForgeDirection side) { if (tankInfo.fluid == null || tankInfo.fluid.getFluid() == null || tankInfo.fluid.amount <= 0) { return null; } @@ -219,18 +219,19 @@ public class GT_Cover_FluidStorageMonitor extends GT_CoverBehaviorBase<GT_Cover_ if (container.getItem() instanceof IFluidContainerItem containerItem) { final int filled = Math.min( - Optional.ofNullable( - tank.drain( - side, - new FluidStack(tankInfo.fluid.getFluid(), containerItem.getCapacity(container)), - false)) - .filter(fs -> GT_Utility.areFluidsEqual(fs, tankInfo.fluid)) - .map(fs -> fs.amount) - .orElse(0), - containerItem.fill( - container, + Optional + .ofNullable( + tank.drain( + side, new FluidStack(tankInfo.fluid.getFluid(), containerItem.getCapacity(container)), - false)); + false)) + .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)), + false)); if (filled == 0) { return null; } @@ -247,10 +248,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) - != filledFluid.amount) { + .filter(fs -> GT_Utility.areFluidsEqual(fs, filledFluid)) + .map(fs -> fs.amount) + .orElse(0) != filledFluid.amount) { return null; } tank.drain(side, filledFluid, true); @@ -259,7 +259,7 @@ public class GT_Cover_FluidStorageMonitor extends GT_CoverBehaviorBase<GT_Cover_ } protected static void replaceHeldItemStack(@Nonnull EntityPlayer player, @Nonnull ItemStack heldItem, - @Nonnull ItemStack result) { + @Nonnull ItemStack result) { heldItem.stackSize--; GT_Utility.addItemToPlayerInventory(player, result); player.inventoryContainer.detectAndSendChanges(); @@ -267,11 +267,11 @@ public class GT_Cover_FluidStorageMonitor extends GT_CoverBehaviorBase<GT_Cover_ @Override protected FluidStorageData onCoverScrewdriverClickImpl(byte aSide, int aCoverID, FluidStorageData aCoverVariable, - ICoverable aTileEntity, EntityPlayer aPlayer, float aX, float aY, float aZ) { + ICoverable aTileEntity, EntityPlayer aPlayer, float aX, float aY, float aZ) { if (aPlayer.isSneaking()) { - aCoverVariable.setSide( - ForgeDirection.values()[(aCoverVariable.side.ordinal() + 1) % ForgeDirection.values().length]) - .setSlot(0); + aCoverVariable + .setSide(ForgeDirection.values()[(aCoverVariable.side.ordinal() + 1) % ForgeDirection.values().length]) + .setSlot(0); GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("SIDE", "Side: ") + aCoverVariable.side.name()); return aCoverVariable; } @@ -283,8 +283,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; @@ -292,19 +292,19 @@ public class GT_Cover_FluidStorageMonitor extends GT_CoverBehaviorBase<GT_Cover_ @Override protected boolean isDataNeededOnClientImpl(byte aSide, int aCoverID, FluidStorageData aCoverVariable, - ICoverable aTileEntity) { + ICoverable aTileEntity) { return true; } @Override protected boolean letsFluidInImpl(byte aSide, int aCoverID, FluidStorageData aCoverVariable, Fluid aFluid, - ICoverable aTileEntity) { + ICoverable aTileEntity) { return true; } @Override protected boolean letsFluidOutImpl(byte aSide, int aCoverID, FluidStorageData aCoverVariable, Fluid aFluid, - ICoverable aTileEntity) { + ICoverable aTileEntity) { return true; } @@ -314,7 +314,7 @@ public class GT_Cover_FluidStorageMonitor extends GT_CoverBehaviorBase<GT_Cover_ } protected static FluidTankInfo[] getValidFluidTankInfos(@Nullable ICoverable tileEntity, - @Nonnull ForgeDirection side) { + @Nonnull ForgeDirection side) { if (tileEntity instanceof IFluidHandler) { final FluidTankInfo[] tanks = ((IFluidHandler) tileEntity).getTankInfo(side); if (tanks != null && 0 < tanks.length) { @@ -333,7 +333,7 @@ public class GT_Cover_FluidStorageMonitor extends GT_CoverBehaviorBase<GT_Cover_ protected short[] colorToRGBA(int color) { return new short[] { (short) (color >> 16 & 0xFF), (short) (color >> 8 & 0xFF), (short) (color & 0xFF), - (short) (0xFF) }; + (short) (0xFF) }; } public static class FluidStorageData implements ISerializableObject { @@ -405,7 +405,7 @@ public class GT_Cover_FluidStorageMonitor extends GT_CoverBehaviorBase<GT_Cover_ public FluidStorageData setNullTank() { return this.setFluid((Fluid) null) - .setScale(0); + .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 a067674322..22db900f18 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_Fluidfilter.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_Fluidfilter.java @@ -68,26 +68,24 @@ public class GT_Cover_Fluidfilter extends GT_CoverBehaviorBase<GT_Cover_Fluidfil @Override protected String getDescriptionImpl(byte aSide, int aCoverID, FluidFilterData aCoverVariable, - ICoverable aTileEntity) { + ICoverable aTileEntity) { final Fluid fluid = FluidRegistry.getFluid(aCoverVariable.mFluidID); if (fluid == null) return E; final FluidStack sFluid = new FluidStack(fluid, 1000); - return (String.format( - "Filtering Fluid: %s - %s", - sFluid.getLocalizedName(), - getFilterMode(aCoverVariable.mFilterMode))); + return (String + .format("Filtering Fluid: %s - %s", sFluid.getLocalizedName(), getFilterMode(aCoverVariable.mFilterMode))); } @Override protected boolean isRedstoneSensitiveImpl(byte aSide, int aCoverID, FluidFilterData aCoverVariable, - ICoverable aTileEntity, long aTimer) { + ICoverable aTileEntity, long aTimer) { return false; } @Override protected FluidFilterData doCoverThingsImpl(byte aSide, byte aInputRedstone, int aCoverID, - FluidFilterData aCoverVariable, ICoverable aTileEntity, long aTimer) { + FluidFilterData aCoverVariable, ICoverable aTileEntity, long aTimer) { return aCoverVariable; } @@ -107,7 +105,7 @@ public class GT_Cover_Fluidfilter extends GT_CoverBehaviorBase<GT_Cover_Fluidfil @Override protected FluidFilterData onCoverScrewdriverClickImpl(byte aSide, int aCoverID, FluidFilterData aCoverVariable, - ICoverable aTileEntity, EntityPlayer aPlayer, float aX, float aY, float aZ) { + ICoverable aTileEntity, EntityPlayer aPlayer, float aX, float aY, float aZ) { aCoverVariable.mFilterMode = (aCoverVariable.mFilterMode + (aPlayer.isSneaking() ? -1 : 1)) % 8; if (aCoverVariable.mFilterMode < 0) { aCoverVariable.mFilterMode = 7; @@ -120,11 +118,11 @@ public class GT_Cover_Fluidfilter extends GT_CoverBehaviorBase<GT_Cover_Fluidfil @Override protected boolean onCoverRightClickImpl(byte aSide, int aCoverID, FluidFilterData aCoverVariable, - ICoverable aTileEntity, EntityPlayer aPlayer, float aX, float aY, float aZ) { + ICoverable aTileEntity, EntityPlayer aPlayer, float aX, float aY, float aZ) { if (((aX > 0.375D) && (aX < 0.625D)) || ((aSide > 3) && ((aY > 0.375D) && (aY < 0.625D))) - || ((aSide < 2) && ((aZ > 0.375D) && (aZ < 0.625D))) - || (aSide == 2) - || (aSide == 3)) { + || ((aSide < 2) && ((aZ > 0.375D) && (aZ < 0.625D))) + || (aSide == 2) + || (aSide == 3)) { ItemStack tStack = aPlayer.inventory.getCurrentItem(); if (tStack == null) return true; @@ -134,9 +132,8 @@ public class GT_Cover_Fluidfilter extends GT_CoverBehaviorBase<GT_Cover_Fluidfil aCoverVariable.mFluidID = aFluid; aTileEntity.setCoverDataAtSide(aSide, aCoverVariable); FluidStack sFluid = new FluidStack(FluidRegistry.getFluid(aFluid), 1000); - GT_Utility.sendChatToPlayer( - aPlayer, - GT_Utility.trans("047", "Filter Fluid: ") + sFluid.getLocalizedName()); + GT_Utility + .sendChatToPlayer(aPlayer, GT_Utility.trans("047", "Filter Fluid: ") + sFluid.getLocalizedName()); } return true; } @@ -145,43 +142,43 @@ public class GT_Cover_Fluidfilter extends GT_CoverBehaviorBase<GT_Cover_Fluidfil @Override protected boolean letsRedstoneGoInImpl(byte aSide, int aCoverID, - GT_Cover_Fluidfilter.FluidFilterData aCoverVariable, ICoverable aTileEntity) { + GT_Cover_Fluidfilter.FluidFilterData aCoverVariable, ICoverable aTileEntity) { return true; } @Override protected boolean letsRedstoneGoOutImpl(byte aSide, int aCoverID, - GT_Cover_Fluidfilter.FluidFilterData aCoverVariable, ICoverable aTileEntity) { + GT_Cover_Fluidfilter.FluidFilterData aCoverVariable, ICoverable aTileEntity) { return true; } @Override protected boolean letsEnergyInImpl(byte aSide, int aCoverID, GT_Cover_Fluidfilter.FluidFilterData aCoverVariable, - ICoverable aTileEntity) { + ICoverable aTileEntity) { return true; } @Override protected boolean letsEnergyOutImpl(byte aSide, int aCoverID, GT_Cover_Fluidfilter.FluidFilterData aCoverVariable, - ICoverable aTileEntity) { + ICoverable aTileEntity) { return true; } @Override public boolean letsItemsInImpl(byte aSide, int aCoverID, GT_Cover_Fluidfilter.FluidFilterData aCoverVariable, - int aSlot, ICoverable aTileEntity) { + int aSlot, ICoverable aTileEntity) { return true; } @Override public boolean letsItemsOutImpl(byte aSide, int aCoverID, GT_Cover_Fluidfilter.FluidFilterData aCoverVariable, - int aSlot, ICoverable aTileEntity) { + int aSlot, ICoverable aTileEntity) { return true; } @Override protected boolean letsFluidInImpl(byte aSide, int aCoverID, FluidFilterData aCoverVariable, Fluid aFluid, - ICoverable aTileEntity) { + ICoverable aTileEntity) { if (aFluid == null) return true; int aFilterMode = aCoverVariable.mFilterMode; @@ -196,7 +193,7 @@ public class GT_Cover_Fluidfilter extends GT_CoverBehaviorBase<GT_Cover_Fluidfil @Override protected boolean letsFluidOutImpl(byte aSide, int aCoverID, FluidFilterData aCoverVariable, Fluid aFluid, - ICoverable aTileEntity) { + ICoverable aTileEntity) { if (aFluid == null) return true; int aFilterMode = aCoverVariable.mFilterMode; @@ -211,7 +208,7 @@ public class GT_Cover_Fluidfilter extends GT_CoverBehaviorBase<GT_Cover_Fluidfil @Override protected boolean alwaysLookConnectedImpl(byte aSide, int aCoverID, FluidFilterData aCoverVariable, - ICoverable aTileEntity) { + ICoverable aTileEntity) { return true; } @@ -252,113 +249,101 @@ public class GT_Cover_Fluidfilter extends GT_CoverBehaviorBase<GT_Cover_Fluidfil @Override protected void addUIWidgets(ModularWindow.Builder builder) { builder.widget( - new CoverDataControllerWidget.CoverDataIndexedControllerWidget_ToggleButtons<>( - this::getCoverData, - this::setCoverData, - GT_Cover_Fluidfilter.this, - (id, coverData) -> !getClickable(id, coverData), - (id, coverData) -> { - coverData.mFilterMode = getNewFilterMode(id, coverData); + new CoverDataControllerWidget.CoverDataIndexedControllerWidget_ToggleButtons<>( + this::getCoverData, + this::setCoverData, + GT_Cover_Fluidfilter.this, + (id, coverData) -> !getClickable(id, coverData), + (id, coverData) -> { + coverData.mFilterMode = getNewFilterMode(id, coverData); + return coverData; + }).addToggleButton( + 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; - }).addToggleButton( - 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)); + }, + 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) { @@ -410,9 +395,9 @@ public class GT_Cover_Fluidfilter extends GT_CoverBehaviorBase<GT_Cover_Fluidfil NBTTagCompound tNBT = new NBTTagCompound(); tNBT.setInteger("mFilterMode", mFilterMode); if (mFluidID >= 0) tNBT.setString( - "mFluid", - FluidRegistry.getFluid(mFluidID) - .getName()); + "mFluid", + FluidRegistry.getFluid(mFluidID) + .getName()); return tNBT; } 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 3ea7c88d8e..0e5f57ad6d 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_ItemFilter.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_ItemFilter.java @@ -64,39 +64,39 @@ public class GT_Cover_ItemFilter extends GT_CoverBehaviorBase<GT_Cover_ItemFilte @Override protected boolean isRedstoneSensitiveImpl(byte aSide, int aCoverID, ItemFilterData aCoverVariable, - ICoverable aTileEntity, long aTimer) { + ICoverable aTileEntity, long aTimer) { return false; } @Override protected ItemFilterData doCoverThingsImpl(byte aSide, byte aInputRedstone, int aCoverID, - ItemFilterData aCoverVariable, ICoverable aTileEntity, long aTimer) { + ItemFilterData aCoverVariable, ICoverable aTileEntity, long aTimer) { TileEntity tTileEntity = aTileEntity.getTileEntityAtSide(aSide); Object fromEntity = mExport ? aTileEntity : tTileEntity, toEntity = !mExport ? aTileEntity : tTileEntity; byte fromSide = !mExport ? GT_Utility.getOppositeSide(aSide) : aSide, - toSide = mExport ? GT_Utility.getOppositeSide(aSide) : aSide; + toSide = mExport ? GT_Utility.getOppositeSide(aSide) : aSide; List<ItemStack> Filter = Collections.singletonList(aCoverVariable.mFilter); moveMultipleItemStacks( - fromEntity, - toEntity, - fromSide, - toSide, - Filter, - aCoverVariable.mWhitelist, - (byte) 64, - (byte) 1, - (byte) 64, - (byte) 1, - 64); + fromEntity, + toEntity, + fromSide, + toSide, + Filter, + aCoverVariable.mWhitelist, + (byte) 64, + (byte) 1, + (byte) 64, + (byte) 1, + 64); return aCoverVariable; } @Override protected boolean onCoverRightClickImpl(byte aSide, int aCoverID, ItemFilterData aCoverVariable, - ICoverable aTileEntity, EntityPlayer aPlayer, float aX, float aY, float aZ) { + ICoverable aTileEntity, EntityPlayer aPlayer, float aX, float aY, float aZ) { ItemStack tStack = aPlayer.inventory.getCurrentItem(); if (tStack != null) { aCoverVariable.mFilter = tStack; @@ -110,66 +110,66 @@ public class GT_Cover_ItemFilter extends GT_CoverBehaviorBase<GT_Cover_ItemFilte @Override protected ItemFilterData onCoverScrewdriverClickImpl(byte aSide, int aCoverID, ItemFilterData aCoverVariable, - ICoverable aTileEntity, EntityPlayer aPlayer, float aX, float aY, float aZ) { + ICoverable aTileEntity, EntityPlayer aPlayer, float aX, float aY, float aZ) { aCoverVariable.mWhitelist = !aCoverVariable.mWhitelist; GT_Utility.sendChatToPlayer( - aPlayer, - aCoverVariable.mWhitelist ? GT_Utility.trans("125.1", "Whitelist Mode") - : GT_Utility.trans("124.1", "Blacklist Mode")); + aPlayer, + aCoverVariable.mWhitelist ? GT_Utility.trans("125.1", "Whitelist Mode") + : GT_Utility.trans("124.1", "Blacklist Mode")); return aCoverVariable; } @Override protected boolean letsRedstoneGoInImpl(byte aSide, int aCoverID, ItemFilterData aCoverVariable, - ICoverable aTileEntity) { + ICoverable aTileEntity) { return true; } @Override protected boolean letsRedstoneGoOutImpl(byte aSide, int aCoverID, ItemFilterData aCoverVariable, - ICoverable aTileEntity) { + ICoverable aTileEntity) { return true; } @Override protected boolean letsEnergyInImpl(byte aSide, int aCoverID, ItemFilterData aCoverVariable, - ICoverable aTileEntity) { + ICoverable aTileEntity) { return true; } @Override protected boolean letsEnergyOutImpl(byte aSide, int aCoverID, ItemFilterData aCoverVariable, - ICoverable aTileEntity) { + ICoverable aTileEntity) { return true; } @Override protected boolean letsFluidInImpl(byte aSide, int aCoverID, ItemFilterData aCoverVariable, Fluid aFluid, - ICoverable aTileEntity) { + ICoverable aTileEntity) { return false; } @Override protected boolean letsFluidOutImpl(byte aSide, int aCoverID, ItemFilterData aCoverVariable, Fluid aFluid, - ICoverable aTileEntity) { + ICoverable aTileEntity) { return false; } @Override protected boolean letsItemsInImpl(byte aSide, int aCoverID, ItemFilterData aCoverVariable, int aSlot, - ICoverable aTileEntity) { + ICoverable aTileEntity) { return true; } @Override protected boolean letsItemsOutImpl(byte aSide, int aCoverID, ItemFilterData aCoverVariable, int aSlot, - ICoverable aTileEntity) { + ICoverable aTileEntity) { return true; } @Override protected boolean alwaysLookConnectedImpl(byte aSide, int aCoverID, ItemFilterData aCoverVariable, - ICoverable aTileEntity) { + ICoverable aTileEntity) { return true; } @@ -214,46 +214,37 @@ 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 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)); + 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)); } 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 059cf43e2c..af5a4df927 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_ItemMeter.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_ItemMeter.java @@ -73,12 +73,12 @@ public class GT_Cover_ItemMeter extends GT_CoverBehaviorBase<GT_Cover_ItemMeter. @Override protected boolean isRedstoneSensitiveImpl(byte aSide, int aCoverID, ItemMeterData aCoverVariable, - ICoverable aTileEntity, long aTimer) { + ICoverable aTileEntity, long aTimer) { return false; } public static byte computeSignalBasedOnItems(ICoverable tileEntity, boolean inverted, int threshold, int slot, - int side) { + int side) { long max = 0; long used = 0; IMetaTileEntity mte = ((IGregTechTileEntity) tileEntity).getMetaTileEntity(); @@ -107,13 +107,13 @@ public class GT_Cover_ItemMeter extends GT_CoverBehaviorBase<GT_Cover_ItemMeter. @Override protected ItemMeterData doCoverThingsImpl(byte aSide, byte aInputRedstone, int aCoverID, - ItemMeterData aCoverVariable, ICoverable aTileEntity, long aTimer) { + ItemMeterData aCoverVariable, ICoverable aTileEntity, long aTimer) { byte signal = computeSignalBasedOnItems( - aTileEntity, - aCoverVariable.inverted, - aCoverVariable.threshold, - aCoverVariable.slot, - aSide); + aTileEntity, + aCoverVariable.inverted, + aCoverVariable.threshold, + aCoverVariable.slot, + aSide); aTileEntity.setOutputRedstoneSignal(aSide, signal); return aCoverVariable; @@ -121,7 +121,7 @@ public class GT_Cover_ItemMeter extends GT_CoverBehaviorBase<GT_Cover_ItemMeter. @Override protected ItemMeterData onCoverScrewdriverClickImpl(byte aSide, int aCoverID, ItemMeterData aCoverVariable, - ICoverable aTileEntity, EntityPlayer aPlayer, float aX, float aY, float aZ) { + ICoverable aTileEntity, EntityPlayer aPlayer, float aX, float aY, float aZ) { if (aPlayer.isSneaking()) { if (aCoverVariable.inverted) { aCoverVariable.inverted = false; @@ -134,9 +134,8 @@ 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); } @@ -150,37 +149,37 @@ public class GT_Cover_ItemMeter extends GT_CoverBehaviorBase<GT_Cover_ItemMeter. @Override protected boolean letsEnergyOutImpl(byte aSide, int aCoverID, ItemMeterData aCoverVariable, - ICoverable aTileEntity) { + ICoverable aTileEntity) { return true; } @Override protected boolean letsFluidInImpl(byte aSide, int aCoverID, ItemMeterData aCoverVariable, Fluid aFluid, - ICoverable aTileEntity) { + ICoverable aTileEntity) { return true; } @Override protected boolean letsFluidOutImpl(byte aSide, int aCoverID, ItemMeterData aCoverVariable, Fluid aFluid, - ICoverable aTileEntity) { + ICoverable aTileEntity) { return true; } @Override protected boolean letsItemsInImpl(byte aSide, int aCoverID, ItemMeterData aCoverVariable, int aSlot, - ICoverable aTileEntity) { + ICoverable aTileEntity) { return true; } @Override protected boolean letsItemsOutImpl(byte aSide, int aCoverID, ItemMeterData aCoverVariable, int aSlot, - ICoverable aTileEntity) { + ICoverable aTileEntity) { return true; } @Override protected boolean manipulatesSidedRedstoneOutputImpl(byte aSide, int aCoverID, ItemMeterData aCoverVariable, - ICoverable aTileEntity) { + ICoverable aTileEntity) { return true; } @@ -228,84 +227,71 @@ 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( - 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)); + 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)); } private int getMaxSlot() { final ICoverable tile = getUIBuildContext().getTile(); if (tile instanceof TileEntity && !tile.isDead() - && tile instanceof IGregTechTileEntity - && !(((IGregTechTileEntity) tile).getMetaTileEntity() instanceof GT_MetaTileEntity_DigitalChestBase)) + && tile instanceof IGregTechTileEntity + && !(((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_Lens.java b/src/main/java/gregtech/common/covers/GT_Cover_Lens.java index 1171a4717f..092973767a 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_Lens.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_Lens.java @@ -23,7 +23,7 @@ public class GT_Cover_Lens extends GT_CoverBehavior { @Override public boolean isRedstoneSensitive(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity, - long aTimer) { + long aTimer) { return false; } 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 4e54aa7cf3..af97e190ce 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_LiquidMeter.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_LiquidMeter.java @@ -54,7 +54,7 @@ public class GT_Cover_LiquidMeter extends GT_CoverBehaviorBase<GT_Cover_LiquidMe @Override protected boolean isRedstoneSensitiveImpl(byte aSide, int aCoverID, LiquidMeterData aCoverVariable, - ICoverable aTileEntity, long aTimer) { + ICoverable aTileEntity, long aTimer) { return false; } @@ -66,9 +66,10 @@ 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) { @@ -86,7 +87,7 @@ public class GT_Cover_LiquidMeter extends GT_CoverBehaviorBase<GT_Cover_LiquidMe @Override protected LiquidMeterData doCoverThingsImpl(byte aSide, byte aInputRedstone, int aCoverID, - LiquidMeterData aCoverVariable, ICoverable aTileEntity, long aTimer) { + LiquidMeterData aCoverVariable, ICoverable aTileEntity, long aTimer) { byte signal = computeSignalBasedOnFluid(aTileEntity, aCoverVariable.inverted, aCoverVariable.threshold); if (aCoverVariable.strong) { aTileEntity.setStrongOutputRedstoneSignal(aSide, signal); @@ -99,7 +100,7 @@ public class GT_Cover_LiquidMeter extends GT_CoverBehaviorBase<GT_Cover_LiquidMe @Override protected LiquidMeterData onCoverScrewdriverClickImpl(byte aSide, int aCoverID, LiquidMeterData aCoverVariable, - ICoverable aTileEntity, EntityPlayer aPlayer, float aX, float aY, float aZ) { + ICoverable aTileEntity, EntityPlayer aPlayer, float aX, float aY, float aZ) { if (aCoverVariable.inverted) { aCoverVariable.inverted = false; GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("055", "Normal")); @@ -112,43 +113,43 @@ public class GT_Cover_LiquidMeter extends GT_CoverBehaviorBase<GT_Cover_LiquidMe @Override protected boolean letsEnergyInImpl(byte aSide, int aCoverID, LiquidMeterData aCoverVariable, - ICoverable aTileEntity) { + ICoverable aTileEntity) { return true; } @Override protected boolean letsEnergyOutImpl(byte aSide, int aCoverID, LiquidMeterData aCoverVariable, - ICoverable aTileEntity) { + ICoverable aTileEntity) { return true; } @Override protected boolean letsFluidInImpl(byte aSide, int aCoverID, LiquidMeterData aCoverVariable, Fluid aFluid, - ICoverable aTileEntity) { + ICoverable aTileEntity) { return true; } @Override protected boolean letsFluidOutImpl(byte aSide, int aCoverID, LiquidMeterData aCoverVariable, Fluid aFluid, - ICoverable aTileEntity) { + ICoverable aTileEntity) { return true; } @Override protected boolean letsItemsInImpl(byte aSide, int aCoverID, LiquidMeterData aCoverVariable, int aSlot, - ICoverable aTileEntity) { + ICoverable aTileEntity) { return true; } @Override protected boolean letsItemsOutImpl(byte aSide, int aCoverID, LiquidMeterData aCoverVariable, int aSlot, - ICoverable aTileEntity) { + ICoverable aTileEntity) { return true; } @Override protected boolean manipulatesSidedRedstoneOutputImpl(byte aSide, int aCoverID, LiquidMeterData aCoverVariable, - ICoverable aTileEntity) { + ICoverable aTileEntity) { return true; } @@ -195,75 +196,64 @@ 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); + FluidTankInfo[] tanks = ((IFluidHandler) getUIBuildContext().getTile()) + .getTankInfo(ForgeDirection.UNKNOWN); maxCapacity = Arrays.stream(tanks) - .mapToInt(tank -> tank.capacity) - .sum(); + .mapToInt(tank -> tank.capacity) + .sum(); } else { maxCapacity = -1; } builder.widget( - 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)); + 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)); } } 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 b0ec7137b4..5fc9354c18 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_NeedMaintainance.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_NeedMaintainance.java @@ -36,19 +36,19 @@ public class GT_Cover_NeedMaintainance extends GT_CoverBehavior { public static boolean isRotor(ItemStack rotor) { return (rotor != null && rotor.getItem() instanceof GT_MetaGenerated_Tool - && rotor.getItemDamage() >= 170 - && rotor.getItemDamage() <= 176); + && rotor.getItemDamage() >= 170 + && rotor.getItemDamage() <= 176); } @Override public boolean isRedstoneSensitive(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity, - long aTimer) { + long aTimer) { return false; } @Override public int doCoverThings(byte aSide, byte aInputRedstone, int aCoverID, int aCoverVariable, ICoverable aTileEntity, - long aTimer) { + long aTimer) { boolean needsRepair = false; if (aTileEntity instanceof IGregTechTileEntity tTileEntity) { IMetaTileEntity mTileEntity = tTileEntity.getMetaTileEntity(); @@ -67,9 +67,9 @@ public class GT_Cover_NeedMaintainance extends GT_CoverBehavior { needsRepair = (tCur >= tMax * 8 / 10); } else { long mExpectedDamage = Math.round( - Math.min( - multi.mEUt / multi.damageFactorLow, - Math.pow(multi.mEUt, multi.damageFactorHigh))); + Math.min( + multi.mEUt / multi.damageFactorLow, + Math.pow(multi.mEUt, multi.damageFactorHigh))); needsRepair = tCur + mExpectedDamage * 2 >= tMax; } } else { @@ -89,44 +89,38 @@ public class GT_Cover_NeedMaintainance extends GT_CoverBehavior { @Override public int onCoverScrewdriverclick(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity, - EntityPlayer aPlayer, float aX, float aY, float aZ) { + EntityPlayer aPlayer, float aX, float aY, float aZ) { aCoverVariable = (aCoverVariable + (aPlayer.isSneaking() ? -1 : 1)) % 14; if (aCoverVariable < 0) { aCoverVariable = 13; } switch (aCoverVariable) { case 0 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("056", "Emit if 1 Maintenance Needed")); - case 1 -> GT_Utility.sendChatToPlayer( - aPlayer, - GT_Utility.trans("057", "Emit if 1 Maintenance Needed(inverted)")); + case 1 -> GT_Utility + .sendChatToPlayer(aPlayer, GT_Utility.trans("057", "Emit if 1 Maintenance Needed(inverted)")); case 2 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("058", "Emit if 2 Maintenance Needed")); - case 3 -> GT_Utility.sendChatToPlayer( - aPlayer, - GT_Utility.trans("059", "Emit if 2 Maintenance Needed(inverted)")); + case 3 -> GT_Utility + .sendChatToPlayer(aPlayer, GT_Utility.trans("059", "Emit if 2 Maintenance Needed(inverted)")); case 4 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("060", "Emit if 3 Maintenance Needed")); - case 5 -> GT_Utility.sendChatToPlayer( - aPlayer, - GT_Utility.trans("061", "Emit if 3 Maintenance Needed(inverted)")); + case 5 -> GT_Utility + .sendChatToPlayer(aPlayer, GT_Utility.trans("061", "Emit if 3 Maintenance Needed(inverted)")); case 6 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("062", "Emit if 4 Maintenance Needed")); - case 7 -> GT_Utility.sendChatToPlayer( - aPlayer, - GT_Utility.trans("063", "Emit if 4 Maintenance Needed(inverted)")); + case 7 -> GT_Utility + .sendChatToPlayer(aPlayer, GT_Utility.trans("063", "Emit if 4 Maintenance Needed(inverted)")); case 8 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("064", "Emit if 5 Maintenance Needed")); - case 9 -> GT_Utility.sendChatToPlayer( - aPlayer, - GT_Utility.trans("065", "Emit if 5 Maintenance Needed(inverted)")); - case 10 -> GT_Utility.sendChatToPlayer( - aPlayer, - GT_Utility.trans("066", "Emit if rotor needs maintenance low accuracy mod")); + case 9 -> GT_Utility + .sendChatToPlayer(aPlayer, GT_Utility.trans("065", "Emit if 5 Maintenance Needed(inverted)")); + case 10 -> GT_Utility + .sendChatToPlayer(aPlayer, GT_Utility.trans("066", "Emit if rotor needs maintenance low accuracy mod")); case 11 -> GT_Utility.sendChatToPlayer( - aPlayer, - GT_Utility.trans("067", "Emit if rotor needs maintenance low accuracy mod(inverted)")); + aPlayer, + GT_Utility.trans("067", "Emit if rotor needs maintenance low accuracy mod(inverted)")); case 12 -> GT_Utility.sendChatToPlayer( - aPlayer, - GT_Utility.trans("068", "Emit if rotor needs maintenance high accuracy mod")); + aPlayer, + GT_Utility.trans("068", "Emit if rotor needs maintenance high accuracy mod")); case 13 -> GT_Utility.sendChatToPlayer( - aPlayer, - GT_Utility.trans("069", "Emit if rotor needs maintenance high accuracy mod(inverted)")); + aPlayer, + GT_Utility.trans("069", "Emit if rotor needs maintenance high accuracy mod(inverted)")); } return aCoverVariable; } @@ -163,7 +157,7 @@ public class GT_Cover_NeedMaintainance extends GT_CoverBehavior { @Override public boolean manipulatesSidedRedstoneOutput(byte aSide, int aCoverID, int aCoverVariable, - ICoverable aTileEntity) { + ICoverable aTileEntity) { return true; } @@ -204,116 +198,95 @@ public class GT_Cover_NeedMaintainance extends GT_CoverBehavior { @Override protected void addUIWidgets(ModularWindow.Builder builder) { final String[] tooltipText = { GT_Utility.trans("056", "Emit if 1 Maintenance Needed"), - GT_Utility.trans("058", "Emit if 2 Maintenance Needed"), - GT_Utility.trans("060", "Emit if 3 Maintenance Needed"), - GT_Utility.trans("062", "Emit if 4 Maintenance Needed"), - GT_Utility.trans("064", "Emit if 5 Maintenance Needed"), - GT_Utility.trans("066", "Emit if rotor needs maintenance low accuracy mod"), - GT_Utility.trans("068", "Emit if rotor needs maintenance high accuracy mod"), }; + GT_Utility.trans("058", "Emit if 2 Maintenance Needed"), + GT_Utility.trans("060", "Emit if 3 Maintenance Needed"), + GT_Utility.trans("062", "Emit if 4 Maintenance Needed"), + GT_Utility.trans("064", "Emit if 5 Maintenance Needed"), + GT_Utility.trans("066", "Emit if rotor needs maintenance low accuracy mod"), + GT_Utility.trans("068", "Emit if rotor needs maintenance high accuracy mod"), }; final String[] buttonText = { GT_Utility.trans("247", "1 Issue"), GT_Utility.trans("248", "2 Issues"), - GT_Utility.trans("249", "3 Issues"), GT_Utility.trans("250", "4 Issues"), - GT_Utility.trans("251", "5 Issues"), GT_Utility.trans("252", "Rotor < 80%"), - GT_Utility.trans("253", "Rotor < 100%"), GT_Utility.trans("INVERTED", "Inverted"), - GT_Utility.trans("NORMAL", "Normal"), }; + GT_Utility.trans("249", "3 Issues"), GT_Utility.trans("250", "4 Issues"), + GT_Utility.trans("251", "5 Issues"), GT_Utility.trans("252", "Rotor < 80%"), + GT_Utility.trans("253", "Rotor < 100%"), GT_Utility.trans("INVERTED", "Inverted"), + GT_Utility.trans("NORMAL", "Normal"), }; - builder.widget( + builder + .widget( new CoverDataControllerWidget.CoverDataIndexedControllerWidget_ToggleButtons<>( - this::getCoverData, - this::setCoverData, - GT_Cover_NeedMaintainance.this, - (index, coverData) -> isEnabled(index, convert(coverData)), - (index, coverData) -> new ISerializableObject.LegacyCoverData( - 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)); + this::getCoverData, + this::setCoverData, + GT_Cover_NeedMaintainance.this, + (index, coverData) -> isEnabled(index, convert(coverData)), + (index, coverData) -> new ISerializableObject.LegacyCoverData( + 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)); } 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 466931d075..13054bccf6 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_PlayerDetector.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_PlayerDetector.java @@ -36,13 +36,13 @@ public class GT_Cover_PlayerDetector extends GT_CoverBehavior { @Override public boolean isRedstoneSensitive(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity, - long aTimer) { + long aTimer) { return false; } @Override public int doCoverThings(byte aSide, byte aInputRedstone, int aCoverID, int aCoverVariable, ICoverable aTileEntity, - long aTimer) { + long aTimer) { boolean playerDetected = false; if (aTileEntity instanceof IGregTechTileEntity) { @@ -57,18 +57,18 @@ public class GT_Cover_PlayerDetector extends GT_CoverBehavior { for (Object tObject : aTileEntity.getWorld().playerEntities) { if ((tObject instanceof EntityPlayerMP tEntity)) { int dist = Math.max( - 1, - (int) tEntity.getDistance( - aTileEntity.getXCoord() + 0.5D, - aTileEntity.getYCoord() + 0.5D, - aTileEntity.getZCoord() + 0.5D)); + 1, + (int) tEntity.getDistance( + aTileEntity.getXCoord() + 0.5D, + aTileEntity.getYCoord() + 0.5D, + aTileEntity.getZCoord() + 0.5D)); if (dist < range) { if (aCoverVariable == 0) { playerDetected = true; break; } if (tEntity.getDisplayName() - .equalsIgnoreCase(placer)) { + .equalsIgnoreCase(placer)) { if (aCoverVariable == 1) { playerDetected = true; break; @@ -87,7 +87,7 @@ public class GT_Cover_PlayerDetector extends GT_CoverBehavior { @Override public int onCoverScrewdriverclick(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity, - EntityPlayer aPlayer, float aX, float aY, float aZ) { + EntityPlayer aPlayer, float aX, float aY, float aZ) { aCoverVariable = (aCoverVariable + (aPlayer.isSneaking() ? -1 : 1)) % 3; if (aCoverVariable < 0) { aCoverVariable = 2; @@ -132,7 +132,7 @@ public class GT_Cover_PlayerDetector extends GT_CoverBehavior { @Override public boolean manipulatesSidedRedstoneOutput(byte aSide, int aCoverID, int aCoverVariable, - ICoverable aTileEntity) { + ICoverable aTileEntity) { return true; } @@ -172,58 +172,39 @@ public class GT_Cover_PlayerDetector extends GT_CoverBehavior { @SuppressWarnings("PointlessArithmeticExpression") @Override protected void addUIWidgets(ModularWindow.Builder builder) { - builder.widget( + builder + .widget( new CoverDataControllerWidget.CoverDataIndexedControllerWidget_ToggleButtons<>( - this::getCoverData, - this::setCoverData, - GT_Cover_PlayerDetector.this, - (index, coverData) -> index == convert(coverData), - (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)); + this::getCoverData, + this::setCoverData, + GT_Cover_PlayerDetector.this, + (index, coverData) -> index == convert(coverData), + (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)); } } } 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 f95c586427..045eec872c 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_Pump.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_Pump.java @@ -39,13 +39,13 @@ public class GT_Cover_Pump extends GT_CoverBehavior { @Override public boolean isRedstoneSensitive(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity, - long aTimer) { + long aTimer) { return false; } @Override public int doCoverThings(byte aSide, byte aInputRedstone, int aCoverID, int aCoverVariable, ICoverable aTileEntity, - long aTimer) { + long aTimer) { if ((aCoverVariable % 6 > 1) && ((aTileEntity instanceof IMachineProgress))) { if (((IMachineProgress) aTileEntity).isAllowedToWork() != aCoverVariable % 6 < 4) { return aCoverVariable; @@ -61,36 +61,36 @@ public class GT_Cover_Pump extends GT_CoverBehavior { if (tLiquid != null) { tLiquid = tLiquid.copy(); tLiquid.amount = tTank2.fill( - ForgeDirection.getOrientation(aSide) - .getOpposite(), - tLiquid, - false); + ForgeDirection.getOrientation(aSide) + .getOpposite(), + tLiquid, + false); if (tLiquid.amount > 0 && canTransferFluid(tLiquid)) { tTank2.fill( - ForgeDirection.getOrientation(aSide) - .getOpposite(), - tTank1.drain(ForgeDirection.getOrientation(aSide), tLiquid.amount, true), - true); + 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); + ForgeDirection.getOrientation(aSide) + .getOpposite(), + this.mTransferRate, + false); if (tLiquid != null) { tLiquid = tLiquid.copy(); tLiquid.amount = tTank1.fill(ForgeDirection.getOrientation(aSide), tLiquid, false); if (tLiquid.amount > 0 && canTransferFluid(tLiquid)) { tTank1.fill( - ForgeDirection.getOrientation(aSide), - tTank2.drain( - ForgeDirection.getOrientation(aSide) - .getOpposite(), - tLiquid.amount, - true), - true); + ForgeDirection.getOrientation(aSide), + tTank2.drain( + ForgeDirection.getOrientation(aSide) + .getOpposite(), + tLiquid.amount, + true), + true); } } } @@ -105,7 +105,7 @@ public class GT_Cover_Pump extends GT_CoverBehavior { @Override public int onCoverScrewdriverclick(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity, - EntityPlayer aPlayer, float aX, float aY, float aZ) { + EntityPlayer aPlayer, float aX, float aY, float aZ) { aCoverVariable = (aCoverVariable + (aPlayer.isSneaking() ? -1 : 1)) % 12; if (aCoverVariable < 0) { aCoverVariable = 11; @@ -120,15 +120,12 @@ public class GT_Cover_Pump extends GT_CoverBehavior { case 6 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("012", "Export allow Input")); case 7 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("013", "Import allow Output")); case 8 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("014", "Export allow Input (conditional)")); - case 9 -> GT_Utility.sendChatToPlayer( - aPlayer, - GT_Utility.trans("015", "Import allow Output (conditional)")); - case 10 -> GT_Utility.sendChatToPlayer( - aPlayer, - GT_Utility.trans("016", "Export allow Input (invert cond)")); - case 11 -> GT_Utility.sendChatToPlayer( - aPlayer, - GT_Utility.trans("017", "Import allow Output (invert cond)")); + case 9 -> GT_Utility + .sendChatToPlayer(aPlayer, GT_Utility.trans("015", "Import allow Output (conditional)")); + case 10 -> GT_Utility + .sendChatToPlayer(aPlayer, GT_Utility.trans("016", "Export allow Input (invert cond)")); + case 11 -> GT_Utility + .sendChatToPlayer(aPlayer, GT_Utility.trans("017", "Import allow Output (invert cond)")); } return aCoverVariable; } @@ -224,111 +221,67 @@ public class GT_Cover_Pump extends GT_CoverBehavior { @SuppressWarnings("PointlessArithmeticExpression") @Override protected void addUIWidgets(ModularWindow.Builder builder) { - builder.widget( + builder + .widget( new CoverDataControllerWidget.CoverDataIndexedControllerWidget_ToggleButtons<>( - this::getCoverData, - this::setCoverData, - GT_Cover_Pump.this, - (id, coverData) -> !getClickable(id, convert(coverData)), - (id, coverData) -> new ISerializableObject.LegacyCoverData( - getNewCoverVariable(id, convert(coverData)))).addToggleButton( - 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)); + this::getCoverData, + this::setCoverData, + GT_Cover_Pump.this, + (id, coverData) -> !getClickable(id, convert(coverData)), + (id, coverData) -> new ISerializableObject.LegacyCoverData( + getNewCoverVariable(id, convert(coverData)))) + .addToggleButton( + 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)); } private int getNewCoverVariable(int id, int coverVariable) { diff --git a/src/main/java/gregtech/common/covers/GT_Cover_RedstoneConductor.java b/src/main/java/gregtech/common/covers/GT_Cover_RedstoneConductor.java index 7b1adacff4..7205876fca 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_RedstoneConductor.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_RedstoneConductor.java @@ -17,26 +17,26 @@ public class GT_Cover_RedstoneConductor extends GT_CoverBehavior { @Override public boolean isRedstoneSensitive(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity, - long aTimer) { + long aTimer) { return false; } @Override public int doCoverThings(byte aSide, byte aInputRedstone, int aCoverID, int aCoverVariable, ICoverable aTileEntity, - long aTimer) { + long aTimer) { if (aCoverVariable == 0) { aTileEntity.setOutputRedstoneSignal(aSide, aTileEntity.getStrongestRedstone()); } else if (aCoverVariable < 7) { aTileEntity.setOutputRedstoneSignal( - aSide, - aTileEntity.getInternalInputRedstoneSignal((byte) (aCoverVariable - 1))); + aSide, + aTileEntity.getInternalInputRedstoneSignal((byte) (aCoverVariable - 1))); } return aCoverVariable; } @Override public int onCoverScrewdriverclick(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity, - EntityPlayer aPlayer, float aX, float aY, float aZ) { + EntityPlayer aPlayer, float aX, float aY, float aZ) { aCoverVariable = (aCoverVariable + (aPlayer.isSneaking() ? -1 : 1)) % 7; if (aCoverVariable < 0) { aCoverVariable = 6; @@ -85,7 +85,7 @@ public class GT_Cover_RedstoneConductor extends GT_CoverBehavior { @Override public boolean manipulatesSidedRedstoneOutput(byte aSide, int aCoverID, int aCoverVariable, - ICoverable aTileEntity) { + ICoverable aTileEntity) { return true; } diff --git a/src/main/java/gregtech/common/covers/GT_Cover_RedstoneReceiverExternal.java b/src/main/java/gregtech/common/covers/GT_Cover_RedstoneReceiverExternal.java index 8fe1bb5d13..00890541bc 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_RedstoneReceiverExternal.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_RedstoneReceiverExternal.java @@ -20,23 +20,23 @@ public class GT_Cover_RedstoneReceiverExternal extends GT_Cover_RedstoneWireless @Override public boolean isRedstoneSensitive(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity, - long aTimer) { + long aTimer) { return false; } @Override public int doCoverThings(byte aSide, byte aInputRedstone, int aCoverID, int aCoverVariable, ICoverable aTileEntity, - long aTimer) { + long aTimer) { aTileEntity.setOutputRedstoneSignal( - aSide, - GregTech_API.sWirelessRedstone.get(aCoverVariable) == null ? 0 - : GregTech_API.sWirelessRedstone.get(aCoverVariable)); + aSide, + GregTech_API.sWirelessRedstone.get(aCoverVariable) == null ? 0 + : GregTech_API.sWirelessRedstone.get(aCoverVariable)); return aCoverVariable; } @Override public boolean manipulatesSidedRedstoneOutput(byte aSide, int aCoverID, int aCoverVariable, - ICoverable aTileEntity) { + ICoverable aTileEntity) { return true; } diff --git a/src/main/java/gregtech/common/covers/GT_Cover_RedstoneReceiverInternal.java b/src/main/java/gregtech/common/covers/GT_Cover_RedstoneReceiverInternal.java index 8dec852149..899db734af 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_RedstoneReceiverInternal.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_RedstoneReceiverInternal.java @@ -22,7 +22,7 @@ public class GT_Cover_RedstoneReceiverInternal extends GT_Cover_RedstoneWireless @Override public int doCoverThings(byte aSide, byte aInputRedstone, int aCoverID, int aCoverVariable, ICoverable aTileEntity, - long aTimer) { + long aTimer) { if (aTileEntity instanceof IMachineProgress) { if (getRedstoneInput(aSide, aInputRedstone, aCoverID, aCoverVariable, aTileEntity) > 0) ((IMachineProgress) aTileEntity).enableWorking(); @@ -34,15 +34,15 @@ public class GT_Cover_RedstoneReceiverInternal extends GT_Cover_RedstoneWireless @Override protected boolean isRedstoneSensitiveImpl(byte aSide, int aCoverID, - ISerializableObject.LegacyCoverData aCoverVariable, ICoverable aTileEntity, long aTimer) { + ISerializableObject.LegacyCoverData aCoverVariable, ICoverable aTileEntity, long aTimer) { return true; } @Override public byte getRedstoneInput(byte aSide, byte aInputRedstone, int aCoverID, int aCoverVariable, - ICoverable aTileEntity) { + ICoverable aTileEntity) { return GregTech_API.sWirelessRedstone.get(aCoverVariable) == null ? 0 - : GregTech_API.sWirelessRedstone.get(aCoverVariable); + : GregTech_API.sWirelessRedstone.get(aCoverVariable); } @Override diff --git a/src/main/java/gregtech/common/covers/GT_Cover_RedstoneSignalizer.java b/src/main/java/gregtech/common/covers/GT_Cover_RedstoneSignalizer.java index bdb160f15e..d8ace5b4d2 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_RedstoneSignalizer.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_RedstoneSignalizer.java @@ -18,24 +18,22 @@ public class GT_Cover_RedstoneSignalizer extends GT_CoverBehavior { @Override public boolean isRedstoneSensitive(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity, - long aTimer) { + long aTimer) { return false; } @Override public int onCoverScrewdriverclick(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity, - EntityPlayer aPlayer, float aX, float aY, float aZ) { + EntityPlayer aPlayer, float aX, float aY, float aZ) { aCoverVariable = (aCoverVariable + 1) % 48; switch (aCoverVariable / 16) { - case 0 -> GT_Utility.sendChatToPlayer( - aPlayer, - GT_Utility.trans("078", "Signal = ") + (aCoverVariable & 0xF)); - case 1 -> GT_Utility.sendChatToPlayer( - aPlayer, - GT_Utility.trans("079", "Conditional Signal = ") + (aCoverVariable & 0xF)); + case 0 -> GT_Utility + .sendChatToPlayer(aPlayer, GT_Utility.trans("078", "Signal = ") + (aCoverVariable & 0xF)); + case 1 -> GT_Utility + .sendChatToPlayer(aPlayer, GT_Utility.trans("079", "Conditional Signal = ") + (aCoverVariable & 0xF)); case 2 -> GT_Utility.sendChatToPlayer( - aPlayer, - GT_Utility.trans("080", "Inverted Conditional Signal = ") + (aCoverVariable & 0xF)); + aPlayer, + GT_Utility.trans("080", "Inverted Conditional Signal = ") + (aCoverVariable & 0xF)); } return aCoverVariable; } @@ -77,7 +75,7 @@ public class GT_Cover_RedstoneSignalizer extends GT_CoverBehavior { @Override public byte getRedstoneInput(byte aSide, byte aInputRedstone, int aCoverID, int aCoverVariable, - ICoverable aTileEntity) { + ICoverable aTileEntity) { if (aCoverVariable < 16) { return (byte) (aCoverVariable & 0xF); } diff --git a/src/main/java/gregtech/common/covers/GT_Cover_RedstoneTransmitterExternal.java b/src/main/java/gregtech/common/covers/GT_Cover_RedstoneTransmitterExternal.java index 4f3a8367d3..05374fb096 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_RedstoneTransmitterExternal.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_RedstoneTransmitterExternal.java @@ -26,7 +26,7 @@ public class GT_Cover_RedstoneTransmitterExternal extends GT_Cover_RedstoneWirel @Override public int doCoverThings(byte aSide, byte aInputRedstone, int aCoverID, int aCoverVariable, ICoverable aTileEntity, - long aTimer) { + long aTimer) { // TODO remove next line after 2.3.0 if (!IControlsWorkCover.makeSureOnlyOne(aSide, aTileEntity)) return aCoverVariable; GregTech_API.sWirelessRedstone.put(aCoverVariable, aInputRedstone); @@ -35,7 +35,7 @@ public class GT_Cover_RedstoneTransmitterExternal extends GT_Cover_RedstoneWirel @Override protected boolean isRedstoneSensitiveImpl(byte aSide, int aCoverID, - ISerializableObject.LegacyCoverData aCoverVariable, ICoverable aTileEntity, long aTimer) { + ISerializableObject.LegacyCoverData aCoverVariable, ICoverable aTileEntity, long aTimer) { return true; } 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 42c20e9088..43dbfea1de 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_RedstoneTransmitterInternal.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_RedstoneTransmitterInternal.java @@ -20,13 +20,13 @@ public class GT_Cover_RedstoneTransmitterInternal extends GT_Cover_RedstoneWirel @Override public boolean isRedstoneSensitive(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity, - long aTimer) { + long aTimer) { return false; } @Override public int doCoverThings(byte aSide, byte aInputRedstone, int aCoverID, int aCoverVariable, ICoverable aTileEntity, - long aTimer) { + long aTimer) { GregTech_API.sWirelessRedstone.put(aCoverVariable, aTileEntity.getOutputRedstoneSignal(aSide)); return aCoverVariable; } @@ -43,7 +43,7 @@ public class GT_Cover_RedstoneTransmitterInternal extends GT_Cover_RedstoneWirel @Override public boolean manipulatesSidedRedstoneOutput(byte aSide, int aCoverID, int aCoverVariable, - ICoverable aTileEntity) { + ICoverable aTileEntity) { return true; } } 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 a2a6ea76c6..f41250ad15 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_RedstoneWirelessBase.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_RedstoneWirelessBase.java @@ -39,21 +39,20 @@ public abstract class GT_Cover_RedstoneWirelessBase extends GT_CoverBehavior { @Override public boolean onCoverRemoval(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity, - boolean aForced) { + boolean aForced) { GregTech_API.sWirelessRedstone.put(aCoverVariable, (byte) 0); return true; } @Override protected boolean onCoverRightClickImpl(byte aSide, int aCoverID, - ISerializableObject.LegacyCoverData aCoverVariable, ICoverable aTileEntity, EntityPlayer aPlayer, float aX, - float aY, float aZ) { + ISerializableObject.LegacyCoverData aCoverVariable, ICoverable aTileEntity, EntityPlayer aPlayer, float aX, + float aY, float aZ) { if (((aX > 0.375D) && (aX < 0.625D)) || ((aSide > 3) && ((aY > 0.375D) && (aY < 0.625D)))) { GregTech_API.sWirelessRedstone.put(aCoverVariable.get(), (byte) 0); aCoverVariable.set( - (aCoverVariable.get() & (PRIVATE_MASK | CHECKBOX_MASK)) - | (((Integer) GT_Utility.stackToInt(aPlayer.inventory.getCurrentItem())).hashCode() - & PUBLIC_MASK)); + (aCoverVariable.get() & (PRIVATE_MASK | CHECKBOX_MASK)) + | (((Integer) GT_Utility.stackToInt(aPlayer.inventory.getCurrentItem())).hashCode() & PUBLIC_MASK)); GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("081", "Frequency: ") + aCoverVariable); return true; } @@ -63,20 +62,19 @@ public abstract class GT_Cover_RedstoneWirelessBase extends GT_CoverBehavior { @Override @SuppressWarnings("deprecation") public boolean onCoverRightclick(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity, - EntityPlayer aPlayer, float aX, float aY, float aZ) { + EntityPlayer aPlayer, float aX, float aY, float aZ) { if (((aX > 0.375D) && (aX < 0.625D)) || ((aSide > 3) && ((aY > 0.375D) && (aY < 0.625D)))) { 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; @@ -84,14 +82,14 @@ public abstract class GT_Cover_RedstoneWirelessBase extends GT_CoverBehavior { @Override public int onCoverScrewdriverclick(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity, - EntityPlayer aPlayer, float aX, float aY, float aZ) { + EntityPlayer aPlayer, float aX, float aY, float aZ) { if (((aX > 0.375D) && (aX < 0.625D)) - || ((aSide <= 3) || (((aY > 0.375D) && (aY < 0.625D)) || ((((aZ <= 0.375D) || (aZ >= 0.625D))))))) { + || ((aSide <= 3) || (((aY > 0.375D) && (aY < 0.625D)) || ((((aZ <= 0.375D) || (aZ >= 0.625D))))))) { GregTech_API.sWirelessRedstone.put(aCoverVariable, (byte) 0); float[] tCoords = GT_Utility.getClickedFacingCoords(aSide, aX, aY, aZ); short tAdjustVal = switch ((byte) ((byte) (int) (tCoords[0] * 2.0F) - + 2 * (byte) (int) (tCoords[1] * 2.0F))) { + + 2 * (byte) (int) (tCoords[1] * 2.0F))) { case 0 -> -32; case 1 -> 32; case 2 -> -1024; @@ -189,45 +187,35 @@ public abstract class GT_Cover_RedstoneWirelessBase extends GT_CoverBehavior { @SuppressWarnings("PointlessArithmeticExpression") @Override protected void addUIWidgets(ModularWindow.Builder builder) { - builder.widget( + builder + .widget( 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) - .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)); + 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) + .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)); } private int getFlagFrequency(int coverVariable) { diff --git a/src/main/java/gregtech/common/covers/GT_Cover_Screen.java b/src/main/java/gregtech/common/covers/GT_Cover_Screen.java index 8f26c112ae..77d75aa6b9 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_Screen.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_Screen.java @@ -23,7 +23,7 @@ public class GT_Cover_Screen extends GT_CoverBehavior { @Override public boolean isRedstoneSensitive(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity, - long aTimer) { + long aTimer) { return false; } @@ -79,25 +79,25 @@ public class GT_Cover_Screen extends GT_CoverBehavior { @Override public boolean manipulatesSidedRedstoneOutput(byte aSide, int aCoverID, int aCoverVariable, - ICoverable aTileEntity) { + ICoverable aTileEntity) { return false; } @Override public boolean onCoverRightclick(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity, - EntityPlayer aPlayer, float aX, float aY, float aZ) { + EntityPlayer aPlayer, float aX, float aY, float aZ) { return false; } @Override public boolean onCoverRemoval(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity, - boolean aForced) { + boolean aForced) { return true; } @Override public int doCoverThings(byte aSide, byte aInputRedstone, int aCoverID, int aCoverVariable, ICoverable aTileEntity, - long aTimer) { + long aTimer) { return 0; } } 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 1e70efc5b8..e7d2ac1e02 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_Shutter.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_Shutter.java @@ -33,19 +33,19 @@ public class GT_Cover_Shutter extends GT_CoverBehavior { @Override public boolean isRedstoneSensitive(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity, - long aTimer) { + long aTimer) { return false; } @Override public int doCoverThings(byte aSide, byte aInputRedstone, int aCoverID, int aCoverVariable, ICoverable aTileEntity, - long aTimer) { + long aTimer) { return aCoverVariable; } @Override public int onCoverScrewdriverclick(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity, - EntityPlayer aPlayer, float aX, float aY, float aZ) { + EntityPlayer aPlayer, float aX, float aY, float aZ) { aCoverVariable = (aCoverVariable + (aPlayer.isSneaking() ? -1 : 1)) % 4; if (aCoverVariable < 0) { aCoverVariable = 3; @@ -65,57 +65,57 @@ public class GT_Cover_Shutter extends GT_CoverBehavior { @Override public boolean letsRedstoneGoIn(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity) { return aCoverVariable >= 2 ? aCoverVariable == 3 - : !(aTileEntity instanceof IMachineProgress) - || (((IMachineProgress) aTileEntity).isAllowedToWork() == (aCoverVariable % 2 == 0)); + : !(aTileEntity instanceof IMachineProgress) + || (((IMachineProgress) aTileEntity).isAllowedToWork() == (aCoverVariable % 2 == 0)); } @Override public boolean letsRedstoneGoOut(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity) { return aCoverVariable >= 2 ? aCoverVariable == 2 - : !(aTileEntity instanceof IMachineProgress) - || (((IMachineProgress) aTileEntity).isAllowedToWork() == (aCoverVariable % 2 == 0)); + : !(aTileEntity instanceof IMachineProgress) + || (((IMachineProgress) aTileEntity).isAllowedToWork() == (aCoverVariable % 2 == 0)); } @Override public boolean letsEnergyIn(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity) { return aCoverVariable >= 2 ? aCoverVariable == 3 - : !(aTileEntity instanceof IMachineProgress) - || (((IMachineProgress) aTileEntity).isAllowedToWork() == (aCoverVariable % 2 == 0)); + : !(aTileEntity instanceof IMachineProgress) + || (((IMachineProgress) aTileEntity).isAllowedToWork() == (aCoverVariable % 2 == 0)); } @Override public boolean letsEnergyOut(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity) { return aCoverVariable >= 2 ? aCoverVariable == 2 - : !(aTileEntity instanceof IMachineProgress) - || ((IMachineProgress) aTileEntity).isAllowedToWork() == (aCoverVariable % 2 == 0); + : !(aTileEntity instanceof IMachineProgress) + || ((IMachineProgress) aTileEntity).isAllowedToWork() == (aCoverVariable % 2 == 0); } @Override public boolean letsFluidIn(byte aSide, int aCoverID, int aCoverVariable, Fluid aFluid, ICoverable aTileEntity) { return aCoverVariable >= 2 ? aCoverVariable == 3 - : !(aTileEntity instanceof IMachineProgress) - || ((IMachineProgress) aTileEntity).isAllowedToWork() == (aCoverVariable % 2 == 0); + : !(aTileEntity instanceof IMachineProgress) + || ((IMachineProgress) aTileEntity).isAllowedToWork() == (aCoverVariable % 2 == 0); } @Override public boolean letsFluidOut(byte aSide, int aCoverID, int aCoverVariable, Fluid aFluid, ICoverable aTileEntity) { return aCoverVariable >= 2 ? aCoverVariable == 2 - : !(aTileEntity instanceof IMachineProgress) - || ((IMachineProgress) aTileEntity).isAllowedToWork() == (aCoverVariable % 2 == 0); + : !(aTileEntity instanceof IMachineProgress) + || ((IMachineProgress) aTileEntity).isAllowedToWork() == (aCoverVariable % 2 == 0); } @Override public boolean letsItemsIn(byte aSide, int aCoverID, int aCoverVariable, int aSlot, ICoverable aTileEntity) { return aCoverVariable >= 2 ? aCoverVariable == 3 - : !(aTileEntity instanceof IMachineProgress) - || ((IMachineProgress) aTileEntity).isAllowedToWork() == (aCoverVariable % 2 == 0); + : !(aTileEntity instanceof IMachineProgress) + || ((IMachineProgress) aTileEntity).isAllowedToWork() == (aCoverVariable % 2 == 0); } @Override public boolean letsItemsOut(byte aSide, int aCoverID, int aCoverVariable, int aSlot, ICoverable aTileEntity) { return aCoverVariable >= 2 ? aCoverVariable == 2 - : !(aTileEntity instanceof IMachineProgress) - || ((IMachineProgress) aTileEntity).isAllowedToWork() == (aCoverVariable % 2 == 0); + : !(aTileEntity instanceof IMachineProgress) + || ((IMachineProgress) aTileEntity).isAllowedToWork() == (aCoverVariable % 2 == 0); } @Override @@ -159,71 +159,46 @@ public class GT_Cover_Shutter extends GT_CoverBehavior { @SuppressWarnings("PointlessArithmeticExpression") @Override protected void addUIWidgets(ModularWindow.Builder builder) { - builder.widget( + builder + .widget( new CoverDataControllerWidget.CoverDataIndexedControllerWidget_ToggleButtons<>( - this::getCoverData, - 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)); + this::getCoverData, + 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)); } } } 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 7b41aefcca..702291db78 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_SolarPanel.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_SolarPanel.java @@ -21,30 +21,29 @@ public class GT_Cover_SolarPanel extends GT_CoverBehavior { @Override public boolean isRedstoneSensitive(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity, - long aTimer) { + long aTimer) { return false; } @Override public int doCoverThings(byte aSide, byte aInputRedstone, int aCoverID, int aCoverVariable, ICoverable aTileEntity, - long aTimer) { + long aTimer) { if (aSide != 1) return 0; int coverState = aCoverVariable & 0x3; int coverNum = aCoverVariable >> 2; if (aTimer % 100L == 0L) { if (aTileEntity.getWorld() - .isThundering()) { + .isThundering()) { return aTileEntity.getBiome().rainfall > 0.0F && aTileEntity.getSkyAtSide(aSide) - ? Math.min(20, coverNum) << 2 - : coverNum << 2; + ? Math.min(20, coverNum) << 2 + : coverNum << 2; } else { if (aTileEntity.getWorld() - .isRaining() - && aTileEntity.getBiome().rainfall > 0.0F) { // really rains + .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()) { + .isDaytime()) { coverState = 2; } else { return coverNum << 2; @@ -52,7 +51,7 @@ public class GT_Cover_SolarPanel extends GT_CoverBehavior { } } else { // not rains if (aTileEntity.getWorld() - .isDaytime()) { + .isDaytime()) { coverState = 1; } else { coverState = 2; @@ -69,8 +68,8 @@ public class GT_Cover_SolarPanel extends GT_CoverBehavior { @Override protected boolean onCoverRightClickImpl(byte aSide, int aCoverID, - ISerializableObject.LegacyCoverData aCoverVariable, ICoverable aTileEntity, EntityPlayer aPlayer, float aX, - float aY, float aZ) { + ISerializableObject.LegacyCoverData aCoverVariable, ICoverable aTileEntity, EntityPlayer aPlayer, float aX, + float aY, float aZ) { if (aPlayer.capabilities.isCreativeMode) { GT_Utility.sendChatToPlayer(aPlayer, "Cleaned solar panel from " + (aCoverVariable.get() >> 2) + "% dirt"); aCoverVariable.set(aCoverVariable.get() & 0x3); @@ -80,12 +79,11 @@ public class GT_Cover_SolarPanel extends GT_CoverBehavior { ItemStack is = aPlayer.inventory.mainInventory[i]; if (is == null) continue; if (is.getUnlocalizedName() - .equals(new ItemStack(Items.water_bucket).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.get() >> 2) + "% dirt"); + GT_Utility + .sendChatToPlayer(aPlayer, "Cleaned solar panel from " + (aCoverVariable.get() >> 2) + "% dirt"); aCoverVariable.set(aCoverVariable.get() & 0x3); return true; } @@ -97,7 +95,7 @@ public class GT_Cover_SolarPanel extends GT_CoverBehavior { @Override @SuppressWarnings("deprecation") public boolean onCoverRightclick(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity, - EntityPlayer aPlayer, float aX, float aY, float aZ) { + EntityPlayer aPlayer, float aX, float aY, float aZ) { if (aPlayer.capabilities.isCreativeMode) { GT_Utility.sendChatToPlayer(aPlayer, "Cleaned solar panel from " + (aCoverVariable >> 2) + "% dirt"); aTileEntity.setCoverDataAtSide(aSide, (aCoverVariable & 0x3)); @@ -107,7 +105,7 @@ public class GT_Cover_SolarPanel extends GT_CoverBehavior { ItemStack is = aPlayer.inventory.mainInventory[i]; if (is == null) continue; if (is.getUnlocalizedName() - .equals(new ItemStack(Items.water_bucket).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/GT_Cover_SteamValve.java b/src/main/java/gregtech/common/covers/GT_Cover_SteamValve.java index 0c24e135f1..21c2fa6f63 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_SteamValve.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_SteamValve.java @@ -22,7 +22,7 @@ public class GT_Cover_SteamValve extends GT_Cover_Pump { @Override public boolean isRedstoneSensitive(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity, - long aTimer) { + long aTimer) { return false; } diff --git a/src/main/java/gregtech/common/covers/GT_Cover_Vent.java b/src/main/java/gregtech/common/covers/GT_Cover_Vent.java index 39eeda2ba2..c179f5843b 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_Vent.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_Vent.java @@ -29,13 +29,13 @@ public class GT_Cover_Vent extends GT_CoverBehavior { @Override public boolean isRedstoneSensitive(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity, - long aTimer) { + long aTimer) { return false; } @Override public int doCoverThings(byte aSide, byte aInputRedstone, int aCoverID, int aCoverVariable, ICoverable aTileEntity, - long aTimer) { + long aTimer) { if (aSide == SIDE_UNKNOWN) return 0; int ret = 0; if (aTileEntity instanceof IFluidHandler) { @@ -63,7 +63,7 @@ public class GT_Cover_Vent extends GT_CoverBehavior { final int offsetZ = aTileEntity.getOffsetZ(aSide, 1); final World world = aTileEntity.getWorld(); if (aTileEntity.hasThingsToDo() && aCoverVariable != aTileEntity.getProgress() - && !GT_Utility.hasBlockHitBox(world, offsetX, offsetY, offsetZ)) { + && !GT_Utility.hasBlockHitBox(world, offsetX, offsetY, offsetZ)) { aTileEntity.increaseProgress(this.mEfficiency); } return aTileEntity.getProgress(); 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 bebedffaca..afd0f67b37 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 @@ -23,7 +23,7 @@ import gregtech.common.gui.modularui.widget.CoverDataFollower_ToggleButtonWidget import io.netty.buffer.ByteBuf; public abstract class GT_Cover_AdvancedRedstoneReceiverBase - extends GT_Cover_AdvancedWirelessRedstoneBase<GT_Cover_AdvancedRedstoneReceiverBase.ReceiverData> { + extends GT_Cover_AdvancedWirelessRedstoneBase<GT_Cover_AdvancedRedstoneReceiverBase.ReceiverData> { public GT_Cover_AdvancedRedstoneReceiverBase(ITexture coverTexture) { super(ReceiverData.class, coverTexture); @@ -71,10 +71,8 @@ public abstract class GT_Cover_AdvancedRedstoneReceiverBase protected void addUIWidgets(ModularWindow.Builder builder) { 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)); + new TextWidget(GT_Utility.trans("335", "Gate Mode")).setDefaultColor(COLOR_TEXT_GRAY.get()) + .setPos(startX + spaceX * 5, 4 + startY + spaceY * 2)); } @SuppressWarnings("PointlessArithmeticExpression") @@ -82,59 +80,59 @@ public abstract class GT_Cover_AdvancedRedstoneReceiverBase protected void addUIForDataController(CoverDataControllerWidget<ReceiverData> controller) { super.addUIForDataController(controller); controller.addFollower( + CoverDataFollower_ToggleButtonWidget.ofDisableable(), + coverData -> coverData.mode == GateMode.AND, + (coverData, state) -> { + coverData.mode = GateMode.AND; + 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.AND, + coverData -> coverData.mode == GateMode.NAND, (coverData, state) -> { - coverData.mode = GateMode.AND; + coverData.mode = GateMode.NAND; 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)); + 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_AdvancedRedstoneReceiverExternal.java b/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneReceiverExternal.java index caf4b6bdcd..1e1c992bb1 100644 --- a/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneReceiverExternal.java +++ b/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneReceiverExternal.java @@ -11,23 +11,23 @@ public class GT_Cover_AdvancedRedstoneReceiverExternal extends GT_Cover_Advanced @Override public ReceiverData doCoverThingsImpl(byte aSide, byte aInputRedstone, int aCoverID, ReceiverData aCoverVariable, - ICoverable aTileEntity, long aTimer) { + ICoverable aTileEntity, long aTimer) { aTileEntity.setOutputRedstoneSignal( - aSide, - getSignalAt(aCoverVariable.getUuid(), aCoverVariable.getFrequency(), aCoverVariable.getGateMode())); + aSide, + getSignalAt(aCoverVariable.getUuid(), aCoverVariable.getFrequency(), aCoverVariable.getGateMode())); return aCoverVariable; } @Override protected boolean isRedstoneSensitiveImpl(byte aSide, int aCoverID, ReceiverData aCoverVariable, - ICoverable aTileEntity, long aTimer) { + ICoverable aTileEntity, long aTimer) { return false; } @Override protected boolean manipulatesSidedRedstoneOutputImpl(byte aSide, int aCoverID, ReceiverData aCoverVariable, - ICoverable aTileEntity) { + ICoverable aTileEntity) { return true; } } diff --git a/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneReceiverInternal.java b/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneReceiverInternal.java index 0ceaaeb887..899a97dca7 100644 --- a/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneReceiverInternal.java +++ b/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneReceiverInternal.java @@ -12,7 +12,7 @@ public class GT_Cover_AdvancedRedstoneReceiverInternal extends GT_Cover_Advanced @Override public ReceiverData doCoverThingsImpl(byte aSide, byte aInputRedstone, int aCoverID, ReceiverData aCoverVariable, - ICoverable aTileEntity, long aTimer) { + ICoverable aTileEntity, long aTimer) { if (aTileEntity instanceof IMachineProgress machine) { if (getRedstoneInput(aSide, aInputRedstone, aCoverID, aCoverVariable, aTileEntity) > 0) { machine.enableWorking(); @@ -28,13 +28,13 @@ public class GT_Cover_AdvancedRedstoneReceiverInternal extends GT_Cover_Advanced @Override protected byte getRedstoneInputImpl(byte aSide, byte aInputRedstone, int aCoverID, ReceiverData aCoverVariable, - ICoverable aTileEntity) { + ICoverable aTileEntity) { return getSignalAt(aCoverVariable.getUuid(), aCoverVariable.getFrequency(), aCoverVariable.getGateMode()); } @Override protected boolean isRedstoneSensitiveImpl(byte aSide, int aCoverID, ReceiverData aCoverVariable, - ICoverable aTileEntity, long aTimer) { + ICoverable aTileEntity, long aTimer) { return true; } } 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 e74dffb102..237635eb7f 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 @@ -24,7 +24,7 @@ import gregtech.common.gui.modularui.widget.CoverDataFollower_ToggleButtonWidget import io.netty.buffer.ByteBuf; public abstract class GT_Cover_AdvancedRedstoneTransmitterBase<T extends GT_Cover_AdvancedRedstoneTransmitterBase.TransmitterData> - extends GT_Cover_AdvancedWirelessRedstoneBase<T> { + extends GT_Cover_AdvancedWirelessRedstoneBase<T> { public GT_Cover_AdvancedRedstoneTransmitterBase(Class<T> typeToken, ITexture coverTexture) { super(typeToken, coverTexture); @@ -37,33 +37,33 @@ public abstract class GT_Cover_AdvancedRedstoneTransmitterBase<T extends GT_Cove @Override public boolean onCoverRemovalImpl(byte aSide, int aCoverID, TransmitterData aCoverVariable, ICoverable aTileEntity, - boolean aForced) { + boolean aForced) { unregisterSignal(aSide, aCoverVariable, aTileEntity); return true; } @Override protected void onBaseTEDestroyedImpl(byte aSide, int aCoverID, TransmitterData aCoverVariable, - ICoverable aTileEntity) { + ICoverable aTileEntity) { unregisterSignal(aSide, aCoverVariable, aTileEntity); } @Override protected T onCoverScrewdriverClickImpl(byte aSide, int aCoverID, T aCoverVariable, ICoverable aTileEntity, - EntityPlayer aPlayer, float aX, float aY, float aZ) { + EntityPlayer aPlayer, float aX, float aY, float aZ) { aCoverVariable.invert = !aCoverVariable.invert; GT_Utility.sendChatToPlayer( - aPlayer, - aCoverVariable.invert ? GT_Utility.trans("054", "Inverted") : GT_Utility.trans("055", "Normal")); + aPlayer, + aCoverVariable.invert ? GT_Utility.trans("054", "Inverted") : GT_Utility.trans("055", "Normal")); return aCoverVariable; } @Override protected void preDataChangedImpl(byte aSide, int aCoverID, int aNewCoverId, T aCoverVariable, T aNewCoverVariable, - ICoverable aTileEntity) { + ICoverable aTileEntity) { if (aCoverVariable.frequency != aNewCoverVariable.frequency - || !Objects.equals(aCoverVariable.uuid, aNewCoverVariable.uuid)) { + || !Objects.equals(aCoverVariable.uuid, aNewCoverVariable.uuid)) { unregisterSignal(aSide, aCoverVariable, aTileEntity); } } @@ -159,29 +159,29 @@ public abstract class GT_Cover_AdvancedRedstoneTransmitterBase<T extends GT_Cove T coverData = getCoverData(); if (coverData != null) { return getCoverData().invert ? GT_Utility.trans("INVERTED", "Inverted") - : GT_Utility.trans("NORMAL", "Normal"); + : GT_Utility.trans("NORMAL", "Normal"); } 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 protected void addUIForDataController(CoverDataControllerWidget<T> controller) { super.addUIForDataController(controller); controller.addFollower( - CoverDataFollower_ToggleButtonWidget.ofRedstone(), - coverData -> coverData.invert, - (coverData, state) -> { - coverData.invert = state; - return coverData; - }, - widget -> widget.addTooltip(0, GT_Utility.trans("NORMAL", "Normal")) - .addTooltip(1, GT_Utility.trans("INVERTED", "Inverted")) - .setPos(spaceX * 9, spaceY * getButtonRow())); + CoverDataFollower_ToggleButtonWidget.ofRedstone(), + coverData -> coverData.invert, + (coverData, state) -> { + coverData.invert = state; + return coverData; + }, + widget -> widget.addTooltip(0, GT_Utility.trans("NORMAL", "Normal")) + .addTooltip(1, GT_Utility.trans("INVERTED", "Inverted")) + .setPos(spaceX * 9, spaceY * getButtonRow())); } } } diff --git a/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneTransmitterExternal.java b/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneTransmitterExternal.java index 52392b5f84..c693610318 100644 --- a/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneTransmitterExternal.java +++ b/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneTransmitterExternal.java @@ -4,7 +4,7 @@ import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.ICoverable; public class GT_Cover_AdvancedRedstoneTransmitterExternal - extends GT_Cover_AdvancedRedstoneTransmitterBase<GT_Cover_AdvancedRedstoneTransmitterBase.TransmitterData> { + extends GT_Cover_AdvancedRedstoneTransmitterBase<GT_Cover_AdvancedRedstoneTransmitterBase.TransmitterData> { public GT_Cover_AdvancedRedstoneTransmitterExternal(ITexture coverTexture) { super(TransmitterData.class, coverTexture); @@ -22,7 +22,7 @@ public class GT_Cover_AdvancedRedstoneTransmitterExternal @Override public TransmitterData doCoverThingsImpl(byte aSide, byte aInputRedstone, int aCoverID, - TransmitterData aCoverVariable, ICoverable aTileEntity, long aTimer) { + TransmitterData aCoverVariable, ICoverable aTileEntity, long aTimer) { byte outputRedstone = aInputRedstone; if (aCoverVariable.isInvert()) { if (outputRedstone > 0) outputRedstone = 0; @@ -37,13 +37,13 @@ public class GT_Cover_AdvancedRedstoneTransmitterExternal @Override protected boolean isRedstoneSensitiveImpl(byte aSide, int aCoverID, TransmitterData aCoverVariable, - ICoverable aTileEntity, long aTimer) { + ICoverable aTileEntity, long aTimer) { return true; } @Override public boolean letsRedstoneGoInImpl(byte aSide, int aCoverID, TransmitterData aCoverVariable, - ICoverable aTileEntity) { + ICoverable aTileEntity) { return true; } } diff --git a/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneTransmitterInternal.java b/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneTransmitterInternal.java index 8cd288f8e2..353a579680 100644 --- a/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneTransmitterInternal.java +++ b/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneTransmitterInternal.java @@ -4,7 +4,7 @@ import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.ICoverable; public class GT_Cover_AdvancedRedstoneTransmitterInternal - extends GT_Cover_AdvancedRedstoneTransmitterBase<GT_Cover_AdvancedRedstoneTransmitterBase.TransmitterData> { + extends GT_Cover_AdvancedRedstoneTransmitterBase<GT_Cover_AdvancedRedstoneTransmitterBase.TransmitterData> { public GT_Cover_AdvancedRedstoneTransmitterInternal(ITexture coverTexture) { super(TransmitterData.class, coverTexture); @@ -22,7 +22,7 @@ public class GT_Cover_AdvancedRedstoneTransmitterInternal @Override public TransmitterData doCoverThingsImpl(byte aSide, byte aInputRedstone, int aCoverID, - TransmitterData aCoverVariable, ICoverable aTileEntity, long aTimer) { + TransmitterData aCoverVariable, ICoverable aTileEntity, long aTimer) { byte outputRedstone = aTileEntity.getOutputRedstoneSignal(aSide); if (aCoverVariable.isInvert()) { if (outputRedstone > 0) outputRedstone = 0; @@ -36,13 +36,13 @@ public class GT_Cover_AdvancedRedstoneTransmitterInternal @Override public boolean letsRedstoneGoOutImpl(byte aSide, int aCoverID, TransmitterData aCoverVariable, - ICoverable aTileEntity) { + ICoverable aTileEntity) { return true; } @Override protected boolean manipulatesSidedRedstoneOutputImpl(byte aSide, int aCoverID, TransmitterData aCoverVariable, - ICoverable aTileEntity) { + ICoverable aTileEntity) { return true; } } 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 fecb188214..843c7ab5e2 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 @@ -29,7 +29,7 @@ import gregtech.common.gui.modularui.widget.CoverDataFollower_ToggleButtonWidget import io.netty.buffer.ByteBuf; public abstract class GT_Cover_AdvancedWirelessRedstoneBase<T extends GT_Cover_AdvancedWirelessRedstoneBase.WirelessData> - extends GT_CoverBehaviorBase<T> { + extends GT_CoverBehaviorBase<T> { public GT_Cover_AdvancedWirelessRedstoneBase(Class<T> typeToken, ITexture coverTexture) { super(typeToken, coverTexture); @@ -45,36 +45,36 @@ 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); + .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); + .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); + .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); + .stream() + .map(signal -> signal > 0) + .reduce(false, (signalA, signalB) -> signalA || signalB) ? 0 : 15); } case SINGLE_SOURCE -> { if (signals.values() - .isEmpty()) { + .isEmpty()) { return 0; } return signals.values() - .iterator() - .next(); + .iterator() + .next(); } default -> { return 0; @@ -92,9 +92,8 @@ 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); } @@ -105,7 +104,7 @@ public abstract class GT_Cover_AdvancedWirelessRedstoneBase<T extends GT_Cover_A */ public static long hashCoverCoords(ICoverable tile, byte side) { return (((((long) tile.getXCoord() << 20) + tile.getZCoord() << 10) + tile.getYCoord() << 10) - + tile.getWorld().provider.dimensionId << 4) + side; + + tile.getWorld().provider.dimensionId << 4) + side; } @Override @@ -141,8 +140,8 @@ public abstract class GT_Cover_AdvancedWirelessRedstoneBase<T extends GT_Cover_A @Override public String getDescriptionImpl(byte aSide, int aCoverID, T aCoverVariable, ICoverable aTileEntity) { return GT_Utility.trans("081", "Frequency: ") + aCoverVariable.frequency - + ", Transmission: " - + (aCoverVariable.uuid == null ? "Public" : "Private"); + + ", Transmission: " + + (aCoverVariable.uuid == null ? "Public" : "Private"); } @Override @@ -248,57 +247,48 @@ public abstract class GT_Cover_AdvancedWirelessRedstoneBase<T extends GT_Cover_A final int privateExtraColumn = isShiftPrivateLeft() ? 1 : 5; CoverDataControllerWidget<T> dataController = new CoverDataControllerWidget<>( - this::getCoverData, - this::setCoverData, - GT_Cover_AdvancedWirelessRedstoneBase.this); + this::getCoverData, + this::setCoverData, + GT_Cover_AdvancedWirelessRedstoneBase.this); dataController.setPos(startX, startY); 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) { controller.addFollower( - new CoverDataFollower_TextFieldWidget<>(), - coverData -> String.valueOf(coverData.frequency), + new CoverDataFollower_TextFieldWidget<>(), + coverData -> String.valueOf(coverData.frequency), + (coverData, state) -> { + 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) -> { - coverData.frequency = (int) MathExpression.parseMathExpression(state); + if (state) { + coverData.uuid = getUIBuildContext().getPlayer() + .getUniqueID(); + } else { + coverData.uuid = null; + } 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.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 af1afbe18d..f580877dea 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 @@ -24,7 +24,7 @@ import gregtech.common.gui.modularui.widget.CoverDataFollower_TextFieldWidget; import io.netty.buffer.ByteBuf; public class GT_Cover_WirelessFluidDetector - extends GT_Cover_AdvancedRedstoneTransmitterBase<GT_Cover_WirelessFluidDetector.FluidTransmitterData> { + extends GT_Cover_AdvancedRedstoneTransmitterBase<GT_Cover_WirelessFluidDetector.FluidTransmitterData> { public GT_Cover_WirelessFluidDetector(ITexture coverTexture) { super(FluidTransmitterData.class, coverTexture); @@ -42,11 +42,9 @@ 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); + FluidTransmitterData aCoverVariable, ICoverable aTileEntity, long aTimer) { + byte signal = GT_Cover_LiquidMeter + .computeSignalBasedOnFluid(aTileEntity, aCoverVariable.invert, aCoverVariable.threshold); long hash = hashCoverCoords(aTileEntity, aSide); setSignalAt(aCoverVariable.getUuid(), aCoverVariable.getFrequency(), hash, signal); @@ -55,13 +53,13 @@ public class GT_Cover_WirelessFluidDetector @Override public boolean letsRedstoneGoOutImpl(byte aSide, int aCoverID, FluidTransmitterData aCoverVariable, - ICoverable aTileEntity) { + ICoverable aTileEntity) { return true; } @Override protected boolean manipulatesSidedRedstoneOutputImpl(byte aSide, int aCoverID, FluidTransmitterData aCoverVariable, - ICoverable aTileEntity) { + ICoverable aTileEntity) { return true; } @@ -146,24 +144,24 @@ public class GT_Cover_WirelessFluidDetector protected void addUIWidgets(ModularWindow.Builder builder) { super.addUIWidgets(builder); builder.widget( - new TextWidget(GT_Utility.trans("222", "Fluid threshold")).setDefaultColor(COLOR_TEXT_GRAY.get()) - .setPos(startX + spaceX * 5, 4 + startY)); + new TextWidget(GT_Utility.trans("222", "Fluid threshold")).setDefaultColor(COLOR_TEXT_GRAY.get()) + .setPos(startX + spaceX * 5, 4 + startY)); } @Override protected void addUIForDataController(CoverDataControllerWidget<FluidTransmitterData> controller) { super.addUIForDataController(controller); controller.addFollower( - new CoverDataFollower_TextFieldWidget<>(), - coverData -> String.valueOf(coverData.threshold), - (coverData, state) -> { - coverData.threshold = (int) MathExpression.parseMathExpression(state); - return coverData; - }, - widget -> widget.setOnScrollNumbers() - .setNumbers(0, Integer.MAX_VALUE) - .setPos(1, 2) - .setSize(spaceX * 5 - 4, 12)); + new CoverDataFollower_TextFieldWidget<>(), + coverData -> String.valueOf(coverData.threshold), + (coverData, state) -> { + coverData.threshold = (int) MathExpression.parseMathExpression(state); + return coverData; + }, + 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 9c1e9b2c5f..428b9b636d 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 @@ -32,7 +32,7 @@ import gregtech.common.tileentities.storage.GT_MetaTileEntity_DigitalChestBase; import io.netty.buffer.ByteBuf; public class GT_Cover_WirelessItemDetector - extends GT_Cover_AdvancedRedstoneTransmitterBase<GT_Cover_WirelessItemDetector.ItemTransmitterData> { + extends GT_Cover_AdvancedRedstoneTransmitterBase<GT_Cover_WirelessItemDetector.ItemTransmitterData> { public GT_Cover_WirelessItemDetector(ITexture coverTexture) { super(ItemTransmitterData.class, coverTexture); @@ -50,13 +50,13 @@ public class GT_Cover_WirelessItemDetector @Override public ItemTransmitterData doCoverThingsImpl(byte aSide, byte aInputRedstone, int aCoverID, - ItemTransmitterData aCoverVariable, ICoverable aTileEntity, long aTimer) { + ItemTransmitterData aCoverVariable, ICoverable aTileEntity, long aTimer) { byte signal = GT_Cover_ItemMeter.computeSignalBasedOnItems( - aTileEntity, - aCoverVariable.invert, - aCoverVariable.threshold, - aCoverVariable.slot, - aSide); + aTileEntity, + aCoverVariable.invert, + aCoverVariable.threshold, + aCoverVariable.slot, + aSide); long hash = hashCoverCoords(aTileEntity, aSide); setSignalAt(aCoverVariable.getUuid(), aCoverVariable.getFrequency(), hash, signal); @@ -65,13 +65,13 @@ public class GT_Cover_WirelessItemDetector @Override public boolean letsRedstoneGoOutImpl(byte aSide, int aCoverID, ItemTransmitterData aCoverVariable, - ICoverable aTileEntity) { + ICoverable aTileEntity) { return true; } @Override protected boolean manipulatesSidedRedstoneOutputImpl(byte aSide, int aCoverID, ItemTransmitterData aCoverVariable, - ICoverable aTileEntity) { + ICoverable aTileEntity) { return true; } @@ -174,64 +174,56 @@ public class GT_Cover_WirelessItemDetector maxSlot = getMaxSlot(); 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)); + 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)); } @Override protected void addUIForDataController(CoverDataControllerWidget<ItemTransmitterData> controller) { super.addUIForDataController(controller); controller.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, this::getMaxItemCount) + .setPos(1, 2 + spaceY * 2) + .setSize(spaceX * 5 - 4, 12)) + .addFollower( new CoverDataFollower_TextFieldWidget<>(), - coverData -> String.valueOf(coverData.threshold), + coverData -> getSlotTextFieldContent(coverData.slot), (coverData, state) -> { - coverData.threshold = (int) MathExpression.parseMathExpression(state); + coverData.slot = getIntFromText(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.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)) { + && tile instanceof IGregTechTileEntity + && !(((IGregTechTileEntity) tile).getMetaTileEntity() instanceof GT_MetaTileEntity_DigitalChestBase)) { return tile.getSizeInventory() - 1; } else { return -1; @@ -258,9 +250,9 @@ public class GT_Cover_WirelessItemDetector final ICoverable tile = getUIBuildContext().getTile(); final ItemTransmitterData coverVariable = getCoverData(); if (coverVariable != null && coverVariable.slot >= 0 - && tile instanceof TileEntity - && !tile.isDead() - && tile.getSizeInventory() >= coverVariable.slot) { + && tile instanceof TileEntity + && !tile.isDead() + && tile.getSizeInventory() >= coverVariable.slot) { return tile.getStackInSlot(coverVariable.slot); } else { return null; 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 d567ea0ae5..6179b8084c 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 @@ -27,8 +27,8 @@ import gregtech.common.gui.modularui.widget.CoverDataControllerWidget; import gregtech.common.gui.modularui.widget.CoverDataFollower_ToggleButtonWidget; import io.netty.buffer.ByteBuf; -public class GT_Cover_WirelessMaintenanceDetector extends - GT_Cover_AdvancedRedstoneTransmitterBase<GT_Cover_WirelessMaintenanceDetector.MaintenanceTransmitterData> { +public class GT_Cover_WirelessMaintenanceDetector + extends GT_Cover_AdvancedRedstoneTransmitterBase<GT_Cover_WirelessMaintenanceDetector.MaintenanceTransmitterData> { public GT_Cover_WirelessMaintenanceDetector(ITexture coverTexture) { super(MaintenanceTransmitterData.class, coverTexture); @@ -45,7 +45,7 @@ public class GT_Cover_WirelessMaintenanceDetector extends } private static byte computeSignalBasedOnMaintenance(MaintenanceTransmitterData coverVariable, - ICoverable tileEntity) { + ICoverable tileEntity) { boolean signal = false; if (tileEntity instanceof IGregTechTileEntity) { @@ -57,7 +57,7 @@ public class GT_Cover_WirelessMaintenanceDetector extends switch (coverVariable.mode) { case NO_ISSUE -> signal = ideal == real; case ONE_ISSUE, TWO_ISSUES, THREE_ISSUES, FOUR_ISSUES, FIVE_ISSUES -> signal = ideal - real - >= coverVariable.mode.ordinal(); + >= coverVariable.mode.ordinal(); case ROTOR_80, ROTOR_100 -> { ItemStack rotor = multiTE.getRealInventory()[1]; if (GT_Cover_NeedMaintainance.isRotor(rotor)) { @@ -68,9 +68,9 @@ public class GT_Cover_WirelessMaintenanceDetector extends signal = current >= max * 8 / 10; } else { long expectedDamage = Math.round( - Math.min( - (double) multiTE.mEUt / multiTE.damageFactorLow, - Math.pow(multiTE.mEUt, multiTE.damageFactorHigh))); + Math.min( + (double) multiTE.mEUt / multiTE.damageFactorLow, + Math.pow(multiTE.mEUt, multiTE.damageFactorHigh))); signal = current + expectedDamage * 2 >= max; } } else { @@ -90,7 +90,7 @@ public class GT_Cover_WirelessMaintenanceDetector extends @Override public MaintenanceTransmitterData doCoverThingsImpl(byte aSide, byte aInputRedstone, int aCoverID, - MaintenanceTransmitterData aCoverVariable, ICoverable aTileEntity, long aTimer) { + MaintenanceTransmitterData aCoverVariable, ICoverable aTileEntity, long aTimer) { byte signal = computeSignalBasedOnMaintenance(aCoverVariable, aTileEntity); long hash = hashCoverCoords(aTileEntity, aSide); setSignalAt(aCoverVariable.getUuid(), aCoverVariable.getFrequency(), hash, signal); @@ -100,19 +100,19 @@ public class GT_Cover_WirelessMaintenanceDetector extends @Override public boolean letsRedstoneGoOutImpl(byte aSide, int aCoverID, MaintenanceTransmitterData aCoverVariable, - ICoverable aTileEntity) { + ICoverable aTileEntity) { return true; } @Override protected boolean manipulatesSidedRedstoneOutputImpl(byte aSide, int aCoverID, - MaintenanceTransmitterData aCoverVariable, ICoverable aTileEntity) { + MaintenanceTransmitterData aCoverVariable, ICoverable aTileEntity) { return true; } @Override public int getTickRateImpl(byte aSide, int aCoverID, MaintenanceTransmitterData aCoverVariable, - ICoverable aTileEntity) { + ICoverable aTileEntity) { return 60; } @@ -183,7 +183,7 @@ public class GT_Cover_WirelessMaintenanceDetector extends // GUI stuff private static final String[] extraTexts = new String[] { "No Issues", ">= 1 Issue", ">= 2 Issues", ">= 3 Issues", - ">= 4 Issues", ">= 5 Issues", "Rotor < 80%", "Rotor < 100%" }; + ">= 4 Issues", ">= 5 Issues", "Rotor < 80%", "Rotor < 100%" }; @Override public ModularWindow createWindow(GT_CoverUIBuildContext buildContext) { @@ -216,10 +216,8 @@ public class GT_Cover_WirelessMaintenanceDetector extends super.addUIWidgets(builder); 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))); + new TextWidget(extraTexts[i]).setDefaultColor(COLOR_TEXT_GRAY.get()) + .setPos(startX + spaceX * (i % 2 == 0 ? 1 : 7), 4 + startY + spaceY * (2 + i / 2))); } } @@ -229,16 +227,14 @@ public class GT_Cover_WirelessMaintenanceDetector extends for (int i = 0; i < 8; i++) { final int index = i; controller.addFollower( - CoverDataFollower_ToggleButtonWidget.ofDisableable(), - coverData -> coverData.mode == MaintenanceMode.values()[index], - (coverData, state) -> { - 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))); + CoverDataFollower_ToggleButtonWidget.ofDisableable(), + coverData -> coverData.mode == MaintenanceMode.values()[index], + (coverData, state) -> { + 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))); } } } |