From c918a1b6d8008773e9beebb48ba1a770405aee20 Mon Sep 17 00:00:00 2001 From: bculkin2442 Date: Thu, 22 Aug 2019 19:54:41 -0400 Subject: Bulk update back to sanity --- .../fyresmodjam/commands/CommandCraftingStats.java | 76 +++++++--------------- 1 file changed, 25 insertions(+), 51 deletions(-) (limited to 'YWD/src/main/java/fyresmodjam/commands/CommandCraftingStats.java') diff --git a/YWD/src/main/java/fyresmodjam/commands/CommandCraftingStats.java b/YWD/src/main/java/fyresmodjam/commands/CommandCraftingStats.java index aecf4d5..fd31d52 100755 --- a/YWD/src/main/java/fyresmodjam/commands/CommandCraftingStats.java +++ b/YWD/src/main/java/fyresmodjam/commands/CommandCraftingStats.java @@ -33,11 +33,8 @@ public class CommandCraftingStats implements ICommand { } @Override - public void processCommand(ICommandSender icommandsender, - String[] astring) { - int page = astring.length > 0 - ? Integer.parseInt(astring[0]) - 1 - : 0, maxPage = 0; + public void processCommand(ICommandSender icommandsender, String[] astring) { + int page = astring.length > 0 ? Integer.parseInt(astring[0]) - 1 : 0, maxPage = 0; if (icommandsender instanceof EntityPlayer) { EntityPlayer entityplayer = (EntityPlayer) icommandsender; @@ -46,28 +43,17 @@ public class CommandCraftingStats implements ICommand { if (ConfigData.enableCraftingStats) { message = "@Crafting Knowledge:"; - if (entityplayer.getEntityData() - .hasKey("CraftingStats")) { - NBTTagCompound craftingStats = entityplayer - .getEntityData() - .getCompoundTag("CraftingStats"); - - String trackedItems = craftingStats - .hasKey("TrackedItemList") - ? craftingStats.getString( - "TrackedItemList") - : ""; - - if (trackedItems != null - && trackedItems.length() > 0) { - String[] trackedItemList = trackedItems - .split(";"); - - maxPage = Math.max(0, - (craftingStats.func_150296_c() - .size() - - 1) - / 4); + if (entityplayer.getEntityData().hasKey("CraftingStats")) { + NBTTagCompound craftingStats = entityplayer.getEntityData().getCompoundTag("CraftingStats"); + + String trackedItems = craftingStats.hasKey("TrackedItemList") + ? craftingStats.getString("TrackedItemList") + : ""; + + if (trackedItems != null && trackedItems.length() > 0) { + String[] trackedItemList = trackedItems.split(";"); + + maxPage = Math.max(0, (craftingStats.func_150296_c().size() - 1) / 4); if (page > maxPage) { page = maxPage; } @@ -75,11 +61,7 @@ public class CommandCraftingStats implements ICommand { page = 0; } - message = "@Crafting Knowledge (page " - + (page + 1) - + "/" - + (maxPage + 1) - + "):"; + message = "@Crafting Knowledge (page " + (page + 1) + "/" + (maxPage + 1) + "):"; int count = 0, skip = 0; for (String item : trackedItemList) { @@ -88,13 +70,11 @@ public class CommandCraftingStats implements ICommand { continue; } - int kills = craftingStats - .getInteger(item); + int kills = craftingStats.getInteger(item); int last = 0; for (int i = 0; i < EntityStatHelper.killCount.length; i++) { - if (kills >= EntityStatHelper.killCount[i] - * 2) { + if (kills >= EntityStatHelper.killCount[i] * 2) { last = i; continue; } else { @@ -102,15 +82,12 @@ public class CommandCraftingStats implements ICommand { } } - message += "@\u00A7b " - + EntityStatHelper.knowledge[last] - + " " - + item.toLowerCase() - + " smith\u00A73 (" - + kills - + " craft(s)" - + (last < EntityStatHelper.knowledge.length - - 1 ? ", " + (EntityStatHelper.killCount[last + 1] * 2 - kills + " craft(s) to next rank)") : ")"); + message += "@\u00A7b " + EntityStatHelper.knowledge[last] + " " + item.toLowerCase() + + " smith\u00A73 (" + kills + " craft(s)" + + (last < EntityStatHelper.knowledge.length - 1 + ? ", " + (EntityStatHelper.killCount[last + 1] * 2 - kills + + " craft(s) to next rank)") + : ")"); count++; if (count >= 4) { @@ -123,20 +100,17 @@ public class CommandCraftingStats implements ICommand { } } - NewPacketHandler.SEND_MESSAGE.sendToPlayer( - entityplayer, message); + NewPacketHandler.SEND_MESSAGE.sendToPlayer(entityplayer, message); } } @Override - public boolean canCommandSenderUseCommand( - ICommandSender icommandsender) { + public boolean canCommandSenderUseCommand(ICommandSender icommandsender) { return true; } @Override - public List addTabCompletionOptions(ICommandSender icommandsender, - String[] astring) { + public List addTabCompletionOptions(ICommandSender icommandsender, String[] astring) { return null; } -- cgit v1.2.3