diff options
| author | Martin Robertz <dream-master@gmx.net> | 2022-01-14 07:03:01 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-14 07:03:01 +0100 |
| commit | f36a411afc659a0c215e7bb0027156250ae69983 (patch) | |
| tree | 0bc8ded58a02786c0e677ef454fb479e6c5e5603 /src | |
| parent | 1f657fbf67576cded29ae47756b346fa35a453b4 (diff) | |
| parent | 05ddcb086669271b0b47e96c538e417706fa3fa8 (diff) | |
| download | GT5-Unofficial-f36a411afc659a0c215e7bb0027156250ae69983.tar.gz GT5-Unofficial-f36a411afc659a0c215e7bb0027156250ae69983.tar.bz2 GT5-Unofficial-f36a411afc659a0c215e7bb0027156250ae69983.zip | |
Merge pull request #871 from Sphyix/experimental
Assline DataHatch anywhere, output bus anywhere
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AssemblyLine.java | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AssemblyLine.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AssemblyLine.java index 075ca564cb..c037aeb512 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AssemblyLine.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AssemblyLine.java @@ -57,13 +57,13 @@ public class GT_MetaTileEntity_AssemblyLine extends GT_MetaTileEntity_EnhancedMu })) .addShape(STRUCTURE_PIECE_SECOND, transpose(new String[][]{ {" ", "e", " "}, - {"d", "l", "G"}, + {"d", "l", "d"}, {"g", "m", "g"}, {"b", "I", "b"}, })) .addShape(STRUCTURE_PIECE_LATER, transpose(new String[][]{ {" ", "e", " "}, - {"G", "l", "G"}, + {"d", "l", "d"}, {"g", "m", "g"}, {"b", "I", "b"}, })) @@ -76,6 +76,7 @@ public class GT_MetaTileEntity_AssemblyLine extends GT_MetaTileEntity_EnhancedMu .addElement('b', ofChain( ofHatchAdder(GT_MetaTileEntity_AssemblyLine::addMaintenanceToMachineList, 16, 3), ofHatchAdder(GT_MetaTileEntity_AssemblyLine::addInputHatchToMachineList, 16, 3), + ofHatchAdder(GT_MetaTileEntity_AssemblyLine::addOutputToMachineList, 16,4), ofBlock(GregTech_API.sBlockCasings2, 0) )) .addElement('I', ofChain( @@ -120,7 +121,7 @@ public class GT_MetaTileEntity_AssemblyLine extends GT_MetaTileEntity_EnhancedMu .addMaintenanceHatch("Any layer 1 casing", 3) .addInputBus("As specified on layer 1", 4, 5) .addInputHatch("Any layer 1 casing", 3) - .addOutputBus("Replaces Input Bus on final slice", 4) + .addOutputBus("Replaces Input Bus on final slice or on any solid steel casing on layer 1", 4) .addOtherStructurePart("Data Access Hatch", "Optional, next to controller", 2) .toolTipFinisher("Gregtech"); return tt; @@ -334,7 +335,8 @@ public class GT_MetaTileEntity_AssemblyLine extends GT_MetaTileEntity_EnhancedMu if (!checkPiece(i == 1 ? STRUCTURE_PIECE_SECOND : STRUCTURE_PIECE_LATER, leftToRight ? -i : i, 1, 0)) return false; if (!mOutputBusses.isEmpty()) - return !mEnergyHatches.isEmpty() && mMaintenanceHatches.size() == 1; + + return !mEnergyHatches.isEmpty() && mMaintenanceHatches.size() == 1 && mDataAccessHatches.size() <= 1; } return false; } |