Bump version number

Co-authored-by: Gent Semaj <gentsemaj@live.com>

.editorconfig

@@ -0,0 +1,19 @@
+# top-most EditorConfig file
+root = true
+
+# Unix-style newlines with a newline ending every file
+[*]
+end_of_line = lf
+insert_final_newline = true
+
+# 4 space indentation
+[*.js, *.css, *.html, *.json]
+indent_style = space
+indent_size = 4
+
+# Don't enforce anything in vendored code
+[*.min.*]
+end_of_line = unset
+insert_final_newline = unset
+indent_style = unset
+indent_style = unset

.gitattributes

@@ -3,3 +3,6 @@
 *.js    text eol=lf
 *.json  text eol=lf
 *.md    text eol=lf
+
+defaults/* linguist-vendored
+lib/* linguist-vendored

.github/workflows/build.yml

@@ -0,0 +1,47 @@
+name: Publish Build
+
+on:
+    push:
+        branches: ["main"]
+        tags: "*"
+
+permissions:
+    contents: write
+
+jobs:
+    build:
+        runs-on: windows-2022
+
+        steps:
+            - uses: actions/checkout@v4
+              with:
+                  fetch-depth: 0
+            - name: Set up Node.js 20.x
+              uses: actions/setup-node@v4
+              with:
+                  node-version: 20.x
+                  cache: "npm"
+            - name: Install dependencies
+              run: npm install
+            - name: Pack into zip and create installer
+              run: npm run dist
+            - name: Upload Artifacts
+              uses: actions/upload-artifact@master
+              with:
+                  path: dist
+
+    publish-release:
+        if: contains(github.ref, 'refs/tags/')
+        runs-on: ubuntu-latest
+        needs: build
+
+        steps:
+            - name: Download artifact
+              uses: actions/download-artifact@master
+            - name: Create release
+              uses: ncipollo/release-action@v1
+              with:
+                  artifacts: "artifact/*-ia32-win.zip,artifact/*.exe"
+              env:
+                  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+                  GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.gitignore

@@ -8,4 +8,8 @@ version
 resources/app/files/rankurl.txt
 node_modules/
 dist/
-UnityBugReporter.exe
+UnityBugReporter.exe
+cache_handler/*/
+extra/
+*.sh
+yarn.lock

.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+    "editor.formatOnSave": true
+}

LICENSE.md

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2020-2022 OpenFusion Contributors
+Copyright (c) 2020-2024 OpenFusion Contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -1,3 +1,52 @@
 # OpenFusionClient
 
-Electron app for joining OpenFusion servers
+[![Current Release](https://img.shields.io/github/v/release/OpenFusionProject/OpenFusionClient?include_prereleases)](https://github.com/OpenFusionProject/OpenFusionClient/releases/latest) [![Discord](https://img.shields.io/badge/chat-on%20discord-7289da.svg?logo=discord)](https://discord.gg/DYavckB)[![License](https://img.shields.io/github/license/OpenFusionProject/OpenFusionClient)](https://github.com/OpenFusionProject/OpenFusionClient/blob/master/LICENSE.md)
+
+An Electron app that allows you to easily join FusionFall servers.
+
+It automatically installs FF's custom build of Unity Web Player, manages text files such as `assetInfo.php`/`loginInfo.php`, and embeds the game, all in a few clicks!
+
+For an overview of how the game client worked originally, please see [this section in the OpenFusion README](https://github.com/OpenFusionProject/OpenFusion#architecture).
+
+## Disclaimer
+
+This repository does not contain any code from the actual FusionFall game client. **Think of it more as a launcher:** it abstracts away having to use a NPAPI plugin capable web browser, along with having to host a HTTP server for it to connect to.
+
+In addition, if you are interested in contributing: do note that **this project likely cannot utilize more modern Javascript techniques**. In order to use NPAPI plugins, a very old version of Electron was needed (0.31.0). This limits the project to only a portion of ES5 in non-strict mode, and a reduced subset of Node/Electron APIs.
+
+## Usage
+
+Provided that you have npm installed, clone the repository, then run install like so:
+
+```
+git clone https://github.com/OpenFusionProject/OpenFusionClient.git
+npm install
+```
+
+After that has completed you can then test OpenFusionClient:
+
+```
+npm run start
+```
+
+If you would like to package it as a standalone win32 application:
+
+```
+npm run pack
+```
+
+You can then compress the application directory into a zip file and installer for distribution:
+
+```
+npm run dist
+```
+
+Before opening a PR or running pack/dist, please do a code formatting pass:
+
+```
+npm run prettier
+```
+
+## License
+
+MIT unless specified otherwise

assets/css/openfusion.css

@@ -47,6 +47,11 @@ img {
 }
 
 body {
+    width: 100%;
+    height: 100%;
+    margin: 0;
+    padding: 0;
+    clear: both;
     user-select: none;
     background-color: #000;
     font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto,
@@ -54,12 +59,24 @@ body {
         "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
 }
 
-#of-versionnumber {
+#of-about-button-div {
     position: fixed;
     bottom: 4px;
     right: 8px;
 }
 
+#of-about-flash-div {
+    position: fixed;
+    bottom: 4px;
+    right: 8px;
+}
+
+#of-config-button-div {
+    position: fixed;
+    bottom: 4px;
+    left: 8px;
+}
+
 .btn-primary {
     background-image: url("../../assets/img/btn-primary-bg.png");
     background-repeat: repeat;
@@ -75,6 +92,23 @@ body {
     background-repeat: repeat;
 }
 
+.btn-warning {
+    background-image: url("../../assets/img/btn-warning-bg.png");
+    background-repeat: repeat;
+}
+
+.form-check-input {
+    width: 25px;
+    height: 25px;
+}
+
+.form-check-label {
+    height: 25px;
+    margin-top: 5px;
+    margin-left: 10px;
+    font-size: 1rem;
+}
+
 #of-aboutmodal > .modal-dialog > .modal-content {
     background-color: #093363;
     border-color: #6699ff;
@@ -100,6 +134,36 @@ body {
     border-color: #6699ff;
 }
 
+#of-editcacheconfigmodal > .modal-dialog > .modal-content {
+    background-color: #093363;
+    border-color: #6699ff;
+}
+
+#of-editconfigmodal > .modal-dialog > .modal-content {
+    background-color: #093363;
+    border-color: #6699ff;
+}
+
+#of-addversionmodal > .modal-dialog > .modal-content {
+    background-color: #093363;
+    border-color: #6699ff;
+}
+
+#of-editversionmodal > .modal-dialog > .modal-content {
+    background-color: #093363;
+    border-color: #6699ff;
+}
+
+#of-deleteversionmodal > .modal-dialog > .modal-content {
+    background-color: #093363;
+    border-color: #6699ff;
+}
+
+#of-restoreversionsmodal > .modal-dialog > .modal-content {
+    background-color: #093363;
+    border-color: #6699ff;
+}
+
 .form-control,
 .form-control:focus {
     border-color: #0099ff;
@@ -113,6 +177,14 @@ select {
     color: #fff;
 }
 
+.modal {
+    overflow-y: auto;
+}
+
+.invalidinput {
+    border-color: #ff0000;
+}
+
 button:disabled {
     cursor: not-allowed;
     pointer-events: all !important;
@@ -129,3 +201,28 @@ button > i {
 #server-table .server-listing-entry {
     cursor: pointer;
 }
+
+#client {
+    width: 100%;
+    height: 100%;
+    margin: 0;
+    padding: 0;
+    background: #000;
+    clear: both;
+}
+
+@keyframes pulse {
+    0% {
+        opacity: 1;
+    }
+    50% {
+        opacity: 0;
+    }
+    100% {
+        opacity: 1;
+    }
+}
+
+.pulsing {
+    animation: pulse 2s infinite;
+}

assets/js/easter-eggs.js

@@ -1,10 +1,8 @@
 // You're kind of ruining the surprise by reading this, but whatever
 var today = new Date();
 
-// Check Christmas season: Date constructor in Javascript uses an index
-// so 11 is Dec. of this year, and 12 is Jan. of the next
-var christmasBegin = new Date(today.getFullYear(), 11, 23);
-var christmasEnd = new Date(today.getFullYear(), 12, 8);
+var christmasBegin = new Date(today.getFullYear(), 11, 21);
+var christmasEnd = new Date(today.getFullYear(), 11, 31);
 var sf;
 
 if (today >= christmasBegin && today <= christmasEnd) {

assets/js/game-client.js

@@ -5,7 +5,7 @@ var gameRunning = false;
 
 // Uncomment and enter credentials to skip login screen
 function authDoCallback(param) {
-    /*var unity = document.getElementById('Unity_embed');
+    /*var unity = document.getElementById('unityEmbed');
   unity.SendMessage("GlobalManager", "SetTEGid", "player");
   unity.SendMessage("GlobalManager", "SetAuthid", "0");
   unity.SendMessage("GlobalManager", "DoAuth", 0);*/
@@ -33,7 +33,7 @@ function PayPage(param) {
 
 function onResize() {
     if (gameRunning == true) {
-        var unity = document.getElementById("Unity_embed");
+        var unity = document.getElementById("unityEmbed");
         unity.style.width = window.innerWidth + "px";
         unity.style.height = window.innerHeight + "px";
     }
@@ -56,38 +56,29 @@ function launchGame() {
         "codebase",
         "undefined/UnityWebPlayer.cab#version=2,0,0,0"
     );
-    object.setAttribute("id", "Unity_object");
+    object.setAttribute("id", "unityObject");
     object.setAttribute("width", "1264");
     object.setAttribute("height", "661");
 
     var embed = document.createElement("embed");
-    embed.setAttribute("type", "application/vnd.unity");
+    embed.setAttribute("type", "application/vnd.ffuwp");
     embed.setAttribute(
         "pluginspage",
         "http://www.unity3d.com/unity-web-player-2.x"
     );
-    embed.setAttribute("id", "Unity_embed");
+    embed.setAttribute("id", "unityEmbed");
     embed.setAttribute("width", "1280");
     embed.setAttribute("height", "680");
-    embed.setAttribute("src", window.asseturl + "main.unity3d");
-    embed.setAttribute("disablecontdparaextmenu", "true");
+    embed.setAttribute("src", window.assetUrl + "main.unity3d");
     embed.setAttribute("bordercolor", "000000");
     embed.setAttribute("backgroundcolor", "000000");
     embed.setAttribute("disableContextMenu", true);
     embed.setAttribute("textcolor", "ccffff");
-    embed.setAttribute("logoimage", "assets/img/unity_dexlabs.png");
-    embed.setAttribute("progressbarimage", "assets/img/unity_loadingbar.png");
+    embed.setAttribute("logoimage", "assets/img/unity-dexlabs.png");
+    embed.setAttribute("progressbarimage", "assets/img/unity-loadingbar.png");
     embed.setAttribute(
         "progressframeimage",
-        "assets/img/unity_loadingframe.png"
-    );
-    embed.setAttribute(
-        "autoupdateurlsignature",
-        "42180ee5edc4e3d4dd706bcc17cedd8d6ec7b7ac463071fd34ab97fe181f1a78df31db5feb4526677e4f69ef53acaff44471591e68b87f041c80fd54765f0d5725b08aa28f5acf7716ffb2a04e971269f35925c7e38d57dd78f6a206530caaa3da7e32f07f19810efc0ebf29a4eae976a925ad9cc5beb4dd51564c67dc489033"
-    );
-    embed.setAttribute(
-        "autoupdateurl",
-        "http://wp-cartoonnetwork.unity3d.com/ff/big/beta-20111013/autodownload_webplugin_beta"
+        "assets/img/unity-loadingframe.png"
     );
 
     var div = document.getElementById("client");

assets/js/serverselector.js

@@ -1,328 +0,0 @@
-var remote = require("remote");
-var remotefs = remote.require("fs-extra");
-var dns = remote.require("dns");
-
-var userdir = remote.require("app").getPath("userData");
-var versionarray;
-var serverarray;
-var config;
-
-function enableServerListButtons() {
-    $("#of-connect-button").removeClass("disabled");
-    $("#of-connect-button").prop("disabled", false);
-    $("#of-editserver-button").removeClass("disabled");
-    $("#of-editserver-button").prop("disabled", false);
-    $("#of-deleteserver-button").removeClass("disabled");
-    $("#of-deleteserver-button").prop("disabled", false);
-}
-
-function disableServerListButtons() {
-    $("#of-connect-button").addClass("disabled");
-    $("#of-connect-button").prop("disabled", true);
-    $("#of-editserver-button").addClass("disabled");
-    $("#of-editserver-button").prop("disabled", true);
-    $("#of-deleteserver-button").addClass("disabled");
-    $("#of-deleteserver-button").prop("disabled", true);
-}
-
-function addServer() {
-    var jsontomodify = JSON.parse(
-        remotefs.readFileSync(userdir + "\\servers.json")
-    );
-
-    var server = {};
-    server["uuid"] = uuidv4();
-    server["description"] =
-        $("#addserver-descinput").val().length == 0
-            ? "My OpenFusion Server"
-            : $("#addserver-descinput").val();
-    server["ip"] =
-        $("#addserver-ipinput").val().length == 0
-            ? "127.0.0.1:23000"
-            : $("#addserver-ipinput").val();
-    server["version"] = $("#addserver-versionselect option:selected").text();
-    //server['endpoint'] =
-
-    jsontomodify["servers"].push(server);
-
-    remotefs.writeFileSync(
-        userdir + "\\servers.json",
-        JSON.stringify(jsontomodify, null, 4)
-    );
-    loadServerList();
-}
-
-function editServer() {
-    var jsontomodify = JSON.parse(
-        remotefs.readFileSync(userdir + "\\servers.json")
-    );
-    $.each(jsontomodify["servers"], function (key, value) {
-        if (value["uuid"] == getSelectedServer()) {
-            value["description"] =
-                $("#editserver-descinput").val().length == 0
-                    ? value["description"]
-                    : $("#editserver-descinput").val();
-            value["ip"] =
-                $("#editserver-ipinput").val().length == 0
-                    ? value["ip"]
-                    : $("#editserver-ipinput").val();
-            value["version"] = $(
-                "#editserver-versionselect option:selected"
-            ).text();
-        }
-    });
-
-    remotefs.writeFileSync(
-        userdir + "\\servers.json",
-        JSON.stringify(jsontomodify, null, 4)
-    );
-    loadServerList();
-}
-
-function deleteServer() {
-    var jsontomodify = JSON.parse(
-        remotefs.readFileSync(userdir + "\\servers.json")
-    );
-    var result = jsontomodify["servers"].filter(function (obj) {
-        return obj.uuid === getSelectedServer();
-    })[0];
-
-    var resultindex = jsontomodify["servers"].indexOf(result);
-
-    jsontomodify["servers"].splice(resultindex, 1);
-
-    remotefs.writeFileSync(
-        userdir + "\\servers.json",
-        JSON.stringify(jsontomodify, null, 4)
-    );
-    loadServerList();
-}
-
-function restoreDefaultServers() {
-    remotefs.copySync(
-        __dirname + "\\defaults\\servers.json",
-        userdir + "\\servers.json"
-    );
-    loadServerList();
-}
-
-function loadGameVersions() {
-    var versionjson = JSON.parse(
-        remotefs.readFileSync(userdir + "\\versions.json")
-    );
-    versionarray = versionjson["versions"];
-    $.each(versionarray, function (key, value) {
-        $(new Option(value.name, "val")).appendTo("#addserver-versionselect");
-        $(new Option(value.name, "val")).appendTo("#editserver-versionselect");
-    });
-}
-
-function loadConfig() {
-    // load config object globally
-    config = JSON.parse(remotefs.readFileSync(userdir + "\\config.json"));
-}
-
-function loadServerList() {
-    var serverjson = JSON.parse(
-        remotefs.readFileSync(userdir + "\\servers.json")
-    );
-    serverarray = serverjson["servers"];
-
-    $(".server-listing-entry").remove(); // Clear out old stuff, if any
-    disableServerListButtons(); // Disable buttons until another server is selected
-
-    if (serverarray.length > 0) {
-        // Servers were found in the JSON
-        $("#server-listing-placeholder").attr("hidden", true);
-        $.each(serverarray, function (key, value) {
-            // Create the row, and populate the cells
-            var row = document.createElement("tr");
-            row.className = "server-listing-entry";
-            row.setAttribute("id", value.uuid);
-            var cellName = document.createElement("td");
-            cellName.textContent = value.description;
-            var cellVersion = document.createElement("td");
-            cellVersion.textContent = value.version;
-            cellVersion.className = "text-monospace";
-
-            row.appendChild(cellName);
-            row.appendChild(cellVersion);
-            $("#server-tablebody").append(row);
-        });
-    } else {
-        // No servers are added, make sure placeholder is visible
-        $("#server-listing-placeholder").attr("hidden", false);
-    }
-}
-
-// For writing loginInfo.php, assetInfo.php, etc.
-function setGameInfo(serverUUID) {
-    var result = serverarray.filter(function (obj) {
-        return obj.uuid === serverUUID;
-    })[0];
-    var gameversion = versionarray.filter(function (obj) {
-        return obj.name === result.version;
-    })[0];
-
-    if (config["cache-swapping"]) {
-        // if cache swapping property exists AND is `true`, run cache swapping logic
-        // Cache folder renaming
-        var cachedir = userdir + "\\..\\..\\LocalLow\\Unity\\Web Player\\Cache";
-        var curversion = cachedir + "\\Fusionfall";
-        var newversion = cachedir + "\\" + gameversion.name;
-        var record = userdir + "\\.lastver";
-
-        if (remotefs.existsSync(curversion)) {
-            // cache already exists
-            // find out what version it belongs to
-            if (remotefs.existsSync(record)) {
-                var lastversion = remotefs.readFileSync(record);
-                remotefs.renameSync(curversion, cachedir + "\\" + lastversion);
-                console.log("Cached version " + lastversion);
-            } else {
-                console.log(
-                    "Couldn't find last version record; cache may get overwritten"
-                );
-            }
-        }
-
-        if (remotefs.existsSync(newversion)) {
-            // rename saved cache to FusionFall
-            remotefs.renameSync(newversion, curversion);
-            console.log("Loaded cached " + gameversion.name);
-        }
-
-        // make note of what version we are launching for next launch
-        remotefs.writeFileSync(record, gameversion.name);
-    }
-
-    window.asseturl = gameversion.url; // gameclient.js needs to access this
-
-    remotefs.writeFileSync(__dirname + "\\assetInfo.php", asseturl);
-    if (result.hasOwnProperty("endpoint")) {
-        var httpendpoint = result.endpoint.replace("https://", "http://");
-        remotefs.writeFileSync(
-            __dirname + "\\rankurl.txt",
-            httpendpoint + "getranks"
-        );
-        // Write these out too
-        remotefs.writeFileSync(
-            __dirname + "\\sponsor.php",
-            httpendpoint + "upsell/sponsor.png"
-        );
-        remotefs.writeFileSync(
-            __dirname + "\\images.php",
-            httpendpoint + "upsell/"
-        );
-    } else {
-        // Remove/default the endpoint related stuff, this server won't be using it
-        if (remotefs.existsSync(__dirname + "\\rankurl.txt")) {
-            remotefs.unlinkSync(__dirname + "\\rankurl.txt");
-            remotefs.writeFileSync(
-                __dirname + "\\sponsor.php",
-                "assets/img/welcome.png"
-            );
-            remotefs.writeFileSync(__dirname + "\\images.php", "assets/img/");
-        }
-    }
-
-    // Server address parsing
-    var address;
-    var port;
-    var sepPos = result.ip.indexOf(":");
-    if (sepPos > -1) {
-        address = result.ip.substr(0, sepPos);
-        port = result.ip.substr(sepPos + 1);
-    } else {
-        address = result.ip;
-        port = 23000; // default
-    }
-
-    // DNS resolution. there is no synchronous version for some stupid reason
-    if (!address.match(/^[0-9.]+$/))
-        dns.resolve4(address, function (err, res) {
-            if (!err) {
-                console.log("Resolved " + address + " to " + res[0]);
-                address = res[0];
-            } else {
-                console.log("Err: " + err.code);
-            }
-            prepConnection(address, port);
-        });
-    else {
-        console.log(address + " is an IP; skipping DNS lookup");
-        prepConnection(address, port);
-    }
-}
-
-function prepConnection(address, port) {
-    var full = address + ":" + port;
-    console.log("Will connect to " + full);
-    remotefs.writeFileSync(__dirname + "\\loginInfo.php", full);
-    launchGame();
-}
-
-// Returns the UUID of the server with the selected background color.
-// Yes, there are probably better ways to go about this, but it works well enough.
-function getSelectedServer() {
-    return $("#server-tablebody > tr.bg-primary").prop("id");
-}
-
-function connectToServer() {
-    // Get ID of the selected server, which corresponds to its UUID in the json
-    console.log("Connecting to server with UUID of " + getSelectedServer());
-
-    // Prevent the user from clicking anywhere else during the transition
-    $("body,html").css("pointer-events", "none");
-    stopEasterEggs();
-    $("#of-serverselector").fadeOut("slow", function () {
-        setTimeout(function () {
-            $("body,html").css("pointer-events", "");
-            setGameInfo(getSelectedServer());
-        }, 200);
-    });
-}
-
-// If applicable, deselect currently selected server.
-function deselectServer() {
-    disableServerListButtons();
-    $(".server-listing-entry").removeClass("bg-primary");
-}
-
-$("#server-table").on("click", ".server-listing-entry", function (event) {
-    enableServerListButtons();
-    $(this).addClass("bg-primary").siblings().removeClass("bg-primary");
-});
-
-// QoL feature: if you double click on a server it will connect
-$("#server-table").on("dblclick", ".server-listing-entry", function (event) {
-    $(this).addClass("bg-primary").siblings().removeClass("bg-primary");
-    connectToServer();
-});
-
-$("#of-editservermodal").on("show.bs.modal", function (e) {
-    var jsontomodify = JSON.parse(
-        remotefs.readFileSync(userdir + "\\servers.json")
-    );
-    $.each(jsontomodify["servers"], function (key, value) {
-        if (value["uuid"] == getSelectedServer()) {
-            $("#editserver-descinput")[0].value = value["description"];
-            $("#editserver-ipinput")[0].value = value["ip"];
-
-            var versionIndex = -1;
-            $.each($("#editserver-versionselect")[0], function (key, val) {
-                if (val.text === value["version"]) {
-                    versionIndex = key;
-                }
-            });
-            $("#editserver-versionselect")[0].selectedIndex = versionIndex;
-        }
-    });
-});
-
-$("#of-deleteservermodal").on("show.bs.modal", function (e) {
-    var result = serverarray.filter(function (obj) {
-        return obj.uuid === getSelectedServer();
-    })[0];
-    $("#deleteserver-servername").html(result.description);
-});

build/OpenFusionClient.exe.manifest

@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<asmv1:assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1" xmlns:asmv1="urn:schemas-microsoft-com:asm.v1" xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
+  <assemblyIdentity type="win32" name="OpenFusion.Client" version="1.6.0.0" processorArchitecture="x86" />
+  <dependency>
+    <dependentAssembly>
+      <assemblyIdentity type="Win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" processorArchitecture="*" publicKeyToken="6595b64144ccf1df" language="*">
+      </assemblyIdentity>
+    </dependentAssembly>
+  </dependency>
+  <asmv3:trustInfo>
+    <security>
+      <requestedPrivileges>
+        <requestedExecutionLevel level="asInvoker" uiAccess="false"></requestedExecutionLevel>
+      </requestedPrivileges>
+    </security>
+  </asmv3:trustInfo>
+  <asmv3:application>
+    <asmv3:windowsSettings>
+      <activeCodePage xmlns="urn:schemas-microsoft-com:smi.2019.WindowsSettings">UTF-8</activeCodePage> 
+      <dpiAware xmlns="urn:schemas-microsoft-com:smi.2005.WindowsSettings">True/PM</dpiAware>
+    </asmv3:windowsSettings>
+  </asmv3:application>
+  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+    <application>
+      <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"></supportedOS>
+      <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"></supportedOS>
+      <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"></supportedOS>
+      <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"></supportedOS>
+      <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"></supportedOS>
+    </application>
+  </compatibility>
+</asmv1:assembly>

build/WebPlayer/loader/info.plist

@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plist>
-<dict>
-	<key>CFBundleVersion</key>
-	<string>2.5.5b4</string>
-	<key>UnityBuildNumber</key>
-	<string>50</string>
-</dict>
+<?xml version="1.0" encoding="UTF-8"?>
+<plist>
+<dict>
+	<key>CFBundleVersion</key>
+	<string>2.5.5b4</string>
+	<key>UnityBuildNumber</key>
+	<string>50</string>
+</dict>
 </plist>

build/WebPlayer/mono/fusion-2.x.x/info.plist

@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plist>
-<dict>
-	<key>CFBundleVersion</key>
-	<string>3.5.2f2</string>
-	<key>UnityBuildNumber</key>
-	<string>4c6ee796dacc</string>
-</dict>
+<?xml version="1.0" encoding="UTF-8"?>
+<plist>
+<dict>
+	<key>CFBundleVersion</key>
+	<string>2.5.5b4</string>
+	<key>UnityBuildNumber</key>
+	<string>50</string>
+</dict>
 </plist>

build/WebPlayer/player/fusion-2.x.x/info.plist

@@ -1,13 +1,13 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plist>
-<dict>
-	<key>CFBundleVersion</key>
-	<string>2.5.5b4</string>
-	<key>UnityBuildNumber</key>
-	<string>50</string>
-	<key>monoVersion</key>
-	<string>fusion-2.x.x</string>
-	<key>monoMinimumRevision</key>
-	<string>2.0.0f6</string>
-</dict>
+<?xml version="1.0" encoding="UTF-8"?>
+<plist>
+<dict>
+	<key>CFBundleVersion</key>
+	<string>2.5.5b4</string>
+	<key>UnityBuildNumber</key>
+	<string>50</string>
+	<key>monoVersion</key>
+	<string>fusion-2.x.x</string>
+	<key>monoMinimumRevision</key>
+	<string>2.0.0f6</string>
+</dict>
 </plist>

build/after-pack.js

@@ -0,0 +1,28 @@
+const fs = require('fs');
+const defaultDir = './dist/win-ia32-unpacked/resources/default_app'
+const exeFile = './dist/win-ia32-unpacked/OpenFusionClient.exe'
+
+exports.default = function() {
+  // remove leftover files from default electron app
+  fs.rm(defaultDir, { recursive: true }, (err) => {
+    if (err) {
+        throw err;
+    }
+  });
+  // patch executable for large address awareness
+  fs.open(exeFile, "r+", (err, fd) => {
+    if(!err) {
+        fs.write(
+            fd, new Uint8Array([0x22]), 0, 1, 0x166,
+            (err) => {
+                if(err) {
+                    throw err;
+                }
+                fs.closeSync(fd);
+            }
+        );
+    } else {
+        throw err;
+    }
+  });
+}

build/delete-default-app.js

@@ -1,10 +0,0 @@
-const fs = require('fs');
-const dir = './dist/win-ia32-unpacked/resources/default_app'
-
-exports.default = async function(context) {
-  fs.rmdir(dir, { recursive: true }, (err) => {
-    if (err) {
-        throw err;
-    }
-  });
-}

build/utils/installUnity.bat

@@ -1,5 +0,0 @@
-PUSHD %~dp0
-.\UnityWebPlayer.exe /quiet /S
-robocopy WebPlayer "%USERPROFILE%\AppData\LocalLow\Unity\WebPlayer" /s /e
-del "%USERPROFILE%\AppData\LocalLow\Unity\WebPlayer\UnityBugReporter.exe"
-POPD

cache_handler/cache_handler.spec

@@ -0,0 +1,33 @@
+# -*- mode: python ; coding: utf-8 -*-
+
+block_cipher = None
+
+
+a = Analysis(['cache_handler.py'],
+             pathex=['Z:\\src'],
+             binaries=[],
+             datas=[],
+             hiddenimports=[],
+             hookspath=[],
+             runtime_hooks=[],
+             excludes=[],
+             win_no_prefer_redirects=False,
+             win_private_assemblies=False,
+             cipher=block_cipher,
+             noarchive=False)
+pyz = PYZ(a.pure, a.zipped_data,
+             cipher=block_cipher)
+exe = EXE(pyz,
+          a.scripts,
+          a.binaries,
+          a.zipfiles,
+          a.datas,
+          [],
+          name='cache_handler',
+          debug=False,
+          bootloader_ignore_signals=False,
+          strip=False,
+          upx=True,
+          upx_exclude=[],
+          runtime_tmpdir=None,
+          console=True )

cache_handler/requirements.txt

@@ -0,0 +1,4 @@
+aiofiles
+httpx
+beautifulsoup4
+pyinstaller==3.5

defaults/config.json

@@ -1,5 +1,7 @@
 {
     "autoupdate-check": true,
     "cache-swapping": true,
-    "last-version-initialized": "1.4"
+    "enable-offline-cache": true,
+    "verify-offline-cache": false,
+    "last-version-initialized": "1.6"
 }

index.html

@@ -1,29 +1,20 @@
-<!DOCTYPE html>
+<!doctype html>
 <html>
     <head>
         <meta charset="utf-8" />
         <meta
-            name="viewport"
-            content="width=device-width, initial-scale=1.0, shrink-to-fit=no"
+            http-equiv="Content-Type"
+            contentType="text/html; charset=UTF-8"
         />
+        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
         <title>OpenFusion: Server Selector</title>
-        <link rel="stylesheet" href="assets/bootstrap/css/bootstrap.min.css" />
+        <link rel="stylesheet" href="assets/css/bootstrap.min.css" />
         <link rel="stylesheet" href="assets/fonts/fontawesome-all.min.css" />
         <link rel="stylesheet" href="assets/css/openfusion.css" />
         <link rel="stylesheet" href="assets/css/styles.css" />
     </head>
 
-    <body
-        style="
-            background: rgb(0, 0, 0);
-            width: 100%;
-            height: 100%;
-            margin: 0;
-            padding: 0;
-            clear: both;
-        "
-        onresize="onResize()"
-    >
+    <body onresize="onResize()">
         <section id="of-serverselector">
             <div class="container" id="serverselector-container">
                 <div class="row text-center mt-3" id="of-logoheader">
@@ -117,6 +108,18 @@
                         </button>
                     </div>
                     <div class="col-4 d-inline-flex justify-content-end">
+                        <button
+                            class="btn btn-primary mr-1"
+                            data-toggle="modal"
+                            data-bs-tooltip=""
+                            data-placement="bottom"
+                            id="of-editcache-button"
+                            type="button"
+                            title="Edit Game Builds"
+                            data-target="#of-editcacheconfigmodal"
+                        >
+                            <i class="fas fa-database"></i>
+                        </button>
                         <button
                             class="btn btn-primary disabled"
                             id="of-connect-button"
@@ -151,9 +154,14 @@
                             </button>
                         </div>
                         <div class="modal-body">
-                            <p class="text-monospace">Version 1.4</p>
+                            <p
+                                id="of-aboutversionnumber"
+                                class="text-monospace"
+                            >
+                                APP_VERSION_NUMBER
+                            </p>
                             <p>
-                                ©2020-2022 OpenFusion Contributors<br />OpenFusion
+                                ©2020-2024 OpenFusion Contributors<br />OpenFusion
                                 is licensed under MIT.<br />
                             </p>
                             <a
@@ -163,6 +171,14 @@
                                 data-target="#of-restoreserversmodal"
                                 >Reset to Default Servers</a
                             >
+                            <br />
+                            <a
+                                href="#of-restoreversionsmodal"
+                                onclick="$('#of-aboutmodal').modal('toggle')"
+                                data-toggle="modal"
+                                data-target="#of-restoreversionsmodal"
+                                >Reset to Default Game Builds</a
+                            >
                         </div>
                         <div class="modal-footer">
                             <div class="row flex-fill">
@@ -173,7 +189,7 @@
                                         data-bs-tooltip=""
                                         type="button"
                                         title="Github Page"
-                                        onclick="window.open(&#39;https://github.com/OpenFusionProject/OpenFusion&#39;,&#39;_blank&#39;);"
+                                        onclick="window.open('https://github.com/OpenFusionProject/OpenFusion','_blank');"
                                     >
                                         <i
                                             class="fab fa-github"
@@ -185,7 +201,7 @@
                                         data-bs-tooltip=""
                                         type="button"
                                         title="Discord Chat"
-                                        onclick="window.open(&#39;https://discord.gg/DYavckB&#39;,&#39;_blank&#39;);"
+                                        onclick="window.open('https://discord.gg/DYavckB','_blank');"
                                     >
                                         <i
                                             class="fab fa-discord"
@@ -242,6 +258,7 @@
                                     required=""
                                     minlength="1"
                                     maxlength="70"
+                                    oninput="validateServerSave('add')"
                                 /><label for="addserver-ipinput"
                                     >Server IP</label
                                 ><input
@@ -249,8 +266,10 @@
                                     type="text"
                                     id="addserver-ipinput"
                                     placeholder="127.0.0.1:23000"
+                                    value="127.0.0.1:23000"
                                     required=""
-                                    pattern="^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5]):[0-9]+$"
+                                    pattern="^([-a-zA-Z0-9]+\.)+[-a-zA-Z0-9]+:[0-9]+$"
+                                    oninput="validateServerSave('add')"
                                 /><label for="addserver-versionselect"
                                     >Game Version:&nbsp;</label
                                 ><select
@@ -258,6 +277,7 @@
                                     id="addserver-versionselect"
                                     required=""
                                     style="margin-left: -5px"
+                                    oninput="validateServerSave('add')"
                                 ></select>
                             </form>
                         </div>
@@ -314,7 +334,8 @@
                                     required=""
                                     minlength="1"
                                     maxlength="70"
-                                /><label for="addserver-ipinput"
+                                    oninput="validateServerSave('edit')"
+                                /><label for="editserver-ipinput"
                                     >Server IP</label
                                 ><input
                                     class="form-control form-row w-75"
@@ -322,7 +343,8 @@
                                     id="editserver-ipinput"
                                     placeholder="127.0.0.1:23000"
                                     required=""
-                                    pattern="^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5]):[0-9]+$"
+                                    pattern="^([-a-zA-Z0-9]+\.)+[-a-zA-Z0-9]+:[0-9]+$"
+                                    oninput="validateServerSave('edit')"
                                 /><label for="editserver-versionselect"
                                     >Game Version:&nbsp;</label
                                 ><select
@@ -330,6 +352,7 @@
                                     id="editserver-versionselect"
                                     required=""
                                     style="margin-left: -5px"
+                                    oninput="validateServerSave('edit')"
                                 ></select>
                             </form>
                         </div>
@@ -343,7 +366,7 @@
                                 Cancel</button
                             ><button
                                 class="btn btn-primary border rounded border-primary btn-success border-success"
-                                id="addserver-savebutton"
+                                id="editserver-savebutton"
                                 type="submit"
                                 data-dismiss="modal"
                                 form="editserver-form"
@@ -436,7 +459,7 @@
                                 Cancel</button
                             ><button
                                 class="btn btn-primary border rounded border-primary btn-danger border-danger"
-                                id="deleteserver-button"
+                                id="restoreservers-button"
                                 type="button"
                                 data-dismiss="modal"
                                 onclick="restoreDefaultServers();"
@@ -447,39 +470,492 @@
                     </div>
                 </div>
             </div>
-            <div id="of-versionnumber">
-                <a
-                    class="text-monospace text-secondary"
-                    href="#of-aboutmodal"
-                    data-toggle="modal"
-                    data-target="#of-aboutmodal"
-                    >v1.4</a
+            <div
+                class="modal fade"
+                role="dialog"
+                tabindex="-1"
+                id="of-editconfigmodal"
+            >
+                <div class="modal-dialog modal-dialog-centered" role="document">
+                    <div class="modal-content">
+                        <div class="modal-header">
+                            <h4 class="modal-title">Edit Configuration</h4>
+                            <button
+                                type="button"
+                                class="close"
+                                data-dismiss="modal"
+                                aria-label="Close"
+                            >
+                                <span aria-hidden="true">×</span>
+                            </button>
+                        </div>
+                        <div class="modal-body">
+                            <form
+                                id="editconfig-form"
+                                class="needs-validation form-group"
+                            >
+                                <div class="form-check form-row">
+                                    <input
+                                        class="form-check-input"
+                                        type="checkbox"
+                                        id="editconfig-autoupdate"
+                                    />
+                                    <label
+                                        class="form-check-label"
+                                        for="editconfig-autoupdate"
+                                        >Automatically check for updates</label
+                                    >
+                                </div>
+                                <div class="form-check form-row">
+                                    <input
+                                        class="form-check-input"
+                                        type="checkbox"
+                                        id="editconfig-cacheswapping"
+                                    />
+                                    <label
+                                        class="form-check-label"
+                                        for="editconfig-cacheswapping"
+                                        >Swap game caches to avoid unnecessary
+                                        downloads</label
+                                    >
+                                </div>
+                                <div class="form-check form-row">
+                                    <input
+                                        class="form-check-input"
+                                        type="checkbox"
+                                        id="editconfig-enableofflinecache"
+                                    />
+                                    <label
+                                        class="form-check-label"
+                                        for="editconfig-enableofflinecache"
+                                        >Use offline caches when they are
+                                        available</label
+                                    >
+                                </div>
+                                <div class="form-check form-row mb-3">
+                                    <input
+                                        class="form-check-input"
+                                        type="checkbox"
+                                        id="editconfig-verifyofflinecache"
+                                    />
+                                    <label
+                                        class="form-check-label"
+                                        for="editconfig-verifyofflinecache"
+                                        >Verify offline caches every time they
+                                        are loaded</label
+                                    >
+                                </div>
+                                <label for="editconfig-offlinecachelocation"
+                                    ><h5>Offline Cache Location:</h5></label
+                                >
+                                <div class="form-row">
+                                    <input
+                                        class="form-control w-75"
+                                        id="editconfig-offlinecachelocation"
+                                        type="text"
+                                        oninput="validateCacheLocation()"
+                                    />
+                                    <button
+                                        type="button"
+                                        class="btn btn-primary ml-1"
+                                        onclick="browseOfflineCache()"
+                                        title="Browse"
+                                    >
+                                        <i class="fas fa-folder"></i>
+                                    </button>
+                                </div>
+                            </form>
+                        </div>
+                        <div class="modal-footer">
+                            <button
+                                class="btn btn-primary border rounded border-primary btn-danger border-danger"
+                                id="editconfig-cancel"
+                                type="button"
+                                data-dismiss="modal"
+                            >
+                                Cancel</button
+                            ><button
+                                class="btn btn-primary border rounded border-primary btn-success border-success"
+                                id="editconfig-savebutton"
+                                type="submit"
+                                data-dismiss="modal"
+                                form="editconfig-form"
+                                onclick="editConfig();"
+                            >
+                                Save
+                            </button>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div
+                class="modal fade"
+                role="dialog"
+                tabindex="-1"
+                id="of-editcacheconfigmodal"
+            >
+                <div
+                    class="modal-dialog modal-dialog-centered modal-lg"
+                    role="document"
                 >
+                    <div class="modal-content">
+                        <div class="modal-header">
+                            <h4 class="modal-title">Edit Game Builds</h4>
+                            <button
+                                type="button"
+                                class="close"
+                                data-dismiss="modal"
+                                aria-label="Close"
+                            >
+                                <span aria-hidden="true">×</span>
+                            </button>
+                        </div>
+                        <div class="modal-body">
+                            <div
+                                class="row row-cols-2 d-xl-flex justify-content-center justify-content-xl-start"
+                                id="of-versionbuttons"
+                                style="padding-bottom: 16px"
+                            >
+                                <div
+                                    class="col-4 text-left d-inline-flex justify-content-xl-start"
+                                    id="cache-buttons"
+                                >
+                                    <button
+                                        class="btn btn-success mr-1"
+                                        data-toggle="modal"
+                                        data-bs-tooltip=""
+                                        data-placement="bottom"
+                                        id="of-addversion-button"
+                                        type="button"
+                                        title="Add Version"
+                                        data-target="#of-addversionmodal"
+                                        onclick="deselectVersion()"
+                                    >
+                                        <i class="fas fa-plus"></i>
+                                    </button>
+                                    <button
+                                        class="btn btn-primary mr-1 disabled"
+                                        data-toggle="modal"
+                                        data-bs-tooltip=""
+                                        data-placement="bottom"
+                                        id="of-editversion-button"
+                                        type="button"
+                                        title="Edit Version"
+                                        data-target="#of-editversionmodal"
+                                        disabled=""
+                                    >
+                                        <i class="fas fa-edit"></i>
+                                    </button>
+                                    <button
+                                        class="btn btn-danger mr-1 disabled"
+                                        data-toggle="modal"
+                                        data-bs-tooltip=""
+                                        data-placement="bottom"
+                                        id="of-deleteversion-button"
+                                        type="button"
+                                        title="Delete Version"
+                                        data-target="#of-deleteversionmodal"
+                                        disabled=""
+                                    >
+                                        <i class="fas fa-trash-alt"></i>
+                                    </button>
+                                </div>
+                            </div>
+                            <div
+                                class="table-responsive text-center border rounded border-primary"
+                                id="cache-table"
+                            >
+                                <table
+                                    class="table table-striped table-hover mb-0"
+                                >
+                                    <thead>
+                                        <tr>
+                                            <th>Game Version</th>
+                                            <th>Game Cache</th>
+                                            <th>Offline Cache</th>
+                                        </tr>
+                                    </thead>
+                                    <tbody id="cache-tablebody"></tbody>
+                                </table>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div
+                class="modal fade"
+                role="dialog"
+                tabindex="-1"
+                id="of-addversionmodal"
+            >
+                <div class="modal-dialog modal-dialog-centered" role="document">
+                    <div class="modal-content">
+                        <div class="modal-header">
+                            <h4 class="modal-title">Add Version</h4>
+                            <button
+                                type="button"
+                                class="close"
+                                data-dismiss="modal"
+                                aria-label="Close"
+                            >
+                                <span aria-hidden="true">×</span>
+                            </button>
+                        </div>
+                        <div class="modal-body">
+                            <form id="addversion-form" class="needs-validation">
+                                <label for="addversion-nameinput"
+                                    >Version Name</label
+                                ><input
+                                    class="form-control form-row w-75"
+                                    type="text"
+                                    id="addversion-nameinput"
+                                    placeholder="custom-build-000"
+                                    required=""
+                                    pattern="^[-a-zA-Z0-9_]{1,70}$"
+                                    oninput="validateVersionSave('add')"
+                                /><label for="addversion-urlinput"
+                                    >Version URL</label
+                                ><input
+                                    class="form-control form-row w-75"
+                                    type="text"
+                                    id="addversion-urlinput"
+                                    placeholder="http://cdn.dexlabs.systems/custom-build-000/"
+                                    required=""
+                                    pattern="^(https?|file):\/\/\/?([-a-zA-Z0-9@:%._\+~#= ]{1,256}\/){1,64}$"
+                                    oninput="validateVersionSave('add')"
+                                />
+                            </form>
+                        </div>
+                        <div class="modal-footer">
+                            <button
+                                class="btn btn-primary border rounded border-primary btn-danger border-danger"
+                                id="addversion-cancel"
+                                type="button"
+                                data-dismiss="modal"
+                            >
+                                Cancel</button
+                            ><button
+                                class="btn btn-primary border rounded border-primary btn-success border-success"
+                                id="addversion-savebutton"
+                                type="submit"
+                                data-dismiss="modal"
+                                form="addversion-form"
+                                onclick="addVersion();"
+                            >
+                                Save
+                            </button>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div
+                class="modal fade"
+                role="dialog"
+                tabindex="-1"
+                id="of-editversionmodal"
+            >
+                <div class="modal-dialog modal-dialog-centered" role="document">
+                    <div class="modal-content">
+                        <div class="modal-header">
+                            <h4 class="modal-title">Edit Version</h4>
+                            <button
+                                type="button"
+                                class="close"
+                                data-dismiss="modal"
+                                aria-label="Close"
+                            >
+                                <span aria-hidden="true">×</span>
+                            </button>
+                        </div>
+                        <div class="modal-body">
+                            <form
+                                id="editversion-form"
+                                class="needs-validation"
+                            >
+                                <label for="editversion-nameinput"
+                                    >Version Name</label
+                                ><input
+                                    class="form-control form-row w-75"
+                                    type="text"
+                                    id="editversion-nameinput"
+                                    placeholder="custom-build-000"
+                                    required=""
+                                    pattern="^[-a-zA-Z0-9_]{1,70}$"
+                                    oninput="validateVersionSave('edit')"
+                                /><label for="editversion-urlinput"
+                                    >Version URL</label
+                                ><input
+                                    class="form-control form-row w-75"
+                                    type="text"
+                                    id="editversion-urlinput"
+                                    placeholder="http://cdn.dexlabs.systems/custom-build-000/"
+                                    required=""
+                                    pattern="^(https?|file):\/\/\/?([-a-zA-Z0-9@:%._\+~#= ]{1,256}\/){1,64}$"
+                                    oninput="validateVersionSave('edit')"
+                                />
+                            </form>
+                        </div>
+                        <div class="modal-footer">
+                            <button
+                                class="btn btn-primary border rounded border-primary btn-danger border-danger"
+                                id="editversion-cancel"
+                                type="button"
+                                data-dismiss="modal"
+                            >
+                                Cancel</button
+                            ><button
+                                class="btn btn-primary border rounded border-primary btn-success border-success"
+                                id="editversion-savebutton"
+                                type="submit"
+                                data-dismiss="modal"
+                                form="editversion-form"
+                                onclick="editVersion();"
+                            >
+                                Save
+                            </button>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div
+                class="modal fade"
+                role="dialog"
+                tabindex="-1"
+                id="of-deleteversionmodal"
+            >
+                <div class="modal-dialog modal-dialog-centered" role="document">
+                    <div class="modal-content">
+                        <div class="modal-header">
+                            <h4 class="modal-title">Are you sure?</h4>
+                            <button
+                                type="button"
+                                class="close"
+                                data-dismiss="modal"
+                                aria-label="Close"
+                            >
+                                <span aria-hidden="true">×</span>
+                            </button>
+                        </div>
+                        <div class="modal-body">
+                            <p class="lead">
+                                Do you really want to delete<br />"<a
+                                    id="deleteversion-versionname"
+                                    >VERSION_NAME</a
+                                >"?<br /><br />You could always re-add it later.
+                            </p>
+                        </div>
+                        <div class="modal-footer">
+                            <button
+                                class="btn btn-primary border rounded border-primary"
+                                type="button"
+                                data-dismiss="modal"
+                            >
+                                Cancel</button
+                            ><button
+                                class="btn btn-primary border rounded border-primary btn-danger border-danger"
+                                id="deleteversion-button"
+                                type="button"
+                                data-dismiss="modal"
+                                onclick="deleteVersion();"
+                            >
+                                Yes, Delete
+                            </button>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div
+                class="modal fade"
+                role="dialog"
+                tabindex="-1"
+                id="of-restoreversionsmodal"
+            >
+                <div class="modal-dialog modal-dialog-centered" role="document">
+                    <div class="modal-content">
+                        <div class="modal-header">
+                            <h4 class="modal-title">Are you sure?</h4>
+                            <button
+                                type="button"
+                                class="close"
+                                data-dismiss="modal"
+                                aria-label="Close"
+                            >
+                                <span aria-hidden="true">×</span>
+                            </button>
+                        </div>
+                        <div class="modal-body">
+                            <p class="lead">
+                                Do you really want to restore the default
+                                versions?
+                            </p>
+                        </div>
+                        <div class="modal-footer">
+                            <button
+                                class="btn btn-primary border rounded border-primary"
+                                type="button"
+                                data-dismiss="modal"
+                            >
+                                Cancel</button
+                            ><button
+                                class="btn btn-primary border rounded border-primary btn-danger border-danger"
+                                id="restoreversions-button"
+                                type="button"
+                                data-dismiss="modal"
+                                onclick="restoreDefaultVersions();"
+                            >
+                                Yes, Restore
+                            </button>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div id="of-config-button-div">
+                <button
+                    class="btn btn-primary mr-1"
+                    data-toggle="modal"
+                    data-bs-tooltip=""
+                    data-placement="right"
+                    id="of-editconfig-button"
+                    type="button"
+                    title="Edit Configuration"
+                    data-target="#of-editconfigmodal"
+                >
+                    <i class="fas fa-cog"></i>
+                </button>
+            </div>
+            <div id="of-about-button-div">
+                <button
+                    class="btn btn-primary mr-1"
+                    data-toggle="modal"
+                    data-bs-tooltip=""
+                    data-placement="left"
+                    id="of-about-button"
+                    type="button"
+                    title="About OpenFusionClient"
+                    data-target="#of-aboutmodal"
+                >
+                    <i class="fas fa-info-circle"></i>
+                </button>
+            </div>
+            <div id="of-about-flash-div" style="z-index: -1">
+                <button class="btn btn-warning mr-1" tabindex="-1" type="button">
+                    <i class="fas fa-info-circle"></i>
+                </button>
             </div>
         </section>
         <section>
-            <div
-                id="client"
-                style="
-                    width: 100%;
-                    height: 100%;
-                    margin: 0;
-                    padding: 0;
-                    background: #000;
-                    clear: both;
-                "
-            ></div>
+            <div id="client"></div>
         </section>
         <script
             src="assets/js/jquery.min.js"
             onload="window.$ = window.jQuery = module.exports;"
         ></script>
-        <script src="assets/bootstrap/js/bootstrap.min.js"></script>
+        <script src="assets/js/bootstrap.min.js"></script>
         <script src="assets/js/bs-init.js"></script>
         <script src="assets/js/uuidv4.min.js"></script>
-        <script src="assets/js/serverselector.js"></script>
-        <script src="assets/js/gameclient.js"></script>
+        <script src="assets/js/server-selector.js"></script>
+        <script src="assets/js/game-client.js"></script>
         <script src="assets/js/snowflakes.min.js"></script>
-        <script src="assets/js/eastereggs.js"></script>
+        <script src="assets/js/easter-eggs.js"></script>
     </body>
 </html>

index.js

@@ -1,69 +1,117 @@
 var app = require("app"); // Module to control application life.
-var ipc = require("ipc");
-var fs = require("fs-extra");
-var os = require("os");
 var dialog = require("dialog");
-var BrowserWindow = require("browser-window");
+var fs = require("fs-extra");
+var ipc = require("ipc");
+var os = require("os");
+var path = require("path");
 
+var BrowserWindow = require("browser-window");
 var mainWindow = null;
 
-app.commandLine.appendSwitch("--enable-npapi");
+var unityHomeDir = path.join(__dirname, "../../WebPlayer");
+// If running in non-packaged / development mode, this dir will be slightly different
+if (process.env.npm_node_execpath) {
+    unityHomeDir = path.join(app.getAppPath(), "/build/WebPlayer");
+}
+
+process.env["UNITY_HOME_DIR"] = unityHomeDir;
+process.env["UNITY_DISABLE_PLUGIN_UPDATES"] = "yes";
+
+app.commandLine.appendSwitch("enable-npapi");
+app.commandLine.appendSwitch(
+    "load-plugin",
+    path.join(unityHomeDir, "/loader/npUnity3D32.dll")
+);
+app.commandLine.appendSwitch("no-proxy-server");
+
+var userData = app.getPath("userData");
+var configPath = path.join(userData, "config.json");
+var serversPath = path.join(userData, "servers.json");
+var versionsPath = path.join(userData, "versions.json");
+var hashPath = path.join(userData, "hashes.json");
+
+function backup() {
+    if (fs.existsSync(configPath)) fs.copySync(configPath, configPath + ".bak");
+    if (fs.existsSync(serversPath))
+        fs.copySync(serversPath, serversPath + ".bak");
+    if (fs.existsSync(versionsPath))
+        fs.copySync(versionsPath, versionsPath + ".bak");
+    if (fs.existsSync(hashPath)) fs.copySync(hashPath, hashPath + ".bak");
+}
+
+function patchVersions() {
+    var current = fs.readJsonSync(versionsPath);
+    var newDefaults = fs.readJsonSync(
+        path.join(__dirname, "/defaults/versions.json")
+    );
+    for (var i = 0; i < newDefaults["versions"].length; i++) {
+        var newDefault = newDefaults["versions"][i];
+        var found = false;
+        for (var j = 0; j < current["versions"].length; j++) {
+            var version = current["versions"][j];
+            if (newDefault["name"] === version["name"]) {
+                current["versions"][j] = newDefault;
+                found = true;
+                break;
+            }
+        }
+        if (!found) {
+            current["versions"].push(newDefault);
+        }
+    }
+    fs.writeFileSync(versionsPath, JSON.stringify(current, null, 4));
+}
+
+function patchServers() {
+    var current = fs.readJsonSync(serversPath);
+    var newDefaults = fs.readJsonSync(
+        path.join(__dirname, "/defaults/servers.json")
+    );
+    for (var i = 0; i < newDefaults["servers"].length; i++) {
+        var newDefault = newDefaults["servers"][i];
+        var found = false;
+        for (var j = 0; j < current["servers"].length; j++) {
+            var server = current["servers"][j];
+            if (newDefault["uuid"] === server["uuid"]) {
+                current["servers"][j] = newDefault;
+                found = true;
+                break;
+            }
+        }
+        if (!found) {
+            current["servers"].push(newDefault);
+        }
+    }
+    fs.writeFileSync(serversPath, JSON.stringify(current, null, 4));
+}
 
 function initialSetup(firstTime) {
-    // Display a small window to inform the user that the app is working
-    setupWindow = new BrowserWindow({
-        width: 275,
-        height: 450,
-        resizable: false,
-        center: true,
-        frame: false,
-    });
-    setupWindow.loadUrl("file://" + __dirname + "/initialsetup.html");
-    // Exec installUnity.bat and wait for it to finish.
-    var child = require("child_process").spawn("cmd.exe", [
-        "/c",
-        "utils\\installUnity.bat",
-    ]);
-    child.on("exit", function () {
-        console.log("Unity installed.");
-        if (!firstTime) {
-            // migration from pre-1.4
-            // Back everything up, just in case
-            fs.copySync(
-                app.getPath("userData") + "\\config.json",
-                app.getPath("userData") + "\\config.json.bak"
-            );
-            fs.copySync(
-                app.getPath("userData") + "\\servers.json",
-                app.getPath("userData") + "\\servers.json.bak"
-            );
-            fs.copySync(
-                app.getPath("userData") + "\\versions.json",
-                app.getPath("userData") + "\\versions.json.bak"
-            );
-        } else {
-            // first-time setup
-            // Copy default servers
-            fs.copySync(
-                __dirname + "\\defaults\\servers.json",
-                app.getPath("userData") + "\\servers.json"
-            );
-        }
+    backup();
 
-        // Copy default versions and config
+    if (firstTime) {
+        // First-time setup
+        // Copy default servers
         fs.copySync(
-            __dirname + "\\defaults\\versions.json",
-            app.getPath("userData") + "\\versions.json"
+            path.join(__dirname, "/defaults/servers.json"),
+            serversPath
         );
         fs.copySync(
-            __dirname + "\\defaults\\config.json",
-            app.getPath("userData") + "\\config.json"
+            path.join(__dirname, "/defaults/versions.json"),
+            versionsPath
         );
+    } else if (fs.existsSync(serversPath)) {
+        // Migration
+        // Update default servers and versions
+        patchVersions();
+        patchServers();
+    }
 
-        console.log("JSON files copied.");
-        setupWindow.destroy();
-        showMainWindow();
-    });
+    // Copy default versions and config
+    fs.copySync(path.join(__dirname, "/defaults/config.json"), configPath);
+    fs.copySync(path.join(__dirname, "/defaults/hashes.json"), hashPath);
+
+    console.log("JSON files copied.");
+    showMainWindow();
 }
 
 ipc.on("exit", function (id) {
@@ -77,46 +125,50 @@ app.on("window-all-closed", function () {
 
 app.on("ready", function () {
     // Check just in case the user forgot to extract the zip.
-    zip_check = app.getPath("exe").includes(os.tmpdir());
-    if (zip_check) {
-        errormsg =
+    zipCheck = app.getPath("exe").includes(os.tmpdir());
+    if (zipCheck) {
+        var errorMessage =
             "It has been detected that OpenFusionClient is running from the TEMP folder.\n\n" +
             "Please extract the entire Client folder to a location of your choice before starting OpenFusionClient.";
-        dialog.showErrorBox("Error!", errormsg);
+        dialog.showErrorBox("Error!", errorMessage);
         return;
     }
-
     // Create the browser window.
     mainWindow = new BrowserWindow({
         width: 1280,
         height: 720,
         show: false,
-        "web-preferences": { plugins: true },
+        "web-preferences": {
+            plugins: true,
+        },
     });
     mainWindow.setMinimumSize(640, 480);
 
     // Check for first run
-    var configPath = app.getPath("userData") + "\\config.json";
     try {
         if (!fs.existsSync(configPath)) {
             console.log("Config file not found. Running initial setup.");
             initialSetup(true);
         } else {
             var config = fs.readJsonSync(configPath);
-            if (!config["last-version-initialized"]) {
-                console.log("Pre-1.4 config detected. Running migration.");
+            if (config["last-version-initialized"] !== "1.6") {
+                console.log("Pre-1.6 config detected. Running migration.");
                 initialSetup(false);
             } else {
                 showMainWindow();
             }
         }
-    } catch (e) {
-        console.log("An error occurred while checking for the config.");
+    } catch (ex) {
+        dialog.showErrorBox(
+            "Error!",
+            "An error occurred while checking for the config. Make sure you have sufficent permissions."
+        );
+        app.quit();
     }
 
     // Makes it so external links are opened in the system browser, not Electron
-    mainWindow.webContents.on("new-window", function (e, url) {
-        e.preventDefault();
+    mainWindow.webContents.on("new-window", function (event, url) {
+        event.preventDefault();
         require("shell").openExternal(url);
     });
 
@@ -131,27 +183,33 @@ function showMainWindow() {
 
     // Reduces white flash when opening the program
     mainWindow.webContents.on("did-finish-load", function () {
+        mainWindow.webContents.executeJavaScript("setAppVersionText();");
         mainWindow.show();
         // everything's loaded, tell the renderer process to do its thing
         mainWindow.webContents.executeJavaScript("loadConfig();");
         mainWindow.webContents.executeJavaScript("loadGameVersions();");
         mainWindow.webContents.executeJavaScript("loadServerList();");
+        mainWindow.webContents.executeJavaScript("loadCacheList();");
     });
 
     mainWindow.webContents.on("plugin-crashed", function () {
-        console.log("Unity Web Player crashed.");
+        var errorMessage =
+            "Unity Web Player has crashed - please re-open the application.\n" +
+            "If this error persists, please read the FAQ or ask for support in our Discord server.";
+        dialog.showErrorBox("Error!", errorMessage);
+        mainWindow.destroy();
+        app.quit();
     });
 
-    mainWindow.webContents.on("will-navigate", function (evt, url) {
-        evt.preventDefault();
-        // TODO: showMessageBox rather than showErrorBox?
+    mainWindow.webContents.on("will-navigate", function (event, url) {
+        event.preventDefault();
         switch (url) {
             case "https://audience.fusionfall.com/ff/regWizard.do?_flowId=fusionfall-registration-flow":
-                errormsg =
+                var errorMessage =
                     "The register page is currently unimplemented.\n\n" +
                     'You can still create an account: type your desired username and password into the provided boxes and click "Log In". ' +
                     "Your account will then be automatically created on the server. \nBe sure to remember these details!";
-                dialog.showErrorBox("Sorry!", errormsg);
+                dialog.showErrorBox("Sorry!", errorMessage);
                 break;
             case "https://audience.fusionfall.com/ff/login.do":
                 dialog.showErrorBox(
@@ -163,7 +221,7 @@ function showMainWindow() {
                 require("shell").openExternal("https://discord.gg/DYavckB");
                 break;
             default:
-                mainWindow.webContents.loadURL(url);
+                mainWindow.loadUrl(url);
         }
     });
 }

initialsetup.html

@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<html>
-    <head>
-        <title>OpenFusion: Initial Setup</title>
-    </head>
-    <body
-        style="
-            overflow: hidden;
-            background-color: #000;
-            user-select: none;
-            -webkit-user-select: none;
-        "
-    >
-        <center>
-            <div>
-                <img src="assets/img/of-3.png" width="256" />
-                <div>
-                    <img src="assets/img/spinner.gif" width="50px" />
-                </div>
-                <div style="margin-top: 15px">
-                    <p
-                        style="
-                            text-shadow: 1px 1px 8px #4349c4;
-                            color: #4a76b7;
-                            font-size: 18px;
-                            font-family: -apple-system, BlinkMacSystemFont,
-                                'Segoe UI', Roboto, 'Helvetica Neue', Arial,
-                                'Noto Sans', sans-serif, 'Apple Color Emoji',
-                                'Segoe UI Emoji', 'Segoe UI Symbol',
-                                'Noto Color Emoji';
-                        "
-                    >
-                        OpenFusion is setting up...<br />Please wait - this
-                        should take <br />less than a minute.
-                    </p>
-                </div>
-            </div>
-        </center>
-    </body>
-</html>

package.json

@@ -1,32 +1,31 @@
 {
-    "name": "openfusionclient",
-    "version": "1.4.0",
+    "name": "OpenFusionClient",
+    "version": "1.6.1",
     "description": "OpenFusionClient",
     "main": "index.js",
     "scripts": {
         "postinstall": "npx patch-package && npm explore electron-prebuilt -- npm run postinstall",
         "start": "electron .",
-        "build": "node build.js",
         "pack": "electron-builder --win --ia32 --dir",
-        "dist": "electron-builder --win --ia32",
+        "dist": "electron-builder --win --ia32 --publish=never",
         "prettier": "npx prettier --write ."
     },
     "author": "OpenFusion Contributors",
     "license": "MIT",
     "devDependencies": {
-        "electron-builder": "^22.10.5",
+        "electron-builder": "^22.14.13",
         "electron-prebuilt": "^0.31.2",
-        "patch-package": "^6.4.7",
-        "prettier": "^2.7.1"
+        "patch-package": "^7.0.2",
+        "prettier": "^3.3.3"
     },
     "repository": {
         "type": "git",
-        "url": "https://github.com/OpenFusionProject/Client.git"
+        "url": "https://github.com/OpenFusionProject/OpenFusionClient.git"
     },
     "build": {
         "appId": "xyz.openfusion.client",
         "productName": "OpenFusionClient",
-        "copyright": "© 2020-2022 OpenFusion Contributors",
+        "copyright": "© 2020-2024 OpenFusion Contributors",
         "electronDownload": {
             "version": "0.31.2",
             "platform": "win32",
@@ -52,20 +51,29 @@
         },
         "files": [
             "!patches${/*}",
+            "!.vscode${/*}",
             "!*.php",
             "!rankurl.txt",
             "!README.md",
-            "!.npmrc"
+            "!LICENSE.md",
+            "!.npmrc",
+            "!.prettierrc",
+            "!.prettierignore"
         ],
         "extraFiles": [
+            "LICENSE.md",
             {
-                "from": "build/utils",
-                "to": "utils"
+                "from": "build/OpenFusionClient.exe.manifest",
+                "to": "OpenFusionClient.exe.manifest"
+            },
+            {
+                "from": "build/WebPlayer",
+                "to": "WebPlayer"
             }
         ],
-        "afterPack": "./build/delete-default-app.js"
+        "afterPack": "./build/after-pack.js"
     },
     "dependencies": {
-        "fs-extra": "^0.30.0"
+        "fs-extra": "2.0.0"
     }
 }