From bb0a432e81ae585f1128feec7084414651f66b26 Mon Sep 17 00:00:00 2001
From: Up <upcraftedlp@gmail.com>
Date: Tue, 2 Jan 2024 09:45:44 +0100
Subject: [PATCH] fix default deity file extract

---
 .../tribes/tribe_data/SaveHandler.java        | 25 ++++++++++---------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/src/main/java/io/github/lukegrahamlandry/tribes/tribe_data/SaveHandler.java b/src/main/java/io/github/lukegrahamlandry/tribes/tribe_data/SaveHandler.java
index 1773f6c..86d5d06 100644
--- a/src/main/java/io/github/lukegrahamlandry/tribes/tribe_data/SaveHandler.java
+++ b/src/main/java/io/github/lukegrahamlandry/tribes/tribe_data/SaveHandler.java
@@ -13,8 +13,11 @@
 import net.minecraftforge.fml.ModList;
 import net.minecraftforge.fml.common.Mod;
 
-import java.io.*;
-import java.nio.file.*;
+import java.io.IOException;
+import java.nio.file.FileVisitResult;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.SimpleFileVisitor;
 import java.nio.file.attribute.BasicFileAttributes;
 import java.util.Map;
 
@@ -37,7 +40,7 @@ public static void doLoad(ServerStartingEvent event) {
     }
 
     @SubscribeEvent
-    public static void doSave(ServerStoppingEvent event){
+    public static void doSave(ServerStoppingEvent event) {
         try {
             save(event.getServer());
         } catch (IOException e) {
@@ -104,21 +107,19 @@ public static void load(MinecraftServer server) throws IOException {
     }
 
     private static void createDefaultDeityFiles(Path deityLocation) throws IOException {
-        Files.createDirectories(deityLocation);
-
         var srcPath = ModList.get().getModFileById(TribesMain.MOD_ID).getFile().findResource("/deities");
         Files.walkFileTree(srcPath, new SimpleFileVisitor<>() {
             @Override
             public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {
                 var relative = srcPath.relativize(file);
-                Files.copy(file, deityLocation.resolve(relative));
-                return FileVisitResult.CONTINUE;
-            }
+                var filePath = deityLocation.resolve(relative.toString());
 
-            @Override
-            public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) throws IOException {
-                var relative = srcPath.relativize(dir);
-                Files.createDirectories(deityLocation.resolve(relative));
+                var parent = filePath.getParent();
+                if (parent != null) {
+                    Files.createDirectories(parent);
+                }
+
+                Files.copy(file, filePath);
                 return FileVisitResult.CONTINUE;
             }
         });