From 383604ec9f8fb0c707913315f5c63bf92dfb76a3 Mon Sep 17 00:00:00 2001 From: YoyoNow Date: Fri, 3 Oct 2025 13:39:19 +0200 Subject: [PATCH] Implement Linkage for SpigotCore --- .../CaseInsensitiveCommandsListener.java | 2 + .../src/de/steamwar/core/Core.java | 37 ++++++++----------- .../de/steamwar/core/WorldEditRenderer.java | 4 ++ .../core/authlib/AuthlibInjector.java | 11 ++++-- .../de/steamwar/core/events/AntiNocom.java | 6 +-- .../steamwar/core/events/ChattingEvent.java | 2 + .../core/events/PlayerJoinedEvent.java | 3 +- .../steamwar/core/events/WorldLoadEvent.java | 2 + .../network/handlers/ServerDataHandler.java | 4 ++ .../src/de/steamwar/persistent/Subserver.java | 1 + 10 files changed, 44 insertions(+), 28 deletions(-) diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/command/CaseInsensitiveCommandsListener.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/command/CaseInsensitiveCommandsListener.java index 05eafdbb..d12e8418 100644 --- a/SpigotCore/SpigotCore_Main/src/de/steamwar/command/CaseInsensitiveCommandsListener.java +++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/command/CaseInsensitiveCommandsListener.java @@ -20,6 +20,7 @@ package de.steamwar.command; import de.steamwar.core.Core; +import de.steamwar.linkage.Linked; import de.steamwar.providers.BauServerInfo; import de.steamwar.sql.AuditLog; import de.steamwar.sql.SteamwarUser; @@ -28,6 +29,7 @@ import org.bukkit.event.EventPriority; import org.bukkit.event.Listener; import org.bukkit.event.player.PlayerCommandPreprocessEvent; +@Linked public class CaseInsensitiveCommandsListener implements Listener { @EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true) diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/core/Core.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/core/Core.java index 91c05851..703d67e9 100644 --- a/SpigotCore/SpigotCore_Main/src/de/steamwar/core/Core.java +++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/core/Core.java @@ -21,15 +21,14 @@ package de.steamwar.core; import com.comphenix.tinyprotocol.TinyProtocol; import de.steamwar.Reflection; -import de.steamwar.command.*; -import de.steamwar.core.authlib.AuthlibInjector; -import de.steamwar.core.events.AntiNocom; -import de.steamwar.core.events.ChattingEvent; -import de.steamwar.core.events.PlayerJoinedEvent; -import de.steamwar.core.events.WorldLoadEvent; +import de.steamwar.command.SWCommandUtils; +import de.steamwar.command.SWTypeMapperCreator; +import de.steamwar.command.TabCompletionCache; +import de.steamwar.command.TypeMapper; +import de.steamwar.linkage.AbstractLinker; +import de.steamwar.linkage.SpigotLinker; import de.steamwar.message.Message; import de.steamwar.network.NetworkReceiver; -import de.steamwar.network.handlers.ServerDataHandler; import de.steamwar.sql.SchematicNode; import de.steamwar.sql.SteamwarUser; import de.steamwar.sql.internal.Statement; @@ -37,7 +36,6 @@ import lombok.Getter; import lombok.Setter; import org.bukkit.Bukkit; import org.bukkit.command.CommandSender; -import org.bukkit.event.Listener; import org.bukkit.plugin.java.JavaPlugin; import java.io.BufferedReader; @@ -95,9 +93,16 @@ public class Core extends JavaPlugin { } }); - for(Listener listener : new Listener[]{new CaseInsensitiveCommandsListener(), new PlayerJoinedEvent(), new ChattingEvent(), new WorldLoadEvent(), RecipeDiscoverWrapper.impl}) { - getServer().getPluginManager().registerEvents(listener, this); - } + SpigotLinker spigotLinker = new SpigotLinker(this, MESSAGE); + try { + spigotLinker.link(); + } catch (AbstractLinker.LinkException e) { + e.printStackTrace(); + Bukkit.shutdown(); + return; + } + + Bukkit.getServer().getPluginManager().registerEvents(RecipeDiscoverWrapper.impl, this); if(!Statement.productionDatabase()) { getServer().getPluginManager().registerEvents(LocaleChangeWrapper.impl, this); } @@ -105,18 +110,8 @@ public class Core extends JavaPlugin { getServer().getMessenger().registerIncomingPluginChannel(this, "sw:bridge", new NetworkReceiver()); getServer().getMessenger().registerOutgoingPluginChannel(this, "sw:bridge"); - if(Core.getVersion() < 19) - AuthlibInjector.inject(); - TinyProtocol.init(); CheckpointUtils.signalHandler(); - new AntiNocom(); - - if(Core.getVersion() >= 19) - new ServerDataHandler(); - - if(Bukkit.getPluginManager().getPlugin("WorldEdit") != null) - new WorldEditRenderer(); Bukkit.getScheduler().runTaskTimer(this, TabCompletionCache::invalidateOldEntries, 20, 20); Bukkit.getScheduler().runTaskTimer(Core.getInstance(), SteamwarUser::clear, 72000, 72000); diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/core/WorldEditRenderer.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/core/WorldEditRenderer.java index 79c54986..27f76cda 100644 --- a/SpigotCore/SpigotCore_Main/src/de/steamwar/core/WorldEditRenderer.java +++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/core/WorldEditRenderer.java @@ -28,6 +28,8 @@ import com.sk89q.worldedit.math.transform.Transform; import com.sk89q.worldedit.regions.Region; import com.sk89q.worldedit.regions.RegionSelector; import com.sk89q.worldedit.world.World; +import de.steamwar.linkage.Linked; +import de.steamwar.linkage.PluginCheck; import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.entity.Player; @@ -37,6 +39,8 @@ import org.bukkit.event.block.BlockBreakEvent; import org.bukkit.event.player.*; import org.bukkit.util.Vector; +@Linked +@PluginCheck("WorldEdit") public class WorldEditRenderer implements Listener { private static WorldEditRenderer INSTANCE; diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/core/authlib/AuthlibInjector.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/core/authlib/AuthlibInjector.java index b9c4011a..06fd942c 100644 --- a/SpigotCore/SpigotCore_Main/src/de/steamwar/core/authlib/AuthlibInjector.java +++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/core/authlib/AuthlibInjector.java @@ -22,11 +22,16 @@ package de.steamwar.core.authlib; import de.steamwar.Reflection; import com.mojang.authlib.GameProfileRepository; import com.mojang.authlib.yggdrasil.YggdrasilGameProfileRepository; +import de.steamwar.linkage.Linked; +import de.steamwar.linkage.MaxVersion; +import de.steamwar.linkage.api.Enable; -public class AuthlibInjector { - private AuthlibInjector() {} +@Linked +@MaxVersion(18) +public class AuthlibInjector implements Enable { - public static void inject() { + @Override + public void enable() { Class minecraftServerClass = Reflection.getClass("net.minecraft.server.MinecraftServer"); Reflection.Field gameProfile = Reflection.getField(minecraftServerClass, GameProfileRepository.class, 0); Object minecraftServer = Reflection.getTypedMethod(minecraftServerClass, "getServer", minecraftServerClass).invoke(null); diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/core/events/AntiNocom.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/core/events/AntiNocom.java index 14f8badc..d3e5ea34 100644 --- a/SpigotCore/SpigotCore_Main/src/de/steamwar/core/events/AntiNocom.java +++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/core/events/AntiNocom.java @@ -19,9 +19,10 @@ package de.steamwar.core.events; -import de.steamwar.Reflection; import com.comphenix.tinyprotocol.TinyProtocol; +import de.steamwar.Reflection; import de.steamwar.core.Core; +import de.steamwar.linkage.Linked; import de.steamwar.sql.SWException; import de.steamwar.techhider.ProtocolUtils; import de.steamwar.techhider.TechHider; @@ -35,14 +36,13 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import java.util.function.Function; +@Linked public class AntiNocom implements Listener { private final Map flags = new ConcurrentHashMap<>(); public AntiNocom() { - Bukkit.getServer().getPluginManager().registerEvents(this, Core.getInstance()); TinyProtocol.instance.addFilter(blockDig, this::onDig); - if(Core.getVersion() > 8) { registerUseItem(); } diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/core/events/ChattingEvent.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/core/events/ChattingEvent.java index 1de582f2..40b7412f 100644 --- a/SpigotCore/SpigotCore_Main/src/de/steamwar/core/events/ChattingEvent.java +++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/core/events/ChattingEvent.java @@ -20,11 +20,13 @@ package de.steamwar.core.events; import de.steamwar.core.Core; +import de.steamwar.linkage.Linked; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.Listener; import org.bukkit.event.player.AsyncPlayerChatEvent; +@Linked public class ChattingEvent implements Listener { @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/core/events/PlayerJoinedEvent.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/core/events/PlayerJoinedEvent.java index d3fd33a0..fc64cb27 100644 --- a/SpigotCore/SpigotCore_Main/src/de/steamwar/core/events/PlayerJoinedEvent.java +++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/core/events/PlayerJoinedEvent.java @@ -20,6 +20,7 @@ package de.steamwar.core.events; import de.steamwar.core.Core; +import de.steamwar.linkage.Linked; import de.steamwar.providers.BauServerInfo; import de.steamwar.sql.AuditLog; import de.steamwar.sql.SteamwarUser; @@ -32,7 +33,7 @@ import org.bukkit.event.Listener; import org.bukkit.event.player.PlayerJoinEvent; import org.bukkit.event.player.PlayerQuitEvent; - +@Linked public class PlayerJoinedEvent implements Listener{ @EventHandler(priority = EventPriority.LOWEST) diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/core/events/WorldLoadEvent.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/core/events/WorldLoadEvent.java index c28f998e..f7aba879 100644 --- a/SpigotCore/SpigotCore_Main/src/de/steamwar/core/events/WorldLoadEvent.java +++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/core/events/WorldLoadEvent.java @@ -19,10 +19,12 @@ package de.steamwar.core.events; +import de.steamwar.linkage.Linked; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; import org.bukkit.event.world.WorldInitEvent; +@Linked public class WorldLoadEvent implements Listener { @EventHandler diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/network/handlers/ServerDataHandler.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/network/handlers/ServerDataHandler.java index 8941432b..a758892d 100644 --- a/SpigotCore/SpigotCore_Main/src/de/steamwar/network/handlers/ServerDataHandler.java +++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/network/handlers/ServerDataHandler.java @@ -21,7 +21,11 @@ package de.steamwar.network.handlers; import de.steamwar.Reflection; import com.comphenix.tinyprotocol.TinyProtocol; +import de.steamwar.linkage.Linked; +import de.steamwar.linkage.MinVersion; +@Linked +@MinVersion(19) public class ServerDataHandler { public ServerDataHandler() { diff --git a/VelocityCore/Persistent/src/de/steamwar/persistent/Subserver.java b/VelocityCore/Persistent/src/de/steamwar/persistent/Subserver.java index 7351e83a..e63b2806 100644 --- a/VelocityCore/Persistent/src/de/steamwar/persistent/Subserver.java +++ b/VelocityCore/Persistent/src/de/steamwar/persistent/Subserver.java @@ -223,6 +223,7 @@ public class Subserver { start(process.getInputStream(), line -> line.contains("Checkpoint restored")); Thread.sleep(100); } else { + sendProgress(0); start(process.getInputStream(), line -> { if (line.contains("Loading libraries, please wait")) sendProgress(2);