fix serialization

Author: lc-1337

src/main/java/appeng/client/gui/implementations/GuiStorageReshuffle.java

@@ -278,6 +278,7 @@ protected void actionPerformed(final GuiButton btn) {
                 }
             } else if (btn == this.scanButton) {
                 NetworkHandler.instance.sendToServer(new PacketValueConfig("Reshuffle.Scan", ""));
+                this.container.report = null;
             }
         } catch (final IOException e) {
             AELog.debug(e);

src/main/java/appeng/container/implementations/ContainerStorageReshuffle.java

@@ -5,7 +5,6 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.entity.player.EntityPlayer;
@@ -104,7 +103,7 @@ public void detectAndSendChanges() {
         this.reshuffleProcessedItems = this.tile.getReshuffleProcessedItems();
 
         final ReshuffleReport current = this.tile.getReshuffleReport();
-        if (!Objects.equals(current, this.report)) {
+        if (current != this.report) {
             this.report = current;
         }
 
@@ -128,6 +127,7 @@ public void onUpdate(final String field, final Object oldValue, final Object new
     }
 
     public void startReshuffle(EntityPlayer player, boolean confirmed) {
+        this.report = null;
         this.tile.startReshuffle(player, confirmed);
     }
 

src/main/java/appeng/helpers/ReshuffleReport.java

@@ -78,7 +78,7 @@ public enum ChangeType {
     public final Set<IAEStackType<?>> allowedTypes;
     public final boolean voidProtection;
     public final long startTime;
-    public long endTime;
+    public long endTime = 0;
 
     public int totalItemTypesBefore = 0;
     public int totalItemTypesAfter = 0;
@@ -112,8 +112,8 @@ public ReshuffleReport(final Set<IAEStackType<?>> allowedTypes, final boolean vo
     // For IGuiPacketWritable
     public ReshuffleReport(final ByteBuf buf) {
         this.allowedTypes = new HashSet<>();
-        final int size = buf.readInt();
-        for (int i = 0; i < size; i++) {
+        final int sizeTypes = buf.readInt();
+        for (int i = 0; i < sizeTypes; i++) {
             final String typeId = ByteBufUtils.readUTF8String(buf);
             if (buf.readBoolean()) {
                 this.allowedTypes.add(AEStackTypeRegistry.getType(typeId));
@@ -133,15 +133,18 @@ public ReshuffleReport(final ByteBuf buf) {
         this.itemsProcessed = buf.readInt();
         this.itemsSkipped = buf.readInt();
 
-        for (int i = 0; i < buf.readInt(); i++) {
+        final int sizeSkippedItemsList = buf.readInt();
+        for (int i = 0; i < sizeSkippedItemsList; i++) {
             this.skippedItemsList.add(Platform.readStackByte(buf));
         }
 
-        for (int i = 0; i < buf.readInt(); i++) {
+        final int sizeLostItems = buf.readInt();
+        for (int i = 0; i < sizeLostItems; i++) {
             this.lostItems.add(ItemChange.read(buf));
         }
 
-        for (int i = 0; i < buf.readInt(); i++) {
+        final int sizeGainedItems = buf.readInt();
+        for (int i = 0; i < sizeGainedItems; i++) {
             this.gainedItems.add(ItemChange.read(buf));
         }
     }
@@ -232,7 +235,10 @@ public void generateReport(Map<IAEStackType<?>, IMEMonitor<?>> monitors, Set<IAE
             final IAEStack<?> before = beforeSnapshot.findPrecise(lookup);
             final IAEStack<?> after = afterSnapshot.findPrecise(lookup);
 
-            ItemChange change = new ItemChange(lookup, before.getStackSize(), after.getStackSize());
+            ItemChange change = new ItemChange(
+                    lookup,
+                    before == null ? 0 : before.getStackSize(),
+                    after == null ? 0 : after.getStackSize());
 
             switch (change.changeType) {
                 case GAINED: