more sync fixes

Author: gustovafing

src/main/java/com/gregtechceu/gtceu/common/cover/ender/EnderFluidLinkCover.java

@@ -47,8 +47,8 @@ public EnderFluidLinkCover(CoverDefinition definition, ICoverable coverHolder, D
         super(definition, coverHolder, attachedSide);
         this.mBLeftToTransferLastSecond = TRANSFER_RATE * 20;
         filterHandler = FilterHandlers.fluid(this);
-        if (!isRemote()) visualTank = VirtualEnderRegistry.getInstance()
-                .getOrCreateEntry(getOwner(), EntryTypes.ENDER_FLUID, getChannelName());
+        if (!isRemote()) setEntry(VirtualEnderRegistry.getInstance()
+                .getOrCreateEntry(getOwner(), EntryTypes.ENDER_FLUID, getChannelName()));
     }
 
     @Override

src/main/java/com/gregtechceu/gtceu/common/cover/ender/EnderItemLinkCover.java

@@ -45,8 +45,7 @@ public EnderItemLinkCover(CoverDefinition definition, ICoverable coverHolder, Di
         super(definition, coverHolder, attachedSide);
         itemsLeftToTransferLastSecond = TRANSFER_RATE * 20;
         filterHandler = FilterHandlers.item(this);
-        if (!isRemote()) storage = VirtualEnderRegistry.getInstance().getOrCreateEntry(getOwner(),
-                EntryTypes.ENDER_ITEM, getChannelName());
+        if (!isRemote()) setEntry(VirtualEnderRegistry.getInstance().getOrCreateEntry(getOwner(), EntryTypes.ENDER_ITEM, getChannelName()));
     }
 
     @Override
@@ -67,6 +66,7 @@ protected VirtualItemStorage getEntry() {
     @Override
     protected void setEntry(VirtualEntry entry) {
         storage = (VirtualItemStorage) entry;
+        getSyncDataHolder().markClientSyncFieldDirty("storage");
     }
 
     @Override

src/main/java/com/gregtechceu/gtceu/common/cover/ender/EnderRedstoneLinkCover.java

@@ -58,6 +58,7 @@ protected void setEntry(VirtualEntry entry) {
         if (storage != null) storage.removeMember(uuid);
         storage = (VirtualRedstone) entry;
         storage.addMember(uuid);
+        getSyncDataHolder().markClientSyncFieldDirty("storage");
     }
 
     @Override

src/main/java/com/gregtechceu/gtceu/common/item/PortableScannerBehavior.java

@@ -25,6 +25,7 @@
 import com.gregtechceu.gtceu.common.data.GTSoundEntries;
 import com.gregtechceu.gtceu.common.network.GTNetwork;
 import com.gregtechceu.gtceu.common.network.packets.prospecting.SPacketProspectBedrockFluid;
+import com.gregtechceu.gtceu.syncsystem.ManagedSyncBlockEntity;
 import com.gregtechceu.gtceu.utils.FormattingUtil;
 import com.gregtechceu.gtceu.utils.GTUtil;
 
@@ -71,8 +72,8 @@ public enum DisplayMode {
         SHOW_MACHINE_INFO("behavior.portable_scanner.mode.show_machine_info"),
         SHOW_ELECTRICAL_INFO("behavior.portable_scanner.mode.show_electrical_info"),
         SHOW_RECIPE_INFO("behavior.portable_scanner.mode.show_recipe_info"),
-        SHOW_ENVIRONMENTAL_INFO("behavior.portable_scanner.mode.show_environmental_info");
-
+        SHOW_ENVIRONMENTAL_INFO("behavior.portable_scanner.mode.show_environmental_info"),
+        SHOW_SYNC_INFO("behavior.portable_scanner.mode.show_sync_info");
         private final String langKey;
 
         DisplayMode(String langKey) {
@@ -449,6 +450,15 @@ else if (machine instanceof IDataInfoProvider)
             }
         }
 
+        if ((mode == DisplayMode.SHOW_ALL || mode == DisplayMode.SHOW_SYNC_INFO) && tileEntity instanceof ManagedSyncBlockEntity syncBlockEntity) {
+            list.add(Component.translatable("behavior.portable_scanner.divider"));
+            list.add(Component.literal("Save data"));
+            list.add(Component.literal(syncBlockEntity.getSyncDataHolder().serializeNBT(false).toString()));
+            list.add(Component.translatable("behavior.portable_scanner.divider"));
+            list.add(Component.literal("Update packet"));
+            list.add(Component.literal(syncBlockEntity.getSyncDataHolder().serializeNBT(true, true).toString()));
+        }
+
         return energyCost;
     }
 

src/main/java/com/gregtechceu/gtceu/syncsystem/IValueTransformer.java

@@ -1,5 +1,6 @@
 package com.gregtechceu.gtceu.syncsystem;
 
+import net.minecraft.nbt.CompoundTag;
 import net.minecraft.nbt.Tag;
 
 import org.jetbrains.annotations.Nullable;
@@ -10,6 +11,17 @@
  */
 public interface IValueTransformer<T> {
 
+    static Tag stripLdlibWrapper(Tag t) {
+        if (!(t instanceof CompoundTag tag)) return t;
+        if (tag.contains("p") && tag.contains("t")) {
+            return tag.getCompound("p");
+        }
+        if (tag.contains("t", Tag.TAG_COMPOUND)) {
+            return tag.getCompound("t").getCompound("p");
+        }
+        return tag;
+    }
+
     default boolean mustProvideObject() {
         return false;
     }

src/main/java/com/gregtechceu/gtceu/syncsystem/data_transformers/CoverBehaviorTransformer.java

@@ -12,6 +12,7 @@
 import net.minecraft.nbt.Tag;
 import net.minecraft.resources.ResourceLocation;
 
+import net.minecraft.world.item.ItemStack;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.Objects;
@@ -90,6 +91,12 @@ public CoverBehavior deserialize(CompoundTag tag, ICoverable holder, @Nullable C
         }
 
         Objects.requireNonNull(holder.getCoverAtSide(side)).getSyncDataHolder().deserializeNBT(tag.getCompound("data"), isSync);
+
+        if (!isSync && holder.getCoverAtSide(side).getAttachItem() == ItemStack.EMPTY) {
+            GTCEu.LOGGER.error("Invalid cover save state, this should never happen unless loading corrupted data.");
+            holder.setCoverAtSide(null, side);
+        }
+
         return holder.getCoverAtSide(side);
     }
 }

src/main/java/com/gregtechceu/gtceu/syncsystem/data_transformers/collections/ListTransformer.java

@@ -29,6 +29,7 @@ public Tag serializeNBT(List<T> value, ISyncManaged holder) {
     @Override
     public List<T> deserializeNBT(Tag tag, ISyncManaged holder, List<T> current) {
         if (!(tag instanceof ListTag listTag) || elementTransformer == null) return List.of();
-        return listTag.stream().map((t) -> elementTransformer.deserializeNBT(t, null, null)).toList();
+
+        return listTag.stream().map((t) -> elementTransformer.deserializeNBT(IValueTransformer.stripLdlibWrapper(t), null, null)).toList();
     }
 }

src/main/java/com/gregtechceu/gtceu/syncsystem/data_transformers/collections/ObjectArrayTransformer.java

@@ -40,8 +40,8 @@ public T[] deserializeNBT(Tag tag, ISyncManaged holder, T[] currentVal) {
 
         for (int i = 0; i < listTag.size(); i++) {
             if (elementTransformer.mustProvideObject())
-                elementTransformer.deserializeNBT(listTag.get(i), null, currentVal[i]);
-            else currentVal[i] = elementTransformer.deserializeNBT(listTag.get(i), null, null);
+                elementTransformer.deserializeNBT(IValueTransformer.stripLdlibWrapper(listTag.get(i)), null, currentVal[i]);
+            else currentVal[i] = elementTransformer.deserializeNBT(IValueTransformer.stripLdlibWrapper(listTag.get(i)), null, null);
         }
         return currentVal;
     }