diff options
| author | bculkin2442 <bjculkin@mix.wvu.edu> | 2019-08-22 19:54:41 -0400 |
|---|---|---|
| committer | bculkin2442 <bjculkin@mix.wvu.edu> | 2019-08-22 19:54:41 -0400 |
| commit | c918a1b6d8008773e9beebb48ba1a770405aee20 (patch) | |
| tree | 7588d9e570addc61d2f318697662e6f2156fa04e /YWD/src/main/java/fyresmodjam/commands/CommandKillStats.java | |
| parent | 3eb8c7a8fca3f22475d53e30f0b90a6737f313fa (diff) | |
Bulk update back to sanity
Diffstat (limited to 'YWD/src/main/java/fyresmodjam/commands/CommandKillStats.java')
| -rwxr-xr-x | YWD/src/main/java/fyresmodjam/commands/CommandKillStats.java | 74 |
1 files changed, 23 insertions, 51 deletions
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;
}
|