From d659e64613d371b9273945793d6e307a6fe552bd Mon Sep 17 00:00:00 2001
From: Danielxs01 <daniel.schmidtdsi@gmail.com>
Date: Tue, 16 Nov 2021 17:36:13 +0100
Subject: [PATCH] [#25] Current process Completed connection logic.
 ItemSelection still needs to be fixed.

---
 .../net/landofrails/stellwand/Stellwand.java  |   3 +
 .../function/BlockSenderFunctionEntity.java   |  31 ++-
 .../storage/BlockSenderStorageEntity.java     |  13 ++
 .../stellwand/content/guis/SelectItem.java    |  18 +-
 .../content/items/ItemMagnifyingGlass.java    |   1 +
 .../items/connector/AItemConnector.java       | 163 ++++++++++++--
 .../items/connector/ItemConnector.java        | 202 +++---------------
 .../items/connector/ItemConnectorSender.java  |  86 +++++++-
 .../items/connector/ItemConnectorSignal.java  |  58 ++++-
 .../stellwand/content/messages/EMessage.java  |   1 +
 .../contentpacks/loader/StaticLoader.java     |   8 +-
 .../assets/landofsignals/lang/de_DE.lang      |   3 +-
 .../assets/landofsignals/lang/en_US.lang      |   3 +-
 13 files changed, 369 insertions(+), 221 deletions(-)

diff --git a/src/main/java/net/landofrails/stellwand/Stellwand.java b/src/main/java/net/landofrails/stellwand/Stellwand.java
index 6e4d88d7..cc20f810 100644
--- a/src/main/java/net/landofrails/stellwand/Stellwand.java
+++ b/src/main/java/net/landofrails/stellwand/Stellwand.java
@@ -8,6 +8,7 @@
 import net.landofrails.stellwand.content.entities.storage.*;
 import net.landofrails.stellwand.content.guis.CustomGuis;
 import net.landofrails.stellwand.content.items.CustomItems;
+import net.landofrails.stellwand.content.items.connector.AItemConnector;
 import net.landofrails.stellwand.content.network.CustomPackets;
 import net.landofrails.stellwand.content.recipes.CustomRecipes;
 import net.landofrails.stellwand.content.tabs.CustomTabs;
@@ -37,6 +38,8 @@ public static void commonEvent(ModEvent event) {
                 if (!StellwandConfig.disableStellwand) {
                     Loader.init();
 
+                    AItemConnector.registerConnectors();
+
                     CustomGuis.register();
                     CustomTabs.register();
                     CustomItems.register();
diff --git a/src/main/java/net/landofrails/stellwand/content/entities/function/BlockSenderFunctionEntity.java b/src/main/java/net/landofrails/stellwand/content/entities/function/BlockSenderFunctionEntity.java
index fd78c9c9..df78a484 100644
--- a/src/main/java/net/landofrails/stellwand/content/entities/function/BlockSenderFunctionEntity.java
+++ b/src/main/java/net/landofrails/stellwand/content/entities/function/BlockSenderFunctionEntity.java
@@ -51,16 +51,24 @@ public ItemStack onPick() {
 
     @Override
     public boolean onClick(Player player, Hand hand, Facing facing, Vec3d hit) {
-        ItemStack item = player.getHeldItem(hand);
-
         ItemStack heldItem = player.getHeldItem(hand);
-        if (heldItem != null && heldItem.is(CustomItems.ITEMMAGNIFYINGGLASS))
+
+        // @formatter:off
+        if (heldItem != null &&
+            (
+                heldItem.is(CustomItems.ITEMMAGNIFYINGGLASS) ||
+                heldItem.is(CustomItems.ITEMCONNECTOR1) ||
+                heldItem.is(CustomItems.ITEMCONNECTOR2) ||
+                heldItem.is(CustomItems.ITEMCONNECTOR3)
+            )
+        )
             return false;
+        // @formatter:on
 
-        if (isAir(item) && getWorld().isServer) {
-            if (!entity.signals.isEmpty()) {
+        if (isAir(heldItem) && hand.equals(Hand.PRIMARY) && getWorld().isServer) {
+            Vec3i signalPos = entity.getFirstSignal();
+            if (signalPos != null) {
 
-                Vec3i signalPos = entity.signals.get(0);
                 getWorld().keepLoaded(signalPos);
                 if (getWorld().hasBlockEntity(signalPos, BlockSignalStorageEntity.class)) {
                     BlockSignalStorageEntity signalEntity = getWorld().getBlockEntity(signalPos, BlockSignalStorageEntity.class);
@@ -72,13 +80,11 @@ public boolean onClick(Player player, Hand hand, Facing facing, Vec3d hit) {
                     packet.sendToPlayer(player);
                 } else {
                     entity.signals.remove(signalPos);
-                    if (!getWorld().isClient)
-                        ServerMessagePacket.send(player, EMessage.MESSAGE_NO_SIGNAL_FOUND, EMessage.MESSAGE_ERROR1.getRaw());
+                    ServerMessagePacket.send(player, EMessage.MESSAGE_NO_SIGNAL_FOUND, EMessage.MESSAGE_ERROR1.getRaw());
                 }
 
             } else {
-                if (!getWorld().isClient)
-                    ServerMessagePacket.send(player, EMessage.MESSAGE_NO_SIGNALS_CONNECTED);
+                ServerMessagePacket.send(player, EMessage.MESSAGE_NO_SIGNALS_CONNECTED);
             }
 
             return true;
@@ -101,6 +107,7 @@ public void onNeighborChange(Vec3i neighbor) {
     }
 
     public void updateSignals() {
+        entity.refreshSignals();
         for (Vec3i signalPos : entity.signals) {
             getWorld().keepLoaded(signalPos);
 
@@ -152,7 +159,9 @@ public void onBreak() {
     }
 
     private boolean isAir(ItemStack item) {
-        return item.is(ItemStack.EMPTY) || item.equals(ItemStack.EMPTY);
+        if (item == null)
+            return true;
+        return (item.is(ItemStack.EMPTY) || item.equals(ItemStack.EMPTY)) && item.getTagCompound().isEmpty();
     }
 
 }
diff --git a/src/main/java/net/landofrails/stellwand/content/entities/storage/BlockSenderStorageEntity.java b/src/main/java/net/landofrails/stellwand/content/entities/storage/BlockSenderStorageEntity.java
index f63802d2..056220bb 100644
--- a/src/main/java/net/landofrails/stellwand/content/entities/storage/BlockSenderStorageEntity.java
+++ b/src/main/java/net/landofrails/stellwand/content/entities/storage/BlockSenderStorageEntity.java
@@ -143,6 +143,19 @@ public void setSignal(SignalContainer<BlockEntity> signalEntity) {
         this.signalEntity = signalEntity;
     }
 
+    public Vec3i getFirstSignal() {
+        refreshSignals();
+        for (Vec3i pos : this.signals)
+            if (SignalContainer.isSignal(getWorld(), pos))
+                return pos;
+        return null;
+    }
+
+    public void refreshSignals() {
+        this.signals.forEach(signal -> getWorld().keepLoaded(signal));
+        this.signals.removeIf(vec3i -> !SignalContainer.isSignal(getWorld(), vec3i) && getWorld().isBlockLoaded(vec3i));
+    }
+
     public SignalContainer<BlockEntity> getSignal() {
         return this.signalEntity;
     }
diff --git a/src/main/java/net/landofrails/stellwand/content/guis/SelectItem.java b/src/main/java/net/landofrails/stellwand/content/guis/SelectItem.java
index 3e6a940d..8b7a123d 100644
--- a/src/main/java/net/landofrails/stellwand/content/guis/SelectItem.java
+++ b/src/main/java/net/landofrails/stellwand/content/guis/SelectItem.java
@@ -12,10 +12,12 @@
 import net.landofrails.stellwand.content.items.CustomItems;
 import net.landofrails.stellwand.contentpacks.Content;
 import net.landofrails.stellwand.contentpacks.entries.ContentPack;
-import net.landofrails.stellwand.contentpacks.entries.parent.ContentPackEntry;
 import net.landofrails.stellwand.contentpacks.types.EntryType;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Objects;
 import java.util.function.Consumer;
 
 public class SelectItem implements IScreen {
@@ -26,7 +28,7 @@ public class SelectItem implements IScreen {
     // Initialized every call
     private List<Button> contentPackButtons = new LinkedList<>();
     private Consumer<ItemStack> selectedItem;
-    private ItemStack current;
+    private ItemStack current = null;
     private EntryType entryType;
     private ItemStack defaultItem;
 
@@ -48,7 +50,8 @@ public void onEnterKey(IScreenBuilder builder) {
 
     @Override
     public void onClose() {
-        selectedItem.accept(current);
+        if (current != null)
+            selectedItem.accept(current);
         // Reset variables
         contentPackButtons.clear();
         selectedItem = null;
@@ -64,14 +67,13 @@ public void draw(IScreenBuilder builder) {
 
     private List<ItemStack> getItemStackForContentPack(ContentPack pack, EntryType type) {
         List<ItemStack> items = new ArrayList<>();
-        for (Map.Entry<ContentPackEntry, String> entry : Content.getBlocks(pack, type).entrySet()) {
-            ContentPackEntry cpe = entry.getKey();
+        Content.getBlocks(pack, type).forEach((cpe, value) -> {
             ItemStack is = new ItemStack(getCustomItemForEntryType(Objects.requireNonNull(type)), 1);
             TagCompound tag = is.getTagCompound();
-            tag.setString("itemId", cpe.getBlockId(entry.getValue()));
+            tag.setString("itemId", cpe.getBlockId(value));
             is.setTagCompound(tag);
             items.add(is);
-        }
+        });
         if (items.isEmpty())
             items.add(defaultItem);
         return items;
diff --git a/src/main/java/net/landofrails/stellwand/content/items/ItemMagnifyingGlass.java b/src/main/java/net/landofrails/stellwand/content/items/ItemMagnifyingGlass.java
index c1f4a4c5..1b6b8f8f 100644
--- a/src/main/java/net/landofrails/stellwand/content/items/ItemMagnifyingGlass.java
+++ b/src/main/java/net/landofrails/stellwand/content/items/ItemMagnifyingGlass.java
@@ -49,6 +49,7 @@ public ClickResult onClickBlock(Player player, World world, Vec3i pos, Hand hand
             float g = (float) (RANDOM.nextFloat() / 2f + 0.5);
             float b = (float) (RANDOM.nextFloat() / 2f + 0.5);
 
+            sender.refreshSignals();
             sender.signals.forEach(vec -> {
                 if (SignalContainer.isSignal(sender.getWorld(), vec)) {
                     SignalContainer<BlockEntity> signalContainer = SignalContainer.of(sender.getWorld(), vec);
diff --git a/src/main/java/net/landofrails/stellwand/content/items/connector/AItemConnector.java b/src/main/java/net/landofrails/stellwand/content/items/connector/AItemConnector.java
index 2aa5c828..48c8cfb5 100644
--- a/src/main/java/net/landofrails/stellwand/content/items/connector/AItemConnector.java
+++ b/src/main/java/net/landofrails/stellwand/content/items/connector/AItemConnector.java
@@ -1,9 +1,13 @@
 package net.landofrails.stellwand.content.items.connector;
 
 import cam72cam.mod.entity.Player;
+import cam72cam.mod.item.ItemStack;
 import cam72cam.mod.math.Vec3i;
 import cam72cam.mod.serialization.TagCompound;
 import cam72cam.mod.world.World;
+import net.landofrails.stellwand.content.entities.storage.BlockSenderStorageEntity;
+import net.landofrails.stellwand.content.items.CustomItems;
+import net.landofrails.stellwand.utils.compact.SignalContainer;
 
 import java.lang.reflect.InvocationTargetException;
 import java.util.HashMap;
@@ -14,25 +18,89 @@ public abstract class AItemConnector {
 
     private static final Map<Class<? extends AItemConnector>, BiPredicate<World, Vec3i>> CONNECTORS = new HashMap<>();
 
-    private static final long serialVersionUID = -4963471115414960689L;
     private static final String KEY_ISCLIENT = "isClient";
     private static final String KEY_WORLD = "world";
     private static final String KEY_POS = "pos";
-
-    public static <T extends AItemConnector> void registerConnector(Class<T> connector, BiPredicate<World, Vec3i> isConnectable) {
+    private static final String KEY_CLASSNAME = "className";
+
+    /**
+     * Used by connectors to register class and bipredicate
+     *
+     * @param connector     Connector's class
+     * @param isConnectable Method of identifying the correct connector
+     * @param <T>           Class extending AItemConnector.class
+     */
+    protected static <T extends AItemConnector> void registerConnector(Class<T> connector, BiPredicate<World, Vec3i> isConnectable) {
         CONNECTORS.put(connector, isConnectable);
     }
 
+    /**
+     * Called by commonEvent
+     */
+    public static void registerConnectors() {
+        ItemConnectorSignal.register();
+        ItemConnectorSender.register();
+    }
+
+    /**
+     * Returns true if itemstack contains a connector
+     *
+     * @param itemStack The itemstack
+     * @return true if it contains a connector
+     */
+    public static boolean hasConnectorData(ItemStack itemStack) {
+        if (itemStack.is(CustomItems.ITEMCONNECTOR2) || itemStack.is(CustomItems.ITEMCONNECTOR3)) {
+            TagCompound tag = itemStack.getTagCompound();
+            return tag.hasKey(KEY_WORLD) && tag.hasKey(KEY_POS) && tag.hasKey(KEY_CLASSNAME);
+        }
+        return false;
+    }
+
+    /**
+     * Returns true if a connector is suited for the position
+     *
+     * @param world World
+     * @param pos   Position
+     * @return true if a suitable connector exists
+     */
     public static boolean suitableConnectorExists(World world, Vec3i pos) {
+        assert !CONNECTORS.isEmpty();
         return CONNECTORS.values().stream().anyMatch(c -> c.test(world, pos));
     }
 
+    /**
+     * Returns new instance of a connector if a suitable one exists
+     *
+     * @param world World
+     * @param pos   Position
+     * @return Suitable Connector, may be null
+     */
     public static AItemConnector getConnector(World world, Vec3i pos) {
         Class<? extends AItemConnector> clazz = getImplementor(world, pos);
 
         if (clazz != null) {
             try {
-                TagCompound tag = worldPosTag(world, pos);
+                return clazz.getDeclaredConstructor().newInstance();
+            } catch (InstantiationException | IllegalAccessException | InvocationTargetException | NoSuchMethodException e) {
+                e.printStackTrace();
+            }
+        }
+
+        return null;
+    }
+
+    /**
+     * Returns instance of a connector if one exists
+     *
+     * @param itemStack ItemStack
+     * @return The suitable connector, may be null
+     */
+    public static AItemConnector getConnector(ItemStack itemStack) {
+        Class<? extends AItemConnector> clazz = getImplementor(itemStack);
+
+        if (clazz != null) {
+            try {
+                TagCompound tag = itemStack.getTagCompound();
                 return clazz.getDeclaredConstructor(TagCompound.class).newInstance(tag);
             } catch (InstantiationException | IllegalAccessException | InvocationTargetException | NoSuchMethodException e) {
                 e.printStackTrace();
@@ -42,10 +110,65 @@ public static AItemConnector getConnector(World world, Vec3i pos) {
         return null;
     }
 
+    /**
+     * Returns class of a connector if a suitable one exists
+     *
+     * @param world World
+     * @param pos   Position
+     * @return Class of the suitable connector, may be null
+     */
     public static Class<? extends AItemConnector> getImplementor(World world, Vec3i pos) {
         return CONNECTORS.entrySet().stream().filter(es -> es.getValue().test(world, pos)).map(Map.Entry::getKey).findFirst().orElse(null);
     }
 
+    /**
+     * Return class of connector if a suitable one exists
+     *
+     * @param itemStack ItemStack
+     * @return Class of the connector in the itemstack, may be null
+     */
+    public static Class<? extends AItemConnector> getImplementor(ItemStack itemStack) {
+        if (itemStack != null) {
+            TagCompound tag = itemStack.getTagCompound();
+            if (tag.hasKey(KEY_CLASSNAME)) {
+                try {
+                    Class<?> aClass = Class.forName(tag.getString(KEY_CLASSNAME));
+                    return aClass.asSubclass(AItemConnector.class);
+                } catch (ClassNotFoundException e) {
+                    return null;
+                }
+            }
+        }
+        return null;
+    }
+
+    /**
+     * Returns a new SignalContainer if a signal exists at the give position
+     *
+     * @param world World
+     * @param pos   Position
+     * @return The SignalContainer for this position, may be null
+     */
+    protected static SignalContainer<?> getSignal(World world, Vec3i pos) {
+        world.keepLoaded(pos);
+        boolean isSignal = SignalContainer.isSignal(world, pos);
+        if (!isSignal)
+            return null;
+        return SignalContainer.of(world, pos);
+    }
+
+    /**
+     * Returns a BlockSenderStorageEntity if a signal exists at the give position
+     *
+     * @param world World
+     * @param pos   Position
+     * @return Blocksender
+     */
+    protected static BlockSenderStorageEntity getSender(World world, Vec3i pos) {
+        world.keepLoaded(pos);
+        return world.getBlockEntity(pos, BlockSenderStorageEntity.class);
+    }
+
     // Connector
 
     protected AItemConnector() {
@@ -55,32 +178,32 @@ protected AItemConnector() {
     protected AItemConnector(TagCompound tag) {
         if (tag != null && !tag.isEmpty()) {
             Boolean isClient = tag.getBoolean(KEY_ISCLIENT);
-            this.world = tag.getWorld(KEY_WORLD, isClient);
-            this.pos = tag.getVec3i(KEY_POS);
+            this.startWorld = tag.getWorld(KEY_WORLD, isClient);
+            this.startPos = tag.getVec3i(KEY_POS);
         }
     }
 
-    private World world;
-    private Vec3i pos;
+    private World startWorld = null;
+    private Vec3i startPos = null;
 
-    public World getWorld() {
-        return world;
+    public World getStartWorld() {
+        return startWorld;
     }
 
-    public void setWorld(World world) {
-        this.world = world;
+    public void setStartWorld(World startWorld) {
+        this.startWorld = startWorld;
     }
 
-    public Vec3i getPos() {
-        return pos;
+    public Vec3i getStartPos() {
+        return startPos;
     }
 
-    public void setPos(Vec3i pos) {
-        this.pos = pos;
+    public void setStartPos(Vec3i startPos) {
+        this.startPos = startPos;
     }
 
     public TagCompound toTag() {
-        return worldPosTag(world, pos);
+        return worldPosTag(startWorld, startPos).setString(KEY_CLASSNAME, getImplementingClass().getName());
     }
 
     protected static TagCompound worldPosTag(World world, Vec3i pos) {
@@ -91,6 +214,12 @@ protected static TagCompound worldPosTag(World world, Vec3i pos) {
         return tag;
     }
 
+    public abstract boolean shouldOverrideConnector(World world, Vec3i pos);
+
     protected abstract boolean connect(World world, Vec3i pos, Player player, Player.Hand hand);
 
+    protected abstract boolean canConnect(World world, Vec3i pos);
+
+    protected abstract Class<? extends AItemConnector> getImplementingClass();
+
 }
diff --git a/src/main/java/net/landofrails/stellwand/content/items/connector/ItemConnector.java b/src/main/java/net/landofrails/stellwand/content/items/connector/ItemConnector.java
index 73b3a9a1..b9cc7029 100644
--- a/src/main/java/net/landofrails/stellwand/content/items/connector/ItemConnector.java
+++ b/src/main/java/net/landofrails/stellwand/content/items/connector/ItemConnector.java
@@ -1,6 +1,5 @@
 package net.landofrails.stellwand.content.items.connector;
 
-import cam72cam.mod.block.BlockEntity;
 import cam72cam.mod.entity.Player;
 import cam72cam.mod.entity.Player.Hand;
 import cam72cam.mod.item.ClickResult;
@@ -9,18 +8,14 @@
 import cam72cam.mod.item.ItemStack;
 import cam72cam.mod.math.Vec3d;
 import cam72cam.mod.math.Vec3i;
-import cam72cam.mod.serialization.TagCompound;
 import cam72cam.mod.util.Facing;
 import cam72cam.mod.world.World;
 import net.landofrails.landofsignals.LandOfSignals;
-import net.landofrails.stellwand.content.entities.storage.BlockSenderStorageEntity;
 import net.landofrails.stellwand.content.items.CustomItems;
 import net.landofrails.stellwand.content.messages.EMessage;
 import net.landofrails.stellwand.content.network.ServerMessagePacket;
 import net.landofrails.stellwand.content.tabs.CustomTabs;
 import net.landofrails.stellwand.utils.ICustomTexturePath;
-import net.landofrails.stellwand.utils.compact.LoSPlayer;
-import net.landofrails.stellwand.utils.compact.SignalContainer;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -29,13 +24,7 @@
 
 public class ItemConnector extends CustomItem implements ICustomTexturePath {
 
-    // Constants
-    private static final String SENDERKEY = "senderPos";
-    private static final String SIGNALKEY = "signalPos";
-
-    //
-
-    private int variation;
+    private final int variation;
 
     public ItemConnector() {
         this(1);
@@ -80,176 +69,35 @@ public ClickResult onClickBlock(Player player, World world, Vec3i pos,
                                     Hand hand, Facing facing, Vec3d inBlockPos) {
 
         if (world.isServer) {
-            LoSPlayer p = new LoSPlayer(player);
-            if (ConnectionHandler.Checker.isConnectable(world, pos)) {
-                ItemStack itemStack = player.getHeldItem(hand);
-
-                return Objects.requireNonNull(ConnectionHandler.Connector.connect(p, world, pos, itemStack), "ConnectionHandler should not return null!");
-            } else {
-                ServerMessagePacket.send(player, EMessage.MESSAGE_BLOCK_NOT_CONNECTABLE);
-                return ClickResult.REJECTED;
-            }
-        } else {
-            return ClickResult.PASS;
-        }
-
-
-        if (itemStack.is(CustomItems.ITEMCONNECTOR1)) {
-            return onClickBlockWithItemConnector1(player, world, hand, pos);
-        } else if (itemStack.is(CustomItems.ITEMCONNECTOR2)) {
-            return onClickBlockWithItemConnector2(player, world, hand, pos);
-        } else if (itemStack.is(CustomItems.ITEMCONNECTOR3)) {
-            return onClickBlockWithItemConnector3(player, world, hand, pos);
-        }
-
-        return ClickResult.PASS;
-    }
-
-    private ClickResult onClickBlockWithItemConnector1(Player player, World world, Hand hand, Vec3i pos) {
-        LoSPlayer p = new LoSPlayer(player);
-
-        SignalContainer<?> signalEntity = getSignal(world, pos);
-        BlockSenderStorageEntity senderEntity = getSender(world, pos);
-
-        if (signalEntity != null) {
-            selectSignal(p, hand, pos);
-            return ClickResult.ACCEPTED;
-        } else if (senderEntity != null) {
-            selectSender(p, hand, pos);
-            return ClickResult.ACCEPTED;
-        }
-
-        return ClickResult.PASS;
-    }
-
-    private ClickResult onClickBlockWithItemConnector3(Player player, World world, Hand hand, Vec3i pos) {
-
-        ItemStack itemStack = player.getHeldItem(hand);
-        TagCompound nbt = itemStack.getTagCompound();
-        LoSPlayer p = new LoSPlayer(player);
-
-        SignalContainer<?> signalEntity = getSignal(world, pos);
-        BlockSenderStorageEntity senderEntity = getSender(world, pos);
-
-        if (signalEntity != null) {
-            selectSignal(p, hand, pos);
-            return ClickResult.ACCEPTED;
-        } else if (senderEntity != null && nbt.hasKey(SIGNALKEY)) {
-            Vec3i signalPos = nbt.getVec3i(SIGNALKEY);
-            boolean d = player.isCrouching();
-            if (senderEntity.isCompatible(getSignal(world, signalPos))) {
-                connect(world, senderEntity.getPos(), signalPos, d);
-                if (p.getWorld().isServer)
-                    ServerMessagePacket.send(player, d ? EMessage.MESSAGE_SIGNAL_DISCONNECTED : EMessage.MESSAGE_SIGNAL_CONNECTED);
-            } else {
-                if (p.getWorld().isServer)
-                    ServerMessagePacket.send(player, EMessage.MESSAGE_SIGNALS_MUST_BE_EQUAL);
-            }
-
-            return ClickResult.ACCEPTED;
-        }
-
-        return ClickResult.PASS;
-    }
-
-    private ClickResult onClickBlockWithItemConnector2(Player player, World world, Hand hand, Vec3i pos) {
-
-        ItemStack itemStack = player.getHeldItem(hand);
-        TagCompound nbt = itemStack.getTagCompound();
-        LoSPlayer p = new LoSPlayer(player);
-
-        SignalContainer<?> signalEntity = getSignal(world, pos);
-        BlockSenderStorageEntity senderEntity = getSender(world, pos);
-
-        for (Class<? extends BlockEntity> clazz : connectableClasses) {
-            if (IConnectable.class.isAssignableFrom(clazz)) {
-                if (world.hasBlockEntity(pos, clazz)) {
-                    connect(clazz, world, pos, itemStack, p, hand);
+            ItemStack itemStack = player.getHeldItem(hand);
+            if (!AItemConnector.hasConnectorData(itemStack)) {
+                if (AItemConnector.suitableConnectorExists(world, pos)) {
+                    AItemConnector connector = Objects.requireNonNull(AItemConnector.getConnector(world, pos));
+                    boolean result = connector.connect(world, pos, player, hand);
+                    return result ? ClickResult.ACCEPTED : ClickResult.REJECTED;
+                } else {
+                    ServerMessagePacket.send(player, EMessage.MESSAGE_BLOCK_NOT_CONNECTABLE);
+                    return ClickResult.REJECTED;
                 }
-            }
-        }
-
-        if (signalEntity != null && nbt.hasKey(SENDERKEY)) {
-            Vec3i senderPos = nbt.getVec3i(SENDERKEY);
-            boolean d = player.isCrouching();
-            BlockSenderStorageEntity sender = getSender(world, senderPos);
-            if (sender.isCompatible(signalEntity)) {
-                connect(world, senderPos, signalEntity.getPos(), d);
-                if (p.getWorld().isServer)
-                    ServerMessagePacket.send(player, d ? EMessage.MESSAGE_SIGNAL_DISCONNECTED : EMessage.MESSAGE_SIGNAL_CONNECTED);
             } else {
-                if (p.getWorld().isServer)
-                    ServerMessagePacket.send(player, EMessage.MESSAGE_SIGNALS_MUST_BE_EQUAL);
+                AItemConnector connector = AItemConnector.getConnector(itemStack);
+                if (connector != null && connector.canConnect(world, pos)) {
+                    boolean result = connector.connect(world, pos, player, hand);
+                    return result ? ClickResult.ACCEPTED : ClickResult.REJECTED;
+                } else if (connector != null && connector.shouldOverrideConnector(world, pos)) {
+                    // Override with new Connector
+                    connector = Objects.requireNonNull(AItemConnector.getConnector(world, pos));
+                    boolean result = connector.connect(world, pos, player, hand);
+                    return result ? ClickResult.ACCEPTED : ClickResult.REJECTED;
+                } else {
+                    ServerMessagePacket.send(player, EMessage.MESSAGE_BLOCK_NOT_CONNECTABLE);
+                    return ClickResult.REJECTED;
+                }
             }
-            return ClickResult.ACCEPTED;
-        } else if (senderEntity != null) {
-            selectSender(p, hand, pos);
-            return ClickResult.ACCEPTED;
-        }
-        return ClickResult.PASS;
-    }
-
-    private static <T extends BlockEntity> void connect(Class<T> clazz, World world, Vec3i pos, ItemStack connector, LoSPlayer p, Player.Hand hand) {
-
-        if (connector.is(CustomItems.ITEMCONNECTOR1)) {
-            return onClickBlockWithItemConnector1(p, world, hand, pos);
-        } else if (connector.is(CustomItems.ITEMCONNECTOR2)) {
-            return onClickBlockWithItemConnector2(p, world, hand, pos);
-        } else if (connector.is(CustomItems.ITEMCONNECTOR3)) {
-            return onClickBlockWithItemConnector3(p, world, hand, pos);
-        }
-
-        T blockEntity = world.getBlockEntity(pos, clazz);
-        if (blockEntity instanceof IConnectable) {
-            ((IConnectable) blockEntity).tryConnect(connector, 0, p, hand);
-        }
-    }
-
-    // Helper
 
-    public SignalContainer<?> getSignal(World world, Vec3i pos) {
-        world.keepLoaded(pos);
-        boolean isSignal = SignalContainer.isSignal(world, pos);
-        if (!isSignal)
-            return null;
-        return SignalContainer.of(world, pos);
-    }
-
-    public BlockSenderStorageEntity getSender(World world, Vec3i pos) {
-        world.keepLoaded(pos);
-        return world.getBlockEntity(pos, BlockSenderStorageEntity.class);
-    }
-
-    public void selectSignal(LoSPlayer player, Hand hand, Vec3i pos) {
-
-        if (player.getWorld().isServer) {
-            ItemStack stack = new ItemStack(CustomItems.ITEMCONNECTOR3, 1);
-            stack.getTagCompound().setVec3i(SIGNALKEY, pos);
-            player.setHeldItem(hand, stack);
-            ServerMessagePacket.send(player, EMessage.MESSAGE_NEW_SIGNAL_SELECTED, "" + pos.x, "" + pos.y, "" + pos.z);
-
-        }
-    }
 
-    public void selectSender(LoSPlayer player, Hand hand, Vec3i pos) {
-        if (player.getWorld().isServer) {
-            ItemStack stack = new ItemStack(CustomItems.ITEMCONNECTOR2, 1);
-            stack.getTagCompound().setVec3i(SENDERKEY, pos);
-            player.setHeldItem(hand, stack);
-            ServerMessagePacket.send(player, EMessage.MESSAGE_NEW_SENDER_SELECTED, "" + pos.x, "" + pos.y, "" + pos.z);
-        }
-    }
-
-    public void connect(World world, Vec3i senderPos, Vec3i signalPos, boolean disconnect) {
-        if (world.isServer) {
-            BlockSenderStorageEntity sender = getSender(world, senderPos);
-            if (!disconnect) {
-                sender.signals.add(signalPos);
-            } else {
-                sender.signals.remove(signalPos);
-            }
-            sender.updateSignals();
-            sender.markDirty();
+        } else {
+            return ClickResult.REJECTED;
         }
     }
 
diff --git a/src/main/java/net/landofrails/stellwand/content/items/connector/ItemConnectorSender.java b/src/main/java/net/landofrails/stellwand/content/items/connector/ItemConnectorSender.java
index f1eefb8f..f921a99c 100644
--- a/src/main/java/net/landofrails/stellwand/content/items/connector/ItemConnectorSender.java
+++ b/src/main/java/net/landofrails/stellwand/content/items/connector/ItemConnectorSender.java
@@ -1,4 +1,88 @@
 package net.landofrails.stellwand.content.items.connector;
 
-public class ItemConnectorSender {
+import cam72cam.mod.entity.Player;
+import cam72cam.mod.item.ItemStack;
+import cam72cam.mod.math.Vec3i;
+import cam72cam.mod.serialization.TagCompound;
+import cam72cam.mod.world.World;
+import net.landofrails.stellwand.content.entities.storage.BlockSenderStorageEntity;
+import net.landofrails.stellwand.content.items.CustomItems;
+import net.landofrails.stellwand.content.messages.EMessage;
+import net.landofrails.stellwand.content.network.ServerMessagePacket;
+import net.landofrails.stellwand.utils.compact.SignalContainer;
+
+public class ItemConnectorSender extends AItemConnector {
+    private static final long serialVersionUID = -7946475502287227609L;
+
+    protected static void register() {
+        AItemConnector.registerConnector(ItemConnectorSender.class, ItemConnectorSender::isConnectable);
+    }
+
+    public ItemConnectorSender() {
+        super();
+    }
+
+    public ItemConnectorSender(TagCompound tag) {
+        super(tag);
+    }
+
+    private static Boolean isConnectable(World world, Vec3i pos) {
+        return getSender(world, pos) != null;
+    }
+
+    @Override
+    protected boolean canConnect(World world, Vec3i pos) {
+        return SignalContainer.isSignal(world, pos);
+    }
+
+    @Override
+    protected Class<? extends AItemConnector> getImplementingClass() {
+        return ItemConnectorSender.class;
+    }
+
+    @Override
+    public boolean shouldOverrideConnector(World world, Vec3i pos) {
+        return isConnectable(world, pos);
+    }
+
+    @Override
+    protected boolean connect(World world, Vec3i pos, Player player, Player.Hand hand) {
+
+        if (getStartWorld() == null && getStartPos() == null) {
+
+            int count = player.getHeldItem(hand).getCount();
+            setStartWorld(world);
+            setStartPos(pos);
+            ItemStack newItemStack = new ItemStack(CustomItems.ITEMCONNECTOR2, count);
+            newItemStack.setTagCompound(this.toTag());
+            player.setHeldItem(hand, newItemStack);
+            ServerMessagePacket.send(player, EMessage.MESSAGE_NEW_SENDER_SELECTED, "" + pos.x, "" + pos.y, "" + pos.z);
+            return true;
+
+        } else if (world != null) {
+
+            if (getStartWorld().getId() == world.getId()) {
+                BlockSenderStorageEntity sender = getSender(getStartWorld(), getStartPos());
+                if (sender.isCompatible(getSignal(world, pos))) {
+                    if (!player.isCrouching()) {
+                        sender.signals.add(pos);
+                        ServerMessagePacket.send(player, EMessage.MESSAGE_SIGNAL_CONNECTED);
+                    } else {
+                        sender.signals.remove(pos);
+                        ServerMessagePacket.send(player, EMessage.MESSAGE_SIGNAL_DISCONNECTED);
+                    }
+                    sender.updateSignals();
+                    sender.markDirty();
+                    return true;
+                } else {
+                    ServerMessagePacket.send(player, EMessage.MESSAGE_SIGNALS_MUST_BE_EQUAL);
+                }
+            } else {
+                ServerMessagePacket.send(player, EMessage.MESSAGE_NOT_THE_SAME_WORLD);
+            }
+
+        }
+
+        return false;
+    }
 }
diff --git a/src/main/java/net/landofrails/stellwand/content/items/connector/ItemConnectorSignal.java b/src/main/java/net/landofrails/stellwand/content/items/connector/ItemConnectorSignal.java
index 2657b2c4..89de1951 100644
--- a/src/main/java/net/landofrails/stellwand/content/items/connector/ItemConnectorSignal.java
+++ b/src/main/java/net/landofrails/stellwand/content/items/connector/ItemConnectorSignal.java
@@ -1,15 +1,20 @@
 package net.landofrails.stellwand.content.items.connector;
 
 import cam72cam.mod.entity.Player;
+import cam72cam.mod.item.ItemStack;
 import cam72cam.mod.math.Vec3i;
 import cam72cam.mod.serialization.TagCompound;
 import cam72cam.mod.world.World;
+import net.landofrails.stellwand.content.entities.storage.BlockSenderStorageEntity;
+import net.landofrails.stellwand.content.items.CustomItems;
+import net.landofrails.stellwand.content.messages.EMessage;
+import net.landofrails.stellwand.content.network.ServerMessagePacket;
 import net.landofrails.stellwand.utils.compact.SignalContainer;
 
 public class ItemConnectorSignal extends AItemConnector {
     private static final long serialVersionUID = -7946475502287227609L;
 
-    static {
+    protected static void register() {
         AItemConnector.registerConnector(ItemConnectorSignal.class, ItemConnectorSignal::isConnectable);
     }
 
@@ -25,8 +30,59 @@ private static Boolean isConnectable(World world, Vec3i pos) {
         return SignalContainer.isSignal(world, pos);
     }
 
+    @Override
+    protected boolean canConnect(World world, Vec3i pos) {
+        return getSender(world, pos) != null;
+    }
+
+    @Override
+    protected Class<? extends AItemConnector> getImplementingClass() {
+        return ItemConnectorSignal.class;
+    }
+
+    @Override
+    public boolean shouldOverrideConnector(World world, Vec3i pos) {
+        return isConnectable(world, pos);
+    }
+
     @Override
     protected boolean connect(World world, Vec3i pos, Player player, Player.Hand hand) {
+
+        if (getStartWorld() == null && getStartPos() == null) {
+
+            int count = player.getHeldItem(hand).getCount();
+            setStartWorld(world);
+            setStartPos(pos);
+            ItemStack newItemStack = new ItemStack(CustomItems.ITEMCONNECTOR3, count);
+            newItemStack.setTagCompound(this.toTag());
+            player.setHeldItem(hand, newItemStack);
+            ServerMessagePacket.send(player, EMessage.MESSAGE_NEW_SIGNAL_SELECTED, "" + pos.x, "" + pos.y, "" + pos.z);
+            return true;
+
+        } else if (world != null) {
+
+            if (getStartWorld().getId() == world.getId()) {
+                BlockSenderStorageEntity sender = getSender(world, pos);
+                if (sender.isCompatible(getSignal(getStartWorld(), getStartPos()))) {
+                    if (!player.isCrouching()) {
+                        sender.signals.add(getStartPos());
+                        ServerMessagePacket.send(player, EMessage.MESSAGE_SIGNAL_CONNECTED);
+                    } else {
+                        sender.signals.remove(getStartPos());
+                        ServerMessagePacket.send(player, EMessage.MESSAGE_SIGNAL_DISCONNECTED);
+                    }
+                    sender.updateSignals();
+                    sender.markDirty();
+                    return true;
+                } else {
+                    ServerMessagePacket.send(player, EMessage.MESSAGE_SIGNALS_MUST_BE_EQUAL);
+                }
+            } else {
+                ServerMessagePacket.send(player, EMessage.MESSAGE_NOT_THE_SAME_WORLD);
+            }
+
+        }
+
         return false;
     }
 
diff --git a/src/main/java/net/landofrails/stellwand/content/messages/EMessage.java b/src/main/java/net/landofrails/stellwand/content/messages/EMessage.java
index 83432d02..048e8fed 100644
--- a/src/main/java/net/landofrails/stellwand/content/messages/EMessage.java
+++ b/src/main/java/net/landofrails/stellwand/content/messages/EMessage.java
@@ -20,6 +20,7 @@ public enum EMessage {
 	MESSAGE_NEW_SIGNAL_SELECTED("connector.newsignalselected"),
 	MESSAGE_NEW_SENDER_SELECTED("connector.newsenderselected"),
 	MESSAGE_BLOCK_NOT_CONNECTABLE("connector.blocknotconnectable"),
+    MESSAGE_NOT_THE_SAME_WORLD("connector.notthesameworld"),
 
 	// GUI
 	GUI_STELLWAND_SELECTSENDERMODES_GROUP("gui." + Stellwand.DOMAIN + ":selectsendermodes.group", true);
diff --git a/src/main/java/net/landofrails/stellwand/contentpacks/loader/StaticLoader.java b/src/main/java/net/landofrails/stellwand/contentpacks/loader/StaticLoader.java
index 64180671..1f351199 100644
--- a/src/main/java/net/landofrails/stellwand/contentpacks/loader/StaticLoader.java
+++ b/src/main/java/net/landofrails/stellwand/contentpacks/loader/StaticLoader.java
@@ -5,6 +5,9 @@
 import net.landofrails.stellwand.Stellwand;
 import net.landofrails.stellwand.contentpacks.Content;
 import net.landofrails.stellwand.contentpacks.entries.ContentPack;
+import net.landofrails.stellwand.contentpacks.entries.buttonreceiver.BlockReceiverEntry;
+import net.landofrails.stellwand.contentpacks.entries.buttonreceiver.BlockReceiverEntryBlock;
+import net.landofrails.stellwand.contentpacks.entries.buttonreceiver.BlockReceiverEntryItem;
 import net.landofrails.stellwand.contentpacks.entries.filler.BlockFillerEntry;
 import net.landofrails.stellwand.contentpacks.entries.filler.BlockFillerEntryBlock;
 import net.landofrails.stellwand.contentpacks.entries.filler.BlockFillerEntryItem;
@@ -12,9 +15,6 @@
 import net.landofrails.stellwand.contentpacks.entries.multisignal.BlockMultisignalEntryBlock;
 import net.landofrails.stellwand.contentpacks.entries.multisignal.BlockMultisignalEntryItem;
 import net.landofrails.stellwand.contentpacks.entries.parent.ContentPackEntry;
-import net.landofrails.stellwand.contentpacks.entries.buttonreceiver.BlockReceiverEntry;
-import net.landofrails.stellwand.contentpacks.entries.buttonreceiver.BlockReceiverEntryBlock;
-import net.landofrails.stellwand.contentpacks.entries.buttonreceiver.BlockReceiverEntryItem;
 import net.landofrails.stellwand.contentpacks.entries.sender.BlockSenderEntry;
 import net.landofrails.stellwand.contentpacks.entries.sender.BlockSenderEntryBlock;
 import net.landofrails.stellwand.contentpacks.entries.sender.BlockSenderEntryItem;
@@ -256,7 +256,7 @@ private static List<ContentPackEntry> getEntries() {
         // Blockreceiver
         prop = new Properties().setName("Blockreceiver");
         prop.setType(EntryType.BLOCKRECEIVER).setWallMountable(true);
-        prop.setModel("models/block/blockreceiver/blockreceiver/blockreceiver.obj");
+        prop.setModel("models/block/blockbuttonreceiver/blockbuttonreceiver/blockreceiver.obj");
         prop.setBlockTranslation(.5f, 0, .5f);
         prop.setItemMode("on").setItemTranslation(.5f, .1625f, .5f);
         contentPackEntries.add(prop.toEntry());
diff --git a/src/main/resources/assets/landofsignals/lang/de_DE.lang b/src/main/resources/assets/landofsignals/lang/de_DE.lang
index f9feb663..027ee800 100644
--- a/src/main/resources/assets/landofsignals/lang/de_DE.lang
+++ b/src/main/resources/assets/landofsignals/lang/de_DE.lang
@@ -34,7 +34,7 @@ item.landofsignals:stellwand.magnifyingglass.name=Lupe
 message.stellwand:sender.nosignalsconnected=Es ist noch kein Signal verbunden!
 message.stellwand:sender.modesset=Modes gesetzt!
 message.stellwand:sender.signalnotfound=Signal konnte nicht gefunden werden: %s
-message.stellwand:sender.error1=Ich weiß nicht wie, aber es ist weg.. [Surprised Pikachu hier einfügen]
+message.stellwand:sender.error1=Scheint als sei der Signalblock nicht mehr da..
 
 message.stellwand:connector.signaldisconnected=Signal entfernt!
 message.stellwand:connector.signalconnected=Signal verbunden!
@@ -42,5 +42,6 @@ message.stellwand:connector.sendersignalsmustbeequal=Du kannst nur Signale des g
 message.stellwand:connector.newsignalselected=Neues Signal ausgewählt! (%s, %s, %s)
 message.stellwand:connector.newsenderselected=Neuer Sender ausgewählt! (%s, %s, %s)
 message.stellwand:connector.blocknotconnectable=Dieser Block lässt sich nicht verbinden!
+message.stellwand:connector.notthesameworld=Blöcke aus unterschiedlichen Welten lassen sich nicht verbinden!
 
 gui.stellwand:selectsendermodes.group=Gruppe: %s
\ No newline at end of file
diff --git a/src/main/resources/assets/landofsignals/lang/en_US.lang b/src/main/resources/assets/landofsignals/lang/en_US.lang
index c7fa24b3..a78e51c9 100644
--- a/src/main/resources/assets/landofsignals/lang/en_US.lang
+++ b/src/main/resources/assets/landofsignals/lang/en_US.lang
@@ -34,7 +34,7 @@ item.landofsignals:stellwand.magnifyingglass.name=Magnifying glass
 message.stellwand:sender.nosignalsconnected=No signals connected yet!
 message.stellwand:sender.modesset=Modes set!
 message.stellwand:sender.signalnotfound=Signal couldn't be found: %s
-message.stellwand:sender.error1=I dont know how, but its missing.. [Insert surprised Pikachu here]
+message.stellwand:sender.error1=Seems like the signalblock does not exist anymore..
 
 message.stellwand:connector.signaldisconnected=Signal disconnected!
 message.stellwand:connector.signalconnected=Signal connected!
@@ -42,5 +42,6 @@ message.stellwand:connector.sendersignalsmustbeequal=You only can connect the sa
 message.stellwand:connector.newsignalselected=New signal selected! (%s, %s, %s)
 message.stellwand:connector.newsenderselected=New sender selected! (%s, %s, %s)
 message.stellwand:connector.blocknotconnectable=This block is not connectable!
+message.stellwand:connector.notthesameworld=Can't connect blocks between different worlds!
 
 gui.stellwand:selectsendermodes.group=Group: %s
\ No newline at end of file