From e4548069dce18bcbec0dba1060dd87c8403b1cf1 Mon Sep 17 00:00:00 2001 From: NorbiPeti Date: Mon, 27 Jul 2020 16:24:42 +0200 Subject: [PATCH] Update dependencies --- README.md | 10 +- pom.xml | 546 +++++++++--------- .../limitedcreative/hooks/AuthMeHooks.java | 9 +- .../inventories/AuthMeInventories.java | 23 +- 4 files changed, 305 insertions(+), 283 deletions(-) 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 @@ - - 4.0.0 - de.jaschastarke - LimitedCreative - LimitedCreative - 2.4 - https://github.com/possi/LimitedCreative - - - UTF-8 - 1.4-SNAPSHOT - 1.12.2-R0.1-SNAPSHOT - - - - scm:git:git://github.com/possi/LimitedCreative.git - scm:git:git@github.com:possi/LimitedCreative.git - https://github.com/possi/LimitedCreative/tree/plib - - - - de-jas-repo - scp://repo@ja-s.de/var/customers/webs/repo/mvn - - - - jenkins - http://ci.ja-s.de:8080/ - - - BukkitDev - http://dev.bukkit.org/server-mods/limited-creative/tickets/ - - - - - - de-jas-rep - http://repo.ja-s.de/mvn - - - - - spigot-repo - https://hub.spigotmc.org/nexus/content/repositories/snapshots/ - - - - sk89q-mvn2 - https://maven.enginehub.org/repo/ - - - - onarandombox - http://repo.onarandombox.com/content/groups/public - - - - - md5 - http://repo.md-5.net/content/groups/public/ - - + + 4.0.0 + de.jaschastarke + LimitedCreative + LimitedCreative + 2.5-SNAPSHOT + https://github.com/possi/LimitedCreative + + + UTF-8 + 1.4-SNAPSHOT + 1.12.2-R0.1-SNAPSHOT + + + + scm:git:git://github.com/possi/LimitedCreative.git + scm:git:git@github.com:possi/LimitedCreative.git + https://github.com/possi/LimitedCreative/tree/plib + + + + de-jas-repo + scp://repo@ja-s.de/var/customers/webs/repo/mvn + + + + jenkins + http://ci.ja-s.de:8080/ + + + BukkitDev + http://dev.bukkit.org/server-mods/limited-creative/tickets/ + + + + + + + + localRepo + file://${project.basedir}/repo + + + + + spigot-repo + https://hub.spigotmc.org/nexus/content/repositories/snapshots/ + + + + sk89q-mvn2 + https://maven.enginehub.org/repo/ + + + + onarandombox + http://repo.onarandombox.com/content/groups/public + + + + + md5 + http://repo.md-5.net/content/groups/public/ + + + + codemc-repo + https://repo.codemc.org/repository/maven-public/ + + + + coreprotect-repo + http://maven.playpro.com/ + + + + pex-repo + https://repo.glaremasters.me/repository/permissionsex/ + + @@ -75,200 +96,195 @@ - - - de.jaschastarke - plib - ${plib.version} - - - - org.bukkit - bukkit - ${bukkit.version} - - - - org.bukkit. - bukkit - 1.14.4-R0.1-SNAPSHOT - - - - com.sk89q.worldguard - worldguard-bukkit - 7.0.0 - - - - com.sk89q.worldedit - worldedit-bukkit - 7.0.0 - - - - uk.org.whoami - authme - 2.9.5 - - - - fr.xephi - authme - 3.0 - - - - com.onarandombox.multiversecore - Multiverse-Core - 2.4 - - - - multiworld - multiworld - 4.7.2 - - - - com.cypherx - xauth - 2.0.26 - - - - net.coreprotect - coreprotect - 2.0.8 - - - - org.avaje - ebean - 2.7.3 - - - - - ${basedir}/src/main/java - ${project.artifactId} - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.3.2 - - 1.8 - 1.8 - - - de.jaschastarke.maven.AnnotationProcessor - - - - - de.jaschastarke - plib - ${plib.version} - - - compile - - pluginyaml - - - - de.jaschastarke.minecraft.limitedcreative.LimitedCreative - - WorldGuard - WorldEdit - Multiverse-Core - Multiworld - xAuth - AuthMe - MultiInv - Multiverse-Inventories - Vault - CoreProtect - - - http://dev.bukkit.org/server-mods/limited-creative/ - - - - - - - org.apache.maven.plugins - maven-shade-plugin - 2.0 - - - package - - shade - - - false - - - de.jaschastarke:plib - - - - - de.jaschastarke:plib - - de/jaschastarke/maven/** - de/jaschastarke/bukkit/maven/** - - - - - - - - - - - - - - org.eclipse.m2e - lifecycle-mapping - 1.0.0 - - - - - - de.jaschastarke - plib - - [0.1-SNAPSHOT,) - - - pluginyaml - - - - - - - - - - - - - - - - org.apache.maven.wagon - wagon-ssh - 2.1 - - - + + + de.jaschastarke + plib + ${plib.version} + + + + org.bukkit + bukkit + ${bukkit.version} + + + + org.bukkit. + bukkit + 1.14.4-R0.1-SNAPSHOT + + + + com.sk89q.worldguard + worldguard-bukkit + 7.0.0 + + + + com.sk89q.worldedit + worldedit-bukkit + 7.0.0 + + + + fr.xephi + authme + 5.6.0-SNAPSHOT + provided + + + + com.onarandombox.multiversecore + Multiverse-Core + 2.4 + + + + multiworld + multiworld + 5.2.8 + + + + de.luricos.bukkit + xAuth + 2.0.26 + + + + net.coreprotect + coreprotect + 19.1 + + + + org.avaje + ebean + 2.7.3 + + + + + ${basedir}/src/main/java + ${project.artifactId} + + + + org.apache.maven.plugins + maven-compiler-plugin + 2.3.2 + + 1.8 + 1.8 + + + de.jaschastarke.maven.AnnotationProcessor + + + + + de.jaschastarke + plib + ${plib.version} + + + compile + + pluginyaml + + + + de.jaschastarke.minecraft.limitedcreative.LimitedCreative + + WorldGuard + WorldEdit + Multiverse-Core + Multiworld + xAuth + AuthMe + MultiInv + Multiverse-Inventories + Vault + CoreProtect + + + http://dev.bukkit.org/server-mods/limited-creative/ + + + + + + + org.apache.maven.plugins + maven-shade-plugin + 2.0 + + + package + + shade + + + false + + + de.jaschastarke:plib + + + + + de.jaschastarke:plib + + de/jaschastarke/maven/** + de/jaschastarke/bukkit/maven/** + + + + + + + + + + + + + + org.eclipse.m2e + lifecycle-mapping + 1.0.0 + + + + + + de.jaschastarke + plib + + [0.1-SNAPSHOT,) + + + pluginyaml + + + + + + + + + + + + + + + + org.apache.maven.wagon + wagon-ssh + 2.1 + + + 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 implements Listener { ModInventories invmod; public AuthMeInventories(LimitedCreative plugin, ModInventories modInventories) { @@ -19,16 +18,16 @@ public class AuthMeInventories extends SimpleModule 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); }