Update dependencies

README.md

@@ -18,3 +18,11 @@ Dependencies for optional integrations
 * [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/)
+
+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
+```

pom.xml

@@ -1,9 +1,10 @@
-<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">
+<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>
+    <version>2.5-SNAPSHOT</version>
     <url>https://github.com/possi/LimitedCreative</url>
 
     <properties>
@@ -36,9 +37,14 @@
         <!-- Possible public Maven Repository, containing LimitedCreative builds and other dependencies without own rep.
              like AuthMe, etc.
              Supports http only -->
-    <repository>
+        <!-- <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 -->
@@ -59,13 +65,28 @@
         <!-- 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>
+            <url>http://repo.luricos.de/repository/bukkit-plugins/</url>
-    </repository><!- - -->
+        </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>
@@ -105,17 +126,12 @@
             <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>
+            <version>5.6.0-SNAPSHOT</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <!-- http://dev.bukkit.org/server-mods/multiverse-core/ -->
@@ -127,19 +143,19 @@
             <!-- http://dev.bukkit.org/bukkit-plugins/multiworld-v-2-0/ -->
             <groupId>multiworld</groupId>
             <artifactId>multiworld</artifactId>
-        <version>4.7.2</version>
+            <version>5.2.8</version>
         </dependency>
         <dependency>
             <!-- http://dev.bukkit.org/server-mods/xauth/ -->
-        <groupId>com.cypherx</groupId>
+            <groupId>de.luricos.bukkit</groupId>
-        <artifactId>xauth</artifactId>
+            <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>
+            <version>19.1</version>
         </dependency>
         <!-- https://mvnrepository.com/artifact/org.avaje/ebean -->
         <dependency>

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;

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;
+//@Deprecated // AuthMe 3.0 released. Compatibility for older versions will be removed sometime
-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
 public class AuthMeInventories extends SimpleModule<LimitedCreative> implements Listener {
     ModInventories invmod;
     public AuthMeInventories(LimitedCreative plugin, ModInventories modInventories) {
@@ -19,7 +18,7 @@ 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());