fix: 修复-Xmx参数无法自动覆盖的问题&清理部分无效代码

Author: ShirosakiMio

FCL/src/main/java/com/tungsten/fcl/game/FCLGameRepository.java

@@ -335,7 +335,7 @@ public void globalizeVersionSetting(String id) {
             vs.setUsesGlobal(true);
     }
 
-    public LaunchOptions getLaunchOptions(String version, JavaVersion javaVersion, File gameDir, List<String> javaAgents) {
+    public LaunchOptions getLaunchOptions(String version, JavaVersion javaVersion, File gameDir) {
         VersionSetting vs = getVersionSetting(version);
 
         LaunchOptions.Builder builder = new LaunchOptions.Builder()
@@ -345,7 +345,7 @@ public LaunchOptions getLaunchOptions(String version, JavaVersion javaVersion, F
                 .setVersionName(version)
                 .setProfileName(FCLPath.CONTEXT.getString(R.string.app_name))
                 .setGameArguments(StringUtils.tokenize(vs.getMinecraftArgs()))
-                .setOverrideJavaArguments(StringUtils.tokenize(vs.getJavaArgs()))
+                .setJavaArguments(StringUtils.tokenize(vs.getJavaArgs()))
                 .setMaxMemory((int) (getAllocatedMemory(
                         vs.getMaxMemory() * 1024L * 1024L,
                         MemoryUtils.getFreeDeviceMemory(FCLPath.CONTEXT),
@@ -356,7 +356,6 @@ public LaunchOptions getLaunchOptions(String version, JavaVersion javaVersion, F
                 .setWidth((int) (AndroidUtils.getScreenWidth(FCLApplication.getCurrentActivity()) * vs.getScaleFactor() / 100.0))
                 .setHeight((int) (AndroidUtils.getScreenHeight(FCLApplication.getCurrentActivity()) * vs.getScaleFactor() / 100.0))
                 .setServerIp(vs.getServerIp())
-                .setJavaAgents(javaAgents)
                 .setBEGesture(vs.isBeGesture())
                 .setVkDriverSystem(vs.isVKDriverSystem())
                 .setPojavBigCore(vs.isPojavBigCore())

FCL/src/main/java/com/tungsten/fcl/game/LauncherHelper.java

@@ -135,7 +135,6 @@ private void launch0() {
         AtomicReference<Version> version = new AtomicReference<>(MaintainTask.maintain(repository, repository.getResolvedVersion(selectedVersion)));
         Optional<String> gameVersion = repository.getGameVersion(version.get());
         boolean integrityCheck = repository.unmarkVersionLaunchedAbnormally(selectedVersion);
-        List<String> javaAgents = new ArrayList<>(0);
 
         AtomicReference<JavaVersion> javaVersionRef = new AtomicReference<>();
 
@@ -181,7 +180,7 @@ else if (configuration.getType().equals(ServerModpackProvider.INSTANCE.getName()
                 .thenComposeAsync(() -> gameVersion.map(s -> new GameVerificationFixTask(dependencyManager, s, version.get())).orElse(null))
                 .thenComposeAsync(() -> logIn(context, account).withStage("launch.state.logging_in"))
                 .thenComposeAsync(authInfo -> Task.supplyAsync(() -> {
-                            LaunchOptions launchOptions = repository.getLaunchOptions(selectedVersion, javaVersionRef.get(), profile.getGameDir(), javaAgents);
+                            LaunchOptions launchOptions = repository.getLaunchOptions(selectedVersion, javaVersionRef.get(), profile.getGameDir());
                             FCLGameLauncher launcher = new FCLGameLauncher(
                                     context,
                                     repository,

FCLCore/src/main/java/com/tungsten/fclcore/game/LaunchOptions.java

@@ -35,9 +35,7 @@ public class LaunchOptions implements Serializable {
     private String versionType;
     private String profileName;
     private final List<String> gameArguments = new ArrayList<>();
-    private final List<String> overrideJavaArguments = new ArrayList<>();
     private final List<String> javaArguments = new ArrayList<>();
-    private final List<String> javaAgents = new ArrayList<>(0);
     private Integer minMemory;
     private Integer maxMemory;
     private Integer width;
@@ -95,14 +93,6 @@ public List<String> getGameArguments() {
         return Collections.unmodifiableList(gameArguments);
     }
 
-    /**
-     * The highest priority JVM arguments (overrides the version setting)
-     */
-    @NotNull
-    public List<String> getOverrideJavaArguments() {
-        return Collections.unmodifiableList(overrideJavaArguments);
-    }
-
     /**
      * User custom additional java virtual machine command line arguments.
      */
@@ -111,11 +101,6 @@ public List<String> getJavaArguments() {
         return Collections.unmodifiableList(javaArguments);
     }
 
-    @NotNull
-    public List<String> getJavaAgents() {
-        return Collections.unmodifiableList(javaAgents);
-    }
-
     /**
      * The minimum memory that the JVM can allocate.
      */
@@ -238,24 +223,12 @@ public Builder setGameArguments(List<String> gameArguments) {
             return this;
         }
 
-        public Builder setOverrideJavaArguments(List<String> overrideJavaArguments) {
-            options.overrideJavaArguments.clear();
-            options.overrideJavaArguments.addAll(overrideJavaArguments);
-            return this;
-        }
-
         public Builder setJavaArguments(List<String> javaArguments) {
             options.javaArguments.clear();
             options.javaArguments.addAll(javaArguments);
             return this;
         }
 
-        public Builder setJavaAgents(List<String> javaAgents) {
-            options.javaAgents.clear();
-            options.javaAgents.addAll(javaAgents);
-            return this;
-        }
-
         public Builder setMinMemory(Integer minMemory) {
             options.minMemory = minMemory;
             return this;

FCLCore/src/main/java/com/tungsten/fclcore/launch/DefaultLauncher.java

@@ -82,18 +82,15 @@ private CommandBuilder generateCommandLine() throws IOException {
 
         getCacioJavaArgs(res, version, options);
 
-        res.addAllWithoutParsing(options.getOverrideJavaArguments().stream().filter(arg -> !arg.equals("noXmx")).collect(Collectors.toList()));
+        res.addAllWithoutParsing(options.getJavaArguments().stream().filter(arg -> !arg.equals("noXmx")).collect(Collectors.toList()));
 
-        if (options.getMaxMemory() != null && options.getMaxMemory() > 0 && !options.getOverrideJavaArguments().contains("noXmx"))
-            if (options.getOverrideJavaArguments().stream().noneMatch(arg -> arg.contains("-Xmx")))
-                res.addDefault("-Xmx", options.getMaxMemory() + "m");
+        if (options.getMaxMemory() != null && options.getMaxMemory() > 0)
+            res.addDefault("-Xmx", options.getMaxMemory() + "m");
 
         if (options.getMinMemory() != null && options.getMinMemory() > 0
                 && (options.getMaxMemory() == null || options.getMinMemory() <= options.getMaxMemory()))
             res.addDefault("-Xms", options.getMinMemory() + "m");
 
-        res.addAllDefaultWithoutParsing(options.getJavaArguments());
-
         Charset encoding = OperatingSystem.NATIVE_CHARSET;
         String fileEncoding = res.addDefault("-Dfile.encoding=", encoding.name());
         if (fileEncoding != null && !"-Dfile.encoding=COMPAT".equals(fileEncoding)) {
@@ -235,10 +232,6 @@ private CommandBuilder generateCommandLine() throws IOException {
         if (argumentsFromAuthInfo != null && argumentsFromAuthInfo.getJvm() != null && !argumentsFromAuthInfo.getJvm().isEmpty())
             res.addAll(Arguments.parseArguments(argumentsFromAuthInfo.getJvm(), configuration));
 
-        for (String javaAgent : options.getJavaAgents()) {
-            res.add("-javaagent:" + javaAgent);
-        }
-
         if (javaVersion.getVersion() != JavaVersion.JAVA_VERSION_8) {
             res.add("--add-exports");
             String pkg = version.getMainClass().substring(0, version.getMainClass().lastIndexOf("."));