"Autogenerate" data files with data fallbacks and moved keys folder into jar resources (#927)

* Autogenerate keys and data files

* Update gacha html files

Accidentally pushed with old html files

* Keys no longer copied. No more manually retrieving listing files. Recursive directory creation

Removed unused code from old GC as well.

* Moved somethings and better errors

* Fixed resources from loading twice

* Data files fallback

src/main/java/emu/grasscutter/utils/ConfigContainer.java

@@ -84,7 +84,6 @@ public class ConfigContainer {
         public String resources = "./resources/";
         public String data = "./data/";
         public String packets = "./packets/";
-        public String keys = "./keys/";
         public String scripts = "./resources/scripts/";
         public String plugins = "./plugins/";
 

src/main/java/emu/grasscutter/utils/Crypto.java

@@ -20,11 +20,11 @@ public final class Crypto {
 	public static byte[] ENCRYPT_SEED_BUFFER = new byte[0];
 	
 	public static void loadKeys() {
-		DISPATCH_KEY = FileUtils.read(KEY("dispatchKey.bin"));
-		DISPATCH_SEED = FileUtils.read(KEY("dispatchSeed.bin"));
+		DISPATCH_KEY = FileUtils.readResource("/keys/dispatchKey.bin");
+		DISPATCH_SEED = FileUtils.readResource("/keys/dispatchSeed.bin");
 
-		ENCRYPT_KEY = FileUtils.read(KEY("secretKey.bin"));
-		ENCRYPT_SEED_BUFFER = FileUtils.read(KEY("secretKeyBuffer.bin"));
+		ENCRYPT_KEY = FileUtils.readResource("/keys/secretKey.bin");
+		ENCRYPT_SEED_BUFFER = FileUtils.readResource("/keys/secretKeyBuffer.bin");
 	}
 	
 	public static void xor(byte[] packet, byte[] key) {
@@ -37,25 +37,6 @@ public final class Crypto {
 		}
 	}
 	
-	public static void extractSecretKeyBuffer(byte[] data) {
-		try {
-			GetPlayerTokenRsp p = GetPlayerTokenRsp.parseFrom(data);
-			FileUtils.write(KEY("/secretKeyBuffer.bin"), p.getSecretKeyBytes().toByteArray());
-			Grasscutter.getLogger().info("Secret Key: " + p.getSecretKey());
-		} catch (Exception e) {
-			Grasscutter.getLogger().error("Crypto error.", e);
-		}
-	}
-	
-	public static void extractDispatchSeed(String data) {
-		try {
-			QueryCurrRegionHttpRsp p = QueryCurrRegionHttpRsp.parseFrom(Base64.getDecoder().decode(data));
-			FileUtils.write(KEY("/dispatchSeed.bin"), p.getRegionInfo().getSecretKey().toByteArray());
-		} catch (Exception e) {
-			Grasscutter.getLogger().error("Crypto error.", e);
-		}
-	}
-	
 	public static byte[] createSessionKey(int length) {
 		byte[] bytes = new byte[length];
 		secureRandom.nextBytes(bytes);

src/main/java/emu/grasscutter/utils/FileUtils.java

@@ -4,9 +4,14 @@ import emu.grasscutter.Grasscutter;
 
 import java.io.File;
 import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
+import java.io.InputStream;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.*;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
 
 public final class FileUtils {
 	public static void write(String dest, byte[] bytes) {
@@ -32,10 +37,34 @@ public final class FileUtils {
 		
 		return new byte[0];
 	}
+
+	public static InputStream readResourceAsStream(String resourcePath) {
+		return Grasscutter.class.getResourceAsStream(resourcePath);
+	}
+
+	public static byte[] readResource(String resourcePath) {
+		try (InputStream is = Grasscutter.class.getResourceAsStream(resourcePath)) {
+			return is.readAllBytes();
+		} catch (Exception exception) {
+			Grasscutter.getLogger().warn("Failed to read resource: " + resourcePath);
+			exception.printStackTrace();
+		}
+
+		return new byte[0];
+	}
 	
 	public static byte[] read(File file) {
 		return read(file.getPath());
 	}
+
+	public static void copyResource(String resourcePath, String destination) {
+		try {
+			byte[] resource = FileUtils.readResource(resourcePath);
+			FileUtils.write(destination, resource);
+		} catch (Exception exception) {
+			Grasscutter.getLogger().warn("Failed to copy resource: " + resourcePath + "\n" + exception);
+		}
+	}
 	
 	public static String getFilenameWithoutPath(String fileName) {
 		if (fileName.indexOf(".") > 0) {
@@ -44,4 +73,33 @@ public final class FileUtils {
 		   return fileName;
 		}
 	}
+
+	// From https://mkyong.com/java/java-read-a-file-from-resources-folder/
+	public static List<Path> getPathsFromResource(String folder) throws URISyntaxException, IOException {
+		List<Path> result;
+
+		// get path of the current running JAR
+		String jarPath = Grasscutter.class.getProtectionDomain()
+				.getCodeSource()
+				.getLocation()
+				.toURI()
+				.getPath();
+
+		// file walks JAR
+		URI uri = URI.create("jar:file:" + jarPath);
+		try (FileSystem fs = FileSystems.newFileSystem(uri, Collections.emptyMap())) {
+			result = Files.walk(fs.getPath(folder))
+					.filter(Files::isRegularFile)
+					.collect(Collectors.toList());
+		}
+
+		return result;
+	}
+
+	@SuppressWarnings("ResultOfMethodCallIgnored")
+	public static String readToString(InputStream file) throws IOException {
+		byte[] content = file.readAllBytes();
+
+		return new String(content, StandardCharsets.UTF_8);
+	}
 }

src/main/java/emu/grasscutter/utils/Utils.java

@@ -9,6 +9,7 @@ import java.time.temporal.TemporalAdjusters;
 import java.util.*;
 
 import emu.grasscutter.Grasscutter;
+import emu.grasscutter.data.DataLoader;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.ByteBufUtil;
 import io.netty.buffer.Unpooled;
@@ -198,6 +199,9 @@ public final class Utils {
 		if(!fileExists(dataFolder))
 			createFolder(dataFolder);
 
+		// Make sure the data folder is populated, if there are any missing files copy them from resources
+		DataLoader.CheckAllFiles();
+
 		if(exit) System.exit(1);
 	}