mirror of
https://git.sanhost.net/sanasol/hytale-f2p
synced 2026-02-26 17:31:48 -03:00
merge branch 'main' (lost 4 commits) into develop
This commit is contained in:
Fazri Gading
0
.env.example
Normal file
0
.env.example
Normal file
@@ -635,6 +635,20 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<!-- Installation effects overlay -->
|
||||||
|
<div id="installationEffects" class="installation-effects" style="display: none;">
|
||||||
|
<div class="space-effects">
|
||||||
|
<div class="warp-line"></div>
|
||||||
|
<div class="warp-line"></div>
|
||||||
|
<div class="warp-line"></div>
|
||||||
|
<div class="warp-line"></div>
|
||||||
|
<div class="warp-line"></div>
|
||||||
|
<div class="warp-line"></div>
|
||||||
|
<div class="warp-line"></div>
|
||||||
|
<div class="warp-line"></div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
<div id="chatUsernameModal" class="chat-username-modal" style="display: none;">
|
<div id="chatUsernameModal" class="chat-username-modal" style="display: none;">
|
||||||
<div class="chat-username-modal-content">
|
<div class="chat-username-modal-content">
|
||||||
<div class="chat-username-modal-header">
|
<div class="chat-username-modal-header">
|
||||||
|
|||||||
@@ -207,6 +207,11 @@ function setupSettingsElements() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
if (closeLauncherCheck) {
|
||||||
|
closeLauncherCheck.addEventListener('change', saveCloseLauncher);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
// UUID event listeners
|
// UUID event listeners
|
||||||
if (copyUuidBtn) {
|
if (copyUuidBtn) {
|
||||||
copyUuidBtn.addEventListener('click', copyCurrentUuid);
|
copyUuidBtn.addEventListener('click', copyCurrentUuid);
|
||||||
@@ -392,6 +397,31 @@ async function loadCloseLauncher() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
async function saveCloseLauncher() {
|
||||||
|
try {
|
||||||
|
if (window.electronAPI && window.electronAPI.saveCloseLauncher && closeLauncherCheck) {
|
||||||
|
const enabled = closeLauncherCheck.checked;
|
||||||
|
await window.electronAPI.saveCloseLauncher(enabled);
|
||||||
|
}
|
||||||
|
} catch (error) {
|
||||||
|
console.error('Error saving close launcher setting:', error);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function loadCloseLauncher() {
|
||||||
|
try {
|
||||||
|
if (window.electronAPI && window.electronAPI.loadCloseLauncher) {
|
||||||
|
const enabled = await window.electronAPI.loadCloseLauncher();
|
||||||
|
if (closeLauncherCheck) {
|
||||||
|
closeLauncherCheck.checked = enabled;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} catch (error) {
|
||||||
|
console.error('Error loading close launcher setting:', error);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
async function savePlayerName() {
|
async function savePlayerName() {
|
||||||
try {
|
try {
|
||||||
if (!window.electronAPI || !settingsPlayerName) return;
|
if (!window.electronAPI || !settingsPlayerName) return;
|
||||||
|
|||||||
@@ -638,6 +638,9 @@ function setupUI() {
|
|||||||
// Setup retry button
|
// Setup retry button
|
||||||
setupRetryButton();
|
setupRetryButton();
|
||||||
|
|
||||||
|
// Setup draggable progress bar
|
||||||
|
setupProgressDrag();
|
||||||
|
|
||||||
lockPlayButton(true);
|
lockPlayButton(true);
|
||||||
|
|
||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
@@ -738,7 +741,6 @@ window.LauncherUI = {
|
|||||||
|
|
||||||
// Make installation effects globally available
|
// Make installation effects globally available
|
||||||
|
|
||||||
|
|
||||||
// Draggable progress bar functionality
|
// Draggable progress bar functionality
|
||||||
function setupProgressDrag() {
|
function setupProgressDrag() {
|
||||||
if (!progressOverlay) return;
|
if (!progressOverlay) return;
|
||||||
|
|||||||
818
GUI/style.css
818
GUI/style.css
@@ -1770,252 +1770,252 @@ body {
|
|||||||
animation: shimmer 2s infinite;
|
animation: shimmer 2s infinite;
|
||||||
}
|
}
|
||||||
|
|
||||||
@keyframes shimmer {
|
@keyframes shimmer {
|
||||||
0% {
|
0% {
|
||||||
left: -100%;
|
left: -100%;
|
||||||
}
|
}
|
||||||
|
|
||||||
100% {
|
100% {
|
||||||
left: 100%;
|
left: 100%;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Progress Error and Retry Styles */
|
/* Progress Error and Retry Styles */
|
||||||
.progress-error-container {
|
.progress-error-container {
|
||||||
margin-top: 0.75rem;
|
margin-top: 0.75rem;
|
||||||
padding-top: 0.75rem;
|
padding-top: 0.75rem;
|
||||||
border-top: 1px solid rgba(239, 68, 68, 0.3);
|
border-top: 1px solid rgba(239, 68, 68, 0.3);
|
||||||
animation: errorSlideIn 0.3s ease-out;
|
animation: errorSlideIn 0.3s ease-out;
|
||||||
}
|
}
|
||||||
|
|
||||||
@keyframes errorSlideIn {
|
@keyframes errorSlideIn {
|
||||||
from {
|
from {
|
||||||
opacity: 0;
|
opacity: 0;
|
||||||
transform: translateY(-10px);
|
transform: translateY(-10px);
|
||||||
}
|
}
|
||||||
to {
|
to {
|
||||||
opacity: 1;
|
opacity: 1;
|
||||||
transform: translateY(0);
|
transform: translateY(0);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.progress-error-message {
|
.progress-error-message {
|
||||||
color: #f87171;
|
color: #f87171;
|
||||||
font-family: 'JetBrains Mono', monospace;
|
font-family: 'JetBrains Mono', monospace;
|
||||||
font-size: 0.75rem;
|
font-size: 0.75rem;
|
||||||
margin-bottom: 0.5rem;
|
margin-bottom: 0.5rem;
|
||||||
text-shadow: 0 0 8px rgba(248, 113, 113, 0.4);
|
text-shadow: 0 0 8px rgba(248, 113, 113, 0.4);
|
||||||
line-height: 1.4;
|
line-height: 1.4;
|
||||||
}
|
}
|
||||||
|
|
||||||
.progress-retry-section {
|
.progress-retry-section {
|
||||||
display: flex;
|
display: flex;
|
||||||
justify-content: space-between;
|
justify-content: space-between;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
gap: 0.75rem;
|
gap: 0.75rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
.progress-retry-buttons {
|
.progress-retry-buttons {
|
||||||
display: flex;
|
display: flex;
|
||||||
gap: 0.5rem;
|
gap: 0.5rem;
|
||||||
flex-wrap: wrap;
|
flex-wrap: wrap;
|
||||||
}
|
}
|
||||||
|
|
||||||
.progress-retry-info {
|
.progress-retry-info {
|
||||||
color: #fbbf24;
|
color: #fbbf24;
|
||||||
font-family: 'JetBrains Mono', monospace;
|
font-family: 'JetBrains Mono', monospace;
|
||||||
font-size: 0.7rem;
|
font-size: 0.7rem;
|
||||||
flex: 1;
|
flex: 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
.progress-retry-btn {
|
.progress-retry-btn {
|
||||||
background: linear-gradient(135deg, #dc2626, #ef4444);
|
background: linear-gradient(135deg, #dc2626, #ef4444);
|
||||||
color: white;
|
color: white;
|
||||||
border: none;
|
border: none;
|
||||||
padding: 0.5rem 1rem;
|
padding: 0.5rem 1rem;
|
||||||
border-radius: 6px;
|
border-radius: 6px;
|
||||||
font-family: 'JetBrains Mono', monospace;
|
font-family: 'JetBrains Mono', monospace;
|
||||||
font-size: 0.75rem;
|
font-size: 0.75rem;
|
||||||
font-weight: 600;
|
font-weight: 600;
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
transition: all 0.2s ease;
|
transition: all 0.2s ease;
|
||||||
box-shadow: 0 2px 8px rgba(220, 38, 38, 0.3);
|
box-shadow: 0 2px 8px rgba(220, 38, 38, 0.3);
|
||||||
white-space: nowrap;
|
white-space: nowrap;
|
||||||
min-width: 120px;
|
min-width: 120px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.progress-retry-btn:hover {
|
.progress-retry-btn:hover {
|
||||||
background: linear-gradient(135deg, #b91c1c, #dc2626);
|
background: linear-gradient(135deg, #b91c1c, #dc2626);
|
||||||
transform: translateY(-1px);
|
transform: translateY(-1px);
|
||||||
box-shadow: 0 4px 12px rgba(220, 38, 38, 0.4);
|
box-shadow: 0 4px 12px rgba(220, 38, 38, 0.4);
|
||||||
}
|
}
|
||||||
|
|
||||||
.progress-retry-btn:active {
|
.progress-retry-btn:active {
|
||||||
transform: translateY(0);
|
transform: translateY(0);
|
||||||
box-shadow: 0 2px 6px rgba(220, 38, 38, 0.3);
|
box-shadow: 0 2px 6px rgba(220, 38, 38, 0.3);
|
||||||
}
|
}
|
||||||
|
|
||||||
.progress-retry-btn:disabled {
|
.progress-retry-btn:disabled {
|
||||||
background: linear-gradient(135deg, #4b5563, #6b7280);
|
background: linear-gradient(135deg, #4b5563, #6b7280);
|
||||||
cursor: not-allowed;
|
cursor: not-allowed;
|
||||||
transform: none;
|
transform: none;
|
||||||
box-shadow: none;
|
box-shadow: none;
|
||||||
opacity: 0.6;
|
opacity: 0.6;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Progress overlay error state */
|
/* Progress overlay error state */
|
||||||
.progress-overlay.error-state {
|
.progress-overlay.error-state {
|
||||||
border-color: rgba(239, 68, 68, 0.5);
|
border-color: rgba(239, 68, 68, 0.5);
|
||||||
box-shadow:
|
box-shadow:
|
||||||
0 4px 16px rgba(0, 0, 0, 0.5),
|
0 4px 16px rgba(0, 0, 0, 0.5),
|
||||||
0 0 30px rgba(239, 68, 68, 0.2),
|
0 0 30px rgba(239, 68, 68, 0.2),
|
||||||
inset 0 1px 0 rgba(255, 255, 255, 0.05);
|
inset 0 1px 0 rgba(255, 255, 255, 0.05);
|
||||||
}
|
}
|
||||||
|
|
||||||
.progress-overlay.error-state #progressBarFill {
|
.progress-overlay.error-state #progressBarFill {
|
||||||
background: linear-gradient(90deg, #dc2626, #ef4444);
|
background: linear-gradient(90deg, #dc2626, #ef4444);
|
||||||
animation: errorPulse 1.5s ease-in-out infinite;
|
animation: errorPulse 1.5s ease-in-out infinite;
|
||||||
}
|
}
|
||||||
|
|
||||||
@keyframes errorPulse {
|
@keyframes errorPulse {
|
||||||
0%, 100% {
|
0%, 100% {
|
||||||
opacity: 0.8;
|
opacity: 0.8;
|
||||||
}
|
}
|
||||||
50% {
|
50% {
|
||||||
opacity: 1;
|
opacity: 1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Error type specific styling */
|
/* Error type specific styling */
|
||||||
.progress-error-container.error-network {
|
.progress-error-container.error-network {
|
||||||
border-top-color: rgba(59, 130, 246, 0.5);
|
border-top-color: rgba(59, 130, 246, 0.5);
|
||||||
}
|
}
|
||||||
|
|
||||||
.progress-error-container.error-network .progress-error-message {
|
.progress-error-container.error-network .progress-error-message {
|
||||||
color: #60a5fa;
|
color: #60a5fa;
|
||||||
text-shadow: 0 0 8px rgba(96, 165, 250, 0.4);
|
text-shadow: 0 0 8px rgba(96, 165, 250, 0.4);
|
||||||
}
|
}
|
||||||
|
|
||||||
.progress-error-container.error-stall {
|
.progress-error-container.error-stall {
|
||||||
border-top-color: rgba(245, 158, 11, 0.5);
|
border-top-color: rgba(245, 158, 11, 0.5);
|
||||||
}
|
}
|
||||||
|
|
||||||
.progress-error-container.error-stall .progress-error-message {
|
.progress-error-container.error-stall .progress-error-message {
|
||||||
color: #fbbf24;
|
color: #fbbf24;
|
||||||
text-shadow: 0 0 8px rgba(251, 191, 36, 0.4);
|
text-shadow: 0 0 8px rgba(251, 191, 36, 0.4);
|
||||||
}
|
}
|
||||||
|
|
||||||
.progress-error-container.error-file {
|
.progress-error-container.error-file {
|
||||||
border-top-color: rgba(239, 68, 68, 0.5);
|
border-top-color: rgba(239, 68, 68, 0.5);
|
||||||
}
|
}
|
||||||
|
|
||||||
.progress-error-container.error-file .progress-error-message {
|
.progress-error-container.error-file .progress-error-message {
|
||||||
color: #f87171;
|
color: #f87171;
|
||||||
text-shadow: 0 0 8px rgba(248, 113, 113, 0.4);
|
text-shadow: 0 0 8px rgba(248, 113, 113, 0.4);
|
||||||
}
|
}
|
||||||
|
|
||||||
.progress-error-container.error-permission {
|
.progress-error-container.error-permission {
|
||||||
border-top-color: rgba(168, 85, 247, 0.5);
|
border-top-color: rgba(168, 85, 247, 0.5);
|
||||||
}
|
}
|
||||||
|
|
||||||
.progress-error-container.error-permission .progress-error-message {
|
.progress-error-container.error-permission .progress-error-message {
|
||||||
color: #a855f7;
|
color: #a855f7;
|
||||||
text-shadow: 0 0 8px rgba(168, 85, 247, 0.4);
|
text-shadow: 0 0 8px rgba(168, 85, 247, 0.4);
|
||||||
}
|
}
|
||||||
|
|
||||||
.progress-error-container.error-server {
|
.progress-error-container.error-server {
|
||||||
border-top-color: rgba(236, 72, 153, 0.5);
|
border-top-color: rgba(236, 72, 153, 0.5);
|
||||||
}
|
}
|
||||||
|
|
||||||
.progress-error-container.error-server .progress-error-message {
|
.progress-error-container.error-server .progress-error-message {
|
||||||
color: #ec4899;
|
color: #ec4899;
|
||||||
text-shadow: 0 0 8px rgba(236, 72, 153, 0.4);
|
text-shadow: 0 0 8px rgba(236, 72, 153, 0.4);
|
||||||
}
|
}
|
||||||
|
|
||||||
.progress-error-container.error-corruption {
|
.progress-error-container.error-corruption {
|
||||||
border-top-color: rgba(220, 38, 38, 0.8);
|
border-top-color: rgba(220, 38, 38, 0.8);
|
||||||
}
|
}
|
||||||
|
|
||||||
.progress-error-container.error-corruption .progress-error-message {
|
.progress-error-container.error-corruption .progress-error-message {
|
||||||
color: #dc2626;
|
color: #dc2626;
|
||||||
text-shadow: 0 0 8px rgba(220, 38, 38, 0.6);
|
text-shadow: 0 0 8px rgba(220, 38, 38, 0.6);
|
||||||
font-weight: 600;
|
font-weight: 600;
|
||||||
}
|
}
|
||||||
|
|
||||||
.progress-error-container.error-butler {
|
.progress-error-container.error-butler {
|
||||||
border-top-color: rgba(245, 158, 11, 0.5);
|
border-top-color: rgba(245, 158, 11, 0.5);
|
||||||
}
|
}
|
||||||
|
|
||||||
.progress-error-container.error-butler .progress-error-message {
|
.progress-error-container.error-butler .progress-error-message {
|
||||||
color: #f59e0b;
|
color: #f59e0b;
|
||||||
text-shadow: 0 0 8px rgba(245, 158, 11, 0.4);
|
text-shadow: 0 0 8px rgba(245, 158, 11, 0.4);
|
||||||
}
|
}
|
||||||
|
|
||||||
.progress-error-container.error-space {
|
.progress-error-container.error-space {
|
||||||
border-top-color: rgba(168, 85, 247, 0.5);
|
border-top-color: rgba(168, 85, 247, 0.5);
|
||||||
}
|
}
|
||||||
|
|
||||||
.progress-error-container.error-space .progress-error-message {
|
.progress-error-container.error-space .progress-error-message {
|
||||||
color: #a855f7;
|
color: #a855f7;
|
||||||
text-shadow: 0 0 8px rgba(168, 85, 247, 0.4);
|
text-shadow: 0 0 8px rgba(168, 85, 247, 0.4);
|
||||||
}
|
}
|
||||||
|
|
||||||
.progress-error-container.error-conflict {
|
.progress-error-container.error-conflict {
|
||||||
border-top-color: rgba(6, 182, 212, 0.5);
|
border-top-color: rgba(6, 182, 212, 0.5);
|
||||||
}
|
}
|
||||||
|
|
||||||
.progress-error-container.error-conflict .progress-error-message {
|
.progress-error-container.error-conflict .progress-error-message {
|
||||||
color: #06b6d4;
|
color: #06b6d4;
|
||||||
text-shadow: 0 0 8px rgba(6, 182, 212, 0.4);
|
text-shadow: 0 0 8px rgba(6, 182, 212, 0.4);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Connection quality indicators */
|
/* Connection quality indicators */
|
||||||
.progress-details {
|
.progress-details {
|
||||||
transition: all 0.3s ease;
|
transition: all 0.3s ease;
|
||||||
}
|
}
|
||||||
|
|
||||||
.progress-details #progressSize {
|
.progress-details #progressSize {
|
||||||
transition: color 0.5s ease;
|
transition: color 0.5s ease;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Enhanced retry button states */
|
/* Enhanced retry button states */
|
||||||
.progress-retry-btn.retrying {
|
.progress-retry-btn.retrying {
|
||||||
background: linear-gradient(135deg, #059669, #10b981);
|
background: linear-gradient(135deg, #059669, #10b981);
|
||||||
animation: retryingPulse 1s ease-in-out infinite;
|
animation: retryingPulse 1s ease-in-out infinite;
|
||||||
}
|
}
|
||||||
|
|
||||||
@keyframes retryingPulse {
|
@keyframes retryingPulse {
|
||||||
0%, 100% {
|
0%, 100% {
|
||||||
transform: scale(1);
|
transform: scale(1);
|
||||||
box-shadow: 0 2px 8px rgba(5, 150, 105, 0.3);
|
box-shadow: 0 2px 8px rgba(5, 150, 105, 0.3);
|
||||||
}
|
}
|
||||||
50% {
|
50% {
|
||||||
transform: scale(1.05);
|
transform: scale(1.05);
|
||||||
box-shadow: 0 4px 12px rgba(5, 150, 105, 0.4);
|
box-shadow: 0 4px 12px rgba(5, 150, 105, 0.4);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Network status indicator (optional future enhancement) */
|
/* Network status indicator (optional future enhancement) */
|
||||||
.network-status {
|
.network-status {
|
||||||
position: absolute;
|
position: absolute;
|
||||||
top: 5px;
|
top: 5px;
|
||||||
right: 5px;
|
right: 5px;
|
||||||
width: 8px;
|
width: 8px;
|
||||||
height: 8px;
|
height: 8px;
|
||||||
border-radius: 50%;
|
border-radius: 50%;
|
||||||
background: #10b981;
|
background: #10b981;
|
||||||
box-shadow: 0 0 6px rgba(16, 185, 129, 0.6);
|
box-shadow: 0 0 6px rgba(16, 185, 129, 0.6);
|
||||||
}
|
}
|
||||||
|
|
||||||
.network-status.poor {
|
.network-status.poor {
|
||||||
background: #f87171;
|
background: #f87171;
|
||||||
box-shadow: 0 0 6px rgba(248, 113, 113, 0.6);
|
box-shadow: 0 0 6px rgba(248, 113, 113, 0.6);
|
||||||
}
|
}
|
||||||
|
|
||||||
.network-status.fair {
|
.network-status.fair {
|
||||||
background: #fbbf24;
|
background: #fbbf24;
|
||||||
box-shadow: 0 0 6px rgba(251, 191, 36, 0.6);
|
box-shadow: 0 0 6px rgba(251, 191, 36, 0.6);
|
||||||
}
|
}
|
||||||
|
|
||||||
.progress-bar-fill {
|
.progress-bar-fill {
|
||||||
height: 100%;
|
height: 100%;
|
||||||
@@ -5990,167 +5990,167 @@ select.settings-input option {
|
|||||||
to {
|
to {
|
||||||
opacity: 1;
|
opacity: 1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
/* Launcher Update Modal Styles */
|
/* Launcher Update Modal Styles */
|
||||||
.update-modal-overlay {
|
.update-modal-overlay {
|
||||||
position: fixed;
|
position: fixed;
|
||||||
top: 0;
|
top: 0;
|
||||||
left: 0;
|
left: 0;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
height: 100%;
|
height: 100%;
|
||||||
background: rgba(0, 0, 0, 0.85);
|
background: rgba(0, 0, 0, 0.85);
|
||||||
backdrop-filter: blur(10px);
|
backdrop-filter: blur(10px);
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
justify-content: center;
|
justify-content: center;
|
||||||
z-index: 100000;
|
z-index: 100000;
|
||||||
animation: fadeIn 0.3s ease;
|
animation: fadeIn 0.3s ease;
|
||||||
}
|
}
|
||||||
|
|
||||||
.update-modal {
|
.update-modal {
|
||||||
background: linear-gradient(135deg, #1a1a2e 0%, #16213e 100%);
|
background: linear-gradient(135deg, #1a1a2e 0%, #16213e 100%);
|
||||||
border: 2px solid rgba(147, 51, 234, 0.3);
|
border: 2px solid rgba(147, 51, 234, 0.3);
|
||||||
border-radius: 16px;
|
border-radius: 16px;
|
||||||
padding: 2rem;
|
padding: 2rem;
|
||||||
max-width: 500px;
|
max-width: 500px;
|
||||||
width: 90%;
|
width: 90%;
|
||||||
box-shadow: 0 20px 60px rgba(147, 51, 234, 0.3);
|
box-shadow: 0 20px 60px rgba(147, 51, 234, 0.3);
|
||||||
animation: slideUp 0.3s ease;
|
animation: slideUp 0.3s ease;
|
||||||
}
|
}
|
||||||
|
|
||||||
@keyframes slideUp {
|
@keyframes slideUp {
|
||||||
from {
|
from {
|
||||||
transform: translateY(30px);
|
transform: translateY(30px);
|
||||||
opacity: 0;
|
opacity: 0;
|
||||||
}
|
}
|
||||||
to {
|
to {
|
||||||
transform: translateY(0);
|
transform: translateY(0);
|
||||||
opacity: 1;
|
opacity: 1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.update-header {
|
.update-header {
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
gap: 1rem;
|
gap: 1rem;
|
||||||
margin-bottom: 1.5rem;
|
margin-bottom: 1.5rem;
|
||||||
color: #9333ea;
|
color: #9333ea;
|
||||||
}
|
}
|
||||||
|
|
||||||
.update-header i {
|
.update-header i {
|
||||||
font-size: 2rem;
|
font-size: 2rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
.update-header h2 {
|
.update-header h2 {
|
||||||
margin: 0;
|
margin: 0;
|
||||||
font-size: 1.5rem;
|
font-size: 1.5rem;
|
||||||
color: #fff;
|
color: #fff;
|
||||||
}
|
}
|
||||||
|
|
||||||
.update-content {
|
.update-content {
|
||||||
color: #e0e0e0;
|
color: #e0e0e0;
|
||||||
margin-bottom: 1.5rem;
|
margin-bottom: 1.5rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
.update-version {
|
.update-version {
|
||||||
font-size: 1.2rem;
|
font-size: 1.2rem;
|
||||||
font-weight: 600;
|
font-weight: 600;
|
||||||
color: #9333ea;
|
color: #9333ea;
|
||||||
margin-bottom: 0.5rem;
|
margin-bottom: 0.5rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
.current-version {
|
.current-version {
|
||||||
color: #888;
|
color: #888;
|
||||||
font-size: 0.9rem;
|
font-size: 0.9rem;
|
||||||
margin-bottom: 1rem;
|
margin-bottom: 1rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
.release-notes {
|
.release-notes {
|
||||||
background: rgba(0, 0, 0, 0.3);
|
background: rgba(0, 0, 0, 0.3);
|
||||||
border-left: 3px solid #9333ea;
|
border-left: 3px solid #9333ea;
|
||||||
padding: 1rem;
|
padding: 1rem;
|
||||||
border-radius: 8px;
|
border-radius: 8px;
|
||||||
max-height: 200px;
|
max-height: 200px;
|
||||||
overflow-y: auto;
|
overflow-y: auto;
|
||||||
font-size: 0.9rem;
|
font-size: 0.9rem;
|
||||||
line-height: 1.6;
|
line-height: 1.6;
|
||||||
}
|
}
|
||||||
|
|
||||||
.update-progress {
|
.update-progress {
|
||||||
margin-bottom: 1.5rem;
|
margin-bottom: 1.5rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
.progress-bar-container {
|
.progress-bar-container {
|
||||||
background: rgba(0, 0, 0, 0.3);
|
background: rgba(0, 0, 0, 0.3);
|
||||||
border-radius: 10px;
|
border-radius: 10px;
|
||||||
height: 20px;
|
height: 20px;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
margin-bottom: 0.5rem;
|
margin-bottom: 0.5rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
.progress-bar {
|
.progress-bar {
|
||||||
height: 100%;
|
height: 100%;
|
||||||
background: linear-gradient(90deg, #9333ea 0%, #7c3aed 100%);
|
background: linear-gradient(90deg, #9333ea 0%, #7c3aed 100%);
|
||||||
width: 0%;
|
width: 0%;
|
||||||
transition: width 0.3s ease;
|
transition: width 0.3s ease;
|
||||||
border-radius: 10px;
|
border-radius: 10px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.progress-text {
|
.progress-text {
|
||||||
color: #aaa;
|
color: #aaa;
|
||||||
font-size: 0.9rem;
|
font-size: 0.9rem;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
margin: 0;
|
margin: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
.update-note {
|
.update-note {
|
||||||
background: rgba(147, 51, 234, 0.1);
|
background: rgba(147, 51, 234, 0.1);
|
||||||
border: 1px solid rgba(147, 51, 234, 0.3);
|
border: 1px solid rgba(147, 51, 234, 0.3);
|
||||||
padding: 0.75rem;
|
padding: 0.75rem;
|
||||||
border-radius: 8px;
|
border-radius: 8px;
|
||||||
font-size: 0.9rem;
|
font-size: 0.9rem;
|
||||||
margin-top: 1rem;
|
margin-top: 1rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
.update-actions {
|
.update-actions {
|
||||||
display: flex;
|
display: flex;
|
||||||
gap: 1rem;
|
gap: 1rem;
|
||||||
justify-content: flex-end;
|
justify-content: flex-end;
|
||||||
}
|
}
|
||||||
|
|
||||||
.update-actions button {
|
.update-actions button {
|
||||||
padding: 0.75rem 1.5rem;
|
padding: 0.75rem 1.5rem;
|
||||||
border: none;
|
border: none;
|
||||||
border-radius: 8px;
|
border-radius: 8px;
|
||||||
font-weight: 600;
|
font-weight: 600;
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
transition: all 0.2s;
|
transition: all 0.2s;
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
gap: 0.5rem;
|
gap: 0.5rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
.update-actions .btn-primary {
|
.update-actions .btn-primary {
|
||||||
background: linear-gradient(135deg, #9333ea 0%, #7c3aed 100%);
|
background: linear-gradient(135deg, #9333ea 0%, #7c3aed 100%);
|
||||||
color: white;
|
color: white;
|
||||||
}
|
}
|
||||||
|
|
||||||
.update-actions .btn-primary:hover:not(:disabled) {
|
.update-actions .btn-primary:hover:not(:disabled) {
|
||||||
transform: translateY(-2px);
|
transform: translateY(-2px);
|
||||||
box-shadow: 0 5px 15px rgba(147, 51, 234, 0.4);
|
box-shadow: 0 5px 15px rgba(147, 51, 234, 0.4);
|
||||||
}
|
}
|
||||||
|
|
||||||
.update-actions .btn-secondary {
|
.update-actions .btn-secondary {
|
||||||
background: rgba(255, 255, 255, 0.1);
|
background: rgba(255, 255, 255, 0.1);
|
||||||
color: #e0e0e0;
|
color: #e0e0e0;
|
||||||
border: 1px solid rgba(255, 255, 255, 0.2);
|
border: 1px solid rgba(255, 255, 255, 0.2);
|
||||||
}
|
}
|
||||||
|
|
||||||
.update-actions .btn-secondary:hover:not(:disabled) {
|
.update-actions .btn-secondary:hover:not(:disabled) {
|
||||||
background: rgba(255, 255, 255, 0.15);
|
background: rgba(255, 255, 255, 0.15);
|
||||||
}
|
}
|
||||||
|
|
||||||
.update-actions button:disabled {
|
.update-actions button:disabled {
|
||||||
opacity: 0.5;
|
opacity: 0.5;
|
||||||
cursor: not-allowed;
|
cursor: not-allowed;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
Type=Application
|
Type=Application
|
||||||
Name=Hytale-F2P
|
Name=Hytale-F2P
|
||||||
Comment=A modern, cross-platform launcher for Hytale with automatic updates and multi-client support
|
Comment=A modern, cross-platform launcher for Hytale with automatic updates and multi-client support
|
||||||
Exec=/opt/Hytale-F2P/hytale-f2p-launcherv2
|
Exec=/opt/Hytale-F2P/hytale-f2p-launcher
|
||||||
Categories=Game;
|
Categories=Game;
|
||||||
Icon=Hytale-F2P
|
Icon=Hytale-F2P
|
||||||
Terminal=false
|
Terminal=false
|
||||||
|
|||||||
6
PKGBUILD
6
PKGBUILD
@@ -2,7 +2,7 @@
|
|||||||
# Maintainer: Fazri Gading <fazrigading@gmail.com>
|
# Maintainer: Fazri Gading <fazrigading@gmail.com>
|
||||||
pkgname=Hytale-F2P-git
|
pkgname=Hytale-F2P-git
|
||||||
_pkgname=Hytale-F2P
|
_pkgname=Hytale-F2P
|
||||||
pkgver=2.0.2b.r120.gb05aeef
|
pkgver=2.0.11.r120.gb05aeef
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
pkgdesc="Hytale-F2P - unofficial Hytale Launcher for free to play with multiplayer support"
|
pkgdesc="Hytale-F2P - unofficial Hytale Launcher for free to play with multiplayer support"
|
||||||
arch=('x86_64')
|
arch=('x86_64')
|
||||||
@@ -10,11 +10,11 @@ url="https://github.com/amiayweb/Hytale-F2P"
|
|||||||
license=('custom')
|
license=('custom')
|
||||||
makedepends=('npm' 'git' 'rpm-tools' 'libxcrypt-compat')
|
makedepends=('npm' 'git' 'rpm-tools' 'libxcrypt-compat')
|
||||||
source=("git+$url.git" "Hytale-F2P.desktop")
|
source=("git+$url.git" "Hytale-F2P.desktop")
|
||||||
sha256sums=('SKIP' '8c78a6931fade2b0501122980dc238e042b9f6f0292b5ca74c391d7b3c1543c0')
|
sha256sums=('SKIP' '46488fada4775d9976d7b7b62f8d1f1f8d9a9a9d8f8aa9af4f2e2153019f6a30')
|
||||||
|
|
||||||
pkgver() {
|
pkgver() {
|
||||||
cd "$_pkgname"
|
cd "$_pkgname"
|
||||||
printf "2.0.2b.r%s.g%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
|
printf "2.0.11.r%s.g%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
|
||||||
}
|
}
|
||||||
|
|
||||||
build() {
|
build() {
|
||||||
|
|||||||
@@ -15,6 +15,12 @@ class AppUpdater {
|
|||||||
}
|
}
|
||||||
|
|
||||||
setupAutoUpdater() {
|
setupAutoUpdater() {
|
||||||
|
// Enable dev mode for testing (reads dev-app-update.yml)
|
||||||
|
// Only enable in development, not in production builds
|
||||||
|
if (process.env.NODE_ENV === 'development' || !app.isPackaged) {
|
||||||
|
autoUpdater.forceDevUpdateConfig = true;
|
||||||
|
console.log('Dev update mode enabled - using dev-app-update.yml');
|
||||||
|
}
|
||||||
|
|
||||||
// Configure logger for electron-updater
|
// Configure logger for electron-updater
|
||||||
// Create a compatible logger interface
|
// Create a compatible logger interface
|
||||||
|
|||||||
8
main.js
8
main.js
@@ -447,13 +447,6 @@ ipcMain.handle('launch-game', async (event, playerName, javaPath, installPath, g
|
|||||||
|
|
||||||
ipcMain.handle('install-game', async (event, playerName, javaPath, installPath, branch) => {
|
ipcMain.handle('install-game', async (event, playerName, javaPath, installPath, branch) => {
|
||||||
try {
|
try {
|
||||||
console.log(`[IPC] install-game called with parameters:`);
|
|
||||||
console.log(` - playerName: ${playerName}`);
|
|
||||||
console.log(` - javaPath: ${javaPath}`);
|
|
||||||
console.log(` - installPath: ${installPath}`);
|
|
||||||
console.log(` - branch: ${branch}`);
|
|
||||||
console.log(`[IPC] branch type: ${typeof branch}, value: ${JSON.stringify(branch)}`);
|
|
||||||
|
|
||||||
// Signal installation start
|
// Signal installation start
|
||||||
if (mainWindow && !mainWindow.isDestroyed()) {
|
if (mainWindow && !mainWindow.isDestroyed()) {
|
||||||
mainWindow.webContents.send('installation-start');
|
mainWindow.webContents.send('installation-start');
|
||||||
@@ -633,7 +626,6 @@ ipcMain.handle('load-close-launcher', () => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
ipcMain.handle('select-install-path', async () => {
|
ipcMain.handle('select-install-path', async () => {
|
||||||
|
|
||||||
const result = await dialog.showOpenDialog(mainWindow, {
|
const result = await dialog.showOpenDialog(mainWindow, {
|
||||||
properties: ['openDirectory'],
|
properties: ['openDirectory'],
|
||||||
title: 'Select Installation Folder'
|
title: 'Select Installation Folder'
|
||||||
|
|||||||
Reference in New Issue
Block a user