WorldEdit 7 compatibility

NerdNu · Sep 16, 2018 · 5385c66 · 5385c66
1 parent 8ed52bc
commit 5385c66
Show file tree

Hide file tree

Showing 6 changed files with 54 additions and 24 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,7 +1,24 @@
-target/
-*.iml
-.idea/
+*.class
 
-# Eclipse:
-.classpath
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+*.jar
+*.war
+*.ear
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
+
+# Eclipse stuff:
 .project
+.settings
+.classpath
+
+# IntelliJ stuff:
+.idea
+
+# Build:
+/classes/
+target/
diff --git a/pom.xml b/pom.xml
@@ -94,4 +94,4 @@
             </plugins>
         </pluginManagement>
     </build>
-</project>
+</project>
diff --git a/src/nu/nerd/SafeBuckets/Configuration.java b/src/nu/nerd/SafeBuckets/Configuration.java
@@ -2,6 +2,7 @@
 
 import org.bukkit.Material;
 import org.bukkit.configuration.file.FileConfiguration;
+import org.bukkit.plugin.java.JavaPlugin;
 
 // ----------------------------------------------------------------------------------------------------------
 /**
@@ -95,7 +96,7 @@ class Configuration {
 
     // ------------------------------------------------------------------------------------------------------
     /**
-     * Constructor.
+     * Constructor. Called once during {@link JavaPlugin#onEnable()}.
      */
     Configuration() {
         reload();

diff --git a/src/nu/nerd/SafeBuckets/PlayerFlowCache.java b/src/nu/nerd/SafeBuckets/PlayerFlowCache.java
@@ -32,7 +32,7 @@ class PlayerFlowCache implements Listener {
         Bukkit.getPluginManager().registerEvents(this, SafeBuckets.PLUGIN);
         Bukkit.getScheduler().runTaskTimer(SafeBuckets.PLUGIN,
                                            PlayerFlowCache::reviewCache,
-                                           1,
+                                           1, // delay
                                            SafeBuckets.CONFIG.PLAYER_SELF_FLOW_CACHE_REVIEW_PERIOD);
     }
 
@@ -102,7 +102,7 @@ private static boolean willExpire(UUID uuid) {
     /**
      * Forces a player's flow session to expire upon logout.
      */
-    @EventHandler(priority = EventPriority.NORMAL)
+    @EventHandler(priority = EventPriority.MONITOR)
     public void onPlayerQuit(PlayerQuitEvent event) {
         forceExpire(event.getPlayer());
     }
@@ -111,7 +111,7 @@ public void onPlayerQuit(PlayerQuitEvent event) {
     /**
      * Forces a player's flow session to expire upon being kicked.
      */
-    @EventHandler(priority = EventPriority.NORMAL)
+    @EventHandler(priority = EventPriority.MONITOR)
     public void onPlayerKick(PlayerKickEvent event) {
         forceExpire(event.getPlayer());
     }

diff --git a/src/nu/nerd/SafeBuckets/SafeBuckets.java b/src/nu/nerd/SafeBuckets/SafeBuckets.java
@@ -382,7 +382,8 @@ private void flowLiquidsInSelection(Player player) {
             return;
         }
 
-        if (CONFIG.WORLDEDIT_FLOWSEL_MAX_BLOCKS != 0 && region.getArea() > CONFIG.WORLDEDIT_FLOWSEL_MAX_BLOCKS) {
+        int regionArea = region.getArea();
+        if (CONFIG.WORLDEDIT_FLOWSEL_MAX_BLOCKS != 0 && regionArea > CONFIG.WORLDEDIT_FLOWSEL_MAX_BLOCKS) {
             Util.Message.WORLDEDIT_FLOWSEL_OVER_MAX.send(player);
             return;
         }

diff --git a/src/nu/nerd/SafeBuckets/SafeBucketsListener.java b/src/nu/nerd/SafeBuckets/SafeBucketsListener.java
@@ -1,10 +1,19 @@
 package nu.nerd.SafeBuckets;
 
+import com.sk89q.worldedit.Vector;
+import com.sk89q.worldedit.WorldEdit;
+import com.sk89q.worldedit.WorldEditException;
+import com.sk89q.worldedit.bukkit.BukkitAdapter;
+import com.sk89q.worldedit.event.extent.EditSessionEvent;
+import com.sk89q.worldedit.extent.AbstractDelegateExtent;
+import com.sk89q.worldedit.util.eventbus.Subscribe;
+import com.sk89q.worldedit.world.block.BlockStateHolder;
 import me.sothatsit.usefulsnippets.EnchantGlow;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.Material;
 import org.bukkit.Sound;
+import org.bukkit.World;
 import org.bukkit.block.Block;
 import org.bukkit.enchantments.Enchantment;
 import org.bukkit.entity.Player;
@@ -38,6 +47,7 @@ public class SafeBucketsListener implements Listener {
      */
     SafeBucketsListener() {
         Bukkit.getPluginManager().registerEvents(this, SafeBuckets.PLUGIN);
+        WorldEdit.getInstance().getEventBus().register(this);
     }
 
     // ------------------------------------------------------------------------------------------------------
@@ -85,27 +95,27 @@ public void onBlockFromTo(BlockFromToEvent event) {
         }
     }
 
-    /*
-    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    // ------------------------------------------------------------------------------------------------------
+    /**
+     * Prevents WorldEdited liquids from flowing.
+     */
+    @Subscribe
     public void onWorldEdit(EditSessionEvent event) {
-        System.out.println("edit session");
         event.setExtent(new AbstractDelegateExtent(event.getExtent()) {
             @Override
-            public boolean setBlock(Vector location, BlockStateHolder block) throws WorldEditException {
-                System.out.println("caught");
+            public boolean setBlock(Vector loc, BlockStateHolder block) throws WorldEditException {
                 Material newMaterial = BukkitAdapter.adapt(block.getBlockType());
                 if (Liquid.isSupportedType(newMaterial) && event.getWorld() != null) {
                     World world = BukkitAdapter.adapt(event.getWorld());
                     Bukkit.getScheduler().runTaskLater(SafeBuckets.PLUGIN, () -> {
-                        Block newBlock = world.getBlockAt(location.getBlockX(), location.getBlockY(), location.getBlockZ());
+                        Block newBlock = world.getBlockAt(loc.getBlockX(), loc.getBlockY(), loc.getBlockZ());
                         SafeBuckets.setSafe(newBlock, true);
-                        System.out.println("Set safe after WE: " + newBlock);
                     }, 1);
                 }
-                return super.setBlock(location, block);
+                return super.setBlock(loc, block);
             }
         });
-    }*/
+    }
 
     // ------------------------------------------------------------------------------------------------------
     /**
@@ -129,7 +139,8 @@ public void onBlockBreak(BlockBreakEvent event) {
         Block block = event.getBlock();
         FrozenLiquid frozenLiquid = FrozenLiquid.getType(block);
         if (frozenLiquid != null && frozenLiquid.meltsWhenBroken()) {
-            if (!event.getPlayer().getEquipment().getItemInMainHand().containsEnchantment(Enchantment.SILK_TOUCH)) {
+            Player player = event.getPlayer();
+            if (!player.getEquipment().getItemInMainHand().containsEnchantment(Enchantment.SILK_TOUCH)) {
                 // make the ice block safe to prevent flowing immediately upon breaking
                 SafeBuckets.setSafe(block, true);
 
@@ -183,9 +194,9 @@ public void onPlayerBucketEmpty(PlayerBucketEmptyEvent event) {
 
                     // replenish
                     final ItemStack bucket = liquid.getBucket(false);
-                    Bukkit.getScheduler().runTaskLater(SafeBuckets.PLUGIN,
-                                                       () -> player.getEquipment().setItemInMainHand(bucket),
-                                                       1);
+                    Bukkit.getScheduler().runTaskLater(SafeBuckets.PLUGIN, () -> {
+                        player.getEquipment().setItemInMainHand(bucket);
+                    }, 1);
                 } else {
                     SafeBuckets.setSafe(block, true);
                 }