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