mirror of
https://git.sanhost.net/sanasol/hytale-f2p.git
synced 2026-02-26 06:41:47 -03:00
fix: replace pacman build with pkg.tar.zst and remove its deps, changed CF and Discord key mode
This commit is contained in:
38
.github/workflows/release.yml
vendored
38
.github/workflows/release.yml
vendored
@@ -13,11 +13,11 @@ jobs:
|
|||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
# FIX Install bsdtar for Pacman builds
|
# Not needed anymore due to the removal of Pacman builds
|
||||||
- name: Install build dependencies
|
# - name: Install build dependencies
|
||||||
run: |
|
# run: |
|
||||||
sudo apt-get update
|
# sudo apt-get update
|
||||||
sudo apt-get install -y libarchive-tools
|
# sudo apt-get install -y libarchive-tools
|
||||||
|
|
||||||
- uses: actions/setup-node@v4
|
- uses: actions/setup-node@v4
|
||||||
with:
|
with:
|
||||||
@@ -25,14 +25,6 @@ jobs:
|
|||||||
cache: 'npm'
|
cache: 'npm'
|
||||||
- run: npm ci
|
- run: npm ci
|
||||||
|
|
||||||
- name: Create .env file
|
|
||||||
env:
|
|
||||||
CF_KEY: ${{ secrets.CURSEFORGE_API_KEY }}
|
|
||||||
DISCORD_ID: ${{ secrets.DISCORD_CLIENT_ID }}
|
|
||||||
run: |
|
|
||||||
echo "CURSEFORGE_API_KEY=$CF_KEY" > .env
|
|
||||||
echo "DISCORD_CLIENT_ID=$DISCORD_ID" >> .env
|
|
||||||
|
|
||||||
- name: Build Linux Packages
|
- name: Build Linux Packages
|
||||||
run: |
|
run: |
|
||||||
npx electron-builder --linux --x64 --arm64 --publish never
|
npx electron-builder --linux --x64 --arm64 --publish never
|
||||||
@@ -44,7 +36,7 @@ jobs:
|
|||||||
dist/*.AppImage.blockmap
|
dist/*.AppImage.blockmap
|
||||||
dist/*.deb
|
dist/*.deb
|
||||||
dist/*.rpm
|
dist/*.rpm
|
||||||
dist/*.pacman
|
dist/*.pkg.tar.zst
|
||||||
dist/latest-linux.yml
|
dist/latest-linux.yml
|
||||||
|
|
||||||
build-windows:
|
build-windows:
|
||||||
@@ -57,14 +49,6 @@ jobs:
|
|||||||
cache: 'npm'
|
cache: 'npm'
|
||||||
- run: npm ci
|
- run: npm ci
|
||||||
|
|
||||||
- name: Create .env file
|
|
||||||
env:
|
|
||||||
CF_KEY: ${{ secrets.CURSEFORGE_API_KEY }}
|
|
||||||
DISCORD_ID: ${{ secrets.DISCORD_CLIENT_ID }}
|
|
||||||
run: |
|
|
||||||
echo "CURSEFORGE_API_KEY=$CF_KEY" > .env
|
|
||||||
echo "DISCORD_CLIENT_ID=$DISCORD_ID" >> .env
|
|
||||||
|
|
||||||
- name: Build Windows Packages
|
- name: Build Windows Packages
|
||||||
run: npx electron-builder --win --publish never
|
run: npx electron-builder --win --publish never
|
||||||
- uses: actions/upload-artifact@v4
|
- uses: actions/upload-artifact@v4
|
||||||
@@ -85,15 +69,7 @@ jobs:
|
|||||||
cache: 'npm'
|
cache: 'npm'
|
||||||
- run: npm ci
|
- run: npm ci
|
||||||
|
|
||||||
- name: Create .env file
|
- name: Build macOS Packages
|
||||||
env:
|
|
||||||
CF_KEY: ${{ secrets.CURSEFORGE_API_KEY }}
|
|
||||||
DISCORD_ID: ${{ secrets.DISCORD_CLIENT_ID }}
|
|
||||||
run: |
|
|
||||||
echo "CURSEFORGE_API_KEY=$CF_KEY" > .env
|
|
||||||
echo "DISCORD_CLIENT_ID=$DISCORD_ID" >> .env
|
|
||||||
|
|
||||||
- name: Build Windows Packages
|
|
||||||
run: npx electron-builder --mac --publish never
|
run: npx electron-builder --mac --publish never
|
||||||
- uses: actions/upload-artifact@v4
|
- uses: actions/upload-artifact@v4
|
||||||
with:
|
with:
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
|
|
||||||
let API_KEY = "$2a$10$bqk254NMZOWVTzLVJCcxEOmhcyUujKxA5xk.kQCN9q0KNYFJd5b32";
|
let CF_API_KEY = "$2a$10$bqk254NMZOWVTzLVJCcxEOmhcyUujKxA5xk.kQCN9q0KNYFJd5b32";
|
||||||
const CURSEFORGE_API = 'https://api.curseforge.com/v1';
|
const CURSEFORGE_API = 'https://api.curseforge.com/v1';
|
||||||
const HYTALE_GAME_ID = 70216;
|
const HYTALE_GAME_ID = 70216;
|
||||||
|
|
||||||
@@ -13,7 +13,7 @@ let modsTotalPages = 1;
|
|||||||
export async function initModsManager() {
|
export async function initModsManager() {
|
||||||
try {
|
try {
|
||||||
if (window.electronAPI && window.electronAPI.getEnvVar) {
|
if (window.electronAPI && window.electronAPI.getEnvVar) {
|
||||||
console.log('Loaded API Key:', API_KEY ? 'Yes' : 'No');
|
console.log('Loaded API Key:', CF_API_KEY ? 'Yes' : 'No');
|
||||||
}
|
}
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
console.error('Failed to load API Key:', err);
|
console.error('Failed to load API Key:', err);
|
||||||
@@ -196,7 +196,7 @@ async function loadBrowseMods() {
|
|||||||
browseContainer.innerHTML = `<div class="loading-mods"><div class="loading-spinner"></div><span>${window.i18n ? window.i18n.t('mods.loadingMods') : 'Loading mods from CurseForge...'}</span></div>`;
|
browseContainer.innerHTML = `<div class="loading-mods"><div class="loading-spinner"></div><span>${window.i18n ? window.i18n.t('mods.loadingMods') : 'Loading mods from CurseForge...'}</span></div>`;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
if (!API_KEY || API_KEY.length < 10) {
|
if (!CF_API_KEY || CF_API_KEY.length < 10) {
|
||||||
browseContainer.innerHTML = `
|
browseContainer.innerHTML = `
|
||||||
<div class=\"empty-browse-mods\">
|
<div class=\"empty-browse-mods\">
|
||||||
<i class=\"fas fa-key\"></i>
|
<i class=\"fas fa-key\"></i>
|
||||||
@@ -223,7 +223,7 @@ async function loadBrowseMods() {
|
|||||||
|
|
||||||
const response = await fetch(url, {
|
const response = await fetch(url, {
|
||||||
headers: {
|
headers: {
|
||||||
'x-api-key': API_KEY,
|
'x-api-key': CF_API_KEY,
|
||||||
'Accept': 'application/json'
|
'Accept': 'application/json'
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ const { getModsPath, getProfilesDir } = require('../core/paths');
|
|||||||
const { saveModsToConfig, loadModsFromConfig } = require('../core/config');
|
const { saveModsToConfig, loadModsFromConfig } = require('../core/config');
|
||||||
const profileManager = require('./profileManager');
|
const profileManager = require('./profileManager');
|
||||||
|
|
||||||
const API_KEY = process.env.CURSEFORGE_API_KEY;
|
const CF_API_KEY = "$2a$10$bqk254NMZOWVTzLVJCcxEOmhcyUujKxA5xk.kQCN9q0KNYFJd5b32";
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get the physical mods path for a specific profile.
|
* Get the physical mods path for a specific profile.
|
||||||
@@ -120,7 +120,7 @@ async function downloadMod(modInfo) {
|
|||||||
if (!downloadUrl && modInfo.fileId && modInfo.modId) {
|
if (!downloadUrl && modInfo.fileId && modInfo.modId) {
|
||||||
const response = await axios.get(`https://api.curseforge.com/v1/mods/${modInfo.modId || modInfo.curseForgeId}/files/${modInfo.fileId || modInfo.curseForgeFileId}`, {
|
const response = await axios.get(`https://api.curseforge.com/v1/mods/${modInfo.modId || modInfo.curseForgeId}/files/${modInfo.fileId || modInfo.curseForgeFileId}`, {
|
||||||
headers: {
|
headers: {
|
||||||
'x-api-key': modInfo.apiKey || API_KEY,
|
'x-api-key': modInfo.apiKey || CF_API_KEY,
|
||||||
'Accept': 'application/json'
|
'Accept': 'application/json'
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@@ -393,7 +393,7 @@ async function syncModsForCurrentProfile() {
|
|||||||
...mod,
|
...mod,
|
||||||
modId: mod.curseForgeId,
|
modId: mod.curseForgeId,
|
||||||
fileId: mod.curseForgeFileId || mod.fileId,
|
fileId: mod.curseForgeFileId || mod.fileId,
|
||||||
apiKey: API_KEY
|
apiKey: CF_API_KEY
|
||||||
});
|
});
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
console.error(`[ModManager] Auto-repair failed for "${mod.name}": ${err.message}`);
|
console.error(`[ModManager] Auto-repair failed for "${mod.name}": ${err.message}`);
|
||||||
|
|||||||
2
main.js
2
main.js
@@ -30,7 +30,7 @@ let mainWindow;
|
|||||||
let discordRPC = null;
|
let discordRPC = null;
|
||||||
|
|
||||||
// Discord Rich Presence setup
|
// Discord Rich Presence setup
|
||||||
const DISCORD_CLIENT_ID = process.env.DISCORD_CLIENT_ID;
|
const DISCORD_CLIENT_ID = 1462244937868513373;
|
||||||
|
|
||||||
function initDiscordRPC() {
|
function initDiscordRPC() {
|
||||||
try {
|
try {
|
||||||
|
|||||||
Reference in New Issue
Block a user