diff --git a/.classpath b/.classpath
index 807fe5c..1845049 100644
--- a/.classpath
+++ b/.classpath
@@ -1,8 +1,31 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="lib" path="../lib/bukkit.jar"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="lib" path="PluginCore.jar"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" output="target/classes" path="src/main/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/.externalToolBuilders/Ant Builder for Lockette.launch b/.externalToolBuilders/Ant Builder for Lockette.launch
index 76adc9d..aed7efd 100644
--- a/.externalToolBuilders/Ant Builder for Lockette.launch	
+++ b/.externalToolBuilders/Ant Builder for Lockette.launch	
@@ -1,14 +1,15 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType">
-<booleanAttribute key="org.eclipse.ant.ui.ATTR_TARGETS_UPDATED" value="true"/>
-<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
-<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${workspace}"/>
-<booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
-<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
-<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="Lockette"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/Lockette/build.xml}"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="full,incremental,"/>
-<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${workspace_loc:/Lockette}"/>
-</launchConfiguration>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType">
+<booleanAttribute key="org.eclipse.ant.ui.ATTR_TARGETS_UPDATED" value="true"/>
+<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
+<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${workspace}"/>
+<booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
+<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
+<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="Lockette"/>
+<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_BUILDER_ENABLED" value="false"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/Lockette/build.xml}"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="full,incremental,"/>
+<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${workspace_loc:/Lockette}"/>
+</launchConfiguration>
diff --git a/.gitignore b/.gitignore
index 12297e1..2c6c590 100644
--- a/.gitignore
+++ b/.gitignore
@@ -44,3 +44,5 @@ Thumbs.db
 target/*
 
 
+/bin/
+/target/
diff --git a/.project b/.project
index 0bdd544..9bff337 100644
--- a/.project
+++ b/.project
@@ -20,8 +20,14 @@
 				</dictionary>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
 </projectDescription>
diff --git a/PluginCore.jar b/PluginCore.jar
deleted file mode 100644
index 4ef56b7..0000000
Binary files a/PluginCore.jar and /dev/null differ
diff --git a/plugin.yml b/plugin.yml
deleted file mode 100644
index 7278abc..0000000
--- a/plugin.yml
+++ /dev/null
@@ -1,102 +0,0 @@
-name: Lockette
-main: org.yi.acru.bukkit.Lockette.Lockette
-version: 1.7.12
-author: Acru
-description: A simple plugin for locking containers and doors without passwords or database files.  Inspired by the old hmod plugins Lock by Roman "kingseta" Pramberger and ChestCapsule by Fernando "Fergo".
-commands:
-    lockette:
-        aliases: [lock]
-        description: Access to the Lockette plugin via commands.
-        usage: |
-            /<command> <line number> <text> - Edits signs on locked containers. Right click on the sign to edit.
-            /<command> fix - Fixes an automatic door that is in the wrong position. Look at the door to edit.
-            /<command> reload - Reloads the configuration files.  Operators only.
-            /<command> version - Reports Lockette version string.
-permissions:
-    lockette.*:
-        description: Permission for a super admin who can do anything.
-        children:
-            lockette.user.create.*: true
-            lockette.admin.create.*: true
-            lockette.admin.break: true
-            lockette.admin.bypass: true
-            lockette.admin.snoop: true
-            lockette.admin.reload: true
-            lockette.towny.wilds: true
-    lockette.user.*:
-        description: All the permissions a normal user normally needs.
-        children:
-            lockette.user.create.*: true
-            lockette.towny.wilds: true
-    lockette.user.create.*:
-        description: Allows the normal method of locking containers.
-        children:
-            lockette.user.create.chest: true
-            lockette.user.create.furnace: true
-            lockette.user.create.dispenser: true
-            lockette.user.create.dropper: true
-            lockette.user.create.brewingstand: true
-            lockette.user.create.custom: true
-            lockette.user.create.trapdoor: true
-            lockette.user.create.door: true
-    lockette.admin.*:
-        description: All the permissions a normal admin normally needs.
-        children:
-            lockette.user.create.*: true
-            lockette.admin.create.*: true
-            lockette.admin.break: true
-            lockette.admin.bypass: true
-            lockette.towny.wilds: true
-    lockette.admin.create.*:
-        description: Allows the admin method of locking containers.
-        children:
-            lockette.admin.create.chest: true
-            lockette.admin.create.furnace: true
-            lockette.admin.create.dispenser: true
-            lockette.admin.create.dropper: true
-            lockette.admin.create.brewingstand: true
-            lockette.admin.create.custom: true
-            lockette.admin.create.trapdoor: true
-            lockette.admin.create.door: true
-    lockette.user.create.chest:
-        default: op
-    lockette.user.create.furnace:
-        default: op
-    lockette.user.create.dispenser:
-        default: op
-    lockette.user.create.dropper:
-        default: op
-    lockette.user.create.brewingstand:
-        default: op
-    lockette.user.create.custom:
-        default: op
-    lockette.user.create.trapdoor:
-        default: op
-    lockette.user.create.door:
-        default: op
-    lockette.admin.create.chest:
-        default: op
-    lockette.admin.create.furnace:
-        default: op
-    lockette.admin.create.dispenser:
-        default: op
-    lockette.admin.create.dropper:
-        default: op
-    lockette.admin.create.brewingstand:
-        default: op
-    lockette.admin.create.custom:
-        default: op
-    lockette.admin.create.trapdoor:
-        default: op
-    lockette.admin.create.door:
-        default: op
-    lockette.admin.break:
-        default: op
-    lockette.admin.bypass:
-        default: op
-    lockette.admin.snoop:
-        default: false
-    lockette.admin.reload:
-        default: false
-    lockette.towny.wilds:
-        default: op
diff --git a/pom.xml b/pom.xml
index 3434571..a7297fc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,24 +4,19 @@
 	<groupId>org.yi.acru.bukkit.Lockette</groupId>
 	<artifactId>Lockette</artifactId>
 	<packaging>jar</packaging>
-	<version>1.8.13</version>
+	<version>1.9.0</version>
 	<name>Lockette</name>
 	<url>http://maven.apache.org</url>
 	<properties>
 		<project.build.sourceEncoding>Cp1252</project.build.sourceEncoding>
 	</properties>
 	<dependencies>
-		<dependency>
-			<groupId>org.bukkit</groupId>
-			<artifactId>bukkit</artifactId>
-			<version>LATEST</version>
-	      <scope>system</scope>
-		  <systemPath>${basedir}/lib/spigot-1.8-R0.1-SNAPSHOT.jar</systemPath>
-<!--		  
-			<type>jar</type>
-			<scope>compile</scope>
--->			
-		</dependency>
+        <dependency>
+            <groupId>org.bukkit</groupId>
+            <artifactId>bukkit</artifactId>
+            <version>1.8-R0.1-SNAPSHOT</version>
+            <optional>true</optional>
+        </dependency>
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
@@ -31,7 +26,7 @@
 		<dependency>
 			<groupId>org.yi.acru.bukkit</groupId>
 			<artifactId>PluginCore</artifactId>
-			<version>1.4.0</version>
+			<version>1.5.0</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
@@ -64,10 +59,12 @@
                             <goal>shade</goal>
                         </goals>
                         <configuration>
+                            <minimizeJar>true</minimizeJar>
                             <artifactSet>
-                                <excludes>
-                                    <exclude>org.bukkit</exclude>
-                                </excludes>
+                                <includes>
+                                    <include>org.yi.acru.bukkit:PluginCore</include>
+                                    <include>com.googlecode.json-simple:json-simple</include>
+                                </includes>
                             </artifactSet>
                         </configuration>
                     </execution>
@@ -94,9 +91,9 @@
 		</resources>
 	</build>
 	<repositories>
-		<repository>
-			<id>bukkit-repo</id>
-			<url>http://repo.bukkit.org/content/groups/public</url>
-		</repository>
+        <repository>
+            <id>spigot-repo</id>
+            <url>https://hub.spigotmc.org/nexus/content/groups/public</url>
+        </repository>
 	</repositories>
 </project>
diff --git a/src/main/java/org/yi/acru/bukkit/Lockette/Lockette.java b/src/main/java/org/yi/acru/bukkit/Lockette/Lockette.java
index 2fe1d38..c89d053 100644
--- a/src/main/java/org/yi/acru/bukkit/Lockette/Lockette.java
+++ b/src/main/java/org/yi/acru/bukkit/Lockette/Lockette.java
@@ -814,9 +814,7 @@ protected boolean pluginEnableOverride(String pluginName){
 	
 	
 	protected boolean usingExternalPermissions(){
-		if(!usePermissions) return(false);
-		return(super.usingExternalPermissions());
-		//return(usePermissions);
+		return usePermissions;
 	}
 	
 	
diff --git a/src/main/java/org/yi/acru/bukkit/Lockette/LockettePlayerListener.java b/src/main/java/org/yi/acru/bukkit/Lockette/LockettePlayerListener.java
index 3342c2c..bd1310c 100644
--- a/src/main/java/org/yi/acru/bukkit/Lockette/LockettePlayerListener.java
+++ b/src/main/java/org/yi/acru/bukkit/Lockette/LockettePlayerListener.java
@@ -8,6 +8,7 @@
 package org.yi.acru.bukkit.Lockette;
 
 // Imports.
+import java.util.HashSet;
 import java.util.List;
 
 import org.bukkit.ChatColor;
@@ -23,11 +24,9 @@
 import org.bukkit.event.block.Action;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.plugin.PluginManager;
-
 import org.bukkit.event.player.PlayerCommandPreprocessEvent;
 import org.bukkit.event.player.PlayerInteractEvent;
 import org.bukkit.event.player.PlayerQuitEvent;
-
 import org.yi.acru.bukkit.BlockUtil;
 
 
@@ -528,7 +527,7 @@ else if(Lockette.adminSnoop){
 	
 	// Returns true if a door wasn't changed.
 	private static boolean fixDoor(Player player){
-		Block		block = player.getTargetBlock(null, 10);
+		Block		block = player.getTargetBlock(new HashSet<Byte>(), 10);
 		int			type = block.getTypeId();
 		boolean		doCheck = false;
 		
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
index 6e80c65..db7c460 100644
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -1,6 +1,7 @@
 name: Lockette
 main: org.yi.acru.bukkit.Lockette.Lockette
 version: ${project.version}
+softdepend: [Vault]
 authors: [Acru, ElgarL, vk2gpz]
 description: A simple plugin for locking containers and doors without passwords or database files.  Inspired by the old hmod plugins Lock by Roman "kingseta" Pramberger and ChestCapsule by Fernando "Fergo".
 commands: