Add Blaze to /peek (#279)

* Add Blaze to /peek

Add blaze slayer to /peek
Add Carpentry to skill average in /peek
Fix color of - in peek
Add my IGN to DEV_TESTERS in DevTestCommand and actually commit it so I can stop manually re-adding myself to that list

* Update 2.1.md

Added changes to changelog

* Update 2.1.md

Changed formatting for readability

3 files changed, 17 insertions, 5 deletions

diff --git a/Update Notes/2.1.md b/Update Notes/2.1.md
index 50e2d0e4..e6b2b472 100644
--- a/Update Notes/2.1.md
+++ b/Update Notes/2.1.md
@@ -7,7 +7,7 @@
 - Added combat skill overlay - nopo
 - Added slayer overlay - nopo
 - Added blocking clicks back to the enchanting minigames (because apparently, it's not bannable?)
-- [Donpireso replied to a sba dev's email about some of sba features, and it seems to imply that blocking clicks in guis aren't bannable](https://cdn.discordapp.com/attachments/823769568933576764/906101631861526559/unknown.png)
+  - [Donpireso replied to a sba dev's email about some of sba features, and it seems to imply that blocking clicks in guis aren't bannable](https://cdn.discordapp.com/attachments/823769568933576764/906101631861526559/unknown.png)
   - Made it if you hold shift in the enchant solvers it overrides prevent missclicks - nopo
 - Fixed pet overlay not updating when going into /pets - nopo
 - Fixed pet overlay randomly going to level 100 - nopo
@@ -153,6 +153,8 @@
 - Fixed priceless items showing first in the missing tab of the accessory bag overlay - nopo
 - Fixed clicking outside of experimentation game causing it to go count that as a valid click - nopo
 - Fixed storage gui when having locked backpack slots - nopo
+- Fixed hyphens in /peek being the wrong color - whalker
+- Fixed skill average calculation to include carpentry in /peek - whalker
 
 ### **Other:**
 
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/commands/dev/DevTestCommand.java b/src/main/java/io/github/moulberry/notenoughupdates/commands/dev/DevTestCommand.java
index fdf59bb0..2a5e3305 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/commands/dev/DevTestCommand.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/commands/dev/DevTestCommand.java
@@ -57,7 +57,8 @@ public class DevTestCommand extends ClientCommandBase {
 			"dediamondpro",
 			"lulonaut",
 			"craftyoldminer",
-			"eisengolem"
+			"eisengolem",
+			"whalker"
 		);
 
 	private static final String[] DEV_FAIL_STRINGS = {
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/commands/profile/PeekCommand.java b/src/main/java/io/github/moulberry/notenoughupdates/commands/profile/PeekCommand.java
index 421f7c10..75e779fc 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/commands/profile/PeekCommand.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/commands/profile/PeekCommand.java
@@ -122,7 +122,7 @@ public class PeekCommand extends ClientCommandBase {
 								float totalSkillLVL = 0;
 								float totalSkillCount = 0;
 
-								List<String> skills = Arrays.asList("taming", "mining", "foraging", "enchanting", "farming", "combat", "fishing", "alchemy");
+								List<String> skills = Arrays.asList("taming", "mining", "foraging", "enchanting", "farming", "combat", "fishing", "alchemy", "carpentry");
 								for (String skillName : skills) {
 									totalSkillLVL += skyblockInfo.get(skillName).level;
 									totalSkillCount++;
@@ -133,6 +133,7 @@ public class PeekCommand extends ClientCommandBase {
 								float spider = skyblockInfo.get("spider").level;
 								float wolf = skyblockInfo.get("wolf").level;
 								float enderman = skyblockInfo.get("enderman").level;
+								float blaze = skyblockInfo.get("blaze").level;
 
 								float avgSkillLVL = totalSkillLVL / totalSkillCount;
 
@@ -143,6 +144,7 @@ public class PeekCommand extends ClientCommandBase {
 									spider = 1;
 									wolf = 2;
 									enderman = 0;
+									blaze = 0;
 								}
 
 								EnumChatFormatting combatPrefix = combat > 20
@@ -161,6 +163,11 @@ public class PeekCommand extends ClientCommandBase {
 									? EnumChatFormatting.GREEN
 									: EnumChatFormatting.YELLOW)
 									: EnumChatFormatting.RED;
+								EnumChatFormatting blazePrefix = blaze > 3
+									? (blaze > 6
+									? EnumChatFormatting.GREEN
+									: EnumChatFormatting.YELLOW)
+									: EnumChatFormatting.RED;
 								EnumChatFormatting avgPrefix = avgSkillLVL > 20
 									? (avgSkillLVL > 35
 									? EnumChatFormatting.GREEN
@@ -171,6 +178,7 @@ public class PeekCommand extends ClientCommandBase {
 								overallScore += spider * spider / 81f;
 								overallScore += wolf * wolf / 81f;
 								overallScore += enderman * enderman / 81f;
+								overallScore += blaze * blaze / 81f;
 								overallScore += avgSkillLVL / 20f;
 
 								int cata = (int) skyblockInfo.get("catacombs").level;
@@ -187,8 +195,9 @@ public class PeekCommand extends ClientCommandBase {
 								Minecraft.getMinecraft().thePlayer.addChatMessage(new ChatComponentText(
 									g + "Slayer: " + zombiePrefix + (int) Math.floor(zombie) + g + "-" +
 										spiderPrefix + (int) Math.floor(spider) + g + "-" +
-										wolfPrefix + (int) Math.floor(wolf) + "-" +
-										endermanPrefix + (int) Math.floor(enderman)));
+										wolfPrefix + (int) Math.floor(wolf) + g+ "-" +
+										endermanPrefix + (int) Math.floor(enderman) + g + "-" +
+										blazePrefix + (int) Math.floor(blaze)));
 							}
 							if (stats == null) {
 								Minecraft.getMinecraft().thePlayer.addChatMessage(new ChatComponentText(