Merge pull request #1 from sgdc3/master

Clean the project
lishid · Apr 18, 2016 · 7c5c6a4 · 7c5c6a4
2 parents 3318f30 + 958202c
commit 7c5c6a4
Show file tree

Hide file tree

Showing 7 changed files with 177 additions and 43 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,129 @@
-.classpath
+### Maven ###
+target/
+pom.xml.tag
+pom.xml.releaseBackup
+pom.xml.versionsBackup
+pom.xml.next
+release.properties
+dependency-reduced-pom.xml
+buildNumber.properties
+.mvn/timing.properties
+
+
+### Java ###
+*.class
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+*.jar
+*.war
+*.ear
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
+
+
+### Eclipse ###
+
+.metadata
+bin/
+tmp/
+*.tmp
+*.bak
+*.swp
+*~.nib
+local.properties
+.settings/
+.loadpath
+.recommenders
+
+# Eclipse Core
 .project
-.settings
-/bin/
-/target/
+
+# External tool builders
+.externalToolBuilders/
+
+# Locally stored "Eclipse launch configurations"
+*.launch
+
+# PyDev specific (Python IDE for Eclipse)
+*.pydevproject
+
+# CDT-specific (C/C++ Development Tooling)
+.cproject
+
+# JDT-specific (Eclipse Java Development Tools)
+.classpath
+
+# Java annotation processor (APT)
+.factorypath
+
+# PDT-specific (PHP Development Tools)
+.buildpath
+
+# sbteclipse plugin
+.target
+
+# Tern plugin
+.tern-project
+
+# TeXlipse plugin
+.texlipse
+
+# STS (Spring Tool Suite)
+.springBeans
+
+# Code Recommenders
+.recommenders/
+
+
+### Intellij ###
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm
+# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
+
+# User-specific stuff:
+.idea/workspace.xml
+.idea/tasks.xml
+.idea/dictionaries
+.idea/vcs.xml
+.idea/jsLibraryMappings.xml
+
+# Sensitive or high-churn files:
+.idea/dataSources.ids
+.idea/dataSources.xml
+.idea/dataSources.local.xml
+.idea/sqlDataSources.xml
+.idea/dynamic.xml
+.idea/uiDesigner.xml
+
+# Gradle:
+.idea/gradle.xml
+.idea/libraries
+
+# Mongo Explorer plugin:
+.idea/mongoSettings.xml
+
+## File-based project format:
+*.iws
+
+## Plugin-specific files:
+
+# IntelliJ
+/out/
+
+# mpeltonen/sbt-idea plugin
+.idea_modules/
+
+# JIRA plugin
+atlassian-ide-plugin.xml
+
+# Crashlytics plugin (for Android Studio and IntelliJ)
+com_crashlytics_export_strings.xml
+crashlytics.properties
+crashlytics-build.properties
+fabric.properties
+
+### Intellij Patch ###
+*.iml
diff --git a/gpl.txt → LICENSE b/gpl.txt → LICENSE
diff --git a/README b/README
diff --git a/README.md b/README.md
@@ -0,0 +1,13 @@
+#Orebfuscator:
+##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)
+
+###Requirements:
+- Java 1.6 / 1.7 / 1.8
+- Spigot/PaperSpigot and any other fork of CraftBukkit! (Only 1.9)
+- ProtocolLib (latest builds)
+
+###License:
+Please check the LICENSE file.
diff --git a/pom.xml b/pom.xml
@@ -1,11 +1,13 @@
 <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</artifactId>
+  <version>4.0.1-SNAPSHOT</version>
   <packaging>jar</packaging>
-  <version>4.0.0</version>
-  <name>Orebfuscator</name>
+
+  <name>Orebfuscator4</name>
   <url>http://dev.bukkit.org/server-mods/orebfuscator/</url>
 
   <properties>
@@ -17,31 +19,32 @@
       <id>dmulloy2-repo</id>
       <url>http://repo.dmulloy2.net/content/groups/public/</url>
     </repository>
-    <repository>
-      <id>spigot-repo</id>
-      <url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
-    </repository>
   </repositories>
 
-  <pluginRepositories>
-    <pluginRepository>
-      <id>bukkit-plugins</id>
-      <url>http://repo.bukkit.org/content/groups/public</url>
-    </pluginRepository>
-  </pluginRepositories>
-
   <dependencies>
     <dependency>
       <groupId>org.spigotmc</groupId>
       <artifactId>spigot</artifactId>
-      <version>1.9-R0.1-SNAPSHOT</version>
+      <version>1.9.2-R0.1-SNAPSHOT</version>
       <scope>provided</scope>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>com.comphenix.protocol</groupId>
-      <artifactId>ProtocolLib</artifactId>
-      <version>3.7.0-SNAPSHOT</version>
+      <artifactId>ProtocolLib-API</artifactId>
+      <version>4.0-SNAPSHOT</version>
       <scope>provided</scope>
+      <optional>true</optional>
+      <exclusions>
+      	<exclusion>
+      		<artifactId>cglib-nodep</artifactId>
+      		<groupId>cglib</groupId>
+      	</exclusion>
+      	<exclusion>
+      		<artifactId>BukkitExecutors</artifactId>
+      		<groupId>com.comphenix.executors</groupId>
+      	</exclusion>
+      </exclusions>
     </dependency>
   </dependencies>
 
@@ -50,19 +53,26 @@
     <sourceDirectory>src/main/java</sourceDirectory>
     <testSourceDirectory>src/test/java</testSourceDirectory>
     <resources>
+      <resource>
+        <directory>.</directory>
+        <filtering>false</filtering>
+        <includes>
+          <include>LICENSE</include>
+        </includes>
+      </resource>
       <resource>
         <directory>src/main/resources</directory>
         <filtering>true</filtering>
-        <excludes>
-          <exclude>**/*.java</exclude>
-        </excludes>
+        <includes>
+          <include>**/*</include>
+        </includes>
       </resource>
     </resources>
 
     <plugins>
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>2.3.2</version>
+        <version>3.5.1</version>
         <configuration>
           <source>1.6</source>
           <target>1.6</target>
@@ -77,4 +87,3 @@
     <url>https://github.com/lishid/Orebfuscator</url>
   </scm>
 </project>
-
diff --git a/src/main/java/com/lishid/orebfuscator/Orebfuscator.java b/src/main/java/com/lishid/orebfuscator/Orebfuscator.java
@@ -66,6 +66,7 @@ public void onEnable() {
             usePL = true;
         }
 
+        /* NoLagg is deprecated now
         if (pm.getPlugin("NoLagg") != null && !usePL) {
             getServer().getScheduler().scheduleSyncRepeatingTask(this, new Runnable() {
                 @Override
@@ -74,6 +75,7 @@ public void run() {
                 }
             }, 0, 60 * 1000);// Warn every minute
         }
+        */
 
         // Disable spigot's built-in orebfuscator since it has limited functionality
         try {

diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
@@ -1,11 +1,10 @@
-name: Orebfuscator3
+name: {project.name}
 main: com.lishid.orebfuscator.Orebfuscator
-version: 4.0.0
+version: ${project.version}
 author: lishid
 softdepend: [ProtocolLib]
 load: startup
-description: >
-             The most powerful and efficient Anti Xray
+description: 'The most powerful and efficient Anti Xray plugin compatible with any CraftBukkit fork!'
 commands:
   ofc:
     description: Manage Orebfuscator.
@@ -18,4 +17,4 @@ commands:
            /<command> clearcache - Clear all cached chunks
            /<command> <enable/disable> - Toggle plugin state
            /<command> <enable/disable> world <worldname>
-           /<command> <enable/disable> <op/perms/cache/axr/notification>
+           /<command> <enable/disable> <op/perms/cache/axr/notification>