Merge pull request 'Add Linkage to CommonCore and implement SpigotLinker used in BauSystem' (#151) from ExtraceLinkageToCommonCore into main

Reviewed-on: SteamWar/SteamWar#151
Reviewed-by: D4rkr34lm <dark@steamwar.de>

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/BauSystem.java

@@ -38,41 +38,29 @@ import de.steamwar.bausystem.utils.TickListener;
 import de.steamwar.bausystem.utils.TickManager;
 import de.steamwar.bausystem.worlddata.WorldData;
 import de.steamwar.command.AbstractValidator;
-import de.steamwar.command.SWCommand;
 import de.steamwar.command.SWCommandUtils;
 import de.steamwar.core.CRIUSleepEvent;
-import de.steamwar.core.Core;
 import de.steamwar.core.WorldEditRendererCUIEditor;
-import de.steamwar.linkage.LinkedInstance;
+import de.steamwar.linkage.AbstractLinker;
-import de.steamwar.linkage.MaxVersion;
+import de.steamwar.linkage.SpigotLinker;
-import de.steamwar.linkage.MinVersion;
-import de.steamwar.linkage.PluginCheck;
-import de.steamwar.linkage.api.Disable;
-import de.steamwar.linkage.api.Enable;
 import de.steamwar.message.Message;
-import de.steamwar.network.packets.PacketHandler;
 import lombok.Getter;
 import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
-import org.bukkit.event.HandlerList;
 import org.bukkit.event.Listener;
 import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.java.JavaPlugin;
 import org.bukkit.scheduler.BukkitRunnable;
 import org.bukkit.scheduler.BukkitTask;
 
-import java.io.*;
+import java.io.IOException;
-import java.lang.reflect.Field;
+import java.io.OutputStream;
-import java.util.HashMap;
+import java.io.PrintStream;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Consumer;
 import java.util.logging.Level;
-import java.util.stream.Collectors;
 
 public class BauSystem extends JavaPlugin implements Listener {
 
@@ -83,7 +71,7 @@ public class BauSystem extends JavaPlugin implements Listener {
     @Getter
     private static BauSystem instance;
 
-    private final Map<Class<?>, Object> instances = new HashMap<>();
+    private SpigotLinker linker;
 
     @Override
     public void onEnable() {
@@ -96,115 +84,43 @@ public class BauSystem extends JavaPlugin implements Listener {
         SWUtils.setBausystem(instance);
 
         RegionSystem.INSTANCE.load();
-        /*
-        try {
-            PrototypeLoader.load();
-            RegionLoader.load();
-        } catch (SecurityException e) {
-            Bukkit.getLogger().log(Level.SEVERE, e.getMessage(), e);
-            Bukkit.shutdown();
-            System.exit(1);
-            return;
-        }
-
-        new Updater(PrototypeLoader.file, PrototypeLoader::load);
-        new Updater(RegionLoader.file, RegionLoader::load);
-         */
 
         SWCommandUtils.addValidator(Player.class, validator(Permission.BUILD));
         SWCommandUtils.addValidator(CommandSender.class, validator(Permission.BUILD));
         SWCommandUtils.addValidator("supervisor", validator(Permission.SUPERVISOR));
         SWCommandUtils.addValidator("owner", validator(Permission.OWNER));
 
-        instances.put(BauServer.class, BauServer.getInstance());
+        linker = new SpigotLinker(BauSystem.getInstance(), BauSystem.MESSAGE) {
-        List<Class<?>> classes = new BufferedReader(new InputStreamReader(BauSystem.class.getResourceAsStream("/META-INF/annotations/de.steamwar.linkage.Linked")))
+            @Override
-                .lines()
+            protected void linkObject(Object any) {
-                .map(s -> {
+                super.linkObject(any);
-                    try {
+                if (any instanceof LuaLib) {
-                        return Class.forName(s, false, BauSystem.class.getClassLoader());
+                    SteamWarLuaPlugin.add((LuaLib) any);
-                    } catch (ClassNotFoundException | NoClassDefFoundError e) {
-                        if (e.getMessage().equals(s)) {
-                            Bukkit.shutdown();
-                            throw new SecurityException(e.getMessage(), e);
-                        }
-                        return null;
-                    }
-                })
-                .filter(Objects::nonNull)
-                .collect(Collectors.toList());
-        classes.forEach(clazz -> {
-            MinVersion minVersion = clazz.getAnnotation(MinVersion.class);
-            MaxVersion maxVersion = clazz.getAnnotation(MaxVersion.class);
-            PluginCheck[] pluginChecks = clazz.getAnnotationsByType(PluginCheck.class);
-            if (minVersion != null && Core.getVersion() < minVersion.value()) {
-                return;
-            }
-            if (maxVersion != null && Core.getVersion() > maxVersion.value()) {
-                return;
-            }
-            for (PluginCheck pluginCheck : pluginChecks) {
-                if (pluginCheck.has() == PluginCheck.Has.THIS && Bukkit.getPluginManager().getPlugin(pluginCheck.value()) != null) {
-                    continue;
                 }
-                if (pluginCheck.has() == PluginCheck.Has.NOT && Bukkit.getPluginManager().getPlugin(pluginCheck.value()) == null) {
+                if (any instanceof ScoreboardElement) {
-                    continue;
+                    BauScoreboard.addElement((ScoreboardElement) any);
                 }
-                return;
+                if (any instanceof BauGuiItem) {
-            }
+                    BauGUI.addItem((BauGuiItem) any);
-
+                }
-            Object any;
+                if (any instanceof PanzernAlgorithm) {
-            try {
+                    Panzern.add((PanzernAlgorithm) any);
-                any = clazz.newInstance();
+                }
-            } catch (InstantiationException | IllegalAccessException e) {
+                if (any instanceof ConfigConverter) {
-                getLogger().log(Level.SEVERE, e.getMessage(), e);
+                    Config.addConfigConverter((ConfigConverter) any);
-                Bukkit.shutdown();
+                }
-                throw new SecurityException(e.getMessage());
+                if (any instanceof BoundingBoxLoader) {
-            }
+                    ((BoundingBoxLoader) any).load();
-
-            instances.put(clazz, any);
-            if (any instanceof Enable) {
-                ((Enable) any).enable();
-            }
-            if (any instanceof SWCommand) {
-                ((SWCommand) any).setMessage(BauSystem.MESSAGE);
-            }
-            if (any instanceof Listener) {
-                Bukkit.getPluginManager().registerEvents((Listener) any, BauSystem.getInstance());
-            }
-            if (any instanceof PacketHandler) {
-                ((PacketHandler) any).register();
-            }
-            if (any instanceof LuaLib) {
-                SteamWarLuaPlugin.add((LuaLib) any);
-            }
-            if (any instanceof ScoreboardElement) {
-                BauScoreboard.addElement((ScoreboardElement) any);
-            }
-            if (any instanceof BauGuiItem) {
-                BauGUI.addItem((BauGuiItem) any);
-            }
-            if (any instanceof PanzernAlgorithm) {
-                Panzern.add((PanzernAlgorithm) any);
-            }
-            if (any instanceof ConfigConverter) {
-                Config.addConfigConverter((ConfigConverter) any);
-            }
-            if (any instanceof BoundingBoxLoader) {
-                ((BoundingBoxLoader) any).load();
-            }
-        });
-
-        instances.forEach((clazz, o) -> {
-            for (Field field : clazz.getFields()) {
-                if (field.getAnnotation(LinkedInstance.class) != null) {
-                    try {
-                        field.set(o, instances.get(field.getType()));
-                    } catch (IllegalAccessException e) {
-                        throw new RuntimeException(e);
-                    }
                 }
             }
-        });
+        };
+        try {
+            linker.addLinkableInstance(BauServer.getInstance());
+            linker.link();
+        } catch (AbstractLinker.LinkException e) {
+            getLogger().log(Level.SEVERE, "Could not link a class.", e);
+            Bukkit.shutdown();
+        }
 
         TickListener.impl.init();
 
@@ -221,15 +137,7 @@ public class BauSystem extends JavaPlugin implements Listener {
 
     @Override
     public void onDisable() {
-        instances.forEach((aClass, o) -> {
+        linker.unlink();
-            if (o instanceof Listener) {
-                HandlerList.unregisterAll((Listener) o);
-            }
-            if (o instanceof Disable) {
-                ((Disable) o).disable();
-            }
-        });
-
         WorldData.write();
         RegionSystem.INSTANCE.save();
         Config.getInstance().saveAll();

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/bau/BauInfoBauGuiItem.java

@@ -26,7 +26,6 @@ import de.steamwar.bausystem.linkage.specific.BauGuiItem;
 import de.steamwar.bausystem.region.FlagOptional;
 import de.steamwar.bausystem.region.Region;
 import de.steamwar.bausystem.region.flags.Flag;
-import de.steamwar.core.Core;
 import de.steamwar.inventory.SWItem;
 import de.steamwar.linkage.Linked;
 import de.steamwar.sql.SteamwarUser;

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/loadtimer/LoadtimerListener.java

@@ -23,7 +23,6 @@ import de.steamwar.bausystem.region.Region;
 import de.steamwar.core.TrickyTrialsWrapper;
 import de.steamwar.linkage.Linked;
 import org.bukkit.Material;
-import org.bukkit.entity.EntityType;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.block.BlockPlaceEvent;

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/ColorCommand.java

@@ -25,8 +25,6 @@ import de.steamwar.bausystem.region.Region;
 import de.steamwar.bausystem.region.RegionUtils;
 import de.steamwar.bausystem.region.flags.ColorMode;
 import de.steamwar.bausystem.region.flags.Flag;
-import de.steamwar.bausystem.region.utils.RegionExtensionType;
-import de.steamwar.bausystem.region.utils.RegionType;
 import de.steamwar.bausystem.utils.PasteBuilder;
 import de.steamwar.command.SWCommand;
 import de.steamwar.command.TypeValidator;

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/RegionScoreboardElement.java

@@ -23,12 +23,9 @@ import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.region.Region;
 import de.steamwar.bausystem.utils.ScoreboardElement;
 import de.steamwar.linkage.Linked;
-import org.bukkit.configuration.file.YamlConfiguration;
 import org.bukkit.entity.Player;
 
-import java.io.File;
 import java.util.List;
-import java.util.Optional;
 
 @Linked
 public class RegionScoreboardElement implements ScoreboardElement {

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/event/EventListener.java

@@ -25,8 +25,6 @@ import de.steamwar.bausystem.features.script.ScriptRunner;
 import de.steamwar.bausystem.features.script.lua.SteamWarGlobalLuaPlugin;
 import de.steamwar.bausystem.features.script.lua.libs.StorageLib;
 import de.steamwar.bausystem.region.Region;
-import de.steamwar.bausystem.region.utils.RegionExtensionType;
-import de.steamwar.bausystem.region.utils.RegionType;
 import de.steamwar.core.TrickyTrialsWrapper;
 import de.steamwar.linkage.Linked;
 import org.bukkit.Bukkit;

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/techhider/TechHiderCommand.java

@@ -34,16 +34,12 @@ import de.steamwar.linkage.LinkedInstance;
 import de.steamwar.techhider.TechHider;
 import net.md_5.bungee.api.ChatMessageType;
 import org.bukkit.Bukkit;
-import org.bukkit.Material;
 import org.bukkit.command.CommandSender;
-import org.bukkit.configuration.file.FileConfiguration;
-import org.bukkit.configuration.file.YamlConfiguration;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerQuitEvent;
 
-import java.io.File;
 import java.util.*;
 import java.util.stream.Collectors;
 

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/NightVisionBauGuiItem.java

@@ -28,7 +28,6 @@ import de.steamwar.linkage.Linked;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.ClickType;
-import org.bukkit.inventory.ItemFlag;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.PotionMeta;
 import org.bukkit.potion.PotionEffectType;

CommonCore/Linkage/build.gradle.kts

@@ -0,0 +1,26 @@
+/*
+ *   This file is a part of the SteamWar software.
+ *
+ *   Copyright (C) 2024  SteamWar.de-Serverteam
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU Affero 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 Affero General Public License for more details.
+ *
+ *   You should have received a copy of the GNU Affero General Public License
+ *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+plugins {
+    steamwar.java
+}
+
+dependencies {
+    compileOnly(libs.classindex)
+}

CommonCore/Linkage/src/de/steamwar/linkage/AbstractLinker.java

@@ -0,0 +1,167 @@
+/*
+ * This file is a part of the SteamWar software.
+ *
+ * Copyright (C) 2020  SteamWar.de-Serverteam
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package de.steamwar.linkage;
+
+import de.steamwar.linkage.api.Disable;
+import de.steamwar.linkage.api.Enable;
+import lombok.NonNull;
+import lombok.experimental.StandardException;
+
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
+public abstract class AbstractLinker<T> {
+
+    protected final T plugin;
+    private Map<Class<?>, Object> instances = new HashMap<>();
+
+    protected AbstractLinker(@NonNull T plugin) {
+        this.plugin = plugin;
+        instances.put(plugin.getClass(), plugin);
+    }
+
+    @StandardException
+    public static class LinkException extends Exception {
+    }
+
+    public final void link() throws LinkException {
+        List<Class<?>> classes;
+        try {
+            classes = new BufferedReader(new InputStreamReader(plugin.getClass().getResourceAsStream("/META-INF/annotations/de.steamwar.linkage.Linked")))
+                    .lines()
+                    .map(s -> {
+                        try {
+                            return Class.forName(s, false, plugin.getClass().getClassLoader());
+                        } catch (ClassNotFoundException | NoClassDefFoundError e) {
+                            throw new SecurityException(e.getMessage(), e);
+                        }
+                    })
+                    .filter(Objects::nonNull)
+                    .collect(Collectors.toList());
+        } catch (SecurityException e) {
+            Throwable cause = e.getCause();
+            throw new LinkException(cause.getMessage(), cause);
+        }
+
+        try {
+            classes.forEach(clazz -> {
+                MinVersion minVersion = clazz.getAnnotation(MinVersion.class);
+                MaxVersion maxVersion = clazz.getAnnotation(MaxVersion.class);
+                if (!versionCheck(clazz, minVersion, maxVersion)) return;
+                EventMode eventMode = clazz.getAnnotation(EventMode.class);
+                if (!eventModeCheck(clazz, eventMode)) return;
+                PluginCheck[] pluginChecks = clazz.getAnnotationsByType(PluginCheck.class);
+                for (PluginCheck pluginCheck : pluginChecks) {
+                    if (!pluginCheck(clazz, pluginCheck)) return;
+                }
+
+                Object any;
+                try {
+                    any = clazz.newInstance();
+                } catch (InstantiationException | IllegalAccessException e) {
+                    throw new SecurityException(e.getMessage(), e);
+                }
+                instances.put(clazz, any);
+
+                if (any instanceof Enable) {
+                    ((Enable) any).enable();
+                }
+                linkObject(any);
+            });
+        } catch (SecurityException e) {
+            Throwable cause = e.getCause();
+            throw new LinkException(cause.getMessage(), cause);
+        }
+
+        try {
+            instances.forEach((clazz, o) -> {
+                for (Field field : clazz.getFields()) {
+                    if (field.getAnnotation(LinkedInstance.class) != null) {
+                        try {
+                            if (Modifier.isStatic(field.getModifiers())) {
+                                field.set(null, instances.get(field.getType()));
+                            } else {
+                                field.set(o, instances.get(field.getType()));
+                            }
+                        } catch (IllegalAccessException e) {
+                            throw new SecurityException(e.getMessage(), e);
+                        }
+                    }
+                }
+            });
+        } catch (SecurityException e) {
+            Throwable cause = e.getCause();
+            throw new LinkException(cause.getMessage(), cause);
+        }
+    }
+
+    public final void unlink() {
+        instances.forEach((aClass, any) -> {
+            unlinkObject(any);
+            if (any instanceof Disable) {
+                ((Disable) any).disable();
+            }
+        });
+    }
+
+    public final void addLinkableInstance(@NonNull Object instance) {
+        instances.put(instance.getClass(), instance);
+    }
+
+    /**
+     * @return {@code true} if the clazz passes the checks {@code false} otherwise
+     */
+    protected boolean versionCheck(@NonNull Class<?> clazz, MinVersion minVersion, MaxVersion maxVersion) {
+        return true;
+    }
+
+    /**
+     * @return {@code true} if the clazz passes the checks {@code false} otherwise
+     */
+    protected boolean pluginCheck(@NonNull Class<?> clazz, PluginCheck pluginCheck) {
+        return true;
+    }
+
+    /**
+     * @return {@code true} if the clazz passes the checks {@code false} otherwise
+     */
+    protected boolean eventModeCheck(@NonNull Class<?> clazz, EventMode eventMode) {
+        return true;
+    }
+
+    /**
+     * There is no need in calling {@link Enable#enable()} by this method.
+     */
+    protected void linkObject(Object any) {
+    }
+
+    /**
+     * There is no need in calling {@link Disable#disable()} ()} by this method.
+     */
+    protected void unlinkObject(Object any) {
+    }
+}

CommonCore/Linkage/src/de/steamwar/linkage/EventMode.java

@@ -1,7 +1,7 @@
 /*
  * This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ * Copyright (C) 2020  SteamWar.de-Serverteam
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -17,15 +17,15 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.steamwar.lobby.listener;
+package de.steamwar.linkage;
 
-import de.steamwar.lobby.LobbySystem;
+import java.lang.annotation.ElementType;
-import org.bukkit.Bukkit;
+import java.lang.annotation.Retention;
-import org.bukkit.event.Listener;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 
-public class BasicListener implements Listener {
+@Retention(RetentionPolicy.RUNTIME)
-
+@Target({ElementType.TYPE})
-    public BasicListener () {
+public @interface EventMode {
-        Bukkit.getPluginManager().registerEvents(this, LobbySystem.getPlugin());
+    boolean value();
-    }
 }

CommonCore/Linkage/src/de/steamwar/linkage/Linked.java

@@ -1,7 +1,7 @@
 /*
  * This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ * Copyright (C) 2020  SteamWar.de-Serverteam
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by

CommonCore/Linkage/src/de/steamwar/linkage/LinkedInstance.java

@@ -1,7 +1,7 @@
 /*
  * This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ * Copyright (C) 2020  SteamWar.de-Serverteam
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by

CommonCore/Linkage/src/de/steamwar/linkage/MinVersion.java

@@ -1,7 +1,7 @@
 /*
  * This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ * Copyright (C) 2020  SteamWar.de-Serverteam
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by

CommonCore/build.gradle.kts

@@ -25,4 +25,5 @@ dependencies {
     api(project(":CommonCore:SQL"))
     api(project(":CommonCore:Network"))
     api(project(":CommonCore:Data"))
+    api(project(":CommonCore:Linkage"))
 }

FightSystem/FightSystem_Core/build.gradle.kts

@@ -22,6 +22,8 @@ plugins {
 }
 
 dependencies {
+    compileOnly(libs.classindex)
+    annotationProcessor(libs.classindex)
     compileOnly(project(":SpigotCore", "default"))
 
     compileOnly(libs.spigotapi)

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/FightSystem.java

@@ -20,26 +20,24 @@
 package de.steamwar.fightsystem;
 
 import com.comphenix.tinyprotocol.TinyProtocol;
-import de.steamwar.core.WorldEditRendererCUIEditor;
 import de.steamwar.core.Core;
-import de.steamwar.fightsystem.commands.*;
+import de.steamwar.core.WorldEditRendererCUIEditor;
-import de.steamwar.fightsystem.countdown.*;
+import de.steamwar.fightsystem.commands.TechareaCommand;
-import de.steamwar.fightsystem.event.*;
 import de.steamwar.fightsystem.fight.Fight;
 import de.steamwar.fightsystem.fight.FightTeam;
-import de.steamwar.fightsystem.fight.FightWorld;
+import de.steamwar.fightsystem.listener.ClickAnalyzer;
-import de.steamwar.fightsystem.fight.HotbarKit;
+import de.steamwar.fightsystem.listener.PistonListener;
-import de.steamwar.fightsystem.listener.*;
-import de.steamwar.fightsystem.listener.Shutdown;
-import de.steamwar.fightsystem.record.FileRecorder;
 import de.steamwar.fightsystem.record.FileSource;
 import de.steamwar.fightsystem.record.GlobalRecorder;
-import de.steamwar.fightsystem.record.LiveRecorder;
 import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.OneShotStateDependent;
 import de.steamwar.fightsystem.states.StateDependentListener;
 import de.steamwar.fightsystem.utils.*;
-import de.steamwar.fightsystem.winconditions.*;
+import de.steamwar.fightsystem.winconditions.Wincondition;
+import de.steamwar.fightsystem.winconditions.WinconditionComparisonTimeout;
+import de.steamwar.fightsystem.winconditions.Winconditions;
+import de.steamwar.linkage.AbstractLinker;
+import de.steamwar.linkage.SpigotLinker;
 import de.steamwar.message.Message;
 import de.steamwar.sql.NodeData;
 import de.steamwar.sql.SchematicNode;
@@ -58,6 +56,8 @@ public class FightSystem extends JavaPlugin {
     private TechHiderWrapper techHider;
     private HullHider hullHider;
 
+    private SpigotLinker spigotLinker;
+
     @Override
     public void onLoad() {
         plugin = this;
@@ -77,100 +77,32 @@ public class FightSystem extends JavaPlugin {
 
         message = new Message("de.steamwar.fightsystem.FightSystem", FightSystem.class.getClassLoader());
 
-        new EntityDamage();
+        spigotLinker = new SpigotLinker(this, message) {
-        new WaterRemover();
+            @Override
-        new Permanent();
+            protected void linkObject(Object any) {
+                // No Init needed for FightSystem!
+            }
+        };
+        try {
+            spigotLinker.link();
+        } catch (AbstractLinker.LinkException e) {
+            e.printStackTrace();
+            Bukkit.shutdown();
+            return;
+        }
+
         new PistonListener(ArenaMode.AntiTestCheckPrepare, e -> e.setCancelled(true));
         new PistonListener(ArenaMode.Test, e -> getMessage().broadcastActionbar("PISTON_PUSHED_OUTSIDE"));
         new PistonListener(ArenaMode.Prepare, e -> {
             getMessage().broadcast("PISTON_PUSHED_OUTSIDE");
             shutdown();
         });
-        new Chat();
-        new ArenaBorder();
-        new IngameDeath();
-        new InFightDamage();
-        new InFightInventory();
-        new DenyWorldInteraction();
-        new DenyInventoryMovement();
-        new EventJoin();
-        new Recording();
-        new Check();
-        new Shutdown();
-        new SetupQuit();
-        new PrepareSchem();
-        new TestJoin();
-        new NormalJoin();
-        new Spectator();
-        new RunningWorldInteraction();
-        new PersonalKitCreator();
-        new ArrowStopper();
         new StateDependentListener(ArenaMode.All, FightState.All, BountifulWrapper.impl.newDenyArrowPickupListener());
-        new BlockFadeListener();
-        new LeaveableArena();
-        new ClickAnalyzer();
-        new BlockPlaceCollision();
-        new HotbarKit.HotbarKitListener();
-        new JoinRequestListener();
         new OneShotStateDependent(ArenaMode.All, FightState.PreSchemSetup, () -> Fight.playSound(SWSound.BLOCK_NOTE_PLING.getSound(), 100.0f, 2.0f));
         new OneShotStateDependent(ArenaMode.Test, FightState.All, WorldEditRendererCUIEditor::new);
 
-        new EnterHandler();
         techHider = new TechHiderWrapper();
         hullHider = new HullHider();
-        new FightWorld();
-        new FightUI();
-        new FightStatistics();
-        new BungeeFightInfo();
-
-        new WinconditionAllDead();
-        new WinconditionCaptainDead();
-        new WinconditionBlocks(Winconditions.WATER_TECH_KO, "WaterTechKO", "BAR_WATER", FlatteningWrapper.impl::isWater);
-        new WinconditionBlocks(Winconditions.PUMPKIN_TECH_KO, "PumpkinTechKO", "BAR_CANNONS", block -> block.getType() == WinconditionBlocks.PUMPKIN_LANTERN);
-        new WinconditionPercent(Winconditions.PERCENT_SYSTEM, "Percent");
-        new WinconditionPoints();
-        new WinconditionPointsAirShip();
-        new WinconditionTimeout();
-        new WinconditionTimeTechKO();
-        new WinconditionTimedDamageTechKO();
-        new EventTeamOffWincondition();
-        new WinconditionComparisonTimeout(Winconditions.HEART_RATIO_TIMEOUT, "HeartTimeout", "WIN_MORE_HEALTH", FightTeam::getHeartRatio);
-        new WinconditionComparisonTimeout(Winconditions.PERCENT_TIMEOUT, "PercentTimeout", "WIN_LESS_DAMAGE", team -> -Wincondition.getPercentWincondition().getPercent(team));
-
-        new HellsBells();
-        new Meteor();
-        new PersistentDamage();
-        new TNTDistributor();
-        new WinconditionAmongUs();
-        new NoGravity();
-
-        new NoPlayersOnlineCountdown();
-        new PreSchemCountdown();
-        new PostSchemCountdown();
-        new PreRunningCountdown();
-        new SpectateOverCountdown();
-        new EventSpectateCountdown();
-
-        new LeaveCommand();
-        new KitCommand();
-        new RemoveCommand();
-        new RequestsCommand();
-        new InfoCommand();
-        new WGCommand();
-        new TBCommand();
-        new GamemodeCommand();
-        new ReadyCommand();
-        new AkCommand();
-        new LockschemCommand();
-        new StateCommand();
-        new SkipCommand();
-        new TechhiderbugCommand();
-        new TPSWarpCommand();
-        new UnrankCommand();
-        new WinCommand();
-
-        new LiveRecorder();
-        new FileRecorder();
 
         FileSource.startReplay();
 
@@ -196,6 +128,7 @@ public class FightSystem extends JavaPlugin {
     public void onDisable() {
         GlobalRecorder.getInstance().close();
         ClickAnalyzer.close();
+        spigotLinker.unlink();
     }
 
     public static void setSpectateState(FightTeam winFightTeam, String winreason, String subtitle, Object... params) {

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/AkCommand.java

@@ -25,6 +25,7 @@ import de.steamwar.fightsystem.FightSystem;
 import de.steamwar.fightsystem.fight.Kit;
 import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.StateDependentCommand;
+import de.steamwar.linkage.Linked;
 import de.steamwar.sql.SteamwarUser;
 import de.steamwar.sql.UserPerm;
 import org.bukkit.command.Command;
@@ -32,6 +33,7 @@ import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
+@Linked
 public class AkCommand implements CommandExecutor {
 
     public AkCommand() {

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/GamemodeCommand.java

@@ -23,6 +23,7 @@ import com.google.common.collect.ImmutableList;
 import de.steamwar.core.CommandRemover;
 import de.steamwar.fightsystem.Config;
 import de.steamwar.fightsystem.FightSystem;
+import de.steamwar.linkage.Linked;
 import net.md_5.bungee.api.ChatMessageType;
 import org.bukkit.GameMode;
 import org.bukkit.command.CommandSender;
@@ -34,6 +35,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.logging.Level;
 
+@Linked
 public class GamemodeCommand extends BukkitCommand {
 
     private static final List<String> GAMEMODE_NAMES = ImmutableList.of("adventure", "creative", "survival",

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/InfoCommand.java

@@ -26,6 +26,7 @@ import de.steamwar.fightsystem.fight.FightTeam;
 import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.StateDependentCommand;
 import de.steamwar.fightsystem.utils.FightStatistics;
+import de.steamwar.linkage.Linked;
 import de.steamwar.sql.SchematicNode;
 import de.steamwar.sql.SteamwarUser;
 import de.steamwar.sql.UserPerm;
@@ -34,6 +35,7 @@ import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
+@Linked
 public class InfoCommand implements CommandExecutor {
 
     public InfoCommand() {

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/KitCommand.java

@@ -22,11 +22,13 @@ package de.steamwar.fightsystem.commands;
 import de.steamwar.fightsystem.ArenaMode;
 import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.StateDependentCommand;
+import de.steamwar.linkage.Linked;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
+@Linked
 public class KitCommand implements CommandExecutor {
 
     public KitCommand() {

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/LeaveCommand.java

@@ -22,11 +22,13 @@ package de.steamwar.fightsystem.commands;
 import de.steamwar.fightsystem.ArenaMode;
 import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.StateDependentCommand;
+import de.steamwar.linkage.Linked;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
+@Linked
 public class LeaveCommand implements CommandExecutor {
 
     public LeaveCommand() {

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/LockschemCommand.java

@@ -25,6 +25,7 @@ import de.steamwar.fightsystem.fight.Fight;
 import de.steamwar.fightsystem.fight.FightTeam;
 import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.StateDependentCommand;
+import de.steamwar.linkage.Linked;
 import de.steamwar.sql.*;
 import net.md_5.bungee.api.ChatMessageType;
 import org.bukkit.command.Command;
@@ -32,6 +33,7 @@ import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
+@Linked
 public class LockschemCommand implements CommandExecutor {
 
     public LockschemCommand() {

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/ReadyCommand.java

@@ -22,11 +22,13 @@ package de.steamwar.fightsystem.commands;
 import de.steamwar.fightsystem.ArenaMode;
 import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.StateDependentCommand;
+import de.steamwar.linkage.Linked;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
+@Linked
 public class ReadyCommand implements CommandExecutor {
 
     public ReadyCommand() {

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/RemoveCommand.java

@@ -23,11 +23,13 @@ import de.steamwar.fightsystem.ArenaMode;
 import de.steamwar.fightsystem.FightSystem;
 import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.StateDependentCommand;
+import de.steamwar.linkage.Linked;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
+@Linked
 public class RemoveCommand implements CommandExecutor {
 
     public RemoveCommand() {

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/RequestsCommand.java

@@ -27,6 +27,7 @@ import de.steamwar.fightsystem.fight.FightTeam;
 import de.steamwar.fightsystem.fight.JoinRequest;
 import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.StateDependentCommand;
+import de.steamwar.linkage.Linked;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
@@ -34,6 +35,7 @@ import org.bukkit.entity.Player;
 
 import java.util.function.BiConsumer;
 
+@Linked
 public class RequestsCommand implements CommandExecutor {
 
     public RequestsCommand() {

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/SkipCommand.java

@@ -25,11 +25,13 @@ import de.steamwar.fightsystem.fight.Fight;
 import de.steamwar.fightsystem.record.PacketProcessor;
 import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.StateDependentCommand;
+import de.steamwar.linkage.Linked;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
+@Linked
 public class SkipCommand implements CommandExecutor {
 
     public SkipCommand() {

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/StateCommand.java

@@ -22,11 +22,13 @@ package de.steamwar.fightsystem.commands;
 import de.steamwar.fightsystem.ArenaMode;
 import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.StateDependentCommand;
+import de.steamwar.linkage.Linked;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
+@Linked
 public class StateCommand implements CommandExecutor {
 
     public StateCommand() {

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/TBCommand.java

@@ -23,11 +23,13 @@ import de.steamwar.fightsystem.ArenaMode;
 import de.steamwar.fightsystem.fight.Fight;
 import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.StateDependentCommand;
+import de.steamwar.linkage.Linked;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
+@Linked
 public class TBCommand implements CommandExecutor {
 
     public TBCommand() {

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/TPSWarpCommand.java

@@ -24,10 +24,12 @@ import de.steamwar.fightsystem.ArenaMode;
 import de.steamwar.fightsystem.FightSystem;
 import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.StateDependentCommand;
+import de.steamwar.linkage.Linked;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 
+@Linked
 public class TPSWarpCommand implements CommandExecutor {
 
     public TPSWarpCommand() {

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/TechhiderbugCommand.java

@@ -26,6 +26,7 @@ import de.steamwar.fightsystem.FightSystem;
 import de.steamwar.fightsystem.fight.Fight;
 import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.StateDependentCommand;
+import de.steamwar.linkage.Linked;
 import de.steamwar.sql.SWException;
 import org.bukkit.Bukkit;
 import org.bukkit.command.Command;
@@ -36,6 +37,7 @@ import java.io.StringWriter;
 import java.util.Arrays;
 import java.util.logging.Level;
 
+@Linked
 public class TechhiderbugCommand implements CommandExecutor {
 
     public TechhiderbugCommand() {

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/UnrankCommand.java

@@ -23,11 +23,13 @@ import de.steamwar.fightsystem.ArenaMode;
 import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.StateDependentCommand;
 import de.steamwar.fightsystem.utils.FightStatistics;
+import de.steamwar.linkage.Linked;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
+@Linked
 public class UnrankCommand implements CommandExecutor {
 
     public UnrankCommand () {

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/WGCommand.java

@@ -24,11 +24,13 @@ import de.steamwar.fightsystem.fight.Fight;
 import de.steamwar.fightsystem.fight.FightWorld;
 import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.StateDependentCommand;
+import de.steamwar.linkage.Linked;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
+@Linked
 public class WGCommand implements CommandExecutor {
 
     public WGCommand() {

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/WinCommand.java

@@ -7,12 +7,14 @@ import de.steamwar.fightsystem.fight.Fight;
 import de.steamwar.fightsystem.fight.FightTeam;
 import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.StateDependentCommand;
+import de.steamwar.linkage.Linked;
 import net.md_5.bungee.api.ChatMessageType;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
+@Linked
 public class WinCommand implements CommandExecutor {
 
     public WinCommand() {

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/countdown/EventSpectateCountdown.java

@@ -26,7 +26,9 @@ import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.StateDependentCountdown;
 import de.steamwar.fightsystem.utils.Message;
 import de.steamwar.fightsystem.utils.SWSound;
+import de.steamwar.linkage.Linked;
 
+@Linked
 public class EventSpectateCountdown extends Countdown {
 
     public EventSpectateCountdown() {

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/countdown/NoPlayersOnlineCountdown.java

@@ -24,8 +24,10 @@ import de.steamwar.fightsystem.Config;
 import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.StateDependentCountdown;
 import de.steamwar.fightsystem.utils.Message;
+import de.steamwar.linkage.Linked;
 import org.bukkit.Bukkit;
 
+@Linked
 public class NoPlayersOnlineCountdown extends Countdown {
 
     public NoPlayersOnlineCountdown() {

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/countdown/PostSchemCountdown.java

@@ -24,7 +24,9 @@ import de.steamwar.fightsystem.Config;
 import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.StateDependentCountdown;
 import de.steamwar.fightsystem.utils.Message;
+import de.steamwar.linkage.Linked;
 
+@Linked
 public class PostSchemCountdown extends Countdown {
 
     public PostSchemCountdown() {

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/countdown/PreRunningCountdown.java

@@ -25,7 +25,9 @@ import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.StateDependentCountdown;
 import de.steamwar.fightsystem.utils.Message;
 import de.steamwar.fightsystem.utils.SWSound;
+import de.steamwar.linkage.Linked;
 
+@Linked
 public class PreRunningCountdown extends Countdown {
 
     public PreRunningCountdown() {

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/countdown/PreSchemCountdown.java

@@ -25,7 +25,9 @@ import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.StateDependentCountdown;
 import de.steamwar.fightsystem.utils.Message;
 import de.steamwar.fightsystem.utils.SWSound;
+import de.steamwar.linkage.Linked;
 
+@Linked
 public class PreSchemCountdown extends Countdown {
 
     public PreSchemCountdown() {

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/countdown/SpectateOverCountdown.java

@@ -25,7 +25,9 @@ import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.StateDependentCountdown;
 import de.steamwar.fightsystem.utils.Message;
 import de.steamwar.fightsystem.utils.SWSound;
+import de.steamwar.linkage.Linked;
 
+@Linked
 public class SpectateOverCountdown extends Countdown {
 
     public SpectateOverCountdown() {

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/event/HellsBells.java

@@ -29,8 +29,8 @@ import de.steamwar.fightsystem.states.StateDependent;
 import de.steamwar.fightsystem.utils.Message;
 import de.steamwar.fightsystem.utils.SWSound;
 import de.steamwar.fightsystem.winconditions.Winconditions;
+import de.steamwar.linkage.Linked;
 import org.bukkit.Bukkit;
-import org.bukkit.entity.EntityType;
 import org.bukkit.scheduler.BukkitTask;
 
 import java.util.Arrays;
@@ -39,7 +39,7 @@ import java.util.Random;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.logging.Level;
 
-
+@Linked
 public class HellsBells {
 
 	public static final Random random = new Random();

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/event/Meteor.java

@@ -29,6 +29,7 @@ import de.steamwar.fightsystem.states.StateDependentListener;
 import de.steamwar.fightsystem.utils.Message;
 import de.steamwar.fightsystem.utils.SWSound;
 import de.steamwar.fightsystem.winconditions.Winconditions;
+import de.steamwar.linkage.Linked;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Fireball;
 import org.bukkit.entity.LargeFireball;
@@ -44,7 +45,7 @@ import java.util.Random;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.logging.Level;
 
-
+@Linked
 public class Meteor implements Listener {
 
 	public static final Random random = new Random();

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/event/NoGravity.java

@@ -22,11 +22,13 @@ package de.steamwar.fightsystem.event;
 import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.StateDependentListener;
 import de.steamwar.fightsystem.winconditions.Winconditions;
+import de.steamwar.linkage.Linked;
 import org.bukkit.entity.EntityType;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.entity.EntitySpawnEvent;
 
+@Linked
 public class NoGravity implements Listener {
 
     public NoGravity() {

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/event/PersistentDamage.java

@@ -28,10 +28,12 @@ import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.OneShotStateDependent;
 import de.steamwar.fightsystem.utils.WorldeditWrapper;
 import de.steamwar.fightsystem.winconditions.Winconditions;
+import de.steamwar.linkage.Linked;
 import de.steamwar.sql.SchematicNode;
 
 import java.util.logging.Level;
 
+@Linked
 public class PersistentDamage {
 
     public PersistentDamage() {

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/event/TNTDistributor.java

@@ -23,9 +23,11 @@ import de.steamwar.fightsystem.fight.Fight;
 import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.StateDependentTask;
 import de.steamwar.fightsystem.winconditions.Winconditions;
+import de.steamwar.linkage.Linked;
 import org.bukkit.Material;
 import org.bukkit.inventory.ItemStack;
 
+@Linked
 public class TNTDistributor {
 
     public TNTDistributor() {

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/fight/FightWorld.java

@@ -27,6 +27,7 @@ import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.StateDependent;
 import de.steamwar.fightsystem.utils.CraftbukkitWrapper;
 import de.steamwar.fightsystem.utils.FlatteningWrapper;
+import de.steamwar.linkage.Linked;
 import lombok.Getter;
 import org.bukkit.Bukkit;
 import org.bukkit.World;
@@ -39,6 +40,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 
+@Linked
 public class FightWorld extends StateDependent {
 
     @Getter

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/fight/HotbarKit.java

@@ -19,35 +19,18 @@
 
 package de.steamwar.fightsystem.fight;
 
-import de.steamwar.core.Core;
-import de.steamwar.fightsystem.ArenaMode;
 import de.steamwar.fightsystem.Config;
 import de.steamwar.fightsystem.FightSystem;
 import de.steamwar.fightsystem.commands.GUI;
-import de.steamwar.fightsystem.listener.PersonalKitCreator;
-import de.steamwar.fightsystem.states.FightState;
-import de.steamwar.fightsystem.states.StateDependentListener;
-import de.steamwar.fightsystem.states.StateDependentTask;
 import de.steamwar.fightsystem.utils.ItemBuilder;
-import org.bukkit.Bukkit;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
-import org.bukkit.event.Cancellable;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.Listener;
-import org.bukkit.event.block.Action;
-import org.bukkit.event.inventory.InventoryClickEvent;
-import org.bukkit.event.inventory.InventoryOpenEvent;
-import org.bukkit.event.player.PlayerInteractEvent;
-import org.bukkit.inventory.EquipmentSlot;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
 import org.bukkit.potion.PotionEffect;
 
 import java.util.Collection;
-import java.util.HashSet;
 import java.util.Objects;
-import java.util.Set;
 import java.util.function.Consumer;
 
 public class HotbarKit extends Kit {
@@ -58,10 +41,10 @@ public class HotbarKit extends Kit {
             SPECTATOR_KIT.setItem(i, "JOIN_REQUEST", new ItemBuilder(Material.PAPER).build(), GUI::joinRequest);
     }
 
-    private static final int HOTBAR_SIZE = 9;
+    protected static final int HOTBAR_SIZE = 9;
 
     private final String[] nameTags;
-    private final Consumer<Player>[] onClicks;
+    protected final Consumer<Player>[] onClicks;
 
     protected HotbarKit(String name, ItemStack[] inventory, ItemStack[] armor, Collection<PotionEffect> effects, String[] nameTags, Consumer<Player>[] onClicks) {
         super(name, inventory, armor, effects);
@@ -94,45 +77,4 @@ public class HotbarKit extends Kit {
         }
         super.loadToPlayer(player);
     }
-
-    public static class HotbarKitListener implements Listener {
-
-        private static final Set<Player> clicked = new HashSet<>();
-
-        public HotbarKitListener() {
-            new StateDependentListener(ArenaMode.AntiReplay, FightState.All, this);
-            new StateDependentTask(ArenaMode.AntiReplay, FightState.All, clicked::clear, 10, 10);
-        }
-
-        @EventHandler
-        public void handlePlayerInteract(PlayerInteractEvent event) {
-            if(event.getAction() == Action.PHYSICAL || (Core.getVersion() > 8 && event.getHand() != EquipmentSlot.HAND))
-                return;
-
-            Player player = event.getPlayer();
-            int slot = player.getInventory().getHeldItemSlot();
-            click(player, slot, event);
-        }
-
-        @EventHandler
-        public void onInventoryClick(InventoryClickEvent event) {
-            int slot = event.getSlot();
-            if (slot < 0 || slot >= HOTBAR_SIZE) return;
-
-            Player player = (Player) event.getWhoClicked();
-            click(player, slot, event);
-        }
-
-        private void click(Player player, int slot, Cancellable event) {
-            Kit activeKit = activeKits.get(player);
-            if(!(activeKit instanceof HotbarKit) || PersonalKitCreator.inKitCreator(player) || activeKit.getInventory()[slot] == null)
-                return;
-
-            event.setCancelled(true);
-            if(!clicked.add(player))
-                return;
-
-            ((HotbarKit)activeKit).onClicks[slot].accept(player);
-        }
-    }
 }

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/fight/HotbarKitListener.java

@@ -0,0 +1,81 @@
+/*
+ * This file is a part of the SteamWar software.
+ *
+ * Copyright (C) 2020  SteamWar.de-Serverteam
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package de.steamwar.fightsystem.fight;
+
+import de.steamwar.core.Core;
+import de.steamwar.fightsystem.ArenaMode;
+import de.steamwar.fightsystem.listener.PersonalKitCreator;
+import de.steamwar.fightsystem.states.FightState;
+import de.steamwar.fightsystem.states.StateDependentListener;
+import de.steamwar.fightsystem.states.StateDependentTask;
+import de.steamwar.linkage.Linked;
+import org.bukkit.entity.Player;
+import org.bukkit.event.Cancellable;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.block.Action;
+import org.bukkit.event.inventory.InventoryClickEvent;
+import org.bukkit.event.player.PlayerInteractEvent;
+import org.bukkit.inventory.EquipmentSlot;
+
+import java.util.HashSet;
+import java.util.Set;
+
+@Linked
+public class HotbarKitListener implements Listener {
+
+    private static final Set<Player> clicked = new HashSet<>();
+
+    public HotbarKitListener() {
+        new StateDependentListener(ArenaMode.AntiReplay, FightState.All, this);
+        new StateDependentTask(ArenaMode.AntiReplay, FightState.All, clicked::clear, 10, 10);
+    }
+
+    @EventHandler
+    public void handlePlayerInteract(PlayerInteractEvent event) {
+        if (event.getAction() == Action.PHYSICAL || (Core.getVersion() > 8 && event.getHand() != EquipmentSlot.HAND))
+            return;
+
+        Player player = event.getPlayer();
+        int slot = player.getInventory().getHeldItemSlot();
+        click(player, slot, event);
+    }
+
+    @EventHandler
+    public void onInventoryClick(InventoryClickEvent event) {
+        int slot = event.getSlot();
+        if (slot < 0 || slot >= HotbarKit.HOTBAR_SIZE) return;
+
+        Player player = (Player) event.getWhoClicked();
+        click(player, slot, event);
+    }
+
+    private void click(Player player, int slot, Cancellable event) {
+        Kit activeKit = Kit.activeKits.get(player);
+        if (!(activeKit instanceof HotbarKit) || PersonalKitCreator.inKitCreator(player) || activeKit.getInventory()[slot] == null)
+            return;
+
+        event.setCancelled(true);
+        if (!clicked.add(player))
+            return;
+
+        ((HotbarKit) activeKit).onClicks[slot].accept(player);
+    }
+}

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/ArenaBorder.java

@@ -29,6 +29,7 @@ import de.steamwar.fightsystem.fight.FightPlayer;
 import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.StateDependentListener;
 import de.steamwar.fightsystem.states.StateDependentTask;
+import de.steamwar.linkage.Linked;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
@@ -37,6 +38,7 @@ import org.bukkit.event.player.PlayerJoinEvent;
 import org.bukkit.event.player.PlayerMoveEvent;
 import org.bukkit.event.player.PlayerQuitEvent;
 
+@Linked
 public class ArenaBorder implements Listener {
 
     private final Border spectatorBorder = new Border(Config.PlayerRegion, true, 5, "NO_ARENA_LEAVING", "ArenaBorder.spectatorBorder");

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/ArrowStopper.java

@@ -24,6 +24,7 @@ import de.steamwar.fightsystem.Config;
 import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.StateDependentTask;
 import de.steamwar.fightsystem.utils.WorldOfColorWrapper;
+import de.steamwar.linkage.Linked;
 import org.bukkit.Location;
 import org.bukkit.block.Block;
 import org.bukkit.block.BlockFace;
@@ -32,6 +33,7 @@ import org.bukkit.entity.Projectile;
 import org.bukkit.projectiles.ProjectileSource;
 import org.bukkit.util.Vector;
 
+@Linked
 public class ArrowStopper {
 
     private static final Vector NULL_VECTOR = new Vector(0, 0, 0);

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/BlockFadeListener.java

@@ -3,11 +3,13 @@ package de.steamwar.fightsystem.listener;
 import de.steamwar.fightsystem.Config;
 import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.StateDependentListener;
+import de.steamwar.linkage.Linked;
 import org.bukkit.Material;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.block.BlockFadeEvent;
 
+@Linked
 public class BlockFadeListener implements Listener {
 
     public BlockFadeListener() {

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/BlockPlaceCollision.java

@@ -23,6 +23,7 @@ import de.steamwar.fightsystem.ArenaMode;
 import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.StateDependentListener;
 import de.steamwar.fightsystem.utils.FlatteningWrapper;
+import de.steamwar.linkage.Linked;
 import org.bukkit.Location;
 import org.bukkit.block.Block;
 import org.bukkit.entity.Player;
@@ -30,6 +31,7 @@ import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.block.BlockPlaceEvent;
 
+@Linked
 public class BlockPlaceCollision implements Listener {
 
     public BlockPlaceCollision() {

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/Chat.java

@@ -27,6 +27,7 @@ import de.steamwar.fightsystem.fight.FightTeam;
 import de.steamwar.fightsystem.record.GlobalRecorder;
 import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.StateDependentListener;
+import de.steamwar.linkage.Linked;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
@@ -34,6 +35,7 @@ import org.bukkit.event.player.AsyncPlayerChatEvent;
 
 import java.util.logging.Level;
 
+@Linked
 public class Chat implements Listener {
 
     public Chat(){

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/Check.java

@@ -24,6 +24,7 @@ import de.steamwar.fightsystem.Config;
 import de.steamwar.fightsystem.FightSystem;
 import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.StateDependentListener;
+import de.steamwar.linkage.Linked;
 import de.steamwar.sql.SchematicNode;
 import de.steamwar.sql.SteamwarUser;
 import de.steamwar.sql.UserPerm;
@@ -36,6 +37,7 @@ import org.bukkit.event.player.PlayerJoinEvent;
 
 import java.util.logging.Level;
 
+@Linked
 public class Check implements Listener {
 
     public Check() {

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/ClickAnalyzer.java

@@ -24,10 +24,12 @@ import com.comphenix.tinyprotocol.TinyProtocol;
 import de.steamwar.core.Core;
 import de.steamwar.fightsystem.Config;
 import de.steamwar.fightsystem.utils.CraftbukkitWrapper;
+import de.steamwar.linkage.Linked;
 import org.bukkit.entity.Player;
 
 import java.io.*;
 
+@Linked
 public class ClickAnalyzer {
 
     private static final PrintStream output;

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/DenyInventoryMovement.java

@@ -23,12 +23,14 @@ import de.steamwar.fightsystem.ArenaMode;
 import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.StateDependentListener;
 import de.steamwar.fightsystem.utils.BountifulWrapper;
+import de.steamwar.linkage.Linked;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.inventory.InventoryClickEvent;
 import org.bukkit.event.inventory.InventoryDragEvent;
 import org.bukkit.event.player.PlayerPickupItemEvent;
 
+@Linked
 public class DenyInventoryMovement implements Listener {
 
     public DenyInventoryMovement() {

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/DenyWorldInteraction.java

@@ -25,6 +25,7 @@ import de.steamwar.fightsystem.FightSystem;
 import de.steamwar.fightsystem.fight.Fight;
 import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.StateDependentListener;
+import de.steamwar.linkage.Linked;
 import net.md_5.bungee.api.ChatMessageType;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
@@ -38,6 +39,7 @@ import org.bukkit.event.hanging.HangingBreakEvent;
 import org.bukkit.event.player.PlayerDropItemEvent;
 import org.bukkit.event.player.PlayerKickEvent;
 
+@Linked
 public class DenyWorldInteraction implements Listener {
 
     public DenyWorldInteraction() {

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/EntityDamage.java

@@ -23,11 +23,13 @@ import de.steamwar.fightsystem.ArenaMode;
 import de.steamwar.fightsystem.Config;
 import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.StateDependentListener;
+import de.steamwar.linkage.Linked;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.entity.EntityDamageByEntityEvent;
 import org.bukkit.event.entity.EntityDamageEvent;
 
+@Linked
 public class EntityDamage implements Listener {
 
     public EntityDamage() {

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/EventJoin.java

@@ -26,6 +26,7 @@ import de.steamwar.fightsystem.fight.Fight;
 import de.steamwar.fightsystem.fight.FightTeam;
 import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.StateDependentListener;
+import de.steamwar.linkage.Linked;
 import de.steamwar.sql.SteamwarUser;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
@@ -33,6 +34,7 @@ import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerJoinEvent;
 import org.bukkit.event.player.PlayerLoginEvent;
 
+@Linked
 public class EventJoin implements Listener {
 
     public EventJoin() {

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/InFightDamage.java

@@ -25,6 +25,7 @@ import de.steamwar.fightsystem.fight.Fight;
 import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.StateDependentListener;
 import de.steamwar.fightsystem.winconditions.Winconditions;
+import de.steamwar.linkage.Linked;
 import net.md_5.bungee.api.ChatMessageType;
 import org.bukkit.entity.Arrow;
 import org.bukkit.entity.LivingEntity;
@@ -34,6 +35,7 @@ import org.bukkit.event.entity.EntityDamageByEntityEvent;
 
 import java.util.Objects;
 
+@Linked
 public class InFightDamage implements Listener {
 
     public InFightDamage() {

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/InFightInventory.java

@@ -23,6 +23,7 @@ import de.steamwar.fightsystem.ArenaMode;
 import de.steamwar.fightsystem.fight.Fight;
 import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.StateDependentListener;
+import de.steamwar.linkage.Linked;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
@@ -35,6 +36,7 @@ import java.util.Collections;
 import java.util.EnumSet;
 import java.util.Set;
 
+@Linked
 public class InFightInventory implements Listener {
 
     private static final Set<Material> allowed = Collections.unmodifiableSet(EnumSet.of(Material.TNT, Material.AIR));

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/IngameDeath.java

@@ -26,6 +26,7 @@ import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.StateDependentListener;
 import de.steamwar.fightsystem.utils.FightUI;
 import de.steamwar.fightsystem.utils.SWSound;
+import de.steamwar.linkage.Linked;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.event.EventHandler;
@@ -36,6 +37,7 @@ import org.bukkit.event.player.PlayerQuitEvent;
 
 import java.util.function.Consumer;
 
+@Linked
 public class IngameDeath implements Listener {
 
     public IngameDeath() {

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/JoinRequestListener.java

@@ -29,6 +29,7 @@ import de.steamwar.fightsystem.fight.JoinRequest;
 import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.OneShotStateDependent;
 import de.steamwar.fightsystem.states.StateDependentListener;
+import de.steamwar.linkage.Linked;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
@@ -38,6 +39,7 @@ import org.bukkit.event.player.PlayerJoinEvent;
 import org.bukkit.event.player.PlayerQuitEvent;
 import org.bukkit.event.player.PlayerRespawnEvent;
 
+@Linked
 public class JoinRequestListener implements Listener {
 
     public JoinRequestListener() {

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/LeaveableArena.java

@@ -23,6 +23,7 @@ import de.steamwar.fightsystem.Config;
 import de.steamwar.fightsystem.fight.Fight;
 import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.StateDependentListener;
+import de.steamwar.linkage.Linked;
 import org.bukkit.GameMode;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
@@ -35,6 +36,7 @@ import org.spigotmc.event.player.PlayerSpawnLocationEvent;
 import java.util.HashMap;
 import java.util.Map;
 
+@Linked
 public class LeaveableArena implements Listener {
 
     private final Map<Player, GameMode> spectatorsInArena = new HashMap<>();

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/NormalJoin.java

@@ -24,11 +24,13 @@ import de.steamwar.fightsystem.fight.Fight;
 import de.steamwar.fightsystem.fight.FightTeam;
 import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.StateDependentListener;
+import de.steamwar.linkage.Linked;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerJoinEvent;
 
+@Linked
 public class NormalJoin implements Listener {
 
     public NormalJoin() {

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/Permanent.java

@@ -29,6 +29,7 @@ import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.StateDependentListener;
 import de.steamwar.fightsystem.utils.BountifulWrapper;
 import de.steamwar.fightsystem.utils.FlatteningWrapper;
+import de.steamwar.linkage.Linked;
 import net.md_5.bungee.api.ChatMessageType;
 import org.bukkit.GameMode;
 import org.bukkit.Material;
@@ -54,6 +55,7 @@ import org.bukkit.inventory.ItemStack;
 import org.bukkit.scoreboard.NameTagVisibility;
 import org.bukkit.scoreboard.Team;
 
+@Linked
 public class Permanent implements Listener {
 
     private static final Team spectatorTeam = FightScoreboard.getBukkitTeam("Spectator");

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/PersonalKitCreator.java

@@ -26,6 +26,7 @@ import de.steamwar.fightsystem.fight.FightPlayer;
 import de.steamwar.fightsystem.fight.Kit;
 import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.StateDependentListener;
+import de.steamwar.linkage.Linked;
 import de.steamwar.sql.PersonalKit;
 import net.md_5.bungee.api.ChatMessageType;
 import org.bukkit.Bukkit;
@@ -46,6 +47,7 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;
 
+@Linked
 public class PersonalKitCreator implements Listener {
 
     private static final Map<HumanEntity, InventoryBackup> openKitCreators = new HashMap<>();

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/PrepareSchem.java

@@ -31,6 +31,7 @@ import de.steamwar.fightsystem.states.StateDependentListener;
 import de.steamwar.fightsystem.utils.FlatteningWrapper;
 import de.steamwar.fightsystem.utils.Region;
 import de.steamwar.fightsystem.utils.WorldeditWrapper;
+import de.steamwar.linkage.Linked;
 import de.steamwar.sql.SchematicNode;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
@@ -42,6 +43,7 @@ import org.bukkit.util.Vector;
 import java.util.HashSet;
 import java.util.Set;
 
+@Linked
 public class PrepareSchem implements Listener {
 
     private final Set<Vector> stationaryMovingPistons = new HashSet<>();

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/Recording.java

@@ -39,6 +39,7 @@ import de.steamwar.fightsystem.utils.BountifulWrapper;
 import de.steamwar.fightsystem.utils.CraftbukkitWrapper;
 import de.steamwar.fightsystem.utils.FlatteningWrapper;
 import de.steamwar.fightsystem.utils.SWSound;
+import de.steamwar.linkage.Linked;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.Material;
@@ -61,6 +62,7 @@ import java.util.function.BiFunction;
 import java.util.function.Consumer;
 import java.util.function.Predicate;
 
+@Linked
 public class Recording implements Listener {
 
     private static final int AIR = 0;

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/RunningWorldInteraction.java

@@ -25,12 +25,14 @@ import de.steamwar.fightsystem.fight.Fight;
 import de.steamwar.fightsystem.fight.FightPlayer;
 import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.StateDependentListener;
+import de.steamwar.linkage.Linked;
 import net.md_5.bungee.api.ChatMessageType;
 import org.bukkit.Material;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.block.BlockPlaceEvent;
 
+@Linked
 public class RunningWorldInteraction implements Listener {
 
     public RunningWorldInteraction() {

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/SetupQuit.java

@@ -24,11 +24,13 @@ import de.steamwar.fightsystem.fight.Fight;
 import de.steamwar.fightsystem.fight.FightTeam;
 import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.StateDependentListener;
+import de.steamwar.linkage.Linked;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerQuitEvent;
 
+@Linked
 public class SetupQuit implements Listener {
 
     public SetupQuit(){

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/Shutdown.java

@@ -23,11 +23,13 @@ import de.steamwar.fightsystem.ArenaMode;
 import de.steamwar.fightsystem.Config;
 import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.StateDependentListener;
+import de.steamwar.linkage.Linked;
 import org.bukkit.Bukkit;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerQuitEvent;
 
+@Linked
 public class Shutdown implements Listener {
 
     public Shutdown(){

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/Spectator.java

@@ -22,6 +22,7 @@ package de.steamwar.fightsystem.listener;
 import java.util.HashSet;
 import java.util.Set;
 
+import de.steamwar.linkage.Linked;
 import org.bukkit.Bukkit;
 import org.bukkit.GameMode;
 import org.bukkit.entity.Player;
@@ -44,7 +45,7 @@ import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.StateDependentListener;
 import de.steamwar.fightsystem.states.StateDependentTask;
 
-
+@Linked
 public class Spectator implements Listener {
 
     private final Set<Player> pseudoSpectator = new HashSet<>();

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/TestJoin.java

@@ -24,6 +24,7 @@ import de.steamwar.fightsystem.Config;
 import de.steamwar.fightsystem.FightSystem;
 import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.StateDependentListener;
+import de.steamwar.linkage.Linked;
 import de.steamwar.sql.SteamwarUser;
 import de.steamwar.sql.UserPerm;
 import org.bukkit.entity.Player;
@@ -31,6 +32,7 @@ import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerJoinEvent;
 
+@Linked
 public class TestJoin implements Listener {
 
     public TestJoin() {

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/WaterRemover.java

@@ -27,10 +27,10 @@ import de.steamwar.fightsystem.fight.FightTeam;
 import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.StateDependentListener;
 import de.steamwar.fightsystem.utils.FlatteningWrapper;
+import de.steamwar.linkage.Linked;
 import org.bukkit.Location;
 import org.bukkit.block.Block;
 import org.bukkit.block.BlockFace;
-import org.bukkit.entity.EntityType;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.entity.EntityExplodeEvent;
@@ -39,6 +39,7 @@ import org.bukkit.event.entity.EntitySpawnEvent;
 import java.util.HashMap;
 import java.util.Map;
 
+@Linked
 public class WaterRemover implements Listener {
 
     private static final int MIN_Y = Config.BluePasteRegion.getMinY() + Config.WaterDepth;

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/record/FileRecorder.java

@@ -22,11 +22,13 @@ package de.steamwar.fightsystem.record;
 import de.steamwar.fightsystem.Config;
 import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.StateDependent;
+import de.steamwar.linkage.Linked;
 import lombok.Getter;
 
 import java.io.*;
 import java.util.zip.GZIPOutputStream;
 
+@Linked
 public class FileRecorder extends StateDependent implements Recorder {
 
     @Getter

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/record/LiveRecorder.java

@@ -22,12 +22,14 @@ package de.steamwar.fightsystem.record;
 import de.steamwar.fightsystem.Config;
 import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.StateDependent;
+import de.steamwar.linkage.Linked;
 import org.bukkit.Bukkit;
 
 import java.io.*;
 import java.net.Socket;
 import java.util.logging.Level;
 
+@Linked
 public class LiveRecorder extends StateDependent implements Recorder {
 
     private DataOutputStream outputStream;

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/BungeeFightInfo.java

@@ -25,14 +25,15 @@ import de.steamwar.fightsystem.fight.Fight;
 import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.StateDependentCountdown;
 import de.steamwar.fightsystem.states.StateDependentTask;
+import de.steamwar.linkage.Linked;
 import de.steamwar.network.NetworkSender;
 import de.steamwar.network.packets.common.FightInfoPacket;
 import de.steamwar.sql.SteamwarUser;
 import org.bukkit.Bukkit;
-import org.bukkit.entity.Player;
 
 import java.util.stream.Collectors;
 
+@Linked
 public class BungeeFightInfo {
 
     public BungeeFightInfo() {

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/EnterHandler.java

@@ -24,9 +24,11 @@ import de.steamwar.fightsystem.fight.FightPlayer;
 import de.steamwar.fightsystem.fight.FightTeam;
 import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.IStateDependent;
+import de.steamwar.linkage.Linked;
 
 import java.util.Set;
 
+@Linked
 public class EnterHandler implements IStateDependent {
     private static final Set<FightState> enabled = FightState.Running;
 

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/FightStatistics.java

@@ -31,6 +31,7 @@ import de.steamwar.fightsystem.record.FileSource;
 import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.OneShotStateDependent;
 import de.steamwar.fightsystem.winconditions.Wincondition;
+import de.steamwar.linkage.Linked;
 import de.steamwar.network.NetworkSender;
 import de.steamwar.network.packets.common.FightEndsPacket;
 import de.steamwar.sql.EventFight;
@@ -49,6 +50,7 @@ import java.util.stream.Collectors;
 import static de.steamwar.sql.Fight.create;
 import static de.steamwar.sql.Fight.markReplayAvailable;
 
+@Linked
 public class FightStatistics {
 
     @Getter

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/FightUI.java

@@ -31,6 +31,7 @@ import de.steamwar.fightsystem.states.OneShotStateDependent;
 import de.steamwar.fightsystem.states.StateDependentCountdown;
 import de.steamwar.fightsystem.states.StateDependentTask;
 import de.steamwar.fightsystem.winconditions.Wincondition;
+import de.steamwar.linkage.Linked;
 import lombok.Getter;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
@@ -42,6 +43,7 @@ import java.util.Queue;
 import java.util.logging.Level;
 import java.util.stream.Collectors;
 
+@Linked
 public class FightUI {
 
     @Getter

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/EventTeamOffWincondition.java

@@ -24,7 +24,9 @@ import de.steamwar.fightsystem.fight.Fight;
 import de.steamwar.fightsystem.fight.FightTeam;
 import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.OneShotStateDependent;
+import de.steamwar.linkage.Linked;
 
+@Linked
 public class EventTeamOffWincondition extends Wincondition{
 
     public EventTeamOffWincondition(){

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/Wincondition.java

@@ -36,7 +36,7 @@ import java.util.stream.Collectors;
 public abstract class Wincondition {
 
     @Getter
-    protected static WinconditionPercent percentWincondition = null;
+    protected static WinconditionBasePercent percentWincondition = null;
     protected static StateDependentCountdown timeOverCountdown = null;
     @Getter
     protected static final List<PrintableWincondition> printableWinconditions = new ArrayList<>();

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionAllDead.java

@@ -24,9 +24,11 @@ import de.steamwar.fightsystem.fight.Fight;
 import de.steamwar.fightsystem.fight.FightTeam;
 import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.StateDependentListener;
+import de.steamwar.linkage.Linked;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 
+@Linked
 public class WinconditionAllDead extends Wincondition implements Listener {
 
     public WinconditionAllDead(){

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionAmongUs.java

@@ -26,6 +26,7 @@ import de.steamwar.fightsystem.fight.FightTeam;
 import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.OneShotStateDependent;
 import de.steamwar.fightsystem.states.StateDependentListener;
+import de.steamwar.linkage.Linked;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
@@ -34,6 +35,7 @@ import org.bukkit.event.player.PlayerQuitEvent;
 
 import java.util.*;
 
+@Linked
 public class WinconditionAmongUs extends Wincondition implements Listener {
 
     private Map<FightTeam, FightPlayer> imposter = new HashMap<>();

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionBasePercent.java

@@ -0,0 +1,133 @@
+/*
+    This file is a part of the SteamWar software.
+
+    Copyright (C) 2020  SteamWar.de-Serverteam
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero 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 Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
+package de.steamwar.fightsystem.winconditions;
+
+import de.steamwar.fightsystem.Config;
+import de.steamwar.fightsystem.fight.Fight;
+import de.steamwar.fightsystem.fight.FightTeam;
+import de.steamwar.fightsystem.states.FightState;
+import de.steamwar.fightsystem.states.OneShotStateDependent;
+import de.steamwar.fightsystem.states.StateDependentListener;
+import de.steamwar.fightsystem.utils.Message;
+import org.bukkit.entity.EntityType;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.entity.EntityExplodeEvent;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.function.Consumer;
+
+public abstract class WinconditionBasePercent extends Wincondition implements PrintableWincondition {
+
+    private final Map<FightTeam, TeamPercent> teamMap = new HashMap<>();
+
+    protected Consumer<FightTeam> checkWin = team -> {
+        if (getPercent(team) >= Config.PercentWin) {
+            win(Fight.getOpposite(team), "WIN_PERCENT", team.getColoredName());
+        }
+    };
+    protected Consumer<FightTeam> postEnable = team -> {};
+
+    public WinconditionBasePercent(Winconditions wincondition, String windescription) {
+        super(windescription);
+
+        if (Config.ActiveWinconditions.contains(wincondition)) {
+            printableWinconditions.add(this);
+            percentWincondition = this;
+        }
+
+        Fight.teams().forEach(team -> new TeamPercent(team, wincondition));
+    }
+
+    public Message getDisplay(FightTeam team) {
+        return new Message("BAR_PERCENT", team.getPrefix() + (Math.round(10000.0 * (1.0 - getPercent(team) / Config.PercentWin)) / 100.0));
+    }
+
+    public double getPercent(FightTeam team) {
+        return teamMap.get(team).getPercent();
+    }
+
+    protected int getTotalBlocks(FightTeam team) {
+        return teamMap.get(team).totalBlocks;
+    }
+
+    protected int getCurrentBlocks(FightTeam team) {
+        return teamMap.get(team).currentBlocks;
+    }
+
+    private class TeamPercent implements Listener {
+        private final FightTeam team;
+
+        private int totalBlocks = 0;
+        private int currentBlocks = 0;
+        private boolean countAnyBlock = false;
+
+        private TeamPercent(FightTeam team, Winconditions wincondition) {
+            this.team = team;
+
+            new OneShotStateDependent(wincondition, FightState.Running, this::enable);
+            new StateDependentListener(wincondition, FightState.Running, this).register();
+            teamMap.put(team, this);
+        }
+
+        @EventHandler
+        public void onEntityExplode(EntityExplodeEvent event) {
+            if (
+                    event.getEntityType() == EntityType.FIREBALL ||
+                    !team.getExtendRegion().inRegion(event.getEntity().getLocation()) ||
+                    (!Config.PercentEntern && !Config.EnterStages.isEmpty() && Config.EnterStages.get(0) >= Wincondition.getTimeOverCountdown().getTimeLeft())
+            ) {
+                return;
+            }
+
+            event.blockList().forEach(block -> {
+                if (countAnyBlock || Config.PercentBlocks.contains(block.getType()) == Config.PercentBlocksWhitelist) {
+                    currentBlocks--;
+                }
+            });
+
+            checkWin.accept(team);
+        }
+
+        private void enable() {
+            totalBlocks = 0;
+            countAnyBlock = false;
+            team.getSchemRegion().forEach((x, y, z) -> {
+                if (Config.PercentBlocks.contains(Config.world.getBlockAt(x, y, z).getType()) == Config.PercentBlocksWhitelist)
+                    totalBlocks++;
+            });
+            // Edge Case for DirtBlock
+            if (totalBlocks == 0) {
+                totalBlocks = team.getSchemRegion().volume();
+                countAnyBlock = true;
+            }
+            currentBlocks = totalBlocks;
+            postEnable.accept(team);
+        }
+
+        private double getPercent() {
+            if (currentBlocks >= totalBlocks) {
+                return 0;
+            }
+            return (totalBlocks - currentBlocks) * 100 / (double) totalBlocks;
+        }
+    }
+}

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionBlocks.java

@@ -35,7 +35,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.function.Predicate;
 
-public class WinconditionBlocks extends Wincondition implements PrintableWincondition {
+public abstract class WinconditionBlocks extends Wincondition implements PrintableWincondition {
 
     public static final Material PUMPKIN_LANTERN = SWItem.getMaterial("JACK_O_LANTERN");
 

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionCaptainDead.java

@@ -25,9 +25,11 @@ import de.steamwar.fightsystem.fight.FightPlayer;
 import de.steamwar.fightsystem.fight.FightTeam;
 import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.StateDependentListener;
+import de.steamwar.linkage.Linked;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 
+@Linked
 public class WinconditionCaptainDead extends Wincondition implements Listener {
 
     public WinconditionCaptainDead(){

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionComparisonTimeout.java

@@ -27,7 +27,7 @@ import de.steamwar.fightsystem.states.StateDependentCountdown;
 
 import java.util.function.ToDoubleFunction;
 
-public class WinconditionComparisonTimeout extends Wincondition {
+public abstract class WinconditionComparisonTimeout extends Wincondition {
 
     public WinconditionComparisonTimeout(Winconditions wincondition, String windescription, String winMessage, ToDoubleFunction<FightTeam> evaluate) {
         super(windescription);

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionHearthRatioTimeout.java

@@ -1,7 +1,7 @@
 /*
  * This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ * Copyright (C) 2020  SteamWar.de-Serverteam
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -17,21 +17,15 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.steamwar.bausystem.linkage.specific;
+package de.steamwar.fightsystem.winconditions;
 
-import de.steamwar.bausystem.region.Region;
+import de.steamwar.fightsystem.fight.FightTeam;
-import org.bukkit.entity.Player;
+import de.steamwar.linkage.Linked;
 
-public interface ScoreboardItem {
+@Linked
+public class WinconditionHearthRatioTimeout extends WinconditionComparisonTimeout {
 
-    /**
+    public WinconditionHearthRatioTimeout() {
-     * Returns one Scoreboard line. If {@code null} result will be ignored.
+        super(Winconditions.HEART_RATIO_TIMEOUT, "HeartTimeout", "WIN_MORE_HEALTH", FightTeam::getHeartRatio);
-     * If return value contains {@code '?'} it will be replaced to the color
+    }
-     * code of the current {@link Region}.
-     *
-     * @param player the player to create the scoreboard line for
-     * @param region the region the player is in
-     * @return the String to send, can be {@code null}
-     */
-    String getString(Player player, Region region);
 }

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionPercent.java

@@ -1,133 +1,30 @@
 /*
-    This file is a part of the SteamWar software.
+ * This file is a part of the SteamWar software.
-
+ *
-    Copyright (C) 2020  SteamWar.de-Serverteam
+ * Copyright (C) 2020  SteamWar.de-Serverteam
-
+ *
-    This program is free software: you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published by
+ * it under the terms of the GNU Affero General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
+ * (at your option) any later version.
-
+ *
-    This program is distributed in the hope that it will be useful,
+ * This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-    GNU Affero General Public License for more details.
+ * GNU Affero General Public License for more details.
-
+ *
-    You should have received a copy of the GNU Affero General Public License
+ * You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
+ */
 
 package de.steamwar.fightsystem.winconditions;
 
-import de.steamwar.fightsystem.Config;
+import de.steamwar.linkage.Linked;
-import de.steamwar.fightsystem.fight.Fight;
-import de.steamwar.fightsystem.fight.FightTeam;
-import de.steamwar.fightsystem.states.FightState;
-import de.steamwar.fightsystem.states.OneShotStateDependent;
-import de.steamwar.fightsystem.states.StateDependentListener;
-import de.steamwar.fightsystem.utils.Message;
-import org.bukkit.entity.EntityType;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.Listener;
-import org.bukkit.event.entity.EntityExplodeEvent;
 
-import java.util.HashMap;
+@Linked
-import java.util.Map;
+public class WinconditionPercent extends WinconditionBasePercent {
-import java.util.function.Consumer;
 
-public class WinconditionPercent extends Wincondition implements PrintableWincondition {
+    public WinconditionPercent() {
-
+        super(Winconditions.PERCENT_SYSTEM, "Percent");
-    private final Map<FightTeam, TeamPercent> teamMap = new HashMap<>();
-
-    protected Consumer<FightTeam> checkWin = team -> {
-        if (getPercent(team) >= Config.PercentWin) {
-            win(Fight.getOpposite(team), "WIN_PERCENT", team.getColoredName());
-        }
-    };
-    protected Consumer<FightTeam> postEnable = team -> {};
-
-    public WinconditionPercent(Winconditions wincondition, String windescription) {
-        super(windescription);
-
-        if (Config.ActiveWinconditions.contains(wincondition)) {
-            printableWinconditions.add(this);
-            percentWincondition = this;
-        }
-
-        Fight.teams().forEach(team -> new TeamPercent(team, wincondition));
-    }
-
-    public Message getDisplay(FightTeam team) {
-        return new Message("BAR_PERCENT", team.getPrefix() + (Math.round(10000.0 * (1.0 - getPercent(team) / Config.PercentWin)) / 100.0));
-    }
-
-    public double getPercent(FightTeam team) {
-        return teamMap.get(team).getPercent();
-    }
-
-    protected int getTotalBlocks(FightTeam team) {
-        return teamMap.get(team).totalBlocks;
-    }
-
-    protected int getCurrentBlocks(FightTeam team) {
-        return teamMap.get(team).currentBlocks;
-    }
-
-    private class TeamPercent implements Listener {
-        private final FightTeam team;
-
-        private int totalBlocks = 0;
-        private int currentBlocks = 0;
-        private boolean countAnyBlock = false;
-
-        private TeamPercent(FightTeam team, Winconditions wincondition) {
-            this.team = team;
-
-            new OneShotStateDependent(wincondition, FightState.Running, this::enable);
-            new StateDependentListener(wincondition, FightState.Running, this).register();
-            teamMap.put(team, this);
-        }
-
-        @EventHandler
-        public void onEntityExplode(EntityExplodeEvent event) {
-            if (
-                    event.getEntityType() == EntityType.FIREBALL ||
-                    !team.getExtendRegion().inRegion(event.getEntity().getLocation()) ||
-                    (!Config.PercentEntern && !Config.EnterStages.isEmpty() && Config.EnterStages.get(0) >= Wincondition.getTimeOverCountdown().getTimeLeft())
-            ) {
-                return;
-            }
-
-            event.blockList().forEach(block -> {
-                if (countAnyBlock || Config.PercentBlocks.contains(block.getType()) == Config.PercentBlocksWhitelist) {
-                    currentBlocks--;
-                }
-            });
-
-            checkWin.accept(team);
-        }
-
-        private void enable() {
-            totalBlocks = 0;
-            countAnyBlock = false;
-            team.getSchemRegion().forEach((x, y, z) -> {
-                if (Config.PercentBlocks.contains(Config.world.getBlockAt(x, y, z).getType()) == Config.PercentBlocksWhitelist)
-                    totalBlocks++;
-            });
-            // Edge Case for DirtBlock
-            if (totalBlocks == 0) {
-                totalBlocks = team.getSchemRegion().volume();
-                countAnyBlock = true;
-            }
-            currentBlocks = totalBlocks;
-            postEnable.accept(team);
-        }
-
-        private double getPercent() {
-            if (currentBlocks >= totalBlocks) {
-                return 0;
-            }
-            return (totalBlocks - currentBlocks) * 100 / (double) totalBlocks;
-        }
     }
 }

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionPercentTimeout.java

@@ -0,0 +1,30 @@
+/*
+ * This file is a part of the SteamWar software.
+ *
+ * Copyright (C) 2020  SteamWar.de-Serverteam
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package de.steamwar.fightsystem.winconditions;
+
+import de.steamwar.linkage.Linked;
+
+@Linked
+public class WinconditionPercentTimeout extends WinconditionComparisonTimeout {
+
+    public WinconditionPercentTimeout() {
+        super(Winconditions.PERCENT_TIMEOUT, "PercentTimeout", "WIN_LESS_DAMAGE", team -> -Wincondition.getPercentWincondition().getPercent(team));
+    }
+}

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionPoints.java

@@ -27,6 +27,7 @@ import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.StateDependentCountdown;
 import de.steamwar.fightsystem.states.StateDependentListener;
 import de.steamwar.fightsystem.utils.Message;
+import de.steamwar.linkage.Linked;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
@@ -36,7 +37,8 @@ import org.bukkit.event.player.PlayerQuitEvent;
 import java.util.HashMap;
 import java.util.Map;
 
-public class WinconditionPoints extends WinconditionPercent implements Listener {
+@Linked
+public class WinconditionPoints extends WinconditionBasePercent implements Listener {
 
     private final Map<FightTeam, TeamPoints> teamMap = new HashMap<>();
 

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionPointsAirShip.java

@@ -25,6 +25,7 @@ import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.StateDependentListener;
 import de.steamwar.fightsystem.states.StateDependentTask;
 import de.steamwar.fightsystem.utils.Message;
+import de.steamwar.linkage.Linked;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
@@ -35,7 +36,8 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-public class WinconditionPointsAirShip extends WinconditionPercent implements Listener {
+@Linked
+public class WinconditionPointsAirShip extends WinconditionBasePercent implements Listener {
 
     private double[] as = new double[] {
             0.5,

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionPumkinTechKO.java

@@ -0,0 +1,30 @@
+/*
+ * This file is a part of the SteamWar software.
+ *
+ * Copyright (C) 2020  SteamWar.de-Serverteam
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package de.steamwar.fightsystem.winconditions;
+
+import de.steamwar.linkage.Linked;
+
+@Linked
+public class WinconditionPumkinTechKO extends WinconditionBlocks {
+
+    public WinconditionPumkinTechKO() {
+        super(Winconditions.PUMPKIN_TECH_KO, "PumpkinTechKO", "BAR_CANNONS", block -> block.getType() == WinconditionBlocks.PUMPKIN_LANTERN);
+    }
+}

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionTimeTechKO.java

@@ -30,6 +30,7 @@ import de.steamwar.fightsystem.states.StateDependentListener;
 import de.steamwar.fightsystem.states.StateDependentTask;
 import de.steamwar.fightsystem.utils.Message;
 import de.steamwar.fightsystem.utils.SWSound;
+import de.steamwar.linkage.Linked;
 import org.bukkit.Location;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
@@ -39,6 +40,7 @@ import org.bukkit.event.entity.EntitySpawnEvent;
 import java.util.HashMap;
 import java.util.Map;
 
+@Linked
 public class WinconditionTimeTechKO extends Wincondition implements Listener {
 
     private static final int TECH_KO_HALF_TIME = Config.TechKoTime/2;