diff options
author | NotAPenguin <michiel.vandeginste@gmail.com> | 2024-07-18 17:08:27 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-07-18 22:08:27 +0700 |
commit | 11a2735b633623cb6a754247c4f42ff14810b38b (patch) | |
tree | 1ff7c3e4c11a437f80d410e0800b3b2e5521417f /src/main/java/gregtech/common/tileentities | |
parent | e3a650785887866e4b8533b61044479ecb80aee7 (diff) | |
download | GT5-Unofficial-11a2735b633623cb6a754247c4f42ff14810b38b.tar.gz GT5-Unofficial-11a2735b633623cb6a754247c4f42ff14810b38b.tar.bz2 GT5-Unofficial-11a2735b633623cb6a754247c4f42ff14810b38b.zip |
Add wireless computation and data stick hatches (#2724)
* start on wireless computation
* initial implementation of wireless computation hatch
* Implement wireless data sticks
* Fix wireless computation by simplifying the implementation greatly
* Delete dead code
* Add scanner output for wireless computation in network
* Rename wireless computation hatch to cloud hatch
* Final rename to client/server
Diffstat (limited to 'src/main/java/gregtech/common/tileentities')
-rw-r--r-- | src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AssemblyLine.java | 14 |
1 files changed, 2 insertions, 12 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 7c7c27c880..aa422505d7 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 @@ -395,7 +395,7 @@ public class GT_MetaTileEntity_AssemblyLine extends /** * @param state using bitmask, 1 for IntegratedCircuit, 2 for DataStick, 4 for DataOrb */ - private boolean isCorrectDataItem(ItemStack aStack, int state) { + private static boolean isCorrectDataItem(ItemStack aStack, int state) { if ((state & 1) != 0 && ItemList.Circuit_Integrated.isStackEqual(aStack, true, true)) return true; if ((state & 2) != 0 && ItemList.Tool_DataStick.isStackEqual(aStack, false, true)) return true; return (state & 4) != 0 && ItemList.Tool_DataOrb.isStackEqual(aStack, false, true); @@ -410,17 +410,7 @@ public class GT_MetaTileEntity_AssemblyLine extends rList.add(mInventory[1]); } for (GT_MetaTileEntity_Hatch_DataAccess tHatch : filterValidMTEs(mDataAccessHatches)) { - for (int i = 0; i < tHatch.getBaseMetaTileEntity() - .getSizeInventory(); i++) { - if (tHatch.getBaseMetaTileEntity() - .getStackInSlot(i) != null && isCorrectDataItem( - tHatch.getBaseMetaTileEntity() - .getStackInSlot(i), - state)) - rList.add( - tHatch.getBaseMetaTileEntity() - .getStackInSlot(i)); - } + rList.addAll(tHatch.getInventoryItems(stack -> isCorrectDataItem(stack, state))); } return rList; } |