From b3da767d00a55287b77668faf642b2fe24ef40f6 Mon Sep 17 00:00:00 2001
From: cflip <cflip@cflip.net>
Date: Thu, 24 Aug 2023 20:30:32 -0600
Subject: Set correct proxy port depending on the version

---
 src/net/minecraft/GameVersion.java |  5 +++--
 src/net/minecraft/Launcher.java    | 11 ++++++++---
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/net/minecraft/GameVersion.java b/src/net/minecraft/GameVersion.java
index 7698b5d..9de8f4d 100644
--- a/src/net/minecraft/GameVersion.java
+++ b/src/net/minecraft/GameVersion.java
@@ -16,7 +16,7 @@ public class GameVersion {
 	public Instant releasedOn;
 
 	public URL gameJarUrl;
-	public String proxyArgs;
+	public int proxyPort;
 
 	private boolean infoDownloaded = false;
 
@@ -44,7 +44,8 @@ public class GameVersion {
 					gameJarUrl = new URL(value);
 					break;
 				case "proxy-args":
-					proxyArgs = value;
+					int portIndex = value.indexOf("http.proxyPort=") + "http.proxyPort=".length();
+					proxyPort = Integer.parseInt(value.substring(portIndex));
 					break;
 			}
 		}
diff --git a/src/net/minecraft/Launcher.java b/src/net/minecraft/Launcher.java
index f3eed56..1ece117 100644
--- a/src/net/minecraft/Launcher.java
+++ b/src/net/minecraft/Launcher.java
@@ -24,6 +24,8 @@ public class Launcher extends Applet implements Runnable, AppletStub {
 
 	private VolatileImage img;
 
+	private VersionManager versionManager;
+	private GameVersion latestVersion;
 
 	public boolean isActive() {
 		if (this.context == 0) {
@@ -51,8 +53,11 @@ public class Launcher extends Applet implements Runnable, AppletStub {
 
 		Calendar calendar = Calendar.getInstance();
 		calendar.set(Calendar.YEAR, 2010);
-		VersionManager versionManager = new VersionManager();
-		this.gameUpdater = new GameUpdater(versionManager.getVersionForInstant(calendar.toInstant()));
+
+		this.versionManager = new VersionManager();
+		this.latestVersion = versionManager.getVersionForInstant(calendar.toInstant());
+
+		this.gameUpdater = new GameUpdater(this.latestVersion);
 	}
 
 	public boolean canPlayOffline() {
@@ -80,7 +85,7 @@ public class Launcher extends Applet implements Runnable, AppletStub {
 				try {
 					if (!Launcher.this.gameUpdater.fatalError) {
 						System.setProperty("http.proxyHost", "betacraft.uk");
-						System.setProperty("http.proxyPort", "11702");
+						System.setProperty("http.proxyPort", String.valueOf(latestVersion.proxyPort));
 						Launcher.this.replace(Launcher.this.gameUpdater.createApplet());
 					}
 				} catch (ClassNotFoundException e) {
-- 
cgit v1.2.3