diff --git a/.gitignore b/.gitignore
index 3d8e3ac3..682f887c 100644
--- 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/
\ No newline at end of file
+
+# 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 b/LICENSE
similarity index 100%
rename from gpl.txt
rename to LICENSE
diff --git a/README b/README
deleted file mode 100644
index 2828199b..00000000
--- a/README
+++ /dev/null
@@ -1,13 +0,0 @@
-Copyright (C) 2011-2015 lishid. All rights reserved.
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, version 3.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see .
\ No newline at end of file
diff --git a/README.md b/README.md
new file mode 100644
index 00000000..32b0689b
--- /dev/null
+++ 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
index 7386a794..3d9ac19b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,11 +1,13 @@
4.0.0
+
com.lishid
orebfuscator
+ 4.0.1-SNAPSHOT
jar
- 4.0.0
- Orebfuscator
+
+ Orebfuscator4
http://dev.bukkit.org/server-mods/orebfuscator/
@@ -17,31 +19,32 @@
dmulloy2-repo
http://repo.dmulloy2.net/content/groups/public/
-
- spigot-repo
- https://hub.spigotmc.org/nexus/content/groups/public/
-
-
-
- bukkit-plugins
- http://repo.bukkit.org/content/groups/public
-
-
-
org.spigotmc
spigot
- 1.9-R0.1-SNAPSHOT
+ 1.9.2-R0.1-SNAPSHOT
provided
+ true
com.comphenix.protocol
- ProtocolLib
- 3.7.0-SNAPSHOT
+ ProtocolLib-API
+ 4.0-SNAPSHOT
provided
+ true
+
+
+ cglib-nodep
+ cglib
+
+
+ BukkitExecutors
+ com.comphenix.executors
+
+
@@ -50,19 +53,26 @@
src/main/java
src/test/java
+
+ .
+ false
+
+ LICENSE
+
+
src/main/resources
true
-
- **/*.java
-
+
+ **/*
+
maven-compiler-plugin
- 2.3.2
+ 3.5.1
1.6
1.6
@@ -77,4 +87,3 @@
https://github.com/lishid/Orebfuscator
-
diff --git a/src/main/java/com/lishid/orebfuscator/Orebfuscator.java b/src/main/java/com/lishid/orebfuscator/Orebfuscator.java
index 8cd37281..7a39796f 100644
--- 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
index 478a0eeb..bd2ebc36 100644
--- 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:
/ clearcache - Clear all cached chunks
/ - Toggle plugin state
/ world
- /
\ No newline at end of file
+ /