Add /armor, changes to READMEv1.5.3

Change name -> player in README to match /dhelp

2 files changed, 155 insertions, 14 deletions

diff --git a/me/Danker/commands/ArmourCommand.java b/me/Danker/commands/ArmourCommand.java
new file mode 100644
index 0000000..4d89bcd
--- /dev/null
+++ b/me/Danker/commands/ArmourCommand.java
@@ -0,0 +1,140 @@
+package me.Danker.commands;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Base64;
+import java.util.Collections;
+import java.util.List;
+
+import com.google.gson.JsonObject;
+
+import me.Danker.handlers.APIHandler;
+import me.Danker.handlers.ConfigHandler;
+import net.minecraft.command.CommandBase;
+import net.minecraft.command.CommandException;
+import net.minecraft.command.ICommandSender;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.nbt.CompressedStreamTools;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.NBTTagList;
+import net.minecraft.util.ChatComponentText;
+import net.minecraft.util.EnumChatFormatting;
+
+public class ArmourCommand extends CommandBase {
+
+	@Override
+	public String getCommandName() {
+		return "armor";
+	}
+	
+	@Override
+	public List<String> getCommandAliases()
+    {
+        return Collections.singletonList("armour");
+    }
+
+	@Override
+	public String getCommandUsage(ICommandSender arg0) {
+		return getCommandName() + " [name]";
+	}
+	
+	@Override
+	public int getRequiredPermissionLevel() {
+		return 0;
+	}
+
+	@Override
+	public void processCommand(ICommandSender arg0, String[] arg1) throws CommandException {
+		// MULTI THREAD DRIFTING
+		new Thread(() -> {
+			APIHandler ah = new APIHandler();
+			ConfigHandler cf = new ConfigHandler();
+			EntityPlayer player = (EntityPlayer) arg0;
+			
+			// Check key
+			String key = cf.getString("api", "APIKey");
+			if (key.equals("")) {
+				player.addChatMessage(new ChatComponentText(EnumChatFormatting.RED + "API key not set. Use /setkey."));
+			}
+			
+			// Get UUID for Hypixel API requests
+			String username;
+			String uuid;
+			if (arg1.length == 0) {
+				username = player.getName();
+				uuid = player.getUniqueID().toString().replaceAll("[\\-]", "");
+				player.addChatMessage(new ChatComponentText(EnumChatFormatting.GREEN + "Checking armour of " + EnumChatFormatting.DARK_GREEN + username));
+			} else {
+				username = arg1[0];
+				player.addChatMessage(new ChatComponentText(EnumChatFormatting.GREEN + "Checking armour of " + EnumChatFormatting.DARK_GREEN + username));
+				uuid = ah.getUUID(username);
+			}
+			
+			// Find stats of latest profile
+			String latestProfile = ah.getLatestProfileID(uuid, key);
+			if (latestProfile == null) return;
+
+			String profileURL = "https://api.hypixel.net/skyblock/profile?profile=" + latestProfile + "&key=" + key;
+			System.out.println("Fetching profile...");
+			JsonObject profileResponse = ah.getResponse(profileURL);
+			if (!profileResponse.get("success").getAsBoolean()) {
+				String reason = profileResponse.get("cause").getAsString();
+				player.addChatMessage(new ChatComponentText(EnumChatFormatting.RED + "Failed with reason: " + reason));
+				return;
+			}
+			
+			String armourBase64 = profileResponse.get("profile").getAsJsonObject().get("members").getAsJsonObject().get(uuid).getAsJsonObject().get("inv_armor").getAsJsonObject().get("data").getAsString();
+			InputStream armourStream = new ByteArrayInputStream(Base64.getDecoder().decode(armourBase64));
+			// String armourDecodedGZIP = new String(Base64.getDecoder().decode(armourBase64));
+			
+			try {
+				NBTTagCompound armour = CompressedStreamTools.readCompressed(armourStream);
+				NBTTagList armourList = armour.getTagList("i", 10);
+				
+				String helmet = EnumChatFormatting.RED + "None";
+				String chest = EnumChatFormatting.RED + "None";
+				String legs = EnumChatFormatting.RED + "None";
+				String boots = EnumChatFormatting.RED + "None";
+				// Loop through armour
+				for (int i = 0; i < armourList.tagCount(); i++) {
+					NBTTagCompound armourPiece = armourList.getCompoundTagAt(i);
+					if (armourPiece.hasNoTags()) continue;
+					
+					String armourPieceName = armourPiece.getCompoundTag("tag").getCompoundTag("display").getString("Name");
+					// NBT is served boots -> helmet
+					switch (i) {
+						case 0:
+							boots = armourPieceName;
+							break;
+						case 1:
+							legs = armourPieceName;
+							break;
+						case 2:
+							chest = armourPieceName;
+							break;
+						case 3:
+							helmet = armourPieceName;
+							break;
+						default:
+							System.err.println("An error has occurred.");
+							break;
+					}
+				}
+				armourStream.close();
+				
+				player.addChatMessage(new ChatComponentText(EnumChatFormatting.AQUA + "" + EnumChatFormatting.BOLD + "-------------------\n" +
+															EnumChatFormatting.AQUA + " " + username + "'s Armour:\n" +
+															EnumChatFormatting.GREEN + " Helmet:      " + helmet + "\n" +
+															EnumChatFormatting.GREEN + " Chestplate: " + chest + "\n" +
+															EnumChatFormatting.GREEN + " Leggings:   " + legs + "\n" +
+															EnumChatFormatting.GREEN + " Boots:       " + boots + "\n" +
+															EnumChatFormatting.AQUA + " " + EnumChatFormatting.BOLD + "-------------------"));
+			} catch (IOException ex) {
+				player.addChatMessage(new ChatComponentText(EnumChatFormatting.RED + "An error has occurred while reading inventory data. See logs for more info."));
+				System.err.println(ex);
+			}
+		}).start();
+	}
+
+}
diff --git a/me/Danker/commands/DHelpCommand.java b/me/Danker/commands/DHelpCommand.java
index 34b1dec..e086813 100644
--- a/me/Danker/commands/DHelpCommand.java
+++ b/me/Danker/commands/DHelpCommand.java
@@ -28,20 +28,21 @@ public class DHelpCommand extends CommandBase {
 	public void processCommand(ICommandSender arg0, String[] arg1) throws CommandException {
 		EntityPlayer player = (EntityPlayer) arg0;
 		
-		player.addChatMessage(new ChatComponentText(EnumChatFormatting.GOLD + "Danker's Skyblock Mod Version 1.5.3\n" +
-													EnumChatFormatting.AQUA + "<> = Mandatory parameter. [] = Optional parameter.\n" +
-													EnumChatFormatting.GOLD + "/dhelp" + EnumChatFormatting.AQUA + " - Returns this message.\n" +
-													EnumChatFormatting.GOLD + "/toggle <gparty/coords/list>" + EnumChatFormatting.AQUA + " - Toggles features. /toggle list returns values of every toggle.\n" +
-													EnumChatFormatting.GOLD + "/setkey <key>" + EnumChatFormatting.AQUA + " - Sets API key.\n" +
-													EnumChatFormatting.GOLD + "/getkey" + EnumChatFormatting.AQUA + " - Returns key set with /setkey.\n" +
-													EnumChatFormatting.GOLD + "/loot <zombie/spider/wolf>" + EnumChatFormatting.AQUA + " - Returns loot received from slayer quests.\n" +
-													EnumChatFormatting.GOLD + "/display <zombie/spider/wolf/off>" + EnumChatFormatting.AQUA + " - Text display for slayer tracker.\n" +
-													EnumChatFormatting.GOLD + "/move <coords/display> <x> <y>" + EnumChatFormatting.AQUA + " - Moves text display to specified X and Y coordinates.\n" +
-													EnumChatFormatting.GOLD + "/slayer [player]" + EnumChatFormatting.AQUA + " - Uses API to get slayer xp of a person. If no name is provided, it checks yours.\n" +
-													EnumChatFormatting.GOLD + "/skills [player]" + EnumChatFormatting.AQUA + " - Uses API to get skill levels of a person. If no name is provided, it checks yours.\n" +
-													EnumChatFormatting.GOLD + "/guildof [player]" + EnumChatFormatting.AQUA + " - Uses API to get guild name and guild master of a person. If no name is provided, it checks yours.\n" +
-													EnumChatFormatting.GOLD + "/pets [player]" + EnumChatFormatting.AQUA + " - Uses API to get pets of a person. If no name is provided, it checks yours.\n" +
-													EnumChatFormatting.GOLD + "/bank [player]" + EnumChatFormatting.AQUA + " - Uses API to get bank and purse coins of a person. If no name is provided, it checks yours.\n"));
+		player.addChatMessage(new ChatComponentText("\n" + EnumChatFormatting.GOLD + " Danker's Skyblock Mod Version 1.5.3\n" +
+													EnumChatFormatting.AQUA + " <> = Mandatory parameter. [] = Optional parameter.\n" +
+													EnumChatFormatting.GOLD + " /dhelp" + EnumChatFormatting.AQUA + " - Returns this message.\n" +
+													EnumChatFormatting.GOLD + " /toggle <gparty/coords/list>" + EnumChatFormatting.AQUA + " - Toggles features. /toggle list returns values of every toggle.\n" +
+													EnumChatFormatting.GOLD + " /setkey <key>" + EnumChatFormatting.AQUA + " - Sets API key.\n" +
+													EnumChatFormatting.GOLD + " /getkey" + EnumChatFormatting.AQUA + " - Returns key set with /setkey.\n" +
+													EnumChatFormatting.GOLD + " /loot <zombie/spider/wolf>" + EnumChatFormatting.AQUA + " - Returns loot received from slayer quests.\n" +
+													EnumChatFormatting.GOLD + " /display <zombie/spider/wolf/off>" + EnumChatFormatting.AQUA + " - Text display for slayer tracker.\n" +
+													EnumChatFormatting.GOLD + " /move <coords/display> <x> <y>" + EnumChatFormatting.AQUA + " - Moves text display to specified X and Y coordinates.\n" +
+													EnumChatFormatting.GOLD + " /slayer [player]" + EnumChatFormatting.AQUA + " - Uses API to get slayer xp of a person. If no name is provided, it checks yours.\n" +
+													EnumChatFormatting.GOLD + " /skills [player]" + EnumChatFormatting.AQUA + " - Uses API to get skill levels of a person. If no name is provided, it checks yours.\n" +
+													EnumChatFormatting.GOLD + " /guildof [player]" + EnumChatFormatting.AQUA + " - Uses API to get guild name and guild master of a person. If no name is provided, it checks yours.\n" +
+													EnumChatFormatting.GOLD + " /pets [player]" + EnumChatFormatting.AQUA + " - Uses API to get pets of a person. If no name is provided, it checks yours.\n" +
+													EnumChatFormatting.GOLD + " /bank [player]" + EnumChatFormatting.AQUA + " - Uses API to get bank and purse coins of a person. If no name is provided, it checks yours.\n" +
+													EnumChatFormatting.GOLD + " /armor [player]" + EnumChatFormatting.AQUA + " - Uses API to get armour of a person. If no name is provided, it checks yours.\n"));
 	}
 
 }