From 037a2f8353267700e074585c9423a54bdd19a22a Mon Sep 17 00:00:00 2001
From: Shaun Bennett <shaun@mineplex.com>
Date: Wed, 20 Jan 2016 13:04:31 -0500
Subject: [PATCH] Change craftbukkit to provided scope, add ascii.png to Hub
 and Arcade, new /bversion command

---
 .../mineplex/core/common/util/UtilText.java   |   2 +-
 Plugins/Mineplex.Core/pom.xml                 |   4 ++
 .../mineplex/core/updater/FileUpdater.java    |  37 +++++++++++++++---
 .../updater/command/BuildVersionCommand.java  |  33 ++++++++++++++++
 .../{ => command}/RestartServerCommand.java   |   3 +-
 .../core/common => Mineplex.Hub}/ascii.png    | Bin
 Plugins/Nautilus.Game.Arcade/ascii.png        | Bin 0 -> 2516 bytes
 Plugins/plugin.xml                            |   1 +
 Plugins/pom.xml                               |   2 +-
 9 files changed, 74 insertions(+), 8 deletions(-)
 create mode 100644 Plugins/Mineplex.Core/src/mineplex/core/updater/command/BuildVersionCommand.java
 rename Plugins/Mineplex.Core/src/mineplex/core/updater/{ => command}/RestartServerCommand.java (93%)
 rename Plugins/{Mineplex.Core.Common/src/mineplex/core/common => Mineplex.Hub}/ascii.png (100%)
 create mode 100644 Plugins/Nautilus.Game.Arcade/ascii.png

diff --git a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilText.java b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilText.java
index 360a418c2..fe42fdf3c 100644
--- a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilText.java
+++ b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilText.java
@@ -24,7 +24,7 @@ public class UtilText
 	{
 		try
 		{
-			InputStream inputStream = CurrencyType.class.getResourceAsStream("ascii.png");
+			InputStream inputStream = CurrencyType.class.getResourceAsStream("/ascii.png");
 			BufferedImage image = ImageIO.read(inputStream);
 
 			char[] text = new char[]
diff --git a/Plugins/Mineplex.Core/pom.xml b/Plugins/Mineplex.Core/pom.xml
index 9ca17ceef..6dd7ec6c3 100644
--- a/Plugins/Mineplex.Core/pom.xml
+++ b/Plugins/Mineplex.Core/pom.xml
@@ -44,5 +44,9 @@
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.mineplex</groupId>
+            <artifactId>spigot</artifactId>
+        </dependency>
     </dependencies>
 </project>
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/updater/FileUpdater.java b/Plugins/Mineplex.Core/src/mineplex/core/updater/FileUpdater.java
index 4b11a5e29..5df3e3a33 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/updater/FileUpdater.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/updater/FileUpdater.java
@@ -4,7 +4,10 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.io.FilenameFilter;
 import java.io.IOException;
+import java.util.Properties;
 
+import mineplex.core.updater.command.BuildVersionCommand;
+import mineplex.core.updater.command.RestartServerCommand;
 import org.apache.commons.codec.digest.DigestUtils;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
@@ -34,28 +37,33 @@ public class FileUpdater extends MiniPlugin
 	
 	private boolean _needUpdate;
 	private boolean _enabled = true;
+
+	private Properties _buildProperties;
 	
 	public FileUpdater(JavaPlugin plugin, Portal portal, String serverName, Region region)
 	{
 		super("File Updater", plugin);
-		
+
 		_portal = portal;
 		_serverName = serverName;
 		_region = region;
-		
+
 		GetPluginMd5s();
-		
+
 		if (new File("IgnoreUpdates.dat").exists())
 			_enabled = false;
-		
+
 		// Register the server command type for future use
 		ServerCommandManager.getInstance().registerCommandType("RestartCommand", RestartCommand.class, new RestartHandler(plugin, _serverName, _region));
+
+		loadBuildProperties();
 	}
-	
+
 	@Override
 	public void addCommands()
 	{
 		addCommand(new RestartServerCommand(this));
+		addCommand(new BuildVersionCommand(this));
 	}
 	
 	@EventHandler
@@ -224,6 +232,25 @@ public class FileUpdater extends MiniPlugin
 	    }
 	}
 
+	private void loadBuildProperties()
+	{
+		_buildProperties = new Properties();
+
+		try
+		{
+			_buildProperties.load(this.getClass().getResourceAsStream("/version.properties"));
+		}
+		catch (IOException e)
+		{
+			e.printStackTrace();
+		}
+	}
+
+	public Properties getBuildProperties()
+	{
+		return _buildProperties;
+	}
+
 	public Region getRegion()
 	{
 		return _region;
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/updater/command/BuildVersionCommand.java b/Plugins/Mineplex.Core/src/mineplex/core/updater/command/BuildVersionCommand.java
new file mode 100644
index 000000000..0e5e2b10f
--- /dev/null
+++ b/Plugins/Mineplex.Core/src/mineplex/core/updater/command/BuildVersionCommand.java
@@ -0,0 +1,33 @@
+package mineplex.core.updater.command;
+
+import java.util.Properties;
+
+import org.bukkit.entity.Player;
+
+import mineplex.core.command.CommandBase;
+import mineplex.core.common.Rank;
+import mineplex.core.common.util.C;
+import mineplex.core.updater.FileUpdater;
+
+public class BuildVersionCommand extends CommandBase<FileUpdater>
+{
+	public BuildVersionCommand(FileUpdater plugin)
+	{
+		super(plugin, Rank.MODERATOR, "bversion");
+	}
+
+	@Override
+	public void Execute(Player caller, String[] args)
+	{
+		Properties buildProperties = Plugin.getBuildProperties();
+
+		String git = buildProperties.getProperty("build.git", "Unknown");
+		String date = buildProperties.getProperty("build.date", "Unknown");
+		String user = buildProperties.getProperty("build.user", "Unknown");
+
+		caller.sendMessage(C.cRedB + "Build Version;");
+		caller.sendMessage("  " + C.cGold + "Date " + C.cWhite + date);
+		caller.sendMessage("  " + C.cGold + "User " + C.cWhite + user);
+		caller.sendMessage("  " + C.cGold + "Git " + C.cWhite + git);
+	}
+}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/updater/RestartServerCommand.java b/Plugins/Mineplex.Core/src/mineplex/core/updater/command/RestartServerCommand.java
similarity index 93%
rename from Plugins/Mineplex.Core/src/mineplex/core/updater/RestartServerCommand.java
rename to Plugins/Mineplex.Core/src/mineplex/core/updater/command/RestartServerCommand.java
index 1067506b0..544ae231e 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/updater/RestartServerCommand.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/updater/command/RestartServerCommand.java
@@ -1,4 +1,4 @@
-package mineplex.core.updater;
+package mineplex.core.updater.command;
 
 import org.bukkit.entity.Player;
 
@@ -9,6 +9,7 @@ import mineplex.core.common.util.Callback;
 import mineplex.core.common.util.F;
 import mineplex.core.common.util.UtilPlayer;
 import mineplex.core.portal.Portal;
+import mineplex.core.updater.FileUpdater;
 import mineplex.serverdata.commands.RestartCommand;
 
 public class RestartServerCommand extends CommandBase<FileUpdater>
diff --git a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/ascii.png b/Plugins/Mineplex.Hub/ascii.png
similarity index 100%
rename from Plugins/Mineplex.Core.Common/src/mineplex/core/common/ascii.png
rename to Plugins/Mineplex.Hub/ascii.png
diff --git a/Plugins/Nautilus.Game.Arcade/ascii.png b/Plugins/Nautilus.Game.Arcade/ascii.png
new file mode 100644
index 0000000000000000000000000000000000000000..587966dc34dccb49992236660b344f46c66c965c
GIT binary patch
literal 2516
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

literal 0
HcmV?d00001

diff --git a/Plugins/plugin.xml b/Plugins/plugin.xml
index 5febc2a54..c36f68b81 100644
--- a/Plugins/plugin.xml
+++ b/Plugins/plugin.xml
@@ -20,6 +20,7 @@
                 <includes>
                     <include>plugin.yml</include>
                     <include>version.properties</include>
+                    <include>ascii.png</include>
                 </includes>
                 <filtering>true</filtering>
             </resource>
diff --git a/Plugins/pom.xml b/Plugins/pom.xml
index f17e2b4ff..cd99db999 100644
--- a/Plugins/pom.xml
+++ b/Plugins/pom.xml
@@ -117,7 +117,7 @@
                 <groupId>com.mineplex</groupId>
                 <artifactId>spigot</artifactId>
                 <version>1.8.8-R0.1-SNAPSHOT</version>
-                <scope>compile</scope>
+                <scope>provided</scope>
             </dependency>
             <dependency>
                 <groupId>redis.clients</groupId>