OpenPunk/Client
1
0
Fork 0
mirror of https://github.com/OpenFusionProject/Client.git synced 2024-11-24 22:31:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #18 from hichemfantar/patch-prettier

Browse Source 
configure prettier for a prettier project
This commit is contained in:
CakeLancelot 2022-09-12 16:47:42 -05:00 committed by GitHub
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;
} }

6
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();
}); });

14
assets/js/eastereggs.js
View File

@ -7,13 +7,13 @@ 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();
} }
} }

104
assets/js/gameclient.js
View File

@ -5,7 +5,7 @@ var gameRunning = false;
// Uncomment and enter credentials to skip login screen // Uncomment and enter credentials to skip login screen
function authDoCallback(param) { function authDoCallback(param) {
/*var unity = document.getElementById('Unity_embed'); /*var unity = document.getElementById('Unity_embed');
unity.SendMessage("GlobalManager", "SetTEGid", "player"); unity.SendMessage("GlobalManager", "SetTEGid", "player");
unity.SendMessage("GlobalManager", "SetAuthid", "0"); unity.SendMessage("GlobalManager", "SetAuthid", "0");
unity.SendMessage("GlobalManager", "DoAuth", 0);*/ unity.SendMessage("GlobalManager", "DoAuth", 0);*/
@ -14,67 +14,85 @@ function authDoCallback(param) {
function MarkProgress(param) {} function MarkProgress(param) {}
function redirect(html) { function redirect(html) {
ipc.send("exit", 0); ipc.send("exit", 0);
} }
function HomePage(param) { function HomePage(param) {
ipc.send("exit", 0); ipc.send("exit", 0);
} }
function PageOut(param) { function PageOut(param) {
ipc.send("exit", 0); ipc.send("exit", 0);
} }
function updateSocialOptions(param) { function updateSocialOptions(param) {
ipc.send("exit", 0); ipc.send("exit", 0);
} }
function PayPage(param) { function PayPage(param) {
ipc.send("exit", 0); ipc.send("exit", 0);
} }
// Unity invoked methods end // // Unity invoked methods end //
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";
} }
} }
function launchGame() { function launchGame() {
gameRunning = true; gameRunning = true;
var sel = document.getElementById("of-serverselector"); var sel = document.getElementById("of-serverselector");
sel.remove(); sel.remove();
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";
onResize(); onResize();
} }

441
assets/js/serverselector.js
View File

@ -1,269 +1,328 @@
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"
//server['endpoint'] = : $("#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); jsontomodify["servers"].push(server);
remotefs.writeFileSync(userdir+"\\servers.json", JSON.stringify(jsontomodify, null, 4)); remotefs.writeFileSync(
loadServerList(); userdir + "\\servers.json",
JSON.stringify(jsontomodify, null, 4)
);
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(
loadServerList(); userdir + "\\servers.json",
JSON.stringify(jsontomodify, null, 4)
);
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(
loadServerList(); userdir + "\\servers.json",
JSON.stringify(jsontomodify, null, 4)
);
loadServerList();
} }
function restoreDefaultServers() { function restoreDefaultServers() {
remotefs.copySync(__dirname+"\\defaults\\servers.json", userdir+"\\servers.json"); remotefs.copySync(
loadServerList(); __dirname + "\\defaults\\servers.json",
userdir + "\\servers.json"
);
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);
$("#server-tablebody").append(row); $("#server-tablebody").append(row);
}); });
} 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"]) {
// Cache folder renaming // if cache swapping property exists AND is `true`, run cache swapping logic
var cachedir = userdir + '\\..\\..\\LocalLow\\Unity\\Web Player\\Cache'; // Cache folder renaming
var curversion = cachedir + '\\Fusionfall'; var cachedir = userdir + "\\..\\..\\LocalLow\\Unity\\Web Player\\Cache";
var newversion = cachedir + '\\' + gameversion.name; var curversion = cachedir + "\\Fusionfall";
var record = userdir + '\\.lastver'; var newversion = cachedir + "\\" + gameversion.name;
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"
);
}
}
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/"
); );
}
}
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 { } else {
console.log("Err: " + err.code); // 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);
} }
prepConnection(address, port);
});
else {
console.log(address + " is an IP; skipping DNS lookup");
prepConnection(address, port);
}
} }
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();
} }
// Returns the UUID of the server with the selected background color. // 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. // Yes, there are probably better ways to go about this, but it works well enough.
function getSelectedServer() { function getSelectedServer() {
return $("#server-tablebody > tr.bg-primary").prop("id"); return $("#server-tablebody > tr.bg-primary").prop("id");
} }
function connectToServer() { function connectToServer() {
// Get ID of the selected server, which corresponds to its UUID in the json // Get ID of the selected server, which corresponds to its UUID in the json
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);
}); });
} }
// 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(
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 jsontomodify = JSON.parse(remotefs.readFileSync(userdir+"\\servers.json")); var versionIndex = -1;
$.each(jsontomodify["servers"], function( key, value ) { $.each($("#editserver-versionselect")[0], function (key, val) {
if(value["uuid"] == getSelectedServer()) { if (val.text === value["version"]) {
$("#editserver-descinput")[0].value = value['description']; versionIndex = key;
$("#editserver-ipinput")[0].value = value['ip']; }
});
var versionIndex = -1; $("#editserver-versionselect")[0].selectedIndex = versionIndex;
$.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) { $("#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) {
$("#deleteserver-servername").html(result.description); return obj.uuid === getSelectedServer();
})[0];
$("#deleteserver-servername").html(result.description);
}); });

2
defaults/config.json
View File

@ -2,4 +2,4 @@
"autoupdate-check": true, "autoupdate-check": true,
"cache-swapping": true, "cache-swapping": true,
"last-version-initialized": "1.4" "last-version-initialized": "1.4"
} }

576
index.html
View File

@ -1,139 +1,485 @@
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head>
<meta charset="utf-8" />
<meta
name="viewport"
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/fonts/fontawesome-all.min.css" />
<link rel="stylesheet" href="assets/css/openfusion.css" />
<link rel="stylesheet" href="assets/css/styles.css" />
</head>
<head> <body
<meta charset="utf-8"> style="
<meta name="viewport" content="width=device-width, initial-scale=1.0, shrink-to-fit=no"> background: rgb(0, 0, 0);
<title>OpenFusion: Server Selector</title> width: 100%;
<link rel="stylesheet" href="assets/bootstrap/css/bootstrap.min.css"> height: 100%;
<link rel="stylesheet" href="assets/fonts/fontawesome-all.min.css"> margin: 0;
<link rel="stylesheet" href="assets/css/openfusion.css"> padding: 0;
<link rel="stylesheet" href="assets/css/styles.css"> clear: both;
</head> "
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
<div class="row d-sm-flex d-xl-flex justify-content-center justify-content-sm-center justify-content-xl-center" id="of-serverlist"> class="row d-sm-flex d-xl-flex justify-content-center justify-content-sm-center justify-content-xl-center"
<div class="col-8 mb-2"> id="of-serverlist"
<div class="table-responsive text-center border rounded border-primary" id="server-table"> >
<table class="table table-striped table-hover mb-0"> <div class="col-8 mb-2">
<thead> <div
<tr> class="table-responsive text-center border rounded border-primary"
<th>Description</th> id="server-table"
<th>Game Version</th> >
</tr> <table class="table table-striped table-hover mb-0">
</thead> <thead>
<tbody id="server-tablebody"> <tr>
<tr id="server-listing-placeholder"> <th>Description</th>
<td colspan="2">No servers added yet... perhaps you should find one?</td> <th>Game Version</th>
</tr> </tr>
</tbody> </thead>
</table> <tbody id="server-tablebody">
<tr id="server-listing-placeholder">
<td colspan="2">
No servers added yet... perhaps you
should find one?
</td>
</tr>
</tbody>
</table>
</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
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 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>
</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="modal fade"
<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> role="dialog"
<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> tabindex="-1"
<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> id="of-aboutmodal"
</div> >
<div class="col-4 d-inline-flex justify-content-end"> <div class="modal-dialog modal-dialog-centered" role="document">
<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 class="modal-content">
</div> <div class="modal-header">
</div> <h4 class="modal-title">About OpenFusionClient</h4>
</div> <button
<div class="modal fade" role="dialog" tabindex="-1" id="of-aboutmodal"> type="button"
<div class="modal-dialog modal-dialog-centered" role="document"> class="close"
<div class="modal-content"> data-dismiss="modal"
<div class="modal-header"> aria-label="Close"
<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> <span aria-hidden="true">×</span>
<div class="modal-body"> </button>
<p class="text-monospace">Version 1.4</p> </div>
<p>©2020-2022 OpenFusion Contributors<br>OpenFusion is licensed under MIT.<br></p> <div class="modal-body">
<a href="#of-restoreserversmodal" onclick="$('#of-aboutmodal').modal('toggle')" data-toggle="modal" data-target="#of-restoreserversmodal">Reset to Default Servers</a> <p class="text-monospace">Version 1.4</p>
</div> <p>
<div class="modal-footer"> ©2020-2022 OpenFusion Contributors<br />OpenFusion
<div class="row flex-fill"> is licensed under MIT.<br />
<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> </p>
<div class="col text-right"><button class="btn btn-primary border rounded border-primary" type="button" data-dismiss="modal">Close</button></div> <a
href="#of-restoreserversmodal"
onclick="$('#of-aboutmodal').modal('toggle')"
data-toggle="modal"
data-target="#of-restoreserversmodal"
>Reset to Default Servers</a
>
</div>
<div class="modal-footer">
<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 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> <div
<div class="modal fade" role="dialog" tabindex="-1" id="of-addservermodal"> class="modal fade"
<div class="modal-dialog modal-dialog-centered" role="document"> role="dialog"
<div class="modal-content"> tabindex="-1"
<div class="modal-header"> id="of-addservermodal"
<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 class="modal-dialog modal-dialog-centered" role="document">
<div class="modal-content">
<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>
</div>
<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>
</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 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>
</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
<div class="modal fade" role="dialog" tabindex="-1" id="of-editservermodal"> class="modal fade"
<div class="modal-dialog modal-dialog-centered" role="document"> role="dialog"
<div class="modal-content"> tabindex="-1"
<div class="modal-header"> id="of-editservermodal"
<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 class="modal-dialog modal-dialog-centered" role="document">
<div class="modal-content">
<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>
</div>
<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>
</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 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>
</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
<div class="modal fade" role="dialog" tabindex="-1" id="of-deleteservermodal"> class="modal fade"
<div class="modal-dialog modal-dialog-centered" role="document"> role="dialog"
<div class="modal-content"> tabindex="-1"
<div class="modal-header"> id="of-deleteservermodal"
<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 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="deleteserver-servername"
>SERVER_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="deleteserver-button"
type="button"
data-dismiss="modal"
onclick="deleteServer();"
>
Yes, Delete
</button>
</div>
</div> </div>
<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>
</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
<div class="modal fade" role="dialog" tabindex="-1" id="of-restoreserversmodal"> class="modal fade"
<div class="modal-dialog modal-dialog-centered" role="document"> role="dialog"
<div class="modal-content"> tabindex="-1"
<div class="modal-header"> id="of-restoreserversmodal"
<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 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
servers?
</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="deleteserver-button"
type="button"
data-dismiss="modal"
onclick="restoreDefaultServers();"
>
Yes, Restore
</button>
</div>
</div> </div>
<div class="modal-body">
<p class="lead">Do you really want to restore the default servers?</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="deleteserver-button" type="button" data-dismiss="modal" onclick="restoreDefaultServers();">Yes, Restore</button></div>
</div> </div>
</div> </div>
</div> <div id="of-versionnumber">
<div id="of-versionnumber"><a class="text-monospace text-secondary" href="#of-aboutmodal" data-toggle="modal" data-target="#of-aboutmodal">v1.4</a></div> <a
</section> class="text-monospace text-secondary"
<section> href="#of-aboutmodal"
<div id="client" style="width: 100%;height: 100%;margin: 0;padding: 0;background: #000;clear:both;"></div> data-toggle="modal"
</section> data-target="#of-aboutmodal"
<script src="assets/js/jquery.min.js" onload="window.$ = window.jQuery = module.exports;"></script> >v1.4</a
<script src="assets/bootstrap/js/bootstrap.min.js"></script> >
<script src="assets/js/bs-init.js"></script> </div>
<script src="assets/js/uuidv4.min.js"></script> </section>
<script src="assets/js/serverselector.js"></script> <section>
<script src="assets/js/gameclient.js"></script> <div
<script src="assets/js/snowflakes.min.js"></script> id="client"
<script src="assets/js/eastereggs.js"></script> style="
</body> width: 100%;
height: 100%;
margin: 0;
padding: 0;
background: #000;
clear: both;
"
></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/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/snowflakes.min.js"></script>
<script src="assets/js/eastereggs.js"></script>
</body>
</html> </html>

257
index.js
View File

@ -1,134 +1,169 @@
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,
// Exec installUnity.bat and wait for it to finish. height: 450,
var child = require('child_process').spawn('cmd.exe', ['/c', 'utils\\installUnity.bat']); resizable: false,
child.on('exit', function() { center: true,
console.log("Unity installed."); frame: false,
if(!firstTime) { // migration from pre-1.4 });
// Back everything up, just in case setupWindow.loadUrl("file://" + __dirname + "/initialsetup.html");
fs.copySync(app.getPath('userData')+"\\config.json", app.getPath('userData')+"\\config.json.bak"); // Exec installUnity.bat and wait for it to finish.
fs.copySync(app.getPath('userData')+"\\servers.json", app.getPath('userData')+"\\servers.json.bak"); var child = require("child_process").spawn("cmd.exe", [
fs.copySync(app.getPath('userData')+"\\versions.json", app.getPath('userData')+"\\versions.json.bak"); "/c",
} else { // first-time setup "utils\\installUnity.bat",
// Copy default servers ]);
fs.copySync(__dirname+"\\defaults\\servers.json", app.getPath('userData')+"\\servers.json"); 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"
);
}
// 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"
console.log("JSON files copied."); );
setupWindow.destroy(); fs.copySync(
showMainWindow(); __dirname + "\\defaults\\config.json",
}) app.getPath("userData") + "\\config.json"
);
console.log("JSON files copied.");
setupWindow.destroy();
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.
mainWindow = new BrowserWindow({width: 1280, height: 720, show: false, "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.");
initialSetup(false);
} else {
showMainWindow();
}
} }
} catch(e) {
console.log("An error occurred while checking for the config.");
}
// Makes it so external links are opened in the system browser, not Electron // Create the browser window.
mainWindow.webContents.on('new-window', function(e, url) { mainWindow = new BrowserWindow({
e.preventDefault(); width: 1280,
require('shell').openExternal(url); height: 720,
}); show: false,
"web-preferences": { plugins: true },
});
mainWindow.setMinimumSize(640, 480);
mainWindow.on('closed', function() { // Check for first run
mainWindow = null; 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.");
initialSetup(false);
} else {
showMainWindow();
}
}
} catch (e) {
console.log("An error occurred while checking for the config.");
}
// Makes it so external links are opened in the system browser, not Electron
mainWindow.webContents.on("new-window", function (e, url) {
e.preventDefault();
require("shell").openExternal(url);
});
mainWindow.on("closed", function () {
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();");
mainWindow.webContents.executeJavaScript("loadGameVersions();"); mainWindow.webContents.executeJavaScript("loadGameVersions();");
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(
break; "Sorry!",
case "http://forums.fusionfall.com/": "Account management is not available."
require('shell').openExternal("https://discord.gg/DYavckB"); );
break; break;
default: case "http://forums.fusionfall.com/":
mainWindow.webContents.loadURL(url); require("shell").openExternal("https://discord.gg/DYavckB");
} break;
}); default:
mainWindow.webContents.loadURL(url);
}
});
} }

50
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
<center> style="
<div><img src="assets/img/of-3.png" width="256"> overflow: hidden;
background-color: #000;
user-select: none;
-webkit-user-select: none;
"
>
<center>
<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 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> </div>
<div style="margin-top: 15px;"> </center>
<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> </body>
</div> </html>
</div>
</center>
</body>
</html>

16390
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

130
package.json
View File

@ -1,69 +1,71 @@
{ {
"name": "openfusionclient", "name": "openfusionclient",
"version": "1.4.0", "version": "1.4.0",
"description": "OpenFusionClient", "description": "OpenFusionClient",
"main": "index.js", "main": "index.js",
"scripts": { "scripts": {
"postinstall": "npx patch-package && npm explore electron-prebuilt -- npm run postinstall", "postinstall": "npx patch-package && npm explore electron-prebuilt -- npm run postinstall",
"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",
"license": "MIT",
"devDependencies": {
"electron-prebuilt": "^0.31.2",
"patch-package": "^6.4.7",
"electron-builder": "^22.10.5"
},
"repository": {
"type": "git",
"url": "https://github.com/OpenFusionProject/Client.git"
},
"build": {
"appId": "xyz.openfusion.client",
"productName": "OpenFusionClient",
"copyright": "© 2020-2022 OpenFusion Contributors",
"electronDownload": {
"version": "0.31.2",
"platform": "win32",
"arch": "ia32"
}, },
"electronVersion": "0.31.2", "author": "OpenFusion Contributors",
"win": { "license": "MIT",
"asar": false, "devDependencies": {
"target": [ "electron-builder": "^22.10.5",
{ "electron-prebuilt": "^0.31.2",
"target": "nsis", "patch-package": "^6.4.7",
"arch": "ia32" "prettier": "^2.7.1"
},
"repository": {
"type": "git",
"url": "https://github.com/OpenFusionProject/Client.git"
},
"build": {
"appId": "xyz.openfusion.client",
"productName": "OpenFusionClient",
"copyright": "© 2020-2022 OpenFusion Contributors",
"electronDownload": {
"version": "0.31.2",
"platform": "win32",
"arch": "ia32"
}, },
{ "electronVersion": "0.31.2",
"target": "zip", "win": {
"arch": "ia32" "asar": false,
} "target": [
] {
"target": "nsis",
"arch": "ia32"
},
{
"target": "zip",
"arch": "ia32"
}
]
},
"nsis": {
"createDesktopShortcut": true,
"createStartMenuShortcut": true
},
"files": [
"!patches${/*}",
"!*.php",
"!rankurl.txt",
"!README.md",
"!.npmrc"
],
"extraFiles": [
{
"from": "build/utils",
"to": "utils"
}
],
"afterPack": "./build/delete-default-app.js"
}, },
"nsis": { "dependencies": {
"createDesktopShortcut": true, "fs-extra": "^0.30.0"
"createStartMenuShortcut": true }
},
"files": [
"!patches${/*}",
"!*.php",
"!rankurl.txt",
"!README.md",
"!.npmrc"
],
"extraFiles": [
{
"from": "build/utils",
"to": "utils"
}
],
"afterPack": "./build/delete-default-app.js"
},
"dependencies": {
"fs-extra": "^0.30.0"
}
} }