From 5269288fecb9757a927d0d1814ebe94f6b028c9b Mon Sep 17 00:00:00 2001
From: Zorbatron <46525467+Zorbatron@users.noreply.github.com>
Date: Fri, 9 May 2025 12:22:51 -0400
Subject: [PATCH] Fix saving/loading of the machine owner UUID to NBT

---
 .../gregtech/api/metatileentity/MetaTileEntity.java  | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/main/java/gregtech/api/metatileentity/MetaTileEntity.java b/src/main/java/gregtech/api/metatileentity/MetaTileEntity.java
index 5563dd03f7b..308bf0c8aaf 100644
--- a/src/main/java/gregtech/api/metatileentity/MetaTileEntity.java
+++ b/src/main/java/gregtech/api/metatileentity/MetaTileEntity.java
@@ -1326,8 +1326,11 @@ public NBTTagCompound writeToNBT(NBTTagCompound data) {
 
         data.setBoolean(TAG_KEY_MUFFLED, muffled);
 
-        if (owner != null)
-            data.setUniqueId("Owner", owner);
+        if (owner != null) {
+            NBTTagCompound ownerTag = new NBTTagCompound();
+            ownerTag.setUniqueId("UUID", owner);
+            data.setTag("Owner", ownerTag);
+        }
 
         return data;
     }
@@ -1355,8 +1358,9 @@ public void readFromNBT(NBTTagCompound data) {
         CoverSaveHandler.readCoverNBT(data, this, covers::put);
         this.muffled = data.getBoolean(TAG_KEY_MUFFLED);
 
-        if (data.hasKey("Owner"))
-            this.owner = data.getUniqueId("Owner");
+        if (data.hasKey("Owner", 10)) {
+            this.owner = data.getCompoundTag("Owner").getUniqueId("UUID");
+        }
     }
 
     @Override