Upstream/AuthMeReloaded
1
0
Fork 0
mirror of https://github.com/AuthMe/AuthMeReloaded.git synced 2024-11-27 20:57:35 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #167 from AuthMe-Team/master

Browse Source 
Update pom
This commit is contained in:
Alexandre Vanhecke 2015-08-06 20:11:48 +02:00
commit 7002484174
3 changed files with 535 additions and 565 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

122
pom.xml
View File

@ -7,22 +7,17 @@
<artifactId>authme</artifactId> <artifactId>authme</artifactId>
<version>5.0-SNAPSHOT</version> <version>5.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>AuthMeReloaded</name> <name>AuthMeReloaded</name>
<description>Authentication plugin for CraftBukkit/Spigot!</description> <description>Authentication plugin for CraftBukkit/Spigot!</description>
<inceptionYear>2013</inceptionYear>
<url>http://dev.bukkit.org/bukkit-plugins/authme-reloaded/</url> <url>http://dev.bukkit.org/bukkit-plugins/authme-reloaded/</url>
<!-- See also: https://www.spigotmc.org/resources/authme-reloaded.6269/ -->
<properties> <scm>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <connection>scm:git:https://github.com/Xephi/AuthMeReloaded.git</connection>
<developerConnection>scm:git:git@github.com:Xephi/AuthMeReloaded.git</developerConnection>
<!-- Change Compiler Version (JDK) HERE! --> <url>http://github.com/Xephi/AuthMeReloaded</url>
<maven.compiler.source>1.7</maven.compiler.source> </scm>
<maven.compiler.target>1.7</maven.compiler.target>
<!-- Change MC Version HERE! -->
<bukkitVersion>1.8.8-R0.1-SNAPSHOT</bukkitVersion>
</properties>
<!-- Official Build Server --> <!-- Official Build Server -->
<ciManagement> <ciManagement>
@ -35,47 +30,41 @@
<url>https://github.com/Xephi/AuthMeReloaded/issues</url> <url>https://github.com/Xephi/AuthMeReloaded/issues</url>
</issueManagement> </issueManagement>
<licenses>
<license>
<name>Apache-2.0</name>
<url>http://www.apache.org/licenses/LICENSE-2.0</url>
</license>
</licenses>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<!-- Change Compiler Version (JDK) HERE! -->
<javaVersion>1.7</javaVersion>
<!-- Change MC Version HERE! -->
<bukkitVersion>1.8.8-R0.1-SNAPSHOT</bukkitVersion>
</properties>
<build> <build>
<finalName>AuthMe-${project.version}</finalName>
<resources>
<resource>
<targetPath>.</targetPath>
<filtering>true</filtering>
<directory>${basedir}/src/main/resources/</directory>
<includes>
<include>*.yml</include>
</includes>
</resource>
</resources>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>3.3</version> <version>3.3</version>
<configuration> <configuration>
<source>${maven.compiler.source}</source> <source>1.7</source>
<target>${maven.compiler.target}</target> <target>${javaVersion}</target>
</configuration>
</plugin>
<plugin>
<groupId>com.google.code.maven-replacer-plugin</groupId>
<artifactId>replacer</artifactId>
<version>1.5.3</version>
<executions>
<execution>
<phase>prepare-package</phase>
<goals>
<goal>replace</goal>
</goals>
</execution>
</executions>
<configuration>
<file>target/classes/plugin.yml</file>
<replacements>
<replacement>
<token>maven-version</token>
<value>${project.version}</value>
</replacement>
</replacements>
</configuration>
</plugin>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
<version>2.6</version>
<configuration>
<archive>
<manifestFile>${manifest.file}</manifestFile>
</archive>
<finalName>AuthMe-${project.version}</finalName>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>
@ -110,15 +99,6 @@
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
<plugin>
<groupId>com.versioneye</groupId>
<artifactId>versioneye-maven-plugin</artifactId>
<version>3.5.1</version>
<configuration>
<projectId>55bab9e8653762002000190a</projectId>
<!--<apiKey>my_secret_api_key</apiKey> -->
</configuration>
</plugin>
</plugins> </plugins>
</build> </build>
@ -130,10 +110,10 @@
<url>https://hub.spigotmc.org/nexus/content/groups/public</url> <url>https://hub.spigotmc.org/nexus/content/groups/public</url>
</repository> </repository>
<!-- Essentials Repo --> <!-- EssentialsX Repo -->
<repository> <repository>
<id>ess-repo</id> <id>ess-repo</id>
<url>http://repo.ess3.net/content/groups/public</url> <url>https://ci.drtshock.net/plugin/repository/everything</url>
</repository> </repository>
<!-- Citizens API 2.X Repo --> <!-- Citizens API 2.X Repo -->
@ -190,7 +170,7 @@
<!-- Maven Dependencies --> <!-- Maven Dependencies -->
<!-- MySql Library --> <!-- MySql Connection Pool -->
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId> <artifactId>slf4j-simple</artifactId>
@ -250,26 +230,16 @@
<groupId>org.bukkit</groupId> <groupId>org.bukkit</groupId>
<artifactId>bukkit</artifactId> <artifactId>bukkit</artifactId>
</exclusion> </exclusion>
<exclusion>
<groupId>org.bukkit</groupId>
<artifactId>craftbukkit</artifactId>
</exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
<!-- Spigot-Api, http://www.spigotmc.org/ Based on the Bukkit project, <!-- Spigot-Api, http://www.spigotmc.org/ Based on the Bukkit project,
http://bukkit.org/ --> http://bukkit.org/ -->
<dependency> <dependency>
<groupId>org.spigotmc</groupId> <groupId>org.bukkit</groupId>
<artifactId>spigot-api</artifactId> <artifactId>bukkit</artifactId>
<version>${bukkitVersion}</version> <version>${bukkitVersion}</version>
<scope>provided</scope> <scope>provided</scope>
<exclusions>
<exclusion>
<artifactId>bungeecord-chat</artifactId>
<groupId>net.md-5</groupId>
</exclusion>
</exclusions>
</dependency> </dependency>
<!-- Attribute --> <!-- Attribute -->
@ -360,17 +330,13 @@
<!-- Essentials plugin --> <!-- Essentials plugin -->
<dependency> <dependency>
<groupId>net.ess3</groupId> <groupId>net.ess3</groupId>
<artifactId>Essentials</artifactId> <artifactId>EssentialsX</artifactId>
<version>2.14-SNAPSHOT</version> <version>2.0.1-SNAPSHOT</version>
<scope>provided</scope> <scope>provided</scope>
<exclusions> <exclusions>
<exclusion> <exclusion>
<groupId>org.bukkit</groupId> <groupId>org.spigotmc</groupId>
<artifactId>bukkit</artifactId> <artifactId>spigot-api</artifactId>
</exclusion>
<exclusion>
<groupId>org.bukkit</groupId>
<artifactId>craftbukkit</artifactId>
</exclusion> </exclusion>
</exclusions> </exclusions>
</dependency> </dependency>

6
src/main/java/fr/xephi/authme/cache/backup/FileCache.java vendored
View File

@ -504,7 +504,8 @@ public class FileCache {
armours[i] = attributes.getStack(); armours[i] = attributes.getStack();
else armours[i] = item; else armours[i] = item;
} }
} catch (final RuntimeException e) {
ConsoleLogger.showError("Error while reading file for " + player.getName() + ", some wipe inventory incoming...");
} catch (final Exception e) { } catch (final Exception e) {
ConsoleLogger.showError("Error while reading file for " + player.getName() + ", some wipe inventory incoming..."); ConsoleLogger.showError("Error while reading file for " + player.getName() + ", some wipe inventory incoming...");
} finally { } finally {
@ -513,6 +514,9 @@ public class FileCache {
} }
return new DataFileCache(inv, armours, group, op, flying); return new DataFileCache(inv, armours, group, op, flying);
} }
} catch (RuntimeException e) {
ConsoleLogger.showError("Error while reading file for " + player.getName() + ", some wipe inventory incoming...");
return null;
} catch (Exception e) { } catch (Exception e) {
ConsoleLogger.showError("Error while reading file for " + player.getName() + ", some wipe inventory incoming..."); ConsoleLogger.showError("Error while reading file for " + player.getName() + ", some wipe inventory incoming...");
return null; return null;

2
src/main/resources/plugin.yml
View File

@ -3,7 +3,7 @@ author: Xephi59
website: http://dev.bukkit.org/bukkit-plugins/authme-reloaded/ website: http://dev.bukkit.org/bukkit-plugins/authme-reloaded/
description: AuthMe prevents people, which aren't logged in, from doing stuff like placing blocks, moving, typing commands or seeing the inventory of the player. description: AuthMe prevents people, which aren't logged in, from doing stuff like placing blocks, moving, typing commands or seeing the inventory of the player.
main: fr.xephi.authme.AuthMe main: fr.xephi.authme.AuthMe
version: maven-version version: ${project.version}
softdepend: [Vault, ChestShop, Multiverse-Core, Citizens, CombatTag, Essentials, EssentialsSpawn] softdepend: [Vault, ChestShop, Multiverse-Core, Citizens, CombatTag, Essentials, EssentialsSpawn]
commands: commands:
register: register: