Feat: add MioLibFixer for clean log

FCL-Team · Dec 1, 2024 · 23b40d3 · 23b40d3
1 parent d7e3382
commit 23b40d3
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/FCL/src/main/assets/game/MultiplayerFix.jar → FCL/src/main/assets/game/MioLibFixer.jar b/FCL/src/main/assets/game/MultiplayerFix.jar → FCL/src/main/assets/game/MioLibFixer.jar
diff --git a/FCL/src/main/java/com/tungsten/fcl/game/LauncherHelper.java b/FCL/src/main/java/com/tungsten/fcl/game/LauncherHelper.java
@@ -142,9 +142,9 @@ private void launch0() {
                     );
                 }).withStage("launch.state.dependencies")
                 .thenComposeAsync(() -> {
-                    if (!new File(FCLPath.MULTIPLAYER_FIX_PATH).exists()) {
-                        try (InputStream input = LauncherHelper.class.getResourceAsStream("/assets/game/MultiplayerFix.jar")) {
-                            Files.copy(input, new File(FCLPath.MULTIPLAYER_FIX_PATH).toPath(), StandardCopyOption.REPLACE_EXISTING);
+                    if (!new File(FCLPath.LIB_FIXER_PATH).exists()) {
+                        try (InputStream input = LauncherHelper.class.getResourceAsStream("/assets/game/MioLibFixer.jar")) {
+                            Files.copy(input, new File(FCLPath.LIB_FIXER_PATH).toPath(), StandardCopyOption.REPLACE_EXISTING);
                         } catch (IOException e) {
                             Logging.LOG.log(Level.WARNING, "Unable to unpack MultiplayerFix.jar", e);
                         }

diff --git a/FCLCore/src/main/java/com/tungsten/fclcore/launch/DefaultLauncher.java b/FCLCore/src/main/java/com/tungsten/fclcore/launch/DefaultLauncher.java
@@ -177,9 +177,10 @@ private CommandBuilder generateCommandLine() throws IOException {
         }
 
         // Fix 1.16.x multiplayer
-        if (repository.getGameVersion(version).isPresent() && repository.getGameVersion(version).get().startsWith("1.16")) {
-            res.add("-javaagent:" + FCLPath.MULTIPLAYER_FIX_PATH);
-        }
+//        if (repository.getGameVersion(version).isPresent() && repository.getGameVersion(version).get().startsWith("1.16")) {
+//
+//        }
+        res.add("-javaagent:" + FCLPath.LIB_FIXER_PATH);
 
         Set<String> classpath = repository.getClasspath(version);
         classpath.add(FCLPath.MIO_LAUNCH_WRAPPER);

diff --git a/FCLauncher/src/main/java/com/tungsten/fclauncher/utils/FCLPath.java b/FCLauncher/src/main/java/com/tungsten/fclauncher/utils/FCLPath.java
@@ -34,7 +34,7 @@ public class FCLPath {
     public static String SHARED_COMMON_DIR = Environment.getExternalStorageDirectory().getAbsolutePath() + "/FCL/.minecraft";
 
     public static String AUTHLIB_INJECTOR_PATH;
-    public static String MULTIPLAYER_FIX_PATH;
+    public static String LIB_FIXER_PATH;
     public static String MIO_LAUNCH_WRAPPER;
     public static String LT_BACKGROUND_PATH;
     public static String DK_BACKGROUND_PATH;
@@ -66,7 +66,7 @@ public static void loadPaths(Context context) {
         PRIVATE_COMMON_DIR = context.getExternalFilesDir(".minecraft").getAbsolutePath();
 
         AUTHLIB_INJECTOR_PATH = PLUGIN_DIR + "/authlib-injector.jar";
-        MULTIPLAYER_FIX_PATH = PLUGIN_DIR + "/MultiplayerFix.jar";
+        LIB_FIXER_PATH = PLUGIN_DIR + "/MioLibFixer.jar";
         MIO_LAUNCH_WRAPPER = PLUGIN_DIR + "/MioLaunchWrapper.jar";
         LT_BACKGROUND_PATH = BACKGROUND_DIR + "/lt.png";
         DK_BACKGROUND_PATH = BACKGROUND_DIR + "/dk.png";