@dimzxzzx07/mc-headless 1.7.0 → 1.9.0

package/src/index.ts

@@ -1,6 +1,9 @@
+#!/usr/bin/env node
+
 import { MinecraftServer } from './core/MinecraftServer';
 import { Logger, LogLevel } from './utils/Logger';
 import { SystemDetector } from './utils/SystemDetector';
+import { JavaChecker } from './core/JavaChecker';
 
 export * from './core/MinecraftServer';
 export * from './core/ConfigHandler';
@@ -9,6 +12,8 @@ export * from './core/ServerManager';
 export * from './platforms/JavaServer';
 export * from './platforms/BedrockServer';
 export * from './platforms/GeyserBridge';
+export * from './platforms/ViaVersion';
+export * from './platforms/SkinRestorer';
 export * from './engines/Downloader';
 export * from './engines/PaperEngine';
 export * from './engines/VanillaEngine';
@@ -29,40 +34,49 @@ if (require.main === module) {
     const systemInfo = SystemDetector.getSystemInfo();
     logger.info('System Information:', systemInfo);
 
+    JavaChecker.cleanupOldJava();
+
     const server = new MinecraftServer({
         platform: 'java',
-        version: '1.20.1',
+        version: '1.21.11',
         type: 'paper',
+        usePortableJava: true,
         memory: {
-            init: '1G',
-            max: '2G',
+            init: '2G',
+            max: '4G',
             useAikarsFlags: true
         },
         world: {
             difficulty: 'normal',
             hardcore: false,
             gamemode: 'survival',
-            maxPlayers: 10,
-            viewDistance: 10,
+            maxPlayers: 20,
+            viewDistance: 6,
             levelName: 'world'
-        }
+        },
+        enableViaVersion: true,
+        enableViaBackwards: true,
+        enableViaRewind: true,
+        enableSkinRestorer: true,
+        silentMode: true,
+        statsInterval: 30000
     });
 
     server.on('ready', (info) => {
-        logger.success(`
-Mc Headless - Powered By Dimzxzzx07
-     Address: ${info.ip}:${info.port}
-     Version: ${info.version} ${info.type}
-     Players: 0/${info.maxPlayers}
+        console.log(`
+Minecraft Headless - Powered By Dimzxzzx07
+  IP: ${info.ip}:${info.port}
+  Version: ${info.version}
+  Players: ${info.players}/${info.maxPlayers}
+  Memory: ${info.memory.used}/${info.memory.max} MB
+  CPU: ${info.cpu}%
         `);
     });
 
-    server.on('player-join', (player) => {
-        logger.info(`Player joined: ${player.name}`);
-    });
-
-    server.on('player-leave', (name) => {
-        logger.info(`Player left: ${name}`);
+    server.on('resource', (info) => {
+        if (info.memory.used > info.memory.max * 0.8) {
+            logger.warning(`High memory usage: ${info.memory.used}/${info.memory.max} MB (${info.cpu}% CPU)`);
+        }
     });
 
     server.start().catch(error => {
@@ -72,12 +86,14 @@ Mc Headless - Powered By Dimzxzzx07
     process.on('SIGINT', async () => {
         logger.info('Received SIGINT, stopping server...');
         await server.stop();
+        JavaChecker.cleanupOldJava();
         process.exit(0);
     });
 
     process.on('SIGTERM', async () => {
         logger.info('Received SIGTERM, stopping server...');
         await server.stop();
+        JavaChecker.cleanupOldJava();
         process.exit(0);
     });
 }

package/src/platforms/BedrockServer.ts

@@ -39,6 +39,7 @@ export class BedrockServer extends EventEmitter {
             maxPlayers: this.config.world.maxPlayers,
             uptime: 0,
             memory: { used: 0, max: 0 },
+            cpu: 0,
             status: 'stopped'
         };
     }
@@ -258,6 +259,7 @@ export class BedrockServer extends EventEmitter {
                         used: Math.round(stats.memory / 1024 / 1024),
                         max: 0
                     };
+                    this.serverInfo.cpu = Math.round(stats.cpu);
                     this.serverInfo.uptime = Math.floor((Date.now() - (this.startTime?.getTime() || 0)) / 1000);
 
                     this.emit('resource', this.serverInfo);

package/src/platforms/JavaServer.ts

@@ -41,6 +41,7 @@ export class JavaServer extends EventEmitter {
             maxPlayers: this.config.world.maxPlayers,
             uptime: 0,
             memory: { used: 0, max: 0 },
+            cpu: 0,
             status: 'stopped'
         };
     }
@@ -176,6 +177,7 @@ export class JavaServer extends EventEmitter {
                         used: Math.round(stats.memory / 1024 / 1024),
                         max: this.parseMemory(this.config.memory.max)
                     };
+                    this.serverInfo.cpu = Math.round(stats.cpu);
                     this.serverInfo.uptime = Math.floor((Date.now() - (this.startTime?.getTime() || 0)) / 1000);
 
                     if (stats.cpu > 80) {

package/src/platforms/SkinRestorer.ts

@@ -0,0 +1,127 @@
+import { MinecraftConfig } from '../types';
+import { FileUtils } from '../utils/FileUtils';
+import { Logger } from '../utils/Logger';
+import * as path from 'path';
+import axios from 'axios';
+import * as fs from 'fs-extra';
+
+export interface SkinRestorerInfo {
+    version: string;
+    downloadUrl: string;
+}
+
+export class SkinRestorerManager {
+    private logger = Logger.getInstance();
+    private readonly SKINRESTORER_URL = 'https://github.com/SkinsRestorer/SkinsRestorerX/releases/latest/download/SkinsRestorer.jar';
+
+    public async setup(config: MinecraftConfig): Promise<void> {
+        const pluginsDir = config.folders.plugins;
+        await FileUtils.ensureDir(pluginsDir);
+
+        this.logger.info('Setting up SkinRestorer...');
+
+        await this.cleanupCorruptFiles(pluginsDir);
+        await this.downloadSkinRestorer(pluginsDir);
+        await this.verifyPlugin(pluginsDir);
+
+        this.logger.success('SkinRestorer installed successfully');
+        this.logger.info('Player skins will now be restored automatically');
+    }
+
+    private async cleanupCorruptFiles(pluginsDir: string): Promise<void> {
+        const filePath = path.join(pluginsDir, 'SkinsRestorer.jar');
+        
+        if (await FileUtils.fileExists(filePath)) {
+            try {
+                const stats = await fs.stat(filePath);
+                if (stats.size < 100000) {
+                    this.logger.warning('Corrupt SkinRestorer detected, removing...');
+                    await fs.remove(filePath);
+                } else {
+                    const buffer = await fs.readFile(filePath);
+                    if (buffer[0] !== 0x50 || buffer[1] !== 0x4B) {
+                        this.logger.warning('Invalid ZIP header in SkinRestorer, removing...');
+                        await fs.remove(filePath);
+                    } else {
+                        this.logger.info('SkinRestorer is valid, keeping it');
+                    }
+                }
+            } catch (error) {
+                this.logger.warning('Error checking SkinRestorer, removing...');
+                await fs.remove(filePath);
+            }
+        }
+    }
+
+    private async downloadSkinRestorer(pluginsDir: string): Promise<void> {
+        const destPath = path.join(pluginsDir, 'SkinsRestorer.jar');
+        
+        if (await FileUtils.fileExists(destPath)) {
+            this.logger.info('SkinRestorer already exists, skipping download');
+            return;
+        }
+
+        this.logger.info('Downloading SkinRestorer...');
+
+        try {
+            const response = await axios({
+                method: 'GET',
+                url: this.SKINRESTORER_URL,
+                responseType: 'stream',
+                timeout: 60000,
+                headers: {
+                    'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36'
+                }
+            });
+
+            const writer = fs.createWriteStream(destPath);
+            response.data.pipe(writer);
+
+            await new Promise<void>((resolve, reject) => {
+                writer.on('finish', () => resolve());
+                writer.on('error', (err) => reject(err));
+            });
+
+            const stats = await fs.stat(destPath);
+            if (stats.size < 100000) {
+                throw new Error(`Downloaded file too small: ${stats.size} bytes`);
+            }
+
+            const buffer = await fs.readFile(destPath);
+            if (buffer[0] !== 0x50 || buffer[1] !== 0x4B) {
+                throw new Error('Invalid ZIP header');
+            }
+
+            this.logger.success(`Downloaded SkinRestorer (${(stats.size / 1024 / 1024).toFixed(2)} MB)`);
+
+        } catch (error) {
+            this.logger.error('Failed to download SkinRestorer:', error);
+            throw error;
+        }
+    }
+
+    private async verifyPlugin(pluginsDir: string): Promise<void> {
+        const filePath = path.join(pluginsDir, 'SkinsRestorer.jar');
+        
+        if (!await FileUtils.fileExists(filePath)) {
+            throw new Error('SkinRestorer plugin is missing');
+        }
+
+        try {
+            const stats = await fs.stat(filePath);
+            if (stats.size < 100000) {
+                throw new Error('SkinRestorer plugin is too small');
+            }
+
+            const buffer = await fs.readFile(filePath);
+            if (buffer[0] !== 0x50 || buffer[1] !== 0x4B) {
+                throw new Error('SkinRestorer plugin has invalid ZIP header');
+            }
+
+            this.logger.debug(`SkinRestorer verified OK (${(stats.size / 1024 / 1024).toFixed(2)} MB)`);
+        } catch (error) {
+            this.logger.error('Failed to verify SkinRestorer:', error);
+            throw error;
+        }
+    }
+}

package/src/scripts/install-java.sh

@@ -1,38 +1,103 @@
 #!/bin/bash
 
-echo "Installing Java for Minecraft Server..."
+echo "Minecraft Headless - Java Auto Installer"
 
-if [ -f /etc/os-release ]; then
-    . /etc/os-release
-    OS=$ID
-elif [ -n "$TERMUX_VERSION" ]; then
-    OS="termux"
+JAVA_VERSION=${1:-17}
+echo "Target Java version: $JAVA_VERSION"
+
+detect_os() {
+    if [ -f /etc/os-release ]; then
+        . /etc/os-release
+        echo "$ID"
+    elif [ -n "$TERMUX_VERSION" ]; then
+        echo "termux"
+    elif [ "$(uname)" == "Darwin" ]; then
+        echo "macos"
+    elif [ "$(expr substr $(uname -s) 1 5)" == "MINGW" ]; then
+        echo "windows"
+    else
+        echo "unknown"
+    fi
+}
+
+OS=$(detect_os)
+echo "Detected OS: $OS"
+
+install_java_17() {
+    case $OS in
+        ubuntu|debian)
+            apt update
+            apt install -y openjdk-17-jre-headless
+            ;;
+        centos|rhel|fedora)
+            if command -v dnf &> /dev/null; then
+                dnf install -y java-17-openjdk-headless
+            else
+                yum install -y java-17-openjdk-headless
+            fi
+            ;;
+        arch)
+            pacman -S --noconfirm jre17-openjdk-headless
+            ;;
+        termux)
+            pkg install -y openjdk-17
+            ;;
+        macos)
+            if ! command -v brew &> /dev/null; then
+                /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
+            fi
+            brew install openjdk@17
+            ;;
+        *)
+            echo "Unsupported OS for Java 17 installation"
+            return 1
+            ;;
+    esac
+}
+
+install_java_21() {
+    case $OS in
+        ubuntu|debian)
+            apt update
+            apt install -y openjdk-21-jre-headless
+            ;;
+        centos|rhel|fedora)
+            if command -v dnf &> /dev/null; then
+                dnf install -y java-21-openjdk-headless
+            else
+                yum install -y java-21-openjdk-headless
+            fi
+            ;;
+        arch)
+            pacman -S --noconfirm jre21-openjdk-headless
+            ;;
+        termux)
+            echo "Java 21 not available in Termux, installing Java 17 instead"
+            install_java_17
+            ;;
+        macos)
+            if ! command -v brew &> /dev/null; then
+                /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
+            fi
+            brew install openjdk@21
+            ;;
+        *)
+            echo "Unsupported OS for Java 21 installation"
+            return 1
+            ;;
+    esac
+}
+
+if [ "$JAVA_VERSION" = "21" ]; then
+    install_java_21
 else
-    OS="unknown"
+    install_java_17
 fi
 
-case $OS in
-    ubuntu|debian)
-        apt update
-        apt install -y openjdk-17-jre-headless
-        ;;
-    centos|rhel)
-        yum install -y java-17-openjdk-headless
-        ;;
-    fedora)
-        dnf install -y java-17-openjdk-headless
-        ;;
-    arch)
-        pacman -S --noconfirm jre17-openjdk-headless
-        ;;
-    termux)
-        pkg install -y openjdk-17
-        ;;
-    *)
-        echo "Unsupported OS. Please install Java 17 manually."
-        exit 1
-        ;;
-esac
-
-echo "Java installation completed."
-java -version
+if [ $? -eq 0 ]; then
+    echo "Java installation completed."
+    java -version
+else
+    echo "Java installation failed."
+    exit 1
+fi

package/src/types/index.ts

@@ -30,6 +30,7 @@ export interface MinecraftConfig {
         seed?: string;
         maxPlayers: number;
         viewDistance: number;
+        simulationDistance?: number;
         levelName: string;
     };
 
@@ -63,6 +64,7 @@ export interface ServerInfo {
         used: number;
         max: number;
     };
+    cpu: number;
     status: 'starting' | 'running' | 'stopping' | 'stopped' | 'crashed';
 }