Auto PR: Merge dev into master

.gitignore

@@ -122,3 +122,4 @@ run/
 /api/target/
 /backend-api/target/
 /.fastRequest/
+/deploy/

build.gradle

@@ -5,22 +5,46 @@ buildscript {
         }
     }
     dependencies {
-        classpath("gradle.plugin.com.github.johnrengelman:shadow:7.1.2")
+        classpath("com.gradleup.shadow:shadow-gradle-plugin:8.3.6") // for shadowing
         classpath("io.freefair.gradle:lombok-plugin:8.6")
     }
 }
 
 allprojects {
+    apply plugin: "java"
+    apply plugin: "com.gradleup.shadow"
+    apply plugin: "io.freefair.lombok"
+    apply plugin: "maven-publish"
+
     version = rootProject.properties["version"]
     group = rootProject.properties["group"]
+
+    java {
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
+    }
+
+    artifacts {
+        archives shadowJar
+    }
+
+    repositories {
+        // Maven Defaults
+        mavenCentral()
+        mavenLocal()
+        maven { url "https://mvnrepository.com/artifact" }
+
+        // JitPack
+        maven { url "https://jitpack.io" }
+
+        // Local libs folder as a flat directory repository
+        flatDir {
+            dirs "${rootDir}/libs"
+        }
+    }
 }
 
 subprojects {
-    apply plugin: "java"
-    apply plugin: "com.github.johnrengelman.shadow"
-    apply plugin: "io.freefair.lombok"
-    apply plugin: "maven-publish"
-
     apply from: rootDir.toString() + "/dependencies.gradle"
 
     ext {
@@ -33,9 +57,6 @@ subprojects {
     targetCompatibility = JavaVersion.VERSION_11
 
     repositories {
-        mavenCentral()
-        mavenLocal()
-
         // Spigot / Bukkit
         maven {
             url "https://hub.spigotmc.org/nexus/content/repositories/snapshots"
@@ -55,9 +76,6 @@ subprojects {
         maven { url "https://maven.fabricmc.net" }
         maven { url "https://libraries.minecraft.net" }
 
-        // JitPack
-        maven { url "https://jitpack.io" }
-        maven { url "https://mvnrepository.com/artifact" }
         // OpenCollab
         maven {
             name "opencollabRepositoryMavenSnapshots"
@@ -72,11 +90,6 @@ subprojects {
         maven { url "https://repo.extendedclip.com/content/repositories/placeholderapi" }
     }
 
-    java {
-        sourceCompatibility = JavaVersion.VERSION_11
-        targetCompatibility = JavaVersion.VERSION_11
-    }
-
     processResources {
         // Debugging: Print values
         doFirst {
@@ -92,7 +105,12 @@ subprojects {
             expand (
                     "name": rootProject.name.toString(),
                     "version": rootProject.version.toString(),
-                    "main": project.ext.pluginMain.toString(),
+            )
+        }
+        filesMatching("**/velocity-plugin.json") {
+            expand (
+                    "name": rootProject.name.toString(),
+                    "version": rootProject.version.toString(),
             )
         }
         filesMatching("**/streamline.properties") {
@@ -124,10 +142,6 @@ subprojects {
 //        minimize()
     }
 
-    artifacts {
-        archives shadowJar
-    }
-
     tasks.register('deploy', Copy) {
         // Define the deployment directory
         def deployDir = file(System.getenv("DEPLOY_DIR") ?: "$rootDir/deploy")
@@ -168,6 +182,35 @@ subprojects {
     }
 }
 
+//tasks.register("clearDeploys", Delete) {
+//    // Define the deployment directory
+//    def deployDir = file(System.getenv("DEPLOY_DIR") ?: "$rootDir/deploy")
+//
+//    deployDir.mkdirs()
+//    File[] files = deployDir.listFiles()
+//    if (files != null) {
+//        files.each { file ->
+//            if (file.isFile()) {
+//                file.delete()
+//            }
+//        }
+//    }
+//}
+
+//clean.finalizedBy(clearDeploys)
+//tasks.named('clearDeploys').configure {
+//    dependsOn 'clean'
+//}
+
+//clearDeploys.finalizedBy(build)
+//tasks.named("build") {
+//    doFirst {
+//        tasks.named('clean') {
+//            it.
+//        }
+//    }
+//}
+
 wrapper {
     gradleVersion = "8.9"
     distributionType = Wrapper.DistributionType.ALL

bungee/build.gradle

@@ -1,7 +1,6 @@
 dependencies {
-    // Platform.
-    compileOnly 'net.md-5:bungeecord-api:1.20-R0.3-SNAPSHOT'
-    compileOnly 'net.md-5:bungeecord-parent:1.20-R0.3-SNAPSHOT'
+    // Platform
+    annotationProcessor(compileOnly('net.md-5:bungeecord-api:1.21-R0.1-SNAPSHOT'))
 
     // Defaults.
     compileOnly(files(FILES))

bungee/src/main/java/net/streamline/platform/BasePlugin.java

@@ -41,6 +41,7 @@
 import java.util.*;
 import java.util.concurrent.ConcurrentSkipListMap;
 import java.util.concurrent.ConcurrentSkipListSet;
+import java.util.logging.Logger;
 
 public abstract class BasePlugin extends Plugin implements ISingularityExtension {
     @Getter
@@ -120,8 +121,6 @@ public void setupProperties() {
 
     @Override
     public void onEnable() {
-        getLogger().addHandler(new CosmicLogHandler());
-
         userManager = new UserManager();
         messenger = new Messenger();
         consoleHolder = new ConsoleHolder();
@@ -156,6 +155,8 @@ public void onDisable() {
         UserUtils.syncAllUsers();
         UuidManager.getUuids().forEach(UuidInfo::save);
 
+        getProxy().unregisterChannel(SLAPI.getApiChannel());
+
         this.disable();
         fireStopEvent();
 
@@ -349,4 +350,14 @@ public static ConcurrentSkipListMap<String, ProxiedPlayer> getPlayersByUUID() {
         }
         return map;
     }
+
+    @Override
+    public Logger getLoggerLogger() {
+        return getLogger();
+    }
+
+    @Override
+    public org.slf4j.Logger getSLFLogger() {
+        return null;
+    }
 }

bungee/src/main/resources/plugin.yml

@@ -2,7 +2,7 @@ name: '${name}'
 version: '${version}'
 main: 'net.streamline.base.StreamlineBungee'
 authors:
-  - MrDrakify
+  - Drak
 website: https://github.com/Streamline-Essentials
 description: True potential is here. A Proxy and Spigot plugin that opens up endless cross-platform possibilities.
 depend:

dependencies.gradle

@@ -4,12 +4,14 @@ ext {
             "com.github.Server-Utilities:TheBase:master-SNAPSHOT",
             "org.pf4j:pf4j:3.10.0",
             "commons-codec:commons-codec:1.5",
+            "ch.qos.logback:logback-classic:1.5.6",
     ]
     SHADOW = [
             "com.github.ben-manes.caffeine:caffeine:3.1.8",
             "com.github.Server-Utilities:TheBase:master-SNAPSHOT",
             "org.pf4j:pf4j:3.10.0",
             "commons-codec:commons-codec:1.5",
+            "ch.qos.logback:logback-classic:1.5.6",
     ]
     ANNO = [
             "com.github.ben-manes.caffeine:caffeine:3.1.8",