Bump copyright date to 2024 and version to 1.5.2; update build.yml

Fixes #21

.github/workflows/build.yml

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

LICENSE.md

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

assets/js/server-selector.js

@@ -48,7 +48,7 @@ function setAppVersionText() {
 }
 
 function addServer() {
-    var jsonToModify = remotefs.readJsonSync(serversPath);
+    var jsonToModify = JSON.parse(remotefs.readFileSync(serversPath));
 
     var server = {};
     server["uuid"] = uuidv4();
@@ -70,7 +70,7 @@ function addServer() {
 }
 
 function editServer() {
-    var jsonToModify = remotefs.readJsonSync(serversPath);
+    var jsonToModify = JSON.parse(remotefs.readFileSync(serversPath));
     $.each(jsonToModify["servers"], function (key, value) {
         if (value["uuid"] == getSelectedServer()) {
             value["description"] =
@@ -92,7 +92,7 @@ function editServer() {
 }
 
 function deleteServer() {
-    var jsonToModify = remotefs.readJsonSync(serversPath);
+    var jsonToModify = JSON.parse(remotefs.readFileSync(serversPath));
     var result = jsonToModify["servers"].filter(function (obj) {
         return obj.uuid === getSelectedServer();
     })[0];
@@ -166,10 +166,6 @@ function performCacheSwap(newVersion) {
     var currentCache = path.join(cacheRoot, "FusionFall");
     var newCache = path.join(cacheRoot, newVersion);
     var record = path.join(userData, ".lastver");
-    var lastVersion = remotefs.readFileSync(record, (encoding = "utf8"));
-
-    // Make note of what version we are launching for next launch
-    remotefs.writeFileSync(record, newVersion);
 
     // If cache renaming would result in a no-op (ex. launching the same version
     // two times), then skip it. This avoids permissions errors with multiple clients
@@ -179,6 +175,7 @@ function performCacheSwap(newVersion) {
     if (remotefs.existsSync(currentCache)) {
         // Cache already exists, find out what version it belongs to
         if (remotefs.existsSync(record)) {
+            var lastVersion = remotefs.readFileSync(record, (encoding = "utf8"));
             if (lastVersion != newVersion) {
                 // Remove the directory we're trying to store the
                 // existing cache to if it already exists for whatever
@@ -198,6 +195,9 @@ function performCacheSwap(newVersion) {
         }
     }
 
+    // Make note of what version we are launching for next launch
+    remotefs.writeFileSync(record, newVersion);
+    
     if (remotefs.existsSync(newCache) && !skip) {
         // Rename saved cache to FusionFall
         remotefs.renameSync(newCache, currentCache);

build/OpenFusionClient.exe.manifest

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

defaults/config.json

@@ -1,5 +1,5 @@
 {
     "autoupdate-check": true,
     "cache-swapping": true,
-    "last-version-initialized": "1.4"
+    "last-version-initialized": "1.5"
 }

index.html

@@ -149,7 +149,7 @@
                                 APP_VERSION_NUMBER
                             </p>
                             <p>
-                                ©2020-2023 OpenFusion Contributors<br />OpenFusion
+                                ©2020-2024 OpenFusion Contributors<br />OpenFusion
                                 is licensed under MIT.<br />
                             </p>
                             <a

package-lock.json

@@ -1,12 +1,12 @@
 {
     "name": "OpenFusionClient",
-    "version": "1.4.1",
+    "version": "1.5.2",
     "lockfileVersion": 2,
     "requires": true,
     "packages": {
         "": {
             "name": "OpenFusionClient",
-            "version": "1.4.1",
+            "version": "1.5.2",
             "hasInstallScript": true,
             "license": "MIT",
             "dependencies": {

package.json

@@ -1,13 +1,13 @@
 {
     "name": "OpenFusionClient",
-    "version": "1.4.3",
+    "version": "1.5.2",
     "description": "OpenFusionClient",
     "main": "index.js",
     "scripts": {
         "postinstall": "npx patch-package && npm explore electron-prebuilt -- npm run postinstall",
         "start": "electron .",
         "pack": "electron-builder --win --ia32 --dir",
-        "dist": "electron-builder --win --ia32",
+        "dist": "electron-builder --win --ia32 --publish=never",
         "prettier": "npx prettier --write ."
     },
     "author": "OpenFusion Contributors",