OpenPunk
/
Client
mirror of https://github.com/OpenFusionProject/Client.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #18 from hichemfantar/patch-prettier 

configure prettier for a prettier project
This commit is contained in:
CakeLancelot 2022-09-12 16:47:42 -05:00 committed by GitHub
parent 3c0b07e61a f9c041edc9
commit 7bc438d76a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
15 changed files with 9298 additions and 8739 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
.prettierignore Normal file
View File

@ -0,0 +1,33 @@
# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
# dependencies
/node_modules
/.pnp
.pnp.js
# production
/build
# misc
.DS_Store
.env.local
.env.development.local
.env.test.local
.env.production.local
npm-debug.log*
yarn-debug.log*
yarn-error.log*
locales/
*.pak
*.bin
*.php
rankurl.txt
icudtl.dat
version
resources/app/files/rankurl.txt
node_modules/
dist/
UnityBugReporter.exe
*.min.*

12
.prettierrc Normal file
View File

@ -0,0 +1,12 @@
{
"trailingComma": "es5",
"useTabs": false,
"tabWidth": 4,
"singleQuote": false,
"semi": true,
"bracketSameLine": false,
"bracketSpacing": true,
"jsxSingleQuote": false,
"quoteProps": "as-needed",
"endOfLine": "lf"
}

9
.vscode/extensions.json vendored Normal file
View File

@ -0,0 +1,9 @@
{
// See https://go.microsoft.com/fwlink/?LinkId=827846 to learn about workspace recommendations.
// Extension identifier format: ${publisher}.${name}. Example: vscode.csharp
// List of extensions which should be recommended for users of this workspace.
"recommendations": ["esbenp.prettier-vscode"],
// List of extensions recommended by VS Code that should not be recommended for users of this workspace.
"unwantedRecommendations": []
}

1
README.md
View File

@ -1,2 +1,3 @@
# OpenFusionClient # OpenFusionClient
Electron app for joining OpenFusion servers Electron app for joining OpenFusion servers

12
assets/css/openfusion.css
View File

@ -49,9 +49,9 @@ img {
body { body {
user-select: none; user-select: none;
background-color: #000; background-color: #000;
font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto,
'Helvetica Neue', Arial, 'Noto Sans', sans-serif, 'Apple Color Emoji', "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji",
'Segoe UI Emoji', 'Segoe UI Symbol', 'Noto Color Emoji'; "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
} }
#of-versionnumber { #of-versionnumber {
@ -61,17 +61,17 @@ body {
} }
.btn-primary { .btn-primary {
background-image: url('../../assets/img/btn-primary-bg.png'); background-image: url("../../assets/img/btn-primary-bg.png");
background-repeat: repeat; background-repeat: repeat;
} }
.btn-success { .btn-success {
background-image: url('../../assets/img/btn-success-bg.png'); background-image: url("../../assets/img/btn-success-bg.png");
background-repeat: repeat; background-repeat: repeat;
} }
.btn-danger { .btn-danger {
background-image: url('../../assets/img/btn-danger-bg.png'); background-image: url("../../assets/img/btn-danger-bg.png");
background-repeat: repeat; background-repeat: repeat;
} }

4
assets/js/bs-init.js
View File

@ -1,3 +1,3 @@
$(document).ready(function(){ $(document).ready(function () {
$('[data-bs-tooltip]').tooltip(); $("[data-bs-tooltip]").tooltip();
}); });

6
assets/js/eastereggs.js
View File

@ -7,12 +7,12 @@ var christmasBegin = new Date(today.getFullYear(), 11, 23);
var christmasEnd = new Date(today.getFullYear(), 12, 8); var christmasEnd = new Date(today.getFullYear(), 12, 8);
var sf; var sf;
if((today >= christmasBegin && today <= christmasEnd)) { if (today >= christmasBegin && today <= christmasEnd) {
console.log("Christmas Activated."); console.log("Christmas Activated.");
sf = new Snowflakes({zIndex: -100}); sf = new Snowflakes({ zIndex: -100 });
} }
function stopEasterEggs(){ function stopEasterEggs() {
if (sf != null) { if (sf != null) {
sf.destroy(); sf.destroy();
} }

72
assets/js/gameclient.js
View File

@ -33,9 +33,9 @@ function PayPage(param) {
function onResize() { function onResize() {
if (gameRunning == true) { if (gameRunning == true) {
var unity = document.getElementById('Unity_embed'); var unity = document.getElementById("Unity_embed");
unity.style.width = window.innerWidth + 'px'; unity.style.width = window.innerWidth + "px";
unity.style.height = window.innerHeight + 'px'; unity.style.height = window.innerHeight + "px";
} }
} }
@ -47,32 +47,50 @@ function launchGame() {
document.body.style.overflow = "hidden"; document.body.style.overflow = "hidden";
var object = document.createElement('object'); var object = document.createElement("object");
object.setAttribute('classid', "clsid:444785F1-DE89-4295-863A-D46C3A781394"); object.setAttribute(
object.setAttribute('codebase', "undefined/UnityWebPlayer.cab#version=2,0,0,0"); "classid",
object.setAttribute('id', "Unity_object"); "clsid:444785F1-DE89-4295-863A-D46C3A781394"
object.setAttribute('width', "1264"); );
object.setAttribute('height', "661"); object.setAttribute(
"codebase",
"undefined/UnityWebPlayer.cab#version=2,0,0,0"
);
object.setAttribute("id", "Unity_object");
object.setAttribute("width", "1264");
object.setAttribute("height", "661");
var embed = document.createElement('embed'); var embed = document.createElement("embed");
embed.setAttribute('type', "application/vnd.unity"); embed.setAttribute("type", "application/vnd.unity");
embed.setAttribute('pluginspage', "http://www.unity3d.com/unity-web-player-2.x"); embed.setAttribute(
embed.setAttribute('id', "Unity_embed"); "pluginspage",
embed.setAttribute('width', "1280"); "http://www.unity3d.com/unity-web-player-2.x"
embed.setAttribute('height', "680"); );
embed.setAttribute('src', window.asseturl+"main.unity3d"); embed.setAttribute("id", "Unity_embed");
embed.setAttribute('disablecontdparaextmenu', "true"); embed.setAttribute("width", "1280");
embed.setAttribute('bordercolor', "000000"); embed.setAttribute("height", "680");
embed.setAttribute('backgroundcolor', "000000"); embed.setAttribute("src", window.asseturl + "main.unity3d");
embed.setAttribute('disableContextMenu', true); embed.setAttribute("disablecontdparaextmenu", "true");
embed.setAttribute('textcolor', "ccffff"); embed.setAttribute("bordercolor", "000000");
embed.setAttribute('logoimage', "assets/img/unity_dexlabs.png"); embed.setAttribute("backgroundcolor", "000000");
embed.setAttribute('progressbarimage', "assets/img/unity_loadingbar.png"); embed.setAttribute("disableContextMenu", true);
embed.setAttribute('progressframeimage', "assets/img/unity_loadingframe.png"); embed.setAttribute("textcolor", "ccffff");
embed.setAttribute('autoupdateurlsignature', "42180ee5edc4e3d4dd706bcc17cedd8d6ec7b7ac463071fd34ab97fe181f1a78df31db5feb4526677e4f69ef53acaff44471591e68b87f041c80fd54765f0d5725b08aa28f5acf7716ffb2a04e971269f35925c7e38d57dd78f6a206530caaa3da7e32f07f19810efc0ebf29a4eae976a925ad9cc5beb4dd51564c67dc489033"); embed.setAttribute("logoimage", "assets/img/unity_dexlabs.png");
embed.setAttribute('autoupdateurl', "http://wp-cartoonnetwork.unity3d.com/ff/big/beta-20111013/autodownload_webplugin_beta"); 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"
);
var div = document.getElementById('client'); var div = document.getElementById("client");
object.appendChild(embed); object.appendChild(embed);
div.appendChild(object); div.appendChild(object);
document.title = "OpenFusion"; document.title = "OpenFusion";

249
assets/js/serverselector.js
View File

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

442
index.html
View File

@ -1,27 +1,54 @@
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head>
<head> <meta charset="utf-8" />
<meta charset="utf-8"> <meta
<meta name="viewport" content="width=device-width, initial-scale=1.0, shrink-to-fit=no"> name="viewport"
content="width=device-width, initial-scale=1.0, shrink-to-fit=no"
/>
<title>OpenFusion: Server Selector</title> <title>OpenFusion: Server Selector</title>
<link rel="stylesheet" href="assets/bootstrap/css/bootstrap.min.css"> <link rel="stylesheet" href="assets/bootstrap/css/bootstrap.min.css" />
<link rel="stylesheet" href="assets/fonts/fontawesome-all.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/openfusion.css" />
<link rel="stylesheet" href="assets/css/styles.css"> <link rel="stylesheet" href="assets/css/styles.css" />
</head> </head>
<body style="background: rgb(0,0,0);width: 100%;height: 100%;margin: 0;padding: 0;clear:both;" onresize="onResize()"> <body
style="
background: rgb(0, 0, 0);
width: 100%;
height: 100%;
margin: 0;
padding: 0;
clear: both;
"
onresize="onResize()"
>
<section id="of-serverselector"> <section id="of-serverselector">
<div class="container" id="serverselector-container"> <div class="container" id="serverselector-container">
<div class="row text-center mt-3" id="of-logoheader"> <div class="row text-center mt-3" id="of-logoheader">
<div class="col"><img class="img-fluid" id="of-logo" src="assets/img/of-3.png" width="256"> <div class="col">
<p id="of-intro-text">Welcome to OpenFusion.<br>Select a server from the list below to get started.</p> <img
class="img-fluid"
id="of-logo"
src="assets/img/of-3.png"
width="256"
/>
<p id="of-intro-text">
Welcome to OpenFusion.<br />Select a server from the
list below to get started.
</p>
</div> </div>
</div> </div>
<div class="row d-sm-flex d-xl-flex justify-content-center justify-content-sm-center justify-content-xl-center" id="of-serverlist"> <div
class="row d-sm-flex d-xl-flex justify-content-center justify-content-sm-center justify-content-xl-center"
id="of-serverlist"
>
<div class="col-8 mb-2"> <div class="col-8 mb-2">
<div class="table-responsive text-center border rounded border-primary" id="server-table"> <div
class="table-responsive text-center border rounded border-primary"
id="server-table"
>
<table class="table table-striped table-hover mb-0"> <table class="table table-striped table-hover mb-0">
<thead> <thead>
<tr> <tr>
@ -31,102 +58,422 @@
</thead> </thead>
<tbody id="server-tablebody"> <tbody id="server-tablebody">
<tr id="server-listing-placeholder"> <tr id="server-listing-placeholder">
<td colspan="2">No servers added yet... perhaps you should find one?</td> <td colspan="2">
No servers added yet... perhaps you
should find one?
</td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
</div> </div>
</div> </div>
</div> </div>
<div class="row row-cols-2 d-xl-flex justify-content-center justify-content-xl-center" id="of-serverbuttons" style="padding-bottom: 16px;"> <div
<div class="col-4 text-left d-inline-flex justify-content-xl-start"> class="row row-cols-2 d-xl-flex justify-content-center justify-content-xl-center"
<button class="btn btn-success mr-1" data-toggle="modal" data-bs-tooltip="" data-placement="bottom" id="of-addserver-button" type="button" title="Add Server" data-target="#of-addservermodal" onclick="deselectServer()"><i class="fas fa-plus"></i></button> id="of-serverbuttons"
<button class="btn btn-primary mr-1 disabled" data-toggle="modal" data-bs-tooltip="" data-placement="bottom" id="of-editserver-button" type="button" title="Edit Server" data-target="#of-editservermodal" disabled=""><i class="fas fa-edit"></i></button> style="padding-bottom: 16px"
<button class="btn btn-danger mr-1 disabled" data-toggle="modal" data-bs-tooltip="" data-placement="bottom" id="of-deleteserver-button" type="button" title="Delete Server" data-target="#of-deleteservermodal" disabled=""><i class="fas fa-trash-alt"></i></button> >
<div
class="col-4 text-left d-inline-flex justify-content-xl-start"
>
<button
class="btn btn-success mr-1"
data-toggle="modal"
data-bs-tooltip=""
data-placement="bottom"
id="of-addserver-button"
type="button"
title="Add Server"
data-target="#of-addservermodal"
onclick="deselectServer()"
>
<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-editserver-button"
type="button"
title="Edit Server"
data-target="#of-editservermodal"
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-deleteserver-button"
type="button"
title="Delete Server"
data-target="#of-deleteservermodal"
disabled=""
>
<i class="fas fa-trash-alt"></i>
</button>
</div> </div>
<div class="col-4 d-inline-flex justify-content-end"> <div class="col-4 d-inline-flex justify-content-end">
<button class="btn btn-primary disabled" id="of-connect-button" type="button" onclick="connectToServer()" disabled="">Connect&nbsp;<i class="fas fa-angle-double-right"></i></button> <button
class="btn btn-primary disabled"
id="of-connect-button"
type="button"
onclick="connectToServer()"
disabled=""
>
Connect&nbsp;<i
class="fas fa-angle-double-right"
></i>
</button>
</div> </div>
</div> </div>
</div> </div>
<div class="modal fade" role="dialog" tabindex="-1" id="of-aboutmodal"> <div
class="modal fade"
role="dialog"
tabindex="-1"
id="of-aboutmodal"
>
<div class="modal-dialog modal-dialog-centered" role="document"> <div class="modal-dialog modal-dialog-centered" role="document">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<h4 class="modal-title">About OpenFusionClient</h4><button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button> <h4 class="modal-title">About OpenFusionClient</h4>
<button
type="button"
class="close"
data-dismiss="modal"
aria-label="Close"
>
<span aria-hidden="true">×</span>
</button>
</div> </div>
<div class="modal-body"> <div class="modal-body">
<p class="text-monospace">Version 1.4</p> <p class="text-monospace">Version 1.4</p>
<p>©2020-2022 OpenFusion Contributors<br>OpenFusion is licensed under MIT.<br></p> <p>
<a href="#of-restoreserversmodal" onclick="$('#of-aboutmodal').modal('toggle')" data-toggle="modal" data-target="#of-restoreserversmodal">Reset to Default Servers</a> ©2020-2022 OpenFusion Contributors<br />OpenFusion
is licensed under MIT.<br />
</p>
<a
href="#of-restoreserversmodal"
onclick="$('#of-aboutmodal').modal('toggle')"
data-toggle="modal"
data-target="#of-restoreserversmodal"
>Reset to Default Servers</a
>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<div class="row flex-fill"> <div class="row flex-fill">
<div class="col"><button class="btn btn-primary border rounded border-primary pb-1 pt-1 mr-2 pl-2 pr-2" data-toggle="tooltip" data-bs-tooltip="" type="button" title="Github Page" onclick="window.open(&#39;https://github.com/OpenFusionProject/OpenFusion&#39;,&#39;_blank&#39;);"><i class="fab fa-github" style="font-size: 24px;"></i></button><button class="btn btn-primary border rounded border-primary pb-1 pt-1 pl-2 pr-2" data-toggle="tooltip" data-bs-tooltip="" type="button" title="Discord Chat" onclick="window.open(&#39;https://discord.gg/DYavckB&#39;,&#39;_blank&#39;);"><i class="fab fa-discord" style="font-size: 24px; position:relative; top: 1px;"></i></button></div> <div class="col">
<div class="col text-right"><button class="btn btn-primary border rounded border-primary" type="button" data-dismiss="modal">Close</button></div> <button
class="btn btn-primary border rounded border-primary pb-1 pt-1 mr-2 pl-2 pr-2"
data-toggle="tooltip"
data-bs-tooltip=""
type="button"
title="Github Page"
onclick="window.open(&#39;https://github.com/OpenFusionProject/OpenFusion&#39;,&#39;_blank&#39;);"
>
<i
class="fab fa-github"
style="font-size: 24px"
></i></button
><button
class="btn btn-primary border rounded border-primary pb-1 pt-1 pl-2 pr-2"
data-toggle="tooltip"
data-bs-tooltip=""
type="button"
title="Discord Chat"
onclick="window.open(&#39;https://discord.gg/DYavckB&#39;,&#39;_blank&#39;);"
>
<i
class="fab fa-discord"
style="
font-size: 24px;
position: relative;
top: 1px;
"
></i>
</button>
</div>
<div class="col text-right">
<button
class="btn btn-primary border rounded border-primary"
type="button"
data-dismiss="modal"
>
Close
</button>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div class="modal fade" role="dialog" tabindex="-1" id="of-addservermodal"> </div>
<div
class="modal fade"
role="dialog"
tabindex="-1"
id="of-addservermodal"
>
<div class="modal-dialog modal-dialog-centered" role="document"> <div class="modal-dialog modal-dialog-centered" role="document">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<h4 class="modal-title">Add Server</h4><button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button> <h4 class="modal-title">Add Server</h4>
<button
type="button"
class="close"
data-dismiss="modal"
aria-label="Close"
>
<span aria-hidden="true">×</span>
</button>
</div> </div>
<div class="modal-body"> <div class="modal-body">
<form id="addserver-form" class="needs-validation"><label for="addserver-descinput">Server Description</label><input class="form-control form-row w-75" type="text" id="addserver-descinput" placeholder="My OpenFusion Server" required="" minlength="1" maxlength="70"><label for="addserver-ipinput">Server IP</label><input class="form-control form-row w-75" type="text" id="addserver-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]+$"><label for="addserver-versionselect">Game Version:&nbsp;</label><select class="form-control w-50" id="addserver-versionselect" required="" style="margin-left: -5px;"></select></form> <form id="addserver-form" class="needs-validation">
<label for="addserver-descinput"
>Server Description</label
><input
class="form-control form-row w-75"
type="text"
id="addserver-descinput"
placeholder="My OpenFusion Server"
required=""
minlength="1"
maxlength="70"
/><label for="addserver-ipinput"
>Server IP</label
><input
class="form-control form-row w-75"
type="text"
id="addserver-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]+$"
/><label for="addserver-versionselect"
>Game Version:&nbsp;</label
><select
class="form-control w-50"
id="addserver-versionselect"
required=""
style="margin-left: -5px"
></select>
</form>
</div> </div>
<div class="modal-footer"><button class="btn btn-primary border rounded border-primary btn-danger border-danger" id="addserver-cancel" type="button" data-dismiss="modal">Cancel</button><button class="btn btn-primary border rounded border-primary btn-success border-success" id="addserver-savebutton" type="submit" data-dismiss="modal" form="addserver-form" onclick="addServer();">Save</button></div> <div class="modal-footer">
<button
class="btn btn-primary border rounded border-primary btn-danger border-danger"
id="addserver-cancel"
type="button"
data-dismiss="modal"
>
Cancel</button
><button
class="btn btn-primary border rounded border-primary btn-success border-success"
id="addserver-savebutton"
type="submit"
data-dismiss="modal"
form="addserver-form"
onclick="addServer();"
>
Save
</button>
</div> </div>
</div> </div>
</div> </div>
<div class="modal fade" role="dialog" tabindex="-1" id="of-editservermodal"> </div>
<div
class="modal fade"
role="dialog"
tabindex="-1"
id="of-editservermodal"
>
<div class="modal-dialog modal-dialog-centered" role="document"> <div class="modal-dialog modal-dialog-centered" role="document">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<h4 class="modal-title">Edit Server</h4><button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button> <h4 class="modal-title">Edit Server</h4>
<button
type="button"
class="close"
data-dismiss="modal"
aria-label="Close"
>
<span aria-hidden="true">×</span>
</button>
</div> </div>
<div class="modal-body"> <div class="modal-body">
<form id="editserver-form" class="needs-validation"><label for="editserver-descinput">Server Description</label><input class="form-control form-row w-75" type="text" id="editserver-descinput" placeholder="My OpenFusion Server" required="" minlength="1" maxlength="70"><label for="addserver-ipinput">Server IP</label><input class="form-control form-row w-75" type="text" 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]+$"><label for="editserver-versionselect">Game Version:&nbsp;</label><select class="form-control w-50" id="editserver-versionselect" required="" style="margin-left: -5px;"></select></form> <form id="editserver-form" class="needs-validation">
<label for="editserver-descinput"
>Server Description</label
><input
class="form-control form-row w-75"
type="text"
id="editserver-descinput"
placeholder="My OpenFusion Server"
required=""
minlength="1"
maxlength="70"
/><label for="addserver-ipinput"
>Server IP</label
><input
class="form-control form-row w-75"
type="text"
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]+$"
/><label for="editserver-versionselect"
>Game Version:&nbsp;</label
><select
class="form-control w-50"
id="editserver-versionselect"
required=""
style="margin-left: -5px"
></select>
</form>
</div> </div>
<div class="modal-footer"><button class="btn btn-primary border rounded border-primary btn-danger border-danger" id="editserver-cancel" type="button" data-dismiss="modal">Cancel</button><button class="btn btn-primary border rounded border-primary btn-success border-success" id="addserver-savebutton" type="submit" data-dismiss="modal" form="editserver-form" onclick="editServer();">Save</button></div> <div class="modal-footer">
<button
class="btn btn-primary border rounded border-primary btn-danger border-danger"
id="editserver-cancel"
type="button"
data-dismiss="modal"
>
Cancel</button
><button
class="btn btn-primary border rounded border-primary btn-success border-success"
id="addserver-savebutton"
type="submit"
data-dismiss="modal"
form="editserver-form"
onclick="editServer();"
>
Save
</button>
</div> </div>
</div> </div>
</div> </div>
<div class="modal fade" role="dialog" tabindex="-1" id="of-deleteservermodal"> </div>
<div
class="modal fade"
role="dialog"
tabindex="-1"
id="of-deleteservermodal"
>
<div class="modal-dialog modal-dialog-centered" role="document"> <div class="modal-dialog modal-dialog-centered" role="document">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <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> <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>
<div class="modal-body"> <div class="modal-body">
<p class="lead">Do you really want to delete<br>"<a id="deleteserver-servername">SERVER_NAME</a>"?<br><br>You could always re-add it later.</p> <p class="lead">
Do you really want to delete<br />"<a
id="deleteserver-servername"
>SERVER_NAME</a
>"?<br /><br />You could always re-add it later.
</p>
</div> </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="deleteserver-button" type="button" data-dismiss="modal" onclick="deleteServer();">Yes, Delete</button></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="deleteserver-button"
type="button"
data-dismiss="modal"
onclick="deleteServer();"
>
Yes, Delete
</button>
</div> </div>
</div> </div>
</div> </div>
<div class="modal fade" role="dialog" tabindex="-1" id="of-restoreserversmodal"> </div>
<div
class="modal fade"
role="dialog"
tabindex="-1"
id="of-restoreserversmodal"
>
<div class="modal-dialog modal-dialog-centered" role="document"> <div class="modal-dialog modal-dialog-centered" role="document">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <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> <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>
<div class="modal-body"> <div class="modal-body">
<p class="lead">Do you really want to restore the default servers?</p> <p class="lead">
Do you really want to restore the default
servers?
</p>
</div> </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="deleteserver-button" type="button" data-dismiss="modal" onclick="restoreDefaultServers();">Yes, Restore</button></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="deleteserver-button"
type="button"
data-dismiss="modal"
onclick="restoreDefaultServers();"
>
Yes, Restore
</button>
</div> </div>
</div> </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> </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>
</section> </section>
<section> <section>
<div id="client" style="width: 100%;height: 100%;margin: 0;padding: 0;background: #000;clear:both;"></div> <div
id="client"
style="
width: 100%;
height: 100%;
margin: 0;
padding: 0;
background: #000;
clear: both;
"
></div>
</section> </section>
<script src="assets/js/jquery.min.js" onload="window.$ = window.jQuery = module.exports;"></script> <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/bootstrap/js/bootstrap.min.js"></script>
<script src="assets/js/bs-init.js"></script> <script src="assets/js/bs-init.js"></script>
<script src="assets/js/uuidv4.min.js"></script> <script src="assets/js/uuidv4.min.js"></script>
@ -134,6 +481,5 @@
<script src="assets/js/gameclient.js"></script> <script src="assets/js/gameclient.js"></script>
<script src="assets/js/snowflakes.min.js"></script> <script src="assets/js/snowflakes.min.js"></script>
<script src="assets/js/eastereggs.js"></script> <script src="assets/js/eastereggs.js"></script>
</body> </body>
</html> </html>

125
index.js
View File

@ -1,104 +1,136 @@
var app = require('app'); // Module to control application life. var app = require("app"); // Module to control application life.
var ipc = require('ipc'); var ipc = require("ipc");
var fs = require('fs-extra'); var fs = require("fs-extra");
var os = require('os'); var os = require("os");
var dialog = require('dialog'); var dialog = require("dialog");
var BrowserWindow = require('browser-window'); var BrowserWindow = require("browser-window");
var mainWindow = null; var mainWindow = null;
app.commandLine.appendSwitch('--enable-npapi'); app.commandLine.appendSwitch("--enable-npapi");
function initialSetup(firstTime) { function initialSetup(firstTime) {
// Display a small window to inform the user that the app is working // 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 = new BrowserWindow({
setupWindow.loadUrl('file://' + __dirname + '/initialsetup.html'); 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. // Exec installUnity.bat and wait for it to finish.
var child = require('child_process').spawn('cmd.exe', ['/c', 'utils\\installUnity.bat']); var child = require("child_process").spawn("cmd.exe", [
child.on('exit', function() { "/c",
"utils\\installUnity.bat",
]);
child.on("exit", function () {
console.log("Unity installed."); console.log("Unity installed.");
if(!firstTime) { // migration from pre-1.4 if (!firstTime) {
// migration from pre-1.4
// Back everything up, just in case // Back everything up, just in case
fs.copySync(app.getPath('userData')+"\\config.json", app.getPath('userData')+"\\config.json.bak"); fs.copySync(
fs.copySync(app.getPath('userData')+"\\servers.json", app.getPath('userData')+"\\servers.json.bak"); app.getPath("userData") + "\\config.json",
fs.copySync(app.getPath('userData')+"\\versions.json", app.getPath('userData')+"\\versions.json.bak"); app.getPath("userData") + "\\config.json.bak"
} else { // first-time setup );
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 // Copy default servers
fs.copySync(__dirname+"\\defaults\\servers.json", app.getPath('userData')+"\\servers.json"); fs.copySync(
__dirname + "\\defaults\\servers.json",
app.getPath("userData") + "\\servers.json"
);
} }
// Copy default versions and config // Copy default versions and config
fs.copySync(__dirname+"\\defaults\\versions.json", app.getPath('userData')+"\\versions.json"); fs.copySync(
fs.copySync(__dirname+"\\defaults\\config.json", app.getPath('userData')+"\\config.json"); __dirname + "\\defaults\\versions.json",
app.getPath("userData") + "\\versions.json"
);
fs.copySync(
__dirname + "\\defaults\\config.json",
app.getPath("userData") + "\\config.json"
);
console.log("JSON files copied."); console.log("JSON files copied.");
setupWindow.destroy(); setupWindow.destroy();
showMainWindow(); showMainWindow();
}) });
} }
ipc.on("exit", function(id) { ipc.on("exit", function (id) {
mainWindow.destroy(); mainWindow.destroy();
}); });
// Quit when all windows are closed. // Quit when all windows are closed.
app.on('window-all-closed', function() { app.on("window-all-closed", function () {
if (process.platform != 'darwin') if (process.platform != "darwin") app.quit();
app.quit();
}); });
app.on('ready', function() { app.on("ready", function () {
// Check just in case the user forgot to extract the zip. // Check just in case the user forgot to extract the zip.
zip_check = app.getPath('exe').includes(os.tmpdir()); zip_check = app.getPath("exe").includes(os.tmpdir());
if (zip_check) { if (zip_check) {
errormsg = errormsg =
( "It has been detected that OpenFusionClient is running from the TEMP folder.\n\n"+ "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."); "Please extract the entire Client folder to a location of your choice before starting OpenFusionClient.";
dialog.showErrorBox("Error!", errormsg); dialog.showErrorBox("Error!", errormsg);
return; return;
} }
// Create the browser window. // Create the browser window.
mainWindow = new BrowserWindow({width: 1280, height: 720, show: false, "web-preferences": {"plugins": true}}); mainWindow = new BrowserWindow({
width: 1280,
height: 720,
show: false,
"web-preferences": { plugins: true },
});
mainWindow.setMinimumSize(640, 480); mainWindow.setMinimumSize(640, 480);
// Check for first run // Check for first run
var configPath = app.getPath('userData') + "\\config.json"; var configPath = app.getPath("userData") + "\\config.json";
try { try {
if (!fs.existsSync(configPath)) { if (!fs.existsSync(configPath)) {
console.log("Config file not found. Running initial setup."); console.log("Config file not found. Running initial setup.");
initialSetup(true); initialSetup(true);
} else { } else {
var config = fs.readJsonSync(configPath); var config = fs.readJsonSync(configPath);
if(!config['last-version-initialized']) { if (!config["last-version-initialized"]) {
console.log("Pre-1.4 config detected. Running migration."); console.log("Pre-1.4 config detected. Running migration.");
initialSetup(false); initialSetup(false);
} else { } else {
showMainWindow(); showMainWindow();
} }
} }
} catch(e) { } catch (e) {
console.log("An error occurred while checking for the config."); console.log("An error occurred while checking for the config.");
} }
// Makes it so external links are opened in the system browser, not Electron // Makes it so external links are opened in the system browser, not Electron
mainWindow.webContents.on('new-window', function(e, url) { mainWindow.webContents.on("new-window", function (e, url) {
e.preventDefault(); e.preventDefault();
require('shell').openExternal(url); require("shell").openExternal(url);
}); });
mainWindow.on('closed', function() { mainWindow.on("closed", function () {
mainWindow = null; mainWindow = null;
}); });
}); });
function showMainWindow() { function showMainWindow() {
// Load the index.html of the app. // Load the index.html of the app.
mainWindow.loadUrl('file://' + __dirname + '/index.html'); mainWindow.loadUrl("file://" + __dirname + "/index.html");
// Reduces white flash when opening the program // Reduces white flash when opening the program
mainWindow.webContents.on('did-finish-load', function() { mainWindow.webContents.on("did-finish-load", function () {
mainWindow.show(); mainWindow.show();
// everything's loaded, tell the renderer process to do its thing // everything's loaded, tell the renderer process to do its thing
mainWindow.webContents.executeJavaScript("loadConfig();"); mainWindow.webContents.executeJavaScript("loadConfig();");
@ -106,26 +138,29 @@ function showMainWindow() {
mainWindow.webContents.executeJavaScript("loadServerList();"); mainWindow.webContents.executeJavaScript("loadServerList();");
}); });
mainWindow.webContents.on('plugin-crashed', function() { mainWindow.webContents.on("plugin-crashed", function () {
console.log("Unity Web Player crashed."); console.log("Unity Web Player crashed.");
}); });
mainWindow.webContents.on('will-navigate', function(evt, url) { mainWindow.webContents.on("will-navigate", function (evt, url) {
evt.preventDefault(); evt.preventDefault();
// TODO: showMessageBox rather than showErrorBox? // TODO: showMessageBox rather than showErrorBox?
switch (url) { switch (url) {
case "https://audience.fusionfall.com/ff/regWizard.do?_flowId=fusionfall-registration-flow": case "https://audience.fusionfall.com/ff/regWizard.do?_flowId=fusionfall-registration-flow":
errormsg = errormsg =
( "The register page is currently unimplemented.\n\n"+ "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\". "+ '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!"); "Your account will then be automatically created on the server. \nBe sure to remember these details!";
dialog.showErrorBox("Sorry!", errormsg); dialog.showErrorBox("Sorry!", errormsg);
break; break;
case "https://audience.fusionfall.com/ff/login.do": case "https://audience.fusionfall.com/ff/login.do":
dialog.showErrorBox("Sorry!", "Account management is not available."); dialog.showErrorBox(
"Sorry!",
"Account management is not available."
);
break; break;
case "http://forums.fusionfall.com/": case "http://forums.fusionfall.com/":
require('shell').openExternal("https://discord.gg/DYavckB"); require("shell").openExternal("https://discord.gg/DYavckB");
break; break;
default: default:
mainWindow.webContents.loadURL(url); mainWindow.webContents.loadURL(url);

38
initialsetup.html
View File

@ -1,18 +1,40 @@
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
<title>OpenFusion: Initial Setup</title> <title>OpenFusion: Initial Setup</title>
</head> </head>
<body style="overflow:hidden;background-color:#000;user-select:none;-webkit-user-select:none;"> <body
style="
overflow: hidden;
background-color: #000;
user-select: none;
-webkit-user-select: none;
"
>
<center> <center>
<div><img src="assets/img/of-3.png" width="256">
<div> <div>
<img src="assets/img/spinner.gif" width=50px/> <img src="assets/img/of-3.png" width="256" />
<div>
<img src="assets/img/spinner.gif" width="50px" />
</div> </div>
<div style="margin-top: 15px;"> <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> <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>
</div> </div>
</center> </center>
</body> </body>
</html> </html>

24
package-lock.json generated
View File

@ -15,7 +15,8 @@
"devDependencies": { "devDependencies": {
"electron-builder": "^22.10.5", "electron-builder": "^22.10.5",
"electron-prebuilt": "^0.31.2", "electron-prebuilt": "^0.31.2",
"patch-package": "^6.4.7" "patch-package": "^6.4.7",
"prettier": "^2.7.1"
} }
}, },
"node_modules/@develar/schema-utils": { "node_modules/@develar/schema-utils": {
@ -3403,6 +3404,21 @@
"node": ">=4" "node": ">=4"
} }
}, },
"node_modules/prettier": {
"version": "2.7.1",
"resolved": "https://registry.npmjs.org/prettier/-/prettier-2.7.1.tgz",
"integrity": "sha512-ujppO+MkdPqoVINuDFDRLClm7D78qbDt0/NR+wp5FqEZOoTNAjPHWj17QRhu7geIHJfcNhRk1XVQmF8Bp3ye+g==",
"dev": true,
"bin": {
"prettier": "bin-prettier.js"
},
"engines": {
"node": ">=10.13.0"
},
"funding": {
"url": "https://github.com/prettier/prettier?sponsor=1"
}
},
"node_modules/pretty-bytes": { "node_modules/pretty-bytes": {
"version": "1.0.4", "version": "1.0.4",
"resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-1.0.4.tgz", "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-1.0.4.tgz",
@ -7272,6 +7288,12 @@
"integrity": "sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=", "integrity": "sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=",
"dev": true "dev": true
}, },
"prettier": {
"version": "2.7.1",
"resolved": "https://registry.npmjs.org/prettier/-/prettier-2.7.1.tgz",
"integrity": "sha512-ujppO+MkdPqoVINuDFDRLClm7D78qbDt0/NR+wp5FqEZOoTNAjPHWj17QRhu7geIHJfcNhRk1XVQmF8Bp3ye+g==",
"dev": true
},
"pretty-bytes": { "pretty-bytes": {
"version": "1.0.4", "version": "1.0.4",
"resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-1.0.4.tgz", "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-1.0.4.tgz",

6
package.json
View File

@ -8,14 +8,16 @@
"start": "electron .", "start": "electron .",
"build": "node build.js", "build": "node build.js",
"pack": "electron-builder --win --ia32 --dir", "pack": "electron-builder --win --ia32 --dir",
"dist": "electron-builder --win --ia32" "dist": "electron-builder --win --ia32",
"prettier": "npx prettier --write ."
}, },
"author": "OpenFusion Contributors", "author": "OpenFusion Contributors",
"license": "MIT", "license": "MIT",
"devDependencies": { "devDependencies": {
"electron-builder": "^22.10.5",
"electron-prebuilt": "^0.31.2", "electron-prebuilt": "^0.31.2",
"patch-package": "^6.4.7", "patch-package": "^6.4.7",
"electron-builder": "^22.10.5" "prettier": "^2.7.1"
}, },
"repository": { "repository": {
"type": "git", "type": "git",