Added 1.13 support, renamed packages.

biscuut · Nov 28, 2018 · a397426 · a397426
1 parent 76adcb4
commit a397426
Show file tree

Hide file tree

Showing 18 changed files with 115 additions and 74 deletions.
diff --git a/pom.xml b/pom.xml
@@ -4,9 +4,9 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>xyz.biscut.chunkbuster</groupId>
+    <groupId>codes.biscuit</groupId>
     <artifactId>ChunkBuster</artifactId>
-    <version>1.1.8</version>
+    <version>1.1.9</version>
     <name>ChunkBuster</name>
 
     <build>

diff --git a/...a/xyz/biscut/chunkbuster/ChunkBuster.java → ...odes/biscuit/chunkbuster/ChunkBuster.java b/...a/xyz/biscut/chunkbuster/ChunkBuster.java → ...odes/biscuit/chunkbuster/ChunkBuster.java
@@ -1,14 +1,14 @@
-package xyz.biscut.chunkbuster;
+package codes.biscuit.chunkbuster;
 
 import org.bukkit.Bukkit;
 import org.bukkit.plugin.java.JavaPlugin;
-import xyz.biscut.chunkbuster.commands.ChunkBusterCommand;
-import xyz.biscut.chunkbuster.events.OtherEvents;
-import xyz.biscut.chunkbuster.events.PlayerEvents;
-import xyz.biscut.chunkbuster.utils.HookType;
-import xyz.biscut.chunkbuster.utils.HookUtils;
-import xyz.biscut.chunkbuster.utils.ConfigValues;
-import xyz.biscut.chunkbuster.utils.Utils;
+import codes.biscuit.chunkbuster.commands.ChunkBusterCommand;
+import codes.biscuit.chunkbuster.events.OtherEvents;
+import codes.biscuit.chunkbuster.events.PlayerEvents;
+import codes.biscuit.chunkbuster.utils.HookType;
+import codes.biscuit.chunkbuster.utils.HookUtils;
+import codes.biscuit.chunkbuster.utils.ConfigValues;
+import codes.biscuit.chunkbuster.utils.Utils;
 
 public class ChunkBuster extends JavaPlugin {
 

diff --git a/...nkbuster/commands/ChunkBusterCommand.java → ...nkbuster/commands/ChunkBusterCommand.java b/...nkbuster/commands/ChunkBusterCommand.java → ...nkbuster/commands/ChunkBusterCommand.java
@@ -1,4 +1,4 @@
-package xyz.biscut.chunkbuster.commands;
+package codes.biscuit.chunkbuster.commands;
 
 import net.md_5.bungee.api.ChatColor;
 import org.bukkit.Bukkit;
@@ -9,7 +9,7 @@
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
-import xyz.biscut.chunkbuster.ChunkBuster;
+import codes.biscuit.chunkbuster.ChunkBuster;
 
 import java.util.*;
 

diff --git a/src/main/java/codes/biscuit/chunkbuster/events/OtherEvents.java b/src/main/java/codes/biscuit/chunkbuster/events/OtherEvents.java
@@ -0,0 +1,35 @@
+package codes.biscuit.chunkbuster.events;
+
+import org.bukkit.Bukkit;
+import org.bukkit.Material;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.block.BlockFromToEvent;
+import codes.biscuit.chunkbuster.ChunkBuster;
+
+public class OtherEvents implements Listener {
+
+    private ChunkBuster main;
+
+    public OtherEvents(ChunkBuster main) {
+        this.main = main;
+    }
+
+    @EventHandler
+    public void onWaterFlow(BlockFromToEvent e) {
+        if (Bukkit.getVersion().contains("1.13")) {
+            if (e.getBlock().getType().equals(Material.WATER) || e.getBlock().getType().equals(Material.LAVA)) {
+                if (!main.getUtils().getWaterChunks().contains(e.getBlock().getChunk()) && main.getUtils().getWaterChunks().contains(e.getToBlock().getChunk())) {
+                    e.setCancelled(true);
+                }
+            }
+        } else {
+            if (e.getBlock().getType().equals(Material.WATER) || e.getBlock().getType().equals(Material.valueOf("STATIONARY_WATER"))
+                    || e.getBlock().getType().equals(Material.LAVA) || e.getBlock().getType().equals(Material.valueOf("STATIONARY_LAVA"))) {
+                if (!main.getUtils().getWaterChunks().contains(e.getBlock().getChunk()) && main.getUtils().getWaterChunks().contains(e.getToBlock().getChunk())) {
+                    e.setCancelled(true);
+                }
+            }
+        }
+    }
+}
diff --git a/...scut/chunkbuster/events/PlayerEvents.java → ...cuit/chunkbuster/events/PlayerEvents.java b/...scut/chunkbuster/events/PlayerEvents.java → ...cuit/chunkbuster/events/PlayerEvents.java
@@ -1,4 +1,4 @@
-package xyz.biscut.chunkbuster.events;
+package codes.biscuit.chunkbuster.events;
 
 import net.md_5.bungee.api.ChatColor;
 import org.bukkit.*;
@@ -13,10 +13,10 @@
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
-import xyz.biscut.chunkbuster.ChunkBuster;
-import xyz.biscut.chunkbuster.timers.MessageTimer;
-import xyz.biscut.chunkbuster.timers.SoundTimer;
-import xyz.biscut.chunkbuster.utils.HookType;
+import codes.biscuit.chunkbuster.ChunkBuster;
+import codes.biscuit.chunkbuster.timers.MessageTimer;
+import codes.biscuit.chunkbuster.timers.SoundTimer;
+import codes.biscuit.chunkbuster.utils.HookType;
 
 import java.util.HashMap;
 
@@ -136,7 +136,7 @@ public void onChunkBusterPlace(BlockPlaceEvent e) {
     @EventHandler
     public void onConfirmClick(InventoryClickEvent e) {
         if (e.getClickedInventory() != null && e.getClickedInventory().getName() != null &&
-                e.getClickedInventory().getName().contains(main.getConfigValues().getGUITitle())) {
+                e.getClickedInventory().getName().equals(main.getConfigValues().getGUITitle())) {
             e.setCancelled(true);
             Player p = (Player)e.getWhoClicked();
             Location chunkBusterLocation = chunkBusterLocations.get(e.getWhoClicked());

diff --git a/...t/chunkbuster/hooks/FactionsUUIDHook.java → ...t/chunkbuster/hooks/FactionsUUIDHook.java b/...t/chunkbuster/hooks/FactionsUUIDHook.java → ...t/chunkbuster/hooks/FactionsUUIDHook.java
@@ -1,4 +1,4 @@
-package xyz.biscut.chunkbuster.hooks;
+package codes.biscuit.chunkbuster.hooks;
 
 
 import com.massivecraft.factions.*;

diff --git a/.../chunkbuster/hooks/MCoreFactionsHook.java → .../chunkbuster/hooks/MCoreFactionsHook.java b/.../chunkbuster/hooks/MCoreFactionsHook.java → .../chunkbuster/hooks/MCoreFactionsHook.java
@@ -1,4 +1,4 @@
-package xyz.biscut.chunkbuster.hooks;
+package codes.biscuit.chunkbuster.hooks;
 
 import com.massivecraft.factions.Rel;
 import com.massivecraft.factions.entity.BoardColl;

diff --git a/...cut/chunkbuster/hooks/WorldGuardHook.java → ...uit/chunkbuster/hooks/WorldGuardHook.java b/...cut/chunkbuster/hooks/WorldGuardHook.java → ...uit/chunkbuster/hooks/WorldGuardHook.java
@@ -1,4 +1,4 @@
-package xyz.biscut.chunkbuster.hooks;
+package codes.biscuit.chunkbuster.hooks;
 
 import com.sk89q.worldguard.LocalPlayer;
 import com.sk89q.worldguard.bukkit.RegionContainer;

diff --git a/...scut/chunkbuster/timers/MessageTimer.java → ...cuit/chunkbuster/timers/MessageTimer.java b/...scut/chunkbuster/timers/MessageTimer.java → ...cuit/chunkbuster/timers/MessageTimer.java
@@ -1,8 +1,8 @@
-package xyz.biscut.chunkbuster.timers;
+package codes.biscuit.chunkbuster.timers;
 
 import org.bukkit.entity.Player;
 import org.bukkit.scheduler.BukkitRunnable;
-import xyz.biscut.chunkbuster.ChunkBuster;
+import codes.biscuit.chunkbuster.ChunkBuster;
 
 public class MessageTimer extends BukkitRunnable {
 

diff --git a/...scut/chunkbuster/timers/RemovalQueue.java → ...cuit/chunkbuster/timers/RemovalQueue.java b/...scut/chunkbuster/timers/RemovalQueue.java → ...cuit/chunkbuster/timers/RemovalQueue.java
@@ -1,9 +1,9 @@
-package xyz.biscut.chunkbuster.timers;
+package codes.biscuit.chunkbuster.timers;
 
 import org.bukkit.Material;
 import org.bukkit.block.Block;
 import org.bukkit.scheduler.BukkitRunnable;
-import xyz.biscut.chunkbuster.ChunkBuster;
+import codes.biscuit.chunkbuster.ChunkBuster;
 
 import java.util.LinkedList;
 

diff --git a/...biscut/chunkbuster/timers/SoundTimer.java → ...iscuit/chunkbuster/timers/SoundTimer.java b/...biscut/chunkbuster/timers/SoundTimer.java → ...iscuit/chunkbuster/timers/SoundTimer.java
@@ -1,8 +1,8 @@
-package xyz.biscut.chunkbuster.timers;
+package codes.biscuit.chunkbuster.timers;
 
 import org.bukkit.entity.Player;
 import org.bukkit.scheduler.BukkitRunnable;
-import xyz.biscut.chunkbuster.ChunkBuster;
+import codes.biscuit.chunkbuster.ChunkBuster;
 
 public class SoundTimer extends BukkitRunnable {
 

diff --git a/...iscut/chunkbuster/utils/ConfigValues.java → ...scuit/chunkbuster/utils/ConfigValues.java b/...iscut/chunkbuster/utils/ConfigValues.java → ...scuit/chunkbuster/utils/ConfigValues.java
@@ -1,11 +1,11 @@
-package xyz.biscut.chunkbuster.utils;
+package codes.biscuit.chunkbuster.utils;
 
 import net.md_5.bungee.api.ChatColor;
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
-import xyz.biscut.chunkbuster.ChunkBuster;
+import codes.biscuit.chunkbuster.ChunkBuster;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -26,14 +26,14 @@ public Material getChunkBusterMaterial() {
             try {
                 mat = Material.valueOf(materialSplit[0]);
             } catch (IllegalArgumentException ex) {
-                mat = Material.ENDER_PORTAL_FRAME;
+                mat = getEnderPortalMaterial();
                 Bukkit.getLogger().severe("Your chunk buster material is invalid!");
             }
         } else {
             try {
                 mat = Material.valueOf(rawMaterial);
             } catch (IllegalArgumentException ex) {
-                mat = Material.ENDER_PORTAL_FRAME;
+                mat = getEnderPortalMaterial();
                 Bukkit.getLogger().severe("Your chunk buster material is invalid!");
             }
         }
@@ -88,7 +88,7 @@ public ItemStack getConfirmBlockItemStack() {
             try {
                 mat = Material.valueOf(materialSplit[0]);
             } catch (IllegalArgumentException ex) {
-                mat = Material.WOOL;
+                mat = getDefaultConfirmMaterial();
                 Bukkit.getLogger().severe("Your accept-block material is invalid!");
             }
             short damage;
@@ -103,7 +103,7 @@ public ItemStack getConfirmBlockItemStack() {
             try {
                 mat = Material.valueOf(rawMaterial);
             } catch (IllegalArgumentException ex) {
-                mat = Material.WOOL;
+                mat = getDefaultConfirmMaterial();
                 Bukkit.getLogger().severe("Your accept-block material is invalid!");
             }
             return new ItemStack(mat, 1);
@@ -118,7 +118,7 @@ public ItemStack getCancelBlockItemStack() {
             try {
                 mat = Material.valueOf(materialSplit[0]);
             } catch (IllegalArgumentException ex) {
-                mat = Material.WOOL;
+                mat = getDefaultCancelMaterial();
                 Bukkit.getLogger().severe("Your cancel-block material is invalid!");
             }
             short damage;
@@ -133,7 +133,7 @@ public ItemStack getCancelBlockItemStack() {
             try {
                 mat = Material.valueOf(rawMaterial);
             } catch (IllegalArgumentException ex) {
-                mat = Material.WOOL;
+                mat = getDefaultCancelMaterial();
                 Bukkit.getLogger().severe("Your cancel-block material is invalid!");
             }
             return new ItemStack(mat, 1);
@@ -396,4 +396,34 @@ public int getMaximumY(Player p) {
     public double getConfigVersion() {
         return main.getConfig().getDouble("config-version");
     }
+
+    private Material getDefaultCancelMaterial() {
+        Material mat;
+        if (Bukkit.getVersion().contains("1.13")) {
+            mat = Material.valueOf("RED_WOOL");
+        } else {
+            mat = Material.valueOf("WOOL");
+        }
+        return mat;
+    }
+
+    private Material getDefaultConfirmMaterial() {
+        Material mat;
+        if (Bukkit.getVersion().contains("1.13")) {
+            mat = Material.valueOf("GREEN_WOOL");
+        } else {
+            mat = Material.valueOf("WOOL");
+        }
+        return mat;
+    }
+
+    private Material getEnderPortalMaterial() {
+        Material mat;
+        if (Bukkit.getVersion().contains("1.13")) {
+            mat = Material.valueOf("END_PORTAL_FRAME");
+        } else {
+            mat = Material.valueOf("ENDER_PORTAL_FRAME");
+        }
+        return mat;
+    }
 }
diff --git a/...yz/biscut/chunkbuster/utils/HookType.java → ...s/biscuit/chunkbuster/utils/HookType.java b/...yz/biscut/chunkbuster/utils/HookType.java → ...s/biscuit/chunkbuster/utils/HookType.java
@@ -1,4 +1,4 @@
-package xyz.biscut.chunkbuster.utils;
+package codes.biscuit.chunkbuster.utils;
 
 public enum HookType {
     MCOREFACTIONS,

diff --git a/...z/biscut/chunkbuster/utils/HookUtils.java → .../biscuit/chunkbuster/utils/HookUtils.java b/...z/biscut/chunkbuster/utils/HookUtils.java → .../biscuit/chunkbuster/utils/HookUtils.java
@@ -1,11 +1,11 @@
-package xyz.biscut.chunkbuster.utils;
+package codes.biscuit.chunkbuster.utils;
 
 import org.bukkit.Location;
 import org.bukkit.entity.Player;
-import xyz.biscut.chunkbuster.ChunkBuster;
-import xyz.biscut.chunkbuster.hooks.FactionsUUIDHook;
-import xyz.biscut.chunkbuster.hooks.MCoreFactionsHook;
-import xyz.biscut.chunkbuster.hooks.WorldGuardHook;
+import codes.biscuit.chunkbuster.ChunkBuster;
+import codes.biscuit.chunkbuster.hooks.FactionsUUIDHook;
+import codes.biscuit.chunkbuster.hooks.MCoreFactionsHook;
+import codes.biscuit.chunkbuster.hooks.WorldGuardHook;
 
 public class HookUtils {
 

diff --git a/...a/xyz/biscut/chunkbuster/utils/Utils.java → ...odes/biscuit/chunkbuster/utils/Utils.java b/...a/xyz/biscut/chunkbuster/utils/Utils.java → ...odes/biscuit/chunkbuster/utils/Utils.java
@@ -1,4 +1,4 @@
-package xyz.biscut.chunkbuster.utils;
+package codes.biscuit.chunkbuster.utils;
 
 import net.md_5.bungee.api.ChatColor;
 import net.md_5.bungee.api.chat.ClickEvent;
@@ -12,8 +12,8 @@
 import org.bukkit.inventory.ItemFlag;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
-import xyz.biscut.chunkbuster.ChunkBuster;
-import xyz.biscut.chunkbuster.timers.RemovalQueue;
+import codes.biscuit.chunkbuster.ChunkBuster;
+import codes.biscuit.chunkbuster.timers.RemovalQueue;
 
 import java.io.BufferedReader;
 import java.io.InputStreamReader;

diff --git a/src/main/java/xyz/biscut/chunkbuster/events/OtherEvents.java b/src/main/java/xyz/biscut/chunkbuster/events/OtherEvents.java
diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml
@@ -10,9 +10,10 @@
 #########################################################################
 
 chunkbuster:
-  # Please use 1.8 material names from here or any other 1.8 javadocs.
-  # https://biscut.xyz/javadocs/org/bukkit/Material.html
-  # Damage values supported.
+  # Please use item names for your specific version.
+  # 1.8: https://biscuit.codes/javadocs/org/bukkit/Material.html
+  # 1.13: https://hub.spigotmc.org/javadocs/spigot/org/bukkit/Material.html
+  # Damage values supported for > 1.13.
   material: 'ENDER_PORTAL_FRAME'
   name: '&aChunk Buster'
   lore:

diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
@@ -1,5 +1,6 @@
-main: xyz.biscut.chunkbuster.ChunkBuster
+main: codes.biscuit.chunkbuster.ChunkBuster
 version: ${version}
+api-version: 1.13
 name: ChunkBuster
 author: Biscut
 softdepend: [MassiveCore, Factions, WorldGuard]