TotalFreedomMC/TF-EssentialsX
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-EssentialsX.git synced 2025-02-12 12:23:59 +00:00
Code Issues Projects Releases Wiki Activity

Updated joinList to properly handle lists of lists.

Browse source
This commit is contained in:
okamosy 2011-08-23 19:47:50 +01:00
parent dfdf49ac35
commit 2a1b19a8a8
5 changed files with 23 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
Essentials/src/com/earth2me/essentials/Util.java
View file

@ -11,6 +11,7 @@ import java.net.URL;
import java.text.DecimalFormat; import java.text.DecimalFormat;
import java.text.DecimalFormatSymbols; import java.text.DecimalFormatSymbols;
import java.text.MessageFormat; import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.Calendar; import java.util.Calendar;
import java.util.Enumeration; import java.util.Enumeration;
import java.util.GregorianCalendar; import java.util.GregorianCalendar;
@ -470,17 +471,22 @@ public class Util
public static String joinList(Object... list) public static String joinList(Object... list)
{ {
final StringBuilder buf = new StringBuilder(); StringBuilder buf = new StringBuilder();
boolean first = true;
for (Object each : list) for (Object each : list)
{ {
if (!first) if (buf.length() > 0)
{ {
buf.append(", "); buf.append(", ");
} }
first = false;
buf.append(each); if(each instanceof List)
{
buf.append(joinList(((List)each).toArray()));
}
else
{
buf.append(each.toString());
}
} }
return buf.toString(); return buf.toString();
} }
@ -489,26 +495,4 @@ public class Util
{ {
return s.toUpperCase().charAt(0) + s.toLowerCase().substring(1); return s.toUpperCase().charAt(0) + s.toLowerCase().substring(1);
} }
public static String concat(List list)
{
return concat(",", list);
}
public static String concat(String seperator, List list)
{
StringBuilder sb = new StringBuilder();
for(Object item : list)
{
if(sb.length() > 0)
{
sb.append(seperator);
}
sb.append(item.toString());
}
return sb.toString();
}
} }

4
Essentials/src/com/earth2me/essentials/commands/Commandpowertool.java
View file

@ -39,7 +39,7 @@ public class Commandpowertool extends EssentialsCommand
} }
else else
{ {
user.sendMessage(Util.format("powerToolList", Util.concat(powertools), itemName)); user.sendMessage(Util.format("powerToolList", Util.joinList(powertools), itemName));
} }
return; return;
} }
@ -85,7 +85,7 @@ public class Commandpowertool extends EssentialsCommand
} }
powertools.add(command); powertools.add(command);
user.sendMessage(Util.format("powerToolAttach", Util.concat(powertools), itemName)); user.sendMessage(Util.format("powerToolAttach", Util.joinList(powertools), itemName));
} }
} }
else else

7
Essentials/src/com/earth2me/essentials/commands/Commandspawnmob.java
View file

@ -82,7 +82,12 @@ public class Commandspawnmob extends EssentialsCommand
{ {
8, 9 8, 9
}; };
Location loc = (new TargetBlock(user, 300, 0.2, ignore)).getTargetBlock().getLocation(); Block block = (new TargetBlock(user, 300, 0.2, ignore)).getTargetBlock();
if(block == null) {
user.sendMessage(Util.i18n("unableToSpawnMob"));
return;
}
Location loc = block.getLocation();
Location sloc = Util.getSafeDestination(loc); Location sloc = Util.getSafeDestination(loc);
try try
{ {

2
Essentials/src/messages.properties
View file

@ -146,7 +146,7 @@ kits = \u00a77Kits: {0}
lightningSmited = \u00a77You have just been smited lightningSmited = \u00a77You have just been smited
lightningUse = \u00a77Smiting {0} lightningUse = \u00a77Smiting {0}
loadWarpError = Failed to load warp {0} loadWarpError = Failed to load warp {0}
loadinfo = Loaded {0} build {1} by {2} loadinfo = Loaded {0} build {1} by: {2}
localFormat = Local: <{0}> {1} localFormat = Local: <{0}> {1}
mailClear = \u00a7cTo mark your mail as read, type /mail clear mailClear = \u00a7cTo mark your mail as read, type /mail clear
mailCleared = \u00a77Mail Cleared! mailCleared = \u00a77Mail Cleared!

2
Essentials/src/messages_en.properties
View file

@ -146,7 +146,7 @@ kits = \u00a77Kits: {0}
lightningSmited = \u00a77You have just been smited lightningSmited = \u00a77You have just been smited
lightningUse = \u00a77Smiting {0} lightningUse = \u00a77Smiting {0}
loadWarpError = Failed to load warp {0} loadWarpError = Failed to load warp {0}
loadinfo = Loaded {0} build {1} by {2} loadinfo = Loaded {0} build {1} by: {2}
localFormat = Local: <{0}> {1} localFormat = Local: <{0}> {1}
mailClear = \u00a7cTo mark your mail as read, type /mail clear mailClear = \u00a7cTo mark your mail as read, type /mail clear
mailCleared = \u00a77Mail Cleared! mailCleared = \u00a77Mail Cleared!