Misc tweaks

loadURL() -> loadUrl() in index.js Move Bootstrap files
Use local fonts for Bootstrap
2025-10-15 12:10:13 +00:00 · 2023-09-02 23:03:00 -05:00 · 2023-09-03 01:44:09 +02:00 · 2023-07-11 19:40:51 -05:00 · 2023-04-23 15:37:44 -05:00 · 2023-02-17 20:07:52 -06:00
12 changed files with 147 additions and 77 deletions
--- a/README.md
+++ b/README.md
@@ -1,3 +1,52 @@
 # OpenFusionClient

-Electron app for joining OpenFusion servers
+[![Current Release](https://img.shields.io/github/v/release/OpenFusionProject/OpenFusionClient)](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
--- a/assets/bootstrap/css/bootstrap.min.css
+++ b/assets/bootstrap/css/bootstrap.min.css
--- a/assets/css/bootstrap.min.css
+++ b/assets/css/bootstrap.min.css
--- a/assets/fonts/KFOlCnqEu92Fr1MmWUlvAw.ttf
+++ b/assets/fonts/KFOlCnqEu92Fr1MmWUlvAw.ttf
--- a/assets/fonts/KFOmCnqEu92Fr1Me5Q.ttf
+++ b/assets/fonts/KFOmCnqEu92Fr1Me5Q.ttf
--- a/assets/bootstrap/js/bootstrap.min.js
+++ b/assets/bootstrap/js/bootstrap.min.js
--- a/assets/js/serverselector.js
+++ b/assets/js/serverselector.js
@@ -26,20 +26,20 @@ function disableServerListButtons() {
 }

 function getAppVersion() {
-  appversion = remote.require("app").getVersion();
-  
-  // simplify version, ex. 1.4.0 -> 1.4, 
-  // but only if a revision number isn't present
-  if(appversion.endsWith(".0")){
-    return appversion.substr(0, appversion.length - 2)
-  } else {
-    return appversion
-  }
+    appversion = remote.require("app").getVersion();
+
+    // simplify version, ex. 1.4.0 -> 1.4,
+    // but only if a revision number isn't present
+    if (appversion.endsWith(".0")) {
+        return appversion.substr(0, appversion.length - 2);
+    } else {
+        return appversion;
+    }
 }

 function setAppVersionText() {
-  $("#of-aboutversionnumber").text("Version " + getAppVersion());
-  $("#of-versionnumber").text("v" + getAppVersion());
+    $("#of-aboutversionnumber").text("Version " + getAppVersion());
+    $("#of-versionnumber").text("v" + getAppVersion());
 }

 function addServer() {
--- a/build/afterpack.js
+++ b/build/afterpack.js
@@ -4,7 +4,7 @@ const exefile = './dist/win-ia32-unpacked/OpenFusionClient.exe'

 exports.default = function() {
  // remove leftover files from default electron app
-  fs.rm(dir, { recursive: true }, (err) => {
+  fs.rm(defaultdir, { recursive: true }, (err) => {
    if (err) {
        throw err;
    }
--- a/index.html
+++ b/index.html
@@ -7,7 +7,7 @@
            content="width=device-width, initial-scale=1.0, shrink-to-fit=no"
        />
        <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" />
@@ -151,7 +151,12 @@
                            </button>
                        </div>
                        <div class="modal-body">
-                            <p id="of-aboutversionnumber" class="text-monospace">APP_VERSION_NUMBER</p>
+                            <p
+                                id="of-aboutversionnumber"
+                                class="text-monospace"
+                            >
+                                APP_VERSION_NUMBER
+                            </p>
                            <p>
                                ©2020-2023 OpenFusion Contributors<br />OpenFusion
                                is licensed under MIT.<br />
@@ -475,7 +480,7 @@
            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>
--- a/index.js
+++ b/index.js
@@ -43,10 +43,8 @@ function installUnity(callback) {
    child.on("exit", function () {
        // overwrite 3.5.2 loader/player with FF's custom version
        var dstfolder =
-            app.getPath("appData") + "..\\LocalLow\\Unity\\WebPlayer";
-        fs.copySync(utilsdir + "\\WebPlayer", dstfolder, {
-            clobber: true,
-        });
+            app.getPath("appData") + "\\..\\LocalLow\\Unity\\WebPlayer";
+        fs.copySync(utilsdir + "\\WebPlayer", dstfolder, { clobber: true });
        // avoids error reporter popping up when closing Electron
        fs.removeSync(dstfolder + "\\UnityBugReporter.exe");
        console.log("Unity Web Player installed successfully.");
@@ -207,7 +205,7 @@ function showMainWindow() {
                require("shell").openExternal("https://discord.gg/DYavckB");
                break;
            default:
-                mainWindow.webContents.loadURL(url);
+                mainWindow.loadUrl(url);
        }
    });
 }
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,16 +1,16 @@
 {
    "name": "OpenFusionClient",
-    "version": "1.4.0",
+    "version": "1.4.1",
    "lockfileVersion": 2,
    "requires": true,
    "packages": {
        "": {
            "name": "OpenFusionClient",
-            "version": "1.4.0",
+            "version": "1.4.1",
            "hasInstallScript": true,
            "license": "MIT",
            "dependencies": {
-                "fs-extra": "^0.30.0"
+                "fs-extra": "2.0.0"
            },
            "devDependencies": {
                "electron-builder": "^22.14.13",
@@ -746,7 +746,8 @@
        "node_modules/balanced-match": {
            "version": "1.0.2",
            "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
-            "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="
+            "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
+            "dev": true
        },
        "node_modules/base64-js": {
            "version": "1.5.1",
@@ -830,6 +831,7 @@
            "version": "1.1.11",
            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
            "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+            "dev": true,
            "dependencies": {
                "balanced-match": "^1.0.0",
                "concat-map": "0.0.1"
@@ -1333,7 +1335,8 @@
        "node_modules/concat-map": {
            "version": "0.0.1",
            "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-            "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
+            "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
+            "dev": true
        },
        "node_modules/concat-stream": {
            "version": "1.6.2",
@@ -2021,15 +2024,12 @@
            }
        },
        "node_modules/fs-extra": {
-            "version": "0.30.0",
-            "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.30.0.tgz",
-            "integrity": "sha1-8jP/zAjU2n1DLapEl3aYnbHfk/A=",
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-2.0.0.tgz",
+            "integrity": "sha512-DERmRq6uGnu7I4uFJiWQBe5pYy67v2oKowEi8jYA/52u/ZO9xXBP2HAGacD9Nus0UT/WhJFZTq8cWbxZqOHVUg==",
            "dependencies": {
                "graceful-fs": "^4.1.2",
-                "jsonfile": "^2.1.0",
-                "klaw": "^1.0.0",
-                "path-is-absolute": "^1.0.0",
-                "rimraf": "^2.2.8"
+                "jsonfile": "^2.1.0"
            }
        },
        "node_modules/fs-extra/node_modules/jsonfile": {
@@ -2095,6 +2095,7 @@
            "version": "6.0.4",
            "resolved": "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz",
            "integrity": "sha1-DwiGD2oVUSey+t1PnOJLGqtuTSI=",
+            "dev": true,
            "dependencies": {
                "inflight": "^1.0.4",
                "inherits": "2",
@@ -2406,6 +2407,7 @@
            "version": "1.0.6",
            "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
            "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+            "dev": true,
            "dependencies": {
                "once": "^1.3.0",
                "wrappy": "1"
@@ -2414,7 +2416,8 @@
        "node_modules/inherits": {
            "version": "2.0.4",
            "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-            "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
+            "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
+            "dev": true
        },
        "node_modules/ini": {
            "version": "1.3.8",
@@ -2711,14 +2714,6 @@
                "json-buffer": "3.0.0"
            }
        },
-        "node_modules/klaw": {
-            "version": "1.3.1",
-            "resolved": "https://registry.npmjs.org/klaw/-/klaw-1.3.1.tgz",
-            "integrity": "sha1-QIhDO0azsbolnXh4XY6W9zugJDk=",
-            "optionalDependencies": {
-                "graceful-fs": "^4.1.9"
-            }
-        },
        "node_modules/klaw-sync": {
            "version": "6.0.0",
            "resolved": "https://registry.npmjs.org/klaw-sync/-/klaw-sync-6.0.0.tgz",
@@ -2915,6 +2910,7 @@
            "version": "3.0.4",
            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
            "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+            "dev": true,
            "dependencies": {
                "brace-expansion": "^1.1.7"
            },
@@ -3052,6 +3048,7 @@
            "version": "1.4.0",
            "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
            "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+            "dev": true,
            "dependencies": {
                "wrappy": "1"
            }
@@ -3215,6 +3212,7 @@
            "version": "1.0.1",
            "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
            "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
+            "dev": true,
            "engines": {
                "node": ">=0.10.0"
            }
@@ -3603,6 +3601,7 @@
            "version": "2.4.5",
            "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.5.tgz",
            "integrity": "sha1-7nEM5dk6j9uFb7Xqj/Di11k0sto=",
+            "dev": true,
            "dependencies": {
                "glob": "^6.0.1"
            },
@@ -4379,7 +4378,8 @@
        "node_modules/wrappy": {
            "version": "1.0.2",
            "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-            "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
+            "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
+            "dev": true
        },
        "node_modules/write-file-atomic": {
            "version": "3.0.3",
@@ -5049,7 +5049,8 @@
        "balanced-match": {
            "version": "1.0.2",
            "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
-            "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="
+            "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
+            "dev": true
        },
        "base64-js": {
            "version": "1.5.1",
@@ -5109,6 +5110,7 @@
            "version": "1.1.11",
            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
            "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+            "dev": true,
            "requires": {
                "balanced-match": "^1.0.0",
                "concat-map": "0.0.1"
@@ -5485,7 +5487,8 @@
        "concat-map": {
            "version": "0.0.1",
            "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-            "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
+            "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
+            "dev": true
        },
        "concat-stream": {
            "version": "1.6.2",
@@ -6054,15 +6057,12 @@
            }
        },
        "fs-extra": {
-            "version": "0.30.0",
-            "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.30.0.tgz",
-            "integrity": "sha1-8jP/zAjU2n1DLapEl3aYnbHfk/A=",
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-2.0.0.tgz",
+            "integrity": "sha512-DERmRq6uGnu7I4uFJiWQBe5pYy67v2oKowEi8jYA/52u/ZO9xXBP2HAGacD9Nus0UT/WhJFZTq8cWbxZqOHVUg==",
            "requires": {
                "graceful-fs": "^4.1.2",
-                "jsonfile": "^2.1.0",
-                "klaw": "^1.0.0",
-                "path-is-absolute": "^1.0.0",
-                "rimraf": "^2.2.8"
+                "jsonfile": "^2.1.0"
            },
            "dependencies": {
                "jsonfile": {
@@ -6121,6 +6121,7 @@
            "version": "6.0.4",
            "resolved": "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz",
            "integrity": "sha1-DwiGD2oVUSey+t1PnOJLGqtuTSI=",
+            "dev": true,
            "requires": {
                "inflight": "^1.0.4",
                "inherits": "2",
@@ -6349,6 +6350,7 @@
            "version": "1.0.6",
            "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
            "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+            "dev": true,
            "requires": {
                "once": "^1.3.0",
                "wrappy": "1"
@@ -6357,7 +6359,8 @@
        "inherits": {
            "version": "2.0.4",
            "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-            "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
+            "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
+            "dev": true
        },
        "ini": {
            "version": "1.3.8",
@@ -6580,14 +6583,6 @@
                "json-buffer": "3.0.0"
            }
        },
-        "klaw": {
-            "version": "1.3.1",
-            "resolved": "https://registry.npmjs.org/klaw/-/klaw-1.3.1.tgz",
-            "integrity": "sha1-QIhDO0azsbolnXh4XY6W9zugJDk=",
-            "requires": {
-                "graceful-fs": "^4.1.9"
-            }
-        },
        "klaw-sync": {
            "version": "6.0.0",
            "resolved": "https://registry.npmjs.org/klaw-sync/-/klaw-sync-6.0.0.tgz",
@@ -6738,6 +6733,7 @@
            "version": "3.0.4",
            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
            "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+            "dev": true,
            "requires": {
                "brace-expansion": "^1.1.7"
            }
@@ -6848,6 +6844,7 @@
            "version": "1.4.0",
            "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
            "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+            "dev": true,
            "requires": {
                "wrappy": "1"
            }
@@ -6971,7 +6968,8 @@
        "path-is-absolute": {
            "version": "1.0.1",
            "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-            "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18="
+            "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
+            "dev": true
        },
        "path-key": {
            "version": "2.0.1",
@@ -7272,6 +7270,7 @@
            "version": "2.4.5",
            "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.5.tgz",
            "integrity": "sha1-7nEM5dk6j9uFb7Xqj/Di11k0sto=",
+            "dev": true,
            "requires": {
                "glob": "^6.0.1"
            }
@@ -7882,7 +7881,8 @@
        "wrappy": {
            "version": "1.0.2",
            "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-            "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
+            "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
+            "dev": true
        },
        "write-file-atomic": {
            "version": "3.0.3",
--- a/package.json
+++ b/package.json
@@ -20,7 +20,7 @@
    },
    "repository": {
        "type": "git",
-        "url": "https://github.com/OpenFusionProject/Client.git"
+        "url": "https://github.com/OpenFusionProject/OpenFusionClient.git"
    },
    "build": {
        "appId": "xyz.openfusion.client",
@@ -70,6 +70,6 @@
        "afterPack": "./build/afterpack.js"
    },
    "dependencies": {
-        "fs-extra": "^0.30.0"
+        "fs-extra": "2.0.0"
    }
 }
Author	SHA1	Message	Date
CakeLancelot	7131026b2f	Misc tweaks loadURL() -> loadUrl() in index.js Move Bootstrap files	2023-09-02 23:03:00 -05:00
dongresource	7dd018e336	Use local fonts for Bootstrap bootstrap.min.css was fetching a css snippet for the Roboto font remotely. Inlined the snippet and modified it to load the font files locally.	2023-09-03 01:44:09 +02:00
CakeLancelot	e19098a13e	README update	2023-07-11 19:40:51 -05:00
CakeLancelot	48e2052748	Fix call to nonexistent function in URL redirection Gotta love runtime errors	2023-04-23 15:37:44 -05:00
CakeLancelot	7b3de1fe52	Bump fs-extra version to 2.0.0 This is the latest version that supports ES5	2023-02-17 20:07:52 -06:00
CakeLancelot	675a5fce50	Update repo URL in package.json	2023-02-11 16:08:25 +00:00
CakeLancelot	2bf916ea58	Fix bug in WebPlayer installation logic Also run prettier	2023-02-09 12:52:57 -06:00