aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormiozune <miozune@gmail.com>2023-08-29 18:20:01 +0900
committerGitHub <noreply@github.com>2023-08-29 11:20:01 +0200
commit743b48f78666390bca4f10f20a5ea43c00b7f3bc (patch)
tree290e33477e7067fdb13b0108fc364059f5a02ca9
parent762076b448f57d4362821653a97d35085d2eb1ce (diff)
downloadGT5-Unofficial-743b48f78666390bca4f10f20a5ea43c00b7f3bc.tar.gz
GT5-Unofficial-743b48f78666390bca4f10f20a5ea43c00b7f3bc.tar.bz2
GT5-Unofficial-743b48f78666390bca4f10f20a5ea43c00b7f3bc.zip
Fix incorrect data stick behaviors for hatches (#2257)
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_CraftingInput_ME.java2
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_CraftingInput_Slave.java2
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_InputBus_ME.java4
3 files changed, 4 insertions, 4 deletions
diff --git a/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_CraftingInput_ME.java b/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_CraftingInput_ME.java
index 430067ecf7..5561d49a3a 100644
--- a/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_CraftingInput_ME.java
+++ b/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_CraftingInput_ME.java
@@ -861,7 +861,7 @@ public class GT_MetaTileEntity_Hatch_CraftingInput_ME extends GT_MetaTileEntity_
if (!(aPlayer instanceof EntityPlayerMP)) return;
ItemStack dataStick = aPlayer.inventory.getCurrentItem();
- if (!ItemList.Tool_DataStick.isStackEqual(dataStick, true, true)) return;
+ if (!ItemList.Tool_DataStick.isStackEqual(dataStick, false, true)) return;
NBTTagCompound tag = new NBTTagCompound();
tag.setString("type", "CraftingInputBuffer");
diff --git a/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_CraftingInput_Slave.java b/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_CraftingInput_Slave.java
index 16ffeecf65..2ea053995c 100644
--- a/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_CraftingInput_Slave.java
+++ b/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_CraftingInput_Slave.java
@@ -166,7 +166,7 @@ public class GT_MetaTileEntity_Hatch_CraftingInput_Slave extends GT_MetaTileEnti
private boolean tryLinkDataStick(EntityPlayer aPlayer) {
ItemStack dataStick = aPlayer.inventory.getCurrentItem();
- if (!ItemList.Tool_DataStick.isStackEqual(dataStick, true, true)) {
+ if (!ItemList.Tool_DataStick.isStackEqual(dataStick, false, true)) {
return false;
}
if (!dataStick.hasTagCompound() || !dataStick.stackTagCompound.getString("type")
diff --git a/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_InputBus_ME.java b/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_InputBus_ME.java
index 4ecb38136f..801bff1c4c 100644
--- a/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_InputBus_ME.java
+++ b/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_InputBus_ME.java
@@ -257,7 +257,7 @@ public class GT_MetaTileEntity_Hatch_InputBus_ME extends GT_MetaTileEntity_Hatch
if (!(aPlayer instanceof EntityPlayerMP))
return super.onRightclick(aBaseMetaTileEntity, aPlayer, side, aX, aY, aZ);
ItemStack dataStick = aPlayer.inventory.getCurrentItem();
- if (!ItemList.Tool_DataStick.isStackEqual(dataStick, true, true))
+ if (!ItemList.Tool_DataStick.isStackEqual(dataStick, false, true))
return super.onRightclick(aBaseMetaTileEntity, aPlayer, side, aX, aY, aZ);
if (!dataStick.hasTagCompound() || !"stockingBus".equals(dataStick.stackTagCompound.getString("type")))
return false;
@@ -284,7 +284,7 @@ public class GT_MetaTileEntity_Hatch_InputBus_ME extends GT_MetaTileEntity_Hatch
if (!(aPlayer instanceof EntityPlayerMP)) return;
ItemStack dataStick = aPlayer.inventory.getCurrentItem();
- if (!ItemList.Tool_DataStick.isStackEqual(dataStick, true, true)) return;
+ if (!ItemList.Tool_DataStick.isStackEqual(dataStick, false, true)) return;
NBTTagCompound tag = new NBTTagCompound();
tag.setString("type", "stockingBus");