Updated to the lastest WorldEdit 7 SNAPSHOT

Author: hexosse

pom.xml

@@ -23,7 +23,7 @@
     <groupId>com.github.hexocraft</groupId>
     <artifactId>addlight</artifactId>
     <name>AddLight</name>
-    <version>4.3.1</version>
+    <version>4.3.2</version>
     <packaging>jar</packaging>
     <description>This plugin allow server admin to add invisible light sources.</description>
     <url>https://github.com/hexocraft/AddLight</url>
@@ -54,7 +54,7 @@
     <!-- Propriétés du projet -->
     <properties>
         <jdk.version>1.8</jdk.version>
-        <bukkit.version>1.13.1-R0.1-SNAPSHOT</bukkit.version>
+        <bukkit.version>1.13.2-R0.1-SNAPSHOT</bukkit.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <github.global.server>github</github.global.server>
     </properties>

src/main/java/com/github/hexocraft/addlight/LightsApi.java

@@ -21,13 +21,13 @@
 import com.github.hexocraftapi.lights.Lights;
 import com.github.hexocraftapi.message.predifined.message.SimplePrefixedMessage;
 import com.google.common.collect.Lists;
-import com.sk89q.worldedit.BlockVector;
-import com.sk89q.worldedit.Vector;
+import com.sk89q.worldedit.math.BlockVector3;
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
 import org.bukkit.entity.Player;
 import org.bukkit.scheduler.BukkitRunnable;
+import org.bukkit.util.BlockVector;
 
 import java.util.HashMap;
 import java.util.Iterator;
@@ -120,8 +120,8 @@ public void run()
 					Location corner2 = null;
 					if(worldEdit != null && Permissions.has(player, Permissions.WORLDEDIT) && worldEdit.isLocationInSelection(player, location))
 					{
-						Vector vCorner1 = worldEdit.getSelection(player).getMaximumPoint();
-						Vector vCorner2 = worldEdit.getSelection(player).getMinimumPoint();
+						BlockVector3 vCorner1 = worldEdit.getSelection(player).getMaximumPoint();
+						BlockVector3 vCorner2 = worldEdit.getSelection(player).getMinimumPoint();
 
 						corner1 = new org.bukkit.Location(player.getWorld(), vCorner1.getX(), vCorner1.getY(), vCorner1.getZ());
 						corner2 = new org.bukkit.Location(player.getWorld(), vCorner2.getX(), vCorner2.getY(), vCorner2.getZ());
@@ -143,13 +143,13 @@ else if(worldEdit != null && Permissions.has(player, Permissions.WORLDEDIT) && w
 				@Override
 				public void run()
 				{
-					Iterator<BlockVector> blocks = worldEdit.getBlockVector(player, location);
-					List<Location> locations = Lists.newArrayList();
+					Iterator<BlockVector3> blocks    = worldEdit.getBlockVector(player, location);
+					List<Location>         locations = Lists.newArrayList();
 
 					while(blocks != null && blocks.hasNext())
 					{
-						BlockVector pos = blocks.next();
-						Block block = location.getWorld().getBlockAt(pos.getBlockX(), pos.getBlockY(), pos.getBlockZ());
+						BlockVector3 pos   = blocks.next();
+						Block        block = location.getWorld().getBlockAt(pos.getBlockX(), pos.getBlockY(), pos.getBlockZ());
 						if(block.getType() != Material.AIR)
 							locations.add(block.getLocation());
 					}
@@ -195,8 +195,8 @@ public void run()
 					Location corner2 = null;
 					if(worldEdit != null && Permissions.has(player, Permissions.WORLDEDIT) && worldEdit.isLocationInSelection(player, location))
 					{
-						Vector vCorner1 = worldEdit.getSelection(player).getMaximumPoint();
-						Vector vCorner2 = worldEdit.getSelection(player).getMinimumPoint();
+						BlockVector3 vCorner1 = worldEdit.getSelection(player).getMaximumPoint();
+						BlockVector3 vCorner2 = worldEdit.getSelection(player).getMinimumPoint();
 
 						corner1 = new org.bukkit.Location(player.getWorld(), vCorner1.getX(), vCorner1.getY(), vCorner1.getZ());
 						corner2 = new org.bukkit.Location(player.getWorld(), vCorner2.getX(), vCorner2.getY(), vCorner2.getZ());
@@ -218,12 +218,12 @@ else if(worldEdit != null && Permissions.has(player, Permissions.WORLDEDIT) && w
 				@Override
 				public void run()
 				{
-					Iterator<BlockVector> blocks = worldEdit.getBlockVector(player, location);
+					Iterator<BlockVector3> blocks = worldEdit.getBlockVector(player, location);
 					List<Location> locations = Lists.newArrayList();
 
 					while(blocks != null && blocks.hasNext())
 					{
-						BlockVector pos = blocks.next();
+						BlockVector3 pos = blocks.next();
 						Block block = location.getWorld().getBlockAt(pos.getBlockX(), pos.getBlockY(), pos.getBlockZ());
 						if(block.getType() != Material.AIR)
 							locations.add(block.getLocation());

src/main/java/com/github/hexocraft/addlight/integrations/WorldEditHooker.java

@@ -17,12 +17,11 @@
  */
 
 import com.github.hexocraftapi.integration.Hooker;
-import com.sk89q.worldedit.BlockVector;
 import com.sk89q.worldedit.IncompleteRegionException;
 import com.sk89q.worldedit.LocalSession;
-import com.sk89q.worldedit.Vector;
 import com.sk89q.worldedit.WorldEdit;
 import com.sk89q.worldedit.bukkit.BukkitPlayer;
+import com.sk89q.worldedit.math.BlockVector3;
 import com.sk89q.worldedit.regions.CuboidRegion;
 import com.sk89q.worldedit.regions.CylinderRegion;
 import com.sk89q.worldedit.regions.Polygonal2DRegion;
@@ -94,10 +93,10 @@ public boolean isLocationInSelection(Player player, Location location) {
         if(!player.isOnline()) throw new IllegalArgumentException("Offline player not allowed");
 
         try {
-            BukkitPlayer wPlayer = plugin.wrapPlayer(player);
-            LocalSession session = WorldEdit.getInstance().getSessionManager().get(wPlayer);
-            Region region = session.getSelection((World) wPlayer.getWorld());
-            Vector vLocation = new Vector(location.getX(), location.getY(), location.getZ());
+            BukkitPlayer wPlayer   = plugin.wrapPlayer(player);
+            LocalSession session   = WorldEdit.getInstance().getSessionManager().get(wPlayer);
+            Region       region    = session.getSelection((World) wPlayer.getWorld());
+            BlockVector3 vLocation = BlockVector3.at(location.getX(), location.getY(), location.getZ());
             return region != null && region.contains(vLocation);
         } catch(IncompleteRegionException e) {
             return false;
@@ -110,7 +109,7 @@ public boolean isLocationInSelection(Player player, Location location) {
      *
      * @return Region
      */
-    public Iterator<BlockVector> getBlockVector(Player player, Location location) {
+    public Iterator<BlockVector3> getBlockVector(Player player, Location location) {
         if(!isLocationInSelection(player, location))
             return null;
 

src/main/java/com/github/hexocraft/addlight/listeners/PlayerListener.java

@@ -19,10 +19,8 @@
 import com.github.hexocraft.addlight.AddLightPlugin;
 import com.github.hexocraft.addlight.LightsApi;
 import com.github.hexocraft.addlight.configuration.Permissions;
-import com.github.hexocraftapi.message.predifined.message.SimpleMessage;
 import com.github.hexocraftapi.message.predifined.message.SimplePrefixedMessage;
 import com.github.hexocraftapi.message.predifined.message.WarningPrefixedMessage;
-import com.github.hexocraftapi.nms.utils.NmsChunkUtil;
 import com.github.hexocraftapi.reflection.minecraft.Minecraft;
 import com.github.hexocraftapi.util.PlayerUtil;
 import org.bukkit.Location;