Set the window params inside the launcher part, depending on launcher type.

Also create/change the new internal version files.

44 files changed, 203 insertions, 3231 deletions

diff --git a/depends/launcher/org/multimc/onesix/OneSixLauncher.java b/depends/launcher/org/multimc/onesix/OneSixLauncher.java
index 0bd5c7ce..784c3522 100644
--- a/depends/launcher/org/multimc/onesix/OneSixLauncher.java
+++ b/depends/launcher/org/multimc/onesix/OneSixLauncher.java
@@ -181,6 +181,21 @@ public class OneSixLauncher implements Launcher
 	
 	int launchWithMainClass()
 	{
+		// window size, title and state, onesix
+		if (maximize)
+		{
+			// FIXME: there is no good way to maximize the minecraft window in onesix.
+			// the following often breaks linux screen setups
+			// mcparams.add("--fullscreen");
+		}
+		else
+		{
+			mcparams.add("--width");
+			mcparams.add(Integer.toString(winSize.width));
+			mcparams.add("--height");
+			mcparams.add(Integer.toString(winSize.height));
+		}
+		
 		// Get the Minecraft Class.
 		Class<?> mc;
 		try
diff --git a/logic/OneSixInstance.cpp b/logic/OneSixInstance.cpp
index ffd40325..a351a5be 100644
--- a/logic/OneSixInstance.cpp
+++ b/logic/OneSixInstance.cpp
@@ -244,24 +244,6 @@ bool OneSixInstance::prepareForLaunch(AuthSessionPtr account, QString &launchScr
 		launchScript += "windowParams " + windowParams + "\n";
 	}
 	
-	// window size, title and state, onesix
-	{
-		bool maximize = settings().get("LaunchMaximized").toBool();
-		if (maximize)
-		{
-			// FIXME: there is no good way to maximize the minecraft window in onesix.
-			// this is probably a BAD idea
-			// launchScript += "param --fullscreen\n";
-		}
-		else
-		{
-			launchScript +=
-				"param --width\nparam " + settings().get("MinecraftWinWidth").toString() + "\n";
-			launchScript +=
-				"param --height\nparam " + settings().get("MinecraftWinHeight").toString() + "\n";
-		}
-	}
-	
 	// legacy auth
 	{
 		launchScript += "userName " + session->player_name + "\n";
diff --git a/resources/versions/1.0.json b/resources/versions/1.0.json
deleted file mode 100644
index 98e52b0a..00000000
--- a/resources/versions/1.0.json
+++ /dev/null
@@ -1,153 +0,0 @@
-{
-  "id": "1.0",
-  "time": "2013-08-06T13:00:00+02:00",
-  "releaseTime": "2011-11-18T00:00:00+02:00",
-  "type": "release",
-  "minecraftArguments": "${auth_player_name} ${auth_session} --gameDir ${game_directory} --assetsDir ${game_assets}",
-  "libraries": [
-    {
-      "name": "net.minecraft:launchwrapper:1.5"
-    },
-    {
-      "name": "net.sf.jopt-simple:jopt-simple:4.5"
-    },
-    {
-      "name": "org.ow2.asm:asm-all:4.1"
-    },
-    {
-      "name": "net.java.jinput:jinput:2.0.5"
-    },
-    {
-      "name": "net.java.jutils:jutils:1.0.0"
-    },
-    {
-      "name": "org.lwjgl.lwjgl:lwjgl:2.9.0",
-      "rules": [
-        {
-          "action": "allow"
-        },
-        {
-          "action": "disallow",
-          "os": {
-            "name": "osx",
-            "version": "^10\\.5\\.\\d$"
-          }
-        }
-      ]
-    },
-    {
-      "name": "org.lwjgl.lwjgl:lwjgl_util:2.9.0",
-      "rules": [
-        {
-          "action": "allow"
-        },
-        {
-          "action": "disallow",
-          "os": {
-            "name": "osx",
-            "version": "^10\\.5\\.\\d$"
-          }
-        }
-      ]
-    },
-    {
-      "name": "org.lwjgl.lwjgl:lwjgl-platform:2.9.0",
-      "rules": [
-        {
-          "action": "allow"
-        },
-        {
-          "action": "disallow",
-          "os": {
-            "name": "osx",
-            "version": "^10\\.5\\.\\d$"
-          }
-        }
-      ],
-      "natives": {
-        "linux": "natives-linux",
-        "windows": "natives-windows",
-        "osx": "natives-osx"
-      },
-      "extract": {
-        "exclude": [
-          "META-INF/"
-        ]
-      }
-    },
-    {
-      "name": "org.lwjgl.lwjgl:lwjgl:2.9.1-nightly-20130708-debug3",
-      "rules": [
-        {
-          "action": "allow",
-          "os": {
-            "name": "osx",
-            "version": "^10\\.5\\.\\d$"
-          }
-        }
-      ]
-    },
-    {
-      "name": "org.lwjgl.lwjgl:lwjgl_util:2.9.1-nightly-20130708-debug3",
-      "rules": [
-        {
-          "action": "allow",
-          "os": {
-            "name": "osx",
-            "version": "^10\\.5\\.\\d$"
-          }
-        }
-      ]
-    },
-    {
-      "name": "org.lwjgl.lwjgl:lwjgl-platform:2.9.1-nightly-20130708-debug3",
-      "rules": [
-        {
-          "action": "allow",
-          "os": {
-            "name": "osx",
-            "version": "^10\\.5\\.\\d$"
-          }
-        }
-      ],
-      "natives": {
-        "linux": "natives-linux",
-        "windows": "natives-windows",
-        "osx": "natives-osx"
-      },
-      "extract": {
-        "exclude": [
-          "META-INF/"
-        ]
-      }
-    },
-    {
-      "name": "net.java.jinput:jinput-platform:2.0.5",
-      "natives": {
-        "linux": "natives-linux",
-        "windows": "natives-windows",
-        "osx": "natives-osx"
-      },
-      "extract": {
-        "exclude": [
-          "META-INF/"
-        ]
-      }
-    },
-    {
-      "name": "net.java.jinput:jinput-platform:2.0.5",
-      "natives": {
-        "linux": "natives-linux",
-        "windows": "natives-windows",
-        "osx": "natives-osx"
-      },
-      "extract": {
-        "exclude": [
-          "META-INF/"
-        ]
-      }
-    }
-  ],
-  "mainClass": "net.minecraft.launchwrapper.Launch",
-  "minimumLauncherVersion": 4
-}
diff --git a/resources/versions/1.1.json b/resources/versions/1.1.json
deleted file mode 100644
index 769306f1..00000000
--- a/resources/versions/1.1.json
+++ /dev/null
@@ -1,153 +0,0 @@
-{
-  "id": "1.1",
-  "time": "2013-08-06T13:00:00+02:00",
-  "releaseTime": "2012-01-12T00:00:00+02:00",
-  "type": "release",
-  "minecraftArguments": "${auth_player_name} ${auth_session} --gameDir ${game_directory} --assetsDir ${game_assets}",
-  "libraries": [
-    {
-      "name": "net.minecraft:launchwrapper:1.5"
-    },
-    {
-      "name": "net.sf.jopt-simple:jopt-simple:4.5"
-    },
-    {
-      "name": "org.ow2.asm:asm-all:4.1"
-    },
-    {
-      "name": "net.java.jinput:jinput:2.0.5"
-    },
-    {
-      "name": "net.java.jutils:jutils:1.0.0"
-    },
-    {
-      "name": "org.lwjgl.lwjgl:lwjgl:2.9.0",
-      "rules": [
-        {
-          "action": "allow"
-        },
-        {
-          "action": "disallow",
-          "os": {
-            "name": "osx",
-            "version": "^10\\.5\\.\\d$"
-          }
-        }
-      ]
-    },
-    {
-      "name": "org.lwjgl.lwjgl:lwjgl_util:2.9.0",
-      "rules": [
-        {
-          "action": "allow"
-        },
-        {
-          "action": "disallow",
-          "os": {
-            "name": "osx",
-            "version": "^10\\.5\\.\\d$"
-          }
-        }
-      ]
-    },
-    {
-      "name": "org.lwjgl.lwjgl:lwjgl-platform:2.9.0",
-      "rules": [
-        {
-          "action": "allow"
-        },
-        {
-          "action": "disallow",
-          "os": {
-            "name": "osx",
-            "version": "^10\\.5\\.\\d$"
-          }
-        }
-      ],
-      "natives": {
-        "linux": "natives-linux",
-        "windows": "natives-windows",
-        "osx": "natives-osx"
-      },
-      "extract": {
-        "exclude": [
-          "META-INF/"
-        ]
-      }
-    },
-    {
-      "name": "org.lwjgl.lwjgl:lwjgl:2.9.1-nightly-20130708-debug3",
-      "rules": [
-        {
-          "action": "allow",
-          "os": {
-            "name": "osx",
-            "version": "^10\\.5\\.\\d$"
-          }
-        }
-      ]
-    },
-    {
-      "name": "org.lwjgl.lwjgl:lwjgl_util:2.9.1-nightly-20130708-debug3",
-      "rules": [
-        {
-          "action": "allow",
-          "os": {
-            "name": "osx",
-            "version": "^10\\.5\\.\\d$"
-          }
-        }
-      ]
-    },
-    {
-      "name": "org.lwjgl.lwjgl:lwjgl-platform:2.9.1-nightly-20130708-debug3",
-      "rules": [
-        {
-          "action": "allow",
-          "os": {
-            "name": "osx",
-            "version": "^10\\.5\\.\\d$"
-          }
-        }
-      ],
-      "natives": {
-        "linux": "natives-linux",
-        "windows": "natives-windows",
-        "osx": "natives-osx"
-      },
-      "extract": {
-        "exclude": [
-          "META-INF/"
-        ]
-      }
-    },
-    {
-      "name": "net.java.jinput:jinput-platform:2.0.5",
-      "natives": {
-        "linux": "natives-linux",
-        "windows": "natives-windows",
-        "osx": "natives-osx"
-      },
-      "extract": {
-        "exclude": [
-          "META-INF/"
-        ]
-      }
-    },
-    {
-      "name": "net.java.jinput:jinput-platform:2.0.5",
-      "natives": {
-        "linux": "natives-linux",
-        "windows": "natives-windows",
-        "osx": "natives-osx"
-      },
-      "extract": {
-        "exclude": [
-          "META-INF/"
-        ]
-      }
-    }
-  ],
-  "mainClass": "net.minecraft.launchwrapper.Launch",
-  "minimumLauncherVersion": 4
-}
diff --git a/resources/versions/1.2.1.json b/resources/versions/1.2.1.json
deleted file mode 100644
index e92cdf26..00000000
--- a/resources/versions/1.2.1.json
+++ /dev/null
@@ -1,153 +0,0 @@
-{
-  "id": "1.2.1",
-  "time": "2013-08-06T13:00:00+02:00",
-  "releaseTime": "2012-03-01T00:00:00+02:00",
-  "type": "release",
-  "minecraftArguments": "${auth_player_name} ${auth_session} --gameDir ${game_directory} --assetsDir ${game_assets}",
-  "libraries": [
-    {
-      "name": "net.minecraft:launchwrapper:1.5"
-    },
-    {
-      "name": "net.sf.jopt-simple:jopt-simple:4.5"
-    },
-    {
-      "name": "org.ow2.asm:asm-all:4.1"
-    },
-    {
-      "name": "net.java.jinput:jinput:2.0.5"
-    },
-    {
-      "name": "net.java.jutils:jutils:1.0.0"
-    },
-    {
-      "name": "org.lwjgl.lwjgl:lwjgl:2.9.0",
-      "rules": [
-        {
-          "action": "allow"
-        },
-        {
-          "action": "disallow",
-          "os": {
-            "name": "osx",
-            "version": "^10\\.5\\.\\d$"
-          }
-        }
-      ]
-    },
-    {
-      "name": "org.lwjgl.lwjgl:lwjgl_util:2.9.0",
-      "rules": [
-        {
-          "action": "allow"
-        },
-        {
-          "action": "disallow",
-          "os": {
-            "name": "osx",
-            "version": "^10\\.5\\.\\d$"
-          }
-        }
-      ]
-    },
-    {
-      "name": "org.lwjgl.lwjgl:lwjgl-platform:2.9.0",
-      "rules": [
-        {
-          "action": "allow"
-        },
-        {
-          "action": "disallow",
-          "os": {
-            "name": "osx",
-            "version": "^10\\.5\\.\\d$"
-          }
-        }
-      ],
-      "natives": {
-        "linux": "natives-linux",
-        "windows": "natives-windows",
-        "osx": "natives-osx"
-      },
-      "extract": {
-        "exclude": [
-          "META-INF/"
-        ]
-      }
-    },
-    {
-      "name": "org.lwjgl.lwjgl:lwjgl:2.9.1-nightly-20130708-debug3",
-      "rules": [
-        {
-          "action": "allow",
-          "os": {
-            "name": "osx",
-            "version": "^10\\.5\\.\\d$"
-          }
-        }
-      ]
-    },
-    {
-      "name": "org.lwjgl.lwjgl:lwjgl_util:2.9.1-nightly-20130708-debug3",
-      "rules": [
-        {
-          "action": "allow",
-          "os": {
-            "name": "osx",
-            "version": "^10\\.5\\.\\d$"
-          }
-        }
-      ]
-    },
-    {
-      "name": "org.lwjgl.lwjgl:lwjgl-platform:2.9.1-nightly-20130708-debug3",
-      "rules": [
-        {
-          "action": "allow",
-          "os": {
-            "name": "osx",
-            "version": "^10\\.5\\.\\d$"
-          }
-        }
-      ],
-      "natives": {
-        "linux": "natives-linux",
-        "windows": "natives-windows",
-        "osx": "natives-osx"
-      },
-      "extract": {
-        "exclude": [
-          "META-INF/"
-        ]
-      }
-    },
-    {
-      "name": "net.java.jinput:jinput-platform:2.0.5",
-      "natives": {
-        "linux": "natives-linux",
-        "windows": "natives-windows",
-        "osx": "natives-osx"
-      },
-      "extract": {
-        "exclude": [
-          "META-INF/"
-        ]
-      }
-    },
-    {
-      "name": "net.java.jinput:jinput-platform:2.0.5",
-      "natives": {
-        "linux": "natives-linux",
-        "windows": "natives-windows",
-        "osx": "natives-osx"
-      },
-      "extract": {
-        "exclude": [
-          "META-INF/"
-        ]
-      }
-    }
-  ],
-  "mainClass": "net.minecraft.launchwrapper.Launch",
-  "minimumLauncherVersion": 4
-}
diff --git a/resources/versions/1.2.2.json b/resources/versions/1.2.2.json
deleted file mode 100644
index d52fde53..00000000
--- a/resources/versions/1.2.2.json
+++ /dev/null
@@ -1,153 +0,0 @@
-{
-  "id": "1.2.2",
-  "time": "2013-08-06T13:00:00+02:00",
-  "releaseTime": "2012-03-01T00:00:01+02:00",
-  "type": "release",
-  "minecraftArguments": "${auth_player_name} ${auth_session} --gameDir ${game_directory} --assetsDir ${game_assets}",
-  "libraries": [
-    {
-      "name": "net.minecraft:launchwrapper:1.5"
-    },
-    {
-      "name": "net.sf.jopt-simple:jopt-simple:4.5"
-    },
-    {
-      "name": "org.ow2.asm:asm-all:4.1"
-    },
-    {
-      "name": "net.java.jinput:jinput:2.0.5"
-    },
-    {
-      "name": "net.java.jutils:jutils:1.0.0"
-    },
-    {
-      "name": "org.lwjgl.lwjgl:lwjgl:2.9.0",
-      "rules": [
-        {
-          "action": "allow"
-        },
-        {
-          "action": "disallow",
-          "os": {
-            "name": "osx",
-            "version": "^10\\.5\\.\\d$"
-          }
-        }
-      ]
-    },
-    {
-      "name": "org.lwjgl.lwjgl:lwjgl_util:2.9.0",
-      "rules": [
-        {
-          "action": "allow"
-        },
-        {
-          "action": "disallow",
-          "os": {
-            "name": "osx",
-            "version": "^10\\.5\\.\\d$"
-          }
-        }
-      ]
-    },
-    {
-      "name": "org.lwjgl.lwjgl:lwjgl-platform:2.9.0",
-      "rules": [
-        {
-          "action": "allow"
-        },
-        {
-          "action": "disallow",
-          "os": {
-            "name": "osx",
-            "version": "^10\\.5\\.\\d$"
-          }
-        }
-      ],
-      "natives": {
-        "linux": "natives-linux",
-        "windows": "natives-windows",
-        "osx": "natives-osx"
-      },
-      "extract": {
-        "exclude": [
-          "META-INF/"
-        ]
-      }
-    },
-    {
-      "name": "org.lwjgl.lwjgl:lwjgl:2.9.1-nightly-20130708-debug3",
-      "rules": [
-        {
-          "action": "allow",
-          "os": {
-            "name": "osx",
-            "version": "^10\\.5\\.\\d$"
-          }
-        }
-      ]
-    },
-    {
-      "name": "org.lwjgl.lwjgl:lwjgl_util:2.9.1-nightly-20130708-debug3",
-      "rules": [
-        {
-          "action": "allow",
-          "os": {
-            "name": "osx",
-            "version": "^10\\.5\\.\\d$"
-          }
-        }
-      ]
-    },
-    {
-      "name": "org.lwjgl.lwjgl:lwjgl-platform:2.9.1-nightly-20130708-debug3",
-      "rules": [
-        {
-          "action": "allow",
-          "os": {
-            "name": "osx",
-            "version": "^10\\.5\\.\\d$"
-          }
-        }
-      ],
-      "natives": {
-        "linux": "natives-linux",
-        "windows": "natives-windows",
-        "osx": "natives-osx"
-      },
-      "extract": {
-        "exclude": [
-          "META-INF/"
-        ]
-      }
-    },
-    {
-      "name": "net.java.jinput:jinput-platform:2.0.5",
-      "natives": {
-        "linux": "natives-linux",
-        "windows": "natives-windows",
-        "osx": "natives-osx"
-      },
-      "extract": {
-        "exclude": [
-          "META-INF/"
-        ]
-      }
-    },
-    {
-      "name": "net.java.jinput:jinput-platform:2.0.5",
-      "natives": {
-        "linux": "natives-linux",
-        "windows": "natives-windows",
-        "osx": "natives-osx"
-      },
-      "extract": {
-        "exclude": [
-          "META-INF/"
-        ]
-      }
-    }
-  ],
-  "mainClass": "net.minecraft.launchwrapper.Launch",
-  "minimumLauncherVersion": 4
-}
diff --git a/resources/versions/1.2.3.json b/resources/versions/1.2.3.json
deleted file mode 100644
index 1b1892b4..00000000
--- a/resources/versions/1.2.3.json
+++ /dev/null
@@ -1,153 +0,0 @@
-{
-  "id": "1.2.3",
-  "time": "2013-08-06T13:00:00+02:00",
-  "releaseTime": "2012-03-02T00:00:00+02:00",
-  "type": "release",
-  "minecraftArguments": "${auth_player_name} ${auth_session} --gameDir ${game_directory} --assetsDir ${game_assets}",
-  "libraries": [
-    {
-      "name": "net.minecraft:launchwrapper:1.5"
-    },
-    {
-      "name": "net.sf.jopt-simple:jopt-simple:4.5"
-    },
-    {
-      "name": "org.ow2.asm:asm-all:4.1"
-    },
-    {
-      "name": "net.java.jinput:jinput:2.0.5"
-    },
-    {
-      "name": "net.java.jutils:jutils:1.0.0"
-    },
-    {
-      "name": "org.lwjgl.lwjgl:lwjgl:2.9.0",
-      "rules": [
-        {
-          "action": "allow"
-        },
-        {
-          "action": "disallow",
-          "os": {
-            "name": "osx",
-            "version": "^10\\.5\\.\\d$"
-          }
-        }
-      ]
-    },
-    {
-      "name": "org.lwjgl.lwjgl:lwjgl_util:2.9.0",
-      "rules": [
-        {
-          "action": "allow"
-        },
-        {
-          "action": "disallow",
-          "os": {
-            "name": "osx",
-            "version": "^10\\.5\\.\\d$"
-          }
-        }
-      ]
-    },
-    {
-      "name": "org.lwjgl.lwjgl:lwjgl-platform:2.9.0",
-      "rules": [
-        {
-          "action": "allow"
-        },
-        {
-          "action": "disallow",
-          "os": {
-            "name": "osx",
-            "version": "^10\\.5\\.\\d$"
-          }
-        }
-      ],
-      "natives": {
-        "linux": "natives-linux",
-        "windows": "natives-windows",
-        "osx": "natives-osx"
-      },
-      "extract": {
-        "exclude": [
-          "META-INF/"
-        ]
-      }
-    },
-    {
-      "name": "org.lwjgl.lwjgl:lwjgl:2.9.1-nightly-20130708-debug3",
-      "rules": [
-        {
-          "action": "allow",
-          "os": {
-            "name": "osx",
-            "version": "^10\\.5\\.\\d$"
-          }
-        }
-      ]
-    },
-    {
-      "name": "org.lwjgl.lwjgl:lwjgl_util:2.9.1-nightly-20130708-debug3",
-      "rules": [
-        {
-          "action": "allow",
-          "os": {
-            "name": "osx",
-            "version": "^10\\.5\\.\\d$"
-          }
-        }
-      ]
-    },
-    {
-      "name": "org.lwjgl.lwjgl:lwjgl-platform:2.9.1-nightly-20130708-debug3",
-      "rules": [
-        {
-          "action": "allow",
-          "os": {
-            "name": "osx",
-            "version": "^10\\.5\\.\\d$"
-          }
-        }
-      ],
-      "natives": {
-        "linux": "natives-linux",
-        "windows": "natives-windows",
-        "osx": "natives-osx"
-      },
-      "extract": {
-        "exclude": [
-          "META-INF/"
-        ]
-      }
-    },
-    {
-      "name": "net.java.jinput:jinput-platform:2.0.5",
-      "natives": {
-        "linux": "natives-linux",
-        "windows": "natives-windows",
-        "osx": "natives-osx"
-      },
-      "extract": {
-        "exclude": [
-          "META-INF/"
-        ]
-      }
-    },
-    {
-      "name": "net.java.jinput:jinput-platform:2.0.5",
-      "natives": {
-        "linux": "natives-linux",
-        "windows": "natives-windows",
-        "osx": "natives-osx"
-      },
-      "extract": {
-        "exclude": [
-          "META-INF/"
-        ]
-      }
-    }
-  ],
-  "mainClass": "net.minecraft.launchwrapper.Launch",
-  "minimumLauncherVersion": 4
-}
diff --git a/resources/versions/1.2.4.json b/resources/versions/1.2.4.json
deleted file mode 100644
index 0941dedd..00000000
--- a/resources/versions/1.2.4.json
+++ /dev/null
@@ -1,153 +0,0 @@
-{
-  "id": "1.2.4",
-  "time": "2013-08-06T13:00:00+02:00",
-  "releaseTime": "2012-03-22T00:00:00+02:00",
-  "type": "release",
-  "minecraftArguments": "${auth_player_name} ${auth_session} --gameDir ${game_dire