Fix saving Tile-Entities saving (GTNewHorizons#19)

* make sure Tile-Entities have a world to prevent saving issues * remove reference to client
huihiuhuai · Feb 27, 2024 · e72a792 · e72a792
1 parent 54359a5
commit e72a792
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 8 deletions.
diff --git a/src/main/java/com/github/lunatrius/schematica/handler/QueueTickHandler.java b/src/main/java/com/github/lunatrius/schematica/handler/QueueTickHandler.java
@@ -5,6 +5,7 @@
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.entity.EntityClientPlayerMP;
+import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.ChatComponentTranslation;
 
 import com.github.lunatrius.schematica.reference.Names;
@@ -74,7 +75,15 @@ private void processQueue() {
         if (container.hasNext()) {
             this.queue.offer(container);
         } else {
-            final boolean success = SchematicFormat.writeToFile(container.file, container.schematic);
+            if (container.world != null) {
+                for (TileEntity entity : container.schematic.getTileEntities()) {
+                    if (!entity.hasWorldObj()) {
+                        entity.setWorldObj(container.world);
+                    }
+                }
+            }
+
+            final boolean success = SchematicFormat.writeToFile(container.file, container.schematic, container.world);
             final String message = success ? Names.Command.Save.Message.SAVE_SUCCESSFUL
                     : Names.Command.Save.Message.SAVE_FAILED;
             container.player.addChatMessage(new ChatComponentTranslation(message, container.file.getName()));

diff --git a/src/main/java/com/github/lunatrius/schematica/network/message/MessageDownloadEnd.java b/src/main/java/com/github/lunatrius/schematica/network/message/MessageDownloadEnd.java
@@ -39,7 +39,8 @@ public void toBytes(ByteBuf buf) {
     @Override
     public IMessage onMessage(MessageDownloadEnd message, MessageContext ctx) {
         File directory = Schematica.proxy.getPlayerSchematicDirectory(null, true);
-        boolean success = SchematicFormat.writeToFile(directory, message.name, DownloadHandler.INSTANCE.schematic);
+        boolean success = SchematicFormat
+                .writeToFile(directory, message.name, DownloadHandler.INSTANCE.schematic, null);
 
         if (success) {
             Minecraft.getMinecraft().thePlayer.addChatMessage(

diff --git a/src/main/java/com/github/lunatrius/schematica/world/schematic/SchematicAlpha.java b/src/main/java/com/github/lunatrius/schematica/world/schematic/SchematicAlpha.java
@@ -12,6 +12,7 @@
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagList;
 import net.minecraft.tileentity.TileEntity;
+import net.minecraft.world.World;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.common.util.Constants;
 
@@ -100,7 +101,7 @@ public ISchematic readFromNBT(NBTTagCompound tagCompound) {
     }
 
     @Override
-    public boolean writeToNBT(NBTTagCompound tagCompound, ISchematic schematic) {
+    public boolean writeToNBT(NBTTagCompound tagCompound, ISchematic schematic, World backupWorld) {
         NBTTagCompound tagCompoundIcon = new NBTTagCompound();
         ItemStack icon = schematic.getIcon();
         icon.writeToNBT(tagCompoundIcon);
@@ -142,6 +143,9 @@ public boolean writeToNBT(NBTTagCompound tagCompound, ISchematic schematic) {
         NBTTagList tileEntitiesList = new NBTTagList();
         for (TileEntity tileEntity : schematic.getTileEntities()) {
             try {
+                if (!tileEntity.hasWorldObj()) {
+                    tileEntity.setWorldObj(backupWorld);
+                }
                 NBTTagCompound tileEntityTagCompound = NBTHelper.writeTileEntityToCompound(tileEntity);
                 tileEntitiesList.appendTag(tileEntityTagCompound);
             } catch (Exception e) {

diff --git a/src/main/java/com/github/lunatrius/schematica/world/schematic/SchematicFormat.java b/src/main/java/com/github/lunatrius/schematica/world/schematic/SchematicFormat.java
@@ -8,6 +8,7 @@
 import java.util.zip.GZIPOutputStream;
 
 import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.world.World;
 import net.minecraftforge.common.MinecraftForge;
 
 import com.github.lunatrius.schematica.api.ISchematic;
@@ -22,7 +23,7 @@ public abstract class SchematicFormat {
 
     public abstract ISchematic readFromNBT(NBTTagCompound tagCompound);
 
-    public abstract boolean writeToNBT(NBTTagCompound tagCompound, ISchematic schematic);
+    public abstract boolean writeToNBT(NBTTagCompound tagCompound, ISchematic schematic, World backupWorld);
 
     public static ISchematic readFromFile(File file) {
         try {
@@ -46,14 +47,14 @@ public static ISchematic readFromFile(File directory, String filename) {
         return readFromFile(new File(directory, filename));
     }
 
-    public static boolean writeToFile(File file, ISchematic schematic) {
+    public static boolean writeToFile(File file, ISchematic schematic, World backupWorld) {
         try {
             final PostSchematicCaptureEvent event = new PostSchematicCaptureEvent(schematic);
             MinecraftForge.EVENT_BUS.post(event);
 
             NBTTagCompound tagCompound = new NBTTagCompound();
 
-            FORMATS.get(FORMAT_DEFAULT).writeToNBT(tagCompound, schematic);
+            FORMATS.get(FORMAT_DEFAULT).writeToNBT(tagCompound, schematic, backupWorld);
 
             try (DataOutputStream dataOutputStream = new DataOutputStream(
                     new GZIPOutputStream(new FileOutputStream(file)))) {
@@ -68,8 +69,8 @@ public static boolean writeToFile(File file, ISchematic schematic) {
         return false;
     }
 
-    public static boolean writeToFile(File directory, String filename, ISchematic schematic) {
-        return writeToFile(new File(directory, filename), schematic);
+    public static boolean writeToFile(File directory, String filename, ISchematic schematic, World backupWorld) {
+        return writeToFile(new File(directory, filename), schematic, backupWorld);
     }
 
     static {