Merge branch 'refs/heads/QuestCraft' into QuestCraft-BTW

# Conflicts: # src/main/jniLibs/arm64-v8a/liblwjgl.so # src/main/jniLibs/arm64-v8a/liblwjgl_nanovg.so # src/main/jniLibs/arm64-v8a/liblwjgl_opengl.so # src/main/jniLibs/arm64-v8a/liblwjgl_opengles.so # src/main/jniLibs/arm64-v8a/liblwjgl_openvr.so # src/main/jniLibs/arm64-v8a/liblwjgl_stb.so # src/main/jniLibs/arm64-v8a/liblwjgl_tinyfd.so
QuestCraftPlusPlus · Sep 7, 2024 · 38a2e95 · 38a2e95
2 parents 8c2e536 + c5dec21
commit 38a2e95
Show file tree

Hide file tree

Showing 10 changed files with 15 additions and 14 deletions.
diff --git a/src/main/assets/lwjgl/lwjgl-glfw-classes.jar b/src/main/assets/lwjgl/lwjgl-glfw-classes.jar
diff --git a/src/main/assets/servers.dat b/src/main/assets/servers.dat
diff --git a/src/main/java/pojlib/install/Installer.java b/src/main/java/pojlib/install/Installer.java
@@ -118,6 +118,7 @@ public static String installAssets(VersionInfo minecraftVersionInfo, String game
         FileUtils.writeByteArrayToFile(new File(instance.gameDir + "/config/modernfix-mixins.properties"), FileUtil.loadFromAssetToByte(activity,"modernfix-mixins.properties"));
         FileUtils.writeByteArrayToFile(new File(instance.gameDir + "/options.txt"), FileUtil.loadFromAssetToByte(activity, "options.txt"));
         FileUtils.writeByteArrayToFile(new File(instance.gameDir + "/optionsviveprofiles.txt"), FileUtil.loadFromAssetToByte(activity, "optionsviveprofiles.txt"));
+        FileUtils.writeByteArrayToFile(new File(instance.gameDir + "/servers.dat"), FileUtil.loadFromAssetToByte(activity, "servers.dat"));
         FileUtils.writeByteArrayToFile(new File(Constants.USER_HOME + "/hacks/ResConfHack.jar"), FileUtil.loadFromAssetToByte(activity, "hacks/ResConfHack.jar"));
 
         return new File(gameDir + "/assets").getAbsolutePath();

diff --git a/src/main/jniLibs/arm64-v8a/liblwjgl.so b/src/main/jniLibs/arm64-v8a/liblwjgl.so
diff --git a/src/main/jniLibs/arm64-v8a/liblwjgl_nanovg.so b/src/main/jniLibs/arm64-v8a/liblwjgl_nanovg.so
diff --git a/src/main/jniLibs/arm64-v8a/liblwjgl_opengl.so b/src/main/jniLibs/arm64-v8a/liblwjgl_opengl.so
diff --git a/src/main/jniLibs/arm64-v8a/liblwjgl_opengles.so b/src/main/jniLibs/arm64-v8a/liblwjgl_opengles.so
diff --git a/src/main/jniLibs/arm64-v8a/liblwjgl_openvr.so b/src/main/jniLibs/arm64-v8a/liblwjgl_openvr.so
diff --git a/src/main/jniLibs/arm64-v8a/liblwjgl_stb.so b/src/main/jniLibs/arm64-v8a/liblwjgl_stb.so
diff --git a/src/main/jniLibs/arm64-v8a/liblwjgl_tinyfd.so b/src/main/jniLibs/arm64-v8a/liblwjgl_tinyfd.so