Fix some issues with decoding frequencies

Author: pupnewfster

src/main/java/mekanism/common/lib/frequency/FrequencyManager.java

@@ -216,8 +216,10 @@ public void load(@NotNull CompoundTag nbtTags, @NotNull HolderLookup.Provider pr
             NBTUtils.setUUIDIfPresent(nbtTags, SerializationConstants.OWNER_UUID, uuid -> loadedOwner = uuid);
             ListTag list = nbtTags.getList(SerializationConstants.FREQUENCY_LIST, Tag.TAG_COMPOUND);
             loadedFrequencies = new HashList<>();
+            Codec<FREQ> codec = frequencyType.codec();
+            RegistryOps<Tag> registryOps = provider.createSerializationContext(NbtOps.INSTANCE);
             for (int i = 0; i < list.size(); i++) {
-                loadedFrequencies.add(frequencyType.create(provider, list.getCompound(i)));
+                loadedFrequencies.add(codec.decode(registryOps, list.getCompound(i)).getOrThrow().getFirst());
             }
         }
 

src/main/java/mekanism/common/lib/frequency/FrequencyType.java

@@ -107,9 +107,11 @@ public Codec<FREQ> codec() {
         return codec;
     }
 
-    public FREQ create(HolderLookup.Provider provider, CompoundTag tag) {
-        //TODO - 1.20.5: Re-evaluate that this is reasonable/correct
-        return codec.decode(provider.createSerializationContext(NbtOps.INSTANCE), tag).getOrThrow().getFirst();
+    public FREQ create(HolderLookup.Provider provider, CompoundTag identityTag) {
+        FrequencyIdentity identity = getIdentitySerializer().codec().decode(provider.createSerializationContext(NbtOps.INSTANCE), identityTag).getOrThrow().getFirst();
+        FREQ frequency = create(identity.key(), identity.ownerUUID(), identity.securityMode());
+        frequency.setValid(false);
+        return frequency;
     }
 
     public FREQ create(Object key, UUID ownerUUID, SecurityMode securityMode) {

src/main/java/mekanism/common/lib/frequency/TileComponentFrequency.java

@@ -335,9 +335,7 @@ public void deserialize(CompoundTag frequencyNBT, HolderLookup.Provider provider
 
     private static void deserializeFrequency(HolderLookup.Provider provider, CompoundTag frequencyNBT, FrequencyType<?> type, FrequencyData frequencyData) {
         if (frequencyNBT.contains(type.getName(), Tag.TAG_COMPOUND)) {
-            Frequency frequency = type.create(provider, frequencyNBT.getCompound(type.getName()));
-            frequency.setValid(false);
-            frequencyData.setFrequency(frequency);
+            frequencyData.setFrequency(type.create(provider, frequencyNBT.getCompound(type.getName())));
         }
     }
 
@@ -360,7 +358,7 @@ private CompoundTag serialize(DynamicOps<Tag> ops) {
     private static void serializeFrequency(DynamicOps<Tag> ops, FrequencyType<?> type, FrequencyData frequencyData, CompoundTag frequencyNBT) {
         Frequency frequency = frequencyData.selectedFrequency;
         if (frequency != null) {
-            CompoundTag frequencyTag = (CompoundTag) type.getIdentitySerializer().codec().encodeStart(ops, frequency.getIdentity()).getOrThrow();
+            Tag frequencyTag = type.getIdentitySerializer().codec().encodeStart(ops, frequency.getIdentity()).getOrThrow();
             //Note: While we save the full frequency data, and do make some use of it in reading
             // in general this isn't needed and won't be used as the frequency will be grabbed
             // from the frequency manager

src/main/java/mekanism/common/lib/security/SecurityFrequency.java

@@ -27,11 +27,11 @@ public class SecurityFrequency extends Frequency {
           UUIDUtil.CODEC.optionalFieldOf(SerializationConstants.OWNER_UUID).forGetter(freq -> Optional.ofNullable(freq.getOwner())),
           SecurityMode.CODEC.fieldOf(SerializationConstants.SECURITY_MODE).forGetter(SecurityFrequency::getSecurity),
           Codec.BOOL.fieldOf(SerializationConstants.OVERRIDE).forGetter(SecurityFrequency::isOverridden),
-          UUIDUtil.CODEC.listOf().optionalFieldOf(SerializationConstants.TRUSTED, Collections.emptyList()).forGetter(freq -> freq.trusted.elements())
+          UUIDUtil.CODEC.listOf().optionalFieldOf(SerializationConstants.TRUSTED).forGetter(freq -> freq.trusted.isEmpty() ? Optional.empty() : Optional.of(freq.trusted.elements()))
     ).apply(instance, (owner, securityMode, override, trustedCache) -> {
         SecurityFrequency frequency = new SecurityFrequency(owner.orElse(null), securityMode);
         frequency.override = override;
-        for (UUID trusted : trustedCache) {
+        for (UUID trusted : trustedCache.orElse(Collections.emptyList())) {
             frequency.addTrustedRaw(trusted, MekanismUtils.getLastKnownUsername(trusted));
         }
         return frequency;