Wireless data refactor & fixes (#3264)

Co-authored-by: Martin Robertz <dream-master@gmx.net>

2 files changed, 2 insertions, 28 deletions

diff --git a/src/main/java/tectech/thing/metaTileEntity/multi/MTEDataBank.java b/src/main/java/tectech/thing/metaTileEntity/multi/MTEDataBank.java
index 30a417ae91..d3e52b9716 100644
--- a/src/main/java/tectech/thing/metaTileEntity/multi/MTEDataBank.java
+++ b/src/main/java/tectech/thing/metaTileEntity/multi/MTEDataBank.java
@@ -41,7 +41,6 @@ import gregtech.api.util.GTUtility;
 import gregtech.api.util.IGTHatchAdder;
 import gregtech.api.util.MultiblockTooltipBuilder;
 import gregtech.common.WirelessComputationPacket;
-import gregtech.common.WirelessDataStore;
 import tectech.Reference;
 import tectech.mechanics.dataTransport.InventoryDataPacket;
 import tectech.recipe.TTRecipeAdder;
@@ -249,23 +248,6 @@ public class MTEDataBank extends TTMultiblockBase implements ISurvivalConstructa
     }
 
     @Override
-    public void onPreTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) {
-        super.onPreTick(aBaseMetaTileEntity, aTick);
-        // Every 200 ticks, clear wireless data store so hatches need to provide their data again in
-        // their onPostTick() call. This also happens every 200 ticks
-        if (mMachine && aBaseMetaTileEntity.isActive() && wirelessModeEnabled && aTick % 200 == 0) {
-            WirelessDataStore wirelessStore = WirelessDataStore
-                .getWirelessDataSticks(aBaseMetaTileEntity.getOwnerUuid());
-            wirelessStore.clearData();
-
-            // After reset, clear uploadedSinceReset of all connected hatches
-            for (MTEHatchWirelessDataItemsOutput hatch : eWirelessStacksDataOutputs) {
-                hatch.uploadedSinceReset = false;
-            }
-        }
-    }
-
-    @Override
     public void onScrewdriverRightClick(ForgeDirection side, EntityPlayer aPlayer, float aX, float aY, float aZ) {
         if (getBaseMetaTileEntity().isServerSide()) {
             wirelessModeEnabled = !wirelessModeEnabled;
diff --git a/src/main/java/tectech/thing/metaTileEntity/multi/MTEQuantumComputer.java b/src/main/java/tectech/thing/metaTileEntity/multi/MTEQuantumComputer.java
index 25dd5f6ec6..4c57cbe376 100644
--- a/src/main/java/tectech/thing/metaTileEntity/multi/MTEQuantumComputer.java
+++ b/src/main/java/tectech/thing/metaTileEntity/multi/MTEQuantumComputer.java
@@ -235,14 +235,6 @@ public class MTEQuantumComputer extends TTMultiblockBase implements ISurvivalCon
     }
 
     @Override
-    public void onPreTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) {
-        super.onPreTick(aBaseMetaTileEntity, aTick);
-        if (aBaseMetaTileEntity.isServerSide() && wirelessModeEnabled && aTick % 20 == 0) {
-            WirelessComputationPacket.updatePacket(aBaseMetaTileEntity, aTick);
-        }
-    }
-
-    @Override
     public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) {
         super.onPostTick(aBaseMetaTileEntity, aTick);
         if (aBaseMetaTileEntity.isServerSide() && mMachine
@@ -346,7 +338,7 @@ public class MTEQuantumComputer extends TTMultiblockBase implements ISurvivalCon
             }
 
             for (MTEHatchDataOutput o : eOutputData) {
-                o.q = pack;
+                o.providePacket(pack);
             }
         }
     }
@@ -570,7 +562,7 @@ public class MTEQuantumComputer extends TTMultiblockBase implements ISurvivalCon
             data.add("Wireless mode: " + EnumChatFormatting.GREEN + "enabled");
             data.add(
                 "Total wireless computation available: " + EnumChatFormatting.YELLOW
-                    + wirelessComputationPacket.getTotalComputationStored());
+                    + wirelessComputationPacket.getAvailableComputationStored());
         } else {
             data.add("Wireless mode: " + EnumChatFormatting.RED + "disabled");
         }