Update to linkage system

Signed-off-by: yoyosource <yoyosource@nidido.de>

BauSystem_Linkage/src/de/steamwar/linkage/types/SmartPlaceBehaviour_GENERIC.java

@@ -29,7 +29,7 @@ public class SmartPlaceBehaviour_GENERIC implements LinkageType {
 
     @Override
     public String method() {
-        return "linkPanzern";
+        return "linkSmartPlace";
     }
 
     @Override

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

@@ -21,12 +21,11 @@ package de.steamwar.bausystem;
 
 import com.comphenix.tinyprotocol.TinyProtocol;
 import de.steamwar.bausystem.configplayer.Config;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.LinkageUtils;
 import de.steamwar.bausystem.region.loader.PrototypeLoader;
 import de.steamwar.bausystem.region.loader.RegionLoader;
 import de.steamwar.bausystem.region.loader.Updater;
 import de.steamwar.bausystem.worlddata.WorldData;
+import de.steamwar.bausystem.linkage.LinkageUtils;
 import de.steamwar.message.Message;
 import lombok.Getter;
 import org.bukkit.Bukkit;
@@ -73,12 +72,7 @@ public class BauSystem extends JavaPlugin implements Listener {
         new Updater(PrototypeLoader.file, PrototypeLoader::load);
         new Updater(RegionLoader.file, RegionLoader::load);
 
-        LinkageUtils.run(LinkageType.PLAIN);
-        LinkageUtils.run(LinkageType.COMMAND);
-        LinkageUtils.run(LinkageType.ENABLE_LINK);
-        LinkageUtils.run(LinkageType.LISTENER);
-        LinkageUtils.run(LinkageType.CONFIG_CONVERTER);
-        LinkageUtils.run(LinkageType.SCOREBOARD);
+        LinkageUtils.link();
 
         // This could disable any watchdog stuff. We need to investigate if this is a problem.
         /*
@@ -100,8 +94,7 @@ public class BauSystem extends JavaPlugin implements Listener {
 
     @Override
     public void onDisable() {
-        LinkageUtils.run(LinkageType.DISABLE_LINK);
-        LinkageUtils.run(LinkageType.UNLINK_LISTENER);
+        LinkageUtils.unlink();
 
         WorldData.write();
         Config.getInstance().saveAll();

BauSystem_Main/src/de/steamwar/bausystem/config/BauServer.java

@@ -19,15 +19,14 @@
 
 package de.steamwar.bausystem.config;
 
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
+import de.steamwar.linkage.Linked;
 import de.steamwar.providers.BauServerInfo;
 import de.steamwar.sql.SteamwarUser;
 import lombok.Getter;
 
 import java.util.UUID;
 
-@Linked(LinkageType.PLAIN)
+@Linked
 public class BauServer {
 
     @Getter

BauSystem_Main/src/de/steamwar/bausystem/configplayer/Config.java

@@ -20,8 +20,7 @@
 package de.steamwar.bausystem.configplayer;
 
 import de.steamwar.bausystem.configplayer.serializer.ConfigurationSerializableSerializer;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
+import de.steamwar.linkage.Linked;
 import de.steamwar.sql.UserConfig;
 import lombok.Getter;
 import org.bukkit.Bukkit;
@@ -40,7 +39,7 @@ import java.util.Map;
 import java.util.UUID;
 import java.util.logging.Level;
 
-@Linked(LinkageType.LISTENER)
+@Linked
 public class Config implements Listener {
 
     static {

BauSystem_Main/src/de/steamwar/bausystem/features/autostart/AutoStartCommand.java

@@ -20,12 +20,11 @@
 package de.steamwar.bausystem.features.autostart;
 
 import de.steamwar.bausystem.SWUtils;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
 import de.steamwar.command.SWCommand;
+import de.steamwar.linkage.Linked;
 import org.bukkit.entity.Player;
 
-@Linked(LinkageType.COMMAND)
+@Linked
 public class AutoStartCommand extends SWCommand {
 
     public AutoStartCommand() {

BauSystem_Main/src/de/steamwar/bausystem/features/autostart/AutoStartGuiItem.java

@@ -20,15 +20,14 @@
 package de.steamwar.bausystem.features.autostart;
 
 import de.steamwar.bausystem.Permission;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
 import de.steamwar.bausystem.linkage.specific.BauGuiItem;
+import de.steamwar.linkage.Linked;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.ClickType;
 import org.bukkit.inventory.ItemStack;
 
-@Linked(LinkageType.BAU_GUI_ITEM)
+@Linked
 public class AutoStartGuiItem extends BauGuiItem {
 
     public AutoStartGuiItem() {

BauSystem_Main/src/de/steamwar/bausystem/features/autostart/AutostartListener.java

@@ -21,14 +21,13 @@ package de.steamwar.bausystem.features.autostart;
 
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.features.tpslimit.TPSUtils;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
 import de.steamwar.bausystem.region.Region;
 import de.steamwar.bausystem.region.RegionUtils;
 import de.steamwar.bausystem.region.utils.RegionExtensionType;
 import de.steamwar.bausystem.region.utils.RegionType;
 import de.steamwar.bausystem.utils.ItemUtils;
 import de.steamwar.inventory.SWItem;
+import de.steamwar.linkage.Linked;
 import lombok.Getter;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
@@ -44,7 +43,7 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 
-@Linked(LinkageType.LISTENER)
+@Linked
 public class AutostartListener implements Listener {
 
     @Getter

BauSystem_Main/src/de/steamwar/bausystem/features/backup/BackupCommand.java

@@ -21,8 +21,6 @@ package de.steamwar.bausystem.features.backup;
 
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.Permission;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
 import de.steamwar.bausystem.region.Region;
 import de.steamwar.bausystem.region.tags.Tag;
 import de.steamwar.command.SWCommand;
@@ -31,6 +29,7 @@ import de.steamwar.command.TypeMapper;
 import de.steamwar.command.TypeValidator;
 import de.steamwar.inventory.SWItem;
 import de.steamwar.inventory.SWListInv;
+import de.steamwar.linkage.Linked;
 import net.md_5.bungee.api.chat.ClickEvent;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
@@ -42,7 +41,7 @@ import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
 
-@Linked(LinkageType.COMMAND)
+@Linked
 public class BackupCommand extends SWCommand {
 
     public BackupCommand() {

BauSystem_Main/src/de/steamwar/bausystem/features/bau/BauCommand.java

@@ -19,13 +19,12 @@
 
 package de.steamwar.bausystem.features.bau;
 
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
-import de.steamwar.bausystem.linkage.LinkedInstance;
 import de.steamwar.command.SWCommand;
+import de.steamwar.linkage.Linked;
+import de.steamwar.linkage.LinkedInstance;
 import org.bukkit.entity.Player;
 
-@Linked(LinkageType.COMMAND)
+@Linked
 public class BauCommand extends SWCommand {
 
     @LinkedInstance

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

@@ -22,12 +22,11 @@ package de.steamwar.bausystem.features.bau;
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.Permission;
 import de.steamwar.bausystem.config.BauServer;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
 import de.steamwar.bausystem.linkage.specific.BauGuiItem;
 import de.steamwar.bausystem.region.Region;
 import de.steamwar.bausystem.region.flags.Flag;
 import de.steamwar.inventory.SWItem;
+import de.steamwar.linkage.Linked;
 import de.steamwar.sql.SteamwarUser;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
@@ -37,7 +36,7 @@ import org.bukkit.inventory.ItemStack;
 import java.util.ArrayList;
 import java.util.List;
 
-@Linked(LinkageType.BAU_GUI_ITEM)
+@Linked
 public class BauInfoBauGuiItem extends BauGuiItem {
 
     public BauInfoBauGuiItem() {

BauSystem_Main/src/de/steamwar/bausystem/features/bau/InfoCommand.java

@@ -3,13 +3,12 @@ package de.steamwar.bausystem.features.bau;
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.config.BauServer;
 import de.steamwar.bausystem.features.tpslimit.TPSWarpUtils;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
-import de.steamwar.bausystem.linkage.LinkedInstance;
 import de.steamwar.bausystem.region.Region;
 import de.steamwar.bausystem.region.flags.Flag;
 import de.steamwar.command.SWCommand;
 import de.steamwar.core.TPSWatcher;
+import de.steamwar.linkage.Linked;
+import de.steamwar.linkage.LinkedInstance;
 import de.steamwar.sql.BauweltMember;
 import de.steamwar.sql.SteamwarUser;
 import org.bukkit.entity.Player;
@@ -18,7 +17,7 @@ import java.util.List;
 
 import static de.steamwar.bausystem.features.tpslimit.TPSWarpUtils.getTps;
 
-@Linked(LinkageType.COMMAND)
+@Linked
 public class InfoCommand extends SWCommand {
 
     @LinkedInstance

BauSystem_Main/src/de/steamwar/bausystem/features/countingwand/CountingwandCommand.java

@@ -20,13 +20,12 @@
 package de.steamwar.bausystem.features.countingwand;
 
 import de.steamwar.bausystem.SWUtils;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
 import de.steamwar.command.SWCommand;
+import de.steamwar.linkage.Linked;
 import org.bukkit.entity.Player;
 
 
-@Linked(LinkageType.COMMAND)
+@Linked
 public class CountingwandCommand extends SWCommand {
 
 	public CountingwandCommand() {

BauSystem_Main/src/de/steamwar/bausystem/features/countingwand/CountingwandGuiItem.java

@@ -20,15 +20,14 @@
 package de.steamwar.bausystem.features.countingwand;
 
 import de.steamwar.bausystem.Permission;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
 import de.steamwar.bausystem.linkage.specific.BauGuiItem;
+import de.steamwar.linkage.Linked;
 import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.ClickType;
 import org.bukkit.inventory.ItemStack;
 
 
-@Linked(LinkageType.BAU_GUI_ITEM)
+@Linked
 public class CountingwandGuiItem extends BauGuiItem {
 
 	public CountingwandGuiItem() {

BauSystem_Main/src/de/steamwar/bausystem/features/countingwand/CountingwandListener.java

@@ -19,9 +19,8 @@
 
 package de.steamwar.bausystem.features.countingwand;
 
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
 import de.steamwar.bausystem.region.Point;
+import de.steamwar.linkage.Linked;
 import org.bukkit.FluidCollisionMode;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
@@ -34,7 +33,7 @@ import org.bukkit.util.RayTraceResult;
 import java.util.Objects;
 
 
-@Linked(LinkageType.LISTENER)
+@Linked
 public class CountingwandListener implements Listener {
 
 	@EventHandler

BauSystem_Main/src/de/steamwar/bausystem/features/detonator/DetonatorBauGuiItem.java

@@ -20,14 +20,13 @@
 package de.steamwar.bausystem.features.detonator;
 
 import de.steamwar.bausystem.Permission;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
 import de.steamwar.bausystem.linkage.specific.BauGuiItem;
+import de.steamwar.linkage.Linked;
 import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.ClickType;
 import org.bukkit.inventory.ItemStack;
 
-@Linked(LinkageType.BAU_GUI_ITEM)
+@Linked
 public class DetonatorBauGuiItem extends BauGuiItem {
 
     public DetonatorBauGuiItem() {

BauSystem_Main/src/de/steamwar/bausystem/features/detonator/DetonatorCommand.java

@@ -24,10 +24,9 @@ import de.steamwar.bausystem.SWUtils;
 import de.steamwar.bausystem.configplayer.Config;
 import de.steamwar.bausystem.features.detonator.storage.DetonatorStorage;
 import de.steamwar.bausystem.features.detonator.storage.ItemStorage;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
 import de.steamwar.bausystem.utils.ItemUtils;
 import de.steamwar.command.SWCommand;
+import de.steamwar.linkage.Linked;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
@@ -35,7 +34,7 @@ import org.bukkit.inventory.meta.ItemMeta;
 
 import java.util.Arrays;
 
-@Linked(LinkageType.COMMAND)
+@Linked
 public class DetonatorCommand extends SWCommand {
 
     public static ItemStack getWAND(Player player) {

BauSystem_Main/src/de/steamwar/bausystem/features/detonator/DetonatorListener.java

@@ -25,8 +25,7 @@ import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.SWUtils;
 import de.steamwar.bausystem.features.detonator.storage.DetonatorStorage;
 import de.steamwar.bausystem.features.detonator.storage.ItemStorage;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
+import de.steamwar.linkage.Linked;
 import org.bukkit.Location;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
@@ -42,7 +41,7 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
-@Linked(LinkageType.LISTENER)
+@Linked
 public class DetonatorListener implements Listener {
 
     public static final Class<?> useEntity = Reflection.getClass("{nms.network.protocol.game}.PacketPlayInUseEntity");

BauSystem_Main/src/de/steamwar/bausystem/features/gui/BauGUI.java

@@ -23,7 +23,6 @@ import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.Permission;
 import de.steamwar.bausystem.SWUtils;
 import de.steamwar.bausystem.features.gui.editor.BauGuiMapping;
-import de.steamwar.bausystem.linkage.LinkageType;
 import de.steamwar.bausystem.linkage.LinkageUtils;
 import de.steamwar.bausystem.linkage.specific.BauGuiItem;
 import de.steamwar.inventory.SWInventory;
@@ -42,7 +41,7 @@ public class BauGUI {
     private static final Map<Integer, BauGuiItem> ITEMS = new HashMap<>();
 
     public static Map<Integer, BauGuiItem> getITEMS() {
-        LinkageUtils.run(LinkageType.BAU_GUI_ITEM);
+        if (ITEMS.isEmpty()) LinkageUtils.linkGUIItems();
         return ITEMS;
     }
 

BauSystem_Main/src/de/steamwar/bausystem/features/gui/BauGUICommand.java

@@ -20,13 +20,12 @@
 package de.steamwar.bausystem.features.gui;
 
 import de.steamwar.bausystem.features.gui.editor.BauGuiEditor;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
 import de.steamwar.command.SWCommand;
 import de.steamwar.inventory.SWItem;
+import de.steamwar.linkage.Linked;
 import org.bukkit.entity.Player;
 
-@Linked(LinkageType.COMMAND)
+@Linked
 public class BauGUICommand extends SWCommand {
 
     public BauGUICommand() {

BauSystem_Main/src/de/steamwar/bausystem/features/gui/BauGuiBauGuiItem.java

@@ -21,10 +21,9 @@ package de.steamwar.bausystem.features.gui;
 
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.Permission;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
 import de.steamwar.bausystem.linkage.specific.BauGuiItem;
 import de.steamwar.inventory.SWItem;
+import de.steamwar.linkage.Linked;
 import net.md_5.bungee.api.ChatColor;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
@@ -33,7 +32,7 @@ import org.bukkit.inventory.ItemStack;
 
 import java.util.Arrays;
 
-@Linked(LinkageType.BAU_GUI_ITEM)
+@Linked
 public class BauGuiBauGuiItem extends BauGuiItem {
 
     public BauGuiBauGuiItem() {

BauSystem_Main/src/de/steamwar/bausystem/features/gui/BauGuiListener.java

@@ -19,14 +19,13 @@
 
 package de.steamwar.bausystem.features.gui;
 
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
+import de.steamwar.linkage.Linked;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.block.Action;
 import org.bukkit.event.player.PlayerInteractEvent;
 
-@Linked(LinkageType.LISTENER)
+@Linked
 public class BauGuiListener implements Listener {
 
     @EventHandler

BauSystem_Main/src/de/steamwar/bausystem/features/gui/editor/BauGuiEditor.java

@@ -21,11 +21,10 @@ package de.steamwar.bausystem.features.gui.editor;
 
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.features.gui.BauGUI;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
 import de.steamwar.bausystem.linkage.specific.BauGuiItem;
 import de.steamwar.inventory.SWItem;
 import de.steamwar.inventory.SWListInv;
+import de.steamwar.linkage.Linked;
 import lombok.Getter;
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
@@ -46,7 +45,7 @@ import org.bukkit.persistence.PersistentDataType;
 
 import java.util.*;
 
-@Linked(LinkageType.LISTENER)
+@Linked
 public class BauGuiEditor implements Listener {
 
     @Getter

BauSystem_Main/src/de/steamwar/bausystem/features/gui/editor/BauGuiEditorGuiItem.java

@@ -21,16 +21,15 @@ package de.steamwar.bausystem.features.gui.editor;
 
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.Permission;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
 import de.steamwar.bausystem.linkage.specific.BauGuiItem;
 import de.steamwar.inventory.SWItem;
+import de.steamwar.linkage.Linked;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.ClickType;
 import org.bukkit.inventory.ItemStack;
 
-@Linked(LinkageType.BAU_GUI_ITEM)
+@Linked
 public class BauGuiEditorGuiItem extends BauGuiItem {
 
     public BauGuiEditorGuiItem() {

BauSystem_Main/src/de/steamwar/bausystem/features/hotbar/HotbarCommand.java

@@ -20,14 +20,13 @@
 package de.steamwar.bausystem.features.hotbar;
 
 import de.steamwar.bausystem.BauSystem;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
 import de.steamwar.command.SWCommand;
 import de.steamwar.inventory.SWInventory;
+import de.steamwar.linkage.Linked;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 
-@Linked(LinkageType.COMMAND)
+@Linked
 public class HotbarCommand extends SWCommand {
 
     public HotbarCommand() {

BauSystem_Main/src/de/steamwar/bausystem/features/hotbar/HotbarListener.java

@@ -19,14 +19,13 @@
 
 package de.steamwar.bausystem.features.hotbar;
 
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
+import de.steamwar.linkage.Linked;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerJoinEvent;
 
-@Linked(LinkageType.LISTENER)
+@Linked
 public class HotbarListener implements Listener {
 
     @EventHandler(priority = EventPriority.LOWEST)

BauSystem_Main/src/de/steamwar/bausystem/features/inventoryfiller/InventoryFillBauGuiItem.java

@@ -3,12 +3,10 @@ package de.steamwar.bausystem.features.inventoryfiller;
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.Permission;
 import de.steamwar.bausystem.configplayer.Config;
-import de.steamwar.bausystem.features.inventoryfiller.InventoryFillerCommand;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
-import de.steamwar.bausystem.linkage.LinkedInstance;
 import de.steamwar.bausystem.linkage.specific.BauGuiItem;
 import de.steamwar.inventory.SWItem;
+import de.steamwar.linkage.Linked;
+import de.steamwar.linkage.LinkedInstance;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.ClickType;
@@ -16,7 +14,7 @@ import org.bukkit.inventory.ItemStack;
 
 import java.util.Collections;
 
-@Linked(LinkageType.BAU_GUI_ITEM)
+@Linked
 public class InventoryFillBauGuiItem extends BauGuiItem {
     public InventoryFillBauGuiItem() {
         super(34);

BauSystem_Main/src/de/steamwar/bausystem/features/inventoryfiller/InventoryFiller.java

@@ -21,8 +21,7 @@ package de.steamwar.bausystem.features.inventoryfiller;
 
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.configplayer.Config;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
+import de.steamwar.linkage.Linked;
 import net.md_5.bungee.api.ChatMessageType;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
@@ -34,7 +33,7 @@ import org.bukkit.event.player.PlayerItemHeldEvent;
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.ItemStack;
 
-@Linked(LinkageType.LISTENER)
+@Linked
 public class InventoryFiller implements Listener {
 
     @EventHandler

BauSystem_Main/src/de/steamwar/bausystem/features/inventoryfiller/InventoryFillerCommand.java

@@ -3,12 +3,11 @@ package de.steamwar.bausystem.features.inventoryfiller;
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.SWUtils;
 import de.steamwar.bausystem.configplayer.Config;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
 import de.steamwar.command.SWCommand;
+import de.steamwar.linkage.Linked;
 import org.bukkit.entity.Player;
 
-@Linked(LinkageType.COMMAND)
+@Linked
 public class InventoryFillerCommand extends SWCommand {
 
     public InventoryFillerCommand() {

BauSystem_Main/src/de/steamwar/bausystem/features/loader/LoaderBauGuiItem.java

@@ -21,12 +21,11 @@ package de.steamwar.bausystem.features.loader;
 
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.Permission;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
 import de.steamwar.bausystem.linkage.specific.BauGuiItem;
 import de.steamwar.inventory.SWAnvilInv;
 import de.steamwar.inventory.SWInventory;
 import de.steamwar.inventory.SWItem;
+import de.steamwar.linkage.Linked;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.ClickType;
@@ -34,7 +33,7 @@ import org.bukkit.inventory.ItemStack;
 
 import java.util.Arrays;
 
-@Linked(LinkageType.BAU_GUI_ITEM)
+@Linked
 public class LoaderBauGuiItem extends BauGuiItem {
 
     public LoaderBauGuiItem() {

BauSystem_Main/src/de/steamwar/bausystem/features/loader/LoaderCommand.java

@@ -21,12 +21,12 @@ package de.steamwar.bausystem.features.loader;
 
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.Permission;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
-import de.steamwar.command.*;
+import de.steamwar.command.SWCommand;
+import de.steamwar.command.TypeValidator;
+import de.steamwar.linkage.Linked;
 import org.bukkit.entity.Player;
 
-@Linked(LinkageType.COMMAND)
+@Linked
 public class LoaderCommand extends SWCommand {
 
     public LoaderCommand() {

BauSystem_Main/src/de/steamwar/bausystem/features/loadtimer/LoadtimerCommand.java

@@ -19,13 +19,12 @@
 
 package de.steamwar.bausystem.features.loadtimer;
 
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
 import de.steamwar.bausystem.region.Region;
 import de.steamwar.command.SWCommand;
+import de.steamwar.linkage.Linked;
 import org.bukkit.entity.Player;
 
-@Linked(LinkageType.COMMAND)
+@Linked
 public class LoadtimerCommand extends SWCommand {
     public LoadtimerCommand() {
         super("loadtimer", "lt", "stopuhr");

BauSystem_Main/src/de/steamwar/bausystem/features/loadtimer/LoadtimerGuiItem.java

@@ -21,18 +21,17 @@ package de.steamwar.bausystem.features.loadtimer;
 
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.Permission;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
 import de.steamwar.bausystem.linkage.specific.BauGuiItem;
 import de.steamwar.bausystem.region.Region;
 import de.steamwar.inventory.SWInventory;
 import de.steamwar.inventory.SWItem;
+import de.steamwar.linkage.Linked;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.ClickType;
 import org.bukkit.inventory.ItemStack;
 
-@Linked(LinkageType.BAU_GUI_ITEM)
+@Linked
 public class LoadtimerGuiItem extends BauGuiItem {
 
     public LoadtimerGuiItem() {

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

@@ -19,9 +19,8 @@
 
 package de.steamwar.bausystem.features.loadtimer;
 
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
 import de.steamwar.bausystem.region.Region;
+import de.steamwar.linkage.Linked;
 import org.bukkit.Material;
 import org.bukkit.entity.EntityType;
 import org.bukkit.event.EventHandler;
@@ -33,7 +32,7 @@ import org.bukkit.event.player.PlayerInteractEvent;
 
 import static de.steamwar.bausystem.features.loadtimer.Loadtimer.*;
 
-@Linked(LinkageType.LISTENER)
+@Linked
 public class LoadtimerListener implements Listener {
 
     @EventHandler

BauSystem_Main/src/de/steamwar/bausystem/features/observer/ObserverTracerCommand.java

@@ -20,12 +20,11 @@
 package de.steamwar.bausystem.features.observer;
 
 import de.steamwar.bausystem.BauSystem;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
 import de.steamwar.command.SWCommand;
+import de.steamwar.linkage.Linked;
 import org.bukkit.entity.Player;
 
-@Linked(LinkageType.COMMAND)
+@Linked
 public class ObserverTracerCommand extends SWCommand {
 
     public ObserverTracerCommand() {

BauSystem_Main/src/de/steamwar/bausystem/features/observer/ObserverTracerListener.java

@@ -20,8 +20,7 @@
 package de.steamwar.bausystem.features.observer;
 
 import de.steamwar.bausystem.BauSystem;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
+import de.steamwar.linkage.Linked;
 import org.bukkit.Bukkit;
 import org.bukkit.GameMode;
 import org.bukkit.Material;
@@ -38,7 +37,7 @@ import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 
-@Linked(LinkageType.LISTENER)
+@Linked
 public class ObserverTracerListener implements Listener {
 
     static Set<Player> enabled = new HashSet<>();

BauSystem_Main/src/de/steamwar/bausystem/features/redstonetester/RedstoneTesterGuiItem.java

@@ -21,10 +21,9 @@ package de.steamwar.bausystem.features.redstonetester;
 
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.Permission;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
 import de.steamwar.bausystem.linkage.specific.BauGuiItem;
 import de.steamwar.inventory.SWItem;
+import de.steamwar.linkage.Linked;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.ClickType;
@@ -32,7 +31,7 @@ import org.bukkit.inventory.ItemStack;
 
 import java.util.Arrays;
 
-@Linked(LinkageType.BAU_GUI_ITEM)
+@Linked
 public class RedstoneTesterGuiItem extends BauGuiItem {
 
     public RedstoneTesterGuiItem() {

BauSystem_Main/src/de/steamwar/bausystem/features/redstonetester/RedstonetesterCommand.java

@@ -21,12 +21,11 @@ package de.steamwar.bausystem.features.redstonetester;
 
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.SWUtils;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
 import de.steamwar.command.SWCommand;
+import de.steamwar.linkage.Linked;
 import org.bukkit.entity.Player;
 
-@Linked(LinkageType.COMMAND)
+@Linked
 public class RedstonetesterCommand extends SWCommand {
 
 	public RedstonetesterCommand() {

BauSystem_Main/src/de/steamwar/bausystem/features/redstonetester/RestonetesterListener.java

@@ -20,9 +20,8 @@
 package de.steamwar.bausystem.features.redstonetester;
 
 import de.steamwar.bausystem.BauSystem;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
 import de.steamwar.bausystem.utils.ItemUtils;
+import de.steamwar.linkage.Linked;
 import org.bukkit.block.Block;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
@@ -36,7 +35,7 @@ import org.bukkit.event.player.PlayerQuitEvent;
 
 import java.util.Objects;
 
-@Linked(LinkageType.LISTENER)
+@Linked
 public class RestonetesterListener implements Listener {
 
 	@EventHandler

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

@@ -21,9 +21,6 @@ package de.steamwar.bausystem.features.region;
 
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.config.BauServer;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
-import de.steamwar.bausystem.linkage.LinkedInstance;
 import de.steamwar.bausystem.region.Region;
 import de.steamwar.bausystem.region.RegionUtils;
 import de.steamwar.bausystem.region.flags.Flag;
@@ -32,11 +29,13 @@ import de.steamwar.bausystem.region.utils.RegionExtensionType;
 import de.steamwar.bausystem.region.utils.RegionType;
 import de.steamwar.command.SWCommand;
 import de.steamwar.command.TypeValidator;
+import de.steamwar.linkage.Linked;
+import de.steamwar.linkage.LinkedInstance;
 import org.bukkit.entity.Player;
 
 import java.io.IOException;
 
-@Linked(LinkageType.COMMAND)
+@Linked
 public class ColorCommand extends SWCommand {
 
     @LinkedInstance

BauSystem_Main/src/de/steamwar/bausystem/features/region/FireCommand.java

@@ -20,17 +20,16 @@
 package de.steamwar.bausystem.features.region;
 
 import de.steamwar.bausystem.Permission;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
 import de.steamwar.bausystem.region.Region;
 import de.steamwar.bausystem.region.RegionUtils;
 import de.steamwar.bausystem.region.flags.Flag;
 import de.steamwar.bausystem.region.flags.flagvalues.FireMode;
 import de.steamwar.command.SWCommand;
 import de.steamwar.command.TypeValidator;
+import de.steamwar.linkage.Linked;
 import org.bukkit.entity.Player;
 
-@Linked(LinkageType.COMMAND)
+@Linked
 public class FireCommand extends SWCommand {
 
     public FireCommand() {

BauSystem_Main/src/de/steamwar/bausystem/features/region/FireListener.java

@@ -1,16 +1,15 @@
 package de.steamwar.bausystem.features.region;
 
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
 import de.steamwar.bausystem.region.Region;
 import de.steamwar.bausystem.region.flags.Flag;
 import de.steamwar.bausystem.region.flags.flagvalues.FireMode;
+import de.steamwar.linkage.Linked;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.block.BlockBurnEvent;
 import org.bukkit.event.block.BlockSpreadEvent;
 
-@Linked(LinkageType.LISTENER)
+@Linked
 public class FireListener implements Listener {
 
     @EventHandler

BauSystem_Main/src/de/steamwar/bausystem/features/region/FreezeCommand.java

@@ -20,17 +20,16 @@
 package de.steamwar.bausystem.features.region;
 
 import de.steamwar.bausystem.Permission;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
 import de.steamwar.bausystem.region.Region;
 import de.steamwar.bausystem.region.RegionUtils;
 import de.steamwar.bausystem.region.flags.Flag;
 import de.steamwar.bausystem.region.flags.flagvalues.FreezeMode;
 import de.steamwar.command.SWCommand;
 import de.steamwar.command.TypeValidator;
+import de.steamwar.linkage.Linked;
 import org.bukkit.entity.Player;
 
-@Linked(LinkageType.COMMAND)
+@Linked
 public class FreezeCommand extends SWCommand {
 
     public FreezeCommand() {

BauSystem_Main/src/de/steamwar/bausystem/features/region/FreezeListener.java

@@ -1,12 +1,11 @@
 package de.steamwar.bausystem.features.region;
 
 import de.steamwar.bausystem.BauSystem;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
 import de.steamwar.bausystem.region.Region;
 import de.steamwar.bausystem.region.flags.Flag;
 import de.steamwar.bausystem.region.flags.flagvalues.FreezeMode;
 import de.steamwar.core.Core;
+import de.steamwar.linkage.Linked;
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
@@ -21,7 +20,7 @@ import org.bukkit.event.entity.EntitySpawnEvent;
 import org.bukkit.event.inventory.InventoryMoveItemEvent;
 import org.bukkit.event.player.PlayerInteractEvent;
 
-@Linked(LinkageType.LISTENER)
+@Linked
 public class FreezeListener implements Listener {
 
     @EventHandler

BauSystem_Main/src/de/steamwar/bausystem/features/region/ProtectCommand.java

@@ -21,17 +21,16 @@ package de.steamwar.bausystem.features.region;
 
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.Permission;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
 import de.steamwar.bausystem.region.Region;
 import de.steamwar.bausystem.region.RegionUtils;
 import de.steamwar.bausystem.region.flags.Flag;
 import de.steamwar.bausystem.region.flags.flagvalues.ProtectMode;
 import de.steamwar.command.SWCommand;
 import de.steamwar.command.TypeValidator;
+import de.steamwar.linkage.Linked;
 import org.bukkit.entity.Player;
 
-@Linked(LinkageType.COMMAND)
+@Linked
 public class ProtectCommand extends SWCommand {
 
     public ProtectCommand() {

BauSystem_Main/src/de/steamwar/bausystem/features/region/ProtectListener.java

@@ -1,10 +1,9 @@
 package de.steamwar.bausystem.features.region;
 
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
 import de.steamwar.bausystem.region.Region;
 import de.steamwar.bausystem.region.flags.Flag;
 import de.steamwar.bausystem.region.flags.flagvalues.ProtectMode;
+import de.steamwar.linkage.Linked;
 import org.bukkit.Location;
 import org.bukkit.block.Block;
 import org.bukkit.event.EventHandler;
@@ -14,7 +13,7 @@ import org.bukkit.event.entity.EntityExplodeEvent;
 
 import java.util.List;
 
-@Linked(LinkageType.LISTENER)
+@Linked
 public class ProtectListener implements Listener {
 
     private void explode(List<Block> blockList, Location location) {

BauSystem_Main/src/de/steamwar/bausystem/features/region/RegionCommand.java

@@ -22,9 +22,6 @@ package de.steamwar.bausystem.features.region;
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.Permission;
 import de.steamwar.bausystem.features.util.SelectCommand;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
-import de.steamwar.bausystem.linkage.LinkedInstance;
 import de.steamwar.bausystem.region.Prototype;
 import de.steamwar.bausystem.region.Region;
 import de.steamwar.bausystem.region.RegionUtils;
@@ -33,6 +30,8 @@ import de.steamwar.bausystem.region.utils.RegionType;
 import de.steamwar.command.SWCommand;
 import de.steamwar.command.TypeMapper;
 import de.steamwar.command.TypeValidator;
+import de.steamwar.linkage.Linked;
+import de.steamwar.linkage.LinkedInstance;
 import de.steamwar.sql.SchematicNode;
 import net.md_5.bungee.api.chat.ClickEvent;
 import org.bukkit.Bukkit;
@@ -46,7 +45,7 @@ import java.util.List;
 import java.util.logging.Level;
 import java.util.stream.Collectors;
 
-@Linked(LinkageType.COMMAND)
+@Linked
 public class RegionCommand extends SWCommand {
 
     @LinkedInstance

BauSystem_Main/src/de/steamwar/bausystem/features/region/RegionListener.java

@@ -20,10 +20,9 @@
 package de.steamwar.bausystem.features.region;
 
 import de.steamwar.bausystem.BauSystem;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
 import de.steamwar.bausystem.region.Region;
 import de.steamwar.bausystem.region.tags.Tag;
+import de.steamwar.linkage.Linked;
 import org.bukkit.Location;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
@@ -38,7 +37,7 @@ import org.bukkit.event.player.PlayerInteractEvent;
 import org.bukkit.scheduler.BukkitRunnable;
 
 
-@Linked(LinkageType.LISTENER)
+@Linked
 public class RegionListener implements Listener {
 
     @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)

BauSystem_Main/src/de/steamwar/bausystem/features/region/ResetCommand.java

@@ -21,14 +21,13 @@ package de.steamwar.bausystem.features.region;
 
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.Permission;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
 import de.steamwar.bausystem.region.GlobalRegion;
 import de.steamwar.bausystem.region.Region;
 import de.steamwar.bausystem.region.RegionUtils;
 import de.steamwar.bausystem.region.utils.RegionType;
 import de.steamwar.command.SWCommand;
 import de.steamwar.command.TypeValidator;
+import de.steamwar.linkage.Linked;
 import de.steamwar.sql.SchematicNode;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
@@ -36,7 +35,7 @@ import org.bukkit.entity.Player;
 import java.io.IOException;
 import java.util.logging.Level;
 
-@Linked(LinkageType.COMMAND)
+@Linked
 public class ResetCommand extends SWCommand {
 
     public ResetCommand() {

BauSystem_Main/src/de/steamwar/bausystem/features/region/TNTCommand.java

@@ -21,8 +21,6 @@ package de.steamwar.bausystem.features.region;
 
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.Permission;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
 import de.steamwar.bausystem.region.Region;
 import de.steamwar.bausystem.region.RegionUtils;
 import de.steamwar.bausystem.region.flags.Flag;
@@ -31,6 +29,7 @@ import de.steamwar.bausystem.region.utils.RegionType;
 import de.steamwar.command.SWCommand;
 import de.steamwar.command.TypeMapper;
 import de.steamwar.command.TypeValidator;
+import de.steamwar.linkage.Linked;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
@@ -39,7 +38,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-@Linked(LinkageType.COMMAND)
+@Linked
 public class TNTCommand extends SWCommand {
 
     public TNTCommand() {

BauSystem_Main/src/de/steamwar/bausystem/features/region/TNTListener.java

@@ -21,15 +21,14 @@ package de.steamwar.bausystem.features.region;
 
 import de.steamwar.bausystem.features.script.CustomScriptManager;
 import de.steamwar.bausystem.features.script.EventType;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
-import de.steamwar.bausystem.linkage.LinkedInstance;
 import de.steamwar.bausystem.region.Region;
 import de.steamwar.bausystem.region.RegionUtils;
 import de.steamwar.bausystem.region.flags.Flag;
 import de.steamwar.bausystem.region.flags.flagvalues.TNTMode;
 import de.steamwar.bausystem.region.utils.RegionExtensionType;
 import de.steamwar.bausystem.region.utils.RegionType;
+import de.steamwar.linkage.Linked;
+import de.steamwar.linkage.LinkedInstance;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.block.Block;
@@ -43,7 +42,7 @@ import org.bukkit.event.entity.EntityExplodeEvent;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-@Linked(LinkageType.LISTENER)
+@Linked
 public class TNTListener implements Listener {
 
     @LinkedInstance

BauSystem_Main/src/de/steamwar/bausystem/features/region/TestblockCommand.java

@@ -21,8 +21,6 @@ package de.steamwar.bausystem.features.region;
 
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.Permission;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
 import de.steamwar.bausystem.region.Region;
 import de.steamwar.bausystem.region.RegionUtils;
 import de.steamwar.bausystem.region.utils.RegionExtensionType;
@@ -31,6 +29,7 @@ import de.steamwar.command.SWCommand;
 import de.steamwar.command.SWCommandUtils;
 import de.steamwar.command.TypeMapper;
 import de.steamwar.command.TypeValidator;
+import de.steamwar.linkage.Linked;
 import de.steamwar.sql.SchematicNode;
 import de.steamwar.sql.SteamwarUser;
 import org.bukkit.Bukkit;
@@ -44,7 +43,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.logging.Level;
 
-@Linked(LinkageType.COMMAND)
+@Linked
 public class TestblockCommand extends SWCommand {
 
     public TestblockCommand() {

BauSystem_Main/src/de/steamwar/bausystem/features/region/items/ColorBauGuiItem.java

@@ -21,8 +21,6 @@ package de.steamwar.bausystem.features.region.items;
 
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.Permission;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
 import de.steamwar.bausystem.linkage.specific.BauGuiItem;
 import de.steamwar.bausystem.region.Color;
 import de.steamwar.bausystem.region.Region;
@@ -30,6 +28,7 @@ import de.steamwar.bausystem.region.flags.Flag;
 import de.steamwar.bausystem.region.flags.flagvalues.ColorMode;
 import de.steamwar.inventory.SWItem;
 import de.steamwar.inventory.SWListInv;
+import de.steamwar.linkage.Linked;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.ClickType;
@@ -39,7 +38,7 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-@Linked(LinkageType.BAU_GUI_ITEM)
+@Linked
 public class ColorBauGuiItem extends BauGuiItem {
 
     public ColorBauGuiItem() {

BauSystem_Main/src/de/steamwar/bausystem/features/region/items/FireBauGuiItem.java

@@ -21,19 +21,18 @@ package de.steamwar.bausystem.features.region.items;
 
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.Permission;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
 import de.steamwar.bausystem.linkage.specific.BauGuiItem;
 import de.steamwar.bausystem.region.Region;
 import de.steamwar.bausystem.region.flags.Flag;
 import de.steamwar.bausystem.region.flags.flagvalues.FireMode;
 import de.steamwar.inventory.SWItem;
+import de.steamwar.linkage.Linked;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.ClickType;
 import org.bukkit.inventory.ItemStack;
 
-@Linked(LinkageType.BAU_GUI_ITEM)
+@Linked
 public class FireBauGuiItem extends BauGuiItem {
 
     public FireBauGuiItem() {

BauSystem_Main/src/de/steamwar/bausystem/features/region/items/FreezeBauGuiItem.java

@@ -21,19 +21,18 @@ package de.steamwar.bausystem.features.region.items;
 
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.Permission;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
 import de.steamwar.bausystem.linkage.specific.BauGuiItem;
 import de.steamwar.bausystem.region.Region;
 import de.steamwar.bausystem.region.flags.Flag;
 import de.steamwar.bausystem.region.flags.flagvalues.FreezeMode;
 import de.steamwar.inventory.SWItem;
+import de.steamwar.linkage.Linked;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.ClickType;
 import org.bukkit.inventory.ItemStack;
 
-@Linked(LinkageType.BAU_GUI_ITEM)
+@Linked
 public class FreezeBauGuiItem extends BauGuiItem {
 
     public FreezeBauGuiItem() {

BauSystem_Main/src/de/steamwar/bausystem/features/region/items/ProtectBauGuiItem.java

@@ -21,19 +21,18 @@ package de.steamwar.bausystem.features.region.items;
 
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.Permission;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
 import de.steamwar.bausystem.linkage.specific.BauGuiItem;
 import de.steamwar.bausystem.region.Region;
 import de.steamwar.bausystem.region.flags.Flag;
 import de.steamwar.bausystem.region.flags.flagvalues.ProtectMode;
 import de.steamwar.inventory.SWItem;
+import de.steamwar.linkage.Linked;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.ClickType;
 import org.bukkit.inventory.ItemStack;
 
-@Linked(LinkageType.BAU_GUI_ITEM)
+@Linked
 public class ProtectBauGuiItem extends BauGuiItem {
 
     public ProtectBauGuiItem() {

BauSystem_Main/src/de/steamwar/bausystem/features/region/items/ResetBauGuiItem.java

@@ -22,18 +22,17 @@ package de.steamwar.bausystem.features.region.items;
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.Permission;
 import de.steamwar.bausystem.features.region.ResetCommand;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
-import de.steamwar.bausystem.linkage.LinkedInstance;
 import de.steamwar.bausystem.linkage.specific.BauGuiItem;
 import de.steamwar.inventory.SWItem;
 import de.steamwar.inventory.SchematicSelector;
+import de.steamwar.linkage.Linked;
+import de.steamwar.linkage.LinkedInstance;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.ClickType;
 import org.bukkit.inventory.ItemStack;
 
-@Linked(LinkageType.BAU_GUI_ITEM)
+@Linked
 public class ResetBauGuiItem extends BauGuiItem {
 
     @LinkedInstance

BauSystem_Main/src/de/steamwar/bausystem/features/region/items/TestblockBauGuiItem.java

@@ -22,18 +22,17 @@ package de.steamwar.bausystem.features.region.items;
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.Permission;
 import de.steamwar.bausystem.features.region.TestblockCommand;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
-import de.steamwar.bausystem.linkage.LinkedInstance;
 import de.steamwar.bausystem.linkage.specific.BauGuiItem;
 import de.steamwar.inventory.SWItem;
 import de.steamwar.inventory.SchematicSelector;
+import de.steamwar.linkage.Linked;
+import de.steamwar.linkage.LinkedInstance;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.ClickType;
 import org.bukkit.inventory.ItemStack;
 
-@Linked(LinkageType.BAU_GUI_ITEM)
+@Linked
 public class TestblockBauGuiItem extends BauGuiItem {
 
     @LinkedInstance

BauSystem_Main/src/de/steamwar/bausystem/features/region/items/TntBauGuiItem.java

@@ -21,20 +21,19 @@ package de.steamwar.bausystem.features.region.items;
 
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.Permission;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
 import de.steamwar.bausystem.linkage.specific.BauGuiItem;
 import de.steamwar.bausystem.region.Region;
 import de.steamwar.bausystem.region.flags.Flag;
 import de.steamwar.bausystem.region.flags.flagvalues.TNTMode;
 import de.steamwar.inventory.SWInventory;
 import de.steamwar.inventory.SWItem;
+import de.steamwar.linkage.Linked;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.ClickType;
 import org.bukkit.inventory.ItemStack;
 
-@Linked(LinkageType.BAU_GUI_ITEM)
+@Linked
 public class TntBauGuiItem extends BauGuiItem {
 
     public TntBauGuiItem() {

BauSystem_Main/src/de/steamwar/bausystem/features/script/CustomScriptManager.java

@@ -22,11 +22,10 @@ package de.steamwar.bausystem.features.script;
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.SWUtils;
 import de.steamwar.bausystem.features.script.variables.Value;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
 import de.steamwar.bausystem.utils.FlatteningWrapper;
 import de.steamwar.inventory.SWItem;
 import de.steamwar.inventory.SWListInv;
+import de.steamwar.linkage.Linked;
 import de.steamwar.sql.UserConfig;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
@@ -51,7 +50,7 @@ import yapion.parser.YAPIONParser;
 import java.util.*;
 import java.util.stream.Collectors;
 
-@Linked(LinkageType.LISTENER)
+@Linked
 public class CustomScriptManager implements Listener {
 
     private final Map<Player, List<CustomScript.Script>> playerMap = Collections.synchronizedMap(new HashMap<>()); // new ConcurrentHashMap<>();

BauSystem_Main/src/de/steamwar/bausystem/features/script/ScriptCommand.java

@@ -1,12 +1,11 @@
 package de.steamwar.bausystem.features.script;
 
 import de.steamwar.bausystem.BauSystem;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
-import de.steamwar.bausystem.linkage.LinkedInstance;
 import de.steamwar.command.SWCommand;
 import de.steamwar.inventory.SWItem;
 import de.steamwar.inventory.SWListInv;
+import de.steamwar.linkage.Linked;
+import de.steamwar.linkage.LinkedInstance;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
 
@@ -16,7 +15,7 @@ import java.util.List;
 
 import static de.steamwar.bausystem.features.script.ScriptExecutor.SPECIAL_COMMANDS;
 
-@Linked(LinkageType.COMMAND)
+@Linked
 public class ScriptCommand extends SWCommand {
 
     public ScriptCommand() {

BauSystem_Main/src/de/steamwar/bausystem/features/script/ScriptEventListener.java

@@ -20,12 +20,11 @@
 package de.steamwar.bausystem.features.script;
 
 import de.steamwar.bausystem.BauSystem;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
-import de.steamwar.bausystem.linkage.LinkedInstance;
 import de.steamwar.bausystem.region.Region;
 import de.steamwar.bausystem.region.utils.RegionExtensionType;
 import de.steamwar.bausystem.region.utils.RegionType;
+import de.steamwar.linkage.Linked;
+import de.steamwar.linkage.LinkedInstance;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Player;
@@ -43,7 +42,7 @@ import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 
-@Linked(LinkageType.LISTENER)
+@Linked
 public class ScriptEventListener implements Listener {
 
     @LinkedInstance

BauSystem_Main/src/de/steamwar/bausystem/features/script/ScriptExecutor.java

@@ -4,7 +4,6 @@ import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.features.script.variables.Constants;
 import de.steamwar.bausystem.features.script.variables.Context;
 import de.steamwar.bausystem.features.script.variables.Value;
-import de.steamwar.bausystem.linkage.LinkageType;
 import de.steamwar.bausystem.linkage.LinkageUtils;
 import lombok.Getter;
 import lombok.Setter;
@@ -21,7 +20,7 @@ public final class ScriptExecutor {
     public static final Set<SpecialCommand> SPECIAL_COMMANDS = new HashSet<>();
 
     static {
-        LinkageUtils.run(LinkageType.SCRIPT_COMMAND);
+        LinkageUtils.linkScriptCommands();
     }
 
     private String specialCommand = null;

BauSystem_Main/src/de/steamwar/bausystem/features/script/ScriptListener.java

@@ -1,9 +1,8 @@
 package de.steamwar.bausystem.features.script;
 
 import de.steamwar.bausystem.features.script.variables.Context;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
 import de.steamwar.bausystem.utils.FlatteningWrapper;
+import de.steamwar.linkage.Linked;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
@@ -20,7 +19,7 @@ import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 
-@Linked(LinkageType.LISTENER)
+@Linked
 public class ScriptListener implements Listener {
 
     private static final Map<Player, Context> GLOBAL_CONTEXT = new HashMap<>();

BauSystem_Main/src/de/steamwar/bausystem/features/script/command/arithmetic/Add.java

@@ -4,11 +4,10 @@ import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.features.script.ScriptExecutor;
 import de.steamwar.bausystem.features.script.SpecialCommand;
 import de.steamwar.bausystem.features.script.variables.Value;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
+import de.steamwar.linkage.Linked;
 import org.bukkit.Material;
 
-@Linked(LinkageType.SCRIPT_COMMAND)
+@Linked
 public class Add implements SpecialCommand {
 
     @Override

BauSystem_Main/src/de/steamwar/bausystem/features/script/command/arithmetic/Div.java

@@ -4,11 +4,10 @@ import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.features.script.ScriptExecutor;
 import de.steamwar.bausystem.features.script.SpecialCommand;
 import de.steamwar.bausystem.features.script.variables.Value;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
+import de.steamwar.linkage.Linked;
 import org.bukkit.Material;
 
-@Linked(LinkageType.SCRIPT_COMMAND)
+@Linked
 public class Div implements SpecialCommand {
 
     @Override

BauSystem_Main/src/de/steamwar/bausystem/features/script/command/arithmetic/Mul.java

@@ -4,11 +4,10 @@ import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.features.script.ScriptExecutor;
 import de.steamwar.bausystem.features.script.SpecialCommand;
 import de.steamwar.bausystem.features.script.variables.Value;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
+import de.steamwar.linkage.Linked;
 import org.bukkit.Material;
 
-@Linked(LinkageType.SCRIPT_COMMAND)
+@Linked
 public class Mul implements SpecialCommand {
 
     @Override

BauSystem_Main/src/de/steamwar/bausystem/features/script/command/arithmetic/Sub.java

@@ -4,11 +4,10 @@ import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.features.script.ScriptExecutor;
 import de.steamwar.bausystem.features.script.SpecialCommand;
 import de.steamwar.bausystem.features.script.variables.Value;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
+import de.steamwar.linkage.Linked;
 import org.bukkit.Material;
 
-@Linked(LinkageType.SCRIPT_COMMAND)
+@Linked
 public class Sub implements SpecialCommand {
 
     @Override

BauSystem_Main/src/de/steamwar/bausystem/features/script/command/arithmetic/other/Ceil.java

@@ -23,11 +23,10 @@ import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.features.script.ScriptExecutor;
 import de.steamwar.bausystem.features.script.SpecialCommand;
 import de.steamwar.bausystem.features.script.variables.Value;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
+import de.steamwar.linkage.Linked;
 import org.bukkit.Material;
 
-@Linked(LinkageType.SCRIPT_COMMAND)
+@Linked
 public class Ceil implements SpecialCommand {
 
     @Override

BauSystem_Main/src/de/steamwar/bausystem/features/script/command/arithmetic/other/Floor.java

@@ -23,11 +23,10 @@ import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.features.script.ScriptExecutor;
 import de.steamwar.bausystem.features.script.SpecialCommand;
 import de.steamwar.bausystem.features.script.variables.Value;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
+import de.steamwar.linkage.Linked;
 import org.bukkit.Material;
 
-@Linked(LinkageType.SCRIPT_COMMAND)
+@Linked
 public class Floor implements SpecialCommand {
 
     @Override

BauSystem_Main/src/de/steamwar/bausystem/features/script/command/arithmetic/other/Round.java

@@ -23,11 +23,10 @@ import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.features.script.ScriptExecutor;
 import de.steamwar.bausystem.features.script.SpecialCommand;
 import de.steamwar.bausystem.features.script.variables.Value;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
+import de.steamwar.linkage.Linked;
 import org.bukkit.Material;
 
-@Linked(LinkageType.SCRIPT_COMMAND)
+@Linked
 public class Round implements SpecialCommand {
 
     @Override

BauSystem_Main/src/de/steamwar/bausystem/features/script/command/io/Echo.java

@@ -3,12 +3,11 @@ package de.steamwar.bausystem.features.script.command.io;
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.features.script.ScriptExecutor;
 import de.steamwar.bausystem.features.script.SpecialCommand;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
+import de.steamwar.linkage.Linked;
 import net.md_5.bungee.api.ChatColor;
 import org.bukkit.Material;
 
-@Linked(LinkageType.SCRIPT_COMMAND)
+@Linked
 public class Echo implements SpecialCommand {
 
     @Override

BauSystem_Main/src/de/steamwar/bausystem/features/script/command/io/Echoactionbar.java

@@ -3,12 +3,11 @@ package de.steamwar.bausystem.features.script.command.io;
 import de.steamwar.bausystem.SWUtils;
 import de.steamwar.bausystem.features.script.ScriptExecutor;
 import de.steamwar.bausystem.features.script.SpecialCommand;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
+import de.steamwar.linkage.Linked;
 import net.md_5.bungee.api.ChatColor;
 import org.bukkit.Material;
 
-@Linked(LinkageType.SCRIPT_COMMAND)
+@Linked
 public class Echoactionbar implements SpecialCommand {
 
     @Override

BauSystem_Main/src/de/steamwar/bausystem/features/script/command/io/Input.java

@@ -4,13 +4,12 @@ import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.features.script.ScriptExecutor;
 import de.steamwar.bausystem.features.script.SpecialCommand;
 import de.steamwar.bausystem.features.script.variables.Value;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
 import de.steamwar.inventory.SWAnvilInv;
+import de.steamwar.linkage.Linked;
 import org.bukkit.ChatColor;
 import org.bukkit.Material;
 
-@Linked(LinkageType.SCRIPT_COMMAND)
+@Linked
 public class Input implements SpecialCommand {
 
     @Override

BauSystem_Main/src/de/steamwar/bausystem/features/script/command/logic/And.java

@@ -4,11 +4,10 @@ import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.features.script.ScriptExecutor;
 import de.steamwar.bausystem.features.script.SpecialCommand;
 import de.steamwar.bausystem.features.script.variables.Value;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
+import de.steamwar.linkage.Linked;
 import org.bukkit.Material;
 
-@Linked(LinkageType.SCRIPT_COMMAND)
+@Linked
 public class And implements SpecialCommand {
 
     @Override

BauSystem_Main/src/de/steamwar/bausystem/features/script/command/logic/Equal.java

@@ -4,11 +4,10 @@ import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.features.script.ScriptExecutor;
 import de.steamwar.bausystem.features.script.SpecialCommand;
 import de.steamwar.bausystem.features.script.variables.Value;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
+import de.steamwar.linkage.Linked;
 import org.bukkit.Material;
 
-@Linked(LinkageType.SCRIPT_COMMAND)
+@Linked
 public class Equal implements SpecialCommand {
 
     @Override

BauSystem_Main/src/de/steamwar/bausystem/features/script/command/logic/Greater.java

@@ -4,11 +4,10 @@ import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.features.script.ScriptExecutor;
 import de.steamwar.bausystem.features.script.SpecialCommand;
 import de.steamwar.bausystem.features.script.variables.Value;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
+import de.steamwar.linkage.Linked;
 import org.bukkit.Material;
 
-@Linked(LinkageType.SCRIPT_COMMAND)
+@Linked
 public class Greater implements SpecialCommand {
 
     @Override

BauSystem_Main/src/de/steamwar/bausystem/features/script/command/logic/Less.java

@@ -4,11 +4,10 @@ import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.features.script.ScriptExecutor;
 import de.steamwar.bausystem.features.script.SpecialCommand;
 import de.steamwar.bausystem.features.script.variables.Value;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
+import de.steamwar.linkage.Linked;
 import org.bukkit.Material;
 
-@Linked(LinkageType.SCRIPT_COMMAND)
+@Linked
 public class Less implements SpecialCommand {
 
     @Override

BauSystem_Main/src/de/steamwar/bausystem/features/script/command/logic/Not.java

@@ -4,11 +4,10 @@ import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.features.script.ScriptExecutor;
 import de.steamwar.bausystem.features.script.SpecialCommand;
 import de.steamwar.bausystem.features.script.variables.Value;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
+import de.steamwar.linkage.Linked;
 import org.bukkit.Material;
 
-@Linked(LinkageType.SCRIPT_COMMAND)
+@Linked
 public class Not implements SpecialCommand {
 
     @Override

BauSystem_Main/src/de/steamwar/bausystem/features/script/command/logic/Or.java

@@ -4,11 +4,10 @@ import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.features.script.ScriptExecutor;
 import de.steamwar.bausystem.features.script.SpecialCommand;
 import de.steamwar.bausystem.features.script.variables.Value;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
+import de.steamwar.linkage.Linked;
 import org.bukkit.Material;
 
-@Linked(LinkageType.SCRIPT_COMMAND)
+@Linked
 public class Or implements SpecialCommand {
 
     @Override

BauSystem_Main/src/de/steamwar/bausystem/features/script/command/string/Insert.java

@@ -23,11 +23,10 @@ import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.features.script.ScriptExecutor;
 import de.steamwar.bausystem.features.script.SpecialCommand;
 import de.steamwar.bausystem.features.script.variables.Value;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
+import de.steamwar.linkage.Linked;
 import org.bukkit.Material;
 
-@Linked(LinkageType.SCRIPT_COMMAND)
+@Linked
 public class Insert implements SpecialCommand {
 
     @Override

BauSystem_Main/src/de/steamwar/bausystem/features/script/command/string/Length.java

@@ -23,11 +23,10 @@ import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.features.script.ScriptExecutor;
 import de.steamwar.bausystem.features.script.SpecialCommand;
 import de.steamwar.bausystem.features.script.variables.Value;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
+import de.steamwar.linkage.Linked;
 import org.bukkit.Material;
 
-@Linked(LinkageType.SCRIPT_COMMAND)
+@Linked
 public class Length implements SpecialCommand {
 
     @Override

BauSystem_Main/src/de/steamwar/bausystem/features/script/command/string/Remove.java

@@ -23,11 +23,10 @@ import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.features.script.ScriptExecutor;
 import de.steamwar.bausystem.features.script.SpecialCommand;
 import de.steamwar.bausystem.features.script.variables.Value;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
+import de.steamwar.linkage.Linked;
 import org.bukkit.Material;
 
-@Linked(LinkageType.SCRIPT_COMMAND)
+@Linked
 public class Remove implements SpecialCommand {
 
     @Override

BauSystem_Main/src/de/steamwar/bausystem/features/script/command/string/Replace.java

@@ -23,11 +23,10 @@ import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.features.script.ScriptExecutor;
 import de.steamwar.bausystem.features.script.SpecialCommand;
 import de.steamwar.bausystem.features.script.variables.Value;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
+import de.steamwar.linkage.Linked;
 import org.bukkit.Material;
 
-@Linked(LinkageType.SCRIPT_COMMAND)
+@Linked
 public class Replace implements SpecialCommand {
 
     @Override

BauSystem_Main/src/de/steamwar/bausystem/features/script/command/string/Substring.java

@@ -23,11 +23,10 @@ import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.features.script.ScriptExecutor;
 import de.steamwar.bausystem.features.script.SpecialCommand;
 import de.steamwar.bausystem.features.script.variables.Value;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
+import de.steamwar.linkage.Linked;
 import org.bukkit.Material;
 
-@Linked(LinkageType.SCRIPT_COMMAND)
+@Linked
 public class Substring implements SpecialCommand {
 
     @Override

BauSystem_Main/src/de/steamwar/bausystem/features/script/command/variable/Const.java

@@ -23,11 +23,10 @@ import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.features.script.ScriptExecutor;
 import de.steamwar.bausystem.features.script.SpecialCommand;
 import de.steamwar.bausystem.features.script.variables.Constants;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
+import de.steamwar.linkage.Linked;
 import org.bukkit.Material;
 
-@Linked(LinkageType.SCRIPT_COMMAND)
+@Linked
 public class Const implements SpecialCommand {
 
     @Override

BauSystem_Main/src/de/steamwar/bausystem/features/script/command/variable/Convert.java

@@ -22,11 +22,10 @@ package de.steamwar.bausystem.features.script.command.variable;
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.features.script.ScriptExecutor;
 import de.steamwar.bausystem.features.script.SpecialCommand;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
+import de.steamwar.linkage.Linked;
 import org.bukkit.Material;
 
-@Linked(LinkageType.SCRIPT_COMMAND)
+@Linked
 public class Convert implements SpecialCommand {
 
     @Override

BauSystem_Main/src/de/steamwar/bausystem/features/script/command/variable/Global.java

@@ -3,11 +3,10 @@ package de.steamwar.bausystem.features.script.command.variable;
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.features.script.ScriptExecutor;
 import de.steamwar.bausystem.features.script.SpecialCommand;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
+import de.steamwar.linkage.Linked;
 import org.bukkit.Material;
 
-@Linked(LinkageType.SCRIPT_COMMAND)
+@Linked
 public class Global implements SpecialCommand {
 
     @Override

BauSystem_Main/src/de/steamwar/bausystem/features/script/command/variable/Isset.java

@@ -23,11 +23,10 @@ import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.features.script.ScriptExecutor;
 import de.steamwar.bausystem.features.script.SpecialCommand;
 import de.steamwar.bausystem.features.script.variables.Value;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
+import de.steamwar.linkage.Linked;
 import org.bukkit.Material;
 
-@Linked(LinkageType.SCRIPT_COMMAND)
+@Linked
 public class Isset implements SpecialCommand {
 
     @Override

BauSystem_Main/src/de/steamwar/bausystem/features/script/command/variable/Unglobal.java

@@ -3,11 +3,10 @@ package de.steamwar.bausystem.features.script.command.variable;
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.features.script.ScriptExecutor;
 import de.steamwar.bausystem.features.script.SpecialCommand;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
+import de.steamwar.linkage.Linked;
 import org.bukkit.Material;
 
-@Linked(LinkageType.SCRIPT_COMMAND)
+@Linked
 public class Unglobal implements SpecialCommand {
 
     @Override

BauSystem_Main/src/de/steamwar/bausystem/features/script/command/variable/Unvar.java

@@ -3,11 +3,10 @@ package de.steamwar.bausystem.features.script.command.variable;
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.features.script.ScriptExecutor;
 import de.steamwar.bausystem.features.script.SpecialCommand;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
+import de.steamwar.linkage.Linked;
 import org.bukkit.Material;
 
-@Linked(LinkageType.SCRIPT_COMMAND)
+@Linked
 public class Unvar implements SpecialCommand {
 
     @Override

BauSystem_Main/src/de/steamwar/bausystem/features/script/command/variable/Var.java

@@ -3,11 +3,10 @@ package de.steamwar.bausystem.features.script.command.variable;
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.features.script.ScriptExecutor;
 import de.steamwar.bausystem.features.script.SpecialCommand;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
+import de.steamwar.linkage.Linked;
 import org.bukkit.Material;
 
-@Linked(LinkageType.SCRIPT_COMMAND)
+@Linked
 public class Var implements SpecialCommand {
 
     @Override

BauSystem_Main/src/de/steamwar/bausystem/features/script/command/variable/Vartype.java

@@ -23,11 +23,10 @@ import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.features.script.ScriptExecutor;
 import de.steamwar.bausystem.features.script.SpecialCommand;
 import de.steamwar.bausystem.features.script.variables.Value;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
+import de.steamwar.linkage.Linked;
 import org.bukkit.Material;
 
-@Linked(LinkageType.SCRIPT_COMMAND)
+@Linked
 public class Vartype implements SpecialCommand {
 
     @Override

BauSystem_Main/src/de/steamwar/bausystem/features/script/command/world/GetMaterial.java

@@ -23,13 +23,12 @@ import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.features.script.ScriptExecutor;
 import de.steamwar.bausystem.features.script.SpecialCommand;
 import de.steamwar.bausystem.features.script.variables.Value;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
+import de.steamwar.linkage.Linked;
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
 import org.bukkit.World;
 
-@Linked(LinkageType.SCRIPT_COMMAND)
+@Linked
 public class GetMaterial implements SpecialCommand {
 
     private final World world = Bukkit.getWorlds().get(0);

BauSystem_Main/src/de/steamwar/bausystem/features/script/command/world/SetMaterial.java

@@ -22,13 +22,12 @@ package de.steamwar.bausystem.features.script.command.world;
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.features.script.ScriptExecutor;
 import de.steamwar.bausystem.features.script.SpecialCommand;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
+import de.steamwar.linkage.Linked;
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
 import org.bukkit.World;
 
-@Linked(LinkageType.SCRIPT_COMMAND)
+@Linked
 public class SetMaterial implements SpecialCommand {
 
     private final World world = Bukkit.getWorlds().get(0);

BauSystem_Main/src/de/steamwar/bausystem/features/script/items/ScriptMenuBauGuiItem.java

@@ -21,16 +21,15 @@ package de.steamwar.bausystem.features.script.items;
 
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.Permission;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
 import de.steamwar.bausystem.linkage.specific.BauGuiItem;
 import de.steamwar.inventory.SWItem;
+import de.steamwar.linkage.Linked;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.ClickType;
 import org.bukkit.inventory.ItemStack;
 
-@Linked(LinkageType.BAU_GUI_ITEM)
+@Linked
 public class ScriptMenuBauGuiItem extends BauGuiItem {
 
     public ScriptMenuBauGuiItem() {

BauSystem_Main/src/de/steamwar/bausystem/features/simulator/SimulatorBauGuiItem.java

@@ -21,17 +21,16 @@ package de.steamwar.bausystem.features.simulator;
 
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.Permission;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
 import de.steamwar.bausystem.linkage.specific.BauGuiItem;
 import de.steamwar.inventory.SWItem;
+import de.steamwar.linkage.Linked;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.ClickType;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
 
-@Linked(LinkageType.BAU_GUI_ITEM)
+@Linked
 public class SimulatorBauGuiItem extends BauGuiItem {
 
     public SimulatorBauGuiItem() {

BauSystem_Main/src/de/steamwar/bausystem/features/simulator/SimulatorCommand.java

@@ -23,19 +23,18 @@ import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.Permission;
 import de.steamwar.bausystem.SWUtils;
 import de.steamwar.bausystem.features.simulator.gui.SimulatorSelectionGUI;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
 import de.steamwar.bausystem.utils.ItemUtils;
 import de.steamwar.command.SWCommand;
 import de.steamwar.command.TypeMapper;
 import de.steamwar.command.TypeValidator;
+import de.steamwar.linkage.Linked;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 
 import java.util.Collection;
 
-@Linked(LinkageType.COMMAND)
+@Linked
 public class SimulatorCommand extends SWCommand {
 
     public SimulatorCommand() {

BauSystem_Main/src/de/steamwar/bausystem/features/simulator/SimulatorStorage.java

@@ -24,10 +24,9 @@ import de.steamwar.bausystem.SWUtils;
 import de.steamwar.bausystem.features.simulator.tnt.TNTElement;
 import de.steamwar.bausystem.linkage.Disable;
 import de.steamwar.bausystem.linkage.Enable;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
 import de.steamwar.bausystem.utils.ItemUtils;
 import de.steamwar.inventory.SWItem;
+import de.steamwar.linkage.Linked;
 import de.steamwar.sql.SteamwarUser;
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
@@ -49,8 +48,7 @@ import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
 
-@Linked(LinkageType.ENABLE_LINK)
-@Linked(LinkageType.DISABLE_LINK)
+@Linked
 public class SimulatorStorage implements Enable, Disable {
 
     public static final World WORLD = Bukkit.getWorlds().get(0);

BauSystem_Main/src/de/steamwar/bausystem/features/simulator/TNTSimulatorListener.java

@@ -22,10 +22,9 @@ package de.steamwar.bausystem.features.simulator;
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.Permission;
 import de.steamwar.bausystem.features.simulator.gui.SimulatorSelectionGUI;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
 import de.steamwar.bausystem.utils.ItemUtils;
 import de.steamwar.bausystem.utils.RayTraceUtils;
+import de.steamwar.linkage.Linked;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.entity.Player;
@@ -40,7 +39,7 @@ import org.bukkit.util.RayTraceResult;
 
 import java.util.function.Function;
 
-@Linked(LinkageType.LISTENER)
+@Linked
 public class TNTSimulatorListener implements Listener {
 
     private boolean permissionCheck(Player player) {

BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/LaufbauCommand.java

@@ -22,18 +22,17 @@ package de.steamwar.bausystem.features.slaves.laufbau;
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.Permission;
 import de.steamwar.bausystem.SWUtils;
-import de.steamwar.bausystem.utils.WorldEditUtils;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
 import de.steamwar.bausystem.shared.Pair;
+import de.steamwar.bausystem.utils.WorldEditUtils;
 import de.steamwar.command.SWCommand;
 import de.steamwar.command.TypeValidator;
+import de.steamwar.linkage.Linked;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.entity.Player;
 import org.bukkit.scheduler.BukkitRunnable;
 
-@Linked(LinkageType.COMMAND)
+@Linked
 public class LaufbauCommand extends SWCommand {
 
     public LaufbauCommand() {