From 6fca19fa417bb81619b17124d33f1e5837b9daba Mon Sep 17 00:00:00 2001
From: Jerome van der Sar <jerom.sar@hotmail.com>
Date: Sat, 30 Nov 2013 18:04:43 +0100
Subject: [PATCH] Load plugin version through plugin.yml

---
 appinfo.properties                            |  5 --
 build.xml                                     | 83 +++----------------
 buildnumber.properties                        |  4 +-
 nbproject/project.properties                  |  1 -
 .../TotalFreedomMod/TFM_EssentialsBridge.java |  2 +-
 .../TotalFreedomMod/TotalFreedomMod.java      | 17 ++--
 6 files changed, 23 insertions(+), 89 deletions(-)
 delete mode 100644 appinfo.properties

diff --git a/appinfo.properties b/appinfo.properties
deleted file mode 100644
index f869a5a2..00000000
--- a/appinfo.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-#Tue, 08 Oct 2013 13:58:56 -0400
-
-program.VERSION=3.3
-program.BUILDNUM=616
-program.BUILDDATE=10/08/2013 01\:58 PM
diff --git a/build.xml b/build.xml
index 41876061..18d244b9 100644
--- a/build.xml
+++ b/build.xml
@@ -1,83 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- You may freely edit this file. See commented blocks below for -->
-<!-- some examples of how to customize the build. -->
-<!-- (If you delete it and reopen the project it will be recreated.) -->
-<!-- By default, only the Clean and Build commands use this build script. -->
-<!-- Commands such as Run, Debug, and Test only use this build script if -->
-<!-- the Compile on Save feature is turned off for the project. -->
-<!-- You can turn off the Compile on Save (or Deploy on Save) setting -->
-<!-- in the project's Project Properties dialog box.-->
 <project name="TotalFreedomMod" default="default" basedir=".">
     <description>Builds, tests, and runs the project TotalFreedomMod.</description>
-    <import file="nbproject/build-impl.xml"/>
-    <!--
-
-    There exist several targets which are by default empty and which can be 
-    used for execution of your tasks. These targets are usually executed 
-    before and after some main targets. They are: 
-
-      -pre-init:                 called before initialization of project properties
-      -post-init:                called after initialization of project properties
-      -pre-compile:              called before javac compilation
-      -post-compile:             called after javac compilation
-      -pre-compile-single:       called before javac compilation of single file
-      -post-compile-single:      called after javac compilation of single file
-      -pre-compile-test:         called before javac compilation of JUnit tests
-      -post-compile-test:        called after javac compilation of JUnit tests
-      -pre-compile-test-single:  called before javac compilation of single JUnit test
-      -post-compile-test-single: called after javac compilation of single JUunit test
-      -pre-jar:                  called before JAR building
-      -post-jar:                 called after JAR building
-      -post-clean:               called after cleaning build products
-
-    (Targets beginning with '-' are not intended to be called on their own.)
-
-    Example of inserting an obfuscator after compilation could look like this:
-
-        <target name="-post-compile">
-            <obfuscate>
-                <fileset dir="${build.classes.dir}"/>
-            </obfuscate>
-        </target>
-
-    For list of available properties check the imported 
-    nbproject/build-impl.xml file. 
-
-
-    Another way to customize the build is by overriding existing main targets.
-    The targets of interest are: 
-
-      -init-macrodef-javac:     defines macro for javac compilation
-      -init-macrodef-junit:     defines macro for junit execution
-      -init-macrodef-debug:     defines macro for class debugging
-      -init-macrodef-java:      defines macro for class execution
-      -do-jar-with-manifest:    JAR building (if you are using a manifest)
-      -do-jar-without-manifest: JAR building (if you are not using a manifest)
-      run:                      execution of project 
-      -javadoc-build:           Javadoc generation
-      test-report:              JUnit report generation
-
-    An example of overriding the target for project execution could look like this:
-
-        <target name="run" depends="TotalFreedomMod-impl.jar">
-            <exec dir="bin" executable="launcher.exe">
-                <arg file="${dist.jar}"/>
-            </exec>
-        </target>
-
-    Notice that the overridden target depends on the jar target and not only on 
-    the compile target as the regular run target does. Again, for a list of available 
-    properties which you can use, check the target you are overriding in the
-    nbproject/build-impl.xml file. 
-
-    -->
+    <import file="nbproject/build-impl.xml" />
 	<target name="-pre-jar">
 		<buildnumber file="buildnumber.properties" />
 		<propertyfile file="appinfo.properties">
-			<entry key="program.VERSION" default="0.0" />
-			<entry key="program.BUILDNUM" value="${build.number}" />
-			<entry key="program.BUILDDATE" type="date" value="now" pattern="MM/dd/yyyy hh:mm aa" />
+			<entry key="program.buildnumber" value="${build.number}" />
+			<entry key="program.builddate" type="date" value="now" pattern="MM/dd/yyyy hh:mm aa" />
 		</propertyfile>
 		<copy file="appinfo.properties" todir="${build.classes.dir}" />
+		<delete file="appinfo.properties" />
+	</target>
+	
+	<target name="-post-jar">
+		<!-- Cleanup -->
+		<delete file="${dist.dir}/README.TXT" />
+		<delete dir="${dist.dir}/lib/" />
 	</target>
 </project>
diff --git a/buildnumber.properties b/buildnumber.properties
index 8efb7796..ec656df0 100644
--- a/buildnumber.properties
+++ b/buildnumber.properties
@@ -1,3 +1,3 @@
 #Build Number for ANT. Do not edit!
-#Tue Oct 08 13:58:56 EDT 2013
-build.number=617
+#Sat Nov 30 16:57:41 CET 2013
+build.number=622
diff --git a/nbproject/project.properties b/nbproject/project.properties
index 1641a7a6..e2674b92 100644
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -85,7 +85,6 @@ jnlp.signed=false
 jnlp.signing=
 jnlp.signing.alias=
 jnlp.signing.keystore=
-main.class=totalfreedommod.TotalFreedomMod
 manifest.file=manifest.mf
 meta.inf.dir=${src.dir}/META-INF
 mkdist.disabled=true
diff --git a/src/me/StevenLawson/TotalFreedomMod/TFM_EssentialsBridge.java b/src/me/StevenLawson/TotalFreedomMod/TFM_EssentialsBridge.java
index 16443feb..5064389e 100644
--- a/src/me/StevenLawson/TotalFreedomMod/TFM_EssentialsBridge.java
+++ b/src/me/StevenLawson/TotalFreedomMod/TFM_EssentialsBridge.java
@@ -77,7 +77,7 @@ public class TFM_EssentialsBridge
             final User user = getEssentialsUser(username);
             if (user != null)
             {
-                return TFM_Util.getField(user, "lastActivity");
+                return TFM_Util.<Long>getField(user, "lastActivity"); // This is weird
             }
         }
         catch (Exception ex)
diff --git a/src/me/StevenLawson/TotalFreedomMod/TotalFreedomMod.java b/src/me/StevenLawson/TotalFreedomMod/TotalFreedomMod.java
index 7b561744..87a45618 100644
--- a/src/me/StevenLawson/TotalFreedomMod/TotalFreedomMod.java
+++ b/src/me/StevenLawson/TotalFreedomMod/TotalFreedomMod.java
@@ -66,9 +66,10 @@ public class TotalFreedomMod extends JavaPlugin
     {
         TotalFreedomMod.plugin = this;
         TotalFreedomMod.pluginName = plugin.getDescription().getName();
+        TotalFreedomMod.pluginVersion = plugin.getDescription().getVersion();
 
-        TFM_Log.setPluginLogger(this.getLogger());
-        TFM_Log.setServerLogger(this.getServer().getLogger());
+        TFM_Log.setPluginLogger(plugin.getLogger());
+        TFM_Log.setServerLogger(server.getLogger());
 
         setAppProperties();
     }
@@ -165,7 +166,7 @@ public class TotalFreedomMod extends JavaPlugin
 
         TFM_FrontDoor.getInstance().start();
 
-        TFM_Log.info("Plugin enabled.");
+        TFM_Log.info("Version " + pluginVersion + " enabled");
 
         // Delayed Start :
         new BukkitRunnable()
@@ -186,7 +187,7 @@ public class TotalFreedomMod extends JavaPlugin
 
         TFM_HTTPD_Manager.getInstance().stop();
 
-        TFM_Log.info("Plugin disabled.");
+        TFM_Log.info("Plugin disabled");
     }
 
     @Override
@@ -322,14 +323,16 @@ public class TotalFreedomMod extends JavaPlugin
             props.load(in);
             in.close();
 
-            TotalFreedomMod.pluginVersion = props.getProperty("program.VERSION");
-            TotalFreedomMod.buildNumber = props.getProperty("program.BUILDNUM");
-            TotalFreedomMod.buildDate = props.getProperty("program.BUILDDATE");
+            TotalFreedomMod.buildNumber = props.getProperty("program.buildnumber");
+            TotalFreedomMod.buildDate = props.getProperty("program.builddate");
         }
         catch (Exception ex)
         {
             TFM_Log.severe("Could not load App properties!");
             TFM_Log.severe(ex);
+
+            TotalFreedomMod.buildNumber = "1";
+            TotalFreedomMod.buildDate = TFM_Util.dateToString(new Date());
         }
     }
 }