Skip to content

Commit

Permalink
Update to 1.12 (Fixes #198)
Browse files Browse the repository at this point in the history
  • Loading branch information
@games647
games647 committed Jun 10, 2017
1 parent 83ffef9 commit 591d824
Show file tree
Hide file tree
Showing 2 changed files with 61 additions and 21 deletions.
71 changes: 58 additions & 13 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.6.0</version>
<version>3.6.1</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
Expand All @@ -69,7 +69,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>2.4.3</version>
<version>3.0.0</version>
<configuration>
<createDependencyReducedPom>false</createDependencyReducedPom>
<shadedArtifactAttached>false</shadedArtifactAttached>
Expand Down Expand Up @@ -198,18 +198,9 @@
<!--Let us access to the updated javadoc-->
<dependency>
<groupId>org.spigotmc</groupId>
<!--Name it different in order to work around that maven will always use the newest version-->
<artifactId>spigot-api</artifactId>
<version>1.9-R0.1-SNAPSHOT</version>
<version>1.12-R0.1-SNAPSHOT</version>
<scope>provided</scope>
<!--We only want to access the new features with checked version compatibility-->
<!--but don't do it for libraries added in the new version-->
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>

<!--Library for listening and sending Minecraft packets to workaround
Expand All @@ -232,7 +223,7 @@
<dependency>
<groupId>com.zaxxer</groupId>
<artifactId>HikariCP</artifactId>
<version>2.6.0</version>
<version>2.6.2</version>
</dependency>

<!--Logging framework implements slf4j which is required by hikari-->
Expand All @@ -246,18 +237,36 @@
<groupId>com.wasteofplastic</groupId>
<artifactId>askyblock</artifactId>
<version>3.0.6.2</version>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>me.clip</groupId>
<artifactId>placeholderapi</artifactId>
<version>2.6.0</version>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>de.keyle</groupId>
<artifactId>mypet</artifactId>
<version>2.2.6</version>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>

<!--API for economy variables-->
Expand Down Expand Up @@ -383,12 +392,24 @@
<groupId>com.github.TechFortress</groupId>
<artifactId>GriefPrevention</artifactId>
<version>5186739d3a</version>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>com.github.games647</groupId>
<artifactId>McCombatLevel</artifactId>
<version>3ab946cf26</version>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>

<!--dependencies in /lib-->
Expand All @@ -399,6 +420,12 @@
<scope>system</scope>
<systemPath>${project.basedir}/lib/BukkitGames-2.3.2.jar</systemPath>
<optional>true</optional>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>

<!--Factions:-->
Expand All @@ -408,20 +435,38 @@
<!--the name can't be the same because maven would automatically use the newer version-->
<!--Factions-UUID fork of 1.6/1.8-->
<version>1.6.9.5-U0.1.6</version>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
<optional>true</optional>
</dependency>

<dependency>
<groupId>com.massivecraft</groupId>
<artifactId>factions</artifactId>
<version>2.10</version>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>

<!--MCore must be available for factions-->
<dependency>
<groupId>com.massivecraft</groupId>
<artifactId>massivecore</artifactId>
<version>2.10</version>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>

<!--Testing environment-->
Expand Down
11 changes: 3 additions & 8 deletions src/main/java/com/github/games647/scoreboardstats/scoreboard/bukkit/FastOfflinePlayer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import java.util.Map;
import java.util.UUID;

import org.apache.commons.lang.builder.ToStringBuilder;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.OfflinePlayer;
Expand Down Expand Up @@ -61,12 +62,6 @@ public boolean isBanned() {
return false;
}

@Override
@SuppressWarnings("deprecation")
public void setBanned(boolean banned) {
//ignore
}

@Override
public boolean isWhitelisted() {
return false;
Expand Down Expand Up @@ -140,8 +135,8 @@ public boolean equals(Object obj) {

@Override
public String toString() {
return Objects.toStringHelper(this)
.add("playerName", playerName)
return new ToStringBuilder(this)
.append("playerName", playerName)
.toString();
}
}

0 comments on commit 591d824

Please sign in to comment.