-
-
Notifications
You must be signed in to change notification settings - Fork 566
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1999 from TheKodeToad/more-legacy-fixes
- Loading branch information
Showing
12 changed files
with
131 additions
and
68 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
66 changes: 66 additions & 0 deletions
66
libraries/launcher/legacy/org/prismlauncher/legacy/fix/online/OnlineModeFix.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,66 @@ | ||
| // SPDX-License-Identifier: GPL-3.0-only | ||
| /* | ||
| * Prism Launcher - Minecraft Launcher | ||
| * Copyright (C) 2023 TheKodeToad <TheKodeToad@proton.me> | ||
| * | ||
| * This program is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
| * the Free Software Foundation, version 3. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * Linking this library statically or dynamically with other modules is | ||
| * making a combined work based on this library. Thus, the terms and | ||
| * conditions of the GNU General Public License cover the whole | ||
| * combination. | ||
| * | ||
| * As a special exception, the copyright holders of this library give | ||
| * you permission to link this library with independent modules to | ||
| * produce an executable, regardless of the license terms of these | ||
| * independent modules, and to copy and distribute the resulting | ||
| * executable under terms of your choice, provided that you also meet, | ||
| * for each linked independent module, the terms and conditions of the | ||
| * license of that module. An independent module is a module which is | ||
| * not derived from or based on this library. If you modify this | ||
| * library, you may extend this exception to your version of the | ||
| * library, but you are not obliged to do so. If you do not wish to do | ||
| * so, delete this exception statement from your version. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with this program. If not, see <https://www.gnu.org/licenses/>. | ||
| */ | ||
|
|
||
| package org.prismlauncher.legacy.fix.online; | ||
|
|
||
| import java.io.IOException; | ||
| import java.net.MalformedURLException; | ||
| import java.net.Proxy; | ||
| import java.net.URL; | ||
| import java.net.URLConnection; | ||
|
|
||
| import org.prismlauncher.legacy.utils.url.UrlUtils; | ||
|
|
||
| public final class OnlineModeFix { | ||
| public static URLConnection openConnection(URL address, Proxy proxy) throws IOException { | ||
| // we start with "http://www.minecraft.net/game/joinserver.jsp?user=..." | ||
| if (!(address.getHost().equals("www.minecraft.net") && address.getPath().equals("/game/joinserver.jsp"))) | ||
| return null; | ||
|
|
||
| // change it to "https://session.minecraft.net/game/joinserver.jsp?user=..." | ||
| // this seems to be the modern version of the same endpoint... | ||
| // maybe Mojang planned to patch old versions of the game to use it | ||
| // if it ever disappears this should be changed to use sessionserver.mojang.com/session/minecraft/join | ||
| // which of course has a different usage requiring JSON serialisation... | ||
| URL url; | ||
| try { | ||
| url = new URL("https", "session.minecraft.net", address.getPort(), address.getFile()); | ||
| } catch (MalformedURLException e) { | ||
| throw new AssertionError("url should be valid", e); | ||
| } | ||
|
|
||
| return UrlUtils.openConnection(url, proxy); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
38 changes: 38 additions & 0 deletions
38
libraries/launcher/org/prismlauncher/SystemProperties.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| package org.prismlauncher; | ||
|
|
||
| import org.prismlauncher.utils.Parameters; | ||
|
|
||
| public final class SystemProperties { | ||
| public static void apply(Parameters params) { | ||
| String launcherBrand = params.getString("launcherBrand", null); | ||
| String launcherVersion = params.getString("launcherVersion", null); | ||
| String name = params.getString("instanceName", null); | ||
| String iconId = params.getString("instanceIconKey", null); | ||
| String iconPath = params.getString("instanceIconPath", null); | ||
| String windowTitle = params.getString("windowTitle", null); | ||
| String windowDimensions = params.getString("windowParams", null); | ||
|
|
||
| if (launcherBrand != null) | ||
| System.setProperty("minecraft.launcher.brand", launcherBrand); | ||
| if (launcherVersion != null) | ||
| System.setProperty("minecraft.launcher.version", launcherVersion); | ||
|
|
||
| // set useful properties for mods | ||
| if (name != null) | ||
| System.setProperty("org.prismlauncher.instance.name", name); | ||
| if (iconId != null) | ||
| System.setProperty("org.prismlauncher.instance.icon.id", iconId); | ||
| if (iconPath != null) | ||
| System.setProperty("org.prismlauncher.instance.icon.path", iconPath); | ||
| if (windowTitle != null) | ||
| System.setProperty("org.prismlauncher.window.title", windowTitle); | ||
| if (windowDimensions != null) | ||
| System.setProperty("org.prismlauncher.window.dimensions", windowDimensions); | ||
|
|
||
| // set multimc properties for compatibility | ||
| if (name != null) | ||
| System.setProperty("multimc.instance.title", name); | ||
| if (iconId != null) | ||
| System.setProperty("multimc.instance.icon", iconId); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters