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 +++++++-------------- .../commands/CommandCurrentBlessing.java | 26 +++----- .../commands/CommandCurrentDisadvantage.java | 24 ++----- .../commands/CommandCurrentWorldTask.java | 50 +++++--------- .../fyresmodjam/commands/CommandKillStats.java | 74 +++++++-------------- .../fyresmodjam/commands/CommandWeaponStats.java | 77 +++++++--------------- 6 files changed, 103 insertions(+), 224 deletions(-) (limited to 'YWD/src/main/java/fyresmodjam/commands') 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; } diff --git a/YWD/src/main/java/fyresmodjam/commands/CommandCurrentBlessing.java b/YWD/src/main/java/fyresmodjam/commands/CommandCurrentBlessing.java index 09b82df..95bdad9 100755 --- a/YWD/src/main/java/fyresmodjam/commands/CommandCurrentBlessing.java +++ b/YWD/src/main/java/fyresmodjam/commands/CommandCurrentBlessing.java @@ -32,43 +32,33 @@ public class CommandCurrentBlessing implements ICommand { } @Override - public void processCommand(ICommandSender icommandsender, - String[] astring) { + public void processCommand(ICommandSender icommandsender, String[] astring) { if (icommandsender instanceof EntityPlayer) { EntityPlayer entityplayer = (EntityPlayer) icommandsender; - boolean hasBlessing = BlessingUtils - .hasBlessing(entityplayer); + boolean hasBlessing = BlessingUtils.hasBlessing(entityplayer); String blessingMsg = ""; if (hasBlessing) { - Blessing bless = BlessingUtils - .getBlessingInstance( - entityplayer); - - blessingMsg = String.format( - "§eCurrent Blessing - §o%s\n%s", - bless.customName(), - bless.description()); + Blessing bless = BlessingUtils.getBlessingInstance(entityplayer); + + blessingMsg = String.format("§eCurrent Blessing - §o%s\n%s", bless.customName(), bless.description()); } else { blessingMsg = "You don't currently have a blessing"; } - NewPacketHandler.SEND_MESSAGE.sendToPlayer( - entityplayer, blessingMsg); + NewPacketHandler.SEND_MESSAGE.sendToPlayer(entityplayer, blessingMsg); } } @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; } diff --git a/YWD/src/main/java/fyresmodjam/commands/CommandCurrentDisadvantage.java b/YWD/src/main/java/fyresmodjam/commands/CommandCurrentDisadvantage.java index 0ab796d..1d58ae2 100755 --- a/YWD/src/main/java/fyresmodjam/commands/CommandCurrentDisadvantage.java +++ b/YWD/src/main/java/fyresmodjam/commands/CommandCurrentDisadvantage.java @@ -32,40 +32,30 @@ public class CommandCurrentDisadvantage implements ICommand { } @Override - public void processCommand(ICommandSender icommandsender, - String[] astring) { + public void processCommand(ICommandSender icommandsender, String[] astring) { if (icommandsender instanceof EntityPlayer) { EntityPlayer entityplayer = (EntityPlayer) icommandsender; int index = -1; for (int i = 0; i < FyresWorldData.validDisadvantages.length; i++) { - if (FyresWorldData.validDisadvantages[i] - .equals(CommonTickHandler.worldData - .getDisadvantage())) { + if (FyresWorldData.validDisadvantages[i].equals(CommonTickHandler.worldData.getDisadvantage())) { index = i; break; } } - NewPacketHandler.SEND_MESSAGE.sendToPlayer( - entityplayer, - "\u00A7eWorld disadvantage: " - + CommonTickHandler.worldData - .getDisadvantage() - + (index == -1 ? "" - : " (" + FyresWorldData.disadvantageDescriptions[index] - + ")")); + NewPacketHandler.SEND_MESSAGE.sendToPlayer(entityplayer, + "\u00A7eWorld disadvantage: " + CommonTickHandler.worldData.getDisadvantage() + + (index == -1 ? "" : " (" + FyresWorldData.disadvantageDescriptions[index] + ")")); } } @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; } diff --git a/YWD/src/main/java/fyresmodjam/commands/CommandCurrentWorldTask.java b/YWD/src/main/java/fyresmodjam/commands/CommandCurrentWorldTask.java index 34db008..fdf98d8 100755 --- a/YWD/src/main/java/fyresmodjam/commands/CommandCurrentWorldTask.java +++ b/YWD/src/main/java/fyresmodjam/commands/CommandCurrentWorldTask.java @@ -32,65 +32,45 @@ public class CommandCurrentWorldTask implements ICommand { } @Override - public void processCommand(ICommandSender icommandsender, - String[] astring) { + public void processCommand(ICommandSender icommandsender, String[] astring) { if (icommandsender instanceof EntityPlayer) { EntityPlayer entityplayer = (EntityPlayer) icommandsender; - String name = CommonTickHandler.worldData.currentTask - .equals("Kill") ? FyresWorldData.validMobNames[CommonTickHandler.worldData.currentTaskID] - : FyresWorldData.validItems[CommonTickHandler.worldData.currentTaskID] - .getDisplayName(); + String name = CommonTickHandler.worldData.currentTask.equals("Kill") + ? FyresWorldData.validMobNames[CommonTickHandler.worldData.currentTaskID] + : FyresWorldData.validItems[CommonTickHandler.worldData.currentTaskID].getDisplayName(); if (CommonTickHandler.worldData.currentTaskAmount > 1) { if (name.contains("Block")) { if (name.contains("Block")) { - name = name.replace( - "Block", - "Blocks") - .replace("block", - "blocks"); + name = name.replace("Block", "Blocks").replace("block", "blocks"); } } else { name += "s"; } } - NewPacketHandler.SEND_MESSAGE.sendToPlayer( - entityplayer, - "\u00A7eWorld goal: " - + CommonTickHandler.worldData.currentTask - + " " - + CommonTickHandler.worldData.currentTaskAmount - + " " + name - + ". (" - + CommonTickHandler.worldData.progress - + " " - + CommonTickHandler.worldData.currentTask + NewPacketHandler.SEND_MESSAGE.sendToPlayer(entityplayer, + "\u00A7eWorld goal: " + CommonTickHandler.worldData.currentTask + " " + + CommonTickHandler.worldData.currentTaskAmount + " " + name + ". (" + + CommonTickHandler.worldData.progress + " " + CommonTickHandler.worldData.currentTask + "ed)"); - NewPacketHandler.SEND_MESSAGE.sendToPlayer( - entityplayer, - "\u00A7f Reward: " - + CommonTickHandler.worldData.rewardLevels - + " Experience Levels"); + NewPacketHandler.SEND_MESSAGE.sendToPlayer(entityplayer, + "\u00A7f Reward: " + CommonTickHandler.worldData.rewardLevels + " Experience Levels"); - NewPacketHandler.SEND_MESSAGE.sendToPlayer( - entityplayer, - "\u00A7eGoals completed: " - + CommonTickHandler.worldData.tasksCompleted); + NewPacketHandler.SEND_MESSAGE.sendToPlayer(entityplayer, + "\u00A7eGoals completed: " + CommonTickHandler.worldData.tasksCompleted); } } @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; } diff --git a/YWD/src/main/java/fyresmodjam/commands/CommandKillStats.java b/YWD/src/main/java/fyresmodjam/commands/CommandKillStats.java index 582f38c..61ee87c 100755 --- a/YWD/src/main/java/fyresmodjam/commands/CommandKillStats.java +++ b/YWD/src/main/java/fyresmodjam/commands/CommandKillStats.java @@ -33,11 +33,8 @@ public class CommandKillStats 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; @@ -47,28 +44,16 @@ public class CommandKillStats implements ICommand { if (ConfigData.enableMobKillStats) { message = "@Creature Knowledge:"; - if (entityplayer.getEntityData() - .hasKey("KillStats")) { - NBTTagCompound killStats = entityplayer - .getEntityData() - .getCompoundTag("KillStats"); - - String trackedMobs = killStats - .hasKey("TrackedMobList") - ? killStats.getString( - "TrackedMobList") - : ""; - - if (trackedMobs != null - && trackedMobs.length() > 0) { - String[] trackedMobList = trackedMobs - .split(";"); - - maxPage = Math.max(0, - (killStats.func_150296_c() - .size() - - 1) - / 4); + if (entityplayer.getEntityData().hasKey("KillStats")) { + NBTTagCompound killStats = entityplayer.getEntityData().getCompoundTag("KillStats"); + + String trackedMobs = killStats.hasKey("TrackedMobList") ? killStats.getString("TrackedMobList") + : ""; + + if (trackedMobs != null && trackedMobs.length() > 0) { + String[] trackedMobList = trackedMobs.split(";"); + + maxPage = Math.max(0, (killStats.func_150296_c().size() - 1) / 4); if (page > maxPage) { page = maxPage; } @@ -76,11 +61,7 @@ public class CommandKillStats implements ICommand { page = 0; } - message = "@Creature Knowledge (page " - + (page + 1) - + "/" - + (maxPage + 1) - + "):"; + message = "@Creature Knowledge (page " + (page + 1) + "/" + (maxPage + 1) + "):"; int count = 0, skip = 0; for (String mob : trackedMobList) { @@ -89,8 +70,7 @@ public class CommandKillStats implements ICommand { continue; } - int kills = killStats - .getInteger(mob); + int kills = killStats.getInteger(mob); int last = 0; for (int i = 0; i < EntityStatHelper.killCount.length; i++) { @@ -102,19 +82,14 @@ public class CommandKillStats implements ICommand { } } - message += "@\u00A7b " - + EntityStatHelper.knowledge[last] - + " " - + mob.toLowerCase() + message += "@\u00A7b " + EntityStatHelper.knowledge[last] + " " + mob.toLowerCase() + " slayer\u00A73 " + (last > 0 ? "+" - + EntityStatHelper.damageBonusString[last] - + "% damage bonus (" - : "(") - + kills - + " kill(s)" - + (last < EntityStatHelper.knowledge.length - - 1 ? ", " + (EntityStatHelper.killCount[last + 1] - kills + " kill(s) to next rank)") : ")"); + + EntityStatHelper.damageBonusString[last] + "% damage bonus (" : "(") + + kills + " kill(s)" + + (last < EntityStatHelper.knowledge.length - 1 ? ", " + + (EntityStatHelper.killCount[last + 1] - kills + " kill(s) to next rank)") + : ")"); count++; if (count >= 4) { @@ -127,20 +102,17 @@ public class CommandKillStats 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; } diff --git a/YWD/src/main/java/fyresmodjam/commands/CommandWeaponStats.java b/YWD/src/main/java/fyresmodjam/commands/CommandWeaponStats.java index 95c91f7..4957e52 100755 --- a/YWD/src/main/java/fyresmodjam/commands/CommandWeaponStats.java +++ b/YWD/src/main/java/fyresmodjam/commands/CommandWeaponStats.java @@ -33,11 +33,8 @@ public class CommandWeaponStats 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,27 +43,16 @@ public class CommandWeaponStats implements ICommand { if (ConfigData.enableWeaponKillStats) { message = "@Weapon Knowledge:"; - if (entityplayer.getEntityData() - .hasKey("WeaponStats")) { - NBTTagCompound itemStats = entityplayer - .getEntityData() - .getCompoundTag("WeaponStats"); - - String trackedItems = itemStats - .hasKey("TrackedItemList") - ? itemStats.getString( - "TrackedItemList") - : ""; - - if (trackedItems != null - && trackedItems.length() > 0) { - String[] trackedItemList = trackedItems - .split(";"); - - maxPage = Math.max(0, - (itemStats.func_150296_c() - .size()) - / 4); + if (entityplayer.getEntityData().hasKey("WeaponStats")) { + NBTTagCompound itemStats = entityplayer.getEntityData().getCompoundTag("WeaponStats"); + + String trackedItems = itemStats.hasKey("TrackedItemList") ? itemStats.getString("TrackedItemList") + : ""; + + if (trackedItems != null && trackedItems.length() > 0) { + String[] trackedItemList = trackedItems.split(";"); + + maxPage = Math.max(0, (itemStats.func_150296_c().size()) / 4); if (page > maxPage) { page = maxPage; } @@ -74,11 +60,7 @@ public class CommandWeaponStats implements ICommand { page = 0; } - message = "@Weapon Knowledge (page " - + (page + 1) - + "/" - + (maxPage + 1) - + "):"; + message = "@Weapon Knowledge (page " + (page + 1) + "/" + (maxPage + 1) + "):"; int count = 0, skip = 0; for (String item : trackedItemList) { @@ -87,13 +69,11 @@ public class CommandWeaponStats implements ICommand { continue; } - int kills = itemStats - .getInteger(item); + int kills = itemStats.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 { @@ -101,19 +81,15 @@ public class CommandWeaponStats implements ICommand { } } - message += "@\u00A7b " - + EntityStatHelper.knowledge[last] - + " " - + item.toLowerCase() + message += "@\u00A7b " + EntityStatHelper.knowledge[last] + " " + item.toLowerCase() + " user\u00A73 " - + (last > 0 ? "+" - + EntityStatHelper.damageBonusString[last] - + "% damage bonus (" + + (last > 0 ? "+" + EntityStatHelper.damageBonusString[last] + "% damage bonus (" : "(") - + kills - + " kill(s)" - + (last < EntityStatHelper.knowledge.length - - 1 ? ", " + (EntityStatHelper.killCount[last + 1] * 2 - kills + " kill(s) to next rank)") : ")"); + + kills + " kill(s)" + + (last < EntityStatHelper.knowledge.length - 1 + ? ", " + (EntityStatHelper.killCount[last + 1] * 2 - kills + + " kill(s) to next rank)") + : ")"); count++; if (count >= 4) { @@ -126,20 +102,17 @@ public class CommandWeaponStats 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