aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/api
diff options
context:
space:
mode:
authorAntifluxfield <lyj_299792458@163.com>2017-06-30 05:45:37 +0800
committerGitHub <noreply@github.com>2017-06-30 05:45:37 +0800
commit81b91a3d7e43d2a6d3856bb8957aa89e278841f7 (patch)
tree553f7bc9405e45f030c34d48d67e380838c5a06a /src/main/java/gregtech/api
parent37d8191bdcb2894d7f75c8712ae641ca081a79bc (diff)
downloadGT5-Unofficial-81b91a3d7e43d2a6d3856bb8957aa89e278841f7.tar.gz
GT5-Unofficial-81b91a3d7e43d2a6d3856bb8957aa89e278841f7.tar.bz2
GT5-Unofficial-81b91a3d7e43d2a6d3856bb8957aa89e278841f7.zip
Update GT_MetaTileEntity_MultiBlockBase.java
Diffstat (limited to 'src/main/java/gregtech/api')
-rw-r--r--src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java
index 725fccb1aa..17ebab867a 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java
@@ -697,16 +697,17 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity {
}
/**
- * @param state 0 for both, 1 for DataStick, 2 for DataOrb
+ * @param state using bitmask, 1 for IntegratedCircuit, 2 for DataStick, 4 for DataOrb
*/
- private boolean isCorrectDataItem(ItemStack aStack, byte state){
- if (ItemList.Tool_DataStick.isStackEqual(aStack, false, true) && (state == 0 || state == 1)) return true;
- if (ItemList.Tool_DataOrb.isStackEqual(aStack, false, true) && (state == 0 || state == 2)) return true;
+ private boolean isCorrectDataItem(ItemStack aStack, int state){
+ if ((state & 1) != 0 && ItemList.Circuit_Integrated.isStackEqual(aStack, false, true)) return true;
+ if ((state & 2) != 0 && ItemList.Tool_DataStick.isStackEqual(aStack, false, true)) return true;
+ if ((state & 4) != 0 && ItemList.Tool_DataOrb.isStackEqual(aStack, false, true)) return true;
return false;
}
/**
- * @param state 0 for both, 1 for DataStick, 2 for DataOrb
+ * @param state using bitmask, 1 for IntegratedCircuit, 2 for DataStick, 4 for DataOrb
*/
public ArrayList<ItemStack> getDataItems(byte state) {
ArrayList<ItemStack> rList = new ArrayList<ItemStack>();