fix: stream codec for machine references

(Hopefully) Closes #1254
klikli-dev · Dec 22, 2024 · 0a4ae7e · 0a4ae7e
1 parent 9b58196
commit 0a4ae7e
Showing 1 changed file with 10 additions and 11 deletions.
diff --git a/src/main/java/com/klikli_dev/occultism/api/common/data/MachineReference.java b/src/main/java/com/klikli_dev/occultism/api/common/data/MachineReference.java
@@ -59,18 +59,18 @@ public class MachineReference implements INBTSerializable<CompoundTag> {
     ).apply(instance, MachineReference::new));
 
     public static final StreamCodec<RegistryFriendlyByteBuf, MachineReference> STREAM_CODEC = OccultismExtraStreamCodecs.composite(
-            GlobalBlockPos.STREAM_CODEC,
-            (m) -> m.extractGlobalPos,
-            ResourceLocation.STREAM_CODEC,
-            (m) -> m.extractRegistryName,
+            ByteBufCodecs.optional(GlobalBlockPos.STREAM_CODEC),
+            (m) -> Optional.ofNullable(m.extractGlobalPos),
+            ByteBufCodecs.optional(ResourceLocation.STREAM_CODEC),
+            (m) -> Optional.ofNullable(m.extractRegistryName),
             ByteBufCodecs.BOOL,
             (m) -> m.extractChunkLoaded,
             Direction.STREAM_CODEC,
             (m) -> m.extractFacing,
-            GlobalBlockPos.STREAM_CODEC,
-            (m) -> m.insertGlobalPos,
-            ResourceLocation.STREAM_CODEC,
-            (m) -> m.insertRegistryName,
+            ByteBufCodecs.optional(GlobalBlockPos.STREAM_CODEC),
+            (m) -> Optional.ofNullable(m.insertGlobalPos),
+            ByteBufCodecs.optional(ResourceLocation.STREAM_CODEC),
+            (m) -> Optional.ofNullable(m.insertRegistryName),
             ByteBufCodecs.BOOL,
             (m) -> m.insertChunkLoaded,
             Direction.STREAM_CODEC,
@@ -214,11 +214,10 @@ public boolean isValidFor(Level level) {
 
     @Override
     public boolean equals(Object obj) {
-        if(obj == this)
+        if (obj == this)
             return true;
 
-        if (obj instanceof MachineReference) {
-            MachineReference other = (MachineReference) obj;
+        if (obj instanceof MachineReference other) {
             return this.extractGlobalPos.equals(other.extractGlobalPos) &&
                     this.extractRegistryName.equals(other.extractRegistryName) &&
                     this.extractChunkLoaded == other.extractChunkLoaded &&