Resolver changes

- Modified ResConfHack to read resolv data from the Java property - Added auto-unpacking of premade resolv.conf and setting the Java property (Now SRV resolving should work on Java 17 by default)
PojavLauncherTeam · Aug 31, 2021 · dc479a2 · dc479a2
1 parent de50fd9
commit dc479a2
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 1 deletion.
diff --git a/app_pojavlauncher/src/main/assets/components/caciocavallo/ResConfHack.jar b/app_pojavlauncher/src/main/assets/components/caciocavallo/ResConfHack.jar
diff --git a/app_pojavlauncher/src/main/assets/resolv.conf b/app_pojavlauncher/src/main/assets/resolv.conf
@@ -0,0 +1,2 @@
+nameserver 8.8.8.8
+nameserver 8.8.4.4
diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/PojavLoginActivity.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/PojavLoginActivity.java
@@ -338,7 +338,7 @@ private void initMain() throws Throwable {
             Tools.copyAssetFile(this, "options.txt", Tools.DIR_GAME_NEW, false);
             // TODO: Remove after implement.
             Tools.copyAssetFile(this, "launcher_profiles.json", Tools.DIR_GAME_NEW, false);
-
+            Tools.copyAssetFile(this,"resolv.conf",Tools.DIR_DATA, true);
             AssetManager am = this.getAssets();
 
             unpackComponent(am, "caciocavallo");

diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/utils/JREUtils.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/utils/JREUtils.java
@@ -346,6 +346,8 @@ public static List<String> getJavaArgs(Context ctx) {
                 "-Dglfwstub.windowHeight=" + CallbackBridge.windowHeight,
                 "-Dglfwstub.initEgl=false",
 
+                "-Dext.net.resolvPath=" +new File(Tools.DIR_DATA,"resolv.conf").getAbsolutePath(),
+
                 "-Dnet.minecraft.clientmodname=" + Tools.APP_NAME,
                 "-Dfml.earlyprogresswindow=false" //Forge 1.14+ workaround
         };