Version 4.1.1-1.8.8-SNAPSHOT!

(cherry picked from commit 1ba693ffd5)

pom.xml

@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.onarandombox.multiversecore</groupId>
     <artifactId>Multiverse-Core</artifactId>
-    <version>4.1.0</version>
+    <version>4.1.1-1.8.8-SNAPSHOT</version>
     <name>Multiverse-Core</name>
     <description>World Management Plugin</description>
     <properties>
@@ -247,7 +247,7 @@
         <dependency>
            <groupId>org.bukkit</groupId>
            <artifactId>bukkit</artifactId>
-           <version>1.13.2-R0.1-SNAPSHOT</version>
+           <version>1.8.8-R0.1-SNAPSHOT</version>
            <scope>provided</scope>
         </dependency>
         <!-- SerializationConfig Dependency -->
@@ -267,7 +267,7 @@
         <dependency>
             <groupId>net.milkbowl.vault</groupId>
             <artifactId>VaultAPI</artifactId>
-            <version>1.7</version>
+            <version>1.5</version>
             <scope>provided</scope>
         </dependency>
         <!-- End of Economy Dependency -->
@@ -285,7 +285,7 @@
         <dependency>
             <groupId>org.mcstats.bukkit</groupId>
             <artifactId>metrics</artifactId>
-            <version>R8-SNAPSHOT</version>
+            <version>R6</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.bukkit</groupId>

src/main/java/com/onarandombox/MultiverseCore/MultiverseCore.java

@@ -410,18 +410,17 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
         try {
             Metrics m = new Metrics(this);
 
-            Metrics.Graph envGraph = m.createGraph("Worlds by environment");
+            Metrics.Graph envGraph = m.createGraph("worlds_by_env");
             for (Environment env : Environment.values())
                 envGraph.addPlotter(new EnvironmentPlotter(this, env));
 
-            Metrics.Graph loadedWorldsGraph = m.createGraph("Worlds by environment");
-            loadedWorldsGraph.addPlotter(new Metrics.Plotter("Loaded worlds") {
+            m.addCustomData(new Metrics.Plotter("Loaded worlds") {
                 @Override
                 public int getValue() {
                     return getMVWorldManager().getMVWorlds().size();
                 }
             });
-            loadedWorldsGraph.addPlotter(new Metrics.Plotter("Total number of worlds") {
+            m.addCustomData(new Metrics.Plotter("Total number of worlds") {
                 @Override
                 public int getValue() {
                     return getMVWorldManager().getMVWorlds().size()
@@ -434,13 +433,13 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
                 gens.add(w.getGenerator());
             gens.remove(null);
             gens.remove("null");
-            Metrics.Graph genGraph = m.createGraph("Custom Generators");
+            Metrics.Graph genGraph = m.createGraph("custom_gens");
             for (String gen : gens)
                 genGraph.addPlotter(new GeneratorPlotter(this, gen));
 
             m.start();
             log(Level.FINE, "Metrics have run!");
-        } catch (Exception e) {
+        } catch (IOException e) {
             log(Level.WARNING, "There was an issue while enabling metrics: " + e.getMessage());
         }
     }
@@ -465,7 +464,6 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
         pm.registerEvents(this.entityListener, this);
         pm.registerEvents(this.weatherListener, this);
         pm.registerEvents(this.portalListener, this);
-        log(Level.INFO, "We are aware of the warning about the deprecated event. There is no alternative that allows us to do what we need to do. The performance impact is negligible.");
         pm.registerEvents(this.worldListener, this);
         pm.registerEvents(new MVMapListener(this), this);
     }

src/main/java/com/onarandombox/MultiverseCore/listeners/MVMapListener.java

@@ -29,7 +29,7 @@ public class MVMapListener implements Listener {
     public void mapInitialize(final MapInitializeEvent event) {
         for (final Player player : Bukkit.getOnlinePlayers()) {
             if ((player.getItemInHand().getType() == Material.MAP
-                    || player.getItemInHand().getType() == Material.FILLED_MAP)
+                    || player.getItemInHand().getType() == Material.EMPTY_MAP)
                     && player.getItemInHand().getDurability() == event.getMap().getId()) {
                 final Location playerLoc = player.getLocation();
                 final MapView map = event.getMap();

src/main/java/com/onarandombox/MultiverseCore/listeners/MVPlayerListener.java

@@ -252,7 +252,7 @@ public class MVPlayerListener implements Listener {
 
         // REMEMBER! getTo MAY be NULL HERE!!!
         // If the player was actually outside of the portal, adjust the from location
-        if (event.getFrom().getWorld().getBlockAt(event.getFrom()).getType() != Material.NETHER_PORTAL) {
+        if (event.getFrom().getWorld().getBlockAt(event.getFrom()).getType() != Material.PORTAL) {
             Location newloc = this.plugin.getSafeTTeleporter().findPortalBlockNextTo(event.getFrom());
             // TODO: Fix this. Currently, we only check for PORTAL blocks. I'll have to figure out what
             // TODO: we want to do here.

src/main/java/com/onarandombox/MultiverseCore/listeners/MVPortalListener.java

@@ -71,10 +71,10 @@ public class MVPortalListener implements Listener {
         if (event.getAction() != Action.RIGHT_CLICK_BLOCK) {
             return;
         }
-        if (event.getClickedBlock().getType() != Material.END_PORTAL_FRAME) {
+        if (event.getClickedBlock().getType() != Material.ENDER_PORTAL_FRAME) {
             return;
         }
-        if (event.getItem() == null || event.getItem().getType() != Material.ENDER_EYE) {
+        if (event.getItem() == null || event.getItem().getType() != Material.EYE_OF_ENDER) {
             return;
         }
         MultiverseWorld world = this.plugin.getMVWorldManager().getMVWorld(event.getPlayer().getWorld());

src/main/java/com/onarandombox/MultiverseCore/utils/SimpleBlockSafety.java

@@ -14,10 +14,9 @@ import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.World;
 import org.bukkit.block.BlockFace;
-import org.bukkit.block.data.BlockData;
-import org.bukkit.block.data.type.Bed;
 import org.bukkit.entity.Minecart;
 import org.bukkit.entity.Vehicle;
+import org.bukkit.material.Bed;
 
 import java.util.EnumSet;
 import java.util.Iterator;
@@ -152,13 +151,12 @@ public class SimpleBlockSafety implements BlockSafety {
      * @return The location of the other bed piece, or null if it was a jacked up bed.
      */
     private Location findOtherBedPiece(Location checkLoc) {
-        BlockData data = checkLoc.getBlock().getBlockData();
-        if (!(data instanceof Bed)) {
+        if (checkLoc.getBlock().getType() != Material.BED_BLOCK) {
             return null;
         }
-        Bed b = (Bed) data;
-
-        if (b.getPart() == Bed.Part.HEAD) {
+        // Construct a bed object at this location
+        final Bed b = new Bed(Material.BED_BLOCK, checkLoc.getBlock().getData());
+        if (b.isHeadOfBed()) {
             return checkLoc.getBlock().getRelative(b.getFacing().getOppositeFace()).getLocation();
         }
         // We shouldn't ever be looking at the foot, but here's the code for it.
@@ -211,10 +209,7 @@ public class SimpleBlockSafety implements BlockSafety {
     @Override
     public boolean isEntitiyOnTrack(Location l) {
         Material currentBlock = l.getBlock().getType();
-        return (currentBlock == Material.POWERED_RAIL
-                || currentBlock == Material.DETECTOR_RAIL
-                || currentBlock == Material.RAIL
-                || currentBlock == Material.ACTIVATOR_RAIL);
+        return (currentBlock == Material.POWERED_RAIL || currentBlock == Material.DETECTOR_RAIL || currentBlock == Material.RAILS);
     }
 
     /**

src/main/java/com/onarandombox/MultiverseCore/utils/SimpleSafeTTeleporter.java

@@ -292,19 +292,19 @@ public class SimpleSafeTTeleporter implements SafeTTeleporter {
     public Location findPortalBlockNextTo(Location l) {
         Block b = l.getWorld().getBlockAt(l);
         Location foundLocation = null;
-        if (b.getType() == Material.NETHER_PORTAL) {
+        if (b.getType() == Material.PORTAL) {
             return l;
         }
-        if (b.getRelative(BlockFace.NORTH).getType() == Material.NETHER_PORTAL) {
+        if (b.getRelative(BlockFace.NORTH).getType() == Material.PORTAL) {
             foundLocation = getCloserBlock(l, b.getRelative(BlockFace.NORTH).getLocation(), foundLocation);
         }
-        if (b.getRelative(BlockFace.SOUTH).getType() == Material.NETHER_PORTAL) {
+        if (b.getRelative(BlockFace.SOUTH).getType() == Material.PORTAL) {
             foundLocation = getCloserBlock(l, b.getRelative(BlockFace.SOUTH).getLocation(), foundLocation);
         }
-        if (b.getRelative(BlockFace.EAST).getType() == Material.NETHER_PORTAL) {
+        if (b.getRelative(BlockFace.EAST).getType() == Material.PORTAL) {
             foundLocation = getCloserBlock(l, b.getRelative(BlockFace.EAST).getLocation(), foundLocation);
         }
-        if (b.getRelative(BlockFace.WEST).getType() == Material.NETHER_PORTAL) {
+        if (b.getRelative(BlockFace.WEST).getType() == Material.PORTAL) {
             foundLocation = getCloserBlock(l, b.getRelative(BlockFace.WEST).getLocation(), foundLocation);
         }
         return foundLocation;

src/main/java/com/onarandombox/MultiverseCore/utils/SimpleWorldPurger.java

@@ -20,7 +20,6 @@ import org.bukkit.entity.Ghast;
 import org.bukkit.entity.Golem;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Monster;
-import org.bukkit.entity.Phantom;
 import org.bukkit.entity.Projectile;
 import org.bukkit.entity.Slime;
 import org.bukkit.entity.Squid;
@@ -149,7 +148,7 @@ public class SimpleWorldPurger implements WorldPurger {
             if (specifiedAnimals)
                 specified = true;
             negate = negateAnimals;
-        } else if (e instanceof Monster || e instanceof Ghast || e instanceof Slime || e instanceof Phantom) {
+        } else if (e instanceof Monster || e instanceof Ghast || e instanceof Slime) {
             // it's a monster
             if (specifiedMonsters && !negateMonsters) {
                 Logging.finest("Removing an entity because I was told to remove all monsters in world %s: %s", e.getWorld().getName(), e);

src/main/resources/plugin.yml

@@ -2,7 +2,6 @@ name: Multiverse-Core
 main: com.onarandombox.MultiverseCore.MultiverseCore
 authors: ['Rigby', 'fernferret', 'lithium3141', 'main--', 'dumptruckman']
 website: 'https://dev.bukkit.org/projects/multiverse-core'
-api-version: 1.13
 version: maven-version-number
 commands:
   mv:
@@ -233,4 +232,4 @@ commands:
   mvrules:
     description: Lists the gamerules.
     usage: |
-            /<command> [WORLD]
+            /<command> [WORLD]