Merge pull request #148 from PrisonTeam/bleeding

Bleeding being merged in to Master and will become the bug release v3.2.1.

LICENSE.md

@@ -1,3 +1,4 @@
+[Prison Documents - Table of Contents](docs/prison_docs_000_toc.md)
 # GNU GENERAL PUBLIC LICENSE
 Version 3, 29 June 2007
 

README.md

@@ -1,6 +1,3 @@
-[![Documentation](https://static.ultz.co.uk/PrisonMoveDoc.png)](https://confluence.onultz.com/display/PRIS)
-![Prison Banner](https://faizaand.github.io/prison/img/prison-banner.png)
-
 [![License](https://img.shields.io/badge/license-GPL%20License%20v3-blue.svg)](LICENSE.md)
 [![Build Status](https://travis-ci.org/MC-Prison/Prison.svg?branch=master)](https://travis-ci.org/MC-Prison/Prison)
 [![Discord](https://discordapp.com/api/guilds/332602419483770890/widget.png)](https://discord.gg/396ed5F)
@@ -9,29 +6,37 @@
 2. [Why should I use Prison?](#why-should-i-use-prison)
 3. [Get Prison](#get-prison)
 
+## Prison Documentation
+
+[Prison Documents - Table of Contents](docs/prison_docs_000_toc.md)
+
+The Prison documentation covers the important details on how to setup a usable Prison server.
+These documents are in a state of development, so more will be added.
+
 ## What is Prison?
 
-Prison is a Minecraft plugin that adds all the features necessary for [prison servers](https://woodycraft.net/threads/what-is-a-prison-server-a-general-explanation.21161/). It runs on multiple platforms, including the popular [Spigot](http://spigotmc.org) and the rapidly growing [Sponge](http://spongepowered.org). Plugins for prison servers exist already, but many of them are poorly maintained, and the solid ones are paid resources. Prison eliminates the paywall and the updating hassle, and puts a one-stop solution in their place.
+Prison is a Minecraft plugin that adds all the features necessary for prison servers. It runs on the popular [Spigot](http://spigotmc.org). Plugins for prison servers exist already, but many of them are poorly maintained, and the solid ones are paid resources. Prison eliminates the paywall and the updating hassle, and puts a one-stop solution in their place.
 
 ### History of Prison
 
 Prison began as a plugin with the goal of combining two main prison server features: resetting mines and purchasable ranks. In June 2014, Prison v2.0 was released with the goal of providing a single solution for prison servers. Prison v2.0 has had numerous problems and is not the solution that we had envisioned for an all-in-one package to be. The solution is the current version - Prison v3.0.
 
+Starting with prison v3.2.0 new development efforts were began with a focus on adding new features
+and improving the performance and stability.
+
 ## Why should I use Prison?
 
 If hassle-free updates and zero payments is not enough for you to consider switching to Prison, it doesn't stop there.
 
 * **Prison is modular.** If you don't want to use a certain feature on your server, you can disable it in just a few keystrokes.
 * **Prison is completely, 100% open source.** This means that your developers can make changes to the plugin to customize your server's experience, if you so desire.
-* **Prison is and always will be free.** While we do ask for donations, all of our code, resources, and binaries are provided free of charge to the Minecraft community.
+* **Prison is and always will be free.** All of our code, resources, and binaries are provided free of charge to the Minecraft community. We do not accept donations.
 * **New releases are heavily bug-tested.** We test every single aspect of every new release of Prison before releasing it to the community. If a release doesn't pass our rigorous update checklist, it is iterated upon until it does. What does this mean for you? Solid updates with minimal bugs for your server.
 * **Prison is always expanding.** We are always looking for ways to expand Prison with features that make your server run more smoothly. Additionally, we are always looking for contributions from the community, be it code contributions, feature requests, bug reports, translations, or documentation.
 
 ## Get Prison
 
 | Stable | Experimental (Nightly) |
 | ------ | ---------------------- |
-| [![Stable Download](https://img.shields.io/badge/download-stable-44cc11.svg)](https://github.com/MC-Prison/Prison/releases/latest) | [![Experimental Download](https://img.shields.io/badge/download-experimental-red.svg)](https://ci.appveyor.com/project/faizaand/prison/build/artifacts) | 
-
+| [![Stable Download](https://img.shields.io/badge/download-stable-44cc11.svg)](https://www.spigotmc.org/resources/prison.1223/) | [![Experimental Download](https://img.shields.io/badge/download-experimental-red.svg)](https://ci.appveyor.com/project/faizaand/prison/build/artifacts) | 
 
-

build.gradle

@@ -15,34 +15,42 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+import java.text.SimpleDateFormat
+import java.util.Date
 
+apply plugin: 'java'
+
+/* Two different ways to enable utf-8 encoding within gradle, but not sure its
+ * even needed at this time.  Keeping for a few builds to make sure all is ok.
+compileJava.options.encoding = 'UTF-8'
+tasks.withType(JavaCompile) {
+   options.encoding = 'UTF-8'
+}
+*/
+
+
 println """
-================================
-You are building Prison.
-
-Note that you are probably using
-a development build and therefore
-a buggy build. Don\'t use it on a
-production server unless you know
-what you are doing! You have been
-WARNED.
-
-Output files will be in
-[subproject]/build/libs.
-The runnable JAR is usually
-named Prison[ModuleName].jar.
-================================
+==========================================================================
+You are building the Prison plugin 
+  Version:    ${project.version} 
+  Build time: ${getCurrentTimestamp()}
+
+Output files are located in [subproject]/build/libs.
+The runnable JAR is usually named prison.jar.
+Example: The spigot build artifact is prison-spigot/build/libs/prison.jar
+==========================================================================
 """
 
 buildscript {
 
     repositories {
         mavenCentral()
         jcenter()
+        maven { url "https://plugins.gradle.org/m2/" }
     }
 
     dependencies {
-        classpath 'com.github.jengelman.gradle.plugins:shadow:2.0.2'
+        classpath 'com.github.jengelman.gradle.plugins:shadow:5.2.0'
     }
 
 }
@@ -56,7 +64,6 @@ subprojects {
 
     archivesBaseName = 'Prison'
     group = 'tech.mcprison.prison'
-    version = '3.2.0'
 
     sourceCompatibility = 1.8
     targetCompatibility = 1.8
@@ -72,9 +79,9 @@ subprojects {
     }
 
     dependencies {
-        compile 'org.apache.commons:commons-lang3:3.9'
-        compile 'com.google.guava:guava:19.0'
-        compile 'com.google.code.gson:gson:2.8.6'
+        implementation 'org.apache.commons:commons-lang3:3.10'
+        implementation 'com.google.guava:guava:19.0'
+        implementation 'com.google.code.gson:gson:2.8.6'
         testCompile 'junit:junit:4.12'
     }
 
@@ -83,3 +90,9 @@ subprojects {
 wrapper {
     distributionType = Wrapper.DistributionType.ALL
 }
+
+def getCurrentTimestamp()
+{
+  SimpleDateFormat df = new SimpleDateFormat ("yyyy-MM-dd HH:mm:ss")
+  return df.format (new Date())
+}