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 @@
-
-
-
-
-
-
-
-
Builds, tests, and runs the project TotalFreedomMod.
-
-
+
-
-
-
+
+
+
+
+
+
+
+
+
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.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());
}
}
}