🔀 Merge master → dev (conflicts)

.github/workflows/sync-master-to-dev.yml

@@ -1,12 +1,14 @@
 name: Sync master → dev
 
+
 on:
   push:
     branches:
       - master
 
 permissions:
   contents: write    # ensure GITHUB_TOKEN can push code
+  pull-requests: write # allow creating PRs
 
 jobs:
   sync-to-dev:
@@ -60,10 +62,10 @@ jobs:
         if: steps.merge.outcome == 'failure'
         uses: actions/github-script@v6
         with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
+          github-token: ${{ secrets.PAT_PR }}
           script: |
             // 1) Create the PR from master → dev
-            const pr = await github.pulls.create({
+            const pr = await github.rest.pulls.create({
               owner: context.repo.owner,
               repo: context.repo.repo,
               head: 'master',
@@ -72,10 +74,11 @@ jobs:
               body: 'Automatic merge from **master** into **dev** failed due to conflicts. Please resolve and merge.',
               draft: false
             });
-            // 2) Request reviews (replace with your team’s GitHub handles)
-            await github.pulls.requestReviewers({
+
+            // 2) Request reviews
+            await github.rest.pulls.requestReviewers({
               owner: context.repo.owner,
               repo: context.repo.repo,
               pull_number: pr.data.number,
-              reviewers: ['reviewer1', 'reviewer2']
+              reviewers: []
             });

build.gradle

@@ -1,15 +1,31 @@
 plugins {
     id 'java-library'
     id 'maven-publish'
-    id "io.papermc.paperweight.userdev" version "2.0.0-beta.17"
+    id "io.papermc.paperweight.userdev" version "2.0.0-beta.18"
     id "com.gradleup.shadow" version "8.3.8"
+    id 'com.gorylenko.gradle-git-properties' version '2.4.1'
 }
 
 group = 'gg.nextforge'
-version = '1.0'
+version = '2.0'
 
 repositories {
     mavenCentral()
+    mavenLocal()
+}
+
+gitProperties {
+    failOnNoGitDirectory = false            // kein Fehler, falls kein .git da ist
+    dateFormat = "yyyy-MM-dd'T'HH:mm:ssZ"   // optional: Timestamp-Format
+    keys = ['git.commit.id', 'git.branch']  // nur die Keys, die du brauchst
+}
+
+sourceSets {
+    main {
+        resources {
+            srcDir "${buildDir}/generated/gitProperties"
+        }
+    }
 }
 
 dependencies {
@@ -28,9 +44,11 @@ subprojects {
     apply plugin: 'maven-publish'
     apply plugin: 'io.papermc.paperweight.userdev'
     apply plugin: 'com.gradleup.shadow'
+    apply plugin: 'com.gorylenko.gradle-git-properties'
 
     repositories {
         mavenCentral()
+        mavenLocal()
     }
 
     dependencies {
@@ -58,15 +76,21 @@ subprojects {
 
 java {
     // Use Java 21
-    sourceCompatibility = JavaVersion.VERSION_21
-    targetCompatibility = JavaVersion.VERSION_21
+    sourceCompatibility = JavaVersion.VERSION_23
+    targetCompatibility = JavaVersion.VERSION_23
     toolchain {
-        languageVersion.set(JavaLanguageVersion.of(21))
+        languageVersion.set(JavaLanguageVersion.of(23))
     }
     withJavadocJar()
     withSourcesJar()
 }
 
+javadoc {
+    options.encoding = 'UTF-8'
+    failOnError = false
+    options.addStringOption('Xdoclint:none', '-quiet')
+}
+
 tasks {
     compileJava {
         options.encoding = "UTF-8"

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

@@ -1,25 +1,25 @@
 package gg.nextforge;
 
-import gg.nextforge.command.builtin.NPCCommand;
 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 org.checkerframework.checker.units.qual.N;
 
 import java.io.IOException;
 import java.util.UUID;
 
 @Getter
 public class NextCorePlugin extends NextForgePlugin {
 
+    long serverUptime;
+    boolean debugMode;
     ConfigFile configFile;
     ConfigFile messagesFile;
+    CoreAutoUpdater updater;
     ScheduledTask updateCheckTask;
 
     @Override
@@ -39,23 +39,28 @@ public void enable(boolean isReload) {
             return;
         }
 
+        this.serverUptime = System.currentTimeMillis();
+
         configFile = getConfigManager().loadConfig("config.yml");
+        if (configFile.getBoolean("debug_mode", false)) {
+            this.debugMode = true;
+            getSLF4JLogger().info("[NextForge] Debug mode is enabled. This will log additional information to the console.");
+        } else {
+            this.debugMode = false;
+        }
         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>");
-        });
+        getTextManager().placeholder("prefix", _ -> messagesFile.getString("general.prefix", "<dark_gray>[<gradient:aqua:dark_aqua>ɴᴇxᴛᴄᴏʀᴇ<dark_gray>]</gradient></dark_gray>"));
 
         new NextCoreCommand(this);
-        new NPCCommand(this, getNpcManager());
 
         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());
+        this.updater = new CoreAutoUpdater(getDataFolder().getParentFile());
 
         int checkMillis = configFile.getInt("updater.check_interval", 7200000);
         int checkTicks = checkMillis / 50;