From 5d7f5526437234833c86da374c8de41bcb87bad4 Mon Sep 17 00:00:00 2001
From: PrototypeTrousers <salomaoo@gmail.com>
Date: Sat, 18 Feb 2023 21:05:46 -0300
Subject: [PATCH] attempt to fix wireless terminals overwriting items in hand

---
 gradle.properties                                          | 2 +-
 .../container/implementations/ContainerMEPortableCell.java | 6 +-----
 .../implementations/ContainerWirelessPatternTerminal.java  | 6 +-----
 .../fluids/container/ContainerMEPortableFluidCell.java     | 7 ++-----
 4 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 62de83025..a816c6dca 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,7 +4,7 @@ aebuild=7
 aegroup=appeng
 aebasename=appliedenergistics2
 extended=extended_life
-extendedversion=v0.55.5
+extendedversion=v0.55.6
 #########################################################
 # Versions                                              #
 #########################################################
diff --git a/src/main/java/appeng/container/implementations/ContainerMEPortableCell.java b/src/main/java/appeng/container/implementations/ContainerMEPortableCell.java
index 5ddda724f..3a1cd68fb 100644
--- a/src/main/java/appeng/container/implementations/ContainerMEPortableCell.java
+++ b/src/main/java/appeng/container/implementations/ContainerMEPortableCell.java
@@ -85,11 +85,7 @@ public class ContainerMEPortableCell extends ContainerMEMonitorable implements I
             if (currentItem.isEmpty()) {
                 this.setValidContainer(false);
             } else if (!this.wirelessTerminalGUIObject.getItemStack().isEmpty() && currentItem != this.wirelessTerminalGUIObject.getItemStack()) {
-                if (ItemStack.areItemsEqual(this.wirelessTerminalGUIObject.getItemStack(), currentItem)) {
-                    this.getPlayerInv().setInventorySlotContents(this.getPlayerInv().currentItem, this.wirelessTerminalGUIObject.getItemStack());
-                } else {
-                    this.setValidContainer(false);
-                }
+                this.setValidContainer(false);
             }
 
             // drain 1 ae t
diff --git a/src/main/java/appeng/container/implementations/ContainerWirelessPatternTerminal.java b/src/main/java/appeng/container/implementations/ContainerWirelessPatternTerminal.java
index 852fd77bb..fb0a25109 100644
--- a/src/main/java/appeng/container/implementations/ContainerWirelessPatternTerminal.java
+++ b/src/main/java/appeng/container/implementations/ContainerWirelessPatternTerminal.java
@@ -134,11 +134,7 @@ public class ContainerWirelessPatternTerminal extends ContainerPatternEncoder im
             if (currentItem.isEmpty()) {
                 this.setValidContainer(false);
             } else if (!this.wirelessTerminalGUIObject.getItemStack().isEmpty() && currentItem != this.wirelessTerminalGUIObject.getItemStack()) {
-                if (ItemStack.areItemsEqual(this.wirelessTerminalGUIObject.getItemStack(), currentItem)) {
-                    this.getPlayerInv().setInventorySlotContents(this.getPlayerInv().currentItem, this.wirelessTerminalGUIObject.getItemStack());
-                } else {
-                    this.setValidContainer(false);
-                }
+                this.setValidContainer(false);
             }
 
             // drain 1 ae t
diff --git a/src/main/java/appeng/fluids/container/ContainerMEPortableFluidCell.java b/src/main/java/appeng/fluids/container/ContainerMEPortableFluidCell.java
index 71e180d30..33a9e4ce2 100644
--- a/src/main/java/appeng/fluids/container/ContainerMEPortableFluidCell.java
+++ b/src/main/java/appeng/fluids/container/ContainerMEPortableFluidCell.java
@@ -158,14 +158,11 @@ public class ContainerMEPortableFluidCell extends AEBaseContainer implements IAE
             } else {
                 currentItem = this.slot < 0 ? this.getPlayerInv().getCurrentItem() : this.getPlayerInv().getStackInSlot(this.slot);
             }
+
             if (currentItem.isEmpty()) {
                 this.setValidContainer(false);
             } else if (!this.wirelessTerminalGUIObject.getItemStack().isEmpty() && currentItem != this.wirelessTerminalGUIObject.getItemStack()) {
-                if (ItemStack.areItemsEqual(this.wirelessTerminalGUIObject.getItemStack(), currentItem)) {
-                    this.getPlayerInv().setInventorySlotContents(this.getPlayerInv().currentItem, this.wirelessTerminalGUIObject.getItemStack());
-                } else {
-                    this.setValidContainer(false);
-                }
+                this.setValidContainer(false);
             }
 
             // drain 1 ae t