Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Scoreboard, Tag & villager trades requirement support #719

Open
wants to merge 20 commits into
base: master
Choose a base branch
from
+1,612 −288
Open

Scoreboard, Tag & villager trades requirement support #719

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
bcad995
Update build number towards new release.
Staartvin Feb 26, 2017
5173139
Update build number towards development.
Staartvin Feb 26, 2017
56dd6a2
Add the option to define custom descriptions for requirements.
Staartvin Feb 27, 2017
fb0b1f3
Fix NullPointerException when asynchronously updating cached leaderboard
Staartvin Feb 27, 2017
6b5de93
Make a start on activity tracking.
Staartvin Feb 27, 2017
9cb4ce9
Add an /ar activity command and implement activity tracker.
Staartvin Mar 1, 2017
0df8d09
Add reset command to reset completed paths.
Staartvin Mar 1, 2017
202f200
Move debug message to debug message method.
Staartvin Mar 1, 2017
868f7da
Add auto completion (with tab) for performing commands.
Staartvin Mar 1, 2017
7315491
Adding Junit to Maven pom.xml
Staartvin Mar 1, 2017
4b06b1a
Remove test method call.
Staartvin Mar 2, 2017
34c6cf2
Add warning when AFK was enabled but Statz is not installed.
Staartvin Mar 2, 2017
f5ea096
Tidy up /ar hooks command.
Staartvin Mar 2, 2017
f79cfe2
Only close MySQL connection when it is open in the first place.
Staartvin Mar 2, 2017
ba48064
Update build number towards next beta release.
Staartvin Mar 2, 2017
b866504
Update build number towards development.
Staartvin Mar 2, 2017
1e0a2ba
Fix typo in reset command.
Staartvin Mar 5, 2017
2afe886
Almost missed one.
Staartvin Mar 5, 2017
1697296
Paths will now automatically be assigned if possible to a player.
Staartvin Mar 5, 2017
ec2ef50
Add AdvancedAchievement and uSkyBlock requirements.
Staartvin Mar 5, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .settings/org.eclipse.core.resources.prefs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
eclipse.preferences.version=1
encoding/<project>=UTF-8
encoding/src=UTF-8
encoding/test=UTF-8
6 changes: 6 additions & 0 deletions plugin.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,4 +116,10 @@ permissions:
autorank.convert.advancedconfig:
description: Allows a player to convert data from AdvancedConfig to Paths
default: op
autorank.activity.view.self:
description: Allows a player to view their own activity in history.
default: op
autorank.activity.view.others:
description: Allows a player to view other players' activity in history.
default: op

369 changes: 190 additions & 179 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,180 +1,191 @@
<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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>Autorank</groupId>
<artifactId>Autorank</artifactId>
<version>4.0.3-Dev-${BUILD_NUMBER}</version>
<name>Autorank</name>
<description>Maven project for Bukkit plugin Autorank</description>
<url>http://dev.bukkit.org/server-mods/autorank/</url>
<build>

<sourceDirectory>src</sourceDirectory>
<testSourceDirectory>test</testSourceDirectory>

<resources>

<resource>
<filtering>true</filtering>
<directory>${basedir}</directory>
<includes>
<include>*.yml</include>
</includes>
</resource>


</resources>

<plugins>

<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.5.1</version>
<configuration>
<source>1.7</source>
<target>1.7</target>
<excludes>
<exclude>${basedir}/Javadocs</exclude>
<exclude>${basedir}/lib</exclude>
</excludes>
</configuration>
</plugin>

<!-- Stop Maven from including the dependencies (.jars) in the artifact
(created by Jenkins) -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.2</version>
<configuration>
<excludes>
<exclude>*.jar</exclude>
</excludes>
</configuration>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.9</version>
<configuration>
<failOnError>false</failOnError>
</configuration>
</plugin>

</plugins>

</build>

<properties> <!-- Fix encoding warnings -->
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>

<repositories>
<repository>
<id>staartvin-repo</id>
<url>http://62.131.38.74:8081/artifactory/ext-release-local/</url>
</repository>

<repository>
<id>Spigot-repo</id>
<url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
</repository>
</repositories>

<dependencies>

<dependency>
<groupId>EssentialsGroupManager</groupId>
<artifactId>EssentialsGroupManager</artifactId>
<version>2.1.11</version>
<type>jar</type>
</dependency>

<dependency>
<groupId>com.platymuus</groupId>
<artifactId>bukkit-permissions</artifactId>
<version>2.5</version>
<exclusions>
<exclusion>
<artifactId>metrics</artifactId>
<groupId>org.mcstats.bukkit</groupId>
</exclusion>
</exclusions>
</dependency>

<!-- OLD STATS <dependency> <groupId>nl.lolmewn.stats</groupId> <artifactId>Stats</artifactId>
<version>2.0.1</version> <scope>provided</scope> <type>jar</type> </dependency> -->

<!-- <dependency> <groupId>nl.lolmewn.stats</groupId> <artifactId>Stats</artifactId>
<version>3.0.2-SNAPSHOT</version> <scope>provided</scope> <type>jar</type>
</dependency> -->

<!-- <dependency>
<groupId>org.mcstats.bukkit</groupId>
<artifactId>metrics</artifactId>
<version>R7</version>
<type>jar</type>
</dependency> -->


<dependency>
<groupId>org.spigotmc</groupId>
<artifactId>spigot-api</artifactId>
<version>1.8-R0.1-SNAPSHOT</version>
<type>jar</type>
</dependency>

<dependency>
<groupId>org.bukkit</groupId>
<artifactId>bukkit</artifactId>
<version>1.8-R0.1-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>PowerfulPerms</groupId>
<artifactId>PowerfulPerms</artifactId>
<version>3.0.3</version>
</dependency>

<dependency>
<groupId>me.staartvin.Statz</groupId>
<artifactId>Statz</artifactId>
<version>LATEST</version>
</dependency>

<dependency>
<groupId>net.milkbowl.vault</groupId>
<artifactId>Vault</artifactId>
<version>1.5.6</version>
<type>jar</type>
</dependency>

<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
<version>4.12</version>
</dependency>

<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>java-hamcrest</artifactId>
<scope>test</scope>
<version>2.0.0.0</version>
</dependency>

<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<scope>test</scope>
<version>2.7.1</version>
<exclusions>
<exclusion>
<artifactId>hamcrest-core</artifactId>
<groupId>org.hamcrest</groupId>
</exclusion>
</exclusions>
</dependency>
</dependencies>
<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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>Autorank</groupId>
<artifactId>Autorank</artifactId>
<version>4.0.5-Dev-${BUILD_NUMBER}</version>
<name>Autorank</name>
<description>Maven project for Bukkit plugin Autorank</description>
<url>http://dev.bukkit.org/server-mods/autorank/</url>
<build>

<sourceDirectory>src</sourceDirectory>
<testSourceDirectory>test</testSourceDirectory>

<resources>

<resource>
<filtering>true</filtering>
<directory>${basedir}</directory>
<includes>
<include>*.yml</include>
</includes>
</resource>


</resources>

<plugins>

<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.5.1</version>
<configuration>
<source>1.7</source>
<target>1.7</target>
<excludes>
<exclude>${basedir}/Javadocs</exclude>
<exclude>${basedir}/lib</exclude>
</excludes>
</configuration>
</plugin>

<!-- Stop Maven from including the dependencies (.jars) in the artifact
(created by Jenkins) -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.2</version>
<configuration>
<excludes>
<exclude>*.jar</exclude>
</excludes>
</configuration>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.9</version>
<configuration>
<failOnError>false</failOnError>
</configuration>
</plugin>

</plugins>

</build>

<properties> <!-- Fix encoding warnings -->
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>

<repositories>
<repository>
<id>staartvin-repo</id>
<url>http://62.131.38.74:8081/artifactory/ext-release-local/</url>
</repository>

<repository>
<id>Spigot-repo</id>
<url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
</repository>
</repositories>

<dependencies>

<dependency>
<groupId>EssentialsGroupManager</groupId>
<artifactId>EssentialsGroupManager</artifactId>
<version>2.1.11</version>
<type>jar</type>
</dependency>

<dependency>
<groupId>com.platymuus</groupId>
<artifactId>bukkit-permissions</artifactId>
<version>2.5</version>
<exclusions>
<exclusion>
<artifactId>metrics</artifactId>
<groupId>org.mcstats.bukkit</groupId>
</exclusion>
</exclusions>
</dependency>

<!-- OLD STATS <dependency> <groupId>nl.lolmewn.stats</groupId> <artifactId>Stats</artifactId>
<version>2.0.1</version> <scope>provided</scope> <type>jar</type> </dependency> -->

<!-- <dependency> <groupId>nl.lolmewn.stats</groupId> <artifactId>Stats</artifactId>
<version>3.0.2-SNAPSHOT</version> <scope>provided</scope> <type>jar</type>
</dependency> -->

<!-- <dependency> <groupId>org.mcstats.bukkit</groupId> <artifactId>metrics</artifactId>
<version>R7</version> <type>jar</type> </dependency> -->


<dependency>
<groupId>org.spigotmc</groupId>
<artifactId>spigot-api</artifactId>
<version>1.8-R0.1-SNAPSHOT</version>
<type>jar</type>
</dependency>

<dependency>
<groupId>org.bukkit</groupId>
<artifactId>bukkit</artifactId>
<version>1.8-R0.1-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>PowerfulPerms</groupId>
<artifactId>PowerfulPerms</artifactId>
<version>3.0.3</version>
</dependency>

<dependency>
<groupId>me.staartvin.Statz</groupId>
<artifactId>Statz</artifactId>
<version>LATEST</version>
</dependency>

<dependency>
<groupId>net.milkbowl.vault</groupId>
<artifactId>Vault</artifactId>
<version>1.5.6</version>
<type>jar</type>
</dependency>

<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
<version>4.12</version>
</dependency>

<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>java-hamcrest</artifactId>
<scope>test</scope>
<version>2.0.0.0</version>
</dependency>

<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<scope>test</scope>
<version>2.7.1</version>
<exclusions>
<exclusion>
<artifactId>hamcrest-core</artifactId>
<groupId>org.hamcrest</groupId>
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.11</version> <!-- Or whatever JUnit you're using. -->
</dependency>

</dependencies>
<ciManagement>
<system>Jenkins</system>
<url>http://178.62.255.148:8080/</url>
</ciManagement>
<issueManagement>
<system>Github</system>
<url>https://github.com/Staartvin/Autorank-2/issues</url>
</issueManagement>
</project>
Loading