Support all environments in one tweaker

Author: ZeroMemes

src/main/java/clientapi/load/ClientTweaker.java

@@ -19,7 +19,10 @@
 import clientapi.ClientAPI;
 import clientapi.config.ClientConfiguration;
 import clientapi.config.JsonConfiguration;
+import clientapi.load.argument.Argument;
+import clientapi.load.argument.Arguments;
 import net.minecraft.launchwrapper.ITweaker;
+import net.minecraft.launchwrapper.Launch;
 import net.minecraft.launchwrapper.LaunchClassLoader;
 import org.apache.logging.log4j.Level;
 import org.spongepowered.asm.launch.MixinBootstrap;
@@ -43,7 +46,7 @@ public class ClientTweaker implements ITweaker {
     /**
      * The Game Launch Arguments
      */
-    List<String> args;
+    private List<String> args;
 
     @Override
     public void acceptOptions(List<String> args, File gameDir, File assetsDir, String profile) {
@@ -61,7 +64,14 @@ public void injectIntoClassLoader(LaunchClassLoader classLoader) {
         ClientAPI.LOGGER.log(Level.INFO, "Initialized Mixin bootstrap");
 
         MixinEnvironment.getDefaultEnvironment().setSide(MixinEnvironment.Side.CLIENT);
-        MixinEnvironment.getDefaultEnvironment().setObfuscationContext(ObfuscationServiceMCP.NOTCH);
+
+        String obfuscation = ObfuscationServiceMCP.NOTCH;
+        if (Launch.classLoader.getTransformers().stream().noneMatch(t -> t.getClass().getName().contains("fml"))) {
+            obfuscation = ObfuscationServiceMCP.SEARGE;
+        }
+
+        MixinEnvironment.getDefaultEnvironment().setObfuscationContext(obfuscation);
+
         ClientAPI.LOGGER.log(Level.INFO, "Setup Mixin Environment");
 
         ClientConfiguration config = findClientConfig();
@@ -88,8 +98,19 @@ public final String getLaunchTarget() {
     }
 
     @Override
+    @SuppressWarnings("unchecked")
     public final String[] getLaunchArguments() {
-        return this.args.toArray(new String[0]);
+        // Parse the arguments that we are able to pass to the game
+        List<Argument> parsed = Arguments.parse(this.args);
+
+        // Parse the arguments that are already being passed to the game
+        List<Argument> existing = Arguments.parse((List<String>) Launch.blackboard.get("ArgumentList"));
+
+        // Remove any arguments that match already existing ones
+        parsed.removeIf(argument -> existing.stream().anyMatch(a -> a.matches(argument)));
+
+        // Join back the filtered arguments and pass those to the game
+        return Arguments.join(parsed).toArray(new String[0]);
     }
 
     private ClientConfiguration findClientConfig() {

src/main/java/clientapi/load/ClientTweakerForge.java

@@ -14,23 +14,17 @@
  * limitations under the License.
  */
 
-package clientapi.load;
+package clientapi.load.argument;
 
-import java.io.File;
-import java.util.ArrayList;
 import java.util.List;
 
 /**
- * Implementation of ClientTweaker that leaves the argument list alone
- * so that optifine's tweaker does not cause any conflictions.
- *
  * @author Brady
- * @since 2/21/2018
+ * @since 10/9/2018
  */
-public final class ClientTweakerOptifine extends ClientTweaker {
+public interface Argument {
+
+    void addToList(List<String> arguments);
 
-    @Override
-    public final void acceptOptions(List<String> args, File gameDir, File assetsDir, String profile) {
-        this.args = new ArrayList<>();
-    }
+    boolean matches(Argument argument);
 }

…lientapi/load/ClientTweakerOptifine.java …va/clientapi/load/argument/Argument.javasrc/main/java/clientapi/load/ClientTweakerOptifine.java renamed to src/main/java/clientapi/load/argument/Argument.java src/main/java/clientapi/load/ClientTweakerOptifine.java renamed to src/main/java/clientapi/load/argument/Argument.java

@@ -0,0 +1,61 @@
+/*
+ * Copyright 2018 ImpactDevelopment
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package clientapi.load.argument;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author Brady
+ * @since 10/9/2018
+ */
+public final class Arguments {
+
+    public static List<Argument> parse(List<String> args) {
+        List<Argument> argsOut = new ArrayList<>();
+
+        String classifier = null;
+
+        for (String arg : args) {
+            if (arg.startsWith("-")) {
+                if (classifier != null) {
+                    argsOut.add(new ClassifiedArgument(classifier, ""));
+                    classifier = null;
+                } else if (arg.contains("=")) {
+                    argsOut.add(new ClassifiedArgument(arg.substring(0, arg.indexOf('=')), arg.substring(arg.indexOf('=') + 1)));
+                } else {
+                    classifier = arg;
+                }
+            } else {
+                if (classifier != null) {
+                    argsOut.add(new ClassifiedArgument(classifier, arg));
+                    classifier = null;
+                } else {
+                    argsOut.add(new SingularArgument(arg));
+                }
+            }
+        }
+
+        return argsOut;
+    }
+
+    public static List<String> join(List<Argument> args) {
+        List<String> argsOut = new ArrayList<>();
+        args.forEach(argument -> argument.addToList(argsOut));
+        return argsOut;
+    }
+}

src/main/java/clientapi/load/argument/Arguments.java

@@ -0,0 +1,48 @@
+/*
+ * Copyright 2018 ImpactDevelopment
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package clientapi.load.argument;
+
+import java.util.List;
+
+/**
+ * @author Brady
+ * @since 10/9/2018
+ */
+public final class ClassifiedArgument implements Argument {
+
+    private final String classifier;
+    private final String value;
+
+    public ClassifiedArgument(String classifier, String value) {
+        this.classifier = classifier;
+        this.value = value;
+    }
+
+    @Override
+    public final void addToList(List<String> arguments) {
+        arguments.add(classifier);
+        arguments.add(value);
+    }
+
+    @Override
+    public final boolean matches(Argument argument) {
+        if (!(argument instanceof ClassifiedArgument))
+            return false;
+
+        return ((ClassifiedArgument) argument).classifier.equals(this.classifier);
+    }
+}

src/main/java/clientapi/load/argument/ClassifiedArgument.java

@@ -0,0 +1,45 @@
+/*
+ * Copyright 2018 ImpactDevelopment
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package clientapi.load.argument;
+
+import java.util.List;
+
+/**
+ * @author Brady
+ * @since 10/9/2018
+ */
+public final class SingularArgument implements Argument {
+
+    private final String value;
+
+    public SingularArgument(String value) {
+        this.value = value;
+    }
+
+    @Override
+    public final void addToList(List<String> arguments) {
+        arguments.add(this.value);
+    }
+
+    @Override
+    public final boolean matches(Argument argument) {
+        if (!(argument instanceof SingularArgument))
+            return false;
+
+        return ((SingularArgument) argument).value.equals(this.value);
+    }
+}