Preserve pitch and yaw from player

(teleport not working and breaking leading to unexpected and undesired states)

src/main/java/eu/ruekov/ruakij/LinkedBeaconTeleporters/Function.java

@@ -7,10 +7,7 @@ import org.bukkit.World;
 import org.bukkit.block.Block;
 import org.bukkit.util.Vector;
 
-import java.util.Arrays;
+import java.util.*;
-import java.util.InvalidPropertiesFormatException;
-import java.util.List;
-import java.util.Random;
 
 public class Function {
     public static String serialiseBlockLocation(Location loc){
@@ -129,6 +126,9 @@ public class Function {
             Material.STONE_SLAB,
             Material.WARPED_SLAB
     );
+    public static Block searchForMaterial(Location startLoc, Vector searchDirection, Material searchMaterial){
+        return searchForMaterial(startLoc, searchDirection, searchMaterial, new ArrayList<>());
+    }
     public static Block searchForMaterial(Location startLoc, Vector searchDirection, Material searchMaterial, List<Material> ignoreMaterials){
         Location loc = new Location(startLoc.getWorld(), startLoc.getBlockX(), startLoc.getBlockY(), startLoc.getBlockZ());
         for(int i=0; loc.getBlockY()>=0 && loc.getBlockY()<=255; loc.add(searchDirection)){

src/main/java/eu/ruekov/ruakij/LinkedBeaconTeleporters/Main.java

@@ -25,8 +25,6 @@ public class Main extends JavaPlugin {
 
     public static Logger log;
 
-    public static LinkedBeaconTeleporterManager lbtManager;
-
     public void onEnable() {
         log = getLogger();
 
@@ -37,17 +35,20 @@ public class Main extends JavaPlugin {
         pluginManager.registerEvents(new OnBlockPlace(), this);
         pluginManager.registerEvents(new OnCraftItemEvent(), this);
 
-        CustomPlayerMoveEventHandler cpmHandler = new CustomPlayerMoveEventHandler(this, true);
-        cpmHandler.registerListener(new OnCustomPlayerMove());
-
         loadConfigs();
 
-        lbtManager = new LinkedBeaconTeleporterManager();
+        CustomPlayerMoveEventHandler cpmHandler = new CustomPlayerMoveEventHandler(this, config.getInt("locationCheck.interval"), true);
+        cpmHandler.registerListener(new OnCustomPlayerMove());
+
+        LinkedBeaconTeleporterManager.init();
+
+        initAutoSave();
 
         log.info("Plugin activated");
     }
 
     public void onDisable() {
+        saveData();
 
         log.info("Plugin deactivated");
     }
@@ -70,4 +71,31 @@ public class Main extends JavaPlugin {
             Bukkit.getPluginManager().disablePlugin(this);
         }
     }
+
+    public static void saveData(){
+        boolean lbtDataChanged = LinkedBeaconTeleporterManager.writeData();
+
+        // Only run save, when data changed
+        if(lbtDataChanged)
+            saveFiles();
+    }
+
+    public static void saveFiles() {
+        // data.yml
+        try{
+            File dataFile = new File("plugins/"+ plugin.getName() +"/data.yml");
+            data.save(dataFile);
+        }catch (Exception ex){
+            log.severe("Could not save data.yml!");
+            ex.printStackTrace();
+        }
+    }
+
+    static void initAutoSave(){
+        int autosaveInterval = config.getInt("config.interval")*20;
+        Bukkit.getScheduler().scheduleSyncRepeatingTask(plugin, () -> {
+            saveData();
+
+        }, autosaveInterval, autosaveInterval);
+    }
 }

src/main/java/eu/ruekov/ruakij/LinkedBeaconTeleporters/customPlayerMoveEvent/CustomPlayerMoveEvent.java

@@ -3,8 +3,6 @@ package eu.ruekov.ruakij.LinkedBeaconTeleporters.customPlayerMoveEvent;
 import org.bukkit.Location;
 import org.bukkit.entity.Player;
 
-import java.io.InvalidObjectException;
-
 public class CustomPlayerMoveEvent {
 
     Player p;

src/main/java/eu/ruekov/ruakij/LinkedBeaconTeleporters/customPlayerMoveEvent/CustomPlayerMoveEventHandler.java

@@ -17,16 +17,16 @@ public class CustomPlayerMoveEventHandler {
     HashMap<UUID, Location> oldPlayerLoc = new HashMap<>();
 
     boolean locationChangeOnBlockChange;
-    public CustomPlayerMoveEventHandler(Plugin plugin, boolean locationChangeOnBlockChange){
+    public CustomPlayerMoveEventHandler(Plugin plugin, int interval, boolean locationChangeOnBlockChange){
         this.locationChangeOnBlockChange = locationChangeOnBlockChange;
 
-        startRunnable(plugin);
+        startRunnable(plugin, interval);
     }
     public CustomPlayerMoveEventHandler(Plugin plugin){
-        this(plugin, false);
+        this(plugin, 5, false);
     }
 
-    void startRunnable(Plugin plugin){
+    void startRunnable(Plugin plugin, int interval){
 
         Bukkit.getScheduler().scheduleSyncRepeatingTask(plugin, () -> {
             // Dont do anything without listeners
@@ -52,7 +52,9 @@ public class CustomPlayerMoveEventHandler {
                         if(distance > 0)
                             locationChangeListeners(e);
                     }
-                    else
+                    else if(loc.getBlockX() != oldLoc.getBlockX() ||
+                            loc.getBlockY() != oldLoc.getBlockY() ||
+                            loc.getBlockZ() != oldLoc.getBlockZ())
                         locationChangeListeners(e);
                 }
 
@@ -62,7 +64,7 @@ public class CustomPlayerMoveEventHandler {
                 oldPlayerLoc.put(uuid, loc);
             }
 
-        }, 20, 10);
+        }, interval, interval);
     }
 
     boolean blockLocationChanged(Location loc, Location oldLoc){

src/main/java/eu/ruekov/ruakij/LinkedBeaconTeleporters/linkedBeaconTeleporter/LinkedBeaconTeleporter.java

@@ -1,24 +1,46 @@
 package eu.ruekov.ruakij.LinkedBeaconTeleporters.linkedBeaconTeleporter;
 
 import eu.ruekov.ruakij.LinkedBeaconTeleporters.Function;
+import eu.ruekov.ruakij.LinkedBeaconTeleporters.Main;
 import org.bukkit.Location;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * Describes a placed-beacon-teleporter in the world
  */
 public abstract class LinkedBeaconTeleporter {
+    static String id_alphabet = "abcdefghijklmnopqrstuvwxyz0123456789";
+    static int id_length = 10;
 
     // Persistent id for linked-beacons
     public String teleporterId;
 
+    // List of all linkedBeaconTeleporters with same teleporterId (real Type is usually ..Block, because linked Items are temporary constructs are useless)
+    protected List<LinkedBeaconTeleporter> linkedBeaconTeleporters = new ArrayList<>();
+
     LinkedBeaconTeleporter(){
-        this.teleporterId = Function.randomString("abcdefghijklmnopqrstuvwxyz0123456789", 10);
+        this.teleporterId = Function.randomString(id_alphabet, id_length);
+
+        linkedBeaconTeleporters = new ArrayList<>();
     }
     public LinkedBeaconTeleporter(String teleporterId){
         this.teleporterId = teleporterId;
+
+        // Check if id exists
+        linkedBeaconTeleporters = LinkedBeaconTeleporterManager.placedLBTsById.get(this.teleporterId());
+        if(linkedBeaconTeleporters == null){
+            // Create empty if not found
+            linkedBeaconTeleporters = new ArrayList<>();
+        }
     }
 
     public String teleporterId(){
         return teleporterId;
     }
+
+    public List<LinkedBeaconTeleporter> linkedBeaconTeleporters(){
+        return linkedBeaconTeleporters;
+    }
 }

src/main/java/eu/ruekov/ruakij/LinkedBeaconTeleporters/linkedBeaconTeleporter/LinkedBeaconTeleporterBlock.java

@@ -1,10 +1,11 @@
 package eu.ruekov.ruakij.LinkedBeaconTeleporters.linkedBeaconTeleporter;
 
+import eu.ruekov.ruakij.LinkedBeaconTeleporters.Function;
 import eu.ruekov.ruakij.LinkedBeaconTeleporters.Main;
+import org.bukkit.GameMode;
 import org.bukkit.Location;
 import org.bukkit.block.Block;
-import org.bukkit.block.BlockState;
+import org.bukkit.event.block.BlockBreakEvent;
-import org.bukkit.inventory.ItemStack;
 
 import java.util.List;
 
@@ -23,11 +24,56 @@ public class LinkedBeaconTeleporterBlock extends LinkedBeaconTeleporter {
     }
 
 
+    public LinkedBeaconTeleporterItem break_(BlockBreakEvent e){
+        Location loc = this.block().getLocation();
+
+        // Dont drop anything
+        e.setDropItems(false);
+        e.setExpToDrop(0);
+
+        // Notify Player when link was destroyed
+        if(this.linkedBeaconTeleporters.size() == 2){
+            e.getPlayer().sendMessage("§cConnection to Teleporter with id §7"+ this.teleporterId +" §e("+
+                    (int)((LinkedBeaconTeleporterBlock)this.linkedBeaconTeleporters.get(0)).block.getLocation().distance(
+                            ((LinkedBeaconTeleporterBlock)this.linkedBeaconTeleporters.get(1)).block().getLocation()
+                    )
+                    +" Blocks away) §cdestroyed");
+        }
+
+        // Remove from list
+        this.linkedBeaconTeleporters.remove(this);
+
+        if(this.linkedBeaconTeleporters.size() == 0){
+            // List empty, delete from placedLBTsById
+            LinkedBeaconTeleporterManager.placedLBTsById.remove(
+                    this.teleporterId
+            );
+        }
+
+        // Remove from loc
+        LinkedBeaconTeleporterManager.placedLBTByLoc.remove(
+                Function.serialiseBlockLocation(loc)
+        );
+
+        // Item from block
+        LinkedBeaconTeleporterItem lbtItem = new LinkedBeaconTeleporterItem(this.teleporterId());
+
+        // Drop custom-item
+        if(e.getPlayer().getGameMode() != GameMode.CREATIVE)
+            loc.getWorld().dropItemNaturally(
+                    loc.add(0.5, 0, 0.5),
+                    lbtItem.item()
+            );
+
+        return lbtItem;
+    }
+
+
     // Conversion methods
     public static LinkedBeaconTeleporterBlock getFromLocation(Location loc){
-        return Main.lbtManager.getLbtBlockFromLocation(loc);
+        return LinkedBeaconTeleporterManager.getLbtBlockFromLocation(loc);
     }
-    public static List<LinkedBeaconTeleporterBlock> getListFromTeleportId(String teleportId){
+    public static List<LinkedBeaconTeleporter> getListFromTeleportId(String teleportId){
-        return Main.lbtManager.getLbtBlocksFromTeleportId(teleportId);
+        return LinkedBeaconTeleporterManager.getLbtBlocksFromTeleportId(teleportId);
     }
 }

src/main/java/eu/ruekov/ruakij/LinkedBeaconTeleporters/linkedBeaconTeleporter/LinkedBeaconTeleporterItem.java

@@ -1,10 +1,17 @@
 package eu.ruekov.ruakij.LinkedBeaconTeleporters.linkedBeaconTeleporter;
 
+import eu.ruekov.ruakij.LinkedBeaconTeleporters.Function;
 import eu.ruekov.ruakij.LinkedBeaconTeleporters.Main;
+import org.bukkit.GameMode;
+import org.bukkit.Location;
 import org.bukkit.Material;
+import org.bukkit.block.Block;
+import org.bukkit.event.block.BlockBreakEvent;
+import org.bukkit.event.block.BlockPlaceEvent;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -17,7 +24,7 @@ public class LinkedBeaconTeleporterItem extends LinkedBeaconTeleporter {
         // Create a new LinkedBeaconTeleporter
         super();
 
-        this.item = Main.lbtManager.getItemStackFromData(this.teleporterId);
+        this.item = LinkedBeaconTeleporterManager.getItemStackFromData(this.teleporterId);
     }
     public LinkedBeaconTeleporterItem(String teleporterId, ItemStack item) {
         super(teleporterId);
@@ -27,7 +34,7 @@ public class LinkedBeaconTeleporterItem extends LinkedBeaconTeleporter {
     public LinkedBeaconTeleporterItem(String teleporterId){
         super(teleporterId);
 
-        this.item = Main.lbtManager.getItemStackFromData(teleporterId);
+        this.item = LinkedBeaconTeleporterManager.getItemStackFromData(teleporterId);
     }
 
     public ItemStack item(){
@@ -35,8 +42,56 @@ public class LinkedBeaconTeleporterItem extends LinkedBeaconTeleporter {
     }
 
 
+    public LinkedBeaconTeleporterBlock place(BlockPlaceEvent e){
+        // Deny placing when 2 LinkedBeaconTeleporter's are already placed
+        if(this.linkedBeaconTeleporters.size() == 2){
+            e.getPlayer().sendMessage("§cMaximum-Amount §7(2) §cof §6LinkedBeaconTeleporters §cwith id §7"+ this.teleporterId +" §care already placed");
+
+            e.setCancelled(true);
+            return null;
+        }
+
+        Block block = e.getBlock();
+        Location loc = block.getLocation();
+
+        // Block from item
+        LinkedBeaconTeleporterBlock lbtBlock = new LinkedBeaconTeleporterBlock(this.teleporterId(), block);
+        // Both objects have different lists (as both are new), overwrite block-list with item-list
+        // FIXME: This seems like a bad design.. maybe only create the list when necessary? (e.g. keep null if no linked objects found)
+        lbtBlock.linkedBeaconTeleporters = this.linkedBeaconTeleporters;
+
+        // Add to list
+        this.linkedBeaconTeleporters.add(lbtBlock);
+
+        // Add to id if not exists
+        if(!LinkedBeaconTeleporterManager.placedLBTsById.containsKey(this.teleporterId))
+            LinkedBeaconTeleporterManager.placedLBTsById.put(this.teleporterId, this.linkedBeaconTeleporters);
+
+        // Add to location
+        LinkedBeaconTeleporterManager.placedLBTByLoc.put(
+                Function.serialiseBlockLocation(loc),
+                lbtBlock
+        );
+
+        // Notify Player when no other teleporter was found (yet?)
+        if(this.linkedBeaconTeleporters.size() == 1){
+            e.getPlayer().sendMessage("§6No other Teleporter found with with id §7"+ this.teleporterId);
+        }
+        // Notify Player when we have a full link
+        else if(this.linkedBeaconTeleporters.size() == 2){
+            e.getPlayer().sendMessage("§aConnected to Teleporter with id §7"+ this.teleporterId +" §e("+
+                    (int)((LinkedBeaconTeleporterBlock)this.linkedBeaconTeleporters.get(0)).block.getLocation().distance(
+                            ((LinkedBeaconTeleporterBlock)this.linkedBeaconTeleporters.get(1)).block().getLocation()
+                    )
+                    +" Blocks away)");
+        }
+
+        return lbtBlock;
+    }
+
+
     // Conversion methods
     public static LinkedBeaconTeleporterItem getFromItemStack(ItemStack itemStack){
-        return Main.lbtManager.getLbtItemFromItemStack(itemStack);
+        return LinkedBeaconTeleporterManager.getLbtItemFromItemStack(itemStack);
     }
 }

src/main/java/eu/ruekov/ruakij/LinkedBeaconTeleporters/linkedBeaconTeleporter/LinkedBeaconTeleporterManager.java

@@ -7,7 +7,7 @@ import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.NamespacedKey;
 import org.bukkit.block.Block;
-import org.bukkit.configuration.ConfigurationSection;
+import org.bukkit.configuration.file.YamlConfiguration;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.ShapelessRecipe;
 import org.bukkit.inventory.meta.ItemMeta;
@@ -19,13 +19,13 @@ import java.util.regex.Pattern;
 public class LinkedBeaconTeleporterManager {
     // Stores all placed Beacon-Teleporters for fast access
     // TODO: Evaluate necessity of 2 HashMaps with main reason of performance
-    HashMap<String, List<LinkedBeaconTeleporterBlock>> linkedBeaconTeleporterById = new HashMap();
+    public static HashMap<String, List<LinkedBeaconTeleporter>> placedLBTsById = new HashMap();
-    HashMap<String, LinkedBeaconTeleporterBlock> linkedBeaconTeleporterByLoc = new HashMap();
+    public static HashMap<String, LinkedBeaconTeleporterBlock> placedLBTByLoc = new HashMap();
 
     // Regex to match item-name&lore and extract id (group 1)
-    String regex;
+    static String regex;
 
-    public LinkedBeaconTeleporterManager(){
+    public static void init(){
         Main.log.info("Loading LinkedBeaconTeleporter from config..");
 
         // Construct search item-regex
@@ -34,26 +34,28 @@ public class LinkedBeaconTeleporterManager {
                 Main.config.getStringList("item.lore")
         );
 
+        // Load settings
+        LinkedBeaconTeleporter.id_alphabet = Main.config.getString("id.alphabet");
+        LinkedBeaconTeleporter.id_length = Main.config.getInt("id.length");
+
         // Construct & add crafting-receipes
        constructAndAddRecipes();
 
         // Load teleporters
         for(String teleporterId : Main.data.getKeys(false)){
-            ConfigurationSection teleportersData = Main.data.getConfigurationSection(teleporterId);
+            List<String> serialisedLocs = Main.data.getStringList(teleporterId);
 
             // New list for this id
-            ArrayList<LinkedBeaconTeleporterBlock> lbtBlocks = new ArrayList();
+            List<LinkedBeaconTeleporter> linkedBeaconTeleporters = new ArrayList();
 
-            for(String blockId : teleportersData.getKeys(false)) {
+            for(String serializedLoc : serialisedLocs) {
-                ConfigurationSection teleporterData = teleportersData.getConfigurationSection(blockId);
 
                 // Load location
-                String serializedLoc = teleporterData.getString("loc");
                 Location loc;
                 try {
-                    loc = Function.deserializeBlockLocation(teleporterData.getString("loc"));
+                    loc = Function.deserializeBlockLocation(serializedLoc);
                 } catch (InvalidPropertiesFormatException e) {
-                    Main.log.severe("Could not load location='"+ serializedLoc +"' from "+ teleporterId +" > "+ blockId);
+                    Main.log.severe("Could not load location='"+ serializedLoc +"' from "+ teleporterId);
                     continue;
                 }
 
@@ -61,68 +63,61 @@ public class LinkedBeaconTeleporterManager {
                 Block block = loc.getBlock();
                 if(block.getType() != Material.BEACON){
                     // Data out of sync! Skipping
-                    Main.log.warning(teleporterId +" > "+ blockId +" at location "+ serializedLoc +" changed and is no longer LinkedBlockTeleporter! (Changed without the plugin running?)");
+                    Main.log.warning(teleporterId +" at location "+ serializedLoc +" changed and is no longer LinkedBlockTeleporter! (Changed without the plugin running?)");
                     continue;
                 }
 
                 // Construct block
                 LinkedBeaconTeleporterBlock lbtBlock = new LinkedBeaconTeleporterBlock(teleporterId, block);
+                // Write reference of list
+                lbtBlock.linkedBeaconTeleporters = linkedBeaconTeleporters;
 
-                // Add block to id-list
+                // Write block to list
-                lbtBlocks.add(lbtBlock);
+                linkedBeaconTeleporters.add(lbtBlock);
-
                 // Save to loc-list
-                linkedBeaconTeleporterByLoc.put(serializedLoc, lbtBlock);
+                placedLBTByLoc.put(serializedLoc, lbtBlock);
             }
 
             // Save list to id-list
-            linkedBeaconTeleporterById.put(teleporterId, lbtBlocks);
+            placedLBTsById.put(teleporterId, linkedBeaconTeleporters);
         }
 
+        Main.saveData();
+
         Main.log.info("All done!");
     }
 
-    public LinkedBeaconTeleporterBlock placeLbtItem(LinkedBeaconTeleporterItem lbtItem, Block block){
+    static int oldDataHashCode;
-        // Check if id already exists
+    public static boolean writeData(){
-        List<LinkedBeaconTeleporterBlock> lbtBlocks = linkedBeaconTeleporterById.get(lbtItem.teleporterId());
+        // Check if data changed
-        if(lbtBlocks == null){
+        int dataHashCode = placedLBTsById.hashCode();
-            // Create empty if not found
+        if(oldDataHashCode != dataHashCode){
-            lbtBlocks = new ArrayList<>();
+            // Changed
-            linkedBeaconTeleporterById.put(lbtItem.teleporterId(), lbtBlocks);
+            oldDataHashCode = dataHashCode;
         }
+        else // Did not change
+            return false;
 
-        // Block from item
+        Main.data = new YamlConfiguration();
-        LinkedBeaconTeleporterBlock lbtBlock = new LinkedBeaconTeleporterBlock(lbtItem.teleporterId(), block);
+        for(String teleporterId : placedLBTsById.keySet()){
+            List<LinkedBeaconTeleporter> LBTs = placedLBTsById.get(teleporterId);
 
-        // Add to list
+            // Generate clean array with data we want
-        lbtBlocks.add(lbtBlock);
+            List<String> dataList = new ArrayList<>();
-        // Add to location
+            for(LinkedBeaconTeleporter lbt : LBTs){
-        linkedBeaconTeleporterByLoc.put(
+                dataList.add(
-                Function.serialiseBlockLocation(block.getLocation()),
+                        Function.serialiseBlockLocation(
-                lbtBlock
+                                ((LinkedBeaconTeleporterBlock)lbt).block().getLocation()
-        );
+                        )
+                );
+            }
 
-        return lbtBlock;
+            Main.data.set(teleporterId, dataList);
+        }
+        return true;
     }
 
-    public LinkedBeaconTeleporterItem breakLbtBlock(LinkedBeaconTeleporterBlock lbtBlock){
+    static void constructAndAddRecipes(){
-        // Get list by id
-        List<LinkedBeaconTeleporterBlock> lbtBlocks = linkedBeaconTeleporterById.get(lbtBlock.teleporterId());
-
-        // Remove from list
-        lbtBlocks.remove(lbtBlock);
-        // Remove from location
-        linkedBeaconTeleporterByLoc.remove(
-                Function.serialiseBlockLocation(lbtBlock.block().getLocation())
-        );
-
-        // Item from block
-        LinkedBeaconTeleporterItem lbtItem = new LinkedBeaconTeleporterItem(lbtBlock.teleporterId());
-
-        return lbtItem;
-    }
-
-    void constructAndAddRecipes(){
         // Create result-item
         ItemStack item = getItemStackFromData("-");
         item.setAmount(2);
@@ -144,7 +139,7 @@ public class LinkedBeaconTeleporterManager {
     }
 
     // Conversion-methods
-    public ItemStack getItemStackFromData(String teleporterId){
+    public static ItemStack getItemStackFromData(String teleporterId){
         ItemStack item = new ItemStack(Material.BEACON);
         ItemMeta itemMeta = item.getItemMeta();
 
@@ -168,7 +163,7 @@ public class LinkedBeaconTeleporterManager {
 
         return item;
     }
-    public LinkedBeaconTeleporterItem getLbtItemFromItemStack(ItemStack itemStack){
+    public static LinkedBeaconTeleporterItem getLbtItemFromItemStack(ItemStack itemStack){
         ItemMeta itemMeta = itemStack.getItemMeta();
 
         // Serialize
@@ -192,17 +187,17 @@ public class LinkedBeaconTeleporterManager {
         return lbtItem;
     }
 
-    public LinkedBeaconTeleporterBlock getLbtBlockFromLocation(Location loc){
+    public static LinkedBeaconTeleporterBlock getLbtBlockFromLocation(Location loc){
         // Serialize
         String serializedLoc = Function.serialiseBlockLocation(loc);
 
-        return linkedBeaconTeleporterByLoc.get(serializedLoc);
+        return placedLBTByLoc.get(serializedLoc);
     }
-    public List<LinkedBeaconTeleporterBlock> getLbtBlocksFromTeleportId(String teleportId){
+    public static List<LinkedBeaconTeleporter> getLbtBlocksFromTeleportId(String teleportId){
-        return linkedBeaconTeleporterById.get(teleportId);
+        return placedLBTsById.get(teleportId);
     }
 
-    String constructRegex(String name, List<String> lore){
+    static String constructRegex(String name, List<String> lore){
         // Serialize
         String regex = serialiseBeaconItem(name, lore);
 
@@ -216,7 +211,7 @@ public class LinkedBeaconTeleporterManager {
 
         return regex;
     }
-    String serialiseBeaconItem(String name, List<String> lore){
+    static String serialiseBeaconItem(String name, List<String> lore){
         // get name and remove control-chars
         String str = name.replace("\\", "\\\\");
         if(lore != null){

src/main/java/eu/ruekov/ruakij/LinkedBeaconTeleporters/listener/OnBlockBreak.java

@@ -26,18 +26,7 @@ public class OnBlockBreak implements Listener {
             // Ignore if not found
             if(lbtBlock == null) return;
 
-            LinkedBeaconTeleporterItem lbtItem = Main.lbtManager.breakLbtBlock(lbtBlock);
+            LinkedBeaconTeleporterItem lbtItem = lbtBlock.break_(e);
-
-            // Dont drop anything
-            e.setDropItems(false);
-            e.setExpToDrop(0);
-
-            // Drop custom-item
-            if(e.getPlayer().getGameMode() != GameMode.CREATIVE)
-                lbtBlock.block().getLocation().getWorld().dropItemNaturally(
-                        lbtBlock.block().getLocation(),
-                        lbtItem.item()
-                );
         }
     }
 }

src/main/java/eu/ruekov/ruakij/LinkedBeaconTeleporters/listener/OnBlockPlace.java

@@ -25,8 +25,7 @@ public class OnBlockPlace implements Listener {
             // Ignore if not found
             if(lbtItem == null) return;
 
-            Block block = e.getBlock();
+            LinkedBeaconTeleporterBlock lbtBlock = lbtItem.place(e);
-            LinkedBeaconTeleporterBlock lbtBlock = Main.lbtManager.placeLbtItem(lbtItem, block);
         }
     }
 }

src/main/java/eu/ruekov/ruakij/LinkedBeaconTeleporters/listener/OnCraftItemEvent.java

@@ -2,6 +2,7 @@ package eu.ruekov.ruakij.LinkedBeaconTeleporters.listener;
 
 import eu.ruekov.ruakij.LinkedBeaconTeleporters.Main;
 import eu.ruekov.ruakij.LinkedBeaconTeleporters.linkedBeaconTeleporter.LinkedBeaconTeleporterItem;
+import eu.ruekov.ruakij.LinkedBeaconTeleporters.linkedBeaconTeleporter.LinkedBeaconTeleporterManager;
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
 import org.bukkit.event.EventHandler;
@@ -21,7 +22,7 @@ public class OnCraftItemEvent implements Listener {
         ItemStack itemResult = recipe.getResult();
 
         // Check if it has LinkedBeaconTeleporter-Data
-        LinkedBeaconTeleporterItem lbtItem = Main.lbtManager.getLbtItemFromItemStack(itemResult);
+        LinkedBeaconTeleporterItem lbtItem = LinkedBeaconTeleporterManager.getLbtItemFromItemStack(itemResult);
 
         // Ignore if not found
         if(lbtItem == null) return;

src/main/java/eu/ruekov/ruakij/LinkedBeaconTeleporters/listener/OnCustomPlayerMove.java

@@ -4,7 +4,10 @@ import eu.ruekov.ruakij.LinkedBeaconTeleporters.Function;
 import eu.ruekov.ruakij.LinkedBeaconTeleporters.Main;
 import eu.ruekov.ruakij.LinkedBeaconTeleporters.customPlayerMoveEvent.CustomPlayerMoveEvent;
 import eu.ruekov.ruakij.LinkedBeaconTeleporters.customPlayerMoveEvent.CustomPlayerMoveEventListener;
+import eu.ruekov.ruakij.LinkedBeaconTeleporters.linkedBeaconTeleporter.LinkedBeaconTeleporter;
 import eu.ruekov.ruakij.LinkedBeaconTeleporters.linkedBeaconTeleporter.LinkedBeaconTeleporterBlock;
+import eu.ruekov.ruakij.LinkedBeaconTeleporters.linkedBeaconTeleporter.LinkedBeaconTeleporterManager;
+import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
 import org.bukkit.entity.Player;
@@ -28,9 +31,18 @@ public class OnCustomPlayerMove implements CustomPlayerMoveEventListener {
         Player p = e.player();
         UUID uuid = p.getUniqueId();
 
-        // If player found in ignoreList, remove
+        // If player found in ignoreList, check if he stepped out of the Beacon-light
-        if(playerBeaconLocation.containsKey(uuid))
+        if(playerBeaconLocation.containsKey(uuid)) {
-            playerBeaconLocation.remove(uuid);
+            LinkedBeaconTeleporterBlock lbtBlock = playerBeaconLocation.get(uuid);
+            Location lbtBlockLoc = lbtBlock.block().getLocation();
+            Location pLoc = p.getLocation();
+            if(lbtBlockLoc.getBlockX() != pLoc.getBlockX() || lbtBlockLoc.getBlockZ() != pLoc.getBlockZ()){
+                playerBeaconLocation.remove(uuid);
+            }
+            else
+                // Player still on beacon, ignore
+                return;
+        }
 
         // Check if player is on-top of a beacon
         Block block = Function.searchForMaterial(
@@ -46,7 +58,7 @@ public class OnCustomPlayerMove implements CustomPlayerMoveEventListener {
         // TODO: Check if beacon is active
 
         // Check if beacon is a LinkedBeaconTeleporter
-        LinkedBeaconTeleporterBlock lbtBlock = Main.lbtManager.getLbtBlockFromLocation(block.getLocation());
+        LinkedBeaconTeleporterBlock lbtBlock = LinkedBeaconTeleporterManager.getLbtBlockFromLocation(block.getLocation());
 
         // Ignore if not found
         if(lbtBlock == null) return;
@@ -54,28 +66,53 @@ public class OnCustomPlayerMove implements CustomPlayerMoveEventListener {
         // Check if player should be ignored on this LinkedBeaconTeleporter
         if(playerBeaconLocation.get(uuid) != null && playerBeaconLocation.get(uuid) == lbtBlock) return;
 
-        // Find partnering Beacon
-        List<LinkedBeaconTeleporterBlock> lbtBlocks = Main.lbtManager.getLbtBlocksFromTeleportId(lbtBlock.teleporterId());
-        if(lbtBlocks == null) return;
-
         // Get first partner thats not our current-block
         LinkedBeaconTeleporterBlock lbtBlockPartner = null;
-        for(LinkedBeaconTeleporterBlock lbtBlockTmp: lbtBlocks){
+        for(LinkedBeaconTeleporter lbtBlockTmp: lbtBlock.linkedBeaconTeleporters()){
-            if(lbtBlockTmp != lbtBlocks){
+            if(lbtBlockTmp != lbtBlock){
-                lbtBlockPartner = lbtBlockTmp;
+                lbtBlockPartner = (LinkedBeaconTeleporterBlock)lbtBlockTmp;
                 break;
             }
         }
         if(lbtBlockPartner == null){
             // No other partner
+            p.sendMessage("§cNo linked beacon found with id §7"+ lbtBlock.teleporterId());
+
+            // Set player as ignored on this LinkedBeaconTeleporter (so he wont trigger the checks again)
+            playerBeaconLocation.put(uuid, lbtBlock);
         }
         else{
+            // TODO: Check if beacon is active
+
+            // Get safe-location on top of other beacon
+            Block safeBlock = Function.searchForMaterial(
+                    lbtBlockPartner.block().getLocation().add(0, 1, 0),
+                    new Vector(0, 1, 0),
+                    Material.AIR,
+                    Function.transparentMaterials
+            );
+
+            if(safeBlock == null){
+                // No safe location found
+                p.sendMessage("§cNo safe-location found at target teleporter");
+                playerBeaconLocation.put(uuid, lbtBlock);
+                return;
+            }
+            // TODO: Check if there is enough space for a player
+
             // Set player as ignored on target-LinkedBeaconTeleporter (so he wont trigger the teleport again)
             playerBeaconLocation.put(uuid, lbtBlockPartner);
 
             // Teleport
+            Location loc = safeBlock.getLocation();
+            // Middle of block
+            loc.add(0.5, 0, 0.5);
+            // Preserve pitch and yaw from player
+            loc.setPitch(p.getLocation().getPitch());
+            loc.setYaw(p.getLocation().getYaw());
+
             e.player().teleport(
-                    lbtBlockPartner.block().getLocation().add(0, 1, 0)
+                loc
             );
         }
     }

src/main/resources/config.yml

@@ -1,7 +1,28 @@
 
-item:  # TODO
+item:
   # Name & Lore for linked-beacon-blocks
   # - Has to include %id% somewhere for identification!
   name: '§9BeaconTeleporter'
   lore:
-    - '§8§o%id%'
+    - '§8§o%id%'
+
+beacon:
+  # Checks that have to succeed for a teleporter to be active (source and target)
+  checks: # TODO
+    active: true
+
+id:
+  # Alphabet to use for random-generation
+  alphabet: 'abcdefghijklmnopqrstuvwxyz0123456789'
+  # Length of id
+  #  If its too short, ids will "collide" more often (e.g. 2 players generating same linked-teleporters independently), but maybe thats a gameplay-feature for you :)
+  length: 10
+
+locationCheck:
+  # Interval [in ticks] to check if a player is on a beacon
+  #  5 (= 4 times/s) is usually responsive enough for most interactions
+  interval: 5
+
+autosave:
+  # Interval [in seconds] for autosave
+  interval: 600