fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

attempt to fix wireless terminals overwriting items in hand

Browse Source
This commit is contained in:
PrototypeTrousers
2023-02-18 21:05:46 -03:00
parent 82be548fc7
commit 5d7f552643
4 changed files with 5 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gradle.properties
+1 -1
View File
@@ -4,7 +4,7 @@ aebuild=7
aegroup=appeng aegroup=appeng
aebasename=appliedenergistics2 aebasename=appliedenergistics2
extended=extended_life extended=extended_life
extendedversion=v0.55.5 extendedversion=v0.55.6
######################################################### #########################################################
# Versions # # Versions #
######################################################### #########################################################
src/main/java/appeng/container/implementations/ContainerMEPortableCell.java
+1 -5
View File
@@ -85,11 +85,7 @@ public class ContainerMEPortableCell extends ContainerMEMonitorable implements I
if (currentItem.isEmpty()) { if (currentItem.isEmpty()) {
this.setValidContainer(false); this.setValidContainer(false);
} else if (!this.wirelessTerminalGUIObject.getItemStack().isEmpty() && currentItem != this.wirelessTerminalGUIObject.getItemStack()) { } else if (!this.wirelessTerminalGUIObject.getItemStack().isEmpty() && currentItem != this.wirelessTerminalGUIObject.getItemStack()) {
if (ItemStack.areItemsEqual(this.wirelessTerminalGUIObject.getItemStack(), currentItem)) { this.setValidContainer(false);
this.getPlayerInv().setInventorySlotContents(this.getPlayerInv().currentItem, this.wirelessTerminalGUIObject.getItemStack());
} else {
this.setValidContainer(false);
}
} }
// drain 1 ae t // drain 1 ae t
src/main/java/appeng/container/implementations/ContainerWirelessPatternTerminal.java
+1 -5
View File
@@ -134,11 +134,7 @@ public class ContainerWirelessPatternTerminal extends ContainerPatternEncoder im
if (currentItem.isEmpty()) { if (currentItem.isEmpty()) {
this.setValidContainer(false); this.setValidContainer(false);
} else if (!this.wirelessTerminalGUIObject.getItemStack().isEmpty() && currentItem != this.wirelessTerminalGUIObject.getItemStack()) { } else if (!this.wirelessTerminalGUIObject.getItemStack().isEmpty() && currentItem != this.wirelessTerminalGUIObject.getItemStack()) {
if (ItemStack.areItemsEqual(this.wirelessTerminalGUIObject.getItemStack(), currentItem)) { this.setValidContainer(false);
this.getPlayerInv().setInventorySlotContents(this.getPlayerInv().currentItem, this.wirelessTerminalGUIObject.getItemStack());
} else {
this.setValidContainer(false);
}
} }
// drain 1 ae t // drain 1 ae t
src/main/java/appeng/fluids/container/ContainerMEPortableFluidCell.java
+2 -5
View File
@@ -158,14 +158,11 @@ public class ContainerMEPortableFluidCell extends AEBaseContainer implements IAE
} else { } else {
currentItem = this.slot < 0 ? this.getPlayerInv().getCurrentItem() : this.getPlayerInv().getStackInSlot(this.slot); currentItem = this.slot < 0 ? this.getPlayerInv().getCurrentItem() : this.getPlayerInv().getStackInSlot(this.slot);
} }
if (currentItem.isEmpty()) { if (currentItem.isEmpty()) {
this.setValidContainer(false); this.setValidContainer(false);
} else if (!this.wirelessTerminalGUIObject.getItemStack().isEmpty() && currentItem != this.wirelessTerminalGUIObject.getItemStack()) { } else if (!this.wirelessTerminalGUIObject.getItemStack().isEmpty() && currentItem != this.wirelessTerminalGUIObject.getItemStack()) {
if (ItemStack.areItemsEqual(this.wirelessTerminalGUIObject.getItemStack(), currentItem)) { this.setValidContainer(false);
this.getPlayerInv().setInventorySlotContents(this.getPlayerInv().currentItem, this.wirelessTerminalGUIObject.getItemStack());
} else {
this.setValidContainer(false);
}
} }
// drain 1 ae t // drain 1 ae t