CLAN NAME ", cl.getName(), " CLAN LEVEL ", String.valueOf(cl.getLevel()), " CLAN MEMBERS ", String.valueOf(cl.getMembersCount()), " CLAN LEADER ", cl.getLeaderName(), " CLAN NAME ", cl.getName(), " CLAN LEVEL ", String.valueOf(cl.getLevel()), " CLAN MEMBERS ", String.valueOf(cl.getMembersCount()), " CLAN LEADER ", cl.getLeaderName(), " "); html.append("ADMINISTRATOR "); html.append(""+cl.getLeaderName()+" "); html.append(" ");
@@ -271,7 +299,7 @@ public class ClanBoard implements IWriteBoardHandler
"ALLIANCE ", (cl.getAllyName() != null) ? cl.getAllyName() : "", "
" +
// TODO: the BB for clan :)
// html.append("");
- "");
+ SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+ final StringBuilder htmlContent = new StringBuilder(500);
+ htmlContent.append("");
if (activeChar.getClanJoinExpiryTime() > System.currentTimeMillis())
{
- StringUtil.append(htmlContent, "Unable to join a clan. ", format.format(activeChar.getClanJoinExpiryTime()), " ");
+ htmlContent.append("Unable to join a clan. ");
+ htmlContent.append(format.format(activeChar.getClanJoinExpiryTime()));
+ htmlContent.append(" ");
penalty = true;
}
if (activeChar.getClanCreateExpiryTime() > System.currentTimeMillis())
{
- StringUtil.append(htmlContent, "Unable to create a clan. ", format.format(activeChar.getClanCreateExpiryTime()), " ");
+ htmlContent.append("Unable to create a clan. ");
+ htmlContent.append(format.format(activeChar.getClanCreateExpiryTime()));
+ htmlContent.append(" ");
penalty = true;
}
if ((activeChar.getClan() != null) && (activeChar.getClan().getCharPenaltyExpiryTime() > System.currentTimeMillis()))
{
- StringUtil.append(htmlContent, "Unable to invite a clan member. ", format.format(activeChar.getClan().getCharPenaltyExpiryTime()), " ");
+ htmlContent.append("Unable to invite a clan member. ");
+ htmlContent.append(format.format(activeChar.getClan().getCharPenaltyExpiryTime()));
+ htmlContent.append(" ");
penalty = true;
}
diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/handlers/voicedcommandhandlers/Lang.java b/L2J_Mobius_HighFive/dist/game/data/scripts/handlers/voicedcommandhandlers/Lang.java
index 9cd5dda735..5f2fd81afb 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/handlers/voicedcommandhandlers/Lang.java
+++ b/L2J_Mobius_HighFive/dist/game/data/scripts/handlers/voicedcommandhandlers/Lang.java
@@ -22,7 +22,6 @@ import com.l2jmobius.Config;
import com.l2jmobius.gameserver.handler.IVoicedCommandHandler;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
-import com.l2jmobius.util.StringUtil;
public class Lang implements IVoicedCommandHandler
{
@@ -42,10 +41,10 @@ public class Lang implements IVoicedCommandHandler
final NpcHtmlMessage msg = new NpcHtmlMessage();
if (params == null)
{
- final StringBuilder html = StringUtil.startAppend(100);
+ final StringBuilder html = new StringBuilder(100);
for (String lang : Config.L2JMOD_MULTILANG_ALLOWED)
{
- StringUtil.append(html, "[ L2J EVENT ENGINE ] ", pc.getName(), " ", String.valueOf(pc.getEventStatus().getKills().size()), " [ L2J EVENT ENGINE ] " + pc.getName() + " " + pc.getEventStatus().getKills().size() + " ", plr.getName(), " " + plr.getName() + " members = (isInCC) ? party.getCommandChannel().getMembers() : party.getMembers();
diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/instances/ElcadiasTent/ElcadiasTent.java b/L2J_Mobius_HighFive/dist/game/data/scripts/instances/ElcadiasTent/ElcadiasTent.java
index 9fc794b1ec..cebfc61c2a 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/instances/ElcadiasTent/ElcadiasTent.java
+++ b/L2J_Mobius_HighFive/dist/game/data/scripts/instances/ElcadiasTent/ElcadiasTent.java
@@ -35,10 +35,6 @@ import quests.Q10296_SevenSignsPowerOfTheSeal.Q10296_SevenSignsPowerOfTheSeal;
*/
public final class ElcadiasTent extends AbstractInstance
{
- protected class ETWorld extends InstanceWorld
- {
- }
-
// NPCs
private static final int ELCADIA = 32784;
private static final int GRUFF_LOOKING_MAN = 32862;
@@ -71,7 +67,7 @@ public final class ElcadiasTent extends AbstractInstance
|| ((ForbiddenBook != null) && ForbiddenBook.isCompleted() && (Monastery == null)) //
|| ((PowerOfSeal != null) && PowerOfSeal.isStarted()))
{
- enterInstance(talker, new ETWorld(), "ElcadiasTent.xml", TEMPLATE_ID);
+ enterInstance(talker, "ElcadiasTent.xml", TEMPLATE_ID);
}
else
{
diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/instances/HideoutOfTheDawn/HideoutOfTheDawn.java b/L2J_Mobius_HighFive/dist/game/data/scripts/instances/HideoutOfTheDawn/HideoutOfTheDawn.java
index 4d64791514..ebd9040116 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/instances/HideoutOfTheDawn/HideoutOfTheDawn.java
+++ b/L2J_Mobius_HighFive/dist/game/data/scripts/instances/HideoutOfTheDawn/HideoutOfTheDawn.java
@@ -30,11 +30,6 @@ import instances.AbstractInstance;
*/
public final class HideoutOfTheDawn extends AbstractInstance
{
- protected class HotDWorld extends InstanceWorld
- {
-
- }
-
// NPCs
private static final int WOOD = 32593;
private static final int JAINA = 32617;
@@ -58,7 +53,7 @@ public final class HideoutOfTheDawn extends AbstractInstance
{
case WOOD:
{
- enterInstance(talker, new HotDWorld(), "HideoutOfTheDawn.xml", TEMPLATE_ID);
+ enterInstance(talker, "HideoutOfTheDawn.xml", TEMPLATE_ID);
return "32593-01.htm";
}
case JAINA:
diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/instances/JiniaGuildHideout1/JiniaGuildHideout1.java b/L2J_Mobius_HighFive/dist/game/data/scripts/instances/JiniaGuildHideout1/JiniaGuildHideout1.java
index 21b3f87e93..c0839e7c79 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/instances/JiniaGuildHideout1/JiniaGuildHideout1.java
+++ b/L2J_Mobius_HighFive/dist/game/data/scripts/instances/JiniaGuildHideout1/JiniaGuildHideout1.java
@@ -31,11 +31,6 @@ import quests.Q10284_AcquisitionOfDivineSword.Q10284_AcquisitionOfDivineSword;
*/
public final class JiniaGuildHideout1 extends AbstractInstance
{
- protected class JGH1World extends InstanceWorld
- {
-
- }
-
// NPC
private static final int RAFFORTY = 32020;
// Location
@@ -56,7 +51,7 @@ public final class JiniaGuildHideout1 extends AbstractInstance
final QuestState qs = talker.getQuestState(Q10284_AcquisitionOfDivineSword.class.getSimpleName());
if ((qs != null) && qs.isCond(1))
{
- enterInstance(talker, new JGH1World(), "JiniaGuildHideout1.xml", TEMPLATE_ID);
+ enterInstance(talker, "JiniaGuildHideout1.xml", TEMPLATE_ID);
qs.setCond(2, true);
}
return super.onTalk(npc, talker);
diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/instances/JiniaGuildHideout2/JiniaGuildHideout2.java b/L2J_Mobius_HighFive/dist/game/data/scripts/instances/JiniaGuildHideout2/JiniaGuildHideout2.java
index 07ea4f9422..5a92e849ce 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/instances/JiniaGuildHideout2/JiniaGuildHideout2.java
+++ b/L2J_Mobius_HighFive/dist/game/data/scripts/instances/JiniaGuildHideout2/JiniaGuildHideout2.java
@@ -31,11 +31,6 @@ import quests.Q10285_MeetingSirra.Q10285_MeetingSirra;
*/
public final class JiniaGuildHideout2 extends AbstractInstance
{
- protected class JGH2World extends InstanceWorld
- {
-
- }
-
// NPC
private static final int RAFFORTY = 32020;
// Location
@@ -56,7 +51,7 @@ public final class JiniaGuildHideout2 extends AbstractInstance
final QuestState qs = talker.getQuestState(Q10285_MeetingSirra.class.getSimpleName());
if ((qs != null) && qs.isMemoState(1))
{
- enterInstance(talker, new JGH2World(), "JiniaGuildHideout2.xml", TEMPLATE_ID);
+ enterInstance(talker, "JiniaGuildHideout2.xml", TEMPLATE_ID);
qs.setCond(2, true);
}
return super.onTalk(npc, talker);
diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/instances/JiniaGuildHideout3/JiniaGuildHideout3.java b/L2J_Mobius_HighFive/dist/game/data/scripts/instances/JiniaGuildHideout3/JiniaGuildHideout3.java
index cc3d9f6f1d..33dfb1b112 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/instances/JiniaGuildHideout3/JiniaGuildHideout3.java
+++ b/L2J_Mobius_HighFive/dist/game/data/scripts/instances/JiniaGuildHideout3/JiniaGuildHideout3.java
@@ -31,11 +31,6 @@ import quests.Q10286_ReunionWithSirra.Q10286_ReunionWithSirra;
*/
public final class JiniaGuildHideout3 extends AbstractInstance
{
- protected class JGH3World extends InstanceWorld
- {
-
- }
-
// NPC
private static final int RAFFORTY = 32020;
// Location
@@ -56,7 +51,7 @@ public final class JiniaGuildHideout3 extends AbstractInstance
final QuestState qs = talker.getQuestState(Q10286_ReunionWithSirra.class.getSimpleName());
if ((qs != null) && qs.isMemoState(1))
{
- enterInstance(talker, new JGH3World(), "JiniaGuildHideout3.xml", TEMPLATE_ID);
+ enterInstance(talker, "JiniaGuildHideout3.xml", TEMPLATE_ID);
qs.setCond(2, true);
}
return super.onTalk(npc, talker);
diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/instances/JiniaGuildHideout4/JiniaGuildHideout4.java b/L2J_Mobius_HighFive/dist/game/data/scripts/instances/JiniaGuildHideout4/JiniaGuildHideout4.java
index 68c56cad76..a84ff9ce8c 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/instances/JiniaGuildHideout4/JiniaGuildHideout4.java
+++ b/L2J_Mobius_HighFive/dist/game/data/scripts/instances/JiniaGuildHideout4/JiniaGuildHideout4.java
@@ -31,11 +31,6 @@ import quests.Q10287_StoryOfThoseLeft.Q10287_StoryOfThoseLeft;
*/
public final class JiniaGuildHideout4 extends AbstractInstance
{
- protected class JGH4World extends InstanceWorld
- {
-
- }
-
// NPC
private static final int RAFFORTY = 32020;
// Location
@@ -56,7 +51,7 @@ public final class JiniaGuildHideout4 extends AbstractInstance
final QuestState qs = talker.getQuestState(Q10287_StoryOfThoseLeft.class.getSimpleName());
if ((qs != null) && qs.isMemoState(1))
{
- enterInstance(talker, new JGH4World(), "JiniaGuildHideout4.xml", TEMPLATE_ID);
+ enterInstance(talker, "JiniaGuildHideout4.xml", TEMPLATE_ID);
qs.setCond(2, true);
}
return super.onTalk(npc, talker);
diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/instances/PailakaSongOfIceAndFire/PailakaSongOfIceAndFire.java b/L2J_Mobius_HighFive/dist/game/data/scripts/instances/PailakaSongOfIceAndFire/PailakaSongOfIceAndFire.java
index 0d15748e31..115adcb035 100644
--- a/L2J_Mobius_HighFive/dist/game/data/scripts/instances/PailakaSongOfIceAndFire/PailakaSongOfIceAndFire.java
+++ b/L2J_Mobius_HighFive/dist/game/data/scripts/instances/PailakaSongOfIceAndFire/PailakaSongOfIceAndFire.java
@@ -34,11 +34,6 @@ import instances.AbstractInstance;
*/
public final class PailakaSongOfIceAndFire extends AbstractInstance
{
- protected class PSoIWorld extends InstanceWorld
- {
-
- }
-
// NPCs
private static final int ADLER1 = 32497;
private static final int GARGOS = 18607;
@@ -85,7 +80,7 @@ public final class PailakaSongOfIceAndFire extends AbstractInstance
{
case "enter":
{
- enterInstance(player, new PSoIWorld(), "PailakaSongOfIceAndFire.xml", TEMPLATE_ID);
+ enterInstance(player, "PailakaSongOfIceAndFire.xml", TEMPLATE_ID);
break;
}
case "GARGOS_LAUGH":
diff --git a/L2J_Mobius_HighFive/java/com/l2jmobius/Config.java b/L2J_Mobius_HighFive/java/com/l2jmobius/Config.java
index e51f14abe7..7ae5ca6dc9 100644
--- a/L2J_Mobius_HighFive/java/com/l2jmobius/Config.java
+++ b/L2J_Mobius_HighFive/java/com/l2jmobius/Config.java
@@ -61,7 +61,6 @@ import com.l2jmobius.gameserver.model.holders.ItemHolder;
import com.l2jmobius.gameserver.util.FloodProtectorConfig;
import com.l2jmobius.gameserver.util.Util;
import com.l2jmobius.util.PropertiesParser;
-import com.l2jmobius.util.StringUtil;
import com.l2jmobius.util.data.xml.IXmlReader;
/**
@@ -1450,7 +1449,7 @@ public final class Config
final String[] skillSplit = skill.split(",");
if (skillSplit.length != 2)
{
- _log.warning(StringUtil.concat("[SkillDurationList]: invalid config property -> SkillDurationList \"", skill, "\""));
+ _log.warning("[SkillDurationList]: invalid config property -> SkillDurationList \"" + skill + "\"");
}
else
{
@@ -1462,7 +1461,7 @@ public final class Config
{
if (!skill.isEmpty())
{
- _log.warning(StringUtil.concat("[SkillDurationList]: invalid config property -> SkillList \"", skillSplit[0], "\"", skillSplit[1]));
+ _log.warning("[SkillDurationList]: invalid config property -> SkillList \"" + skillSplit[0] + "\"" + skillSplit[1]);
}
}
}
@@ -1479,7 +1478,7 @@ public final class Config
final String[] skillSplit = skill.split(",");
if (skillSplit.length != 2)
{
- _log.warning(StringUtil.concat("[SkillReuseList]: invalid config property -> SkillReuseList \"", skill, "\""));
+ _log.warning("[SkillReuseList]: invalid config property -> SkillReuseList \"" + skill + "\"");
}
else
{
@@ -1491,7 +1490,7 @@ public final class Config
{
if (!skill.isEmpty())
{
- _log.warning(StringUtil.concat("[SkillReuseList]: invalid config property -> SkillList \"", skillSplit[0], "\"", skillSplit[1]));
+ _log.warning("[SkillReuseList]: invalid config property -> SkillList \"" + skillSplit[0] + "\"" + skillSplit[1]);
}
}
}
@@ -2069,7 +2068,7 @@ public final class Config
final String[] propSplit = prop.split(",");
if (propSplit.length != 2)
{
- _log.warning(StringUtil.concat("[CustomMinionsRespawnTime]: invalid config property -> CustomMinionsRespawnTime \"", prop, "\""));
+ _log.warning("[CustomMinionsRespawnTime]: invalid config property -> CustomMinionsRespawnTime \"" + prop + "\"");
}
try
@@ -2080,7 +2079,7 @@ public final class Config
{
if (!prop.isEmpty())
{
- _log.warning(StringUtil.concat("[CustomMinionsRespawnTime]: invalid config property -> CustomMinionsRespawnTime \"", propSplit[0], "\"", propSplit[1]));
+ _log.warning("[CustomMinionsRespawnTime]: invalid config property -> CustomMinionsRespawnTime \"" + propSplit[0] + "\"" + propSplit[1]);
}
}
}
@@ -2170,7 +2169,7 @@ public final class Config
final String[] itemSplit = item.split(",");
if (itemSplit.length != 2)
{
- _log.warning(StringUtil.concat("Config.load(): invalid config property -> RateDropItemsById \"", item, "\""));
+ _log.warning("Config.load(): invalid config property -> RateDropItemsById \"" + item + "\"");
}
else
{
@@ -2182,7 +2181,7 @@ public final class Config
{
if (!item.isEmpty())
{
- _log.warning(StringUtil.concat("Config.load(): invalid config property -> RateDropItemsById \"", item, "\""));
+ _log.warning("Config.load(): invalid config property -> RateDropItemsById \"" + item + "\"");
}
}
}
@@ -2198,7 +2197,7 @@ public final class Config
final String[] itemSplit = item.split(",");
if (itemSplit.length != 2)
{
- _log.warning(StringUtil.concat("Config.load(): invalid config property -> RateDropItemsById \"", item, "\""));
+ _log.warning("Config.load(): invalid config property -> RateDropItemsById \"" + item + "\"");
}
else
{
@@ -2210,7 +2209,7 @@ public final class Config
{
if (!item.isEmpty())
{
- _log.warning(StringUtil.concat("Config.load(): invalid config property -> RateDropItemsById \"", item, "\""));
+ _log.warning("Config.load(): invalid config property -> RateDropItemsById \"" + item + "\"");
}
}
}
@@ -2346,7 +2345,7 @@ public final class Config
final String[] rewardSplit = reward.split(",");
if (rewardSplit.length != 2)
{
- _log.warning(StringUtil.concat("TvTEventEngine[Config.load()]: invalid config property -> TvTEventReward \"", reward, "\""));
+ _log.warning("TvTEventEngine[Config.load()]: invalid config property -> TvTEventReward \"" + reward + "\"");
}
else
{
@@ -2362,7 +2361,7 @@ public final class Config
{
if (!reward.isEmpty())
{
- _log.warning(StringUtil.concat("TvTEventEngine[Config.load()]: invalid config property -> TvTEventReward \"", reward, "\""));
+ _log.warning("TvTEventEngine[Config.load()]: invalid config property -> TvTEventReward \"" + reward + "\"");
}
}
}
@@ -2384,7 +2383,7 @@ public final class Config
{
if (!door.isEmpty())
{
- _log.warning(StringUtil.concat("TvTEventEngine[Config.load()]: invalid config property -> TvTDoorsToOpen \"", door, "\""));
+ _log.warning("TvTEventEngine[Config.load()]: invalid config property -> TvTDoorsToOpen \"" + door + "\"");
}
}
}
@@ -2400,7 +2399,7 @@ public final class Config
{
if (!door.isEmpty())
{
- _log.warning(StringUtil.concat("TvTEventEngine[Config.load()]: invalid config property -> TvTDoorsToClose \"", door, "\""));
+ _log.warning("TvTEventEngine[Config.load()]: invalid config property -> TvTDoorsToClose \"" + door + "\"");
}
}
}
@@ -2414,7 +2413,7 @@ public final class Config
final String[] skillSplit = skill.split(",");
if (skillSplit.length != 2)
{
- _log.warning(StringUtil.concat("TvTEventEngine[Config.load()]: invalid config property -> TvTEventFighterBuffs \"", skill, "\""));
+ _log.warning("TvTEventEngine[Config.load()]: invalid config property -> TvTEventFighterBuffs \"" + skill + "\"");
}
else
{
@@ -2426,7 +2425,7 @@ public final class Config
{
if (!skill.isEmpty())
{
- _log.warning(StringUtil.concat("TvTEventEngine[Config.load()]: invalid config property -> TvTEventFighterBuffs \"", skill, "\""));
+ _log.warning("TvTEventEngine[Config.load()]: invalid config property -> TvTEventFighterBuffs \"" + skill + "\"");
}
}
}
@@ -2442,7 +2441,7 @@ public final class Config
final String[] skillSplit = skill.split(",");
if (skillSplit.length != 2)
{
- _log.warning(StringUtil.concat("TvTEventEngine[Config.load()]: invalid config property -> TvTEventMageBuffs \"", skill, "\""));
+ _log.warning("TvTEventEngine[Config.load()]: invalid config property -> TvTEventMageBuffs \"" + skill + "\"");
}
else
{
@@ -2454,7 +2453,7 @@ public final class Config
{
if (!skill.isEmpty())
{
- _log.warning(StringUtil.concat("TvTEventEngine[Config.load()]: invalid config property -> TvTEventMageBuffs \"", skill, "\""));
+ _log.warning("TvTEventEngine[Config.load()]: invalid config property -> TvTEventMageBuffs \"" + skill + "\"");
}
}
}
@@ -2548,7 +2547,7 @@ public final class Config
final String[] entrySplit = entry.split(",");
if (entrySplit.length != 2)
{
- _log.warning(StringUtil.concat("DualboxCheck[Config.load()]: invalid config property -> DualboxCheckWhitelist \"", entry, "\""));
+ _log.warning("DualboxCheck[Config.load()]: invalid config property -> DualboxCheckWhitelist \"" + entry + "\"");
}
else
{
@@ -2560,11 +2559,11 @@ public final class Config
}
catch (UnknownHostException e)
{
- _log.warning(StringUtil.concat("DualboxCheck[Config.load()]: invalid address -> DualboxCheckWhitelist \"", entrySplit[0], "\""));
+ _log.warning("DualboxCheck[Config.load()]: invalid address -> DualboxCheckWhitelist \"" + entrySplit[0] + "\"");
}
catch (NumberFormatException e)
{
- _log.warning(StringUtil.concat("DualboxCheck[Config.load()]: invalid number -> DualboxCheckWhitelist \"", entrySplit[1], "\""));
+ _log.warning("DualboxCheck[Config.load()]: invalid number -> DualboxCheckWhitelist \"" + entrySplit[1] + "\"");
}
}
}
@@ -2617,7 +2616,7 @@ public final class Config
final String[] itemSplit = item.split(",");
if (itemSplit.length != 2)
{
- _log.warning(StringUtil.concat("Config.load(): invalid config property -> PremiumRateDropChanceByItemId \"", item, "\""));
+ _log.warning("Config.load(): invalid config property -> PremiumRateDropChanceByItemId \"" + item + "\"");
}
else
{
@@ -2629,7 +2628,7 @@ public final class Config
{
if (!item.isEmpty())
{
- _log.warning(StringUtil.concat("Config.load(): invalid config property -> PremiumRateDropChanceByItemId \"", item, "\""));
+ _log.warning("Config.load(): invalid config property -> PremiumRateDropChanceByItemId \"" + item + "\"");
}
}
}
@@ -2644,7 +2643,7 @@ public final class Config
final String[] itemSplit = item.split(",");
if (itemSplit.length != 2)
{
- _log.warning(StringUtil.concat("Config.load(): invalid config property -> PremiumRateDropAmountByItemId \"", item, "\""));
+ _log.warning("Config.load(): invalid config property -> PremiumRateDropAmountByItemId \"" + item + "\"");
}
else
{
@@ -2656,7 +2655,7 @@ public final class Config
{
if (!item.isEmpty())
{
- _log.warning(StringUtil.concat("Config.load(): invalid config property -> PremiumRateDropAmountByItemId \"", item, "\""));
+ _log.warning("Config.load(): invalid config property -> PremiumRateDropAmountByItemId \"" + item + "\"");
}
}
}
@@ -2970,7 +2969,7 @@ public final class Config
}
catch (Exception e)
{
- _log.warning(StringUtil.concat("Failed to save hex id to ", fileName, " File."));
+ _log.warning("Failed to save hex id to " + fileName + " File.");
_log.warning("Config: " + e.getMessage());
}
}
@@ -3008,11 +3007,11 @@ public final class Config
*/
private static void loadFloodProtectorConfig(PropertiesParser properties, FloodProtectorConfig config, String configString, int defaultInterval)
{
- config.FLOOD_PROTECTION_INTERVAL = properties.getInt(StringUtil.concat("FloodProtector", configString, "Interval"), defaultInterval);
- config.LOG_FLOODING = properties.getBoolean(StringUtil.concat("FloodProtector", configString, "LogFlooding"), false);
- config.PUNISHMENT_LIMIT = properties.getInt(StringUtil.concat("FloodProtector", configString, "PunishmentLimit"), 0);
- config.PUNISHMENT_TYPE = properties.getString(StringUtil.concat("FloodProtector", configString, "PunishmentType"), "none");
- config.PUNISHMENT_TIME = properties.getInt(StringUtil.concat("FloodProtector", configString, "PunishmentTime"), 0) * 60000;
+ config.FLOOD_PROTECTION_INTERVAL = properties.getInt("FloodProtector" + configString + "Interval", defaultInterval);
+ config.LOG_FLOODING = properties.getBoolean("FloodProtector" + configString + "LogFlooding", false);
+ config.PUNISHMENT_LIMIT = properties.getInt("FloodProtector" + configString + "PunishmentLimit", 0);
+ config.PUNISHMENT_TYPE = properties.getString("FloodProtector" + configString + "PunishmentType", "none");
+ config.PUNISHMENT_TIME = properties.getInt("FloodProtector" + configString + "PunishmentTime", 0) * 60000;
}
public static int getServerTypeId(String[] serverTypes)
@@ -3185,7 +3184,7 @@ public final class Config
valueSplit = value.split(",");
if (valueSplit.length != 2)
{
- _log.warning(StringUtil.concat("parseItemsList[Config.load()]: invalid entry -> \"", valueSplit[0], "\", should be itemId,itemNumber. Skipping to the next entry in the list."));
+ _log.warning("parseItemsList[Config.load()]: invalid entry -> \"" + valueSplit[0] + "\", should be itemId,itemNumber. Skipping to the next entry in the list.");
continue;
}
@@ -3196,7 +3195,7 @@ public final class Config
}
catch (NumberFormatException e)
{
- _log.warning(StringUtil.concat("parseItemsList[Config.load()]: invalid itemId -> \"", valueSplit[0], "\", value must be an integer. Skipping to the next entry in the list."));
+ _log.warning("parseItemsList[Config.load()]: invalid itemId -> \"" + valueSplit[0] + "\", value must be an integer. Skipping to the next entry in the list.");
continue;
}
try
@@ -3205,7 +3204,7 @@ public final class Config
}
catch (NumberFormatException e)
{
- _log.warning(StringUtil.concat("parseItemsList[Config.load()]: invalid item number -> \"", valueSplit[1], "\", value must be an integer. Skipping to the next entry in the list."));
+ _log.warning("parseItemsList[Config.load()]: invalid item number -> \"" + valueSplit[1] + "\", value must be an integer. Skipping to the next entry in the list.");
continue;
}
result[i++] = tmp;
diff --git a/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/ThreadPoolManager.java b/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/ThreadPoolManager.java
index f0f6f4e260..32774eee2a 100644
--- a/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/ThreadPoolManager.java
+++ b/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/ThreadPoolManager.java
@@ -30,7 +30,6 @@ import java.util.logging.Logger;
import com.l2jmobius.Config;
import com.l2jmobius.gameserver.model.StatsSet;
-import com.l2jmobius.util.StringUtil;
/**
*
@@ -694,7 +693,7 @@ public class ThreadPoolManager
final int count = ptf.getGroup().activeCount();
final Thread[] threads = new Thread[count + 2];
ptf.getGroup().enumerate(threads);
- StringUtil.append(sb, "General Packet Thread Pool:" + Config.EOL + "Tasks in the queue: ", String.valueOf(_generalPacketsThreadPool.getQueue().size()), Config.EOL + "Showing threads stack trace:" + Config.EOL + "There should be ", String.valueOf(count), " Threads" + Config.EOL);
+ sb.append("General Packet Thread Pool:" + Config.EOL + "Tasks in the queue: " + _generalPacketsThreadPool.getQueue().size() + Config.EOL + "Showing threads stack trace:" + Config.EOL + "There should be " + count + " Threads" + Config.EOL);
for (Thread t : threads)
{
if (t == null)
@@ -702,10 +701,12 @@ public class ThreadPoolManager
continue;
}
- StringUtil.append(sb, t.getName(), Config.EOL);
+ sb.append(t.getName());
+ sb.append(Config.EOL);
for (StackTraceElement ste : t.getStackTrace())
{
- StringUtil.append(sb, ste.toString(), Config.EOL);
+ sb.append(ste);
+ sb.append(Config.EOL);
}
}
}
@@ -726,7 +727,7 @@ public class ThreadPoolManager
final int count = ptf.getGroup().activeCount();
final Thread[] threads = new Thread[count + 2];
ptf.getGroup().enumerate(threads);
- StringUtil.append(sb, "I/O Packet Thread Pool:" + Config.EOL + "Tasks in the queue: ", String.valueOf(_ioPacketsThreadPool.getQueue().size()), Config.EOL + "Showing threads stack trace:" + Config.EOL + "There should be ", String.valueOf(count), " Threads" + Config.EOL);
+ sb.append("I/O Packet Thread Pool:" + Config.EOL + "Tasks in the queue: " + _ioPacketsThreadPool.getQueue().size() + Config.EOL + "Showing threads stack trace:" + Config.EOL + "There should be " + count + " Threads" + Config.EOL);
for (Thread t : threads)
{
@@ -735,11 +736,12 @@ public class ThreadPoolManager
continue;
}
- StringUtil.append(sb, t.getName(), Config.EOL);
-
+ sb.append(t.getName());
+ sb.append(Config.EOL);
for (StackTraceElement ste : t.getStackTrace())
{
- StringUtil.append(sb, ste.toString(), Config.EOL);
+ sb.append(ste);
+ sb.append(Config.EOL);
}
}
}
@@ -760,7 +762,7 @@ public class ThreadPoolManager
final int count = ptf.getGroup().activeCount();
final Thread[] threads = new Thread[count + 2];
ptf.getGroup().enumerate(threads);
- StringUtil.append(sb, "General Thread Pool:" + Config.EOL + "Tasks in the queue: ", String.valueOf(_generalThreadPool.getQueue().size()), Config.EOL + "Showing threads stack trace:" + Config.EOL + "There should be ", String.valueOf(count), " Threads" + Config.EOL);
+ sb.append("General Thread Pool:" + Config.EOL + "Tasks in the queue: " + _generalThreadPool.getQueue().size() + Config.EOL + "Showing threads stack trace:" + Config.EOL + "There should be " + +count + " Threads" + Config.EOL);
for (Thread t : threads)
{
@@ -769,11 +771,12 @@ public class ThreadPoolManager
continue;
}
- StringUtil.append(sb, t.getName(), Config.EOL);
-
+ sb.append(t.getName());
+ sb.append(Config.EOL);
for (StackTraceElement ste : t.getStackTrace())
{
- StringUtil.append(sb, ste.toString(), Config.EOL);
+ sb.append(ste);
+ sb.append(Config.EOL);
}
}
}
diff --git a/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/communitybbs/Manager/PostBBSManager.java b/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/communitybbs/Manager/PostBBSManager.java
index c5114568d1..c483740b34 100644
--- a/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/communitybbs/Manager/PostBBSManager.java
+++ b/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/communitybbs/Manager/PostBBSManager.java
@@ -28,7 +28,6 @@ import com.l2jmobius.gameserver.communitybbs.BB.Post;
import com.l2jmobius.gameserver.communitybbs.BB.Topic;
import com.l2jmobius.gameserver.handler.CommunityBoardHandler;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.util.StringUtil;
public class PostBBSManager extends BaseBBSManager
{
@@ -126,15 +125,23 @@ public class PostBBSManager extends BaseBBSManager
private void showHtmlEditPost(Topic topic, L2PcInstance activeChar, Forum forum, Post p)
{
- final String html = StringUtil.concat("
&$413; ", topic.getName(), "
&$413; " + topic.getName() + "
&$413; : ", topic.getName(), " &$417; : ", topic.getOwnerName() + " &$418; : ", DateFormat.getDateInstance(DateFormat.FULL, Locale.getDefault()).format(p.getCPost(0).postDate), "
", p.getCPost(0).postTxt.replace(">", ">").replace("<", "<"), "
&$413; : " + topic.getName() + " &$417; : " + topic.getOwnerName() + " &$418; : " + dateFormat.format(p.getCPost(0).postDate) + "
");
+ final StringBuilder html = new StringBuilder(2000);
+ html.append("");
final DateFormat dateFormat = DateFormat.getInstance();
for (int i = 0, j = getMaxID(forum) + 1; i < (12 * index); j--)
@@ -244,10 +244,13 @@ public class TopicBBSManager extends BaseBBSManager
{
break;
}
- final Topic t = forum.getTopic(j);
- if ((t != null) && (i++ >= (12 * (index - 1))))
+ Topic t = forum.getTopic(j);
+ if (t != null)
{
- StringUtil.append(html, " ", String.valueOf(i), " ");
+ html.append(" " + i + " ");
}
else
{
- StringUtil.append(html, " ", String.valueOf(i), " " + i + "
parameters = null;
Map skills = null;
diff --git a/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/instancemanager/GrandBossManager.java b/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/instancemanager/GrandBossManager.java
index 24b17b827a..6a205f1008 100644
--- a/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/instancemanager/GrandBossManager.java
+++ b/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/instancemanager/GrandBossManager.java
@@ -88,13 +88,9 @@ public final class GrandBossManager implements IStorable
info.set("loc_z", rs.getInt("loc_z"));
info.set("heading", rs.getInt("heading"));
info.set("respawn_time", rs.getLong("respawn_time"));
- final double HP = rs.getDouble("currentHP"); // jython doesn't recognize doubles
- final int true_HP = (int) HP; // so use java's ability to type cast
- info.set("currentHP", true_HP); // to convert double to int
- final double MP = rs.getDouble("currentMP");
- final int true_MP = (int) MP;
- info.set("currentMP", true_MP);
- final int status = rs.getInt("status");
+ info.set("currentHP", rs.getDouble("currentHP"));
+ info.set("currentMP", rs.getDouble("currentMP"));
+ int status = rs.getInt("status");
_bossStatus.put(bossId, status);
_storedInfo.put(bossId, info);
_log.info(getClass().getSimpleName() + ": " + NpcData.getInstance().getTemplate(bossId).getName() + "(" + bossId + ") status is " + status + ".");
diff --git a/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/instancemanager/PetitionManager.java b/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/instancemanager/PetitionManager.java
index 54e1c1bb94..6e5151f338 100644
--- a/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/instancemanager/PetitionManager.java
+++ b/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/instancemanager/PetitionManager.java
@@ -32,7 +32,6 @@ import com.l2jmobius.gameserver.network.SystemMessageId;
import com.l2jmobius.gameserver.network.serverpackets.CreatureSay;
import com.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
import com.l2jmobius.gameserver.network.serverpackets.SystemMessage;
-import com.l2jmobius.util.StringUtil;
/**
* Petition Manager
@@ -352,7 +351,8 @@ public final class PetitionManager
public void sendPendingPetitionList(L2PcInstance activeChar)
{
- final StringBuilder htmlContent = StringUtil.startAppend(600 + (getPendingPetitionCount() * 300), "", dateFormat.format(new Date(currPetition.getSubmitTime())));
- StringUtil.append(htmlContent, " ", currPetition.getPetitioner().getName(), " ");
+ htmlContent.append(" " + dateFormat.format(new Date(currPetition.getSubmitTime())));
+ htmlContent.append(" " + currPetition.getPetitioner().getName() + " ");
if (currPetition.getState() != PetitionState.IN_PROCESS)
{
- StringUtil.append(htmlContent, "");
+ htmlContent.append("");
}
else
{
htmlContent.append("" + currPetition.getResponder().getName() + " ");
}
- StringUtil.append(htmlContent, " ", currPetition.getTypeAsString(), "", currPetition.getTypeAsString(), "
" + currPetition.getTypeAsString() + "
", ClassListData.getInstance().getClass(cid).getClientCode(), " " + ClassListData.getInstance().getClass(cid).getClientCode() + " ", ClassListData.getInstance().getClass(cid).getEscapedClientCode(), " " + ClassListData.getInstance().getClass(cid).getEscapedClientCode() + " ", festivalName, " ", String.valueOf(duskScore), " ", String.valueOf(dawnScore), " ", winningCabal, " " + festivalName + " " + String.valueOf(duskScore) + " " + String.valueOf(dawnScore) + " " + winningCabal + " ", festivalName, " ", String.valueOf(accumScore), " " + festivalName + " " + String.valueOf(accumScore) + " ", ClassListData.getInstance().getClass(subClass.ordinal()).getClientCode(), " " + ClassListData.getInstance().getClass(subClass.ordinal()).getClientCode() + " ", ClassListData.getInstance().getClass(player.getBaseClass()).getClientCode(), " " + ClassListData.getInstance().getClass(player.getBaseClass()).getClientCode() + " subList = iterSubClasses(player); subList.hasNext();)
@@ -419,7 +418,7 @@ public class L2VillageMasterInstance extends L2NpcInstance
final SubClass subClass = subList.next();
if (checkVillageMaster(subClass.getClassDefinition()))
{
- StringUtil.append(content2, "", ClassListData.getInstance().getClass(subClass.getClassId()).getClientCode(), " " + ClassListData.getInstance().getClass(subClass.getClassId()).getClientCode() + " subList = iterSubClasses(player); subList.hasNext();)
{
final SubClass subClass = subList.next();
- StringUtil.append(content3, "Sub-class ", String.valueOf(classIndex++), "", ClassListData.getInstance().getClass(subClass.getClassId()).getClientCode(), " " + ClassListData.getInstance().getClass(subClass.getClassId()).getClientCode() + " ", ClassListData.getInstance().getClass(subClass.ordinal()).getClientCode(), " " + ClassListData.getInstance().getClass(subClass.ordinal()).getClientCode() + " ");
+ fList.append(" ");
if (color)
{
- StringUtil.append(fList, "");
+ fList.append("");
}
else
{
- StringUtil.append(fList, "");
+ fList.append("");
}
- StringUtil.append(fList, "" + diaryEntry.getString("date") + ":xx " + diaryEntry.getString("action") + "
");
- StringUtil.append(fList, "");
+ fList.append("" + diaryEntry.getString("date") + ":xx " + diaryEntry.getString("action") + "
");
+ fList.append("");
color = !color;
counter++;
if (counter >= perpage)
@@ -553,19 +552,19 @@ public class Hero
{
breakat = i;
final StatsSet fight = heroFights.get(i);
- StringUtil.append(fList, "");
+ fList.append(" ");
if (color)
{
- StringUtil.append(fList, "");
+ fList.append("");
}
else
{
- StringUtil.append(fList, "");
+ fList.append("");
}
- StringUtil.append(fList, "" + fight.getString("start") + " " + fight.getString("result") + "" + (fight.getInt("classed") > 0 ? "cls " : "non-cls") + " vs " + fight.getString("oponent") + " (" + fight.getString("oponentclass") + ") (" + fight.getString("time") + ")
");
- StringUtil.append(fList, "");
+ fList.append("" + fight.getString("start") + " " + fight.getString("result") + "" + (fight.getInt("classed") > 0 ? "cls " : "non-cls") + " vs " + fight.getString("oponent") + " (" + fight.getString("oponentclass") + ") (" + fight.getString("time") + ")
");
+ fList.append("");
color = !color;
counter++;
if (counter >= perpage)
diff --git a/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/entity/TvTEvent.java b/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/entity/TvTEvent.java
index a316ce97b2..45b191ff12 100644
--- a/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/entity/TvTEvent.java
+++ b/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/entity/TvTEvent.java
@@ -55,7 +55,6 @@ import com.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
import com.l2jmobius.gameserver.network.serverpackets.StatusUpdate;
import com.l2jmobius.gameserver.network.serverpackets.SystemMessage;
import com.l2jmobius.util.Rnd;
-import com.l2jmobius.util.StringUtil;
/**
* @author HorridoJoho
@@ -543,7 +542,7 @@ public class TvTEvent
return "-";
}
- return StringUtil.concat(String.valueOf(itemNum), " ", ItemTable.getInstance().getTemplate(itemId).getName());
+ return itemNum + " " + ItemTable.getInstance().getTemplate(itemId).getName();
}
/**
diff --git a/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/itemcontainer/Inventory.java
index a5df42a249..886de0f128 100644
--- a/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/itemcontainer/Inventory.java
+++ b/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/itemcontainer/Inventory.java
@@ -41,7 +41,7 @@ import com.l2jmobius.gameserver.model.items.type.EtcItemType;
import com.l2jmobius.gameserver.model.items.type.WeaponType;
import com.l2jmobius.gameserver.model.skills.Skill;
import com.l2jmobius.gameserver.network.serverpackets.SkillCoolTime;
-import com.l2jmobius.util.StringUtil;
+import com.l2jmobius.util.Util;
/**
* This class manages inventory
@@ -1325,7 +1325,7 @@ public abstract class Inventory extends ItemContainer
break;
default:
_log.info("Unhandled slot type: " + slot);
- _log.info(StringUtil.getTraceString(Thread.currentThread().getStackTrace()));
+ _log.info(Util.getTraceString(Thread.currentThread().getStackTrace()));
}
if (pdollSlot >= 0)
{
diff --git a/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/items/L2Armor.java b/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/items/L2Armor.java
index 66eeee3b10..7f5f0899f0 100644
--- a/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/items/L2Armor.java
+++ b/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/items/L2Armor.java
@@ -20,7 +20,6 @@ import com.l2jmobius.gameserver.model.StatsSet;
import com.l2jmobius.gameserver.model.holders.SkillHolder;
import com.l2jmobius.gameserver.model.items.type.ArmorType;
import com.l2jmobius.gameserver.model.skills.Skill;
-import com.l2jmobius.util.StringUtil;
/**
* This class is dedicated to the management of armors.
@@ -86,7 +85,7 @@ public final class L2Armor extends L2Item
catch (Exception nfe)
{
// Incorrect syntax, don't add new skill
- _log.info(StringUtil.concat("> Couldnt parse ", skill, " in armor enchant skills! item ", toString()));
+ _log.info("> Couldnt parse " + skill + " in armor enchant skills! item " + this);
}
if ((id > 0) && (level > 0))
{
diff --git a/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/items/L2EtcItem.java b/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/items/L2EtcItem.java
index 5712239820..c96620c61b 100644
--- a/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/items/L2EtcItem.java
+++ b/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/items/L2EtcItem.java
@@ -23,7 +23,6 @@ import com.l2jmobius.gameserver.model.L2ExtractableProduct;
import com.l2jmobius.gameserver.model.StatsSet;
import com.l2jmobius.gameserver.model.itemcontainer.Inventory;
import com.l2jmobius.gameserver.model.items.type.EtcItemType;
-import com.l2jmobius.util.StringUtil;
/**
* This class is dedicated to the management of EtcItem.
@@ -93,7 +92,7 @@ public final class L2EtcItem extends L2Item
final String[] data = part.split(",");
if (data.length != 4)
{
- _log.info(StringUtil.concat("> Couldnt parse ", part, " in capsuled_items! item ", toString()));
+ _log.info("> Couldnt parse " + part + " in capsuled_items! item " + this);
continue;
}
final int itemId = Integer.parseInt(data[0]);
@@ -102,7 +101,7 @@ public final class L2EtcItem extends L2Item
final double chance = Double.parseDouble(data[3]);
if (max < min)
{
- _log.info(StringUtil.concat("> Max amount < Min amount in ", part, ", item ", toString()));
+ _log.info("> Max amount < Min amount in " + part + ", item " + this);
continue;
}
final L2ExtractableProduct product = new L2ExtractableProduct(itemId, min, max, chance);
diff --git a/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/items/L2Item.java b/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/items/L2Item.java
index c12dd07952..a88c4800ad 100644
--- a/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/items/L2Item.java
+++ b/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/items/L2Item.java
@@ -46,7 +46,6 @@ import com.l2jmobius.gameserver.model.stats.functions.AbstractFunction;
import com.l2jmobius.gameserver.model.stats.functions.FuncTemplate;
import com.l2jmobius.gameserver.network.SystemMessageId;
import com.l2jmobius.gameserver.network.serverpackets.SystemMessage;
-import com.l2jmobius.util.StringUtil;
/**
* This class contains all informations concerning the item (weapon, armor, etc). arg)
{
- final StringBuilder builder = new StringBuilder(5 + StringUtil.getLength(arg) + arg.size()).append("1002\u0008");
+ StringBuilder builder = new StringBuilder(256).append("1002\u0008");
for (String str : arg)
{
builder.append(str).append("\u0008");
diff --git a/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/pathfinding/cellnodes/CellPathFinding.java b/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/pathfinding/cellnodes/CellPathFinding.java
index 67e430f6cf..0555054370 100644
--- a/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/pathfinding/cellnodes/CellPathFinding.java
+++ b/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/pathfinding/cellnodes/CellPathFinding.java
@@ -31,7 +31,6 @@ import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
import com.l2jmobius.gameserver.pathfinding.AbstractNode;
import com.l2jmobius.gameserver.pathfinding.AbstractNodeLoc;
import com.l2jmobius.gameserver.pathfinding.PathFinding;
-import com.l2jmobius.util.StringUtil;
/**
* @author Sami, DS Credits to Diamond
@@ -359,16 +358,32 @@ public class CellPathFinding extends PathFinding
@Override
public String toString()
{
- final StringBuilder stat = new StringBuilder(100);
- StringUtil.append(stat, String.valueOf(mapSize), "x", String.valueOf(mapSize), " num:", String.valueOf(bufs.size()), "/", String.valueOf(count), " uses:", String.valueOf(uses), "/", String.valueOf(playableUses));
+ final StringBuilder sb = new StringBuilder(100);
+ sb.append(mapSize);
+ sb.append("x");
+ sb.append(mapSize);
+ sb.append(" num:");
+ sb.append(bufs.size());
+ sb.append("/");
+ sb.append(count);
+ sb.append(" uses:");
+ sb.append(uses);
+ sb.append("/");
+ sb.append(playableUses);
if (uses > 0)
{
- StringUtil.append(stat, " total/avg(ms):", String.valueOf(elapsed), "/", String.format("%1.2f", (double) elapsed / uses));
+ sb.append(" total/avg(ms):");
+ sb.append(elapsed);
+ sb.append("/");
+ sb.append(String.format("%1.2f", (double) elapsed / uses));
}
- StringUtil.append(stat, " ovf:", String.valueOf(overflows), "/", String.valueOf(playableOverflows));
+ sb.append(" ovf:");
+ sb.append(overflows);
+ sb.append("/");
+ sb.append(playableOverflows);
- return stat.toString();
+ return sb.toString();
}
}
@@ -381,14 +396,28 @@ public class CellPathFinding extends PathFinding
result[i] = _allBuffers[i].toString();
}
- final StringBuilder stat = new StringBuilder(100);
- StringUtil.append(stat, "LOS postfilter uses:", String.valueOf(_postFilterUses), "/", String.valueOf(_postFilterPlayableUses));
+ final StringBuilder sb = new StringBuilder(128);
+ sb.append("LOS postfilter uses:");
+ sb.append(_postFilterUses);
+ sb.append("/");
+ sb.append(_postFilterPlayableUses);
if (_postFilterUses > 0)
{
- StringUtil.append(stat, " total/avg(ms):", String.valueOf(_postFilterElapsed), "/", String.format("%1.2f", (double) _postFilterElapsed / _postFilterUses), " passes total/avg:", String.valueOf(_postFilterPasses), "/", String.format("%1.1f", (double) _postFilterPasses / _postFilterUses), Config.EOL);
+ sb.append(" total/avg(ms):");
+ sb.append(_postFilterElapsed);
+ sb.append("/");
+ sb.append(String.format("%1.2f", (double) _postFilterElapsed / _postFilterUses));
+ sb.append(" passes total/avg:");
+ sb.append(_postFilterPasses);
+ sb.append("/");
+ sb.append(String.format("%1.1f", (double) _postFilterPasses / _postFilterUses));
+ sb.append(Config.EOL);
}
- StringUtil.append(stat, "Pathfind success/fail:", String.valueOf(_findSuccess), "/", String.valueOf(_findFails));
- result[result.length - 1] = stat.toString();
+ sb.append("Pathfind success/fail:");
+ sb.append(_findSuccess);
+ sb.append("/");
+ sb.append(_findFails);
+ result[result.length - 1] = sb.toString();
return result;
}
diff --git a/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/scripting/java/JavaExecutionContext.java b/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/scripting/java/JavaExecutionContext.java
index 984d27cfed..683a40e221 100644
--- a/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/scripting/java/JavaExecutionContext.java
+++ b/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/scripting/java/JavaExecutionContext.java
@@ -46,7 +46,7 @@ public final class JavaExecutionContext extends AbstractExecutionContext list, final String nullChecked, final String before)
+ private boolean addOptionIfNotNull(List list, String nullChecked, String before)
{
if (nullChecked == null)
{
@@ -93,15 +93,14 @@ public final class JavaExecutionContext extends AbstractExecutionContext executeScripts(final Iterable sourcePaths) throws Exception
+ public Map executeScripts(Iterable sourcePaths) throws Exception
{
final DiagnosticCollector fileManagerDiagnostics = new DiagnosticCollector<>();
final DiagnosticCollector compilationDiagnostics = new DiagnosticCollector<>();
try (final ScriptingFileManager fileManager = new ScriptingFileManager(getScriptingEngine().getCompiler().getStandardFileManager(fileManagerDiagnostics, null, StandardCharsets.UTF_8)))
{
- final LinkedList options = new LinkedList<>();
-
+ final List options = new LinkedList<>();
addOptionIfNotNull(options, getProperty("source"), "-source");
addOptionIfNotNull(options, getProperty("sourcepath"), "-sourcepath");
if (!addOptionIfNotNull(options, getProperty("cp"), "-cp") && !addOptionIfNotNull(options, getProperty("classpath"), "-classpath"))
@@ -172,11 +171,11 @@ public final class JavaExecutionContext extends AbstractExecutionContext executionFailures = new LinkedHashMap<>();
final Iterable compiledClasses = fileManager.getCompiledClasses();
- for (final Path sourcePath : sourcePaths)
+ for (Path sourcePath : sourcePaths)
{
boolean found = false;
- for (final ScriptingOutputFileObject compiledClass : compiledClasses)
+ for (ScriptingOutputFileObject compiledClass : compiledClasses)
{
Path compiledSourcePath = compiledClass.getSourcePath();
// sourePath can be relative, so we have to use endsWith
@@ -223,7 +222,7 @@ public final class JavaExecutionContext extends AbstractExecutionContext executeScript(final Path sourcePath) throws Exception
+ public Entry executeScript(Path sourcePath) throws Exception
{
final Map executionFailures = executeScripts(Arrays.asList(sourcePath));
if (!executionFailures.isEmpty())
diff --git a/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/util/FloodProtectorAction.java b/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/util/FloodProtectorAction.java
index 2c4ac90e89..3c1198a11b 100644
--- a/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/util/FloodProtectorAction.java
+++ b/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/util/FloodProtectorAction.java
@@ -16,6 +16,7 @@
*/
package com.l2jmobius.gameserver.util;
+import java.util.Arrays;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.logging.Level;
import java.util.logging.Logger;
@@ -27,7 +28,6 @@ import com.l2jmobius.gameserver.model.punishment.PunishmentAffect;
import com.l2jmobius.gameserver.model.punishment.PunishmentTask;
import com.l2jmobius.gameserver.model.punishment.PunishmentType;
import com.l2jmobius.gameserver.network.L2GameClient;
-import com.l2jmobius.util.StringUtil;
/**
* Flood protector implementation.
@@ -189,7 +189,9 @@ public final class FloodProtectorAction
private void log(String... lines)
{
- final StringBuilder output = StringUtil.startAppend(100, _config.FLOOD_PROTECTOR_TYPE, ": ");
+ final StringBuilder output = new StringBuilder(100);
+ output.append(_config.FLOOD_PROTECTOR_TYPE);
+ output.append(": ");
String address = null;
try
{
@@ -208,8 +210,10 @@ public final class FloodProtectorAction
{
if (_client.getActiveChar() != null)
{
- StringUtil.append(output, _client.getActiveChar().getName());
- StringUtil.append(output, "(", String.valueOf(_client.getActiveChar().getObjectId()), ") ");
+ output.append(_client.getActiveChar().getName());
+ output.append("(");
+ output.append(_client.getActiveChar().getObjectId());
+ output.append(") ");
}
break;
}
@@ -217,7 +221,8 @@ public final class FloodProtectorAction
{
if (_client.getAccountName() != null)
{
- StringUtil.append(output, _client.getAccountName(), " ");
+ output.append(_client.getAccountName());
+ output.append(" ");
}
break;
}
@@ -225,7 +230,7 @@ public final class FloodProtectorAction
{
if (address != null)
{
- StringUtil.append(output, address);
+ output.append(address);
}
break;
}
@@ -234,8 +239,8 @@ public final class FloodProtectorAction
throw new IllegalStateException("Missing state on switch");
}
}
+ Arrays.stream(lines).forEach(output::append);
- StringUtil.append(output, lines);
_log.warning(output.toString());
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/util/HtmlUtil.java b/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/util/HtmlUtil.java
index 1ffc6f3808..391e38d5e7 100644
--- a/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/util/HtmlUtil.java
+++ b/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/util/HtmlUtil.java
@@ -21,7 +21,6 @@ import java.util.Collection;
import java.util.function.Function;
import com.l2jmobius.gameserver.model.PageResult;
-import com.l2jmobius.util.StringUtil;
/**
* A class containing useful methods for constructing HTML
@@ -163,20 +162,62 @@ public class HtmlUtil
{
current = Math.min(current, max);
final StringBuilder sb = new StringBuilder();
- StringUtil.append(sb, "");
- StringUtil.append(sb, " ");
+ sb.append("");
+ sb.append("");
+ sb.append("");
+ sb.append(" ");
+ sb.append(" ");
+ sb.append("");
+ sb.append("");
+ sb.append("");
+ sb.append("");
+ sb.append("");
if (displayAsPercentage)
{
- StringUtil.append(sb, "", String.format("%.2f%%", ((double) current / max) * 100), "
");
+ sb.append("");
+ sb.append("");
+ sb.append(String.format("%.2f%%", ((double) current / max) * 100));
+ sb.append("
");
}
else
{
- final String tdWidth = String.valueOf((width - 10) / 2);
- StringUtil.append(sb, "", String.valueOf(current), " ");
- StringUtil.append(sb, "/ ", String.valueOf(max), "
");
+ int tdWidth = (width - 10) / 2;
+ sb.append("");
+ sb.append("");
+ sb.append("");
+ sb.append(current);
+ sb.append(" ");
+ sb.append("/ ");
+ sb.append("");
+ sb.append(max);
+ sb.append(" ");
+ sb.append(" ");
+ sb.append("
");
}
- StringUtil.append(sb, "
");
+ sb.append(" ");
+ sb.append("
");
+ sb.append("
");
return sb.toString();
}
diff --git a/L2J_Mobius_HighFive/java/com/l2jmobius/log/formatter/AbstractFormatter.java b/L2J_Mobius_HighFive/java/com/l2jmobius/log/formatter/AbstractFormatter.java
new file mode 100644
index 0000000000..4bbc276c13
--- /dev/null
+++ b/L2J_Mobius_HighFive/java/com/l2jmobius/log/formatter/AbstractFormatter.java
@@ -0,0 +1,42 @@
+/*
+ * This file is part of the L2J Mobius project.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see How to Use It
- * concat() or append() If concatenating stringsMinimum Calls
- * final StringBuilder sbString = new StringBuilder();
- * StringUtil.append(sbString, "text 1", String.valueOf(npcId));
- * StringUtil.append("text 2");
- *
- *
- * Good:
- *
- *
- * final StringBuilder sbString = new StringBuilder();
- * StringUtil.append(sbString, "text 1", String.valueOf(npcId), "text 2");
- *
- *
- * Why?Size Hints for Loops
- * final StringBuilder sbString = new StringBuilder();
- * StringUtil.append(sbString, "header start", someText, "header end");
- * for (int i = 0; i < 50; i++)
- * {
- * StringUtil.append(sbString, "text 1", stringArray[i], "text 2");
- * }
- *
- *
- * Good:
- *
- *
- * final StringBuilder sbString = StringUtil.startAppend(1300, "header start", someText, "header end");
- * for (int i = 0; i < 50; i++)
- * {
- * StringUtil.append(sbString, "text 1", stringArray[i], "text 2");
- * }
- *
- *
- * Why?new
- * StringBuilder(1300).Concatenation and Constants
- * StringUtil.concat("text 1 ", "text 2", String.valueOf(npcId));
- *
- *
- * Good:
- *
- *
- * StringUtil.concat("text 1 " + "text 2", String.valueOf(npcId));
- *
- *
- * or
- *
- *
- * StringUtil.concat("text 1 text 2", String.valueOf(npcId));
- *
- *
- * Why?Concatenation and Constant Variables Bad:
- *
- *
- * String glue = "some glue";
- * StringUtil.concat("text 1", glue, "text 2", glue, String.valueOf(npcId));
- *
- *
- * Good:
- *
- *
- * final String glue = "some glue";
- * StringUtil.concat("text 1" + glue + "text2" + glue, String.valueOf(npcId));
- *
- *
- * Why? Because when using final keyword, the glue is marked as constant string and compiler treats it as a constant string so it is able to create string "text1some gluetext2some glue" during the compilation. But this only works in case the value is known at compilation
- * time, so this cannot be used for cases like final String objectIdString =
- * String.valueOf(getObjectId).StringBuilder Reuse
- * final StringBuilder sbString1 = new StringBuilder();
- * StringUtil.append(sbString1, "text 1", String.valueOf(npcId), "text 2");
- * ... // output of sbString1, it is no more needed
- * final StringBuilder sbString2 = new StringBuilder();
- * StringUtil.append(sbString2, "text 3", String.valueOf(npcId), "text 4");
- *
- *
- * Good:
- *
- *
- * final StringBuilder sbString = new StringBuilder();
- * StringUtil.append(sbString, "text 1", String.valueOf(npcId), "text 2");
- * ... // output of sbString, it is no more needed
- * sbString.setLength(0);
- * StringUtil.append(sbString, "text 3", String.valueOf(npcId), "text 4");
- *
- *
- * Why?
- * In first case, new memory has to be allocated for the second string. In second case already allocated memory is reused, but only in case the new string is not longer than the previously allocated string. Anyway, the second way is better because the string either fits in the memory and some memory
- * is saved, or it does not fit in the memory, and in that case it works as in the first case.
- * Primitives to Strings To convert primitives to string, use String.valueOf().How much faster is it?
- * Count: 2
- * TextBuilder: 1893
- * TextBuilder with size: 1703
- * String: 1033
- * StringBuilder: 993
- * StringBuilder with size: 1024
- * Count: 3
- * TextBuilder: 1973
- * TextBuilder with size: 1872
- * String: 2583
- * StringBuilder: 1633
- * StringBuilder with size: 1156
- * Count: 4
- * TextBuilder: 2188
- * TextBuilder with size: 2229
- * String: 4207
- * StringBuilder: 1816
- * StringBuilder with size: 1444
- * Count: 5
- * TextBuilder: 9185
- * TextBuilder with size: 9464
- * String: 6937
- * StringBuilder: 2745
- * StringBuilder with size: 1882
- * Count: 6
- * TextBuilder: 9785
- * TextBuilder with size: 10082
- * String: 9471
- * StringBuilder: 2889
- * StringBuilder with size: 1857
- * Count: 7
- * TextBuilder: 10169
- * TextBuilder with size: 10528
- * String: 12746
- * StringBuilder: 3081
- * StringBuilder with size: 2139
- *
- *
- * @author fordfrog
- */
-public final class StringUtil
-{
- private StringUtil()
- {
- }
-
- /**
- * Concatenates strings.
- * @param strings strings to be concatenated
- * @return concatenated string
- */
- public static String concat(String... strings)
- {
- final StringBuilder sbString = new StringBuilder();
- for (String string : strings)
- {
- sbString.append(string);
- }
- return sbString.toString();
- }
-
- /**
- * Creates new string builder with size initializated to sizeHint, unless total length of strings is greater than sizeHint.
- * @param sizeHint hint for string builder size allocation
- * @param strings strings to be appended
- * @return created string builder
- */
- public static StringBuilder startAppend(int sizeHint, String... strings)
- {
- final int length = getLength(strings);
- final StringBuilder sbString = new StringBuilder(sizeHint > length ? sizeHint : length);
- for (String string : strings)
- {
- sbString.append(string);
- }
- return sbString;
- }
-
- /**
- * Appends strings to existing string builder.
- * @param sbString string builder
- * @param strings strings to be appended
- */
- public static void append(StringBuilder sbString, String... strings)
- {
- sbString.ensureCapacity(sbString.length() + getLength(strings));
-
- for (String string : strings)
- {
- sbString.append(string);
- }
- }
-
- public static int getLength(Iterable strings)
- {
- int length = 0;
- for (String string : strings)
- {
- length += (string == null) ? 4 : string.length();
- }
- return length;
- }
-
- /**
- * Counts total length of all the strings.
- * @param strings array of strings
- * @return total length of all the strings
- */
- public static int getLength(String[] strings)
- {
- int length = 0;
- for (String string : strings)
- {
- length += (string == null) ? 4 : string.length();
- }
- return length;
- }
-
- public static String getTraceString(StackTraceElement[] trace)
- {
- final StringBuilder sbString = new StringBuilder();
- for (StackTraceElement element : trace)
- {
- sbString.append(element.toString()).append(Config.EOL);
- }
- return sbString.toString();
- }
-}
\ No newline at end of file
diff --git a/L2J_Mobius_HighFive/java/com/l2jmobius/util/Util.java b/L2J_Mobius_HighFive/java/com/l2jmobius/util/Util.java
index 8d59ac58ca..3b11dfd045 100644
--- a/L2J_Mobius_HighFive/java/com/l2jmobius/util/Util.java
+++ b/L2J_Mobius_HighFive/java/com/l2jmobius/util/Util.java
@@ -29,8 +29,11 @@ import java.time.temporal.TemporalAdjusters;
import java.util.Arrays;
import java.util.Comparator;
import java.util.List;
+import java.util.StringJoiner;
import java.util.logging.Logger;
+import com.l2jmobius.Config;
+
/**
* Useful utilities common to L2J Server.
*/
@@ -221,4 +224,14 @@ public final class Util
.orElse(dateNowWithDifferentTime.with(TemporalAdjusters.next(daysOfWeek.get(0))));
// @formatter:on
}
+
+ public static String getTraceString(StackTraceElement[] stackTraceElements)
+ {
+ final StringJoiner sj = new StringJoiner(Config.EOL);
+ for (final StackTraceElement stackTraceElement : stackTraceElements)
+ {
+ sj.add(stackTraceElement.toString());
+ }
+ return sj.toString();
+ }
}