diff --git a/README.md b/README.md
index 28d111c..e29d57e 100644
--- a/README.md
+++ b/README.md
@@ -17,4 +17,12 @@ Dependencies for optional integrations
 * [Multiverse-Core](http://dev.bukkit.org/bukkit-plugins/multiverse-core/)
 * [Vault](http://dev.bukkit.org/bukkit-plugins/vault/)
 * [Multiworld](http://dev.bukkit.org/bukkit-plugins/multiworld-v-2-0/)
-* [LogBlock](http://dev.bukkit.org/bukkit-plugins/logblock/)
\ No newline at end of file
+* [LogBlock](http://dev.bukkit.org/bukkit-plugins/logblock/)
+
+Building
+--------
+Download and install xAuth and Multiworld into the local `repo` repository with a command like so:
+
+```bash
+mvn install:install-file -Dfile=xAuth-2.0.26.jar -Dpackaging=jar -DlocalRepositoryPath=repo -DgroupId=de.luricos.bukkit -DartifactId=xAuth -Dversion=2.0.26
+```
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index a3253de..0b5149e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,72 +1,93 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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>de.jaschastarke</groupId>
-  <artifactId>LimitedCreative</artifactId>
-  <name>LimitedCreative</name>
-    <version>2.4</version>
-  <url>https://github.com/possi/LimitedCreative</url>
-  
-  <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <plib.version>1.4-SNAPSHOT</plib.version>
-    <bukkit.version>1.12.2-R0.1-SNAPSHOT</bukkit.version>
-  </properties>
-  
-  <scm>
-  	<connection>scm:git:git://github.com/possi/LimitedCreative.git</connection>
-  	<developerConnection>scm:git:git@github.com:possi/LimitedCreative.git</developerConnection>
-  	<url>https://github.com/possi/LimitedCreative/tree/plib</url>
-  </scm>
-  <distributionManagement>
-    <repository>
-      <id>de-jas-repo</id>
-      <url>scp://repo@ja-s.de/var/customers/webs/repo/mvn</url>
-    </repository>
-  </distributionManagement>
-  <ciManagement>
-    <system>jenkins</system>
-    <url>http://ci.ja-s.de:8080/</url>
-  </ciManagement>
-  <issueManagement>
-    <system>BukkitDev</system>
-    <url>http://dev.bukkit.org/server-mods/limited-creative/tickets/</url>
-  </issueManagement>
-  
-  <repositories>
-    <!-- Possible public Maven Repository, containing LimitedCreative builds and other dependencies without own rep.
-         like AuthMe, etc.
-         Supports http only -->
-    <repository>
-      <id>de-jas-rep</id>
-      <url>http://repo.ja-s.de/mvn</url>
-    </repository>
-    
-    <!-- Official (Craft-)Bukkit repository -->
-    <repository>
-      <id>spigot-repo</id>
-      <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
-    </repository>
-    <!-- Official WorldGuard and WorldEdit repository -->
-    <repository>
-      <id>sk89q-mvn2</id>
-        <url>https://maven.enginehub.org/repo/</url>
-    </repository>
-    <!-- Official Multiverse repository -->
-    <repository>
-        <id>onarandombox</id>
-        <url>http://repo.onarandombox.com/content/groups/public</url>
-    </repository>
-    <!-- Official xAuth repository; it is no good! we keep our own dep-files of it - ->
-    <repository>
-        <id>luricos.de-repo</id>
-        <url>http://repo.luricos.de/bukkit-plugins/</url>
-    </repository><!- - -->
-    <!-- Official LogBlock repository -->
-    <repository>
-        <id>md5</id>
-        <url>http://repo.md-5.net/content/groups/public/</url>
-    </repository>
-  </repositories>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         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>de.jaschastarke</groupId>
+    <artifactId>LimitedCreative</artifactId>
+    <name>LimitedCreative</name>
+    <version>2.5-SNAPSHOT</version>
+    <url>https://github.com/possi/LimitedCreative</url>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <plib.version>1.4-SNAPSHOT</plib.version>
+        <bukkit.version>1.12.2-R0.1-SNAPSHOT</bukkit.version>
+    </properties>
+
+    <scm>
+        <connection>scm:git:git://github.com/possi/LimitedCreative.git</connection>
+        <developerConnection>scm:git:git@github.com:possi/LimitedCreative.git</developerConnection>
+        <url>https://github.com/possi/LimitedCreative/tree/plib</url>
+    </scm>
+    <distributionManagement>
+        <repository>
+            <id>de-jas-repo</id>
+            <url>scp://repo@ja-s.de/var/customers/webs/repo/mvn</url>
+        </repository>
+    </distributionManagement>
+    <ciManagement>
+        <system>jenkins</system>
+        <url>http://ci.ja-s.de:8080/</url>
+    </ciManagement>
+    <issueManagement>
+        <system>BukkitDev</system>
+        <url>http://dev.bukkit.org/server-mods/limited-creative/tickets/</url>
+    </issueManagement>
+
+    <repositories>
+        <!-- Possible public Maven Repository, containing LimitedCreative builds and other dependencies without own rep.
+             like AuthMe, etc.
+             Supports http only -->
+        <!-- <repository> - offline
+          <id>de-jas-rep</id>
+          <url>http://repo.ja-s.de/mvn</url>
+        </repository> -->
+        <!-- Local repository for plugins without a repo -->
+        <repository>
+            <id>localRepo</id>
+            <url>file://${project.basedir}/repo</url>
+        </repository>
+
+        <!-- Official (Craft-)Bukkit repository -->
+        <repository>
+            <id>spigot-repo</id>
+            <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
+        </repository>
+        <!-- Official WorldGuard and WorldEdit repository -->
+        <repository>
+            <id>sk89q-mvn2</id>
+            <url>https://maven.enginehub.org/repo/</url>
+        </repository>
+        <!-- Official Multiverse repository -->
+        <repository>
+            <id>onarandombox</id>
+            <url>http://repo.onarandombox.com/content/groups/public</url>
+        </repository>
+        <!-- Official xAuth repository; it is no good! we keep our own dep-files of it - ->
+        <repository>
+            <id>luricos.de-repo</id>
+            <url>http://repo.luricos.de/repository/bukkit-plugins/</url>
+        </repository><!- - It points to dependencies that don't exist anymore -->
+        <!-- Official LogBlock repository -->
+        <repository>
+            <id>md5</id>
+            <url>http://repo.md-5.net/content/groups/public/</url>
+        </repository>
+        <!-- Official AuthMe Reloaded repository -->
+        <repository>
+            <id>codemc-repo</id>
+            <url>https://repo.codemc.org/repository/maven-public/</url>
+        </repository>
+        <!-- Official CoreProtect repository -->
+        <repository>
+            <id>coreprotect-repo</id>
+            <url>http://maven.playpro.com/</url>
+        </repository>
+        <!-- Official PermissionsEx repository -->
+        <repository>
+            <id>pex-repo</id>
+            <url>https://repo.glaremasters.me/repository/permissionsex/</url>
+        </repository>
+    </repositories>
 
     <pluginRepositories>
         <pluginRepository>
@@ -75,200 +96,195 @@
         </pluginRepository>
     </pluginRepositories>
 
-  <dependencies>
-    <dependency>
-        <groupId>de.jaschastarke</groupId>
-        <artifactId>plib</artifactId>
-        <version>${plib.version}</version>
-    </dependency>
-      <dependency>
-          <!-- http://dl.bukkit.org/ -->
-          <groupId>org.bukkit</groupId>
-          <artifactId>bukkit</artifactId>
-          <version>${bukkit.version}</version>
-      </dependency>
-      <dependency>
-          <!-- http://dl.bukkit.org/ -->
-          <groupId>org.bukkit.</groupId> <!-- Needed for WE integration -->
-          <artifactId>bukkit</artifactId>
-          <version>1.14.4-R0.1-SNAPSHOT</version>
-      </dependency>
-    <dependency>
-        <!-- http://dev.bukkit.org/server-mods/worldguard/ -->
-        <groupId>com.sk89q.worldguard</groupId>
-        <artifactId>worldguard-bukkit</artifactId>
-        <version>7.0.0</version>
-    </dependency>
-    <dependency>
-        <!-- http://dev.bukkit.org/server-mods/worldguard/ -->
-        <groupId>com.sk89q.worldedit</groupId>
-        <artifactId>worldedit-bukkit</artifactId>
-        <version>7.0.0</version>
-    </dependency>
-    <dependency>
-        <!-- http://dev.bukkit.org/server-mods/authme-reloaded/ -->
-        <groupId>uk.org.whoami</groupId>
-        <artifactId>authme</artifactId>
-        <version>2.9.5</version>
-    </dependency>
-    <dependency>
-        <!-- http://dev.bukkit.org/server-mods/authme-reloaded/ -->
-        <groupId>fr.xephi</groupId>
-        <artifactId>authme</artifactId>
-        <version>3.0</version>
-    </dependency>
-    <dependency>
-        <!-- http://dev.bukkit.org/server-mods/multiverse-core/ -->
-        <groupId>com.onarandombox.multiversecore</groupId>
-        <artifactId>Multiverse-Core</artifactId>
-        <version>2.4</version>
-    </dependency>
-    <dependency>
-        <!-- http://dev.bukkit.org/bukkit-plugins/multiworld-v-2-0/ -->
-        <groupId>multiworld</groupId>
-        <artifactId>multiworld</artifactId>
-        <version>4.7.2</version>
-    </dependency>
-    <dependency>
-        <!-- http://dev.bukkit.org/server-mods/xauth/ -->
-        <groupId>com.cypherx</groupId>
-        <artifactId>xauth</artifactId>
-        <version>2.0.26</version>
-    </dependency>
-    <dependency>
-        <!-- http://dev.bukkit.org/bukkit-plugins/coreprotect/ -->
-        <groupId>net.coreprotect</groupId>
-        <artifactId>coreprotect</artifactId>
-        <version>2.0.8</version>
-    </dependency>
-    <!-- https://mvnrepository.com/artifact/org.avaje/ebean -->
-    <dependency>
-        <groupId>org.avaje</groupId>
-        <artifactId>ebean</artifactId>
-        <version>2.7.3</version>
-    </dependency>
-  </dependencies>
-  
-  <build>
-    <sourceDirectory>${basedir}/src/main/java</sourceDirectory>
-    <finalName>${project.artifactId}</finalName>
-    
-  	<plugins>
-      <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-compiler-plugin</artifactId>
-          <version>2.3.2</version>
-          <configuration>
-              <source>1.8</source>
-              <target>1.8</target>
-              <annotationProcessors>
-                <!-- Needed to fetch DocComments from Source -->
-                <annotationProcessor>de.jaschastarke.maven.AnnotationProcessor</annotationProcessor>
-              </annotationProcessors>
-          </configuration>
-      </plugin>
-      <plugin>
-        <groupId>de.jaschastarke</groupId>
-        <artifactId>plib</artifactId>
-        <version>${plib.version}</version>
-        <executions>
-          <execution>
-            <phase>compile</phase>
-            <goals>
-              <goal>pluginyaml</goal>
-            </goals>
-            <configuration>
-              <!-- plugin.yml -->
-              <mainClass>de.jaschastarke.minecraft.limitedcreative.LimitedCreative</mainClass>
-              <softdepend>
-                <param>WorldGuard</param>
-                <param>WorldEdit</param>
-                <param>Multiverse-Core</param>
-                <param>Multiworld</param>
-                <param>xAuth</param>
-                <param>AuthMe</param>
-                <param>MultiInv</param>
-                <param>Multiverse-Inventories</param>
-                <param>Vault</param>
-                <param>CoreProtect</param>
-              </softdepend>
-              <custom>
-                <dev-url>http://dev.bukkit.org/server-mods/limited-creative/</dev-url>
-              </custom>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-shade-plugin</artifactId>
-        <version>2.0</version>
-        <executions>
-          <execution>
-            <phase>package</phase>
-            <goals>
-              <goal>shade</goal>
-            </goals>
-            <configuration>
-              <createDependencyReducedPom>false</createDependencyReducedPom>
-              <artifactSet>
-                <includes>
-                  <include>de.jaschastarke:plib</include>
-                </includes>
-              </artifactSet>
-              <filters>
-                <filter>
-                  <artifact>de.jaschastarke:plib</artifact>
-                  <excludes>
-                    <exclude>de/jaschastarke/maven/**</exclude>
-                    <exclude>de/jaschastarke/bukkit/maven/**</exclude>
-                  </excludes>
-                </filter>
-              </filters>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-  	</plugins>
-  	
-  	<pluginManagement>
-  		<plugins>
-  			<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
-  			<plugin>
-  				<groupId>org.eclipse.m2e</groupId>
-  				<artifactId>lifecycle-mapping</artifactId>
-  				<version>1.0.0</version>
-  				<configuration>
-  					<lifecycleMappingMetadata>
-  						<pluginExecutions>
-  							<pluginExecution>
-  								<pluginExecutionFilter>
-  									<groupId>de.jaschastarke</groupId>
-  									<artifactId>plib</artifactId>
-  									<versionRange>
-  										[0.1-SNAPSHOT,)
-  									</versionRange>
-  									<goals>
-  										<goal>pluginyaml</goal>
-  									</goals>
-  								</pluginExecutionFilter>
-  								<action>
-  									<ignore></ignore>
-  								</action>
-  							</pluginExecution>
-  						</pluginExecutions>
-  					</lifecycleMappingMetadata>
-  				</configuration>
-  			</plugin>
-  		</plugins>
-  	</pluginManagement>
-    <extensions>
-      <!-- Enabling the use of SCP -->
-      <extension>
-        <groupId>org.apache.maven.wagon</groupId>
-         <artifactId>wagon-ssh</artifactId>
-         <version>2.1</version>
-      </extension>
-    </extensions>
-  </build>
+    <dependencies>
+        <dependency>
+            <groupId>de.jaschastarke</groupId>
+            <artifactId>plib</artifactId>
+            <version>${plib.version}</version>
+        </dependency>
+        <dependency>
+            <!-- http://dl.bukkit.org/ -->
+            <groupId>org.bukkit</groupId>
+            <artifactId>bukkit</artifactId>
+            <version>${bukkit.version}</version>
+        </dependency>
+        <dependency>
+            <!-- http://dl.bukkit.org/ -->
+            <groupId>org.bukkit.</groupId> <!-- Needed for WE integration -->
+            <artifactId>bukkit</artifactId>
+            <version>1.14.4-R0.1-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <!-- http://dev.bukkit.org/server-mods/worldguard/ -->
+            <groupId>com.sk89q.worldguard</groupId>
+            <artifactId>worldguard-bukkit</artifactId>
+            <version>7.0.0</version>
+        </dependency>
+        <dependency>
+            <!-- http://dev.bukkit.org/server-mods/worldguard/ -->
+            <groupId>com.sk89q.worldedit</groupId>
+            <artifactId>worldedit-bukkit</artifactId>
+            <version>7.0.0</version>
+        </dependency>
+        <dependency>
+            <!-- http://dev.bukkit.org/server-mods/authme-reloaded/ -->
+            <groupId>fr.xephi</groupId>
+            <artifactId>authme</artifactId>
+            <version>5.6.0-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <!-- http://dev.bukkit.org/server-mods/multiverse-core/ -->
+            <groupId>com.onarandombox.multiversecore</groupId>
+            <artifactId>Multiverse-Core</artifactId>
+            <version>2.4</version>
+        </dependency>
+        <dependency>
+            <!-- http://dev.bukkit.org/bukkit-plugins/multiworld-v-2-0/ -->
+            <groupId>multiworld</groupId>
+            <artifactId>multiworld</artifactId>
+            <version>5.2.8</version>
+        </dependency>
+        <dependency>
+            <!-- http://dev.bukkit.org/server-mods/xauth/ -->
+            <groupId>de.luricos.bukkit</groupId>
+            <artifactId>xAuth</artifactId>
+            <version>2.0.26</version>
+        </dependency>
+        <dependency>
+            <!-- http://dev.bukkit.org/bukkit-plugins/coreprotect/ -->
+            <groupId>net.coreprotect</groupId>
+            <artifactId>coreprotect</artifactId>
+            <version>19.1</version>
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/org.avaje/ebean -->
+        <dependency>
+            <groupId>org.avaje</groupId>
+            <artifactId>ebean</artifactId>
+            <version>2.7.3</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <sourceDirectory>${basedir}/src/main/java</sourceDirectory>
+        <finalName>${project.artifactId}</finalName>
+
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>2.3.2</version>
+                <configuration>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                    <annotationProcessors>
+                        <!-- Needed to fetch DocComments from Source -->
+                        <annotationProcessor>de.jaschastarke.maven.AnnotationProcessor</annotationProcessor>
+                    </annotationProcessors>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>de.jaschastarke</groupId>
+                <artifactId>plib</artifactId>
+                <version>${plib.version}</version>
+                <executions>
+                    <execution>
+                        <phase>compile</phase>
+                        <goals>
+                            <goal>pluginyaml</goal>
+                        </goals>
+                        <configuration>
+                            <!-- plugin.yml -->
+                            <mainClass>de.jaschastarke.minecraft.limitedcreative.LimitedCreative</mainClass>
+                            <softdepend>
+                                <param>WorldGuard</param>
+                                <param>WorldEdit</param>
+                                <param>Multiverse-Core</param>
+                                <param>Multiworld</param>
+                                <param>xAuth</param>
+                                <param>AuthMe</param>
+                                <param>MultiInv</param>
+                                <param>Multiverse-Inventories</param>
+                                <param>Vault</param>
+                                <param>CoreProtect</param>
+                            </softdepend>
+                            <custom>
+                                <dev-url>http://dev.bukkit.org/server-mods/limited-creative/</dev-url>
+                            </custom>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>2.0</version>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                        <configuration>
+                            <createDependencyReducedPom>false</createDependencyReducedPom>
+                            <artifactSet>
+                                <includes>
+                                    <include>de.jaschastarke:plib</include>
+                                </includes>
+                            </artifactSet>
+                            <filters>
+                                <filter>
+                                    <artifact>de.jaschastarke:plib</artifact>
+                                    <excludes>
+                                        <exclude>de/jaschastarke/maven/**</exclude>
+                                        <exclude>de/jaschastarke/bukkit/maven/**</exclude>
+                                    </excludes>
+                                </filter>
+                            </filters>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+
+        <pluginManagement>
+            <plugins>
+                <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
+                <plugin>
+                    <groupId>org.eclipse.m2e</groupId>
+                    <artifactId>lifecycle-mapping</artifactId>
+                    <version>1.0.0</version>
+                    <configuration>
+                        <lifecycleMappingMetadata>
+                            <pluginExecutions>
+                                <pluginExecution>
+                                    <pluginExecutionFilter>
+                                        <groupId>de.jaschastarke</groupId>
+                                        <artifactId>plib</artifactId>
+                                        <versionRange>
+                                            [0.1-SNAPSHOT,)
+                                        </versionRange>
+                                        <goals>
+                                            <goal>pluginyaml</goal>
+                                        </goals>
+                                    </pluginExecutionFilter>
+                                    <action>
+                                        <ignore></ignore>
+                                    </action>
+                                </pluginExecution>
+                            </pluginExecutions>
+                        </lifecycleMappingMetadata>
+                    </configuration>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+        <extensions>
+            <!-- Enabling the use of SCP -->
+            <extension>
+                <groupId>org.apache.maven.wagon</groupId>
+                <artifactId>wagon-ssh</artifactId>
+                <version>2.1</version>
+            </extension>
+        </extensions>
+    </build>
 </project>
diff --git a/src/main/java/de/jaschastarke/minecraft/limitedcreative/hooks/AuthMeHooks.java b/src/main/java/de/jaschastarke/minecraft/limitedcreative/hooks/AuthMeHooks.java
index d665b72..518f288 100644
--- a/src/main/java/de/jaschastarke/minecraft/limitedcreative/hooks/AuthMeHooks.java
+++ b/src/main/java/de/jaschastarke/minecraft/limitedcreative/hooks/AuthMeHooks.java
@@ -1,18 +1,17 @@
 package de.jaschastarke.minecraft.limitedcreative.hooks;
 
-import org.bukkit.entity.Player;
-
-import uk.org.whoami.authme.api.API;
 import de.jaschastarke.minecraft.limitedcreative.Hooks;
 import de.jaschastarke.minecraft.limitedcreative.LimitedCreative;
+import fr.xephi.authme.api.v3.AuthMeApi;
+import org.bukkit.entity.Player;
 
-@Deprecated // AuthMe 3.0 released. Compatibility for older versions will be removed sometime
+//@Deprecated // AuthMe 3.0 released. Compatibility for older versions will be removed sometime
 public class AuthMeHooks {
     public AuthMeHooks(final LimitedCreative plugin) {
         Hooks.IsLoggedIn.register(new PlayerCheckHooker.Check() {
             @Override
             public boolean test(Player player) {
-                boolean li = API.isAuthenticated(player);
+                boolean li = AuthMeApi.getInstance().isAuthenticated(player);
                 if (plugin.isDebug()) // not nessesary, but so no string concation without debug needed
                     plugin.getLog().debug("AuthMe: "+player.getName()+": logged in: "+li);
                 return li;
diff --git a/src/main/java/de/jaschastarke/minecraft/limitedcreative/inventories/AuthMeInventories.java b/src/main/java/de/jaschastarke/minecraft/limitedcreative/inventories/AuthMeInventories.java
index b0d109b..bab466a 100644
--- a/src/main/java/de/jaschastarke/minecraft/limitedcreative/inventories/AuthMeInventories.java
+++ b/src/main/java/de/jaschastarke/minecraft/limitedcreative/inventories/AuthMeInventories.java
@@ -1,16 +1,15 @@
 package de.jaschastarke.minecraft.limitedcreative.inventories;
 
+import de.jaschastarke.bukkit.lib.SimpleModule;
+import de.jaschastarke.minecraft.limitedcreative.LimitedCreative;
+import de.jaschastarke.minecraft.limitedcreative.ModInventories;
+import fr.xephi.authme.events.ProtectInventoryEvent;
+import fr.xephi.authme.events.RestoreInventoryEvent;
 import org.bukkit.GameMode;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 
-import uk.org.whoami.authme.events.RestoreInventoryEvent;
-import uk.org.whoami.authme.events.StoreInventoryEvent;
-import de.jaschastarke.bukkit.lib.SimpleModule;
-import de.jaschastarke.minecraft.limitedcreative.LimitedCreative;
-import de.jaschastarke.minecraft.limitedcreative.ModInventories;
-
-@Deprecated // AuthMe 3.0 released. Compatibility for older versions will be removed sometime
+//@Deprecated // AuthMe 3.0 released. Compatibility for older versions will be removed sometime
 public class AuthMeInventories extends SimpleModule<LimitedCreative> implements Listener {
     ModInventories invmod;
     public AuthMeInventories(LimitedCreative plugin, ModInventories modInventories) {
@@ -19,16 +18,16 @@ public class AuthMeInventories extends SimpleModule<LimitedCreative> implements
     }
 
     @EventHandler
-    public void onStoreInventory(StoreInventoryEvent event) {
+    public void onStoreInventory(ProtectInventoryEvent event) {
         if (isDebug())
-            getLog().debug("AuthMe Store Event: "+event.getPlayer().getName());
-        
+            getLog().debug("AuthMe Store Event: " + event.getPlayer().getName());
+
         event.getPlayer().closeInventory();
         GameMode cgm = event.getPlayer().getGameMode();
-        
+
         if (cgm == GameMode.ADVENTURE && !invmod.getConfig().getSeparateAdventure())
             cgm = GameMode.SURVIVAL;
-        
+
         if (cgm != GameMode.CREATIVE || invmod.getConfig().getStoreCreative()) {
             invmod.getInventory(event.getPlayer()).save(cgm);
         }