Support for MC/Bukkit 1.10 -- minor cleanups and readme update.

master
ProgrammerDan 2016-06-11 19:16:55 -04:00
parent a14517cc1b
commit 7ac943224b
9 changed files with 32 additions and 58 deletions

View File

@ -12,24 +12,26 @@
<artifactId>orebfuscator-parent</artifactId>
<version>parent</version>
</parent>
<build>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.5.1</version>
<version>3.1</version>
<configuration>
<source>1.7</source>
<target>1.7</target>
</configuration>
</plugin>
</plugins>
</build>
</build>
<dependencies>
<dependency>
<groupId>org.spigotmc</groupId>
<artifactId>spigot-api</artifactId>
<version>1.9.4-R0.1-SNAPSHOT</version>
<version>1.10-R0.1-SNAPSHOT</version>
<scope>provided</scope>
<optional>true</optional>
</dependency>

View File

@ -4,7 +4,7 @@
<groupId>com.lishid</groupId>
<artifactId>orebfuscator</artifactId>
<version>4.0.14-SNAPSHOT</version>
<version>4.1.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Orebfuscator4</name>
@ -20,14 +20,14 @@
<dependency>
<groupId>org.spigotmc</groupId>
<artifactId>spigot-api</artifactId>
<version>1.9.4-R0.1-SNAPSHOT</version>
<version>1.10-R0.1-SNAPSHOT</version>
<scope>provided</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>com.comphenix.protocol</groupId>
<artifactId>ProtocolLib-API</artifactId>
<version>4.0-SNAPSHOT</version>
<version>4.0</version>
<scope>provided</scope>
<optional>true</optional>
<exclusions>
@ -112,7 +112,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.5.1</version>
<version>3.1</version>
<configuration>
<source>1.7</source>
<target>1.7</target>

View File

@ -81,7 +81,7 @@ public class Orebfuscator extends JavaPlugin {
private static INmsManager createNmsManager() {
String serverVersion = org.bukkit.Bukkit.getServer().getClass().getPackage().getName().replace(".", ",").split(",")[3];
String serverVersion = org.bukkit.Bukkit.getServer().getClass().getPackage().getName().split("\\.")[3];
if(serverVersion.equals("v1_10_R1")) {
return new com.lishid.orebfuscator.nms.v1_10_R1.NmsManager();

View File

@ -3,12 +3,14 @@
The definitive Anti X-Ray plugin for CraftBukkit
###Changelog:
- Updated to 1.9 (WIP, check the commit log for more infos about the development status)
- Updated to support 1.10 (Thanks Asgorioth)
- Updated to support 1.9.4
- Updated to support 1.9-1.9.2
###Requirements:
- Java 1.6 / 1.7 / 1.8
- Spigot/PaperSpigot and any other fork of CraftBukkit! (Only 1.9)
- ProtocolLib (latest builds)
- Spigot/PaperSpigot and any other fork of CraftBukkit! (1.9 through 1.10)
- ProtocolLib (4.0 or better)
###License:

10
pom.xml
View File

@ -22,11 +22,11 @@
</repositories>
<modules>
<module>Plugin</module>
<module>v1_9_R1</module>
<module>v1_9_R2</module>
<module>v1_10_R1</module>
<module>API</module>
<module>Plugin</module>
<module>v1_9_R1</module>
<module>v1_9_R2</module>
<module>v1_10_R1</module>
<module>API</module>
</modules>
<scm>

View File

@ -13,19 +13,19 @@
<version>parent</version>
</parent>
<build>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.5.1</version>
<version>3.1</version>
<configuration>
<source>1.7</source>
<target>1.7</target>
</configuration>
</plugin>
</plugins>
</build>
</build>
<dependencies>
<dependency>

View File

@ -1,32 +0,0 @@
<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">
<modelVersion>4.0.0</modelVersion>
<groupId>com.lishid</groupId>
<artifactId>orebfuscator-v1_10_R1</artifactId>
<version>v1_10_R1</version>
<packaging>jar</packaging>
<name>Orebfuscator4 v1_10_R1</name>
<parent>
<groupId>com.lishid.parent</groupId>
<artifactId>orebfuscator-parent</artifactId>
<version>parent</version>
</parent>
<dependencies>
<dependency>
<groupId>org.spigotmc</groupId>
<artifactId>spigot</artifactId>
<version>1.10-R0.1-SNAPSHOT</version>
<scope>provided</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>com.lishid</groupId>
<artifactId>orebfuscator-api</artifactId>
<version>API</version>
<type>jar</type>
</dependency>
</dependencies>
</project>

View File

@ -12,19 +12,21 @@
<artifactId>orebfuscator-parent</artifactId>
<version>parent</version>
</parent>
<build>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.5.1</version>
<version>3.1</version>
<configuration>
<source>1.7</source>
<target>1.7</target>
</configuration>
</plugin>
</plugins>
</build>
</build>
<dependencies>
<dependency>
<groupId>org.spigotmc</groupId>

View File

@ -13,19 +13,19 @@
<version>parent</version>
</parent>
<build>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.5.1</version>
<version>3.1</version>
<configuration>
<source>1.7</source>
<target>1.7</target>
</configuration>
</plugin>
</plugins>
</build>
</build>
<dependencies>
<dependency>