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

@@ -2,12 +2,12 @@ package eu.ruekov.ruakij.LinkedBeaconTeleporters;
 
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
+import org.bukkit.Material;
 import org.bukkit.World;
+import org.bukkit.block.Block;
+import org.bukkit.util.Vector;
 
-import java.util.InvalidPropertiesFormatException;
-import java.util.List;
-import java.util.Map;
-import java.util.Random;
+import java.util.*;
 
 public class Function {
     public static String serialiseBlockLocation(Location loc){
@@ -38,4 +38,118 @@ public class Function {
         }
         return str;
     }
+
+    public static List<Material> transparentMaterials = Arrays.asList(
+            Material.AIR,
+            Material.GLASS,
+            Material.GLASS_PANE,
+            Material.BLACK_STAINED_GLASS,
+            Material.BLACK_STAINED_GLASS_PANE,
+            Material.BLUE_STAINED_GLASS,
+            Material.BLUE_STAINED_GLASS_PANE,
+            Material.BROWN_STAINED_GLASS,
+            Material.BROWN_STAINED_GLASS_PANE,
+            Material.CYAN_STAINED_GLASS,
+            Material.CYAN_STAINED_GLASS_PANE,
+            Material.GRAY_STAINED_GLASS,
+            Material.GRAY_STAINED_GLASS_PANE,
+            Material.GREEN_STAINED_GLASS,
+            Material.GREEN_STAINED_GLASS_PANE,
+            Material.LIGHT_BLUE_STAINED_GLASS,
+            Material.LIGHT_BLUE_STAINED_GLASS_PANE,
+            Material.LIGHT_GRAY_STAINED_GLASS,
+            Material.LIGHT_GRAY_STAINED_GLASS_PANE,
+            Material.LIME_STAINED_GLASS,
+            Material.LIME_STAINED_GLASS_PANE,
+            Material.MAGENTA_STAINED_GLASS,
+            Material.MAGENTA_STAINED_GLASS_PANE,
+            Material.ORANGE_STAINED_GLASS,
+            Material.ORANGE_STAINED_GLASS_PANE,
+            Material.PINK_STAINED_GLASS,
+            Material.PINK_STAINED_GLASS_PANE,
+            Material.PURPLE_STAINED_GLASS,
+            Material.PURPLE_STAINED_GLASS_PANE,
+            Material.RED_STAINED_GLASS,
+            Material.RED_STAINED_GLASS_PANE,
+            Material.WHITE_STAINED_GLASS,
+            Material.WHITE_STAINED_GLASS_PANE,
+            Material.YELLOW_STAINED_GLASS,
+            Material.YELLOW_STAINED_GLASS_PANE,
+            Material.PISTON,
+            Material.PISTON_HEAD,
+            Material.MOVING_PISTON,
+            Material.STICKY_PISTON,
+            Material.ACACIA_LEAVES,
+            Material.BIRCH_LEAVES,
+            Material.DARK_OAK_LEAVES,
+            Material.JUNGLE_LEAVES,
+            Material.OAK_LEAVES,
+            Material.SPRUCE_LEAVES,
+            Material.ACACIA_SLAB,
+            Material.ANDESITE_SLAB,
+            Material.BIRCH_SLAB,
+            Material.BLACKSTONE_SLAB,
+            Material.BRICK_SLAB,
+            Material.COBBLESTONE_SLAB,
+            Material.CRIMSON_SLAB,
+            Material.CUT_RED_SANDSTONE_SLAB,
+            Material.CUT_SANDSTONE_SLAB,
+            Material.DARK_OAK_SLAB,
+            Material.DARK_PRISMARINE_SLAB,
+            Material.DIORITE_SLAB,
+            Material.END_STONE_BRICK_SLAB,
+            Material.GRANITE_SLAB,
+            Material.JUNGLE_SLAB,
+            Material.MOSSY_COBBLESTONE_SLAB,
+            Material.MOSSY_STONE_BRICK_SLAB,
+            Material.NETHER_BRICK_SLAB,
+            Material.OAK_SLAB,
+            Material.PETRIFIED_OAK_SLAB,
+            Material.POLISHED_ANDESITE_SLAB,
+            Material.POLISHED_BLACKSTONE_BRICK_SLAB,
+            Material.POLISHED_BLACKSTONE_SLAB,
+            Material.POLISHED_DIORITE_SLAB,
+            Material.POLISHED_GRANITE_SLAB,
+            Material.PRISMARINE_BRICK_SLAB,
+            Material.PRISMARINE_SLAB,
+            Material.PURPUR_SLAB,
+            Material.QUARTZ_SLAB,
+            Material.RED_NETHER_BRICK_SLAB,
+            Material.RED_SANDSTONE_SLAB,
+            Material.SANDSTONE_SLAB,
+            Material.SMOOTH_QUARTZ_SLAB,
+            Material.SMOOTH_RED_SANDSTONE_SLAB,
+            Material.SMOOTH_SANDSTONE_SLAB,
+            Material.SMOOTH_STONE_SLAB,
+            Material.SPRUCE_SLAB,
+            Material.STONE_BRICK_SLAB,
+            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)){
+            Block block = loc.getBlock();
+
+            // Check for correct material
+            if(block.getType() == searchMaterial) return block;
+
+            // Check for non-ignore-block
+            boolean found = false;
+            for(Material ignoreMaterial : ignoreMaterials){
+                if(block.getType() == ignoreMaterial){
+                    found = true;
+                    break;
+                }
+            }
+            // If not found, searchMaterial not found
+            if(!found) return null;
+        }
+
+        // Reached 0 or 255, searchMaterial not found
+        return null;
+    }
 }

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

@@ -1,9 +1,11 @@
 package eu.ruekov.ruakij.LinkedBeaconTeleporters;
 
+import eu.ruekov.ruakij.LinkedBeaconTeleporters.customPlayerMoveEvent.CustomPlayerMoveEventHandler;
 import eu.ruekov.ruakij.LinkedBeaconTeleporters.linkedBeaconTeleporter.LinkedBeaconTeleporterManager;
 import eu.ruekov.ruakij.LinkedBeaconTeleporters.listener.OnBlockBreak;
 import eu.ruekov.ruakij.LinkedBeaconTeleporters.listener.OnBlockPlace;
-import eu.ruekov.ruakij.LinkedBeaconTeleporters.listener.OnPrepareItemCraftEvent;
+import eu.ruekov.ruakij.LinkedBeaconTeleporters.listener.OnCraftItemEvent;
+import eu.ruekov.ruakij.LinkedBeaconTeleporters.listener.OnCustomPlayerMove;
 import org.bukkit.Bukkit;
 import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.configuration.file.YamlConfiguration;
@@ -23,8 +25,6 @@ public class Main extends JavaPlugin {
 
     public static Logger log;
 
-    public static LinkedBeaconTeleporterManager lbtManager;
-
     public void onEnable() {
         log = getLogger();
 
@@ -33,16 +33,22 @@ public class Main extends JavaPlugin {
         PluginManager pluginManager = Bukkit.getPluginManager();
         pluginManager.registerEvents(new OnBlockBreak(), this);
         pluginManager.registerEvents(new OnBlockPlace(), this);
-        pluginManager.registerEvents(new OnPrepareItemCraftEvent(), this);
+        pluginManager.registerEvents(new OnCraftItemEvent(), this);
 
         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");
     }
@@ -65,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

@@ -0,0 +1,33 @@
+package eu.ruekov.ruakij.LinkedBeaconTeleporters.customPlayerMoveEvent;
+
+import org.bukkit.Location;
+import org.bukkit.entity.Player;
+
+public class CustomPlayerMoveEvent {
+
+    Player p;
+    Location loc;
+    Location oldLoc;
+    protected double distance;
+    public CustomPlayerMoveEvent(Player p, Location loc, Location oldLoc){
+        this.p = p;
+        this.loc = loc;
+        this.oldLoc = oldLoc;
+    }
+
+    public Player player(){
+        return p;
+    }
+
+    public Location location(){
+        return loc;
+    }
+
+    public Location oldLocation(){
+        return oldLoc;
+    }
+
+    public double distance(){
+        return distance;
+    }
+}

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

@@ -0,0 +1,91 @@
+package eu.ruekov.ruakij.LinkedBeaconTeleporters.customPlayerMoveEvent;
+
+import org.bukkit.Bukkit;
+import org.bukkit.Location;
+import org.bukkit.entity.Player;
+import org.bukkit.plugin.Plugin;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.UUID;
+
+public class CustomPlayerMoveEventHandler {
+
+    List<CustomPlayerMoveEventListener> listeners = new ArrayList<>();
+
+    HashMap<UUID, Location> oldPlayerLoc = new HashMap<>();
+
+    boolean locationChangeOnBlockChange;
+    public CustomPlayerMoveEventHandler(Plugin plugin, int interval, boolean locationChangeOnBlockChange){
+        this.locationChangeOnBlockChange = locationChangeOnBlockChange;
+
+        startRunnable(plugin, interval);
+    }
+    public CustomPlayerMoveEventHandler(Plugin plugin){
+        this(plugin, 5, false);
+    }
+
+    void startRunnable(Plugin plugin, int interval){
+
+        Bukkit.getScheduler().scheduleSyncRepeatingTask(plugin, () -> {
+            // Dont do anything without listeners
+            if(listeners.size() == 0) return;
+
+            // Check all players
+            for(Player p : Bukkit.getOnlinePlayers()){
+                UUID uuid = p.getUniqueId();
+                Location loc = p.getLocation();
+
+                // Get old-location
+                Location oldLoc = oldPlayerLoc.get(uuid);
+
+                // Create data-obj
+                CustomPlayerMoveEvent e = new CustomPlayerMoveEvent(p, loc, oldLoc);
+
+                // When player has an old-location
+                if(oldLoc != null){
+                    if(!locationChangeOnBlockChange){
+                        double distance = loc.distance(oldLoc);
+                        e.distance = distance;
+
+                        if(distance > 0)
+                            locationChangeListeners(e);
+                    }
+                    else if(loc.getBlockX() != oldLoc.getBlockX() ||
+                            loc.getBlockY() != oldLoc.getBlockY() ||
+                            loc.getBlockZ() != oldLoc.getBlockZ())
+                        locationChangeListeners(e);
+                }
+
+                tickListeners(e);
+
+                // Save old location
+                oldPlayerLoc.put(uuid, loc);
+            }
+
+        }, interval, interval);
+    }
+
+    boolean blockLocationChanged(Location loc, Location oldLoc){
+        return  loc.getBlockX() != oldLoc.getBlockX() ||
+                loc.getBlockY() != oldLoc.getBlockY() ||
+                loc.getBlockZ() != oldLoc.getBlockZ();
+    }
+
+    void tickListeners(CustomPlayerMoveEvent e){
+        for(CustomPlayerMoveEventListener listener : listeners){
+            listener.tick(e);
+        }
+    }
+    void locationChangeListeners(CustomPlayerMoveEvent e){
+        for(CustomPlayerMoveEventListener listener : listeners){
+            listener.locationChange(e);
+        }
+    }
+
+
+    public void registerListener(CustomPlayerMoveEventListener listener){
+        listeners.add(listener);
+    }
+}

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

@@ -0,0 +1,10 @@
+package eu.ruekov.ruakij.LinkedBeaconTeleporters.customPlayerMoveEvent;
+
+import org.bukkit.entity.Player;
+
+public interface CustomPlayerMoveEventListener {
+
+    void tick(CustomPlayerMoveEvent e);
+
+    void locationChange(CustomPlayerMoveEvent e);
+}

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.inventory.ItemStack;
+import org.bukkit.event.block.BlockBreakEvent;
 
 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){
-        return Main.lbtManager.getLbtBlocksFromTeleportId(teleportId);
+    public static List<LinkedBeaconTeleporter> getListFromTeleportId(String 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;
@@ -13,28 +20,78 @@ public class LinkedBeaconTeleporterItem extends LinkedBeaconTeleporter {
     // INFO: Safe to store as its always cloned by bukkit
     ItemStack item;
 
-    public LinkedBeaconTeleporterItem(ItemStack item){
+    public LinkedBeaconTeleporterItem(){
         // Create a new LinkedBeaconTeleporter
         super();
 
-        this.item = item;
+        this.item = LinkedBeaconTeleporterManager.getItemStackFromData(this.teleporterId);
     }
     public LinkedBeaconTeleporterItem(String teleporterId, ItemStack item) {
         super(teleporterId);
 
         this.item = item;
     }
+    public LinkedBeaconTeleporterItem(String teleporterId){
+        super(teleporterId);
+
+        this.item = LinkedBeaconTeleporterManager.getItemStackFromData(teleporterId);
+    }
 
     public ItemStack item(){
         return item;
     }
 
 
-    // Conversion methods
-    public ItemStack toItemStack(){
-        return Main.lbtManager.getItemStackFromLbtItem(this);
+    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

@@ -2,11 +2,14 @@ package eu.ruekov.ruakij.LinkedBeaconTeleporters.linkedBeaconTeleporter;
 
 import eu.ruekov.ruakij.LinkedBeaconTeleporters.Function;
 import eu.ruekov.ruakij.LinkedBeaconTeleporters.Main;
+import org.bukkit.Bukkit;
 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;
 
 import java.util.*;
@@ -16,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();
-    HashMap<String, LinkedBeaconTeleporterBlock> linkedBeaconTeleporterByLoc = new HashMap();
+    public static HashMap<String, List<LinkedBeaconTeleporter>> placedLBTsById = 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
@@ -31,23 +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)) {
-                ConfigurationSection teleporterData = teleportersData.getConfigurationSection(blockId);
+            for(String serializedLoc : serialisedLocs) {
 
                 // 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;
                 }
 
@@ -55,29 +63,83 @@ 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
-                lbtBlocks.add(lbtBlock);
-
+                // Write block to list
+                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!");
     }
 
+    static int oldDataHashCode;
+    public static boolean writeData(){
+        // Check if data changed
+        int dataHashCode = placedLBTsById.hashCode();
+        if(oldDataHashCode != dataHashCode){
+            // Changed
+            oldDataHashCode = dataHashCode;
+        }
+        else // Did not change
+            return false;
+
+        Main.data = new YamlConfiguration();
+        for(String teleporterId : placedLBTsById.keySet()){
+            List<LinkedBeaconTeleporter> LBTs = placedLBTsById.get(teleporterId);
+
+            // Generate clean array with data we want
+            List<String> dataList = new ArrayList<>();
+            for(LinkedBeaconTeleporter lbt : LBTs){
+                dataList.add(
+                        Function.serialiseBlockLocation(
+                                ((LinkedBeaconTeleporterBlock)lbt).block().getLocation()
+                        )
+                );
+            }
+
+            Main.data.set(teleporterId, dataList);
+        }
+        return true;
+    }
+
+    static void constructAndAddRecipes(){
+        // Create result-item
+        ItemStack item = getItemStackFromData("-");
+        item.setAmount(2);
+
+        // Create recipe
+        ShapelessRecipe recipe = new ShapelessRecipe(
+                new NamespacedKey(Main.plugin, "linked_beacon_teleporter")
+                , item);
+        recipe.addIngredient(2, Material.BEACON);
+        Bukkit.addRecipe(recipe);
+
+        // Empty recipe to reset beacon
+        ShapelessRecipe recipe2 = new ShapelessRecipe(
+                new NamespacedKey(Main.plugin, "linked_beacon_teleporter_reset"),
+                new ItemStack(Material.BEACON)
+                );
+        recipe2.addIngredient(1, Material.BEACON);
+        Bukkit.addRecipe(recipe2);
+    }
+
     // Conversion-methods
-    public ItemStack getItemStackFromLbtItem(LinkedBeaconTeleporterItem lbtItem){
+    public static ItemStack getItemStackFromData(String teleporterId){
         ItemStack item = new ItemStack(Material.BEACON);
         ItemMeta itemMeta = item.getItemMeta();
 
@@ -86,10 +148,10 @@ public class LinkedBeaconTeleporterManager {
         List<String> lore = Main.config.getStringList("item.lore");
 
         // Replace parameters
-        name = name.replace("%id%", lbtItem.teleporterId);
+        name = name.replace("%id%", teleporterId);
         for(int i=0; i<lore.size(); i++){
             lore.set(i,
-                    lore.get(i).replace("%id%", lbtItem.teleporterId)
+                    lore.get(i).replace("%id%", teleporterId)
             );
         }
 
@@ -101,7 +163,7 @@ public class LinkedBeaconTeleporterManager {
 
         return item;
     }
-    public LinkedBeaconTeleporterItem getLbtItemFromItemStack(ItemStack itemStack){
+    public static LinkedBeaconTeleporterItem getLbtItemFromItemStack(ItemStack itemStack){
         ItemMeta itemMeta = itemStack.getItemMeta();
 
         // Serialize
@@ -125,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){
-        return linkedBeaconTeleporterById.get(teleportId);
+    public static List<LinkedBeaconTeleporter> getLbtBlocksFromTeleportId(String 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);
 
@@ -149,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/linkedBeaconTeleporter/listener/OnBlockBreak.java

@@ -1,11 +0,0 @@
-package eu.ruekov.ruakij.LinkedBeaconTeleporters.linkedBeaconTeleporter.listener;
-
-import eu.ruekov.ruakij.LinkedBeaconTeleporters.linkedBeaconTeleporter.LinkedBeaconTeleporterBlock;
-import org.bukkit.event.block.BlockBreakEvent;
-
-public class OnBlockBreak {
-
-    public static void onBlockBreakEvent(BlockBreakEvent e, LinkedBeaconTeleporterBlock lbtBlock){
-
-    }
-}

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

@@ -1,11 +0,0 @@
-package eu.ruekov.ruakij.LinkedBeaconTeleporters.linkedBeaconTeleporter.listener;
-
-import eu.ruekov.ruakij.LinkedBeaconTeleporters.linkedBeaconTeleporter.LinkedBeaconTeleporterItem;
-import org.bukkit.event.block.BlockPlaceEvent;
-
-public class OnBlockPlace {
-
-    public static void onBlockPlaceEvent(BlockPlaceEvent e, LinkedBeaconTeleporterItem lbtItem){
-
-    }
-}

src/main/java/eu/ruekov/ruakij/LinkedBeaconTeleporters/linkedBeaconTeleporter/listener/OnPrepareItemCraftEvent.java

@@ -1,39 +0,0 @@
-package eu.ruekov.ruakij.LinkedBeaconTeleporters.linkedBeaconTeleporter.listener;
-
-import eu.ruekov.ruakij.LinkedBeaconTeleporters.linkedBeaconTeleporter.LinkedBeaconTeleporterItem;
-import org.bukkit.Material;
-import org.bukkit.event.inventory.PrepareItemCraftEvent;
-import org.bukkit.inventory.CraftingInventory;
-import org.bukkit.inventory.InventoryView;
-import org.bukkit.inventory.ItemStack;
-
-public class OnPrepareItemCraftEvent {
-
-    public static void onPrepareItemCraftEvent(PrepareItemCraftEvent e){
-        ItemStack[] matrix = e.getInventory().getMatrix();
-
-        // Check if one of provided items is already LinkedBeaconTeleporterItem and use first if found
-        LinkedBeaconTeleporterItem lbtItem = null;
-
-        /*for (ItemStack item : matrix) {
-            if(item == null) continue;
-            lbtItem = LinkedBeaconTeleporterItem.getFromItemStack(item);
-            if(lbtItem != null) break;
-        }*/
-
-        if(lbtItem == null){
-            // If none is found, create new LinkedBeaconTeleporterItem and set as crafting-result
-            ItemStack item = new ItemStack(Material.BEACON);
-            lbtItem = new LinkedBeaconTeleporterItem(item);
-        }
-
-        // Generate ItemStack
-        ItemStack item = lbtItem.toItemStack();
-
-        // Exactly 2
-        item.setAmount(2);
-
-        // Set as crafting-result
-        e.getInventory().setResult(item);
-    }
-}

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

@@ -2,6 +2,8 @@ package eu.ruekov.ruakij.LinkedBeaconTeleporters.listener;
 
 import eu.ruekov.ruakij.LinkedBeaconTeleporters.Main;
 import eu.ruekov.ruakij.LinkedBeaconTeleporters.linkedBeaconTeleporter.LinkedBeaconTeleporterBlock;
+import eu.ruekov.ruakij.LinkedBeaconTeleporters.linkedBeaconTeleporter.LinkedBeaconTeleporterItem;
+import org.bukkit.GameMode;
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
@@ -21,9 +23,10 @@ public class OnBlockBreak implements Listener {
             // Check if this beacon is a LinkedBeaconTeleporter
             LinkedBeaconTeleporterBlock lbtBlock = LinkedBeaconTeleporterBlock.getFromLocation(loc);
 
-            if(lbtBlock != null){
-                eu.ruekov.ruakij.LinkedBeaconTeleporters.linkedBeaconTeleporter.listener.OnBlockBreak.onBlockBreakEvent(e, lbtBlock);
-            }
+            // Ignore if not found
+            if(lbtBlock == null) return;
+
+            LinkedBeaconTeleporterItem lbtItem = lbtBlock.break_(e);
         }
     }
 }

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

@@ -1,5 +1,7 @@
 package eu.ruekov.ruakij.LinkedBeaconTeleporters.listener;
 
+import eu.ruekov.ruakij.LinkedBeaconTeleporters.Main;
+import eu.ruekov.ruakij.LinkedBeaconTeleporters.linkedBeaconTeleporter.LinkedBeaconTeleporterBlock;
 import eu.ruekov.ruakij.LinkedBeaconTeleporters.linkedBeaconTeleporter.LinkedBeaconTeleporterItem;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
@@ -20,9 +22,10 @@ public class OnBlockPlace implements Listener {
             // Check if this beacon is a LinkedBeaconTeleporter
             LinkedBeaconTeleporterItem lbtItem = LinkedBeaconTeleporterItem.getFromItemStack(item);
 
-            if(lbtItem != null){
-                eu.ruekov.ruakij.LinkedBeaconTeleporters.linkedBeaconTeleporter.listener.OnBlockPlace.onBlockPlaceEvent(e, lbtItem);
-            }
+            // Ignore if not found
+            if(lbtItem == null) return;
+
+            LinkedBeaconTeleporterBlock lbtBlock = lbtItem.place(e);
         }
     }
 }

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

@@ -0,0 +1,41 @@
+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;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+import org.bukkit.event.inventory.CraftItemEvent;
+import org.bukkit.event.inventory.PrepareItemCraftEvent;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.Recipe;
+
+public class OnCraftItemEvent implements Listener {
+
+    @EventHandler(priority = EventPriority.LOW)
+    public void onCraftItemEvent(CraftItemEvent e){
+
+        Recipe recipe = e.getRecipe();
+        ItemStack itemResult = recipe.getResult();
+
+        // Check if it has LinkedBeaconTeleporter-Data
+        LinkedBeaconTeleporterItem lbtItem = LinkedBeaconTeleporterManager.getLbtItemFromItemStack(itemResult);
+
+        // Ignore if not found
+        if(lbtItem == null) return;
+
+        // Create new LinkedBeaconTeleporterItem
+        lbtItem = new LinkedBeaconTeleporterItem();
+
+        ItemStack item = lbtItem.item();
+        // Exactly 2
+        item.setAmount(2);
+
+        // FIXME: Changing the just-crafted-item only works for a single item, bulk-crafting (e.g. Shift-Click) will result in default-items getting crafted!
+
+        e.setCurrentItem(item);
+    }
+}

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

@@ -0,0 +1,119 @@
+package eu.ruekov.ruakij.LinkedBeaconTeleporters.listener;
+
+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;
+import org.bukkit.util.Vector;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.UUID;
+
+public class OnCustomPlayerMove implements CustomPlayerMoveEventListener {
+
+    static HashMap<UUID, LinkedBeaconTeleporterBlock> playerBeaconLocation = new HashMap<>();
+
+    @Override
+    public void tick(CustomPlayerMoveEvent e) {
+    }
+
+    @Override
+    public void locationChange(CustomPlayerMoveEvent e) {
+
+        Player p = e.player();
+        UUID uuid = p.getUniqueId();
+
+        // If player found in ignoreList, check if he stepped out of the Beacon-light
+        if(playerBeaconLocation.containsKey(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(
+                p.getLocation().add(0, -1, 0),
+                new Vector(0, -1, 0),
+                Material.BEACON,
+                Function.transparentMaterials
+        );
+
+        // Skip if not found
+        if(block == null) return;
+
+        // TODO: Check if beacon is active
+
+        // Check if beacon is a LinkedBeaconTeleporter
+        LinkedBeaconTeleporterBlock lbtBlock = LinkedBeaconTeleporterManager.getLbtBlockFromLocation(block.getLocation());
+
+        // Ignore if not found
+        if(lbtBlock == null) return;
+
+        // Check if player should be ignored on this LinkedBeaconTeleporter
+        if(playerBeaconLocation.get(uuid) != null && playerBeaconLocation.get(uuid) == lbtBlock) return;
+
+        // Get first partner thats not our current-block
+        LinkedBeaconTeleporterBlock lbtBlockPartner = null;
+        for(LinkedBeaconTeleporter lbtBlockTmp: lbtBlock.linkedBeaconTeleporters()){
+            if(lbtBlockTmp != lbtBlock){
+                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(
+                loc
+            );
+        }
+    }
+}

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

@@ -1,31 +0,0 @@
-package eu.ruekov.ruakij.LinkedBeaconTeleporters.listener;
-
-import org.bukkit.Material;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.EventPriority;
-import org.bukkit.event.Listener;
-import org.bukkit.event.inventory.PrepareItemCraftEvent;
-import org.bukkit.inventory.CraftingInventory;
-import org.bukkit.inventory.InventoryView;
-import org.bukkit.inventory.ItemStack;
-
-public class OnPrepareItemCraftEvent implements Listener {
-
-    @EventHandler(priority = EventPriority.LOW)
-    public void onPrepareItemCraftEvent(PrepareItemCraftEvent e){
-
-        ItemStack[] matrix = e.getInventory().getMatrix();
-
-        // Check if 2 beacons are in the crafting-slots
-        int beaconCount = 0;
-        for (ItemStack item : matrix) {
-            if(item == null) continue;
-            if(item.getType() == Material.BEACON)
-                beaconCount++;
-        }
-        if(beaconCount == 2){
-            // Exactly 2 beacons found
-            eu.ruekov.ruakij.LinkedBeaconTeleporters.linkedBeaconTeleporter.listener.OnPrepareItemCraftEvent.onPrepareItemCraftEvent(e);
-        }
-    }
-}

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

src/main/resources/plugin.yml

@@ -1,4 +1,5 @@
 name: ${artifactId}
 version: ${version}
 author: ${author}
-main: ${groupId}.${artifactId}.Main
+main: ${groupId}.${artifactId}.Main
+api-version: 1.16