Merge pull request #679 from ArikSquad/feat/spark

Fix Spark

Author: ItzKatze

build.gradle.kts

@@ -17,6 +17,7 @@ subprojects {
         mavenLocal()
         maven("https://repo.viaversion.com")
         maven("https://jitpack.io")
+        maven("https://repo.lucko.me/")
     }
 
     java {

loader/src/main/java/net/swofty/loader/Hypixel.java

@@ -23,6 +23,7 @@
 import net.swofty.proxyapi.redis.ProxyToClient;
 import net.swofty.proxyapi.redis.ServerOutboundMessage;
 import net.swofty.proxyapi.redis.ServiceToClient;
+import net.swofty.spark.Spark;
 import net.swofty.type.generic.HypixelConst;
 import net.swofty.type.generic.HypixelGenericLoader;
 import net.swofty.type.generic.HypixelTypeLoader;
@@ -33,7 +34,7 @@
 import org.reflections.Reflections;
 import org.tinylog.Logger;
 
-import java.lang.reflect.InvocationTargetException;
+import java.nio.file.Files;
 import java.util.*;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.TimeUnit;
@@ -157,7 +158,7 @@ public static void main(String[] args) {
          * Start spark if enabled
          */
         if (ENABLE_SPARK) {
-            // Spark.enable(Files.createTempDirectory("spark"));
+            Spark.enable(Files.createTempDirectory("spark"));
         }
 
         /**

spark/build.gradle.kts

@@ -17,16 +17,13 @@ java {
     }
 }
 
-repositories {
-    maven("https://jitpack.io")
-}
-
 dependencies {
     implementation("net.minestom:minestom:2025.12.20c-1.21.11") {
         exclude(group = "org.jboss.shrinkwrap.resolver", module = "shrinkwrap-resolver-depchain")
     }
-    implementation(files("dependencies/spark-1.10.1.10-minestom.jar"))
     implementation(project(":type.generic"))
+    implementation("com.google.guava:guava:33.5.0-jre")
+    api("me.lucko:spark-common:1.10.158-20260110.094844-1")
 }
 
 application {

spark/dependencies/spark-1.10.1.10-minestom.jar

@@ -0,0 +1,65 @@
+/*
+ * This file is part of spark.
+ *
+ *  Copyright (c) lucko (Luck) <luck@lucko.me>
+ *  Copyright (c) contributors
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package me.lucko.spark.minestom;
+
+import java.util.function.BiPredicate;
+import me.lucko.spark.common.command.sender.AbstractCommandSender;
+import net.kyori.adventure.text.Component;
+import net.minestom.server.command.CommandSender;
+import net.minestom.server.command.ConsoleSender;
+import net.minestom.server.entity.Player;
+
+import java.util.UUID;
+import org.jetbrains.annotations.NotNull;
+
+final class MinestomCommandSender extends AbstractCommandSender<CommandSender> {
+
+    private final @NotNull BiPredicate<CommandSender, String> permissionHandler;
+
+    public MinestomCommandSender(CommandSender delegate, @NotNull BiPredicate<CommandSender, String> permissionHandler) {
+        super(delegate);
+        this.permissionHandler = permissionHandler;
+    }
+
+    @Override
+    public String getName() {
+        if (this.delegate instanceof Player player) return player.getUsername();
+        else if (this.delegate instanceof ConsoleSender) return "Console";
+        return "unknown:" + this.delegate.getClass().getSimpleName();
+    }
+
+    @Override
+    public UUID getUniqueId() {
+        if (super.delegate instanceof Player player) return player.getUuid();
+        return null;
+    }
+
+    @Override
+    public void sendMessage(Component message) {
+        this.delegate.sendMessage(message);
+    }
+
+    @Override
+    public boolean hasPermission(String permission) {
+        return this.permissionHandler.test(this.delegate, permission);
+    }
+
+}

spark/src/main/java/me/lucko/spark/minestom/MinestomCommandSender.java

@@ -0,0 +1,51 @@
+/*
+ * This file is part of spark.
+ *
+ *  Copyright (c) lucko (Luck) <luck@lucko.me>
+ *  Copyright (c) contributors
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package me.lucko.spark.minestom;
+
+import me.lucko.spark.common.platform.PlatformInfo;
+import net.minestom.server.MinecraftServer;
+
+final class MinestomPlatformInfo implements PlatformInfo {
+    @Override
+    public Type getType() {
+        return Type.SERVER;
+    }
+
+    @Override
+    public String getName() {
+        return "Minestom";
+    }
+
+    @Override
+    public String getBrand() {
+        return "Minestom";
+    }
+
+    @Override
+    public String getVersion() {
+        return MinecraftServer.VERSION_NAME + "-" + MinecraftServer.getBrandName();
+    }
+
+    @Override
+    public String getMinecraftVersion() {
+        return MinecraftServer.VERSION_NAME;
+    }
+}

spark/src/main/java/me/lucko/spark/minestom/MinestomPlatformInfo.java

@@ -0,0 +1,39 @@
+/*
+ * This file is part of spark.
+ *
+ *  Copyright (c) lucko (Luck) <luck@lucko.me>
+ *  Copyright (c) contributors
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package me.lucko.spark.minestom;
+
+import me.lucko.spark.common.monitor.ping.PlayerPingProvider;
+import net.minestom.server.MinecraftServer;
+import net.minestom.server.entity.Player;
+
+import java.util.Map;
+import java.util.stream.Collectors;
+
+public final class MinestomPlayerPingProvider implements PlayerPingProvider {
+    @Override
+    public Map<String, Integer> poll() {
+        return MinecraftServer.getConnectionManager().getOnlinePlayers().stream()
+                .collect(Collectors.toMap(
+                        Player::getUsername,
+                        Player::getLatency
+                ));
+    }
+}