Trying to reduce reliance on Bukkit

src/main/java/com/intellectualcrafters/plot/object/BlockWrapper.java

@@ -0,0 +1,72 @@
+////////////////////////////////////////////////////////////////////////////////////////////////////
+// PlotSquared - A plot manager and world generator for the Bukkit API                             /
+// Copyright (c) 2014 IntellectualSites/IntellectualCrafters                                       /
+//                                                                                                 /
+// This program is free software; you can redistribute it and/or modify                            /
+// it under the terms of the GNU General Public License as published by                            /
+// the Free Software Foundation; either version 3 of the License, or                               /
+// (at your option) any later version.                                                             /
+//                                                                                                 /
+// This program is distributed in the hope that it will be useful,                                 /
+// but WITHOUT ANY WARRANTY; without even the implied warranty of                                  /
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                                   /
+// GNU General Public License for more details.                                                    /
+//                                                                                                 /
+// You should have received a copy of the GNU General Public License                               /
+// along with this program; if not, write to the Free Software Foundation,                         /
+// Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA                               /
+//                                                                                                 /
+// You can contact us via: support@intellectualsites.com                                           /
+////////////////////////////////////////////////////////////////////////////////////////////////////
+package com.intellectualcrafters.plot.object;
+
+import org.bukkit.World;
+import org.bukkit.block.Block;
+
+/**
+ * Wrapper class for blocks, using pure data rather than the object.
+ * 
+ * Useful for NMS
+ *
+ * @author Empire92
+ * @author Citymonstret
+ */
+public class BlockWrapper {
+    /**
+     * X Coordinate
+     */
+    public final int x;
+    /**
+     * Y Coordinate
+     */
+    public final int y;
+    /**
+     * Z Coordinate
+     */
+    public final int z;
+    /**
+     * Block ID
+     */
+    public final int id;
+    /**
+     * Block Data Value
+     */
+    public final byte data;
+
+    /**
+     * Constructor
+     *
+     * @param x    X Loc Value
+     * @param y    Y Loc Value
+     * @param z    Z Loc Value
+     * @param id   Material ID
+     * @param data Data Value
+     */
+    public BlockWrapper(final int x, final int y, final int z, final short id, final byte data) {
+        this.x = x;
+        this.y = y;
+        this.z = z;
+        this.id = id;
+        this.data = data;
+    }
+}

src/main/java/com/intellectualcrafters/plot/object/PlotAnalysis.java

@@ -4,10 +4,10 @@ import com.intellectualcrafters.configuration.file.YamlConfiguration;
 import com.intellectualcrafters.plot.PS;
 import com.intellectualcrafters.plot.flag.Flag;
 import com.intellectualcrafters.plot.flag.FlagManager;
-import com.intellectualcrafters.plot.generator.BukkitHybridUtils;
 import com.intellectualcrafters.plot.util.MainUtil;
 import com.intellectualcrafters.plot.util.MathMan;
 import com.intellectualcrafters.plot.util.TaskManager;
+import com.plotsquared.bukkit.util.BukkitHybridUtils;
 
 import java.io.IOException;
 import java.lang.reflect.Array;

src/main/java/com/intellectualcrafters/plot/object/PlotItemStack.java

@@ -7,7 +7,7 @@ public class PlotItemStack {
     public final String name;
     public final String[] lore;
     
-    public PlotItemStack(int id, short data, int amount, String name, String[] lore) {
+    public PlotItemStack(int id, short data, int amount, String name, String... lore) {
         this.id = id;
         this.data = data;
         this.amount = amount;

src/main/java/com/intellectualcrafters/plot/object/PlotManager.java

@@ -61,7 +61,7 @@ public abstract class PlotManager {
 
     public abstract boolean setComponent(final PlotWorld plotworld, final PlotId plotid, final String component, final PlotBlock[] blocks);
 
-    public abstract boolean setBiome(final Plot plot, final int biome);
+    public abstract boolean setBiome(final Plot plot, final String biome);
 
     /*
      * PLOT MERGING (return false if your generator does not support plot

src/main/java/com/intellectualcrafters/plot/object/PlotSettings.java

@@ -116,7 +116,7 @@ public class PlotSettings {
      */
     public String getBiome() {
         final Location loc = MainUtil.getPlotBottomLoc(this.plot.world, this.plot.getId()).add(1, 0, 1);
-        return BlockManager.manager.getBiome(loc);
+        return BlockManager.manager.getBiome(loc.getWorld(), loc.getX(), loc.getZ());
     }
 
     public BlockLoc getPosition() {