Updated Fabric Installer to 0.11.2

build.gradle

@@ -9,8 +9,8 @@ plugins {
 }
 
 sourceCompatibility = 1.8
-version = '0.11.1'
-archivesBaseName = "fabric-installer"
+version = '0.11.2'
+archivesBaseName = "legacy-fabric-installer"
 
 def ENV = System.getenv()
 version = version + (ENV.GITHUB_ACTIONS ? "" : "+local")
@@ -20,12 +20,12 @@ repositories {
 		name = 'Fabric'
 		url = 'https://maven.fabricmc.net/'
 	}
-    mavenCentral()
+	mavenCentral()
 }
 
 def nativeLibVersion = "0.1.3"
 def nativeLibDistributions = [
-		"windows-ARM64", "windows-Win32", "windows-x64", "macos-x86_64_arm64"
+	"windows-ARM64", "windows-Win32", "windows-x64", "macos-x86_64_arm64"
 ]
 
 dependencies {
@@ -55,8 +55,8 @@ checkstyle {
 shadowJar {
 	manifest {
 		attributes 'Implementation-Title': 'LegacyFabricInstaller',
-				'Implementation-Version': project.version,
-				'Main-Class': 'net.fabricmc.installer.Main'
+			'Implementation-Version': project.version,
+			'Main-Class': 'net.fabricmc.installer.Main'
 	}
 
 	minimize()
@@ -67,8 +67,8 @@ shadowJar {
 task serverJar(type: com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar) {
 	manifest {
 		attributes 'Implementation-Title': 'LegacyFabricInstaller',
-				'Implementation-Version': project.version,
-				'Main-Class': 'net.fabricmc.installer.ServerLauncher'
+			'Implementation-Version': project.version,
+			'Main-Class': 'net.fabricmc.installer.ServerLauncher'
 	}
 
 	minimize()

gradle.properties

@@ -1 +1 @@
-group = net.legacyfabric
+group = net.legacyfabric

settings.gradle

@@ -9,5 +9,5 @@ pluginManagement {
 	}
 }
 
-rootProject.name = 'fabric-installer'
+rootProject.name = 'legacy-fabric-installer'
 

src/main/java/net/fabricmc/installer/Handler.java

@@ -215,7 +215,7 @@ protected String buildEditorPaneStyle() {
 		return String.format(Locale.ENGLISH,
 				"font-family:%s;font-weight:%s;font-size:%dpt;background-color: rgb(%d,%d,%d);",
 				font.getFamily(), (font.isBold() ? "bold" : "normal"), font.getSize(), color.getRed(), color.getGreen(), color.getBlue()
-		);
+				);
 	}
 
 	@Override

src/main/java/net/fabricmc/installer/InstallerGui.java

@@ -16,9 +16,9 @@
 
 package net.fabricmc.installer;
 
+import java.awt.Toolkit;
 import java.awt.Color;
 import java.awt.Dimension;
-import java.awt.Toolkit;
 import java.io.File;
 import java.io.IOException;
 import java.util.Locale;

src/main/java/net/fabricmc/installer/Main.java

@@ -41,7 +41,7 @@ public static void main(String[] args) throws IOException {
 			System.setProperty("javax.net.ssl.trustStoreType", "WINDOWS-ROOT");
 		}
 
-		System.out.println("Loading LegacyFabric Installer: " + Main.class.getPackage().getImplementationVersion());
+		System.out.println("Loading Legacy Fabric Installer: " + Main.class.getPackage().getImplementationVersion());
 
 		HANDLERS.add(new ClientHandler());
 		HANDLERS.add(new ServerHandler());

src/main/java/net/fabricmc/installer/ServerLauncher.java

@@ -53,7 +53,7 @@ public static void main(String[] args) throws Throwable {
 		try {
 			launchData = initialise();
 		} catch (IOException e) {
-			throw new RuntimeException("Failed to setup fabric server", e);
+			throw new RuntimeException("Failed to setup legacy fabric server", e);
 		}
 
 		Objects.requireNonNull(launchData, "launchData is null, cannot proceed");
@@ -91,11 +91,18 @@ private static LaunchData initialise() throws IOException {
 		Path dataDir = baseDir.resolve(DATA_DIR);
 
 		// Vanilla server jar
-		Path serverJar = dataDir.resolve(String.format("%s-server.jar", gameVersion));
+		String customServerJar = System.getProperty("fabric.installer.server.gameJar", null);
+		Path serverJar = customServerJar == null ? dataDir.resolve(String.format("%s-server.jar", gameVersion)) : Paths.get(customServerJar);
 		// Includes the mc version as this jar contains intermediary
 		Path serverLaunchJar = dataDir.resolve(String.format("fabric-loader-server-%s-minecraft-%s.jar", loaderVersion.name, gameVersion));
 
-		if (Files.exists(serverJar) && Files.exists(serverLaunchJar)) { // install exists, verify libs exist and determine main class
+		if (!Files.exists(serverJar)) {
+			InstallerProgress.CONSOLE.updateProgress(Utils.BUNDLE.getString("progress.download.minecraft"));
+			MinecraftServerDownloader downloader = new MinecraftServerDownloader(gameVersion);
+			downloader.downloadMinecraftServer(serverJar);
+		}
+
+		if (Files.exists(serverLaunchJar)) { // install exists, verify libs exist and determine main class
 			try {
 				List<Path> classPath = new ArrayList<>();
 				String mainClass = readManifest(serverLaunchJar, classPath);
@@ -123,10 +130,6 @@ private static LaunchData initialise() throws IOException {
 		Files.createDirectories(dataDir);
 		ServerInstaller.install(baseDir, loaderVersion, gameVersion, InstallerProgress.CONSOLE, serverLaunchJar);
 
-		InstallerProgress.CONSOLE.updateProgress(Utils.BUNDLE.getString("progress.download.minecraft"));
-		MinecraftServerDownloader downloader = new MinecraftServerDownloader(gameVersion);
-		downloader.downloadMinecraftServer(serverJar);
-
 		String mainClass = readManifest(serverLaunchJar, null);
 
 		return new LaunchData(serverJar, serverLaunchJar, mainClass);

src/main/java/net/fabricmc/installer/client/ClientHandler.java

@@ -117,7 +117,7 @@ private void doInstall() {
 	}
 
 	private void showInstalledMessage(String loaderVersion, String gameVersion) {
-		JEditorPane pane = new JEditorPane("text/html", "<html><body style=\"" + buildEditorPaneStyle() + "\">" + new MessageFormat(Utils.BUNDLE.getString("prompt.install.successful")).format(new Object[]{loaderVersion, gameVersion, Reference.FABRIC_API_URL}) + "</body></html>");
+		JEditorPane pane = new JEditorPane("text/html", "<html><body style=\"" + buildEditorPaneStyle() + "\">" + new MessageFormat(Utils.BUNDLE.getString("prompt.install.successful")).format(new Object[]{loaderVersion, gameVersion, Reference.LEGACY_FABRIC_API_URL}) + "</body></html>");
 		pane.setEditable(false);
 
 		pane.addHyperlinkListener(e -> {
@@ -148,7 +148,7 @@ private ProfileInstaller.LauncherType showLauncherTypeSelection() {
 				null,
 				options,
 				options[0]
-		);
+				);
 
 		if (result == JOptionPane.CLOSED_OPTION) {
 			return null;

src/main/java/net/fabricmc/installer/server/ServerHandler.java

@@ -16,29 +16,20 @@
 
 package net.fabricmc.installer.server;
 
-import java.awt.Cursor;
-import java.awt.Desktop;
 import java.awt.GridBagConstraints;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
 import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.net.URI;
-import java.net.URISyntaxException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.text.MessageFormat;
 
-import javax.swing.JLabel;
 import javax.swing.JPanel;
 
 import net.fabricmc.installer.Handler;
 import net.fabricmc.installer.InstallerGui;
 import net.fabricmc.installer.LoaderVersion;
 import net.fabricmc.installer.util.ArgumentParser;
 import net.fabricmc.installer.util.InstallerProgress;
-import net.fabricmc.installer.util.Reference;
 import net.fabricmc.installer.util.Utils;
 
 public class ServerHandler extends Handler {
@@ -93,28 +84,6 @@ public String cliHelp() {
 		return "-dir <install dir, default current dir> -mcversion <minecraft version, default latest> -loader <loader version, default latest> -downloadMinecraft";
 	}
 
-	@Override
-	public void setupPane1(JPanel pane, GridBagConstraints c, InstallerGui installerGui) {
-		if (!Desktop.isDesktopSupported() || !Desktop.getDesktop().isSupported(Desktop.Action.BROWSE)) {
-			return;
-		}
-
-		JLabel label = new JLabel(String.format("<html><a href=\"\">%s</a></html>", Utils.BUNDLE.getString("prompt.server.launcher")));
-		label.setCursor(new Cursor(Cursor.HAND_CURSOR));
-		label.addMouseListener(new MouseAdapter() {
-			@Override
-			public void mouseClicked(MouseEvent e) {
-				try {
-					Desktop.getDesktop().browse(new URI(Reference.SERVER_LAUNCHER_URL));
-				} catch (IOException | URISyntaxException ex) {
-					ex.printStackTrace();
-				}
-			}
-		});
-
-		addRow(pane, c, null, label);
-	}
-
 	@Override
 	public void setupPane2(JPanel pane, GridBagConstraints c, InstallerGui installerGui) {
 		installLocation.setText(Paths.get(".").toAbsolutePath().normalize().toString());

src/main/java/net/fabricmc/installer/server/ServerInstaller.java

@@ -53,6 +53,7 @@
 import net.fabricmc.installer.util.FabricService;
 import net.fabricmc.installer.util.InstallerProgress;
 import net.fabricmc.installer.util.Library;
+import net.fabricmc.installer.util.Reference;
 import net.fabricmc.installer.util.Utils;
 
 public class ServerInstaller {
@@ -88,8 +89,8 @@ public static void install(Path dir, LoaderVersion loaderVersion, String gameVer
 
 			mainClassMeta = json.at("mainClass").asString();
 		} else { // loader jar available, generate library list from it
-			libraries.add(new Library(String.format("net.fabricmc:fabric-loader:%s", loaderVersion.name), "https://maven.fabricmc.net/", loaderVersion.path));
-			libraries.add(new Library(String.format("net.fabricmc:intermediary:%s", gameVersion), "https://maven.legacyfabric.net/", null));
+			libraries.add(new Library(String.format("net.fabricmc:fabric-loader:%s", loaderVersion.name), Reference.FABRIC_MAVEN, loaderVersion.path));
+			libraries.add(new Library(String.format("net.fabricmc:intermediary:%s", gameVersion), Reference.LEGACY_FABRIC_MAVEN, null));
 
 			try (ZipFile zf = new ZipFile(loaderVersion.path.toFile())) {
 				ZipEntry entry = zf.getEntry("fabric-installer.json");
@@ -139,7 +140,7 @@ public static void install(Path dir, LoaderVersion loaderVersion, String gameVer
 	}
 
 	private static void makeLaunchJar(Path file, String launchMainClass, String jarMainClass, List<Path> libraryFiles,
-										boolean shadeLibraries, InstallerProgress progress) throws IOException {
+			boolean shadeLibraries, InstallerProgress progress) throws IOException {
 		Files.deleteIfExists(file);
 
 		try (ZipOutputStream zipOutputStream = new ZipOutputStream(Files.newOutputStream(file))) {

src/main/java/net/fabricmc/installer/util/LauncherMeta.java

@@ -37,7 +37,7 @@ public static LauncherMeta getLauncherMeta() throws IOException {
 	private static LauncherMeta load() throws IOException {
 		List<Version> versions = new ArrayList<>();
 		versions.addAll(getVersionsFromUrl(Reference.MINECRAFT_LAUNCHER_MANIFEST));
-		versions.addAll(getVersionsFromUrl(Reference.OLD_SNAPSHOTS));
+		versions.addAll(getVersionsFromUrl(Reference.OLD_SNAPSHOTS_MANIFEST));
 
 		return new LauncherMeta(versions);
 	}

src/main/java/net/fabricmc/installer/util/Reference.java

@@ -18,17 +18,15 @@
 
 public class Reference {
 	public static final String LOADER_NAME = "fabric-loader";
-
-	public static final String FABRIC_API_URL = "https://github.com/Legacy-Fabric/fabric/releases/";
-	public static final String SERVER_LAUNCHER_URL = "https://fabricmc.net/use/server/";
+	public static final String LEGACY_FABRIC_API_URL = "https://github.com/Legacy-Fabric/fabric/releases/";
 	public static final String MINECRAFT_LAUNCHER_MANIFEST = "https://piston-meta.mojang.com/mc/game/version_manifest_v2.json";
-	public static final String OLD_SNAPSHOTS = "https://raw.githubusercontent.com/Legacy-Fabric/manifests/master/manifest.json";
-
-	static final String DEFAULT_META_SERVER = "https://meta.legacyfabric.net/";
-	static final String DEFAULT_MAVEN_SERVER = "https://maven.legacyfabric.net/";
+	public static final String OLD_SNAPSHOTS_MANIFEST = "https://raw.githubusercontent.com/Legacy-Fabric/manifests/master/manifest.json";
+	public static final String LEGACY_FABRIC_META = "https://meta.legacyfabric.net/";
+	public static final String FABRIC_MAVEN = "https://maven.fabricmc.net/";
+	public static final String LEGACY_FABRIC_MAVEN = "https://maven.legacyfabric.net/";
 
 	static final FabricService[] FABRIC_SERVICES = {
-			new FabricService(DEFAULT_META_SERVER, DEFAULT_MAVEN_SERVER)//,
+			new FabricService(LEGACY_FABRIC_META, LEGACY_FABRIC_MAVEN)//,
 			// Do not use these fallback servers to interact with our web services. They can and will be unavailable at times and only support limited throughput.
 //			new FabricService("https://meta2.fabricmc.net/", "https://maven2.fabricmc.net/"),
 //			new FabricService("https://meta3.fabricmc.net/", "https://maven3.fabricmc.net/")

src/main/resources/lang/installer.properties

@@ -37,8 +37,7 @@ prompt.server.jar.invalid=No valid {0} server jar found
 prompt.server.downloading=Downloading {0}/{1} MB
 prompt.server.generate=Generate
 prompt.server.overwrite=Are you sure you want to override the existing launch scripts?
-prompt.server.launcher=Click here to use the standalone server launcher for an easier setup
 prompt.install.successful.title=Successfully Installed
-prompt.install.successful=Fabric Loader {0} for {1} has been successfully installed.<br>Many mods also require you to put <a href="{2}">Fabric API</a> into the mods folder.
+prompt.install.successful=Fabric Loader {0} for {1} has been successfully installed.<br>Many mods also require you to put <a href="{2}">Legacy Fabric API</a> into the mods folder.
 tab.client=Client
 tab.server=Server

src/main/resources/lang/installer_ar_AR.properties

@@ -33,6 +33,6 @@ prompt.server.jar.invalid={0} لم يتم العثور على ملف الخاد
 prompt.server.generate=إنشاء
 prompt.server.overwrite=هل أنت متأكد من أنك تريد تجاهل سكريبت التشغيل الحالية؟
 prompt.install.successful.title=تم التثبيث بنجاح
-prompt.install.successful=محمل فابريك {0} ل {1} تم تثبيثه بنجاح<br>الكثير من المودات تجبر وضع <a href="{2}">Fabric API</a> في مجلد المودات.
+prompt.install.successful=محمل فابريك {0} ل {1} تم تثبيثه بنجاح<br>الكثير من المودات تجبر وضع <a href="{2}">Legacy Fabric API</a> في مجلد المودات.
 tab.client=العميل
 tab.server=الخادم

src/main/resources/lang/installer_ar_Ar.properties

@@ -23,7 +23,7 @@ prompt.launcher.open.body=ماينكرافت لونشر يستعمل حاليا
 prompt.launcher.open.tile=ماينكرافت لونشر يستعمل حاليا
 prompt.game.version=:نسخة اللعبة
 prompt.ready.install=جاهز للتثبيث
-prompt.select.location=حدد مكان التثبيث
+prompt.select.location=:حدد مكان التثبيث
 prompt.server.info.jar=الملف الرسمي للخادم الرسمي إجباري
 prompt.server.info.command=إستعمل هذه التعليمة لتشغيل الخادم
 prompt.server.info.scipt=أو انتج سكريبت التشغيل
@@ -33,6 +33,6 @@ prompt.server.jar.invalid={0} لم يتم العثور على ملف الخاد
 prompt.server.generate=إنشاء
 prompt.server.overwrite=هل أنت متأكد من أنك تريد تجاهل سكريبت التشغيل الحالية؟
 prompt.install.successful.title=تم التثبيث بنجاح
-prompt.install.successful=محمل فابريك {0} ل {1} تم تثبيثه بنجاح<br>الكثير من المودات تجبر وضع <a href="{2}">Fabric API</a> في مجلد المودات.
+prompt.install.successful=محمل فابريك {0} ل {1} تم تثبيثه بنجاح<br>الكثير من المودات تجبر وضع <a href="{2}">Legacy Fabric API</a> في مجلد المودات.
 tab.client=العميل
 tab.server=الخادم

src/main/resources/lang/installer_es_ES.properties

@@ -33,6 +33,6 @@ prompt.server.jar.invalid=No se encontró un JAR del servidor de la {0} válido
 prompt.server.generate=Generar
 prompt.server.overwrite=¿Estás seguro que quieres sobreescribir los scripts de lanzamiento existentes?
 prompt.install.successful.title=Instalado Correctamente
-prompt.install.successful=Fabric Loader {0} para {1} ha sido instalado correctamente.<br>Muchos mods también necesitan que descargues <a href="{2}">Fabric API</a> en tu carpeta de mods.
+prompt.install.successful=Fabric Loader {0} para {1} ha sido instalado correctamente.<br>Muchos mods también necesitan que descargues <a href="{2}">Legacy Fabric API</a> en tu carpeta de mods.
 tab.client=Cliente
 tab.server=Servidor

src/main/resources/lang/installer_et_EE.properties

@@ -37,8 +37,7 @@ prompt.server.jar.invalid=Sobivat {0} serveri JARi ei leitud
 prompt.server.downloading=Allalaadimine {0}/{1} MB
 prompt.server.generate=Genereeri
 prompt.server.overwrite=Kas soovid kindlasti olemasolevad käivitusskriptid üle kirjutada?
-prompt.server.launcher=Klõpsa siia, et kasutada lihtsamaks seadistuseks eraldiseisvat serverikäivitajat
 prompt.install.successful.title=Edukalt paigaldatud
-prompt.install.successful=Fabric Loader {0} versioonile {1} on edukalt paigaldatud.<br>Mitmed modid eeldavad ka <a href="{2}">Fabric API</a> asetamist mods kausta.
+prompt.install.successful=Fabric Loader {0} versioonile {1} on edukalt paigaldatud.<br>Mitmed modid eeldavad ka <a href="{2}">Legacy Fabric API</a> asetamist mods kausta.
 tab.client=Klient
 tab.server=Server

src/main/resources/lang/installer_fi_FI.properties

@@ -34,6 +34,6 @@ prompt.server.downloading=Ladataan {0}/{1} Mt
 prompt.server.generate=Generoi
 prompt.server.overwrite=Haluatko varmasti korvata olemassaolevat käynnistinskriptit?
 prompt.install.successful.title=Asennus onnistui
-prompt.install.successful=Fabric Loader {0} versiolle {1} asennettiin onnistuneesti.<br>Monet modit vaativat myös <a href="{2}">Fabric API:n</a> lataamisen mods-kansioon.
+prompt.install.successful=Fabric Loader {0} versiolle {1} asennettiin onnistuneesti.<br>Monet modit vaativat myös <a href="{2}">Legacy Fabric API:n</a> lataamisen mods-kansioon.
 tab.client=Asiakasohjelma
 tab.server=Palvelin

src/main/resources/lang/installer_fr_FR.properties

@@ -31,6 +31,6 @@ prompt.server.jar.invalid=Aucun fichier jar serveur {0} valide trouvé
 prompt.server.generate=Générer
 prompt.server.overwrite=Voulez-vous vraiment remplacer les scripts de lancement existants?
 prompt.install.successful.title=Installé avec succès
-prompt.install.successful=Fabric Loader {0} pour la version {1} a été installé avec succès. <br> De nombreux mods vous demanderons également de placer <a href="{2}">Fabric API</a> dans le dossier mods.
+prompt.install.successful=Fabric Loader {0} pour la version {1} a été installé avec succès. <br> De nombreux mods vous demanderons également de placer <a href="{2}">Legacy Fabric API</a> dans le dossier mods.
 tab.client=Client
 tab.server=Serveur

src/main/resources/lang/installer_ja_JP.properties

@@ -37,6 +37,6 @@ prompt.server.jar.invalid=無効な {0} サーバー JAR が見つかりまし
 prompt.server.generate=生成
 prompt.server.overwrite=既存の起動スクリプトを上書きしてもよろしいですか？
 prompt.install.successful.title=正常にインストールされました
-prompt.install.successful={1}用のFabric ローダー {0} が正常にインストールされました。<br>多くのmodを使用する場合には、<a href="{2}">Fabric API</a> をmodsフォルダーに入れる必要があります。
+prompt.install.successful={1}用のFabric ローダー {0} が正常にインストールされました。<br>多くのmodを使用する場合には、<a href="{2}">Legacy Fabric API</a> をmodsフォルダーに入れる必要があります。
 tab.client=クライアント
 tab.server=サーバー

src/main/resources/lang/installer_pl_PL.properties

@@ -31,6 +31,6 @@ prompt.server.jar.invalid=Poprawny plik jar serwera {0} nie został znaleziony
 prompt.server.generate=Generuj
 prompt.server.overwrite=Czy na pewno chcesz nadpisać istniejące skrypty uruchamiające?
 prompt.install.successful.title=Pomyślnie zainstalowano
-prompt.install.successful=Loader Fabric {0} dla {1} został pomyślnie zainstalowany.<br>Wiele modów wymaga także umieszczenia <a href="{2}">Fabric API</a> w folderze modów.
+prompt.install.successful=Loader Fabric {0} dla {1} został pomyślnie zainstalowany.<br>Wiele modów wymaga także umieszczenia <a href="{2}">Legacy Fabric API</a> w folderze modów.
 tab.client=Klient
 tab.server=Serwer

src/main/resources/lang/installer_pt_BR.properties

@@ -38,6 +38,6 @@ prompt.server.downloading=Baixando {0}/{1} MB
 prompt.server.generate=Gerar
 prompt.server.overwrite=Deseja mesmo sobrescrever os scripts de inicialização atuais?
 prompt.install.successful.title=Instalação com êxito
-prompt.install.successful=O Fabric Loader {0} para {1} foi instalado com êxito.<br>Muitos mods exigem o <a href="{2}">Fabric API</a> na pasta de mods.
+prompt.install.successful=O Fabric Loader {0} para {1} foi instalado com êxito.<br>Muitos mods exigem o <a href="{2}">Legacy Fabric API</a> na pasta de mods.
 tab.client=Cliente
 tab.server=Servidor