Merge pull request #5 from NextForge-Development/master

Merge master 2 dev

Author: mzcydev

.github/workflows/qodana_code_quality.yml

@@ -0,0 +1,40 @@
+#-------------------------------------------------------------------------------#
+#            Discover all capabilities of Qodana in our documentation           #
+#             https://www.jetbrains.com/help/qodana/about-qodana.html           #
+#-------------------------------------------------------------------------------#
+
+name: Qodana
+on:
+  workflow_dispatch:
+  pull_request:
+  push:
+    branches:
+      - dev
+      - master
+
+jobs:
+  qodana:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+      pull-requests: write
+      checks: write
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          ref: ${{ github.event.pull_request.head.sha }}
+          fetch-depth: 0
+      - name: 'Qodana Scan'
+        uses: JetBrains/qodana-action@v2025.2
+        env:
+          QODANA_TOKEN: ${{ secrets.QODANA_TOKEN }}
+        with:
+          # In pr-mode: 'true' Qodana checks only changed files
+          pr-mode: false
+          use-caches: true
+          post-pr-comment: true
+          use-annotations: true
+          # Upload Qodana results (SARIF, other artifacts, logs) as an artifact to the job
+          upload-result: false
+          # quick-fixes available in Ultimate and Ultimate Plus plans
+          push-fixes: 'none'

.github/workflows/release.yml

@@ -1,19 +1,32 @@
 name: Release
 
+permissions:
+  contents: write # Allow the workflow to write to the repository contents
+
 on:
   push:
-    branches: [main]
+    branches: [ master, main ]
+  workflow_dispatch:
+    inputs:
+      firstName:
+        description: "Your first name"
+        type: string
+        default: Brad
+        required: true
 
 jobs:
   release:
     runs-on: ubuntu-latest
+
     steps:
       - uses: actions/checkout@v4
+
       - name: Set up JDK
         uses: actions/setup-java@v3
         with:
-          java-version: '17'
+          java-version: '23'
           distribution: 'temurin'
+
       - name: Cache Gradle
         uses: actions/cache@v3
         with:
@@ -22,14 +35,48 @@ jobs:
             ~/.gradle/wrapper
           key: gradle-${{ runner.os }}-${{ hashFiles('**/gradle-wrapper.properties') }}
           restore-keys: gradle-${{ runner.os }}-
+
+      - name: Make gradlew executable
+        run: chmod +x gradlew
+
       - name: Run tests
         run: ./gradlew test
+
       - name: Build shadowJar
         run: ./gradlew shadowJar
-      - name: Extract version
+
+      # 1) JAR-Pfad bestimmen
+      - name: Find built JAR
+        id: jar
+        run: |
+          JAR_PATH=$(ls build/libs/*.jar | head -n1)
+          echo "jar_path=$JAR_PATH" >> $GITHUB_OUTPUT
+
+      # 2) Version aus plugin.yml im JAR extrahieren
+      - name: Extract version from JAR
         id: vars
         run: |
-          echo "version=$(grep -m1 '^version:' src/main/resources/plugin.yml | sed 's/version:[ ]*//')" >> $GITHUB_OUTPUT
+          VERSION=$(unzip -p "${{ steps.jar.outputs.jar_path }}" plugin.yml \
+                    | grep '^version:' \
+                    | sed 's/version:[ ]*//')
+          echo "version=$VERSION" >> $GITHUB_OUTPUT
+
+      # 3) Alle Tags holen, um lokal prüfen zu können
+      - name: Fetch all tags
+        run: git fetch --tags
+
+      # 4) Abbrechen, wenn der Tag schon existiert
+      - name: Check if tag exists
+        run: |
+          TAG=${{ steps.vars.outputs.version }}
+          if git ls-remote --tags origin "refs/tags/$TAG" | grep -q "$TAG"; then
+            echo "❌ Tag '$TAG' existiert bereits. Breche ab."
+            exit 1
+          else
+            echo "✅ Tag '$TAG' ist neu. Fortfahren..."
+          fi
+
+      # 5) Release anlegen (Prerelease, wenn SNAPSHOT)
       - name: Create Release
         id: create
         uses: actions/create-release@v1
@@ -39,13 +86,16 @@ jobs:
           tag_name: ${{ steps.vars.outputs.version }}
           release_name: ${{ steps.vars.outputs.version }}
           draft: false
-          prerelease: false
+          # Prerelease = true, wenn Version auf "-SNAPSHOT" endet
+          prerelease: ${{ endsWith( steps.vars.outputs.version, '-SNAPSHOT' ) }}
+
+      # 6) JAR hochladen
       - name: Upload JAR
         uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.create.outputs.upload_url }}
-          asset_path: $(ls build/libs/*.jar | head -n 1)
+          asset_path: ${{ steps.jar.outputs.jar_path }}
           asset_name: nextcore-${{ steps.vars.outputs.version }}.jar
           asset_content_type: application/java-archive

build.gradle

@@ -1,13 +1,12 @@
 plugins {
     id 'java-library'
     id 'maven-publish'
-    id("io.papermc.paperweight.userdev") version "2.0.0-beta.17"
-    id("com.gradleup.shadow") version "8.3.8"
+    id "io.papermc.paperweight.userdev" version "2.0.0-beta.17"
+    id "com.gradleup.shadow" version "8.3.8"
 }
 
 group = 'gg.nextforge'
-version = '1.0-SNAPSHOT'
-
+version = '1.3-SNAPSHOT'
 
 repositories {
     mavenCentral()
@@ -44,10 +43,17 @@ subprojects {
         implementation "com.google.code.gson:gson:2.10.1"
         implementation "org.bstats:bstats-bukkit:3.0.2"
     }
-}
 
-test {
-    useJUnitPlatform()
+    // Version-Injection auch in Subprojects, falls benötigt
+    tasks.withType(ProcessResources).configureEach {
+        filesMatching("plugin.yml") {
+            expand(
+                    version: project.version,
+                    group: project.group,
+                    name: project.name
+            )
+        }
+    }
 }
 
 java {
@@ -66,29 +72,29 @@ tasks {
         options.encoding = "UTF-8"
     }
 
+    // Haupt-Versionserweiterung für plugin.yml
     processResources {
         filesMatching("plugin.yml") {
             expand(
-                version: project.version,
-                group: project.group,
-                name: project.name
+                    version: project.version,
+                    group: project.group,
+                    name: project.name
             )
         }
     }
 }
 
 shadowJar {
+    dependsOn(processResources)
     relocate("org.mozilla.javascript", "gg.nextforge.libraries.rhino")
     relocate("com.google.gson", "gg.nextforge.libraries.gson")
     relocate("org.bstats", "gg.nextforge.libraries.bstats")
 }
 
 publishing {
-
     repositories {
         mavenLocal()
     }
-
     publications {
         create("mavenJava", MavenPublication) {
             from components.java
@@ -102,4 +108,4 @@ publishing {
             }
         }
     }
-}
+}

qodana.yaml

@@ -0,0 +1,44 @@
+#-------------------------------------------------------------------------------#
+#               Qodana analysis is configured by qodana.yaml file               #
+#             https://www.jetbrains.com/help/qodana/qodana-yaml.html            #
+#-------------------------------------------------------------------------------#
+version: "1.0"
+
+#Specify inspection profile for code analysis
+profile:
+  name: qodana.starter
+
+#Enable inspections
+#include:
+#  - name: <SomeEnabledInspectionId>
+
+#Disable inspections
+#exclude:
+#  - name: <SomeDisabledInspectionId>
+#    paths:
+#      - <path/where/not/run/inspection>
+
+projectJDK: "21" #(Applied in CI/CD pipeline)
+
+#Execute shell command before Qodana execution (Applied in CI/CD pipeline)
+#bootstrap: sh ./prepare-qodana.sh
+
+#Install IDE plugins before Qodana execution (Applied in CI/CD pipeline)
+#plugins:
+#  - id: <plugin.id> #(plugin id can be found at https://plugins.jetbrains.com)
+
+# Quality gate. Will fail the CI/CD pipeline if any condition is not met
+# severityThresholds - configures maximum thresholds for different problem severities
+# testCoverageThresholds - configures minimum code coverage on a whole project and newly added code
+# Code Coverage is available in Ultimate and Ultimate Plus plans
+#failureConditions:
+#  severityThresholds:
+#    any: 15
+#    critical: 5
+#  testCoverageThresholds:
+#    fresh: 70
+#    total: 50
+  
+#Qodana supports other languages, for example, Python, JavaScript, TypeScript, Go, C#, PHP
+#For all supported languages see https://www.jetbrains.com/help/qodana/linters.html
+linter: jetbrains/qodana-jvm-community:2025.2

src/main/java/gg/nextforge/NextCorePlugin.java

@@ -1,11 +1,25 @@
 package gg.nextforge;
 
+import gg.nextforge.command.builtin.NextCoreCommand;
+import gg.nextforge.config.ConfigFile;
+import gg.nextforge.config.ConfigManager;
 import gg.nextforge.console.ConsoleHeader;
 import gg.nextforge.plugin.NextForgePlugin;
+import gg.nextforge.scheduler.CoreScheduler;
+import gg.nextforge.scheduler.ScheduledTask;
+import gg.nextforge.updater.CoreAutoUpdater;
+import lombok.Getter;
 
+import java.io.IOException;
 import java.util.UUID;
 
+@Getter
 public class NextCorePlugin extends NextForgePlugin {
+
+    ConfigFile configFile;
+    ConfigFile messagesFile;
+    ScheduledTask updateCheckTask;
+
     @Override
     public int getMetricsId() {
         return 26427; // Replace with actual metrics ID if applicable
@@ -23,11 +37,65 @@ public void enable(boolean isReload) {
             return;
         }
 
+        configFile = getConfigManager().loadConfig("config.yml");
+        messagesFile = getConfigManager().loadConfig("messages.yml");
+
+        getTextManager().placeholder("prefix", p -> {
+            return messagesFile.getString("general.prefix", "<dark_gray>[<gradient:aqua:dark_aqua>ɴᴇxᴛᴄᴏʀᴇ<dark_gray>]</gradient></dark_gray>");
+        });
+
+        new NextCoreCommand(this);
+
         ConsoleHeader.send(this);
+
+        getSLF4JLogger().info("[NextForge] {} v{} is running as the core plugin.", getName(), getPluginVersion());
+
+        getSLF4JLogger().info("[NextForge] Initializing {} v{}...", getName(), getPluginVersion());
+
+        CoreAutoUpdater updater = new CoreAutoUpdater(getDataFolder().getParentFile());
+
+        int checkMillis = configFile.getInt("updater.check_interval", 7200000);
+        int checkTicks = checkMillis / 50;
+        if (configFile.getBoolean("updater.auto_update", true)) {
+            updateCheckTask = CoreScheduler.runAsyncTimer(() -> {
+                try {
+                    if (configFile.getBoolean("updater.disable_update_message", false)) {
+                        if (updater.isLatestVersion()) {
+                            getSLF4JLogger().info("[NextForge] You are running the latest version of NextCore.");
+                        } else {
+                            getSLF4JLogger().warn("[NextForge] A new version of NextForge is available! Please update to the latest version for the best experience.");
+                            getSLF4JLogger().warn("[NextForge] Current version: {}, Latest version: {}", getPluginVersion(), updater.fetchLatestVersion());
+                            getSLF4JLogger().warn("[NextForge] TIP: By changing the updater settings in config.yml, you can disable this message or change the update channel to 'dev'.");
+                            getSLF4JLogger().warn("[NextForge] TIP: By changing the updater settings in config.yml, you can automatically download the newest version.");
+                        }
+                    }
+                    if (configFile.getBoolean("updater.auto_update", true)) {
+                        if (!updater.isLatestVersion()) {
+                            getSLF4JLogger().info("[NextForge] Downloading the latest version of NextCore...");
+                            updater.downloadLatestJar(configFile.getString("updater.update_branch", "master").equalsIgnoreCase("dev")).thenAccept((file -> {
+                                getSLF4JLogger().info("[NextForge] Download complete. Please restart the server to apply the update.");
+                            }));
+                        } else {
+                            getSLF4JLogger().info("[NextForge] No updates available. You are already running the latest version.");
+                        }
+                    }
+                } catch (IOException e) {
+                    throw new RuntimeException(e);
+                }
+            }, 1, checkTicks);
+        }
+
+        getSLF4JLogger().info("[NextForge] {} v{} has been successfully enabled.", getName(), getPluginVersion());
     }
 
     @Override
     public void disable() {
+        if (updateCheckTask != null) {
+            updateCheckTask.cancel();
+        }
+
+        getSLF4JLogger().info("[NextForge] {} v{} is shutting down.", getName(), getPluginVersion());
 
+        getSLF4JLogger().info("[NextForge] {} v{} has been successfully disabled.", getName(), getPluginVersion());
     }
 }

src/main/java/gg/nextforge/command/CommandContext.java

@@ -215,6 +215,15 @@ public void reply(String message) {
         sender.sendMessage(message);
     }
 
+    /**
+     * Sends a message in minimessage format to the sender.
+     *
+     * @param message The message to send.
+     */
+    public void replyMini(String message) {
+        sender.sendRichMessage(message);
+    }
+
     /**
      * Gets the plugin instance.
      *