keith/ForgePatch
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Wiki Activity

Make sure we only add args to the argument list if a tweaker hasn't already.

Browse source 
Should fix LiteLoader compatibility issue.
This commit is contained in:
Christian 2013-08-16 16:28:55 -04:00
parent 779139b3ca
commit 7c7cafbae1
1 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
fml/common/cpw/mods/fml/common/launcher/FMLTweaker.java
View file

@ -3,6 +3,7 @@ package cpw.mods.fml.common.launcher;
import java.io.File;
import java.net.URI;
import java.net.URISyntaxException;
import java.util.Arrays;
import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
@ -14,6 +15,7 @@ import joptsimple.OptionSet;
import com.google.common.base.Joiner;
import com.google.common.base.Throwables;
import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
import com.google.common.collect.ObjectArrays;
@ -121,31 +123,32 @@ public class FMLTweaker implements ITweaker {
{
String[] array = args.toArray(new String[args.size()]);
if (gameDir != null)
for (ITweaker tweak: cascadedTweaks)
{
array = ObjectArrays.concat(tweak.getLaunchArguments(), array, String.class);
}
if (gameDir != null && !Arrays.asList(array).contains("--gameDir"))
{
array = ObjectArrays.concat(gameDir.getAbsolutePath(),array);
array = ObjectArrays.concat("--gameDir",array);
}
if (assetsDir != null)
if (assetsDir != null && !Arrays.asList(array).contains("--assetsDir"))
{
array = ObjectArrays.concat(assetsDir.getAbsolutePath(),array);
array = ObjectArrays.concat("--assetsDir",array);
}
if (profile != null)
if (profile != null && !Arrays.asList(array).contains("--version"))
{
array = ObjectArrays.concat(profile,array);
array = ObjectArrays.concat("--version",array);
}
else
else if (!Arrays.asList(array).contains("--version"))
{
array = ObjectArrays.concat("UnknownFMLProfile",array);
array = ObjectArrays.concat("--version",array);
}
for (ITweaker tweak: cascadedTweaks)
{
array = ObjectArrays.concat(tweak.getLaunchArguments(), array, String.class);
}
return array;
}