1.4.0 - Merge pull request #37 from diademiemi/diademiemi/issue36

build.gradle

@@ -6,7 +6,7 @@ plugins {
 }
 
 group 'me.diademiemi.lineation'
-version '1.3.2'
+version '1.4.0'
 
 repositories {
   /*

src/main/java/me/diademiemi/lineation/Lineation.java

@@ -7,7 +7,8 @@
 
 import me.diademiemi.lineation.command.CommandExec;
 import me.diademiemi.lineation.command.CommandTabComplete;
-import me.diademiemi.lineation.line.LineIO;
+import me.diademiemi.lineation.config.Config;
+import me.diademiemi.lineation.config.LineIO;
 
 /**
  * Lineation plugin

src/main/java/me/diademiemi/lineation/Message.java

@@ -2,6 +2,8 @@
 
 import org.bukkit.ChatColor;
 
+import me.diademiemi.lineation.config.Config;
+
 /**
  * Messages used within the plugin
  *

src/main/java/me/diademiemi/lineation/command/CommandExec.java

@@ -8,9 +8,9 @@
 
 import me.diademiemi.lineation.Lineation;
 import me.diademiemi.lineation.Message;
-import me.diademiemi.lineation.Config;
+import me.diademiemi.lineation.config.Config;
+import me.diademiemi.lineation.config.LineIO;
 import me.diademiemi.lineation.line.Line;
-import me.diademiemi.lineation.line.LineIO;
 import me.diademiemi.lineation.line.LineTools;
 
 import java.util.Arrays;
@@ -144,6 +144,7 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
                                                     if (args.length > 3) {
                                                         if (Line.getLines().get(args[3]) == null) {
                                                             if (!args[3].equalsIgnoreCase("help")
+                                                                && !args[3].equalsIgnoreCase("version")
                                                                 && !args[3].equalsIgnoreCase("create")
                                                                 && !args[3].equalsIgnoreCase("remove")
                                                                 && !args[3].equalsIgnoreCase("list")

src/main/java/me/diademiemi/lineation/Config.java → src/main/java/me/diademiemi/lineation/config/Config.java

@@ -1,7 +1,10 @@
-package me.diademiemi.lineation;
+package me.diademiemi.lineation.config;
 
 import org.bukkit.configuration.file.YamlConfiguration;
 
+import me.diademiemi.lineation.Lineation;
+import me.diademiemi.lineation.Message;
+
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStreamReader;

src/main/java/me/diademiemi/lineation/line/LineIO.java → src/main/java/me/diademiemi/lineation/config/LineIO.java

@@ -1,7 +1,7 @@
-package me.diademiemi.lineation.line;
+package me.diademiemi.lineation.config;
 
 import me.diademiemi.lineation.Lineation;
-import me.diademiemi.lineation.Config;
+import me.diademiemi.lineation.line.Line;
 
 import java.util.ArrayList;
 /**
@@ -21,7 +21,9 @@ public class LineIO {
      */
     public static void loadAll() {
         for (String name : lineConfig.getConfig().getKeys(false)) {
-            loadLine(name);
+            if (!name.equalsIgnoreCase("version")) {
+                loadLine(name);
+            }
         }
     }
 

src/main/java/me/diademiemi/lineation/line/Line.java

@@ -9,8 +9,10 @@
 import org.bukkit.entity.Player;
 
 import me.diademiemi.lineation.Message;
+import me.diademiemi.lineation.config.Config;
+import me.diademiemi.lineation.listeners.MoveEvents;
+import me.diademiemi.lineation.listeners.Scheduled;
 import me.diademiemi.lineation.Lineation;
-import me.diademiemi.lineation.Config;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -326,10 +328,12 @@ public void setStarted() {
 					}
 				}
 			}
-            if (startedFinishLines.size() == 1) {
-                new LineListener(Lineation.getInstance());
-            } else if (startedStartLinesIA.size() == 1) {
-				new LineListener(Lineation.getInstance());
+            if (startedFinishLines.size() == 1 || startedStartLinesIA.size() == 1) {
+                if (Config.getPluginConfig().getConfig().getBoolean("aggressive-listener")) {
+                    Scheduled.checkMovements();
+                } else {
+                    new MoveEvents(Lineation.getInstance());
+                }
 			}
         }
 
@@ -343,13 +347,14 @@ public void setStopped() {
             if (this.type.equalsIgnoreCase("finish")) {
                 startedFinishLines.remove(this.name);
             }
-            if (startedFinishLines.size() == 0) {
-                LineListener.unregisterPluginEvents(Lineation.getInstance());
-            } else if (startedStartLinesIA.size() == 0) {
-				LineListener.unregisterPluginEvents(Lineation.getInstance());
-			} else if (!teleportEnabledIllegalArea) {
-				LineListener.unregisterPluginEvents(Lineation.getInstance());
-			}
+
+            if (startedFinishLines.size() == 0 && startedStartLinesIA.size() == 0) {
+                if (Config.getPluginConfig().getConfig().getBoolean("aggressive-listener")) {
+                    Scheduled.cancelTasks(Lineation.getInstance());
+                } else {
+                    MoveEvents.unregisterPluginEvents(Lineation.getInstance());
+                }
+            }
         }
 
         /**

src/main/java/me/diademiemi/lineation/line/LineTools.java

@@ -18,7 +18,7 @@
 
 import me.diademiemi.lineation.Lineation;
 import me.diademiemi.lineation.Message;
-import me.diademiemi.lineation.Config;
+import me.diademiemi.lineation.config.Config;
 
 import java.util.Arrays;
 import java.util.ArrayList;

src/main/java/me/diademiemi/lineation/listeners/Checker.java

@@ -0,0 +1,42 @@
+package me.diademiemi.lineation.listeners;
+
+import org.bukkit.entity.Player;
+
+import me.diademiemi.lineation.line.Line;
+import me.diademiemi.lineation.line.LineTools;
+
+import java.util.Map;
+
+public class Checker {
+    /**
+     * Check if the player is in a line
+     * 
+     * @param p     Player to check
+     */
+    public static void checkPlayer(Player p) {
+        for(Map.Entry<String, Line> entry: Line.getStartedFinishLines().entrySet()) {
+            if (entry.getValue().getGameModes().contains(p.getGameMode())) {
+                if (entry.getValue().contains(p)) {
+                    LineTools.playerFinish(entry.getValue(), p);
+                } else {
+                    int i = entry.getValue().checkpointsContain(p);
+                    if (i != 0) {
+                        if (i - 1 <= entry.getValue().getPlayerCheckpoint(p)) {
+                            entry.getValue().addPlayerCheckpoint(p, i);
+                        }
+                    }
+                }
+            }
+        }
+
+        for(Map.Entry<String, Line> entry: Line.getStartedStartLinesIA().entrySet()) {
+            if (entry.getValue().getGameModes().contains(p.getGameMode())) {
+                if (entry.getValue().illegalAreaContains(p)) {
+                    p.teleport(entry.getValue().getTeleportLocation());
+                }
+            }
+        }
+    }
+
+
+}

src/main/java/me/diademiemi/lineation/listeners/MoveEvents.java

@@ -0,0 +1,46 @@
+package me.diademiemi.lineation.listeners;
+
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.HandlerList;
+import org.bukkit.event.player.PlayerMoveEvent;
+
+import me.diademiemi.lineation.Lineation;
+
+/**
+ * Listens to move events
+ * 
+ * @author diademiemi
+ */
+public class MoveEvents implements Listener {
+
+    /**
+     * Register plugin listener
+     *
+     * @param plugin    Instance of this plugin
+     */
+    public MoveEvents(Lineation plugin) {
+        plugin.getServer().getPluginManager().registerEvents(this, plugin);
+    }
+
+    /**
+     * Unregister plugin listeners
+     *
+     * @param plugin    Instance of this plugin
+     */
+    public static void unregisterPluginEvents(Lineation plugin) {
+        HandlerList.unregisterAll(plugin);
+    }
+
+    /**
+     * Player move listener
+     *
+     * @param e Player move event
+     */
+    @EventHandler
+    public void onMove(PlayerMoveEvent e) {
+        if (e.getFrom().getBlockX() != e.getTo().getBlockX() || e.getFrom().getBlockY() != e.getTo().getBlockY() || e.getFrom().getBlockZ() != e.getTo().getBlockZ()) {
+            Checker.checkPlayer(e.getPlayer());
+		}
+	}
+}

src/main/java/me/diademiemi/lineation/listeners/Scheduled.java

@@ -0,0 +1,32 @@
+package me.diademiemi.lineation.listeners;
+
+import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;
+
+import me.diademiemi.lineation.Lineation;
+
+/**
+ * Checks player locations per tick
+ * 
+ * @author diademiemi
+ */
+public class Scheduled {
+
+    public static void cancelTasks(Lineation plugin) {
+        Bukkit.getServer().getScheduler().cancelTasks(plugin);
+    }
+
+    /**
+     * Schedules movement check every tick
+     */
+    public static void checkMovements() {
+        Bukkit.getServer().getScheduler().scheduleSyncRepeatingTask(Lineation.getInstance(), new Runnable(){
+        public void run() {
+            for (Player p : Bukkit.getOnlinePlayers()) {
+                  Checker.checkPlayer(p);
+              }
+          }
+      },0, 1);
+  }
+
+}

src/main/resources/config.yml

@@ -1,11 +1,20 @@
 # Default options used for lines
 # Reload the plugins config files with /lineation config reload
+
+#NEVER CHANGE THIS, THIS IS USED FOR MIGRATING
+version: 1
+
+# Set if the listener should be aggressive. 
+# This makes the plugin check every players' position every tick, instead of relying on player move events.
+# This can be laggier but is needed for compatibility with some vehicle plugins
+# true/false
+aggressive-listener: false
+
 linedefaults:
   option:
     blocksequence: glass, red_stained_glass, yellow_stained_glass, lime_stained_glass
     messagereach: '250'
     maxwinners: 3
-    commands: []
     gamemodes: SURVIVAL,ADVENTURE
 # Prevent someone from winning multiple times set maxwins
 # This can be set in game with /lineation config maxwins INT

src/main/resources/data.yml

@@ -1,2 +1,5 @@
 # File used to store player wins count
 # Format: UUID: number
+
+#NEVER CHANGE THIS, THIS IS USED FOR MIGRATING
+version: 1

src/main/resources/lines.yml

@@ -2,3 +2,6 @@
 # DO NOT EDIT!
 # If you edit this file, it will likely break!
 # Please use ingame commands to configure lines instead.
+
+#NEVER CHANGE THIS, THIS IS USED FOR MIGRATING
+version: 1

src/main/resources/plugin.yml

@@ -1,7 +1,7 @@
 name: Lineation
 description:  Minecraft Spigot plugin for managing start and finish lines
 author: diademiemi
-version: 1.3.2
+version: 1.4.0
 main: me.diademiemi.lineation.Lineation
 api-version: 1.13
 depend: [WorldEdit]