lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reworked the custom localisation system.

Browse Source
This commit is contained in:
MobiusDevelopment
2019-07-13 06:07:59 +00:00
parent 5fa60b02dc
commit 0be93db17c
3505 changed files with 26765 additions and 63542 deletions
Download Patch File Download Diff File Expand all files Collapse all files
L2J_Mobius_3.0_Helios/java/org/l2jmobius/Config.java
+2 -2
View File
@@ -3091,13 +3091,13 @@ public final class Config
// Load MultilingualSupport config file (if exists)
final PropertiesParser MultilingualSupport = new PropertiesParser(CUSTOM_MULTILANGUAL_SUPPORT_CONFIG_FILE);
MULTILANG_DEFAULT = MultilingualSupport.getString("MultiLangDefault", "en");
MULTILANG_DEFAULT = MultilingualSupport.getString("MultiLangDefault", "en").toLowerCase();
MULTILANG_ENABLE = MultilingualSupport.getBoolean("MultiLangEnable", false);
final String[] allowed = MultilingualSupport.getString("MultiLangAllowed", MULTILANG_DEFAULT).split(";");
MULTILANG_ALLOWED = new ArrayList<>(allowed.length);
for (String lang : allowed)
{
MULTILANG_ALLOWED.add(lang);
MULTILANG_ALLOWED.add(lang.toLowerCase());
}
if (!MULTILANG_ALLOWED.contains(MULTILANG_DEFAULT))
{
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/GameTimeController.java
+2 -2
View File
@@ -191,7 +191,7 @@ public final class GameTimeController extends Thread
_shadowSenseCharacters.add(creature);
if (isNight())
{
final SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.IT_IS_NOW_MIDNIGHT_AND_THE_EFFECT_OF_S1_CAN_BE_FELT);
final SystemMessage msg = new SystemMessage(SystemMessageId.IT_IS_NOW_MIDNIGHT_AND_THE_EFFECT_OF_S1_CAN_BE_FELT);
msg.addSkillName(SHADOW_SENSE_ID);
creature.sendPacket(msg);
}
@@ -205,7 +205,7 @@ public final class GameTimeController extends Thread
private void notifyShadowSense()
{
final SystemMessage msg = SystemMessage.getSystemMessage(isNight() ? SystemMessageId.IT_IS_NOW_MIDNIGHT_AND_THE_EFFECT_OF_S1_CAN_BE_FELT : SystemMessageId.IT_IS_DAWN_AND_THE_EFFECT_OF_S1_WILL_NOW_DISAPPEAR);
final SystemMessage msg = new SystemMessage(isNight() ? SystemMessageId.IT_IS_NOW_MIDNIGHT_AND_THE_EFFECT_OF_S1_CAN_BE_FELT : SystemMessageId.IT_IS_DAWN_AND_THE_EFFECT_OF_S1_WILL_NOW_DISAPPEAR);
msg.addSkillName(SHADOW_SENSE_ID);
for (Creature creature : _shadowSenseCharacters)
{
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/LoginServerThread.java
+1 -1
View File
@@ -573,7 +573,7 @@ public class LoginServerThread extends Thread
{
ACCOUNTING_LOGGER.info("Kicked by login, " + client);
}
client.close(SystemMessage.getSystemMessage(SystemMessageId.YOU_ARE_LOGGED_IN_TO_TWO_PLACES_IF_YOU_SUSPECT_ACCOUNT_THEFT_WE_RECOMMEND_CHANGING_YOUR_PASSWORD_SCANNING_YOUR_COMPUTER_FOR_VIRUSES_AND_USING_AN_ANTI_VIRUS_SOFTWARE));
client.close(new SystemMessage(SystemMessageId.YOU_ARE_LOGGED_IN_TO_TWO_PLACES_IF_YOU_SUSPECT_ACCOUNT_THEFT_WE_RECOMMEND_CHANGING_YOUR_PASSWORD_SCANNING_YOUR_COMPUTER_FOR_VIRUSES_AND_USING_AN_ANTI_VIRUS_SOFTWARE));
}
sendLogout(account);
}
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/RecipeController.java
+13 -13
View File
@@ -147,7 +147,7 @@ public class RecipeController
// Check if player is busy (possible if alt game creation is enabled)
if (Config.ALT_GAME_CREATION && _activeMakers.containsKey(player.getObjectId()))
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S2_S1);
final SystemMessage sm = new SystemMessage(SystemMessageId.S2_S1);
sm.addItemName(recipeList.getItemId());
sm.addString("You are busy creating.");
player.sendPacket(sm);
@@ -417,13 +417,13 @@ public class RecipeController
{
if (_target != _player)
{
SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.YOU_FAILED_TO_CREATE_S2_FOR_C1_AT_THE_PRICE_OF_S3_ADENA);
SystemMessage msg = new SystemMessage(SystemMessageId.YOU_FAILED_TO_CREATE_S2_FOR_C1_AT_THE_PRICE_OF_S3_ADENA);
msg.addString(_target.getName());
msg.addItemName(_recipeList.getItemId());
msg.addLong(_price);
_player.sendPacket(msg);
msg = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_FAILED_TO_CREATE_S2_AT_THE_PRICE_OF_S3_ADENA);
msg = new SystemMessage(SystemMessageId.C1_HAS_FAILED_TO_CREATE_S2_AT_THE_PRICE_OF_S3_ADENA);
msg.addString(_player.getName());
msg.addItemName(_recipeList.getItemId());
msg.addLong(_price);
@@ -493,7 +493,7 @@ public class RecipeController
if (_target == _player)
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.EQUIPPED_S1_S2); // you equipped ...
final SystemMessage sm = new SystemMessage(SystemMessageId.EQUIPPED_S1_S2); // you equipped ...
sm.addLong(count);
sm.addItemName(item.getItemId());
_player.sendPacket(sm);
@@ -613,7 +613,7 @@ public class RecipeController
// check materials
if (itemQuantityAmount < recipe.getQuantity())
{
sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_NEED_S2_MORE_S1_S);
sm = new SystemMessage(SystemMessageId.YOU_NEED_S2_MORE_S1_S);
sm.addItemName(recipe.getItemId());
sm.addLong(recipe.getQuantity() - itemQuantityAmount);
_target.sendPacket(sm);
@@ -635,14 +635,14 @@ public class RecipeController
if (tmp.getQuantity() > 1)
{
sm = SystemMessage.getSystemMessage(SystemMessageId.S2_S1_S_DISAPPEARED);
sm = new SystemMessage(SystemMessageId.S2_S1_S_DISAPPEARED);
sm.addItemName(tmp.getItemId());
sm.addLong(tmp.getQuantity());
_target.sendPacket(sm);
}
else
{
sm = SystemMessage.getSystemMessage(SystemMessageId.S1_DISAPPEARED);
sm = new SystemMessage(SystemMessageId.S1_DISAPPEARED);
sm.addItemName(tmp.getItemId());
_target.sendPacket(sm);
}
@@ -689,13 +689,13 @@ public class RecipeController
// inform manufacturer of earned profit
if (itemCount == 1)
{
sm = SystemMessage.getSystemMessage(SystemMessageId.S2_HAS_BEEN_CREATED_FOR_C1_AFTER_THE_PAYMENT_OF_S3_ADENA_WAS_RECEIVED);
sm = new SystemMessage(SystemMessageId.S2_HAS_BEEN_CREATED_FOR_C1_AFTER_THE_PAYMENT_OF_S3_ADENA_WAS_RECEIVED);
sm.addString(_target.getName());
sm.addItemName(itemId);
sm.addLong(_price);
_player.sendPacket(sm);
sm = SystemMessage.getSystemMessage(SystemMessageId.C1_CREATED_S2_AFTER_RECEIVING_S3_ADENA);
sm = new SystemMessage(SystemMessageId.C1_CREATED_S2_AFTER_RECEIVING_S3_ADENA);
sm.addString(_player.getName());
sm.addItemName(itemId);
sm.addLong(_price);
@@ -703,14 +703,14 @@ public class RecipeController
}
else
{
sm = SystemMessage.getSystemMessage(SystemMessageId.S3_S2_S_HAVE_BEEN_CREATED_FOR_C1_AT_THE_PRICE_OF_S4_ADENA);
sm = new SystemMessage(SystemMessageId.S3_S2_S_HAVE_BEEN_CREATED_FOR_C1_AT_THE_PRICE_OF_S4_ADENA);
sm.addString(_target.getName());
sm.addInt(itemCount);
sm.addItemName(itemId);
sm.addLong(_price);
_player.sendPacket(sm);
sm = SystemMessage.getSystemMessage(SystemMessageId.C1_CREATED_S3_S2_S_AT_THE_PRICE_OF_S4_ADENA);
sm = new SystemMessage(SystemMessageId.C1_CREATED_S3_S2_S_AT_THE_PRICE_OF_S4_ADENA);
sm.addString(_player.getName());
sm.addInt(itemCount);
sm.addItemName(itemId);
@@ -721,14 +721,14 @@ public class RecipeController
if (itemCount > 1)
{
sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_EARNED_S2_S1_S);
sm = new SystemMessage(SystemMessageId.YOU_HAVE_EARNED_S2_S1_S);
sm.addItemName(itemId);
sm.addLong(itemCount);
_target.sendPacket(sm);
}
else
{
sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_EARNED_S1);
sm = new SystemMessage(SystemMessageId.YOU_HAVE_EARNED_S1);
sm.addItemName(itemId);
_target.sendPacket(sm);
}
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/Shutdown.java
+1 -1
View File
@@ -78,7 +78,7 @@ public class Shutdown extends Thread
*/
private void SendServerQuit(int seconds)
{
final SystemMessage sysm = SystemMessage.getSystemMessage(SystemMessageId.THE_SERVER_WILL_BE_COMING_DOWN_IN_S1_SECOND_S_PLEASE_FIND_A_SAFE_PLACE_TO_LOG_OUT);
final SystemMessage sysm = new SystemMessage(SystemMessageId.THE_SERVER_WILL_BE_COMING_DOWN_IN_S1_SECOND_S_PLEASE_FIND_A_SAFE_PLACE_TO_LOG_OUT);
sysm.addInt(seconds);
Broadcast.toAllOnlinePlayers(sysm);
}
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/sql/impl/ClanTable.java
+2 -2
View File
@@ -183,7 +183,7 @@ public class ClanTable
if (getClanByName(clanName) != null)
{
// clan name is already taken
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_ALREADY_EXISTS);
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_ALREADY_EXISTS);
sm.addString(clanName);
player.sendPacket(sm);
return null;
@@ -220,7 +220,7 @@ public class ClanTable
return;
}
clan.broadcastToOnlineMembers(SystemMessage.getSystemMessage(SystemMessageId.CLAN_HAS_DISPERSED));
clan.broadcastToOnlineMembers(new SystemMessage(SystemMessageId.CLAN_HAS_DISPERSED));
ClanEntryManager.getInstance().removeFromClanList(clan.getId());
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/AdminData.java
+1 -1
View File
@@ -302,7 +302,7 @@ public final class AdminData implements IXmlReader
for (String name : getAllGmNames(player.isGM()))
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.GM_C1);
final SystemMessage sm = new SystemMessage(SystemMessageId.GM_C1);
sm.addString(name);
player.sendPacket(sm);
}
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/datatables/BotReportTable.java
+3 -3
View File
@@ -293,7 +293,7 @@ public final class BotReportTable
final long reuse = (System.currentTimeMillis() - rcdRep.getLastReporTime());
if (reuse < Config.BOTREPORT_REPORT_DELAY)
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_CAN_MAKE_ANOTHER_REPORT_IN_S1_MINUTE_S_YOU_HAVE_S2_POINT_S_REMAINING_ON_THIS_ACCOUNT);
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_CAN_MAKE_ANOTHER_REPORT_IN_S1_MINUTE_S_YOU_HAVE_S2_POINT_S_REMAINING_ON_THIS_ACCOUNT);
sm.addInt((int) (reuse / 60000));
sm.addInt(rcdRep.getPointsLeft());
reporter.sendPacket(sm);
@@ -320,11 +320,11 @@ public final class BotReportTable
_charRegistry.put(reporterId, rcdRep);
}
SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_WAS_REPORTED_AS_A_BOT);
SystemMessage sm = new SystemMessage(SystemMessageId.C1_WAS_REPORTED_AS_A_BOT);
sm.addString(bot.getName());
reporter.sendPacket(sm);
sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_USED_A_REPORT_POINT_ON_C1_YOU_HAVE_S2_POINTS_REMAINING_ON_THIS_ACCOUNT);
sm = new SystemMessage(SystemMessageId.YOU_HAVE_USED_A_REPORT_POINT_ON_C1_YOU_HAVE_S2_POINTS_REMAINING_ON_THIS_ACCOUNT);
sm.addString(bot.getName());
sm.addInt(rcdRep.getPointsLeft());
reporter.sendPacket(sm);
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java
+1 -1
View File
@@ -106,7 +106,7 @@ public class AdminCommandHandler implements IHandler<IAdminCommandHandler, Strin
{
player.setAdminConfirmCmd(fullCommand);
final ConfirmDlg dlg = new ConfirmDlg(SystemMessageId.S1_3);
dlg.addString("Are you sure you want execute command '" + commandNoPrefix + "' ?");
dlg.getSystemMessage().addString("Are you sure you want execute command '" + commandNoPrefix + "' ?");
player.addAction(PlayerAction.ADMIN_COMMAND);
player.sendPacket(dlg);
}
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/CeremonyOfChaosManager.java
+1 -1
View File
@@ -261,7 +261,7 @@ public class CeremonyOfChaosManager extends AbstractEventManager<CeremonyOfChaos
case "count_down":
{
final int time = params.getInt("time", 0);
final SystemMessage countdown = SystemMessage.getSystemMessage(SystemMessageId.YOU_WILL_BE_MOVED_TO_THE_ARENA_IN_S1_SECOND_S);
final SystemMessage countdown = new SystemMessage(SystemMessageId.YOU_WILL_BE_MOVED_TO_THE_ARENA_IN_S1_SECOND_S);
countdown.addByte(time);
broadcastPacket(countdown);
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java
+1 -1
View File
@@ -315,7 +315,7 @@ public final class CursedWeaponsManager implements IXmlReader
cw.giveSkill();
player.setCursedWeaponEquippedId(cw.getItemId());
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_HAS_S2_MINUTE_S_OF_USAGE_TIME_REMAINING);
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_S2_MINUTE_S_OF_USAGE_TIME_REMAINING);
sm.addString(cw.getName());
// sm.addItemName(cw.getItemId());
sm.addInt((int) ((cw.getEndTime() - System.currentTimeMillis()) / 60000));
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java
+1 -1
View File
@@ -299,7 +299,7 @@ public final class FortSiegeManager
public boolean checkIfCanPickup(PlayerInstance player)
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_FORTRESS_BATTLE_OF_S1_HAS_FINISHED);
final SystemMessage sm = new SystemMessage(SystemMessageId.THE_FORTRESS_BATTLE_OF_S1_HAS_FINISHED);
sm.addItemName(9819);
// Cannot own 2 combat flag
if (player.isCombatFlagEquipped())
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/HandysBlockCheckerManager.java
+1 -1
View File
@@ -157,7 +157,7 @@ public final class HandysBlockCheckerManager
{
if (_arenaPlayers[i].getAllPlayers().contains(player))
{
final SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_ALREADY_REGISTERED_ON_THE_MATCH_WAITING_LIST);
final SystemMessage msg = new SystemMessage(SystemMessageId.C1_IS_ALREADY_REGISTERED_ON_THE_MATCH_WAITING_LIST);
msg.addString(player.getName());
player.sendPacket(msg);
return false;
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/PcCafePointsManager.java
+3 -3
View File
@@ -41,7 +41,7 @@ public final class PcCafePointsManager
if (player.getPcCafePoints() >= Config.PC_CAFE_MAX_POINTS)
{
final SystemMessage message = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_EARNED_THE_MAXIMUM_NUMBER_OF_PC_POINTS);
final SystemMessage message = new SystemMessage(SystemMessageId.YOU_HAVE_EARNED_THE_MAXIMUM_NUMBER_OF_PC_POINTS);
player.sendPacket(message);
return;
}
@@ -67,11 +67,11 @@ public final class PcCafePointsManager
if (Config.PC_CAFE_ENABLE_DOUBLE_POINTS && (Rnd.get(100) < Config.PC_CAFE_DOUBLE_POINTS_CHANCE))
{
points *= 2;
message = SystemMessage.getSystemMessage(SystemMessageId.DOUBLE_POINTS_YOU_EARNED_S1_PC_POINT_S);
message = new SystemMessage(SystemMessageId.DOUBLE_POINTS_YOU_EARNED_S1_PC_POINT_S);
}
else
{
message = SystemMessage.getSystemMessage(SystemMessageId.YOU_EARNED_S1_PC_POINT_S);
message = new SystemMessage(SystemMessageId.YOU_EARNED_S1_PC_POINT_S);
}
if ((player.getPcCafePoints() + points) > Config.PC_CAFE_MAX_POINTS)
{
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/PetitionManager.java
+3 -3
View File
@@ -84,15 +84,15 @@ public final class PetitionManager
currPetition.setState(PetitionState.IN_PROCESS);
// Petition application accepted. (Send to Petitioner)
currPetition.sendPetitionerPacket(SystemMessage.getSystemMessage(SystemMessageId.PETITION_APPLICATION_ACCEPTED));
currPetition.sendPetitionerPacket(new SystemMessage(SystemMessageId.PETITION_APPLICATION_ACCEPTED));
// Petition application accepted. Reciept No. is <ID>
SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOUR_PETITION_APPLICATION_HAS_BEEN_ACCEPTED_NRECEIPT_NO_IS_S1);
SystemMessage sm = new SystemMessage(SystemMessageId.YOUR_PETITION_APPLICATION_HAS_BEEN_ACCEPTED_NRECEIPT_NO_IS_S1);
sm.addInt(currPetition.getId());
currPetition.sendResponderPacket(sm);
// Petition consultation with <Player> underway.
sm = SystemMessage.getSystemMessage(SystemMessageId.STARTING_PETITION_CONSULTATION_WITH_C1);
sm = new SystemMessage(SystemMessageId.STARTING_PETITION_CONSULTATION_WITH_C1);
sm.addString(currPetition.getPetitioner().getName());
currPetition.sendResponderPacket(sm);
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/tasks/MessageDeletionTask.java
+1 -1
View File
@@ -71,7 +71,7 @@ public final class MessageDeletionTask implements Runnable
final PlayerInstance receiver = World.getInstance().getPlayer(msg.getReceiverId());
if (receiver != null)
{
receiver.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.THE_MAIL_WAS_RETURNED_DUE_TO_THE_EXCEEDED_WAITING_TIME));
receiver.sendPacket(new SystemMessage(SystemMessageId.THE_MAIL_WAS_RETURNED_DUE_TO_THE_EXCEEDED_WAITING_TIME));
}
}
catch (Exception e)
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java
+2 -2
View File
@@ -132,7 +132,7 @@ public abstract class AbstractPlayerGroup
*/
public void broadcastMessage(SystemMessageId message)
{
broadcastPacket(SystemMessage.getSystemMessage(message));
broadcastPacket(new SystemMessage(message));
}
/**
@@ -141,7 +141,7 @@ public abstract class AbstractPlayerGroup
*/
public void broadcastString(String text)
{
broadcastPacket(SystemMessage.sendString(text));
broadcastPacket(new SystemMessage(text));
}
public void broadcastCreatureSay(CreatureSay msg, PlayerInstance broadcaster)
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/ArenaParticipantsHolder.java
+2 -2
View File
@@ -146,7 +146,7 @@ public final class ArenaParticipantsHolder
final int blueSize = _bluePlayers.size();
if (redSize > (blueSize + 1))
{
broadCastPacketToTeam(SystemMessage.getSystemMessage(SystemMessageId.TEAM_MEMBERS_WERE_MODIFIED_BECAUSE_THE_TEAMS_WERE_UNBALANCED));
broadCastPacketToTeam(new SystemMessage(SystemMessageId.TEAM_MEMBERS_WERE_MODIFIED_BECAUSE_THE_TEAMS_WERE_UNBALANCED));
final int needed = redSize - (blueSize + 1);
for (int i = 0; i < (needed + 1); i++)
{
@@ -160,7 +160,7 @@ public final class ArenaParticipantsHolder
}
else if (blueSize > (redSize + 1))
{
broadCastPacketToTeam(SystemMessage.getSystemMessage(SystemMessageId.TEAM_MEMBERS_WERE_MODIFIED_BECAUSE_THE_TEAMS_WERE_UNBALANCED));
broadCastPacketToTeam(new SystemMessage(SystemMessageId.TEAM_MEMBERS_WERE_MODIFIED_BECAUSE_THE_TEAMS_WERE_UNBALANCED));
final int needed = blueSize - (redSize + 1);
for (int i = 0; i < (needed + 1); i++)
{
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/BlockList.java
+4 -4
View File
@@ -186,7 +186,7 @@ public class BlockList
listOwner.getBlockList().addToBlockList(targetId);
SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_HAS_BEEN_ADDED_TO_YOUR_IGNORE_LIST);
SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_BEEN_ADDED_TO_YOUR_IGNORE_LIST);
sm.addString(charName);
listOwner.sendPacket(sm);
@@ -194,7 +194,7 @@ public class BlockList
if (player != null)
{
sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_PLACED_YOU_ON_HIS_HER_IGNORE_LIST);
sm = new SystemMessage(SystemMessageId.C1_HAS_PLACED_YOU_ON_HIS_HER_IGNORE_LIST);
sm.addString(listOwner.getName());
player.sendPacket(sm);
}
@@ -213,14 +213,14 @@ public class BlockList
if (!listOwner.getBlockList().getBlockList().contains(targetId))
{
sm = SystemMessage.getSystemMessage(SystemMessageId.THAT_IS_AN_INCORRECT_TARGET);
sm = new SystemMessage(SystemMessageId.THAT_IS_AN_INCORRECT_TARGET);
listOwner.sendPacket(sm);
return;
}
listOwner.getBlockList().removeFromBlockList(targetId);
sm = SystemMessage.getSystemMessage(SystemMessageId.S1_HAS_BEEN_REMOVED_FROM_YOUR_IGNORE_LIST);
sm = new SystemMessage(SystemMessageId.S1_HAS_BEEN_REMOVED_FROM_YOUR_IGNORE_LIST);
sm.addString(charName);
listOwner.sendPacket(sm);
}
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/CombatFlag.java
+1 -1
View File
@@ -79,7 +79,7 @@ public class CombatFlag
// Equip with the weapon
_item = item;
_player.getInventory().equipItem(_item);
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_EQUIPPED_YOUR_S1);
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_EQUIPPED_YOUR_S1);
sm.addItemName(_item);
_player.sendPacket(sm);
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/CommandChannel.java
+2 -2
View File
@@ -74,7 +74,7 @@ public class CommandChannel extends AbstractPlayerGroup
_channelLvl = party.getLevel();
}
party.setCommandChannel(this);
party.broadcastPacket(SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_JOINED_THE_COMMAND_CHANNEL));
party.broadcastPacket(new SystemMessage(SystemMessageId.YOU_HAVE_JOINED_THE_COMMAND_CHANNEL));
party.broadcastPacket(ExOpenMPCC.STATIC_PACKET);
}
@@ -102,7 +102,7 @@ public class CommandChannel extends AbstractPlayerGroup
party.broadcastPacket(ExCloseMPCC.STATIC_PACKET);
if (_parties.size() < 2)
{
broadcastPacket(SystemMessage.getSystemMessage(SystemMessageId.THE_COMMAND_CHANNEL_HAS_BEEN_DISBANDED));
broadcastPacket(new SystemMessage(SystemMessageId.THE_COMMAND_CHANNEL_HAS_BEEN_DISBANDED));
disbandChannel();
}
else
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/ContactList.java
+3 -3
View File
@@ -107,7 +107,7 @@ public class ContactList
}
else if (contactId < 1)
{
sm = SystemMessage.getSystemMessage(SystemMessageId.THE_NAME_S1_DOESN_T_EXIST_PLEASE_TRY_ANOTHER_NAME);
sm = new SystemMessage(SystemMessageId.THE_NAME_S1_DOESN_T_EXIST_PLEASE_TRY_ANOTHER_NAME);
sm.addString(name);
_player.sendPacket(sm);
return false;
@@ -133,7 +133,7 @@ public class ContactList
_contacts.add(name);
sm = SystemMessage.getSystemMessage(SystemMessageId.S1_WAS_SUCCESSFULLY_ADDED_TO_YOUR_CONTACT_LIST);
sm = new SystemMessage(SystemMessageId.S1_WAS_SUCCESSFULLY_ADDED_TO_YOUR_CONTACT_LIST);
sm.addString(name);
_player.sendPacket(sm);
}
@@ -168,7 +168,7 @@ public class ContactList
statement.setInt(2, contactId);
statement.execute();
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_WAS_SUCCESSFULLY_DELETED_FROM_YOUR_CONTACT_LIST);
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_WAS_SUCCESSFULLY_DELETED_FROM_YOUR_CONTACT_LIST);
sm.addString(name);
_player.sendPacket(sm);
}
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/CursedWeapon.java
+6 -6
View File
@@ -203,7 +203,7 @@ public class CursedWeapon implements INamable
// Delete infos from table if any
CursedWeaponsManager.removeFromDb(_itemId);
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_HAS_DISAPPEARED);
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_DISAPPEARED);
sm.addItemName(_itemId);
CursedWeaponsManager.announce(sm);
@@ -279,7 +279,7 @@ public class CursedWeapon implements INamable
// _player.getInventory().getItemByItemId(_itemId).dropMe(_player, _player.getX(), _player.getY(), _player.getZ());
}
_isDropped = true;
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S2_WAS_DROPPED_IN_THE_S1_REGION);
final SystemMessage sm = new SystemMessage(SystemMessageId.S2_WAS_DROPPED_IN_THE_S1_REGION);
if (player != null)
{
sm.addZoneName(player.getX(), player.getY(), player.getZ()); // Region Name
@@ -301,13 +301,13 @@ public class CursedWeapon implements INamable
doTransform();
giveSkill();
final SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.S2_S_OWNER_HAS_LOGGED_INTO_THE_S1_REGION);
final SystemMessage msg = new SystemMessage(SystemMessageId.S2_S_OWNER_HAS_LOGGED_INTO_THE_S1_REGION);
msg.addZoneName(_player.getX(), _player.getY(), _player.getZ());
msg.addItemName(_player.getCursedWeaponEquippedId());
CursedWeaponsManager.announce(msg);
final CursedWeapon cw = CursedWeaponsManager.getInstance().getCursedWeapon(_player.getCursedWeaponEquippedId());
final SystemMessage msg2 = SystemMessage.getSystemMessage(SystemMessageId.S1_HAS_S2_MINUTE_S_OF_USAGE_TIME_REMAINING);
final SystemMessage msg2 = new SystemMessage(SystemMessageId.S1_HAS_S2_MINUTE_S_OF_USAGE_TIME_REMAINING);
final int timeLeft = (int) (cw.getTimeLeft() / 60000);
msg2.addItemName(_player.getCursedWeaponEquippedId());
msg2.addInt(timeLeft);
@@ -436,7 +436,7 @@ public class CursedWeapon implements INamable
_item = item;
// ItemInstance[] items =
_player.getInventory().equipItem(_item);
SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_EQUIPPED_YOUR_S1);
SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_EQUIPPED_YOUR_S1);
sm.addItemName(_item);
_player.sendPacket(sm);
@@ -463,7 +463,7 @@ public class CursedWeapon implements INamable
_player.broadcastPacket(atk);
sm = SystemMessage.getSystemMessage(SystemMessageId.THE_OWNER_OF_S2_HAS_APPEARED_IN_THE_S1_REGION);
sm = new SystemMessage(SystemMessageId.THE_OWNER_OF_S2_HAS_APPEARED_IN_THE_S1_REGION);
sm.addZoneName(_player.getX(), _player.getY(), _player.getZ()); // Region Name
sm.addItemName(_item);
CursedWeaponsManager.announce(sm);
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/Party.java
+17 -17
View File
@@ -328,11 +328,11 @@ public class Party extends AbstractPlayerGroup
}
}
SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_JOINED_S1_S_PARTY);
SystemMessage msg = new SystemMessage(SystemMessageId.YOU_HAVE_JOINED_S1_S_PARTY);
msg.addString(getLeader().getName());
player.sendPacket(msg);
msg = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_JOINED_THE_PARTY);
msg = new SystemMessage(SystemMessageId.C1_HAS_JOINED_THE_PARTY);
msg.addString(player.getName());
broadcastPacket(msg);
@@ -445,7 +445,7 @@ public class Party extends AbstractPlayerGroup
// Add the new sign
_tacticalSigns.put(tacticalSignId, target);
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_USED_S3_ON_C2);
final SystemMessage sm = new SystemMessage(SystemMessageId.C1_USED_S3_ON_C2);
sm.addPcName(player);
sm.addString(target.getName());
sm.addSystemString(TACTICAL_SYS_STRINGS[tacticalSignId]);
@@ -468,7 +468,7 @@ public class Party extends AbstractPlayerGroup
// Otherwise, delete the old sign, and apply it to the new target
_tacticalSigns.replace(tacticalSignId, target);
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_USED_S3_ON_C2);
final SystemMessage sm = new SystemMessage(SystemMessageId.C1_USED_S3_ON_C2);
sm.addPcName(player);
sm.addString(target.getName());
sm.addSystemString(TACTICAL_SYS_STRINGS[tacticalSignId]);
@@ -554,14 +554,14 @@ public class Party extends AbstractPlayerGroup
if (type == MessageType.EXPELLED)
{
player.sendPacket(SystemMessageId.YOU_HAVE_BEEN_EXPELLED_FROM_THE_PARTY);
msg = SystemMessage.getSystemMessage(SystemMessageId.C1_WAS_EXPELLED_FROM_THE_PARTY);
msg = new SystemMessage(SystemMessageId.C1_WAS_EXPELLED_FROM_THE_PARTY);
msg.addString(player.getName());
broadcastPacket(msg);
}
else if ((type == MessageType.LEFT) || (type == MessageType.DISCONNECTED))
{
player.sendPacket(SystemMessageId.YOU_HAVE_WITHDRAWN_FROM_THE_PARTY);
msg = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_LEFT_THE_PARTY);
msg = new SystemMessage(SystemMessageId.C1_HAS_LEFT_THE_PARTY);
msg.addString(player.getName());
broadcastPacket(msg);
}
@@ -586,7 +586,7 @@ public class Party extends AbstractPlayerGroup
}
if (isLeader && (_members.size() > 1) && (Config.ALT_LEAVE_PARTY_LEADER || (type == MessageType.DISCONNECTED)))
{
msg = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_BECOME_THE_PARTY_LEADER);
msg = new SystemMessage(SystemMessageId.C1_HAS_BECOME_THE_PARTY_LEADER);
msg.addString(getLeader().getName());
broadcastPacket(msg);
broadcastToPartyMembersNewLeader();
@@ -638,7 +638,7 @@ public class Party extends AbstractPlayerGroup
_disbanding = true;
if (_members != null)
{
broadcastPacket(SystemMessage.getSystemMessage(SystemMessageId.THE_PARTY_HAS_DISPERSED));
broadcastPacket(new SystemMessage(SystemMessageId.THE_PARTY_HAS_DISPERSED));
for (PlayerInstance member : _members)
{
if (member != null)
@@ -678,14 +678,14 @@ public class Party extends AbstractPlayerGroup
_members.set(0, player);
_members.set(p1, temp);
SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_BECOME_THE_PARTY_LEADER);
SystemMessage msg = new SystemMessage(SystemMessageId.C1_HAS_BECOME_THE_PARTY_LEADER);
msg.addString(getLeader().getName());
broadcastPacket(msg);
broadcastToPartyMembersNewLeader();
if (isInCommandChannel() && _commandChannel.isLeader(temp))
{
_commandChannel.setLeader(getLeader());
msg = SystemMessage.getSystemMessage(SystemMessageId.COMMAND_CHANNEL_AUTHORITY_HAS_BEEN_TRANSFERRED_TO_C1);
msg = new SystemMessage(SystemMessageId.COMMAND_CHANNEL_AUTHORITY_HAS_BEEN_TRANSFERRED_TO_C1);
msg.addString(_commandChannel.getLeader().getName());
_commandChannel.broadcastPacket(msg);
}
@@ -735,7 +735,7 @@ public class Party extends AbstractPlayerGroup
// Send messages to other party members about reward
if (item.getCount() > 1)
{
final SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_OBTAINED_S3_S2);
final SystemMessage msg = new SystemMessage(SystemMessageId.C1_HAS_OBTAINED_S3_S2);
msg.addString(target.getName());
msg.addItemName(item);
msg.addLong(item.getCount());
@@ -743,7 +743,7 @@ public class Party extends AbstractPlayerGroup
}
else
{
final SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_OBTAINED_S2);
final SystemMessage msg = new SystemMessage(SystemMessageId.C1_HAS_OBTAINED_S2);
msg.addString(target.getName());
msg.addItemName(item);
broadcastToPartyMembers(target, msg);
@@ -773,7 +773,7 @@ public class Party extends AbstractPlayerGroup
// Send messages to other party members about reward
if (itemCount > 1)
{
final SystemMessage msg = spoil ? SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_OBTAINED_S3_S2_S_BY_USING_SWEEPER) : SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_OBTAINED_S3_S2);
final SystemMessage msg = spoil ? new SystemMessage(SystemMessageId.C1_HAS_OBTAINED_S3_S2_S_BY_USING_SWEEPER) : new SystemMessage(SystemMessageId.C1_HAS_OBTAINED_S3_S2);
msg.addString(looter.getName());
msg.addItemName(itemId);
msg.addLong(itemCount);
@@ -781,7 +781,7 @@ public class Party extends AbstractPlayerGroup
}
else
{
final SystemMessage msg = spoil ? SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_OBTAINED_S2_BY_USING_SWEEPER) : SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_OBTAINED_S2);
final SystemMessage msg = spoil ? new SystemMessage(SystemMessageId.C1_HAS_OBTAINED_S2_BY_USING_SWEEPER) : new SystemMessage(SystemMessageId.C1_HAS_OBTAINED_S2);
msg.addString(looter.getName());
msg.addItemName(itemId);
broadcastToPartyMembers(looter, msg);
@@ -1104,7 +1104,7 @@ public class Party extends AbstractPlayerGroup
broadcastToPartyMembers(getLeader(), new ExAskModifyPartyLooting(getLeader().getName(), partyDistributionType));
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.REQUESTING_APPROVAL_FOR_CHANGING_PARTY_LOOT_TO_S1);
final SystemMessage sm = new SystemMessage(SystemMessageId.REQUESTING_APPROVAL_FOR_CHANGING_PARTY_LOOT_TO_S1);
sm.addSystemString(partyDistributionType.getSysStringId());
getLeader().sendPacket(sm);
}
@@ -1149,14 +1149,14 @@ public class Party extends AbstractPlayerGroup
{
broadcastPacket(new ExSetPartyLooting(1, _changeRequestDistributionType));
_distributionType = _changeRequestDistributionType;
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.PARTY_LOOT_WAS_CHANGED_TO_S1);
final SystemMessage sm = new SystemMessage(SystemMessageId.PARTY_LOOT_WAS_CHANGED_TO_S1);
sm.addSystemString(_changeRequestDistributionType.getSysStringId());
broadcastPacket(sm);
}
else
{
broadcastPacket(new ExSetPartyLooting(0, _distributionType));
broadcastPacket(SystemMessage.getSystemMessage(SystemMessageId.PARTY_LOOT_CHANGE_WAS_CANCELLED));
broadcastPacket(new SystemMessage(SystemMessageId.PARTY_LOOT_CHANGE_WAS_CANCELLED));
}
_changeRequestDistributionType = null;
_changeDistributionTypeAnswers = null;
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/Petition.java
+2 -2
View File
@@ -76,14 +76,14 @@ public final class Petition
else
{
// Ending petition consultation with <Player>.
SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.PETITION_CONSULTATION_WITH_C1_HAS_ENDED);
SystemMessage sm = new SystemMessage(SystemMessageId.PETITION_CONSULTATION_WITH_C1_HAS_ENDED);
sm.addString(_petitioner.getName());
_responder.sendPacket(sm);
if (endState == PetitionState.PETITIONER_CANCEL)
{
// Receipt No. <ID> petition cancelled.
sm = SystemMessage.getSystemMessage(SystemMessageId.RECEIPT_NO_S1_PETITION_CANCELLED);
sm = new SystemMessage(SystemMessageId.RECEIPT_NO_S1_PETITION_CANCELLED);
sm.addInt(_id);
_responder.sendPacket(sm);
}
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/Request.java
+1 -1
View File
@@ -99,7 +99,7 @@ public class Request
}
if (partner.getRequest().isProcessingRequest())
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_ON_ANOTHER_TASK_PLEASE_TRY_AGAIN_LATER);
final SystemMessage sm = new SystemMessage(SystemMessageId.C1_IS_ON_ANOTHER_TASK_PLEASE_TRY_AGAIN_LATER);
sm.addString(partner.getName());
_player.sendPacket(sm);
return false;
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/TradeList.java
+8 -8
View File
@@ -821,23 +821,23 @@ public class TradeList
SystemMessage msg;
if (newItem.isStackable())
{
msg = SystemMessage.getSystemMessage(SystemMessageId.C1_PURCHASED_S3_S2_S);
msg = new SystemMessage(SystemMessageId.C1_PURCHASED_S3_S2_S);
msg.addString(player.getName());
msg.addItemName(newItem);
msg.addLong(item.getCount());
_owner.sendPacket(msg);
msg = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_PURCHASED_S3_S2_S_FROM_C1);
msg = new SystemMessage(SystemMessageId.YOU_HAVE_PURCHASED_S3_S2_S_FROM_C1);
msg.addString(_owner.getName());
msg.addItemName(newItem);
msg.addLong(item.getCount());
}
else
{
msg = SystemMessage.getSystemMessage(SystemMessageId.C1_PURCHASED_S2);
msg = new SystemMessage(SystemMessageId.C1_PURCHASED_S2);
msg.addString(player.getName());
msg.addItemName(newItem);
_owner.sendPacket(msg);
msg = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_PURCHASED_S2_FROM_C1);
msg = new SystemMessage(SystemMessageId.YOU_HAVE_PURCHASED_S2_FROM_C1);
msg.addString(_owner.getName());
msg.addItemName(newItem);
}
@@ -1001,23 +1001,23 @@ public class TradeList
SystemMessage msg;
if (newItem.isStackable())
{
msg = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_PURCHASED_S3_S2_S_FROM_C1);
msg = new SystemMessage(SystemMessageId.YOU_HAVE_PURCHASED_S3_S2_S_FROM_C1);
msg.addString(player.getName());
msg.addItemName(newItem);
msg.addLong(item.getCount());
_owner.sendPacket(msg);
msg = SystemMessage.getSystemMessage(SystemMessageId.C1_PURCHASED_S3_S2_S);
msg = new SystemMessage(SystemMessageId.C1_PURCHASED_S3_S2_S);
msg.addString(_owner.getName());
msg.addItemName(newItem);
msg.addLong(item.getCount());
}
else
{
msg = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_PURCHASED_S2_FROM_C1);
msg = new SystemMessage(SystemMessageId.YOU_HAVE_PURCHASED_S2_FROM_C1);
msg.addString(player.getName());
msg.addItemName(newItem);
_owner.sendPacket(msg);
msg = SystemMessage.getSystemMessage(SystemMessageId.C1_PURCHASED_S2);
msg = new SystemMessage(SystemMessageId.C1_PURCHASED_S2);
msg.addString(_owner.getName());
msg.addItemName(newItem);
}
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/Attackable.java
+4 -4
View File
@@ -389,7 +389,7 @@ public class Attackable extends Npc
if (_isRaid && !_isRaidMinion)
{
final PlayerInstance player = (maxDealer != null) && maxDealer.isOnline() ? maxDealer : lastAttacker.getActingPlayer();
broadcastPacket(SystemMessage.getSystemMessage(SystemMessageId.CONGRATULATIONS_YOUR_RAID_WAS_SUCCESSFUL));
broadcastPacket(new SystemMessage(SystemMessageId.CONGRATULATIONS_YOUR_RAID_WAS_SUCCESSFUL));
final int raidbossPoints = (int) (getTemplate().getRaidPoints() * Config.RATE_RAIDBOSS_POINTS);
final Party party = player.getParty();
@@ -406,7 +406,7 @@ public class Attackable extends Npc
{
final int points = Math.max(raidbossPoints / members.size(), 1);
p.increaseRaidbossPoints(points);
p.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_EARNED_S1_RAID_POINT_S).addInt(points));
p.sendPacket(new SystemMessage(SystemMessageId.YOU_HAVE_EARNED_S1_RAID_POINT_S).addInt(points));
if (p.getNobleLevel() > 0)
{
@@ -418,7 +418,7 @@ public class Attackable extends Npc
{
final int points = Math.max(raidbossPoints, 1);
player.increaseRaidbossPoints(points);
player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_EARNED_S1_RAID_POINT_S).addInt(points));
player.sendPacket(new SystemMessage(SystemMessageId.YOU_HAVE_EARNED_S1_RAID_POINT_S).addInt(points));
if (player.getNobleLevel() > 0)
{
Hero.getInstance().setRBkilled(player.getObjectId(), getId());
@@ -1049,7 +1049,7 @@ public class Attackable extends Npc
// Broadcast message if RaidBoss was defeated
if (_isRaid && !_isRaidMinion)
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_DIED_AND_DROPPED_S3_S2_S);
final SystemMessage sm = new SystemMessage(SystemMessageId.C1_DIED_AND_DROPPED_S3_S2_S);
sm.addString(getName());
sm.addItemName(item);
sm.addLong(drop.getCount());
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/Npc.java
+2 -2
View File
@@ -928,7 +928,7 @@ public class Npc extends Creature
final String msg = Config.ANNOUNCE_PK_MSG.replace("$killer", player.getName()).replace("$target", getName());
if (Config.ANNOUNCE_PK_PVP_NORMAL_MESSAGE)
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_3);
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_3);
sm.addString(msg);
Broadcast.toAllOnlinePlayers(sm);
}
@@ -960,7 +960,7 @@ public class Npc extends Creature
final String msg = Config.ANNOUNCE_PVP_MSG.replace("$killer", player.getName()).replace("$target", getName());
if (Config.ANNOUNCE_PK_PVP_NORMAL_MESSAGE)
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_3);
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_3);
sm.addString(msg);
Broadcast.toAllOnlinePlayers(sm);
}
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/Summon.java
+3 -3
View File
@@ -765,11 +765,11 @@ public abstract class Summon extends Playable
if ((target.isHpBlocked() && !target.isNpc()) || (target.isPlayer() && target.isAffected(EffectFlag.DUELIST_FURY) && !_owner.isAffected(EffectFlag.FACEOFF)))
{
sm = SystemMessage.getSystemMessage(SystemMessageId.THE_ATTACK_HAS_BEEN_BLOCKED);
sm = new SystemMessage(SystemMessageId.THE_ATTACK_HAS_BEEN_BLOCKED);
}
else
{
sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_INFLICTED_S3_DAMAGE_ON_C2);
sm = new SystemMessage(SystemMessageId.C1_HAS_INFLICTED_S3_DAMAGE_ON_C2);
sm.addNpcName(this);
sm.addString(target.getName());
sm.addInt(damage);
@@ -787,7 +787,7 @@ public abstract class Summon extends Playable
if (!isDead() && !isHpBlocked() && (_owner != null) && (attacker != null) && (!_owner.isAffected(EffectFlag.DUELIST_FURY) || attacker.isAffected(EffectFlag.FACEOFF)))
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_RECEIVED_S3_DAMAGE_FROM_C2);
final SystemMessage sm = new SystemMessage(SystemMessageId.C1_HAS_RECEIVED_S3_DAMAGE_FROM_C2);
sm.addNpcName(this);
sm.addString(attacker.getName());
sm.addInt((int) damage);
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/ControllableAirShipInstance.java
+2 -2
View File
@@ -218,11 +218,11 @@ public class ControllableAirShipInstance extends AirShipInstance
if ((_fuel == 0) && (old > 0))
{
broadcastToPassengers(SystemMessage.getSystemMessage(SystemMessageId.THE_AIRSHIP_S_FUEL_EP_HAS_RUN_OUT_THE_AIRSHIP_S_SPEED_WILL_BE_GREATLY_DECREASED_IN_THIS_CONDITION));
broadcastToPassengers(new SystemMessage(SystemMessageId.THE_AIRSHIP_S_FUEL_EP_HAS_RUN_OUT_THE_AIRSHIP_S_SPEED_WILL_BE_GREATLY_DECREASED_IN_THIS_CONDITION));
}
else if (_fuel < LOW_FUEL)
{
broadcastToPassengers(SystemMessage.getSystemMessage(SystemMessageId.THE_AIRSHIP_S_FUEL_EP_WILL_SOON_RUN_OUT));
broadcastToPassengers(new SystemMessage(SystemMessageId.THE_AIRSHIP_S_FUEL_EP_WILL_SOON_RUN_OUT));
}
}
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/DoorInstance.java
+1 -1
View File
@@ -580,7 +580,7 @@ public final class DoorInstance extends Creature
if (isFort || isCastle)
{
broadcastPacket(SystemMessage.getSystemMessage(SystemMessageId.THE_CASTLE_GATE_HAS_BEEN_DESTROYED));
broadcastPacket(new SystemMessage(SystemMessageId.THE_CASTLE_GATE_HAS_BEEN_DESTROYED));
}
else
{
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/DoppelgangerInstance.java
+3 -3
View File
@@ -147,11 +147,11 @@ public class DoppelgangerInstance extends Npc
if ((target.isHpBlocked() && !target.isNpc()) || (target.isPlayer() && target.isAffected(EffectFlag.DUELIST_FURY) && !getActingPlayer().isAffected(EffectFlag.FACEOFF)))
{
sm = SystemMessage.getSystemMessage(SystemMessageId.THE_ATTACK_HAS_BEEN_BLOCKED);
sm = new SystemMessage(SystemMessageId.THE_ATTACK_HAS_BEEN_BLOCKED);
}
else
{
sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_INFLICTED_S3_DAMAGE_ON_C2);
sm = new SystemMessage(SystemMessageId.C1_HAS_INFLICTED_S3_DAMAGE_ON_C2);
sm.addNpcName(this);
sm.addString(target.getName());
sm.addInt(damage);
@@ -169,7 +169,7 @@ public class DoppelgangerInstance extends Npc
if ((getSummoner() != null) && getSummoner().isPlayer() && (attacker != null) && !isDead() && !isHpBlocked())
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_RECEIVED_S3_DAMAGE_FROM_C2);
final SystemMessage sm = new SystemMessage(SystemMessageId.C1_HAS_RECEIVED_S3_DAMAGE_FROM_C2);
sm.addNpcName(this);
sm.addString(attacker.getName());
sm.addInt((int) damage);
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/FishermanInstance.java
+1 -1
View File
@@ -74,7 +74,7 @@ public final class FishermanInstance extends MerchantInstance
final int minlLevel = SkillTreesData.getInstance().getMinLevelForNewSkill(player, SkillTreesData.getInstance().getFishingSkillTree());
if (minlLevel > 0)
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_DO_NOT_HAVE_ANY_FURTHER_SKILLS_TO_LEARN_COME_BACK_WHEN_YOU_HAVE_REACHED_LEVEL_S1);
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_DO_NOT_HAVE_ANY_FURTHER_SKILLS_TO_LEARN_COME_BACK_WHEN_YOU_HAVE_REACHED_LEVEL_S1);
sm.addInt(minlLevel);
player.sendPacket(sm);
}
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/NpcInstance.java
+3 -3
View File
@@ -70,7 +70,7 @@ public class NpcInstance extends Npc
final int minLevel = SkillTreesData.getInstance().getMinLevelForNewSkill(player, SkillTreesData.getInstance().getCollectSkillTree());
if (minLevel > 0)
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_DO_NOT_HAVE_ANY_FURTHER_SKILLS_TO_LEARN_COME_BACK_WHEN_YOU_HAVE_REACHED_LEVEL_S1);
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_DO_NOT_HAVE_ANY_FURTHER_SKILLS_TO_LEARN_COME_BACK_WHEN_YOU_HAVE_REACHED_LEVEL_S1);
sm.addInt(minLevel);
player.sendPacket(sm);
}
@@ -94,13 +94,13 @@ public class NpcInstance extends Npc
final int minLevel = SkillTreesData.getInstance().getMinLevelForNewSkill(player, skillTree);
if (minLevel > 0)
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_DO_NOT_HAVE_ANY_FURTHER_SKILLS_TO_LEARN_COME_BACK_WHEN_YOU_HAVE_REACHED_LEVEL_S1);
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_DO_NOT_HAVE_ANY_FURTHER_SKILLS_TO_LEARN_COME_BACK_WHEN_YOU_HAVE_REACHED_LEVEL_S1);
sm.addInt(minLevel);
player.sendPacket(sm);
}
else if (player.getClassId().level() == 1)
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THERE_ARE_NO_OTHER_SKILLS_TO_LEARN_PLEASE_COME_BACK_AFTER_S1ND_CLASS_CHANGE);
final SystemMessage sm = new SystemMessage(SystemMessageId.THERE_ARE_NO_OTHER_SKILLS_TO_LEARN_PLEASE_COME_BACK_AFTER_S1ND_CLASS_CHANGE);
sm.addInt(2);
player.sendPacket(sm);
}
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java
+15 -15
View File
@@ -186,7 +186,7 @@ public class PetInstance extends Summon
final IItemHandler handler = ItemHandler.getInstance().getHandler(food.getEtcItem());
if (handler != null)
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOUR_PET_WAS_HUNGRY_SO_IT_ATE_S1);
final SystemMessage sm = new SystemMessage(SystemMessageId.YOUR_PET_WAS_HUNGRY_SO_IT_ATE_S1);
sm.addItemName(food.getId());
sendPacket(sm);
handler.useItem(PetInstance.this, food, false);
@@ -408,14 +408,14 @@ public class PetInstance extends Summon
{
if (count > 1)
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S2_S1_S_DISAPPEARED);
final SystemMessage sm = new SystemMessage(SystemMessageId.S2_S1_S_DISAPPEARED);
sm.addItemName(item.getId());
sm.addLong(count);
sendPacket(sm);
}
else
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_DISAPPEARED);
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_DISAPPEARED);
sm.addItemName(item.getId());
sendPacket(sm);
}
@@ -455,14 +455,14 @@ public class PetInstance extends Summon
{
if (count > 1)
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S2_S1_S_DISAPPEARED);
final SystemMessage sm = new SystemMessage(SystemMessageId.S2_S1_S_DISAPPEARED);
sm.addItemName(item.getId());
sm.addLong(count);
sendPacket(sm);
}
else
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_DISAPPEARED);
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_DISAPPEARED);
sm.addItemName(item.getId());
sendPacket(sm);
}
@@ -496,7 +496,7 @@ public class PetInstance extends Summon
// Cursed weapons
if (CursedWeaponsManager.getInstance().isCursed(target.getId()))
{
final SystemMessage smsg = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_FAILED_TO_PICK_UP_S1);
final SystemMessage smsg = new SystemMessage(SystemMessageId.YOU_HAVE_FAILED_TO_PICK_UP_S1);
smsg.addItemName(target.getId());
sendPacket(smsg);
return;
@@ -520,7 +520,7 @@ public class PetInstance extends Summon
if (!target.getDropProtection().tryPickUp(this))
{
sendPacket(ActionFailed.STATIC_PACKET);
smsg = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_FAILED_TO_PICK_UP_S1);
smsg = new SystemMessage(SystemMessageId.YOU_HAVE_FAILED_TO_PICK_UP_S1);
smsg.addItemName(target);
sendPacket(smsg);
return;
@@ -537,18 +537,18 @@ public class PetInstance extends Summon
{
if (target.getId() == Inventory.ADENA_ID)
{
smsg = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_FAILED_TO_PICK_UP_S1_ADENA);
smsg = new SystemMessage(SystemMessageId.YOU_HAVE_FAILED_TO_PICK_UP_S1_ADENA);
smsg.addLong(target.getCount());
}
else if (target.getCount() > 1)
{
smsg = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_FAILED_TO_PICK_UP_S2_S1_S);
smsg = new SystemMessage(SystemMessageId.YOU_HAVE_FAILED_TO_PICK_UP_S2_S1_S);
smsg.addItemName(target);
smsg.addLong(target.getCount());
}
else
{
smsg = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_FAILED_TO_PICK_UP_S1);
smsg = new SystemMessage(SystemMessageId.YOU_HAVE_FAILED_TO_PICK_UP_S1);
smsg.addItemName(target);
}
sendPacket(ActionFailed.STATIC_PACKET);
@@ -590,27 +590,27 @@ public class PetInstance extends Summon
{
if (target.getId() == Inventory.ADENA_ID)
{
smsg = SystemMessage.getSystemMessage(SystemMessageId.YOUR_PET_PICKED_UP_S1_ADENA);
smsg = new SystemMessage(SystemMessageId.YOUR_PET_PICKED_UP_S1_ADENA);
smsg.addLong(target.getCount());
sendPacket(smsg);
}
else if (target.getEnchantLevel() > 0)
{
smsg = SystemMessage.getSystemMessage(SystemMessageId.YOUR_PET_PICKED_UP_S1_S2);
smsg = new SystemMessage(SystemMessageId.YOUR_PET_PICKED_UP_S1_S2);
smsg.addInt(target.getEnchantLevel());
smsg.addItemName(target);
sendPacket(smsg);
}
else if (target.getCount() > 1)
{
smsg = SystemMessage.getSystemMessage(SystemMessageId.YOUR_PET_PICKED_UP_S2_S1_S);
smsg = new SystemMessage(SystemMessageId.YOUR_PET_PICKED_UP_S2_S1_S);
smsg.addLong(target.getCount());
smsg.addItemName(target);
sendPacket(smsg);
}
else
{
smsg = SystemMessage.getSystemMessage(SystemMessageId.YOUR_PET_PICKED_UP_S1);
smsg = new SystemMessage(SystemMessageId.YOUR_PET_PICKED_UP_S1);
smsg.addItemName(target);
sendPacket(smsg);
}
@@ -757,7 +757,7 @@ public class PetInstance extends Summon
removedItem = owner.getInventory().destroyItem("PetDestroy", _controlObjectId, 1, getOwner(), this);
if (removedItem != null)
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_DISAPPEARED);
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_DISAPPEARED);
sm.addItemName(removedItem);
owner.sendPacket(sm);
}
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+73 -73
View File
@@ -2008,7 +2008,7 @@ public final class PlayerInstance extends Playable
super.setReputation(reputation);
sendPacket(SystemMessage.getSystemMessage(SystemMessageId.YOUR_REPUTATION_HAS_BEEN_CHANGED_TO_S1).addInt(getReputation()));
sendPacket(new SystemMessage(SystemMessageId.YOUR_REPUTATION_HAS_BEEN_CHANGED_TO_S1).addInt(getReputation()));
broadcastReputation();
}
@@ -2180,13 +2180,13 @@ public final class PlayerInstance extends Playable
{
if (item.getEnchantLevel() > 0)
{
sm = SystemMessage.getSystemMessage(SystemMessageId.THE_EQUIPMENT_S1_S2_HAS_BEEN_REMOVED);
sm = new SystemMessage(SystemMessageId.THE_EQUIPMENT_S1_S2_HAS_BEEN_REMOVED);
sm.addInt(item.getEnchantLevel());
sm.addItemName(item);
}
else
{
sm = SystemMessage.getSystemMessage(SystemMessageId.S1_HAS_BEEN_UNEQUIPPED);
sm = new SystemMessage(SystemMessageId.S1_HAS_BEEN_UNEQUIPPED);
sm.addItemName(item);
}
sendPacket(sm);
@@ -2210,13 +2210,13 @@ public final class PlayerInstance extends Playable
{
if (item.getEnchantLevel() > 0)
{
sm = SystemMessage.getSystemMessage(SystemMessageId.EQUIPPED_S1_S2);
sm = new SystemMessage(SystemMessageId.EQUIPPED_S1_S2);
sm.addInt(item.getEnchantLevel());
sm.addItemName(item);
}
else
{
sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_EQUIPPED_YOUR_S1);
sm = new SystemMessage(SystemMessageId.YOU_HAVE_EQUIPPED_YOUR_S1);
sm.addItemName(item);
}
sendPacket(sm);
@@ -2356,7 +2356,7 @@ public final class PlayerInstance extends Playable
}
setLvlJoinedAcademy(0);
// oust pledge member from the academy, cuz he has finished his 2nd class transfer
final SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.CLAN_MEMBER_S1_HAS_BEEN_EXPELLED);
final SystemMessage msg = new SystemMessage(SystemMessageId.CLAN_MEMBER_S1_HAS_BEEN_EXPELLED);
msg.addPcName(this);
_clan.broadcastToOnlineMembers(msg);
_clan.broadcastToOnlineMembers(new PledgeShowMemberListDelete(getName()));
@@ -2991,7 +2991,7 @@ public final class PlayerInstance extends Playable
{
if (sendMessage)
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_EARNED_S1_ADENA);
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_EARNED_S1_ADENA);
sm.addLong(count);
sendPacket(sm);
}
@@ -3055,7 +3055,7 @@ public final class PlayerInstance extends Playable
if (sendMessage)
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_ADENA_DISAPPEARED);
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_ADENA_DISAPPEARED);
sm.addLong(count);
sendPacket(sm);
}
@@ -3107,14 +3107,14 @@ public final class PlayerInstance extends Playable
{
if (count > 1)
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S2_S1_S_DISAPPEARED);
final SystemMessage sm = new SystemMessage(SystemMessageId.S2_S1_S_DISAPPEARED);
sm.addItemName(Inventory.BEAUTY_TICKET_ID);
sm.addLong(count);
sendPacket(sm);
}
else
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_DISAPPEARED);
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_DISAPPEARED);
sm.addItemName(Inventory.BEAUTY_TICKET_ID);
sendPacket(sm);
}
@@ -3135,7 +3135,7 @@ public final class PlayerInstance extends Playable
{
if (sendMessage)
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_EARNED_S2_S1_S);
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_EARNED_S2_S1_S);
sm.addItemName(Inventory.ANCIENT_ADENA_ID);
sm.addLong(count);
sendPacket(sm);
@@ -3201,14 +3201,14 @@ public final class PlayerInstance extends Playable
{
if (count > 1)
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S2_S1_S_DISAPPEARED);
final SystemMessage sm = new SystemMessage(SystemMessageId.S2_S1_S_DISAPPEARED);
sm.addItemName(Inventory.ANCIENT_ADENA_ID);
sm.addLong(count);
sendPacket(sm);
}
else
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_DISAPPEARED);
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_DISAPPEARED);
sm.addItemName(Inventory.ANCIENT_ADENA_ID);
sendPacket(sm);
}
@@ -3234,21 +3234,21 @@ public final class PlayerInstance extends Playable
{
if (item.getCount() > 1)
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_OBTAINED_S2_S1);
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_OBTAINED_S2_S1);
sm.addItemName(item);
sm.addLong(item.getCount());
sendPacket(sm);
}
else if (item.getEnchantLevel() > 0)
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_OBTAINED_A_S1_S2);
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_OBTAINED_A_S1_S2);
sm.addInt(item.getEnchantLevel());
sm.addItemName(item);
sendPacket(sm);
}
else
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_OBTAINED_S1);
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_OBTAINED_S1);
sm.addItemName(item);
sendPacket(sm);
}
@@ -3273,7 +3273,7 @@ public final class PlayerInstance extends Playable
if (FortSiegeManager.getInstance().activateCombatFlag(this, item))
{
final Fort fort = FortManager.getInstance().getFort(this);
fort.getSiege().announceToPlayer(SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_ACQUIRED_THE_FLAG), getName());
fort.getSiege().announceToPlayer(new SystemMessage(SystemMessageId.C1_HAS_ACQUIRED_THE_FLAG), getName());
}
}
}
@@ -3305,14 +3305,14 @@ public final class PlayerInstance extends Playable
{
if (process.equalsIgnoreCase("Sweeper") || process.equalsIgnoreCase("Quest"))
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_EARNED_S2_S1_S);
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_EARNED_S2_S1_S);
sm.addItemName(itemId);
sm.addLong(count);
sendPacket(sm);
}
else
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_OBTAINED_S2_S1);
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_OBTAINED_S2_S1);
sm.addItemName(itemId);
sm.addLong(count);
sendPacket(sm);
@@ -3320,13 +3320,13 @@ public final class PlayerInstance extends Playable
}
else if (process.equalsIgnoreCase("Sweeper") || process.equalsIgnoreCase("Quest"))
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_EARNED_S1);
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_EARNED_S1);
sm.addItemName(itemId);
sendPacket(sm);
}
else
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_OBTAINED_S1);
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_OBTAINED_S1);
sm.addItemName(itemId);
sendPacket(sm);
}
@@ -3428,14 +3428,14 @@ public final class PlayerInstance extends Playable
{
if (count > 1)
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S2_S1_S_DISAPPEARED);
final SystemMessage sm = new SystemMessage(SystemMessageId.S2_S1_S_DISAPPEARED);
sm.addItemName(item);
sm.addLong(count);
sendPacket(sm);
}
else
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_DISAPPEARED);
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_DISAPPEARED);
sm.addItemName(item);
sendPacket(sm);
}
@@ -3542,14 +3542,14 @@ public final class PlayerInstance extends Playable
{
if (count > 1)
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S2_S1_S_DISAPPEARED);
final SystemMessage sm = new SystemMessage(SystemMessageId.S2_S1_S_DISAPPEARED);
sm.addItemName(itemId);
sm.addLong(count);
sendPacket(sm);
}
else
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_DISAPPEARED);
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_DISAPPEARED);
sm.addItemName(itemId);
sendPacket(sm);
}
@@ -3756,7 +3756,7 @@ public final class PlayerInstance extends Playable
// Sends message to client if requested
if (sendMessage)
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_DROPPED_S1);
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_DROPPED_S1);
sm.addItemName(item);
sendPacket(sm);
}
@@ -3843,7 +3843,7 @@ public final class PlayerInstance extends Playable
// Sends message to client if requested
if (sendMessage)
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_DROPPED_S1);
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_DROPPED_S1);
sm.addItemName(item);
sendPacket(sm);
}
@@ -4287,7 +4287,7 @@ public final class PlayerInstance extends Playable
@Override
public void sendPacket(SystemMessageId id)
{
sendPacket(SystemMessage.getSystemMessage(id));
sendPacket(new SystemMessage(id));
}
/**
@@ -4426,7 +4426,7 @@ public final class PlayerInstance extends Playable
if (!target.getDropProtection().tryPickUp(this))
{
sendPacket(ActionFailed.STATIC_PACKET);
smsg = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_FAILED_TO_PICK_UP_S1);
smsg = new SystemMessage(SystemMessageId.YOU_HAVE_FAILED_TO_PICK_UP_S1);
smsg.addItemName(target);
sendPacket(smsg);
return;
@@ -4442,7 +4442,7 @@ public final class PlayerInstance extends Playable
if (isInvul() && !canOverrideCond(PlayerCondOverride.ITEM_CONDITIONS))
{
sendPacket(ActionFailed.STATIC_PACKET);
smsg = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_FAILED_TO_PICK_UP_S1);
smsg = new SystemMessage(SystemMessageId.YOU_HAVE_FAILED_TO_PICK_UP_S1);
smsg.addItemName(target);
sendPacket(smsg);
return;
@@ -4452,18 +4452,18 @@ public final class PlayerInstance extends Playable
{
if (target.getId() == Inventory.ADENA_ID)
{
smsg = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_FAILED_TO_PICK_UP_S1_ADENA);
smsg = new SystemMessage(SystemMessageId.YOU_HAVE_FAILED_TO_PICK_UP_S1_ADENA);
smsg.addLong(target.getCount());
}
else if (target.getCount() > 1)
{
smsg = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_FAILED_TO_PICK_UP_S2_S1_S);
smsg = new SystemMessage(SystemMessageId.YOU_HAVE_FAILED_TO_PICK_UP_S2_S1_S);
smsg.addItemName(target);
smsg.addLong(target.getCount());
}
else
{
smsg = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_FAILED_TO_PICK_UP_S1);
smsg = new SystemMessage(SystemMessageId.YOU_HAVE_FAILED_TO_PICK_UP_S1);
smsg.addItemName(target);
}
sendPacket(ActionFailed.STATIC_PACKET);
@@ -4523,7 +4523,7 @@ public final class PlayerInstance extends Playable
{
if (target.getEnchantLevel() > 0)
{
smsg = SystemMessage.getSystemMessage(SystemMessageId.ATTENTION_C1_HAS_PICKED_UP_S2_S3);
smsg = new SystemMessage(SystemMessageId.ATTENTION_C1_HAS_PICKED_UP_S2_S3);
smsg.addPcName(this);
smsg.addInt(target.getEnchantLevel());
smsg.addItemName(target.getId());
@@ -4531,7 +4531,7 @@ public final class PlayerInstance extends Playable
}
else
{
smsg = SystemMessage.getSystemMessage(SystemMessageId.ATTENTION_C1_HAS_PICKED_UP_S2);
smsg = new SystemMessage(SystemMessageId.ATTENTION_C1_HAS_PICKED_UP_S2);
smsg.addPcName(this);
smsg.addItemName(target.getId());
broadcastPacket(smsg, 1400);
@@ -4595,7 +4595,7 @@ public final class PlayerInstance extends Playable
{
if (Util.checkIfInRange(creature.getMinShopDistance(), this, creature, true))
{
sendPacket(SystemMessage.getSystemMessage(SystemMessageId.YOU_CANNOT_OPEN_A_PRIVATE_STORE_HERE));
sendPacket(new SystemMessage(SystemMessageId.YOU_CANNOT_OPEN_A_PRIVATE_STORE_HERE));
return false;
}
}
@@ -4943,7 +4943,7 @@ public final class PlayerInstance extends Playable
msg = Config.ANNOUNCE_PK_MSG.replace("$killer", killer.getName()).replace("$target", getName());
if (Config.ANNOUNCE_PK_PVP_NORMAL_MESSAGE)
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_3);
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_3);
sm.addString(msg);
Broadcast.toAllOnlinePlayers(sm);
}
@@ -4957,7 +4957,7 @@ public final class PlayerInstance extends Playable
msg = Config.ANNOUNCE_PVP_MSG.replace("$killer", killer.getName()).replace("$target", getName());
if (Config.ANNOUNCE_PK_PVP_NORMAL_MESSAGE)
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_3);
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_3);
sm.addString(msg);
Broadcast.toAllOnlinePlayers(sm);
}
@@ -5660,7 +5660,7 @@ public final class PlayerInstance extends Playable
_activeTradeList = new TradeList(this);
_activeTradeList.setPartner(partner);
final SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.YOU_BEGIN_TRADING_WITH_C1);
final SystemMessage msg = new SystemMessage(SystemMessageId.YOU_BEGIN_TRADING_WITH_C1);
msg.addPcName(partner);
sendPacket(msg);
sendPacket(new TradeStart(this));
@@ -5668,7 +5668,7 @@ public final class PlayerInstance extends Playable
public void onTradeConfirm(PlayerInstance partner)
{
final SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_CONFIRMED_THE_TRADE);
final SystemMessage msg = new SystemMessage(SystemMessageId.C1_HAS_CONFIRMED_THE_TRADE);
msg.addPcName(partner);
sendPacket(msg);
sendPacket(TradeOtherDone.STATIC_PACKET);
@@ -5685,7 +5685,7 @@ public final class PlayerInstance extends Playable
_activeTradeList = null;
sendPacket(new TradeDone(0));
final SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_CANCELLED_THE_TRADE);
final SystemMessage msg = new SystemMessage(SystemMessageId.C1_HAS_CANCELLED_THE_TRADE);
msg.addPcName(partner);
sendPacket(msg);
}
@@ -5958,13 +5958,13 @@ public final class PlayerInstance extends Playable
final SystemMessage sm;
if (unequiped[0].getEnchantLevel() > 0)
{
sm = SystemMessage.getSystemMessage(SystemMessageId.THE_EQUIPMENT_S1_S2_HAS_BEEN_REMOVED);
sm = new SystemMessage(SystemMessageId.THE_EQUIPMENT_S1_S2_HAS_BEEN_REMOVED);
sm.addInt(unequiped[0].getEnchantLevel());
sm.addItemName(unequiped[0]);
}
else
{
sm = SystemMessage.getSystemMessage(SystemMessageId.S1_HAS_BEEN_UNEQUIPPED);
sm = new SystemMessage(SystemMessageId.S1_HAS_BEEN_UNEQUIPPED);
sm.addItemName(unequiped[0]);
}
sendPacket(sm);
@@ -5998,13 +5998,13 @@ public final class PlayerInstance extends Playable
SystemMessage sm = null;
if (unequiped[0].getEnchantLevel() > 0)
{
sm = SystemMessage.getSystemMessage(SystemMessageId.THE_EQUIPMENT_S1_S2_HAS_BEEN_REMOVED);
sm = new SystemMessage(SystemMessageId.THE_EQUIPMENT_S1_S2_HAS_BEEN_REMOVED);
sm.addInt(unequiped[0].getEnchantLevel());
sm.addItemName(unequiped[0]);
}
else
{
sm = SystemMessage.getSystemMessage(SystemMessageId.S1_HAS_BEEN_UNEQUIPPED);
sm = new SystemMessage(SystemMessageId.S1_HAS_BEEN_UNEQUIPPED);
sm.addItemName(unequiped[0]);
}
sendPacket(sm);
@@ -7959,7 +7959,7 @@ public final class PlayerInstance extends Playable
if (henna.getCancelCount() > 0)
{
_inventory.addItem("Henna", henna.getDyeItemId(), henna.getCancelCount(), this, null);
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_EARNED_S2_S1_S);
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_EARNED_S2_S1_S);
sm.addItemName(henna.getDyeItemId());
sm.addLong(henna.getCancelCount());
sendPacket(sm);
@@ -8471,20 +8471,20 @@ public final class PlayerInstance extends Playable
final int seconds = (remainingTime % 60);
if (hours > 0)
{
sm = SystemMessage.getSystemMessage(SystemMessageId.THERE_ARE_S2_HOUR_S_S3_MINUTE_S_AND_S4_SECOND_S_REMAINING_IN_S1_S_RE_USE_TIME);
sm = new SystemMessage(SystemMessageId.THERE_ARE_S2_HOUR_S_S3_MINUTE_S_AND_S4_SECOND_S_REMAINING_IN_S1_S_RE_USE_TIME);
sm.addSkillName(skill);
sm.addInt(hours);
sm.addInt(minutes);
}
else if (minutes > 0)
{
sm = SystemMessage.getSystemMessage(SystemMessageId.THERE_ARE_S2_MINUTE_S_S3_SECOND_S_REMAINING_IN_S1_S_RE_USE_TIME);
sm = new SystemMessage(SystemMessageId.THERE_ARE_S2_MINUTE_S_S3_SECOND_S_REMAINING_IN_S1_S_RE_USE_TIME);
sm.addSkillName(skill);
sm.addInt(minutes);
}
else
{
sm = SystemMessage.getSystemMessage(SystemMessageId.THERE_ARE_S2_SECOND_S_REMAINING_IN_S1_S_RE_USE_TIME);
sm = new SystemMessage(SystemMessageId.THERE_ARE_S2_SECOND_S_REMAINING_IN_S1_S_RE_USE_TIME);
sm.addSkillName(skill);
}
@@ -8492,7 +8492,7 @@ public final class PlayerInstance extends Playable
}
else
{
sm = SystemMessage.getSystemMessage(SystemMessageId.S1_IS_NOT_AVAILABLE_AT_THIS_TIME_BEING_PREPARED_FOR_REUSE);
sm = new SystemMessage(SystemMessageId.S1_IS_NOT_AVAILABLE_AT_THIS_TIME_BEING_PREPARED_FOR_REUSE);
sm.addSkillName(skill);
}
@@ -8906,7 +8906,7 @@ public final class PlayerInstance extends Playable
removeAutoSoulShot(itemId);
sendPacket(new ExAutoSoulShot(itemId, false, 0));
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_AUTOMATIC_USE_OF_S1_HAS_BEEN_DEACTIVATED);
final SystemMessage sm = new SystemMessage(SystemMessageId.THE_AUTOMATIC_USE_OF_S1_HAS_BEEN_DEACTIVATED);
sm.addItemName(itemId);
sendPacket(sm);
return true;
@@ -8922,7 +8922,7 @@ public final class PlayerInstance extends Playable
for (int itemId : _activeSoulShots)
{
sendPacket(new ExAutoSoulShot(itemId, false, 0));
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_AUTOMATIC_USE_OF_S1_HAS_BEEN_DEACTIVATED);
final SystemMessage sm = new SystemMessage(SystemMessageId.THE_AUTOMATIC_USE_OF_S1_HAS_BEEN_DEACTIVATED);
sm.addItemName(itemId);
sendPacket(sm);
}
@@ -9050,7 +9050,7 @@ public final class PlayerInstance extends Playable
@Override
public void sendMessage(String message)
{
sendPacket(SystemMessage.sendString(message));
sendPacket(new SystemMessage(message));
}
public void setObserving(boolean state)
@@ -9424,7 +9424,7 @@ public final class PlayerInstance extends Playable
*/
public SystemMessage getNoDuelReason()
{
final SystemMessage sm = SystemMessage.getSystemMessage(_noDuelReason);
final SystemMessage sm = new SystemMessage(_noDuelReason);
sm.addPcName(this);
_noDuelReason = SystemMessageId.THERE_IS_NO_OPPONENT_TO_RECEIVE_YOUR_CHALLENGE_FOR_A_DUEL;
return sm;
@@ -10284,9 +10284,9 @@ public final class PlayerInstance extends Playable
final long restoreExp = Math.round(((_expBeforeDeath - getExp()) * _revivePower) / 100);
final ConfirmDlg dlg = new ConfirmDlg(SystemMessageId.C1_IS_ATTEMPTING_TO_DO_A_RESURRECTION_THAT_RESTORES_S2_S3_XP_ACCEPT.getId());
dlg.addPcName(reviver);
dlg.addLong(restoreExp);
dlg.addInt(power);
dlg.getSystemMessage().addPcName(reviver);
dlg.getSystemMessage().addLong(restoreExp);
dlg.getSystemMessage().addInt(power);
sendPacket(dlg);
}
}
@@ -11430,7 +11430,7 @@ public final class PlayerInstance extends Playable
public void increaseSouls(int count)
{
_souls += count;
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOUR_SOUL_COUNT_HAS_INCREASED_BY_S1_IT_IS_NOW_AT_S2);
final SystemMessage sm = new SystemMessage(SystemMessageId.YOUR_SOUL_COUNT_HAS_INCREASED_BY_S1_IT_IS_NOW_AT_S2);
sm.addInt(count);
sm.addInt(_souls);
sendPacket(sm);
@@ -11556,7 +11556,7 @@ public final class PlayerInstance extends Playable
if (skill != null)
{
skill.applyEffects(this, this);
sendPacket(SystemMessage.getSystemMessage(SystemMessageId.YOU_VE_BEEN_AFFLICTED_BY_SHILEN_S_BREATH_LEVEL_S1).addInt(nextLv));
sendPacket(new SystemMessage(SystemMessageId.YOU_VE_BEEN_AFFLICTED_BY_SHILEN_S_BREATH_LEVEL_S1).addInt(nextLv));
}
}
@@ -11567,7 +11567,7 @@ public final class PlayerInstance extends Playable
{
final Skill skill = SkillData.getInstance().getSkill(CommonSkill.SHILENS_BREATH.getId(), nextLv);
skill.applyEffects(this, this);
sendPacket(SystemMessage.getSystemMessage(SystemMessageId.YOU_VE_BEEN_AFFLICTED_BY_SHILEN_S_BREATH_LEVEL_S1).addInt(nextLv));
sendPacket(new SystemMessage(SystemMessageId.YOU_VE_BEEN_AFFLICTED_BY_SHILEN_S_BREATH_LEVEL_S1).addInt(nextLv));
}
else
{
@@ -11581,7 +11581,7 @@ public final class PlayerInstance extends Playable
{
final Skill skill = SkillData.getInstance().getSkill(CommonSkill.SHILENS_BREATH.getId(), level);
skill.applyEffects(this, this);
sendPacket(SystemMessage.getSystemMessage(SystemMessageId.YOU_VE_BEEN_AFFLICTED_BY_SHILEN_S_BREATH_LEVEL_S1).addInt(level));
sendPacket(new SystemMessage(SystemMessageId.YOU_VE_BEEN_AFFLICTED_BY_SHILEN_S_BREATH_LEVEL_S1).addInt(level));
}
}
@@ -11601,12 +11601,12 @@ public final class PlayerInstance extends Playable
{
if (target.isPlayer())
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_EVADED_C2_S_ATTACK);
final SystemMessage sm = new SystemMessage(SystemMessageId.C1_HAS_EVADED_C2_S_ATTACK);
sm.addPcName(target.getActingPlayer());
sm.addString(getName());
target.sendPacket(sm);
}
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_S_ATTACK_WENT_ASTRAY);
final SystemMessage sm = new SystemMessage(SystemMessageId.C1_S_ATTACK_WENT_ASTRAY);
sm.addPcName(this);
sendPacket(sm);
}
@@ -11622,7 +11622,7 @@ public final class PlayerInstance extends Playable
{
if ((skill == null) || !skill.isMagic())
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_LANDED_A_CRITICAL_HIT);
final SystemMessage sm = new SystemMessage(SystemMessageId.C1_LANDED_A_CRITICAL_HIT);
sm.addPcName(this);
sendPacket(sm);
}
@@ -11646,16 +11646,16 @@ public final class PlayerInstance extends Playable
if ((target.isHpBlocked() && !target.isNpc()) || (target.isPlayer() && target.isAffected(EffectFlag.DUELIST_FURY) && !isAffected(EffectFlag.FACEOFF)))
{
sm = SystemMessage.getSystemMessage(SystemMessageId.THE_ATTACK_HAS_BEEN_BLOCKED);
sm = new SystemMessage(SystemMessageId.THE_ATTACK_HAS_BEEN_BLOCKED);
}
else if (target.isDoor() || (target instanceof ControlTowerInstance))
{
sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_HIT_FOR_S1_DAMAGE);
sm = new SystemMessage(SystemMessageId.YOU_HIT_FOR_S1_DAMAGE);
sm.addInt(damage);
}
else if (this != target)
{
sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_INFLICTED_S3_DAMAGE_ON_C2);
sm = new SystemMessage(SystemMessageId.C1_HAS_INFLICTED_S3_DAMAGE_ON_C2);
sm.addPcName(this);
sm.addString(target.getName());
sm.addInt(damage);
@@ -11721,13 +11721,13 @@ public final class PlayerInstance extends Playable
if (equippedItem.getEnchantLevel() > 0)
{
sm = SystemMessage.getSystemMessage(SystemMessageId.THE_EQUIPMENT_S1_S2_HAS_BEEN_REMOVED);
sm = new SystemMessage(SystemMessageId.THE_EQUIPMENT_S1_S2_HAS_BEEN_REMOVED);
sm.addInt(equippedItem.getEnchantLevel());
sm.addItemName(equippedItem);
}
else
{
sm = SystemMessage.getSystemMessage(SystemMessageId.S1_HAS_BEEN_UNEQUIPPED);
sm = new SystemMessage(SystemMessageId.S1_HAS_BEEN_UNEQUIPPED);
sm.addItemName(equippedItem);
}
sendPacket(sm);
@@ -12122,7 +12122,7 @@ public final class PlayerInstance extends Playable
sendPacket(SystemMessageId.YOU_CANNOT_TELEPORT_BECAUSE_YOU_DO_NOT_HAVE_A_TELEPORT_ITEM);
return;
}
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_DISAPPEARED);
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_DISAPPEARED);
sm.addItemName(13016);
sendPacket(sm);
@@ -12195,7 +12195,7 @@ public final class PlayerInstance extends Playable
return false;
}
/*
* TODO: Instant Zone still not implemented else if (isInsideZone(ZoneId.INSTANT)) { sendPacket(SystemMessage.getSystemMessage(2357)); return; }
* TODO: Instant Zone still not implemented else if (isInsideZone(ZoneId.INSTANT)) { sendPacket(new SystemMessage(2357)); return; }
*/
else
{
@@ -12234,7 +12234,7 @@ public final class PlayerInstance extends Playable
destroyItem("Consume", _inventory.getItemByItemId(20033).getObjectId(), 1, null, false);
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_DISAPPEARED);
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_DISAPPEARED);
sm.addItemName(20033);
sendPacket(sm);
@@ -12723,7 +12723,7 @@ public final class PlayerInstance extends Playable
if ((_fallingDamage > 0) && !isInvul())
{
reduceCurrentHp(Math.min(_fallingDamage, getCurrentHp() - 1), this, null, false, true, false, false);
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_RECEIVED_S1_FALLING_DAMAGE);
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_RECEIVED_S1_FALLING_DAMAGE);
sm.addInt(_fallingDamage);
sendPacket(sm);
}
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/RaceManagerInstance.java
+2 -2
View File
@@ -159,7 +159,7 @@ public class RaceManagerInstance extends Npc
public void makeAnnouncement(SystemMessageId type)
{
final SystemMessage sm = SystemMessage.getSystemMessage(type);
final SystemMessage sm = new SystemMessage(type);
switch (type.getId())
{
case 816: // SystemMessageId.TICKETS_ARE_NOW_AVAILABLE_FOR_MONSTER_RACE_S1
@@ -480,7 +480,7 @@ public class RaceManagerInstance extends Npc
}
player.setRace(0, 0);
player.setRace(1, 0);
sm = SystemMessage.getSystemMessage(SystemMessageId.ACQUIRED_S1_S2);
sm = new SystemMessage(SystemMessageId.ACQUIRED_S1_S2);
sm.addInt(_raceNumber);
sm.addItemName(4443);
player.sendPacket(sm);
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/ServitorInstance.java
+1 -1
View File
@@ -563,7 +563,7 @@ public class ServitorInstance extends Summon implements Runnable
{
if (destroyItemByItemId("Consume", _itemConsume.getId(), _itemConsume.getCount(), this, false))
{
final SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.A_SUMMONED_MONSTER_USES_S1);
final SystemMessage msg = new SystemMessage(SystemMessageId.A_SUMMONED_MONSTER_USES_S1);
msg.addItemName(_itemConsume.getId());
sendPacket(msg);
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/SiegeFlagInstance.java
+1 -1
View File
@@ -161,7 +161,7 @@ public class SiegeFlagInstance extends Npc
if (_clan != null)
{
// send warning to owners of headquarters that theirs base is under attack
_clan.broadcastToOnlineMembers(SystemMessage.getSystemMessage(SystemMessageId.YOUR_BASE_IS_BEING_ATTACKED));
_clan.broadcastToOnlineMembers(new SystemMessage(SystemMessageId.YOUR_BASE_IS_BEING_ATTACKED));
setCanTalk(false);
ThreadPool.schedule(new ScheduleTalkTask(), 20000);
}
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/TrapInstance.java
+1 -1
View File
@@ -271,7 +271,7 @@ public final class TrapInstance extends Npc
}
else
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_INFLICTED_S3_DAMAGE_ON_C2);
final SystemMessage sm = new SystemMessage(SystemMessageId.C1_HAS_INFLICTED_S3_DAMAGE_ON_C2);
sm.addString(getName());
sm.addString(target.getName());
sm.addInt(damage);
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java
+8 -8
View File
@@ -214,7 +214,7 @@ public class VillageMasterInstance extends NpcInstance
final ClanMember member = clan.getClanMember(cmdParams);
if (member == null)
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_DOES_NOT_EXIST);
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_DOES_NOT_EXIST);
sm.addString(cmdParams);
player.sendPacket(sm);
return;
@@ -409,7 +409,7 @@ public class VillageMasterInstance extends NpcInstance
{
if (pledgeType == Clan.SUBUNIT_ACADEMY)
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_ALREADY_EXISTS);
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_ALREADY_EXISTS);
sm.addString(clanName);
player.sendPacket(sm);
}
@@ -449,22 +449,22 @@ public class VillageMasterInstance extends NpcInstance
SystemMessage sm;
if (pledgeType == Clan.SUBUNIT_ACADEMY)
{
sm = SystemMessage.getSystemMessage(SystemMessageId.CONGRATULATIONS_THE_S1_S_CLAN_ACADEMY_HAS_BEEN_CREATED);
sm = new SystemMessage(SystemMessageId.CONGRATULATIONS_THE_S1_S_CLAN_ACADEMY_HAS_BEEN_CREATED);
sm.addString(player.getClan().getName());
}
else if (pledgeType >= Clan.SUBUNIT_KNIGHT1)
{
sm = SystemMessage.getSystemMessage(SystemMessageId.THE_KNIGHTS_OF_S1_HAVE_BEEN_CREATED);
sm = new SystemMessage(SystemMessageId.THE_KNIGHTS_OF_S1_HAVE_BEEN_CREATED);
sm.addString(player.getClan().getName());
}
else if (pledgeType >= Clan.SUBUNIT_ROYAL1)
{
sm = SystemMessage.getSystemMessage(SystemMessageId.THE_ROYAL_GUARD_OF_S1_HAVE_BEEN_CREATED);
sm = new SystemMessage(SystemMessageId.THE_ROYAL_GUARD_OF_S1_HAVE_BEEN_CREATED);
sm.addString(player.getClan().getName());
}
else
{
sm = SystemMessage.getSystemMessage(SystemMessageId.YOUR_CLAN_HAS_BEEN_CREATED);
sm = new SystemMessage(SystemMessageId.YOUR_CLAN_HAS_BEEN_CREATED);
}
player.sendPacket(sm);
@@ -565,7 +565,7 @@ public class VillageMasterInstance extends NpcInstance
}
clan.broadcastClanStatus();
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_BEEN_SELECTED_AS_THE_CAPTAIN_OF_S2);
final SystemMessage sm = new SystemMessage(SystemMessageId.C1_HAS_BEEN_SELECTED_AS_THE_CAPTAIN_OF_S2);
sm.addString(leaderName);
sm.addString(clanName);
clan.broadcastToOnlineMembers(sm);
@@ -592,7 +592,7 @@ public class VillageMasterInstance extends NpcInstance
{
if (player.getClan().getLevel() < 8)
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_DO_NOT_HAVE_ANY_FURTHER_SKILLS_TO_LEARN_COME_BACK_WHEN_YOU_HAVE_REACHED_LEVEL_S1);
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_DO_NOT_HAVE_ANY_FURTHER_SKILLS_TO_LEARN_COME_BACK_WHEN_YOU_HAVE_REACHED_LEVEL_S1);
if (player.getClan().getLevel() < 5)
{
sm.addInt(5);
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/stat/PetStat.java
+1 -1
View File
@@ -49,7 +49,7 @@ public class PetStat extends SummonStat
return false;
}
SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOUR_PET_GAINED_S1_XP);
SystemMessage sm = new SystemMessage(SystemMessageId.YOUR_PET_GAINED_S1_XP);
sm.addLong(finalExp);
getActiveChar().updateAndBroadcastStatus(1);
getActiveChar().sendPacket(sm);
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
+5 -5
View File
@@ -183,17 +183,17 @@ public class PlayerStat extends PlayableStat
SystemMessage sm = null;
if (!expAdded && spAdded)
{
sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_ACQUIRED_S1_SP);
sm = new SystemMessage(SystemMessageId.YOU_HAVE_ACQUIRED_S1_SP);
sm.addLong(finalSp);
}
else if (expAdded && !spAdded)
{
sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_EARNED_S1_XP);
sm = new SystemMessage(SystemMessageId.YOU_HAVE_EARNED_S1_XP);
sm.addLong(finalExp);
}
else
{
sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_ACQUIRED_S1_XP_BONUS_S2_AND_S3_SP_BONUS_S4);
sm = new SystemMessage(SystemMessageId.YOU_HAVE_ACQUIRED_S1_XP_BONUS_S2_AND_S3_SP_BONUS_S4);
sm.addLong(finalExp);
sm.addLong(Math.round(addToExp - baseExp));
sm.addLong(finalSp);
@@ -219,10 +219,10 @@ public class PlayerStat extends PlayableStat
if (sendMessage)
{
// Send a Server->Client System Message to the PlayerInstance
SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOUR_XP_HAS_DECREASED_BY_S1);
SystemMessage sm = new SystemMessage(SystemMessageId.YOUR_XP_HAS_DECREASED_BY_S1);
sm.addLong(addToExp);
getActiveChar().sendPacket(sm);
sm = SystemMessage.getSystemMessage(SystemMessageId.YOUR_SP_HAS_DECREASED_BY_S1);
sm = new SystemMessage(SystemMessageId.YOUR_SP_HAS_DECREASED_BY_S1);
sm.addLong(addToSp);
getActiveChar().sendPacket(sm);
if (getLevel() < level)
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/status/PetStatus.java
+1 -1
View File
@@ -51,7 +51,7 @@ public class PetStatus extends SummonStatus
{
if (!isDOT && (getActiveChar().getOwner() != null))
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOUR_PET_RECEIVED_S2_DAMAGE_BY_C1);
final SystemMessage sm = new SystemMessage(SystemMessageId.YOUR_PET_RECEIVED_S2_DAMAGE_BY_C1);
sm.addString(attacker.getName());
sm.addInt((int) value);
getActiveChar().sendPacket(sm);
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/status/PlayerStatus.java
+3 -3
View File
@@ -187,7 +187,7 @@ public class PlayerStatus extends PlayableStatus
else
{
getActiveChar().reduceCurrentMp(mpDam);
final SystemMessage smsg = SystemMessage.getSystemMessage(SystemMessageId.ARCANE_SHIELD_DECREASED_YOUR_MP_BY_S1_INSTEAD_OF_HP);
final SystemMessage smsg = new SystemMessage(SystemMessageId.ARCANE_SHIELD_DECREASED_YOUR_MP_BY_S1_INSTEAD_OF_HP);
smsg.addInt(mpDam);
getActiveChar().sendPacket(smsg);
return;
@@ -251,7 +251,7 @@ public class PlayerStatus extends PlayableStatus
if ((fullValue > 0) && !isDOT)
{
// Send a System Message to the PlayerInstance
SystemMessage smsg = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_RECEIVED_S3_DAMAGE_FROM_C2);
SystemMessage smsg = new SystemMessage(SystemMessageId.C1_HAS_RECEIVED_S3_DAMAGE_FROM_C2);
smsg.addString(getActiveChar().getName());
smsg.addString(attacker.getName());
smsg.addInt(fullValue);
@@ -260,7 +260,7 @@ public class PlayerStatus extends PlayableStatus
if ((tDmg > 0) && (summon != null) && (attackerPlayer != null))
{
smsg = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_DEALT_S1_DAMAGE_TO_YOUR_TARGET_AND_S2_DAMAGE_TO_THE_SERVITOR);
smsg = new SystemMessage(SystemMessageId.YOU_HAVE_DEALT_S1_DAMAGE_TO_YOUR_TARGET_AND_S2_DAMAGE_TO_THE_SERVITOR);
smsg.addInt(fullValue);
smsg.addInt(tDmg);
attackerPlayer.sendPacket(smsg);
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/tasks/player/FameTask.java
+1 -1
View File
@@ -49,7 +49,7 @@ public class FameTask implements Runnable
return;
}
_player.setFame(_player.getFame() + _value);
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_ACQUIRED_S1_FAME);
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_ACQUIRED_S1_FAME);
sm.addInt(_value);
_player.sendPacket(sm);
_player.sendPacket(new UserInfo(_player));
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/tasks/player/PetFeedTask.java
+1 -1
View File
@@ -91,7 +91,7 @@ public class PetFeedTask implements Runnable
if (handler != null)
{
handler.useItem(_player, food, false);
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOUR_PET_WAS_HUNGRY_SO_IT_ATE_S1);
final SystemMessage sm = new SystemMessage(SystemMessageId.YOUR_PET_WAS_HUNGRY_SO_IT_ATE_S1);
sm.addItemName(food.getId());
_player.sendPacket(sm);
}
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/tasks/player/RecoGiveTask.java
+1 -1
View File
@@ -50,7 +50,7 @@ public class RecoGiveTask implements Runnable
_player.setRecomLeft(_player.getRecomLeft() + recoToGive);
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_OBTAINED_S1_RECOMMENDATION_S);
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_OBTAINED_S1_RECOMMENDATION_S);
sm.addInt(recoToGive);
_player.sendPacket(sm);
_player.sendPacket(new UserInfo(_player));
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/tasks/player/WarnUserTakeBreakTask.java
+1 -1
View File
@@ -43,7 +43,7 @@ public final class WarnUserTakeBreakTask implements Runnable
if (_player.isOnline())
{
final long hours = TimeUnit.MILLISECONDS.toHours(_player.getUptime());
_player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_PLAYED_FOR_S1_HOUR_S_PLEASE_TAKE_A_BREAK).addLong(hours));
_player.sendPacket(new SystemMessage(SystemMessageId.YOU_HAVE_PLAYED_FOR_S1_HOUR_S_PLEASE_TAKE_A_BREAK).addLong(hours));
}
else
{
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/tasks/player/WaterTask.java
+1 -1
View File
@@ -47,7 +47,7 @@ public class WaterTask implements Runnable
_player.reduceCurrentHp(reduceHp, _player, null, false, true, false, false);
// reduced hp, becouse not rest
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_TAKEN_S1_DAMAGE_BECAUSE_YOU_WERE_UNABLE_TO_BREATHE);
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_TAKEN_S1_DAMAGE_BECAUSE_YOU_WERE_UNABLE_TO_BREATHE);
sm.addInt((int) reduceHp);
_player.sendPacket(sm);
}
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java
+7 -7
View File
@@ -285,14 +285,14 @@ public class CeremonyOfChaosEvent extends AbstractEvent<CeremonyOfChaosMember>
SystemMessage msg = null;
if (winners.isEmpty() || (winners.size() > 1))
{
msg = SystemMessage.getSystemMessage(SystemMessageId.THERE_IS_NO_VICTOR_THE_MATCH_ENDS_IN_A_TIE);
msg = new SystemMessage(SystemMessageId.THERE_IS_NO_VICTOR_THE_MATCH_ENDS_IN_A_TIE);
}
else
{
final PlayerInstance winner = winners.get(0).getPlayer();
if (winner != null)
{
msg = SystemMessage.getSystemMessage(SystemMessageId.CONGRATULATIONS_C1_YOU_WIN_THE_MATCH);
msg = new SystemMessage(SystemMessageId.CONGRATULATIONS_C1_YOU_WIN_THE_MATCH);
msg.addString(winner.getName());
// Rewards according to https://l2wiki.com/Ceremony_of_Chaos
@@ -512,24 +512,24 @@ public class CeremonyOfChaosEvent extends AbstractEvent<CeremonyOfChaosMember>
}
case "teleport_message1":
{
broadcastPacket(SystemMessage.getSystemMessage(SystemMessageId.PROVE_YOUR_ABILITIES));
broadcastPacket(new SystemMessage(SystemMessageId.PROVE_YOUR_ABILITIES));
break;
}
case "teleport_message2":
{
broadcastPacket(SystemMessage.getSystemMessage(SystemMessageId.THERE_ARE_NO_ALLIES_HERE_EVERYONE_IS_AN_ENEMY));
broadcastPacket(new SystemMessage(SystemMessageId.THERE_ARE_NO_ALLIES_HERE_EVERYONE_IS_AN_ENEMY));
break;
}
case "teleport_message3":
{
broadcastPacket(SystemMessage.getSystemMessage(SystemMessageId.IT_WILL_BE_A_LONELY_BATTLE_BUT_I_WISH_YOU_VICTORY));
broadcastPacket(new SystemMessage(SystemMessageId.IT_WILL_BE_A_LONELY_BATTLE_BUT_I_WISH_YOU_VICTORY));
break;
}
case "match_start_countdown":
{
final int time = params.getInt("time", 0);
final SystemMessage countdown = SystemMessage.getSystemMessage(SystemMessageId.THE_MATCH_WILL_START_IN_S1_SECOND_S);
final SystemMessage countdown = new SystemMessage(SystemMessageId.THE_MATCH_WILL_START_IN_S1_SECOND_S);
countdown.addByte(time);
broadcastPacket(countdown);
@@ -555,7 +555,7 @@ public class CeremonyOfChaosEvent extends AbstractEvent<CeremonyOfChaosMember>
case "match_end_countdown":
{
final int time = params.getInt("time", 0);
final SystemMessage countdown = SystemMessage.getSystemMessage(SystemMessageId.IN_S1_SECOND_S_YOU_WILL_BE_MOVED_TO_WHERE_YOU_WERE_BEFORE_PARTICIPATING_IN_THE_CEREMONY_OF_CHAOS);
final SystemMessage countdown = new SystemMessage(SystemMessageId.IN_S1_SECOND_S_YOU_WILL_BE_MOVED_TO_WHERE_YOU_WERE_BEFORE_PARTICIPATING_IN_THE_CEREMONY_OF_CHAOS);
countdown.addByte(time);
broadcastPacket(countdown);
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/clan/Clan.java
+33 -33
View File
@@ -322,7 +322,7 @@ public class Clan implements IIdentifiable, INamable
}
broadcastClanStatus();
broadcastToOnlineMembers(SystemMessage.getSystemMessage(SystemMessageId.CLAN_LEADER_PRIVILEGES_HAVE_BEEN_TRANSFERRED_TO_C1).addString(member.getName()));
broadcastToOnlineMembers(new SystemMessage(SystemMessageId.CLAN_LEADER_PRIVILEGES_HAVE_BEEN_TRANSFERRED_TO_C1).addString(member.getName()));
LOGGER.info("Leader of Clan: " + getName() + " changed to: " + member.getName() + " ex leader: " + exMember.getName());
}
@@ -1392,7 +1392,7 @@ public class Clan implements IIdentifiable, INamable
LOGGER.log(Level.WARNING, "Error could not store clan skills: " + e.getMessage(), e);
}
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_CLAN_SKILL_S1_HAS_BEEN_ADDED);
final SystemMessage sm = new SystemMessage(SystemMessageId.THE_CLAN_SKILL_S1_HAS_BEEN_ADDED);
sm.addSkillName(newSkill.getId());
for (ClanMember temp : _members.values())
@@ -2113,7 +2113,7 @@ public class Clan implements IIdentifiable, INamable
{
if ((_reputationScore >= 0) && (value < 0))
{
broadcastToOnlineMembers(SystemMessage.getSystemMessage(SystemMessageId.SINCE_THE_CLAN_REPUTATION_HAS_DROPPED_BELOW_0_YOUR_CLAN_SKILL_S_WILL_BE_DE_ACTIVATED));
broadcastToOnlineMembers(new SystemMessage(SystemMessageId.SINCE_THE_CLAN_REPUTATION_HAS_DROPPED_BELOW_0_YOUR_CLAN_SKILL_S_WILL_BE_DE_ACTIVATED));
for (ClanMember member : _members.values())
{
if (member.isOnline() && (member.getPlayerInstance() != null))
@@ -2124,7 +2124,7 @@ public class Clan implements IIdentifiable, INamable
}
else if ((_reputationScore < 0) && (value >= 0))
{
broadcastToOnlineMembers(SystemMessage.getSystemMessage(SystemMessageId.CLAN_SKILLS_WILL_NOW_BE_ACTIVATED_SINCE_THE_CLAN_REPUTATION_IS_1_OR_HIGHER));
broadcastToOnlineMembers(new SystemMessage(SystemMessageId.CLAN_SKILLS_WILL_NOW_BE_ACTIVATED_SINCE_THE_CLAN_REPUTATION_IS_1_OR_HIGHER));
for (ClanMember member : _members.values())
{
if (member.isOnline() && (member.getPlayerInstance() != null))
@@ -2224,21 +2224,21 @@ public class Clan implements IIdentifiable, INamable
}
if (target.getClanId() != 0)
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_IS_ALREADY_A_MEMBER_OF_ANOTHER_CLAN);
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_IS_ALREADY_A_MEMBER_OF_ANOTHER_CLAN);
sm.addString(target.getName());
player.sendPacket(sm);
return false;
}
if (target.getClanJoinExpiryTime() > System.currentTimeMillis())
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_CANNOT_JOIN_THE_CLAN_BECAUSE_ONE_DAY_HAS_NOT_YET_PASSED_SINCE_THEY_LEFT_ANOTHER_CLAN);
final SystemMessage sm = new SystemMessage(SystemMessageId.C1_CANNOT_JOIN_THE_CLAN_BECAUSE_ONE_DAY_HAS_NOT_YET_PASSED_SINCE_THEY_LEFT_ANOTHER_CLAN);
sm.addString(target.getName());
player.sendPacket(sm);
return false;
}
if (((target.getLevel() > 75) || (target.getClassId().level() >= 3)) && (pledgeType == -1))
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_DOES_NOT_MEET_THE_REQUIREMENTS_TO_JOIN_A_CLAN_ACADEMY);
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_DOES_NOT_MEET_THE_REQUIREMENTS_TO_JOIN_A_CLAN_ACADEMY);
sm.addString(target.getName());
player.sendPacket(sm);
player.sendPacket(SystemMessageId.IN_ORDER_TO_JOIN_THE_CLAN_ACADEMY_YOU_MUST_BE_UNAFFILIATED_WITH_A_CLAN_AND_BE_AN_UNAWAKENED_CHARACTER_LV_84_OR_BELOW_FPR_BOTH_MAIN_AND_SUBCLASS);
@@ -2248,7 +2248,7 @@ public class Clan implements IIdentifiable, INamable
{
if (pledgeType == 0)
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_IS_FULL_AND_CANNOT_ACCEPT_ADDITIONAL_CLAN_MEMBERS_AT_THIS_TIME);
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_IS_FULL_AND_CANNOT_ACCEPT_ADDITIONAL_CLAN_MEMBERS_AT_THIS_TIME);
sm.addString(_name);
player.sendPacket(sm);
}
@@ -2303,7 +2303,7 @@ public class Clan implements IIdentifiable, INamable
}
if (!target.isClanLeader())
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_IS_NOT_A_CLAN_LEADER);
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_IS_NOT_A_CLAN_LEADER);
sm.addString(target.getName());
player.sendPacket(sm);
return false;
@@ -2311,7 +2311,7 @@ public class Clan implements IIdentifiable, INamable
final Clan targetClan = target.getClan();
if (target.getAllyId() != 0)
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CLAN_IS_ALREADY_A_MEMBER_OF_S2_ALLIANCE);
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_CLAN_IS_ALREADY_A_MEMBER_OF_S2_ALLIANCE);
sm.addString(targetClan.getName());
sm.addString(targetClan.getAllyName());
player.sendPacket(sm);
@@ -2321,7 +2321,7 @@ public class Clan implements IIdentifiable, INamable
{
if (targetClan.getAllyPenaltyType() == PENALTY_TYPE_CLAN_LEAVED)
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CLAN_CANNOT_JOIN_THE_ALLIANCE_BECAUSE_ONE_DAY_HAS_NOT_YET_PASSED_SINCE_THEY_LEFT_ANOTHER_ALLIANCE);
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_CLAN_CANNOT_JOIN_THE_ALLIANCE_BECAUSE_ONE_DAY_HAS_NOT_YET_PASSED_SINCE_THEY_LEFT_ANOTHER_ALLIANCE);
sm.addString(target.getClan().getName());
sm.addString(target.getClan().getAllyName());
player.sendPacket(sm);
@@ -2466,7 +2466,7 @@ public class Clan implements IIdentifiable, INamable
return;
}
broadcastToOnlineAllyMembers(SystemMessage.getSystemMessage(SystemMessageId.THE_ALLIANCE_HAS_BEEN_DISSOLVED));
broadcastToOnlineAllyMembers(new SystemMessage(SystemMessageId.THE_ALLIANCE_HAS_BEEN_DISSOLVED));
final long currentTime = System.currentTimeMillis();
for (Clan clan : ClanTable.getInstance().getClanAllies(getAllyId()))
@@ -2512,7 +2512,7 @@ public class Clan implements IIdentifiable, INamable
if (player.reduceAdena("ClanLvl", 650000, player.getTarget(), true))
{
player.setSp(player.getSp() - 20000);
final SystemMessage sp = SystemMessage.getSystemMessage(SystemMessageId.YOUR_SP_HAS_DECREASED_BY_S1);
final SystemMessage sp = new SystemMessage(SystemMessageId.YOUR_SP_HAS_DECREASED_BY_S1);
sp.addInt(20000);
player.sendPacket(sp);
increaseClanLevel = true;
@@ -2528,7 +2528,7 @@ public class Clan implements IIdentifiable, INamable
if (player.reduceAdena("ClanLvl", 2500000, player.getTarget(), true))
{
player.setSp(player.getSp() - 100000);
final SystemMessage sp = SystemMessage.getSystemMessage(SystemMessageId.YOUR_SP_HAS_DECREASED_BY_S1);
final SystemMessage sp = new SystemMessage(SystemMessageId.YOUR_SP_HAS_DECREASED_BY_S1);
sp.addInt(100000);
player.sendPacket(sp);
increaseClanLevel = true;
@@ -2546,10 +2546,10 @@ public class Clan implements IIdentifiable, INamable
if (player.destroyItemByItemId("ClanLvl", 1419, 1, player.getTarget(), false))
{
player.setSp(player.getSp() - 350000);
final SystemMessage sp = SystemMessage.getSystemMessage(SystemMessageId.YOUR_SP_HAS_DECREASED_BY_S1);
final SystemMessage sp = new SystemMessage(SystemMessageId.YOUR_SP_HAS_DECREASED_BY_S1);
sp.addInt(350000);
player.sendPacket(sp);
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_DISAPPEARED);
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_DISAPPEARED);
sm.addItemName(1419);
player.sendPacket(sm);
increaseClanLevel = true;
@@ -2566,10 +2566,10 @@ public class Clan implements IIdentifiable, INamable
if (player.destroyItemByItemId("ClanLvl", 3874, 1, player.getTarget(), false))
{
player.setSp(player.getSp() - 1000000);
final SystemMessage sp = SystemMessage.getSystemMessage(SystemMessageId.YOUR_SP_HAS_DECREASED_BY_S1);
final SystemMessage sp = new SystemMessage(SystemMessageId.YOUR_SP_HAS_DECREASED_BY_S1);
sp.addInt(1000000);
player.sendPacket(sp);
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_DISAPPEARED);
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_DISAPPEARED);
sm.addItemName(3874);
player.sendPacket(sm);
increaseClanLevel = true;
@@ -2586,10 +2586,10 @@ public class Clan implements IIdentifiable, INamable
if (player.destroyItemByItemId("ClanLvl", 3870, 1, player.getTarget(), false))
{
player.setSp(player.getSp() - 2500000);
final SystemMessage sp = SystemMessage.getSystemMessage(SystemMessageId.YOUR_SP_HAS_DECREASED_BY_S1);
final SystemMessage sp = new SystemMessage(SystemMessageId.YOUR_SP_HAS_DECREASED_BY_S1);
sp.addInt(2500000);
player.sendPacket(sp);
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_DISAPPEARED);
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_DISAPPEARED);
sm.addItemName(3870);
player.sendPacket(sm);
increaseClanLevel = true;
@@ -2603,7 +2603,7 @@ public class Clan implements IIdentifiable, INamable
if ((_reputationScore >= Config.CLAN_LEVEL_6_COST) && (_members.size() >= Config.CLAN_LEVEL_6_REQUIREMENT))
{
setReputationScore(_reputationScore - Config.CLAN_LEVEL_6_COST, true);
final SystemMessage cr = SystemMessage.getSystemMessage(SystemMessageId.S1_POINT_S_HAVE_BEEN_DEDUCTED_FROM_THE_CLAN_S_REPUTATION);
final SystemMessage cr = new SystemMessage(SystemMessageId.S1_POINT_S_HAVE_BEEN_DEDUCTED_FROM_THE_CLAN_S_REPUTATION);
cr.addInt(Config.CLAN_LEVEL_6_COST);
player.sendPacket(cr);
increaseClanLevel = true;
@@ -2616,7 +2616,7 @@ public class Clan implements IIdentifiable, INamable
if ((_reputationScore >= Config.CLAN_LEVEL_7_COST) && (_members.size() >= Config.CLAN_LEVEL_7_REQUIREMENT))
{
setReputationScore(_reputationScore - Config.CLAN_LEVEL_7_COST, true);
final SystemMessage cr = SystemMessage.getSystemMessage(SystemMessageId.S1_POINT_S_HAVE_BEEN_DEDUCTED_FROM_THE_CLAN_S_REPUTATION);
final SystemMessage cr = new SystemMessage(SystemMessageId.S1_POINT_S_HAVE_BEEN_DEDUCTED_FROM_THE_CLAN_S_REPUTATION);
cr.addInt(Config.CLAN_LEVEL_7_COST);
player.sendPacket(cr);
increaseClanLevel = true;
@@ -2629,7 +2629,7 @@ public class Clan implements IIdentifiable, INamable
if ((_reputationScore >= Config.CLAN_LEVEL_8_COST) && (_members.size() >= Config.CLAN_LEVEL_8_REQUIREMENT))
{
setReputationScore(_reputationScore - Config.CLAN_LEVEL_8_COST, true);
final SystemMessage cr = SystemMessage.getSystemMessage(SystemMessageId.S1_POINT_S_HAVE_BEEN_DEDUCTED_FROM_THE_CLAN_S_REPUTATION);
final SystemMessage cr = new SystemMessage(SystemMessageId.S1_POINT_S_HAVE_BEEN_DEDUCTED_FROM_THE_CLAN_S_REPUTATION);
cr.addInt(Config.CLAN_LEVEL_8_COST);
player.sendPacket(cr);
increaseClanLevel = true;
@@ -2645,10 +2645,10 @@ public class Clan implements IIdentifiable, INamable
if (player.destroyItemByItemId("ClanLvl", 9910, 150, player.getTarget(), false))
{
setReputationScore(_reputationScore - Config.CLAN_LEVEL_9_COST, true);
final SystemMessage cr = SystemMessage.getSystemMessage(SystemMessageId.S1_POINT_S_HAVE_BEEN_DEDUCTED_FROM_THE_CLAN_S_REPUTATION);
final SystemMessage cr = new SystemMessage(SystemMessageId.S1_POINT_S_HAVE_BEEN_DEDUCTED_FROM_THE_CLAN_S_REPUTATION);
cr.addInt(Config.CLAN_LEVEL_9_COST);
player.sendPacket(cr);
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S2_S1_S_DISAPPEARED);
final SystemMessage sm = new SystemMessage(SystemMessageId.S2_S1_S_DISAPPEARED);
sm.addItemName(9910);
sm.addLong(150);
player.sendPacket(sm);
@@ -2666,10 +2666,10 @@ public class Clan implements IIdentifiable, INamable
if (player.destroyItemByItemId("ClanLvl", 9911, 5, player.getTarget(), false))
{
setReputationScore(_reputationScore - Config.CLAN_LEVEL_10_COST, true);
final SystemMessage cr = SystemMessage.getSystemMessage(SystemMessageId.S1_POINT_S_HAVE_BEEN_DEDUCTED_FROM_THE_CLAN_S_REPUTATION);
final SystemMessage cr = new SystemMessage(SystemMessageId.S1_POINT_S_HAVE_BEEN_DEDUCTED_FROM_THE_CLAN_S_REPUTATION);
cr.addInt(Config.CLAN_LEVEL_10_COST);
player.sendPacket(cr);
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S2_S1_S_DISAPPEARED);
final SystemMessage sm = new SystemMessage(SystemMessageId.S2_S1_S_DISAPPEARED);
sm.addItemName(9911);
sm.addLong(5);
player.sendPacket(sm);
@@ -2684,7 +2684,7 @@ public class Clan implements IIdentifiable, INamable
if ((_reputationScore >= Config.CLAN_LEVEL_11_COST) && (_members.size() >= Config.CLAN_LEVEL_11_REQUIREMENT))
{
setReputationScore(_reputationScore - Config.CLAN_LEVEL_11_COST, true);
final SystemMessage cr = SystemMessage.getSystemMessage(SystemMessageId.S1_POINT_S_HAVE_BEEN_DEDUCTED_FROM_THE_CLAN_S_REPUTATION);
final SystemMessage cr = new SystemMessage(SystemMessageId.S1_POINT_S_HAVE_BEEN_DEDUCTED_FROM_THE_CLAN_S_REPUTATION);
cr.addInt(Config.CLAN_LEVEL_11_COST);
player.sendPacket(cr);
increaseClanLevel = true;
@@ -2748,7 +2748,7 @@ public class Clan implements IIdentifiable, INamable
}
// notify all the members about it
broadcastToOnlineMembers(SystemMessage.getSystemMessage(SystemMessageId.YOUR_CLAN_S_LEVEL_HAS_INCREASED));
broadcastToOnlineMembers(new SystemMessage(SystemMessageId.YOUR_CLAN_S_LEVEL_HAS_INCREASED));
broadcastToOnlineMembers(new PledgeShowInfoUpdate(this));
}
@@ -3049,12 +3049,12 @@ public class Clan implements IIdentifiable, INamable
if (_lastMembersOnlineBonus == null)
{
_lastMembersOnlineBonus = availableBonus;
broadcastToOnlineMembers(SystemMessage.getSystemMessage(SystemMessageId.YOUR_CLAN_HAS_ACHIEVED_LOGIN_BONUS_LV_S1).addByte(availableBonus.getLevel()));
broadcastToOnlineMembers(new SystemMessage(SystemMessageId.YOUR_CLAN_HAS_ACHIEVED_LOGIN_BONUS_LV_S1).addByte(availableBonus.getLevel()));
}
else if (_lastMembersOnlineBonus.getLevel() < availableBonus.getLevel())
{
_lastMembersOnlineBonus = availableBonus;
broadcastToOnlineMembers(SystemMessage.getSystemMessage(SystemMessageId.YOUR_CLAN_HAS_ACHIEVED_LOGIN_BONUS_LV_S1).addByte(availableBonus.getLevel()));
broadcastToOnlineMembers(new SystemMessage(SystemMessageId.YOUR_CLAN_HAS_ACHIEVED_LOGIN_BONUS_LV_S1).addByte(availableBonus.getLevel()));
}
}
@@ -3083,12 +3083,12 @@ public class Clan implements IIdentifiable, INamable
if (_lastHuntingBonus == null)
{
_lastHuntingBonus = availableBonus;
broadcastToOnlineMembers(SystemMessage.getSystemMessage(SystemMessageId.YOUR_CLAN_HAS_ACHIEVED_HUNTING_BONUS_LV_S1).addByte(availableBonus.getLevel()));
broadcastToOnlineMembers(new SystemMessage(SystemMessageId.YOUR_CLAN_HAS_ACHIEVED_HUNTING_BONUS_LV_S1).addByte(availableBonus.getLevel()));
}
else if (_lastHuntingBonus.getLevel() < availableBonus.getLevel())
{
_lastHuntingBonus = availableBonus;
broadcastToOnlineMembers(SystemMessage.getSystemMessage(SystemMessageId.YOUR_CLAN_HAS_ACHIEVED_HUNTING_BONUS_LV_S1).addByte(availableBonus.getLevel()));
broadcastToOnlineMembers(new SystemMessage(SystemMessageId.YOUR_CLAN_HAS_ACHIEVED_HUNTING_BONUS_LV_S1).addByte(availableBonus.getLevel()));
}
}
}
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
+13 -13
View File
@@ -67,11 +67,11 @@ public final class ClanWar
EventDispatcher.getInstance().notifyEventAsync(new OnClanWarStart(attacker, attacked));
SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_DECLARED_A_CLAN_WAR_WITH_S1);
SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_DECLARED_A_CLAN_WAR_WITH_S1);
sm.addString(attacked.getName());
attacker.broadcastToOnlineMembers(sm);
sm = SystemMessage.getSystemMessage(SystemMessageId.S1_HAS_DECLARED_A_CLAN_WAR_THE_WAR_WILL_AUTOMATICALLY_START_IF_YOU_KILL_S1_CLAN_MEMBERS_5_TIMES_WITHIN_A_WEEK);
sm = new SystemMessage(SystemMessageId.S1_HAS_DECLARED_A_CLAN_WAR_THE_WAR_WILL_AUTOMATICALLY_START_IF_YOU_KILL_S1_CLAN_MEMBERS_5_TIMES_WITHIN_A_WEEK);
sm.addString(attacker.getName());
attacked.broadcastToOnlineMembers(sm);
}
@@ -132,12 +132,12 @@ public final class ClanWar
}
// System Message notification to clan members
SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.BECAUSE_C1_WAS_KILLED_BY_A_CLAN_MEMBER_OF_S2_CLAN_REPUTATION_DECREASED_BY_1);
SystemMessage sm = new SystemMessage(SystemMessageId.BECAUSE_C1_WAS_KILLED_BY_A_CLAN_MEMBER_OF_S2_CLAN_REPUTATION_DECREASED_BY_1);
sm.addPcName(victim);
sm.addString(killerClan.getName());
victimClan.broadcastToOtherOnlineMembers(sm, victim);
sm = SystemMessage.getSystemMessage(SystemMessageId.BECAUSE_A_CLAN_MEMBER_OF_S1_WAS_KILLED_BY_C2_CLAN_REPUTATION_INCREASED_BY_1);
sm = new SystemMessage(SystemMessageId.BECAUSE_A_CLAN_MEMBER_OF_S1_WAS_KILLED_BY_C2_CLAN_REPUTATION_INCREASED_BY_1);
sm.addString(victimClan.getName());
sm.addPcName(killer);
killerClan.broadcastToOtherOnlineMembers(sm, killer);
@@ -159,11 +159,11 @@ public final class ClanWar
{
_state = ClanWarState.MUTUAL;
SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.A_CLAN_WAR_WITH_CLAN_S1_HAS_STARTED_THE_CLAN_THAT_CANCELS_THE_WAR_FIRST_WILL_LOSE_5_000_CLAN_REPUTATION_ANY_CLAN_THAT_CANCELS_THE_WAR_WILL_BE_UNABLE_TO_DECLARE_A_WAR_FOR_1_WEEK_IF_YOUR_CLAN_MEMBER_GETS_KILLED_BY_THE_OTHER_CLAN_XP_DECREASES_BY_1_4_OF_THE_AMOUNT_THAT_DECREASES_IN_THE_HUNTING_GROUND);
SystemMessage sm = new SystemMessage(SystemMessageId.A_CLAN_WAR_WITH_CLAN_S1_HAS_STARTED_THE_CLAN_THAT_CANCELS_THE_WAR_FIRST_WILL_LOSE_5_000_CLAN_REPUTATION_ANY_CLAN_THAT_CANCELS_THE_WAR_WILL_BE_UNABLE_TO_DECLARE_A_WAR_FOR_1_WEEK_IF_YOUR_CLAN_MEMBER_GETS_KILLED_BY_THE_OTHER_CLAN_XP_DECREASES_BY_1_4_OF_THE_AMOUNT_THAT_DECREASES_IN_THE_HUNTING_GROUND);
sm.addString(victimClan.getName());
killerClan.broadcastToOnlineMembers(sm);
sm = SystemMessage.getSystemMessage(SystemMessageId.A_CLAN_WAR_WITH_CLAN_S1_HAS_STARTED_THE_CLAN_THAT_CANCELS_THE_WAR_FIRST_WILL_LOSE_5_000_CLAN_REPUTATION_ANY_CLAN_THAT_CANCELS_THE_WAR_WILL_BE_UNABLE_TO_DECLARE_A_WAR_FOR_1_WEEK_IF_YOUR_CLAN_MEMBER_GETS_KILLED_BY_THE_OTHER_CLAN_XP_DECREASES_BY_1_4_OF_THE_AMOUNT_THAT_DECREASES_IN_THE_HUNTING_GROUND);
sm = new SystemMessage(SystemMessageId.A_CLAN_WAR_WITH_CLAN_S1_HAS_STARTED_THE_CLAN_THAT_CANCELS_THE_WAR_FIRST_WILL_LOSE_5_000_CLAN_REPUTATION_ANY_CLAN_THAT_CANCELS_THE_WAR_WILL_BE_UNABLE_TO_DECLARE_A_WAR_FOR_1_WEEK_IF_YOUR_CLAN_MEMBER_GETS_KILLED_BY_THE_OTHER_CLAN_XP_DECREASES_BY_1_4_OF_THE_AMOUNT_THAT_DECREASES_IN_THE_HUNTING_GROUND);
sm.addString(killerClan.getName());
victimClan.broadcastToOnlineMembers(sm);
@@ -175,7 +175,7 @@ public final class ClanWar
}
else
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.A_CLAN_MEMBER_OF_S1_WAS_KILLED_BY_YOUR_CLAN_MEMBER_IF_YOUR_CLAN_KILLS_S2_MEMBERS_OF_CLAN_S1_A_CLAN_WAR_WITH_CLAN_S1_WILL_START);
final SystemMessage sm = new SystemMessage(SystemMessageId.A_CLAN_MEMBER_OF_S1_WAS_KILLED_BY_YOUR_CLAN_MEMBER_IF_YOUR_CLAN_KILLS_S2_MEMBERS_OF_CLAN_S1_A_CLAN_WAR_WITH_CLAN_S1_WILL_START);
sm.addString(victimClan.getName());
sm.addInt(5 - killCount);
killerClan.broadcastToOnlineMembers(sm);
@@ -192,11 +192,11 @@ public final class ClanWar
player.sendPacket(new SurrenderPledgeWar(cancelor.getName(), player.getName()));
SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_WAR_ENDED_BY_YOUR_DEFEAT_DECLARATION_WITH_THE_S1_CLAN);
SystemMessage sm = new SystemMessage(SystemMessageId.THE_WAR_ENDED_BY_YOUR_DEFEAT_DECLARATION_WITH_THE_S1_CLAN);
sm.addString(winnerClan.getName());
cancelor.broadcastToOnlineMembers(sm);
sm = SystemMessage.getSystemMessage(SystemMessageId.THE_WAR_ENDED_BY_THE_S1_CLAN_S_DEFEAT_DECLARATION_YOU_HAVE_WON_THE_CLAN_WAR_OVER_THE_S1_CLAN);
sm = new SystemMessage(SystemMessageId.THE_WAR_ENDED_BY_THE_S1_CLAN_S_DEFEAT_DECLARATION_YOU_HAVE_WON_THE_CLAN_WAR_OVER_THE_S1_CLAN);
sm.addString(cancelor.getName());
winnerClan.broadcastToOnlineMembers(sm);
@@ -216,11 +216,11 @@ public final class ClanWar
if ((attackerClan != null) && (attackedClan != null))
{
SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.A_CLAN_WAR_DECLARED_BY_CLAN_S1_WAS_CANCELLED);
SystemMessage sm = new SystemMessage(SystemMessageId.A_CLAN_WAR_DECLARED_BY_CLAN_S1_WAS_CANCELLED);
sm.addString(attackerClan.getName());
attackedClan.broadcastToOnlineMembers(sm);
sm = SystemMessage.getSystemMessage(SystemMessageId.BECAUSE_CLAN_S1_DID_NOT_FIGHT_BACK_FOR_1_WEEK_THE_CLAN_WAR_WAS_CANCELLED);
sm = new SystemMessage(SystemMessageId.BECAUSE_CLAN_S1_DID_NOT_FIGHT_BACK_FOR_1_WEEK_THE_CLAN_WAR_WAS_CANCELLED);
sm.addString(attackedClan.getName());
attackerClan.broadcastToOnlineMembers(sm);
@@ -238,11 +238,11 @@ public final class ClanWar
{
_state = ClanWarState.MUTUAL;
SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.A_CLAN_WAR_WITH_CLAN_S1_HAS_STARTED_THE_CLAN_THAT_CANCELS_THE_WAR_FIRST_WILL_LOSE_5_000_CLAN_REPUTATION_ANY_CLAN_THAT_CANCELS_THE_WAR_WILL_BE_UNABLE_TO_DECLARE_A_WAR_FOR_1_WEEK_IF_YOUR_CLAN_MEMBER_GETS_KILLED_BY_THE_OTHER_CLAN_XP_DECREASES_BY_1_4_OF_THE_AMOUNT_THAT_DECREASES_IN_THE_HUNTING_GROUND);
SystemMessage sm = new SystemMessage(SystemMessageId.A_CLAN_WAR_WITH_CLAN_S1_HAS_STARTED_THE_CLAN_THAT_CANCELS_THE_WAR_FIRST_WILL_LOSE_5_000_CLAN_REPUTATION_ANY_CLAN_THAT_CANCELS_THE_WAR_WILL_BE_UNABLE_TO_DECLARE_A_WAR_FOR_1_WEEK_IF_YOUR_CLAN_MEMBER_GETS_KILLED_BY_THE_OTHER_CLAN_XP_DECREASES_BY_1_4_OF_THE_AMOUNT_THAT_DECREASES_IN_THE_HUNTING_GROUND);
sm.addString(attacker.getName());
attacked.broadcastToOnlineMembers(sm);
sm = SystemMessage.getSystemMessage(SystemMessageId.A_CLAN_WAR_WITH_CLAN_S1_HAS_STARTED_THE_CLAN_THAT_CANCELS_THE_WAR_FIRST_WILL_LOSE_5_000_CLAN_REPUTATION_ANY_CLAN_THAT_CANCELS_THE_WAR_WILL_BE_UNABLE_TO_DECLARE_A_WAR_FOR_1_WEEK_IF_YOUR_CLAN_MEMBER_GETS_KILLED_BY_THE_OTHER_CLAN_XP_DECREASES_BY_1_4_OF_THE_AMOUNT_THAT_DECREASES_IN_THE_HUNTING_GROUND);
sm = new SystemMessage(SystemMessageId.A_CLAN_WAR_WITH_CLAN_S1_HAS_STARTED_THE_CLAN_THAT_CANCELS_THE_WAR_FIRST_WILL_LOSE_5_000_CLAN_REPUTATION_ANY_CLAN_THAT_CANCELS_THE_WAR_WILL_BE_UNABLE_TO_DECLARE_A_WAR_FOR_1_WEEK_IF_YOUR_CLAN_MEMBER_GETS_KILLED_BY_THE_OTHER_CLAN_XP_DECREASES_BY_1_4_OF_THE_AMOUNT_THAT_DECREASES_IN_THE_HUNTING_GROUND);
sm.addString(attacked.getName());
attacker.broadcastToOnlineMembers(sm);
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/clientstrings/Builder.java
+89
View File
@@ -0,0 +1,89 @@
/*
* 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 <http://www.gnu.org/licenses/>.
*/
package org.l2jmobius.gameserver.model.clientstrings;
import java.util.ArrayList;
/**
* @author Forsaiken, Zoey76
*/
public abstract class Builder
{
public abstract String toString(Object param);
public abstract String toString(Object... params);
public abstract int getIndex();
public static Builder newBuilder(String text)
{
final ArrayList<Builder> builders = new ArrayList<>();
int index1 = 0;
int index2 = 0;
int paramId;
int subTextLen;
final char[] array = text.toCharArray();
final int arrayLength = array.length;
char c;
char c2;
char c3;
LOOP: for (; index1 < arrayLength; index1++)
{
c = array[index1];
if ((c == '$') && (index1 < (arrayLength - 2)))
{
c2 = array[index1 + 1];
if ((c2 == 'c') || (c2 == 's') || (c2 == 'p') || (c2 == 'C') || (c2 == 'S') || (c2 == 'P'))
{
c3 = array[index1 + 2];
if (Character.isDigit(c3))
{
paramId = Character.getNumericValue(c3);
subTextLen = index1 - index2;
if (subTextLen != 0)
{
builders.add(new BuilderText(new String(array, index2, subTextLen)));
}
builders.add(new BuilderObject(paramId));
index1 += 2;
index2 = index1 + 1;
continue LOOP;
}
}
}
}
if (arrayLength >= index1)
{
subTextLen = index1 - index2;
if (subTextLen != 0)
{
builders.add(new BuilderText(new String(array, index2, subTextLen)));
}
}
if (builders.size() == 1)
{
return builders.get(0);
}
return new BuilderContainer(builders.toArray(new Builder[builders.size()]));
}
}
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/clientstrings/BuilderContainer.java
+86
View File
@@ -0,0 +1,86 @@
/*
* 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 <http://www.gnu.org/licenses/>.
*/
package org.l2jmobius.gameserver.model.clientstrings;
/**
* @author Forsaiken
*/
final class BuilderContainer extends Builder
{
private final Builder[] _builders;
BuilderContainer(Builder[] builders)
{
_builders = builders;
}
@Override
public final String toString(Object param)
{
return toString(new Object[]
{
param
});
}
@Override
public final String toString(Object... params)
{
final int buildersLength = _builders.length;
final int paramsLength = params.length;
final String[] builds = new String[buildersLength];
Builder builder;
String build;
int i;
int paramIndex;
int buildTextLen = 0;
if (paramsLength != 0)
{
for (i = buildersLength; i-- > 0;)
{
builder = _builders[i];
paramIndex = builder.getIndex();
build = (paramIndex != -1) && (paramIndex < paramsLength) ? builder.toString(params[paramIndex]) : builder.toString();
buildTextLen += build.length();
builds[i] = build;
}
}
else
{
for (i = buildersLength; i-- > 0;)
{
build = _builders[i].toString();
buildTextLen += build.length();
builds[i] = build;
}
}
final FastStringBuilder fsb = new FastStringBuilder(buildTextLen);
for (i = 0; i < buildersLength; i++)
{
fsb.append(builds[i]);
}
return fsb.toString();
}
@Override
public final int getIndex()
{
return -1;
}
}
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/clientstrings/BuilderObject.java
+62
View File
@@ -0,0 +1,62 @@
/*
* 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 <http://www.gnu.org/licenses/>.
*/
package org.l2jmobius.gameserver.model.clientstrings;
/**
* @author Forsaiken
*/
final class BuilderObject extends Builder
{
private final int _index;
BuilderObject(int id)
{
if ((id < 1) || (id > 9))
{
throw new RuntimeException("Illegal Id: " + id);
}
_index = id - 1;
}
@Override
public final String toString(Object param)
{
return param == null ? "null" : param.toString();
}
@Override
public final String toString(Object... params)
{
if ((params == null) || (params.length == 0))
{
return "null";
}
return params[0].toString();
}
@Override
public final int getIndex()
{
return _index;
}
@Override
public final String toString()
{
return "[PARAM-" + (_index + 1) + "]";
}
}
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/clientstrings/BuilderText.java
+54
View File
@@ -0,0 +1,54 @@
/*
* 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 <http://www.gnu.org/licenses/>.
*/
package org.l2jmobius.gameserver.model.clientstrings;
/**
* @author Forsaiken
*/
final class BuilderText extends Builder
{
private final String _text;
BuilderText(String text)
{
_text = text;
}
@Override
public final String toString(Object param)
{
return toString();
}
@Override
public final String toString(Object... params)
{
return toString();
}
@Override
public final int getIndex()
{
return -1;
}
@Override
public final String toString()
{
return _text;
}
}
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/clientstrings/FastStringBuilder.java
+43
View File
@@ -0,0 +1,43 @@
/*
* 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 <http://www.gnu.org/licenses/>.
*/
package org.l2jmobius.gameserver.model.clientstrings;
/**
* @author Forsaiken
*/
final class FastStringBuilder
{
private final char[] _array;
private int _len;
public FastStringBuilder(int capacity)
{
_array = new char[capacity];
}
public final void append(String text)
{
text.getChars(0, text.length(), _array, _len);
_len += text.length();
}
@Override
public final String toString()
{
return new String(_array);
}
}
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateBase.java
+5 -5
View File
@@ -63,35 +63,35 @@ public class ConditionPlayerCanCreateBase extends Condition
final SystemMessage sm;
if ((castle == null) && (fort == null))
{
sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CANNOT_BE_USED_DUE_TO_UNSUITABLE_TERMS);
sm = new SystemMessage(SystemMessageId.S1_CANNOT_BE_USED_DUE_TO_UNSUITABLE_TERMS);
sm.addSkillName(skill);
player.sendPacket(sm);
canCreateBase = false;
}
else if (((castle != null) && !castle.getSiege().isInProgress()) || ((fort != null) && !fort.getSiege().isInProgress()))
{
sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CANNOT_BE_USED_DUE_TO_UNSUITABLE_TERMS);
sm = new SystemMessage(SystemMessageId.S1_CANNOT_BE_USED_DUE_TO_UNSUITABLE_TERMS);
sm.addSkillName(skill);
player.sendPacket(sm);
canCreateBase = false;
}
else if (((castle != null) && (castle.getSiege().getAttackerClan(player.getClan()) == null)) || ((fort != null) && (fort.getSiege().getAttackerClan(player.getClan()) == null)))
{
sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CANNOT_BE_USED_DUE_TO_UNSUITABLE_TERMS);
sm = new SystemMessage(SystemMessageId.S1_CANNOT_BE_USED_DUE_TO_UNSUITABLE_TERMS);
sm.addSkillName(skill);
player.sendPacket(sm);
canCreateBase = false;
}
else if (!player.isClanLeader())
{
sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CANNOT_BE_USED_DUE_TO_UNSUITABLE_TERMS);
sm = new SystemMessage(SystemMessageId.S1_CANNOT_BE_USED_DUE_TO_UNSUITABLE_TERMS);
sm.addSkillName(skill);
player.sendPacket(sm);
canCreateBase = false;
}
else if (((castle != null) && (castle.getSiege().getAttackerClan(player.getClan()).getNumFlags() >= SiegeManager.getInstance().getFlagMaxCount())) || ((fort != null) && (fort.getSiege().getAttackerClan(player.getClan()).getNumFlags() >= FortSiegeManager.getInstance().getFlagMaxCount())))
{
sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CANNOT_BE_USED_DUE_TO_UNSUITABLE_TERMS);
sm = new SystemMessage(SystemMessageId.S1_CANNOT_BE_USED_DUE_TO_UNSUITABLE_TERMS);
sm.addSkillName(skill);
player.sendPacket(sm);
canCreateBase = false;
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanResurrect.java
+2 -2
View File
@@ -62,7 +62,7 @@ public class ConditionPlayerCanResurrect extends Condition
canResurrect = false;
if (effector.isPlayer())
{
final SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.S1_CANNOT_BE_USED_DUE_TO_UNSUITABLE_TERMS);
final SystemMessage msg = new SystemMessage(SystemMessageId.S1_CANNOT_BE_USED_DUE_TO_UNSUITABLE_TERMS);
msg.addSkillName(skill);
effector.sendPacket(msg);
}
@@ -133,7 +133,7 @@ public class ConditionPlayerCanResurrect extends Condition
canResurrect = false;
if (effector.isPlayer())
{
final SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.S1_CANNOT_BE_USED_DUE_TO_UNSUITABLE_TERMS);
final SystemMessage msg = new SystemMessage(SystemMessageId.S1_CANNOT_BE_USED_DUE_TO_UNSUITABLE_TERMS);
msg.addSkillName(skill);
effector.sendPacket(msg);
}
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeCastle.java
+1 -1
View File
@@ -58,7 +58,7 @@ public class ConditionPlayerCanTakeCastle extends Condition
SystemMessage sm;
if ((castle == null) || (castle.getResidenceId() <= 0) || !castle.getSiege().isInProgress() || (castle.getSiege().getAttackerClan(player.getClan()) == null))
{
sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CANNOT_BE_USED_DUE_TO_UNSUITABLE_TERMS);
sm = new SystemMessage(SystemMessageId.S1_CANNOT_BE_USED_DUE_TO_UNSUITABLE_TERMS);
sm.addSkillName(skill);
player.sendPacket(sm);
canTakeCastle = false;
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeFort.java
+1 -1
View File
@@ -58,7 +58,7 @@ public class ConditionPlayerCanTakeFort extends Condition
final SystemMessage sm;
if ((fort == null) || (fort.getResidenceId() <= 0) || !fort.getSiege().isInProgress() || (fort.getSiege().getAttackerClan(player.getClan()) == null))
{
sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CANNOT_BE_USED_DUE_TO_UNSUITABLE_TERMS);
sm = new SystemMessage(SystemMessageId.S1_CANNOT_BE_USED_DUE_TO_UNSUITABLE_TERMS);
sm.addSkillName(skill);
player.sendPacket(sm);
canTakeFort = false;
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeSummonPoints.java
+1 -1
View File
@@ -53,7 +53,7 @@ public class ConditionPlayerHasFreeSummonPoints extends Condition
}
else if ((player.getSummonPoints() + _summonPoints) > player.getMaxSummonPoints())
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_CANNOT_USE_THE_S1_SKILL_DUE_TO_INSUFFICIENT_SUMMON_POINTS);
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_CANNOT_USE_THE_S1_SKILL_DUE_TO_INSUFFICIENT_SUMMON_POINTS);
sm.addSkillName(skill);
player.sendPacket(sm);
canSummon = false;
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetMyPartyExceptMe.java
+1 -1
View File
@@ -52,7 +52,7 @@ public class ConditionTargetMyPartyExceptMe extends Condition
}
else if (!player.isInParty() || !player.getParty().equals(effected.getParty()))
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CANNOT_BE_USED_DUE_TO_UNSUITABLE_TERMS);
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_CANNOT_BE_USED_DUE_TO_UNSUITABLE_TERMS);
sm.addSkillName(skill);
player.sendPacket(sm);
isPartyMember = false;
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/entity/BlockCheckerEngine.java
+3 -3
View File
@@ -567,7 +567,7 @@ public final class BlockCheckerEngine
/*
* private class CountDown implements Runnable {
* @Override public void run() { _holder.broadCastPacketToTeam(SystemMessage.getSystemMessage(SystemMessageId.BLOCK_CHECKER_ENDS_5)); ThreadPoolManager.schedule(new EndEvent(), 5000); } }
* @Override public void run() { _holder.broadCastPacketToTeam(new SystemMessage(SystemMessageId.BLOCK_CHECKER_ENDS_5)); ThreadPoolManager.schedule(new EndEvent(), 5000); } }
*/
/**
@@ -627,7 +627,7 @@ public final class BlockCheckerEngine
{
rewardAsWinner(true);
rewardAsLooser(false);
final SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.THE_C1_TEAM_HAS_WON);
final SystemMessage msg = new SystemMessage(SystemMessageId.THE_C1_TEAM_HAS_WON);
msg.addString("Red Team");
_holder.broadCastPacketToTeam(msg);
}
@@ -635,7 +635,7 @@ public final class BlockCheckerEngine
{
rewardAsWinner(false);
rewardAsLooser(true);
final SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.THE_C1_TEAM_HAS_WON);
final SystemMessage msg = new SystemMessage(SystemMessageId.THE_C1_TEAM_HAS_WON);
msg.addString("Blue Team");
_holder.broadCastPacketToTeam(msg);
}
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/entity/Castle.java
+1 -1
View File
@@ -272,7 +272,7 @@ public final class Castle extends AbstractResidence
}
setSide(side);
setOwner(clan);
final SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.CLAN_S1_HAS_SUCCEEDED_IN_S2);
final SystemMessage msg = new SystemMessage(SystemMessageId.CLAN_S1_HAS_SUCCEEDED_IN_S2);
msg.addString(clan.getName());
msg.addString(getName());
getSiege().announceToPlayer(msg, true);
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/entity/ClanHall.java
+2 -2
View File
@@ -357,13 +357,13 @@ public final class ClanHall extends AbstractResidence
{
if (getCostFailDay() > 8)
{
_owner.broadcastToOnlineMembers(SystemMessage.getSystemMessage(SystemMessageId.THE_CLAN_HALL_FEE_IS_ONE_WEEK_OVERDUE_THEREFORE_THE_CLAN_HALL_OWNERSHIP_HAS_BEEN_REVOKED));
_owner.broadcastToOnlineMembers(new SystemMessage(SystemMessageId.THE_CLAN_HALL_FEE_IS_ONE_WEEK_OVERDUE_THEREFORE_THE_CLAN_HALL_OWNERSHIP_HAS_BEEN_REVOKED));
setOwner(null);
}
else
{
_checkPaymentTask = ThreadPool.schedule(new CheckPaymentTask(), 24 * 60 * 60 * 1000); // 1 day
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.PAYMENT_FOR_YOUR_CLAN_HALL_HAS_NOT_BEEN_MADE_PLEASE_MAKE_PAYMENT_TO_YOUR_CLAN_WAREHOUSE_BY_S1_TOMORROW);
final SystemMessage sm = new SystemMessage(SystemMessageId.PAYMENT_FOR_YOUR_CLAN_HALL_HAS_NOT_BEEN_MADE_PLEASE_MAKE_PAYMENT_TO_YOUR_CLAN_WAREHOUSE_BY_S1_TOMORROW);
sm.addInt(_lease);
_owner.broadcastToOnlineMembers(sm);
}
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/entity/Duel.java
+7 -7
View File
@@ -109,7 +109,7 @@ public class Duel
if (_partyDuel)
{
// inform players that they will be ported shortly
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.IN_A_MOMENT_YOU_WILL_BE_TRANSPORTED_TO_THE_SITE_WHERE_THE_DUEL_WILL_TAKE_PLACE);
final SystemMessage sm = new SystemMessage(SystemMessageId.IN_A_MOMENT_YOU_WILL_BE_TRANSPORTED_TO_THE_SITE_WHERE_THE_DUEL_WILL_TAKE_PLACE);
broadcastToTeam1(sm);
broadcastToTeam2(sm);
}
@@ -771,12 +771,12 @@ public class Duel
SystemMessage sm = null;
if (_countdown > 0)
{
sm = SystemMessage.getSystemMessage(SystemMessageId.THE_DUEL_WILL_BEGIN_IN_S1_SECOND_S);
sm = new SystemMessage(SystemMessageId.THE_DUEL_WILL_BEGIN_IN_S1_SECOND_S);
sm.addInt(_countdown);
}
else
{
sm = SystemMessage.getSystemMessage(SystemMessageId.LET_THE_DUEL_BEGIN);
sm = new SystemMessage(SystemMessageId.LET_THE_DUEL_BEGIN);
}
broadcastToTeam1(sm);
@@ -807,7 +807,7 @@ public class Duel
case TEAM_2_SURRENDER:
{
restorePlayerConditions(false);
sm = _partyDuel ? SystemMessage.getSystemMessage(SystemMessageId.C1_S_PARTY_HAS_WON_THE_DUEL) : SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_WON_THE_DUEL);
sm = _partyDuel ? new SystemMessage(SystemMessageId.C1_S_PARTY_HAS_WON_THE_DUEL) : new SystemMessage(SystemMessageId.C1_HAS_WON_THE_DUEL);
sm.addString(_playerA.getName());
broadcastToTeam1(sm);
@@ -818,7 +818,7 @@ public class Duel
case TEAM_2_WIN:
{
restorePlayerConditions(false);
sm = _partyDuel ? SystemMessage.getSystemMessage(SystemMessageId.C1_S_PARTY_HAS_WON_THE_DUEL) : SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_WON_THE_DUEL);
sm = _partyDuel ? new SystemMessage(SystemMessageId.C1_S_PARTY_HAS_WON_THE_DUEL) : new SystemMessage(SystemMessageId.C1_HAS_WON_THE_DUEL);
sm.addString(_playerB.getName());
broadcastToTeam1(sm);
@@ -832,7 +832,7 @@ public class Duel
restorePlayerConditions(true);
// TODO: is there no other message for a canceled duel?
// send SystemMessage
sm = SystemMessage.getSystemMessage(SystemMessageId.THE_DUEL_HAS_ENDED_IN_A_TIE);
sm = new SystemMessage(SystemMessageId.THE_DUEL_HAS_ENDED_IN_A_TIE);
broadcastToTeam1(sm);
broadcastToTeam2(sm);
@@ -844,7 +844,7 @@ public class Duel
// hp,mp,cp seem to be restored in a timeout too...
restorePlayerConditions(false);
// send SystemMessage
sm = SystemMessage.getSystemMessage(SystemMessageId.THE_DUEL_HAS_ENDED_IN_A_TIE);
sm = new SystemMessage(SystemMessageId.THE_DUEL_HAS_ENDED_IN_A_TIE);
broadcastToTeam1(sm);
broadcastToTeam2(sm);
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/entity/Fort.java
+3 -3
View File
@@ -374,7 +374,7 @@ public final class Fort extends AbstractResidence
return false;
}
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_FORTRESS_BATTLE_OF_S1_HAS_FINISHED);
final SystemMessage sm = new SystemMessage(SystemMessageId.THE_FORTRESS_BATTLE_OF_S1_HAS_FINISHED);
sm.addCastleId(getResidenceId());
getSiege().announceToPlayer(sm);
@@ -405,7 +405,7 @@ public final class Fort extends AbstractResidence
// if clan already have castle, don't store him in fortress
if (clan.getCastleId() > 0)
{
getSiege().announceToPlayer(SystemMessage.getSystemMessage(SystemMessageId.THE_REBEL_ARMY_RECAPTURED_THE_FORTRESS));
getSiege().announceToPlayer(new SystemMessage(SystemMessageId.THE_REBEL_ARMY_RECAPTURED_THE_FORTRESS));
return false;
}
@@ -808,7 +808,7 @@ public final class Fort extends AbstractResidence
{
clan.setFortId(getResidenceId()); // Set has fort flag for new owner
SystemMessage sm;
sm = SystemMessage.getSystemMessage(SystemMessageId.S1_IS_VICTORIOUS_IN_THE_FORTRESS_BATTLE_OF_S2);
sm = new SystemMessage(SystemMessageId.S1_IS_VICTORIOUS_IN_THE_FORTRESS_BATTLE_OF_S2);
sm.addString(clan.getName());
sm.addCastleId(getResidenceId());
World.getInstance().getPlayers().forEach(p -> p.sendPacket(sm));
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/entity/FortSiege.java
+13 -13
View File
@@ -116,49 +116,49 @@ public class FortSiege implements Siegable
else if (_time == 600) // 10min remains
{
_fort.despawnSuspiciousMerchant();
sm = SystemMessage.getSystemMessage(SystemMessageId.S1_MINUTE_S_UNTIL_THE_FORTRESS_BATTLE_STARTS);
sm = new SystemMessage(SystemMessageId.S1_MINUTE_S_UNTIL_THE_FORTRESS_BATTLE_STARTS);
sm.addInt(10);
announceToPlayer(sm);
ThreadPool.schedule(new ScheduleStartSiegeTask(300), 300000); // Prepare task for 5 minutes left.
}
else if (_time == 300) // 5min remains
{
sm = SystemMessage.getSystemMessage(SystemMessageId.S1_MINUTE_S_UNTIL_THE_FORTRESS_BATTLE_STARTS);
sm = new SystemMessage(SystemMessageId.S1_MINUTE_S_UNTIL_THE_FORTRESS_BATTLE_STARTS);
sm.addInt(5);
announceToPlayer(sm);
ThreadPool.schedule(new ScheduleStartSiegeTask(60), 240000); // Prepare task for 1 minute left.
}
else if (_time == 60) // 1min remains
{
sm = SystemMessage.getSystemMessage(SystemMessageId.S1_MINUTE_S_UNTIL_THE_FORTRESS_BATTLE_STARTS);
sm = new SystemMessage(SystemMessageId.S1_MINUTE_S_UNTIL_THE_FORTRESS_BATTLE_STARTS);
sm.addInt(1);
announceToPlayer(sm);
ThreadPool.schedule(new ScheduleStartSiegeTask(30), 30000); // Prepare task for 30 seconds left.
}
else if (_time == 30) // 30seconds remains
{
sm = SystemMessage.getSystemMessage(SystemMessageId.S1_SECOND_S_UNTIL_THE_FORTRESS_BATTLE_STARTS);
sm = new SystemMessage(SystemMessageId.S1_SECOND_S_UNTIL_THE_FORTRESS_BATTLE_STARTS);
sm.addInt(30);
announceToPlayer(sm);
ThreadPool.schedule(new ScheduleStartSiegeTask(10), 20000); // Prepare task for 10 seconds left.
}
else if (_time == 10) // 10seconds remains
{
sm = SystemMessage.getSystemMessage(SystemMessageId.S1_SECOND_S_UNTIL_THE_FORTRESS_BATTLE_STARTS);
sm = new SystemMessage(SystemMessageId.S1_SECOND_S_UNTIL_THE_FORTRESS_BATTLE_STARTS);
sm.addInt(10);
announceToPlayer(sm);
ThreadPool.schedule(new ScheduleStartSiegeTask(5), 5000); // Prepare task for 5 seconds left.
}
else if (_time == 5) // 5seconds remains
{
sm = SystemMessage.getSystemMessage(SystemMessageId.S1_SECOND_S_UNTIL_THE_FORTRESS_BATTLE_STARTS);
sm = new SystemMessage(SystemMessageId.S1_SECOND_S_UNTIL_THE_FORTRESS_BATTLE_STARTS);
sm.addInt(5);
announceToPlayer(sm);
ThreadPool.schedule(new ScheduleStartSiegeTask(1), 4000); // Prepare task for 1 seconds left.
}
else if (_time == 1) // 1seconds remains
{
sm = SystemMessage.getSystemMessage(SystemMessageId.S1_SECOND_S_UNTIL_THE_FORTRESS_BATTLE_STARTS);
sm = new SystemMessage(SystemMessageId.S1_SECOND_S_UNTIL_THE_FORTRESS_BATTLE_STARTS);
sm.addInt(1);
announceToPlayer(sm);
ThreadPool.schedule(new ScheduleStartSiegeTask(0), 1000); // Prepare task start siege.
@@ -214,7 +214,7 @@ public class FortSiege implements Siegable
{
_siegeRestore = null;
resetSiege();
announceToPlayer(SystemMessage.getSystemMessage(SystemMessageId.THE_BARRACKS_FUNCTION_HAS_BEEN_RESTORED));
announceToPlayer(new SystemMessage(SystemMessageId.THE_BARRACKS_FUNCTION_HAS_BEEN_RESTORED));
}
catch (Exception e)
{
@@ -338,7 +338,7 @@ public class FortSiege implements Siegable
// Schedule a task to prepare auto siege end
_siegeEnd = ThreadPool.schedule(new ScheduleEndSiegeTask(), FortSiegeManager.getInstance().getSiegeLength() * 60 * 1000); // Prepare auto end task
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_FORTRESS_BATTLE_S1_HAS_BEGUN);
final SystemMessage sm = new SystemMessage(SystemMessageId.THE_FORTRESS_BATTLE_S1_HAS_BEGUN);
sm.addCastleId(_fort.getResidenceId());
announceToPlayer(sm);
saveFortSiege();
@@ -674,17 +674,17 @@ public class FortSiege implements Siegable
// TODO this also opens control room door at big fort
door.openMe();
}
_fort.getSiege().announceToPlayer(SystemMessage.getSystemMessage(SystemMessageId.ALL_BARRACKS_ARE_OCCUPIED));
_fort.getSiege().announceToPlayer(new SystemMessage(SystemMessageId.ALL_BARRACKS_ARE_OCCUPIED));
}
// schedule restoring doors/commanders respawn
else if (_siegeRestore == null)
{
_fort.getSiege().announceToPlayer(SystemMessage.getSystemMessage(SystemMessageId.THE_BARRACKS_HAVE_BEEN_SEIZED));
_fort.getSiege().announceToPlayer(new SystemMessage(SystemMessageId.THE_BARRACKS_HAVE_BEEN_SEIZED));
_siegeRestore = ThreadPool.schedule(new ScheduleSiegeRestore(), FortSiegeManager.getInstance().getCountDownLength() * 60 * 1000);
}
else
{
_fort.getSiege().announceToPlayer(SystemMessage.getSystemMessage(SystemMessageId.THE_BARRACKS_HAVE_BEEN_SEIZED));
_fort.getSiege().announceToPlayer(new SystemMessage(SystemMessageId.THE_BARRACKS_HAVE_BEEN_SEIZED));
}
}
else
@@ -898,7 +898,7 @@ public class FortSiege implements Siegable
if (_fort.getOwnerClan() != null)
{
_fort.getOwnerClan().broadcastToOnlineMembers(SystemMessage.getSystemMessage(SystemMessageId.A_FORTRESS_IS_UNDER_ATTACK));
_fort.getOwnerClan().broadcastToOnlineMembers(new SystemMessage(SystemMessageId.A_FORTRESS_IS_UNDER_ATTACK));
}
// Execute siege auto start
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/entity/Hero.java
+1 -1
View File
@@ -933,7 +933,7 @@ public class Hero
if ((clan != null) && (clan.getLevel() >= 5))
{
clan.addReputationScore(Config.HERO_POINTS, true);
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.CLAN_MEMBER_C1_WAS_NAMED_A_HERO_S2_POINTS_HAVE_BEEN_ADDED_TO_YOUR_CLAN_REPUTATION);
final SystemMessage sm = new SystemMessage(SystemMessageId.CLAN_MEMBER_C1_WAS_NAMED_A_HERO_S2_POINTS_HAVE_BEEN_ADDED_TO_YOUR_CLAN_REPUTATION);
sm.addString(CharNameTable.getInstance().getNameById(player.getObjectId()));
sm.addInt(Config.HERO_POINTS);
clan.broadcastToOnlineMembers(sm);
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/entity/Siege.java
+14 -14
View File
@@ -102,35 +102,35 @@ public class Siege implements Siegable
final long timeRemaining = _siegeEndDate.getTimeInMillis() - Calendar.getInstance().getTimeInMillis();
if (timeRemaining > 3600000)
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_HOUR_S_UNTIL_CASTLE_SIEGE_CONCLUSION);
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HOUR_S_UNTIL_CASTLE_SIEGE_CONCLUSION);
sm.addInt(2);
announceToPlayer(sm, true);
ThreadPool.schedule(new ScheduleEndSiegeTask(_castleInst), timeRemaining - 3600000); // Prepare task for 1 hr left.
}
else if ((timeRemaining <= 3600000) && (timeRemaining > 600000))
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_MINUTE_S_UNTIL_CASTLE_SIEGE_CONCLUSION);
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_MINUTE_S_UNTIL_CASTLE_SIEGE_CONCLUSION);
sm.addInt((int) timeRemaining / 60000);
announceToPlayer(sm, true);
ThreadPool.schedule(new ScheduleEndSiegeTask(_castleInst), timeRemaining - 600000); // Prepare task for 10 minute left.
}
else if ((timeRemaining <= 600000) && (timeRemaining > 300000))
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_MINUTE_S_UNTIL_CASTLE_SIEGE_CONCLUSION);
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_MINUTE_S_UNTIL_CASTLE_SIEGE_CONCLUSION);
sm.addInt((int) timeRemaining / 60000);
announceToPlayer(sm, true);
ThreadPool.schedule(new ScheduleEndSiegeTask(_castleInst), timeRemaining - 300000); // Prepare task for 5 minute left.
}
else if ((timeRemaining <= 300000) && (timeRemaining > 10000))
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_MINUTE_S_UNTIL_CASTLE_SIEGE_CONCLUSION);
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_MINUTE_S_UNTIL_CASTLE_SIEGE_CONCLUSION);
sm.addInt((int) timeRemaining / 60000);
announceToPlayer(sm, true);
ThreadPool.schedule(new ScheduleEndSiegeTask(_castleInst), timeRemaining - 10000); // Prepare task for 10 seconds count down
}
else if ((timeRemaining <= 10000) && (timeRemaining > 0))
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THIS_CASTLE_SIEGE_WILL_END_IN_S1_SECOND_S);
final SystemMessage sm = new SystemMessage(SystemMessageId.THIS_CASTLE_SIEGE_WILL_END_IN_S1_SECOND_S);
sm.addInt((int) timeRemaining / 1000);
announceToPlayer(sm, true);
ThreadPool.schedule(new ScheduleEndSiegeTask(_castleInst), timeRemaining); // Prepare task for second count down
@@ -185,7 +185,7 @@ public class Siege implements Siegable
}
else if ((timeRemaining <= 86400000) && (timeRemaining > 13600000))
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_REGISTRATION_TERM_FOR_S1_HAS_ENDED);
final SystemMessage sm = new SystemMessage(SystemMessageId.THE_REGISTRATION_TERM_FOR_S1_HAS_ENDED);
sm.addCastleId(_castle.getResidenceId());
Broadcast.toAllOnlinePlayers(sm);
_isRegistrationOver = true;
@@ -248,14 +248,14 @@ public class Siege implements Siegable
{
if (_isInProgress)
{
SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_S1_SIEGE_HAS_FINISHED);
SystemMessage sm = new SystemMessage(SystemMessageId.THE_S1_SIEGE_HAS_FINISHED);
sm.addCastleId(_castle.getResidenceId());
Broadcast.toAllOnlinePlayers(sm);
if (_castle.getOwnerId() > 0)
{
final Clan clan = ClanTable.getInstance().getClan(getCastle().getOwnerId());
sm = SystemMessage.getSystemMessage(SystemMessageId.CLAN_S1_IS_VICTORIOUS_OVER_S2_S_CASTLE_SIEGE);
sm = new SystemMessage(SystemMessageId.CLAN_S1_IS_VICTORIOUS_OVER_S2_S_CASTLE_SIEGE);
sm.addString(clan.getName());
sm.addCastleId(_castle.getResidenceId());
Broadcast.toAllOnlinePlayers(sm);
@@ -283,7 +283,7 @@ public class Siege implements Siegable
}
else
{
sm = SystemMessage.getSystemMessage(SystemMessageId.THE_SIEGE_OF_S1_HAS_ENDED_IN_A_DRAW);
sm = new SystemMessage(SystemMessageId.THE_SIEGE_OF_S1_HAS_ENDED_IN_A_DRAW);
sm.addCastleId(_castle.getResidenceId());
Broadcast.toAllOnlinePlayers(sm);
}
@@ -492,11 +492,11 @@ public class Siege implements Siegable
SystemMessage sm;
if (_firstOwnerClanId <= 0)
{
sm = SystemMessage.getSystemMessage(SystemMessageId.THE_SIEGE_OF_S1_HAS_BEEN_CANCELED_DUE_TO_LACK_OF_INTEREST);
sm = new SystemMessage(SystemMessageId.THE_SIEGE_OF_S1_HAS_BEEN_CANCELED_DUE_TO_LACK_OF_INTEREST);
}
else
{
sm = SystemMessage.getSystemMessage(SystemMessageId.S1_S_SIEGE_WAS_CANCELED_BECAUSE_THERE_WERE_NO_CLANS_THAT_PARTICIPATED);
sm = new SystemMessage(SystemMessageId.S1_S_SIEGE_WAS_CANCELED_BECAUSE_THERE_WERE_NO_CLANS_THAT_PARTICIPATED);
final Clan ownerClan = ClanTable.getInstance().getClan(_firstOwnerClanId);
ownerClan.increaseBloodAllianceCount();
}
@@ -527,7 +527,7 @@ public class Siege implements Siegable
_siegeEndDate.add(Calendar.MINUTE, SiegeManager.getInstance().getSiegeLength());
ThreadPool.schedule(new ScheduleEndSiegeTask(_castle), 1000); // Prepare auto end task
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_S1_SIEGE_HAS_STARTED);
final SystemMessage sm = new SystemMessage(SystemMessageId.THE_S1_SIEGE_HAS_STARTED);
sm.addCastleId(_castle.getResidenceId());
Broadcast.toAllOnlinePlayers(sm);
@@ -1137,7 +1137,7 @@ public class Siege implements Siegable
{
if (_isRegistrationOver)
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_DEADLINE_TO_REGISTER_FOR_THE_SIEGE_OF_S1_HAS_PASSED);
final SystemMessage sm = new SystemMessage(SystemMessageId.THE_DEADLINE_TO_REGISTER_FOR_THE_SIEGE_OF_S1_HAS_PASSED);
sm.addCastleId(_castle.getResidenceId());
player.sendPacket(sm);
}
@@ -1459,7 +1459,7 @@ public class Siege implements Siegable
}
}
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_HAS_ANNOUNCED_THE_NEXT_CASTLE_SIEGE_TIME);
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_ANNOUNCED_THE_NEXT_CASTLE_SIEGE_TIME);
sm.addCastleId(_castle.getResidenceId());
Broadcast.toAllOnlinePlayers(sm);
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/events/AbstractScript.java
+3 -3
View File
@@ -2578,21 +2578,21 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
// If item for reward is gold, send message of gold reward to client
if (item.getId() == Inventory.ADENA_ID)
{
final SystemMessage smsg = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_EARNED_S1_ADENA);
final SystemMessage smsg = new SystemMessage(SystemMessageId.YOU_HAVE_EARNED_S1_ADENA);
smsg.addLong(count);
player.sendPacket(smsg);
}
// Otherwise, send message of object reward to client
else if (count > 1)
{
final SystemMessage smsg = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_EARNED_S2_S1_S);
final SystemMessage smsg = new SystemMessage(SystemMessageId.YOU_HAVE_EARNED_S2_S1_S);
smsg.addItemName(item);
smsg.addLong(count);
player.sendPacket(smsg);
}
else
{
final SystemMessage smsg = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_EARNED_S1);
final SystemMessage smsg = new SystemMessage(SystemMessageId.YOU_HAVE_EARNED_S1);
smsg.addItemName(item);
player.sendPacket(smsg);
}
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/fishing/Fishing.java
+1 -1
View File
@@ -320,7 +320,7 @@ public class Fishing
final long sp = (long) (Rnd.get(fishingData.getSpRateMin(), fishingData.getSpRateMax()) * lvlModifier);
_player.addExpAndSp(xp, sp, true);
_player.getInventory().addItem("Fishing Reward", fishingCatchData.getItemId(), 1, _player, null);
final SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_EARNED_S1);
final SystemMessage msg = new SystemMessage(SystemMessageId.YOU_HAVE_EARNED_S1);
msg.addItemName(fishingCatchData.getItemId());
_player.sendPacket(msg);
_player.unchargeShot(ShotType.FISH_SOULSHOTS);
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/instancezone/Instance.java
+3 -3
View File
@@ -832,7 +832,7 @@ public final class Instance implements IIdentifiable, INamable
ps.executeBatch();
// Save to memory and send message to player
final SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.INSTANT_ZONE_S1_S_ENTRY_HAS_BEEN_RESTRICTED_YOU_CAN_CHECK_THE_NEXT_POSSIBLE_ENTRY_TIME_BY_USING_THE_COMMAND_INSTANCEZONE);
final SystemMessage msg = new SystemMessage(SystemMessageId.INSTANT_ZONE_S1_S_ENTRY_HAS_BEEN_RESTRICTED_YOU_CAN_CHECK_THE_NEXT_POSSIBLE_ENTRY_TIME_BY_USING_THE_COMMAND_INSTANCEZONE);
if (InstanceManager.getInstance().getInstanceName(getTemplateId()) != null)
{
msg.addInstanceName(_template.getId());
@@ -898,7 +898,7 @@ public final class Instance implements IIdentifiable, INamable
if (!player.isOnCustomEvent() && (_template.getEjectTime() > 0))
{
// Send message
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.IF_YOU_ARE_NOT_RESURRECTED_WITHIN_S1_MINUTE_S_YOU_WILL_BE_EXPELLED_FROM_THE_INSTANT_ZONE);
final SystemMessage sm = new SystemMessage(SystemMessageId.IF_YOU_ARE_NOT_RESURRECTED_WITHIN_S1_MINUTE_S_YOU_WILL_BE_EXPELLED_FROM_THE_INSTANT_ZONE);
sm.addInt(_template.getEjectTime());
player.sendPacket(sm);
@@ -1152,7 +1152,7 @@ public final class Instance implements IIdentifiable, INamable
{
return;
}
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THIS_INSTANT_ZONE_WILL_BE_TERMINATED_IN_S1_MINUTE_S_YOU_WILL_BE_FORCED_OUT_OF_THE_DUNGEON_WHEN_THE_TIME_EXPIRES);
final SystemMessage sm = new SystemMessage(SystemMessageId.THIS_INSTANT_ZONE_WILL_BE_TERMINATED_IN_S1_MINUTE_S_YOU_WILL_BE_FORCED_OUT_OF_THE_DUNGEON_WHEN_THE_TIME_EXPIRES);
sm.addInt(delay);
broadcastPacket(sm);
}
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/instancezone/conditions/Condition.java
+1 -1
View File
@@ -136,7 +136,7 @@ public abstract class Condition
// Send system message if condition has any
if (_systemMsg != null)
{
final SystemMessage msg = SystemMessage.getSystemMessage(_systemMsg);
final SystemMessage msg = new SystemMessage(_systemMsg);
if (_systemMsgParams != null)
{
_systemMsgParams.accept(msg, member);
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java
+3 -3
View File
@@ -317,7 +317,7 @@ public final class ItemAuction
onPlayerBid(player, bid);
updatePlayerBid(bid, false);
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_SUBMITTED_A_BID_FOR_THE_AUCTION_OF_S1);
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_SUBMITTED_A_BID_FOR_THE_AUCTION_OF_S1);
sm.addLong(newBid);
player.sendPacket(sm);
}
@@ -348,7 +348,7 @@ public final class ItemAuction
{
_auctionEndingExtendState = ItemAuctionExtendState.EXTEND_BY_5_MIN;
_endingTime += ENDING_TIME_EXTEND_5;
broadcastToAllBidders(SystemMessage.getSystemMessage(SystemMessageId.BIDDER_EXISTS_THE_AUCTION_TIME_HAS_BEEN_EXTENDED_BY_5_MINUTES));
broadcastToAllBidders(new SystemMessage(SystemMessageId.BIDDER_EXISTS_THE_AUCTION_TIME_HAS_BEEN_EXTENDED_BY_5_MINUTES));
break;
}
case EXTEND_BY_5_MIN:
@@ -357,7 +357,7 @@ public final class ItemAuction
{
_auctionEndingExtendState = ItemAuctionExtendState.EXTEND_BY_3_MIN;
_endingTime += ENDING_TIME_EXTEND_3;
broadcastToAllBidders(SystemMessage.getSystemMessage(SystemMessageId.BIDDER_EXISTS_AUCTION_TIME_HAS_BEEN_EXTENDED_BY_3_MINUTES));
broadcastToAllBidders(new SystemMessage(SystemMessageId.BIDDER_EXISTS_AUCTION_TIME_HAS_BEEN_EXTENDED_BY_3_MINUTES));
}
break;
}
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java
+1 -1
View File
@@ -477,7 +477,7 @@ public final class ItemAuctionInstance
final void onAuctionFinished(ItemAuction auction)
{
auction.broadcastToAllBiddersInternal(SystemMessage.getSystemMessage(SystemMessageId.S1_S_AUCTION_HAS_ENDED).addInt(auction.getAuctionId()));
auction.broadcastToAllBiddersInternal(new SystemMessage(SystemMessageId.S1_S_AUCTION_HAS_ENDED).addInt(auction.getAuctionId()));
final ItemAuctionBid bid = auction.getHighestBid();
if (bid != null)
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/items/Item.java
+1 -1
View File
@@ -842,7 +842,7 @@ public abstract class Item extends ListenersContainer implements IIdentifiable
}
else if (msgId != 0)
{
final SystemMessage sm = SystemMessage.getSystemMessage(msgId);
final SystemMessage sm = new SystemMessage(msgId);
if (preCondition.isAddName())
{
sm.addItemName(_itemId);
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/items/Weapon.java
+1 -1
View File
@@ -305,7 +305,7 @@ public final class Weapon extends Item
}
if (caster.isPlayer())
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_HAS_BEEN_ACTIVATED);
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_BEEN_ACTIVATED);
sm.addSkillName(skill);
caster.sendPacket(sm);
}
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java
+7 -7
View File
@@ -1380,21 +1380,21 @@ public final class ItemInstance extends WorldObject
{
case 10:
{
sm = SystemMessage.getSystemMessage(SystemMessageId.S1_S_REMAINING_MANA_IS_NOW_10);
sm = new SystemMessage(SystemMessageId.S1_S_REMAINING_MANA_IS_NOW_10);
sm.addItemName(_item);
player.sendPacket(sm);
break;
}
case 5:
{
sm = SystemMessage.getSystemMessage(SystemMessageId.S1_S_REMAINING_MANA_IS_NOW_5);
sm = new SystemMessage(SystemMessageId.S1_S_REMAINING_MANA_IS_NOW_5);
sm.addItemName(_item);
player.sendPacket(sm);
break;
}
case 1:
{
sm = SystemMessage.getSystemMessage(SystemMessageId.S1_S_REMAINING_MANA_IS_NOW_1_IT_WILL_DISAPPEAR_SOON);
sm = new SystemMessage(SystemMessageId.S1_S_REMAINING_MANA_IS_NOW_1_IT_WILL_DISAPPEAR_SOON);
sm.addItemName(_item);
player.sendPacket(sm);
break;
@@ -1403,7 +1403,7 @@ public final class ItemInstance extends WorldObject
if (_mana == 0) // The life time has expired
{
sm = SystemMessage.getSystemMessage(SystemMessageId.S1_S_REMAINING_MANA_IS_NOW_0_AND_THE_ITEM_HAS_DISAPPEARED);
sm = new SystemMessage(SystemMessageId.S1_S_REMAINING_MANA_IS_NOW_0_AND_THE_ITEM_HAS_DISAPPEARED);
sm.addItemName(_item);
player.sendPacket(sm);
@@ -1891,7 +1891,7 @@ public final class ItemInstance extends WorldObject
{
player.getWarehouse().destroyItem("ItemInstance", this, player, null);
}
player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.S1_HAS_EXPIRED).addItemName(_itemId));
player.sendPacket(new SystemMessage(SystemMessageId.S1_HAS_EXPIRED).addItemName(_itemId));
}
}
@@ -2538,11 +2538,11 @@ public final class ItemInstance extends WorldObject
if (isEnchanted())
{
player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.S1_S2_HAS_BEEN_RESTORED_TO_ITS_PREVIOUS_APPEARANCE_AS_ITS_TEMPORARY_MODIFICATION_HAS_EXPIRED).addInt(_enchantLevel).addItemName(this));
player.sendPacket(new SystemMessage(SystemMessageId.S1_S2_HAS_BEEN_RESTORED_TO_ITS_PREVIOUS_APPEARANCE_AS_ITS_TEMPORARY_MODIFICATION_HAS_EXPIRED).addInt(_enchantLevel).addItemName(this));
}
else
{
player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.S1_HAS_BEEN_RESTORED_TO_ITS_PREVIOUS_APPEARANCE_AS_ITS_TEMPORARY_MODIFICATION_HAS_EXPIRED).addItemName(this));
player.sendPacket(new SystemMessage(SystemMessageId.S1_HAS_BEEN_RESTORED_TO_ITS_PREVIOUS_APPEARANCE_AS_ITS_TEMPORARY_MODIFICATION_HAS_EXPIRED).addItemName(this));
}
}
}
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/matching/CommandChannelMatchingRoom.java
+2 -2
View File
@@ -63,7 +63,7 @@ public class CommandChannelMatchingRoom extends MatchingRoom
});
// Send SystemMessage to others player
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_ENTERED_THE_COMMAND_CHANNEL_MATCHING_ROOM);
final SystemMessage sm = new SystemMessage(SystemMessageId.C1_ENTERED_THE_COMMAND_CHANNEL_MATCHING_ROOM);
sm.addPcName(player);
getMembers().stream().filter(p -> p != player).forEach(sm::sendTo);
@@ -81,7 +81,7 @@ public class CommandChannelMatchingRoom extends MatchingRoom
p.sendPacket(new ExMPCCRoomMember(player, this));
});
final SystemMessage sm = SystemMessage.getSystemMessage(kicked ? SystemMessageId.YOU_WERE_EXPELLED_FROM_THE_COMMAND_CHANNEL_MATCHING_ROOM : SystemMessageId.YOU_EXITED_FROM_THE_COMMAND_CHANNEL_MATCHING_ROOM);
final SystemMessage sm = new SystemMessage(kicked ? SystemMessageId.YOU_WERE_EXPELLED_FROM_THE_COMMAND_CHANNEL_MATCHING_ROOM : SystemMessageId.YOU_EXITED_FROM_THE_COMMAND_CHANNEL_MATCHING_ROOM);
player.sendPacket(sm);
}
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/matching/PartyMatchingRoom.java
+3 -3
View File
@@ -64,7 +64,7 @@ public final class PartyMatchingRoom extends MatchingRoom
});
// Send SystemMessage to others player
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_ENTERED_THE_PARTY_ROOM);
final SystemMessage sm = new SystemMessage(SystemMessageId.C1_HAS_ENTERED_THE_PARTY_ROOM);
sm.addPcName(player);
getMembers().stream().filter(p -> p != player).forEach(sm::sendTo);
@@ -76,7 +76,7 @@ public final class PartyMatchingRoom extends MatchingRoom
@Override
protected void notifyRemovedMember(PlayerInstance player, boolean kicked, boolean leaderChanged)
{
final SystemMessage sm = SystemMessage.getSystemMessage(kicked ? SystemMessageId.C1_HAS_BEEN_KICKED_FROM_THE_PARTY_ROOM : SystemMessageId.C1_HAS_LEFT_THE_PARTY_ROOM);
final SystemMessage sm = new SystemMessage(kicked ? SystemMessageId.C1_HAS_BEEN_KICKED_FROM_THE_PARTY_ROOM : SystemMessageId.C1_HAS_LEFT_THE_PARTY_ROOM);
sm.addPcName(player);
getMembers().forEach(p ->
@@ -87,7 +87,7 @@ public final class PartyMatchingRoom extends MatchingRoom
p.sendPacket(SystemMessageId.THE_LEADER_OF_THE_PARTY_ROOM_HAS_CHANGED);
});
final SystemMessage sm2 = SystemMessage.getSystemMessage(kicked ? SystemMessageId.YOU_HAVE_BEEN_OUSTED_FROM_THE_PARTY_ROOM : SystemMessageId.YOU_HAVE_EXITED_THE_PARTY_ROOM);
final SystemMessage sm2 = new SystemMessage(kicked ? SystemMessageId.YOU_HAVE_BEEN_OUSTED_FROM_THE_PARTY_ROOM : SystemMessageId.YOU_HAVE_EXITED_THE_PARTY_ROOM);
player.sendPacket(sm2);
player.sendPacket(ExClosePartyRoom.STATIC_PACKET);
}
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java
+14 -14
View File
@@ -88,7 +88,7 @@ public abstract class AbstractOlympiadGame
protected final void addPointsToParticipant(Participant par, int points)
{
par.updateStat(POINTS, points);
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_EARNED_S2_POINTS_IN_THE_OLYMPIAD_GAMES);
final SystemMessage sm = new SystemMessage(SystemMessageId.C1_HAS_EARNED_S2_POINTS_IN_THE_OLYMPIAD_GAMES);
sm.addString(par.getName());
sm.addInt(points);
broadcastPacket(sm);
@@ -97,7 +97,7 @@ public abstract class AbstractOlympiadGame
protected final void removePointsFromParticipant(Participant par, int points)
{
par.updateStat(POINTS, -points);
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_LOST_S2_POINTS_IN_THE_OLYMPIAD_GAMES);
final SystemMessage sm = new SystemMessage(SystemMessageId.C1_HAS_LOST_S2_POINTS_IN_THE_OLYMPIAD_GAMES);
sm.addString(par.getName());
sm.addInt(points);
broadcastPacket(sm);
@@ -112,49 +112,49 @@ public abstract class AbstractOlympiadGame
{
if ((player == null) || !player.isOnline())
{
return SystemMessage.getSystemMessage(SystemMessageId.YOUR_OPPONENT_MADE_HASTE_WITH_THEIR_TAIL_BETWEEN_THEIR_LEGS_THE_MATCH_HAS_BEEN_CANCELLED);
return new SystemMessage(SystemMessageId.YOUR_OPPONENT_MADE_HASTE_WITH_THEIR_TAIL_BETWEEN_THEIR_LEGS_THE_MATCH_HAS_BEEN_CANCELLED);
}
if ((player.getClient() == null) || player.getClient().isDetached())
{
return SystemMessage.getSystemMessage(SystemMessageId.YOUR_OPPONENT_MADE_HASTE_WITH_THEIR_TAIL_BETWEEN_THEIR_LEGS_THE_MATCH_HAS_BEEN_CANCELLED);
return new SystemMessage(SystemMessageId.YOUR_OPPONENT_MADE_HASTE_WITH_THEIR_TAIL_BETWEEN_THEIR_LEGS_THE_MATCH_HAS_BEEN_CANCELLED);
}
// safety precautions
if (player.inObserverMode())
{
return SystemMessage.getSystemMessage(SystemMessageId.YOUR_OPPONENT_DOES_NOT_MEET_THE_REQUIREMENTS_TO_DO_BATTLE_THE_MATCH_HAS_BEEN_CANCELLED);
return new SystemMessage(SystemMessageId.YOUR_OPPONENT_DOES_NOT_MEET_THE_REQUIREMENTS_TO_DO_BATTLE_THE_MATCH_HAS_BEEN_CANCELLED);
}
SystemMessage sm;
if (player.isDead())
{
sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_CURRENTLY_DEAD_AND_CANNOT_PARTICIPATE_IN_THE_OLYMPIAD);
sm = new SystemMessage(SystemMessageId.C1_IS_CURRENTLY_DEAD_AND_CANNOT_PARTICIPATE_IN_THE_OLYMPIAD);
sm.addPcName(player);
player.sendPacket(sm);
return SystemMessage.getSystemMessage(SystemMessageId.YOUR_OPPONENT_DOES_NOT_MEET_THE_REQUIREMENTS_TO_DO_BATTLE_THE_MATCH_HAS_BEEN_CANCELLED);
return new SystemMessage(SystemMessageId.YOUR_OPPONENT_DOES_NOT_MEET_THE_REQUIREMENTS_TO_DO_BATTLE_THE_MATCH_HAS_BEEN_CANCELLED);
}
if (player.isSubClassActive())
{
sm = SystemMessage.getSystemMessage(SystemMessageId.C1_DOES_NOT_MEET_THE_PARTICIPATION_REQUIREMENTS_YOU_CANNOT_PARTICIPATE_IN_THE_OLYMPIAD_BECAUSE_YOU_HAVE_CHANGED_YOUR_CLASS_TO_SUBCLASS);
sm = new SystemMessage(SystemMessageId.C1_DOES_NOT_MEET_THE_PARTICIPATION_REQUIREMENTS_YOU_CANNOT_PARTICIPATE_IN_THE_OLYMPIAD_BECAUSE_YOU_HAVE_CHANGED_YOUR_CLASS_TO_SUBCLASS);
sm.addPcName(player);
player.sendPacket(sm);
return SystemMessage.getSystemMessage(SystemMessageId.YOUR_OPPONENT_DOES_NOT_MEET_THE_REQUIREMENTS_TO_DO_BATTLE_THE_MATCH_HAS_BEEN_CANCELLED);
return new SystemMessage(SystemMessageId.YOUR_OPPONENT_DOES_NOT_MEET_THE_REQUIREMENTS_TO_DO_BATTLE_THE_MATCH_HAS_BEEN_CANCELLED);
}
if (player.isCursedWeaponEquipped())
{
sm = SystemMessage.getSystemMessage(SystemMessageId.C1_DOES_NOT_MEET_THE_PARTICIPATION_REQUIREMENTS_THE_OWNER_OF_S2_CANNOT_PARTICIPATE_IN_THE_OLYMPIAD);
sm = new SystemMessage(SystemMessageId.C1_DOES_NOT_MEET_THE_PARTICIPATION_REQUIREMENTS_THE_OWNER_OF_S2_CANNOT_PARTICIPATE_IN_THE_OLYMPIAD);
sm.addPcName(player);
sm.addItemName(player.getCursedWeaponEquippedId());
player.sendPacket(sm);
return SystemMessage.getSystemMessage(SystemMessageId.YOUR_OPPONENT_DOES_NOT_MEET_THE_REQUIREMENTS_TO_DO_BATTLE_THE_MATCH_HAS_BEEN_CANCELLED);
return new SystemMessage(SystemMessageId.YOUR_OPPONENT_DOES_NOT_MEET_THE_REQUIREMENTS_TO_DO_BATTLE_THE_MATCH_HAS_BEEN_CANCELLED);
}
if (!player.isInventoryUnder90(true))
{
sm = SystemMessage.getSystemMessage(SystemMessageId.C1_DOES_NOT_MEET_THE_PARTICIPATION_REQUIREMENTS_AS_THE_INVENTORY_WEIGHT_SLOT_IS_FILLED_BEYOND_80);
sm = new SystemMessage(SystemMessageId.C1_DOES_NOT_MEET_THE_PARTICIPATION_REQUIREMENTS_AS_THE_INVENTORY_WEIGHT_SLOT_IS_FILLED_BEYOND_80);
sm.addPcName(player);
player.sendPacket(sm);
return SystemMessage.getSystemMessage(SystemMessageId.YOUR_OPPONENT_DOES_NOT_MEET_THE_REQUIREMENTS_TO_DO_BATTLE_THE_MATCH_HAS_BEEN_CANCELLED);
return new SystemMessage(SystemMessageId.YOUR_OPPONENT_DOES_NOT_MEET_THE_REQUIREMENTS_TO_DO_BATTLE_THE_MATCH_HAS_BEEN_CANCELLED);
}
return null;
@@ -425,7 +425,7 @@ public abstract class AbstractOlympiadGame
}
iu.addModifiedItem(item);
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_EARNED_S2_S1_S);
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_EARNED_S2_S1_S);
sm.addItemName(item);
sm.addLong(holder.getCount());
player.sendPacket(sm);
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java
+5 -5
View File
@@ -448,7 +448,7 @@ public class Olympiad extends ListenersContainer
@Override
public void run()
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.ROUND_S1_OF_THE_OLYMPIAD_GAMES_HAS_NOW_ENDED);
final SystemMessage sm = new SystemMessage(SystemMessageId.ROUND_S1_OF_THE_OLYMPIAD_GAMES_HAS_NOW_ENDED);
sm.addInt(_currentCycle);
Broadcast.toAllOnlinePlayers(sm);
@@ -529,7 +529,7 @@ public class Olympiad extends ListenersContainer
_inCompPeriod = true;
Broadcast.toAllOnlinePlayers(SystemMessage.getSystemMessage(SystemMessageId.SHARPEN_YOUR_SWORDS_TIGHTEN_THE_STITCHING_IN_YOUR_ARMOR_AND_MAKE_HASTE_TO_A_OLYMPIAD_MANAGER_BATTLES_IN_THE_OLYMPIAD_GAMES_ARE_NOW_TAKING_PLACE));
Broadcast.toAllOnlinePlayers(new SystemMessage(SystemMessageId.SHARPEN_YOUR_SWORDS_TIGHTEN_THE_STITCHING_IN_YOUR_ARMOR_AND_MAKE_HASTE_TO_A_OLYMPIAD_MANAGER_BATTLES_IN_THE_OLYMPIAD_GAMES_ARE_NOW_TAKING_PLACE));
LOGGER.info("Olympiad System: Olympiad Games have started.");
LOGGER_OLYMPIAD.info("Result,Player1,Player2,Player1 HP,Player2 HP,Player1 Damage,Player2 Damage,Points,Classed");
@@ -542,7 +542,7 @@ public class Olympiad extends ListenersContainer
final long regEnd = getMillisToCompEnd() - 600000;
if (regEnd > 0)
{
ThreadPool.schedule(() -> Broadcast.toAllOnlinePlayers(SystemMessage.getSystemMessage(SystemMessageId.THE_OLYMPIAD_REGISTRATION_PERIOD_HAS_ENDED)), regEnd);
ThreadPool.schedule(() -> Broadcast.toAllOnlinePlayers(new SystemMessage(SystemMessageId.THE_OLYMPIAD_REGISTRATION_PERIOD_HAS_ENDED)), regEnd);
}
_scheduledCompEnd = ThreadPool.schedule(() ->
@@ -552,7 +552,7 @@ public class Olympiad extends ListenersContainer
return;
}
_inCompPeriod = false;
Broadcast.toAllOnlinePlayers(SystemMessage.getSystemMessage(SystemMessageId.MUCH_CARNAGE_HAS_BEEN_LEFT_FOR_THE_CLEANUP_CREW_OF_THE_OLYMPIAD_STADIUM_BATTLES_IN_THE_OLYMPIAD_GAMES_ARE_NOW_OVER));
Broadcast.toAllOnlinePlayers(new SystemMessage(SystemMessageId.MUCH_CARNAGE_HAS_BEEN_LEFT_FOR_THE_CLEANUP_CREW_OF_THE_OLYMPIAD_STADIUM_BATTLES_IN_THE_OLYMPIAD_GAMES_ARE_NOW_OVER));
LOGGER.info("Olympiad System: Olympiad games have ended.");
while (OlympiadGameManager.getInstance().isBattleStarted()) // cleared in game manager
@@ -619,7 +619,7 @@ public class Olympiad extends ListenersContainer
protected void setNewOlympiadEnd()
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.ROUND_S1_OF_THE_OLYMPIAD_GAMES_HAS_STARTED);
final SystemMessage sm = new SystemMessage(SystemMessageId.ROUND_S1_OF_THE_OLYMPIAD_GAMES_HAS_STARTED);
sm.addInt(_currentCycle);
Broadcast.toAllOnlinePlayers(sm);
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameManager.java
+2 -2
View File
@@ -156,7 +156,7 @@ public class OlympiadGameManager implements Runnable
final PlayerInstance noble = World.getInstance().getPlayer(id);
if (noble != null)
{
noble.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.THE_GAMES_MAY_BE_DELAYED_DUE_TO_AN_INSUFFICIENT_NUMBER_OF_PLAYERS_WAITING));
noble.sendPacket(new SystemMessage(SystemMessageId.THE_GAMES_MAY_BE_DELAYED_DUE_TO_AN_INSUFFICIENT_NUMBER_OF_PLAYERS_WAITING));
}
}
@@ -172,7 +172,7 @@ public class OlympiadGameManager implements Runnable
final PlayerInstance noble = World.getInstance().getPlayer(id);
if (noble != null)
{
noble.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.THE_GAMES_MAY_BE_DELAYED_DUE_TO_AN_INSUFFICIENT_NUMBER_OF_PLAYERS_WAITING));
noble.sendPacket(new SystemMessage(SystemMessageId.THE_GAMES_MAY_BE_DELAYED_DUE_TO_AN_INSUFFICIENT_NUMBER_OF_PLAYERS_WAITING));
}
}
}
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java
+7 -7
View File
@@ -443,7 +443,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame
{
if (_pTwoCrash && !_pOneCrash)
{
sm = SystemMessage.getSystemMessage(SystemMessageId.CONGRATULATIONS_C1_YOU_WIN_THE_MATCH);
sm = new SystemMessage(SystemMessageId.CONGRATULATIONS_C1_YOU_WIN_THE_MATCH);
sm.addString(_playerOne.getName());
stadium.broadcastPacket(sm);
@@ -469,7 +469,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame
}
else if (_pOneCrash && !_pTwoCrash)
{
sm = SystemMessage.getSystemMessage(SystemMessageId.CONGRATULATIONS_C1_YOU_WIN_THE_MATCH);
sm = new SystemMessage(SystemMessageId.CONGRATULATIONS_C1_YOU_WIN_THE_MATCH);
sm.addString(_playerTwo.getName());
stadium.broadcastPacket(sm);
@@ -494,7 +494,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame
}
else if (_pOneCrash && _pTwoCrash)
{
stadium.broadcastPacket(SystemMessage.getSystemMessage(SystemMessageId.THERE_IS_NO_VICTOR_THE_MATCH_ENDS_IN_A_TIE));
stadium.broadcastPacket(new SystemMessage(SystemMessageId.THERE_IS_NO_VICTOR_THE_MATCH_ENDS_IN_A_TIE));
_playerOne.updateStat(COMP_LOST, 1);
removePointsFromParticipant(_playerOne, pointDiff);
@@ -576,12 +576,12 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame
{
_playerOne.updateStat(COMP_DRAWN, 1);
_playerTwo.updateStat(COMP_DRAWN, 1);
sm = SystemMessage.getSystemMessage(SystemMessageId.THERE_IS_NO_VICTOR_THE_MATCH_ENDS_IN_A_TIE);
sm = new SystemMessage(SystemMessageId.THERE_IS_NO_VICTOR_THE_MATCH_ENDS_IN_A_TIE);
stadium.broadcastPacket(sm);
}
else if ((_playerTwo.getPlayer() == null) || !_playerTwo.getPlayer().isOnline() || ((playerTwoHp == 0) && (playerOneHp != 0)) || ((_damageP1 > _damageP2) && (playerTwoHp != 0) && (playerOneHp != 0)))
{
sm = SystemMessage.getSystemMessage(SystemMessageId.CONGRATULATIONS_C1_YOU_WIN_THE_MATCH);
sm = new SystemMessage(SystemMessageId.CONGRATULATIONS_C1_YOU_WIN_THE_MATCH);
sm.addString(_playerOne.getName());
stadium.broadcastPacket(sm);
@@ -606,7 +606,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame
}
else if ((_playerOne.getPlayer() == null) || !_playerOne.getPlayer().isOnline() || ((playerOneHp == 0) && (playerTwoHp != 0)) || ((_damageP2 > _damageP1) && (playerOneHp != 0) && (playerTwoHp != 0)))
{
sm = SystemMessage.getSystemMessage(SystemMessageId.CONGRATULATIONS_C1_YOU_WIN_THE_MATCH);
sm = new SystemMessage(SystemMessageId.CONGRATULATIONS_C1_YOU_WIN_THE_MATCH);
sm.addString(_playerTwo.getName());
stadium.broadcastPacket(sm);
@@ -634,7 +634,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame
// Save Fight Result
saveResults(_playerOne, _playerTwo, 0, _startTime, _fightTime, getType());
sm = SystemMessage.getSystemMessage(SystemMessageId.THERE_IS_NO_VICTOR_THE_MATCH_ENDS_IN_A_TIE);
sm = new SystemMessage(SystemMessageId.THERE_IS_NO_VICTOR_THE_MATCH_ENDS_IN_A_TIE);
stadium.broadcastPacket(sm);
int value = Math.min(playerOnePoints / getDivider(), Config.ALT_OLY_MAX_POINTS);
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameTask.java
+6 -6
View File
@@ -193,7 +193,7 @@ public final class OlympiadGameTask implements Runnable
{
if (_countDown > 0)
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_WILL_BE_MOVED_TO_THE_OLYMPIAD_STADIUM_IN_S1_SECOND_S);
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_WILL_BE_MOVED_TO_THE_OLYMPIAD_STADIUM_IN_S1_SECOND_S);
sm.addInt(_countDown);
_game.broadcastPacket(sm);
}
@@ -236,7 +236,7 @@ public final class OlympiadGameTask implements Runnable
}
else
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_MATCH_WILL_START_IN_S1_SECOND_S);
final SystemMessage sm = new SystemMessage(SystemMessageId.THE_MATCH_WILL_START_IN_S1_SECOND_S);
sm.addInt(_countDown);
_stadium.broadcastPacket(sm);
}
@@ -260,7 +260,7 @@ public final class OlympiadGameTask implements Runnable
{
if (_countDown > 0)
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_MATCH_WILL_START_IN_S1_SECOND_S);
final SystemMessage sm = new SystemMessage(SystemMessageId.THE_MATCH_WILL_START_IN_S1_SECOND_S);
sm.addInt(_countDown);
_stadium.broadcastPacket(sm);
}
@@ -293,7 +293,7 @@ public final class OlympiadGameTask implements Runnable
{
if (announceTime == remaining)
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_GAME_WILL_END_IN_S1_SECOND_S);
final SystemMessage sm = new SystemMessage(SystemMessageId.THE_GAME_WILL_END_IN_S1_SECOND_S);
sm.addInt(announceTime);
_stadium.broadcastPacket(sm);
break;
@@ -320,7 +320,7 @@ public final class OlympiadGameTask implements Runnable
{
if (_countDown > 0)
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_WILL_BE_MOVED_BACK_TO_TOWN_IN_S1_SECOND_S);
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_WILL_BE_MOVED_BACK_TO_TOWN_IN_S1_SECOND_S);
sm.addInt(_countDown);
_game.broadcastPacket(sm);
}
@@ -439,7 +439,7 @@ public final class OlympiadGameTask implements Runnable
{
// game successfully started
_game.broadcastOlympiadInfo(_stadium);
_stadium.broadcastPacket(SystemMessage.getSystemMessage(SystemMessageId.THE_MATCH_HAS_STARTED_FIGHT));
_stadium.broadcastPacket(new SystemMessage(SystemMessageId.THE_MATCH_HAS_STARTED_FIGHT));
_stadium.updateZoneStatusForCharactersInside();
return true;
}
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java
+5 -5
View File
@@ -100,7 +100,7 @@ public class OlympiadManager
{
if (showMessage)
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_ALREADY_REGISTERED_ON_THE_WAITING_LIST_FOR_THE_ALL_CLASS_BATTLE);
final SystemMessage sm = new SystemMessage(SystemMessageId.C1_IS_ALREADY_REGISTERED_ON_THE_WAITING_LIST_FOR_THE_ALL_CLASS_BATTLE);
sm.addPcName(noble);
player.sendPacket(sm);
}
@@ -112,7 +112,7 @@ public class OlympiadManager
{
if (showMessage)
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_ALREADY_REGISTERED_ON_THE_CLASS_MATCH_WAITING_LIST);
final SystemMessage sm = new SystemMessage(SystemMessageId.C1_IS_ALREADY_REGISTERED_ON_THE_CLASS_MATCH_WAITING_LIST);
sm.addPcName(noble);
player.sendPacket(sm);
}
@@ -154,14 +154,14 @@ public class OlympiadManager
{
case CLASSED:
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_ALREADY_REGISTERED_ON_THE_CLASS_MATCH_WAITING_LIST);
final SystemMessage sm = new SystemMessage(SystemMessageId.C1_IS_ALREADY_REGISTERED_ON_THE_CLASS_MATCH_WAITING_LIST);
sm.addPcName(noble);
player.sendPacket(sm);
break;
}
case NON_CLASSED:
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_ALREADY_REGISTERED_ON_THE_WAITING_LIST_FOR_THE_ALL_CLASS_BATTLE);
final SystemMessage sm = new SystemMessage(SystemMessageId.C1_IS_ALREADY_REGISTERED_ON_THE_WAITING_LIST_FOR_THE_ALL_CLASS_BATTLE);
sm.addPcName(noble);
player.sendPacket(sm);
break;
@@ -264,7 +264,7 @@ public class OlympiadManager
if (noble.getNobleLevel() == 0)
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_DOES_NOT_MEET_THE_PARTICIPATION_REQUIREMENTS_ONLY_NOBLESSE_EXALTED_CHARACTERS_CAN_PARTICIPATE_IN_THE_OLYMPIAD);
final SystemMessage sm = new SystemMessage(SystemMessageId.C1_DOES_NOT_MEET_THE_PARTICIPATION_REQUIREMENTS_ONLY_NOBLESSE_EXALTED_CHARACTERS_CAN_PARTICIPATE_IN_THE_OLYMPIAD);
sm.addString(noble.getName());
noble.sendPacket(sm);
return false;
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/olympiad/OlympiadStadium.java
+2 -2
View File
@@ -137,11 +137,11 @@ public class OlympiadStadium
final SystemMessage sm;
if (battleStarted)
{
sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_ENTERED_A_COMBAT_ZONE);
sm = new SystemMessage(SystemMessageId.YOU_HAVE_ENTERED_A_COMBAT_ZONE);
}
else
{
sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_LEFT_A_COMBAT_ZONE);
sm = new SystemMessage(SystemMessageId.YOU_HAVE_LEFT_A_COMBAT_ZONE);
}
for (PlayerInstance player : _instance.getPlayers())
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java
+4 -4
View File
@@ -243,14 +243,14 @@ public final class BuffInfo
{
if (!_hideStartMessage && !_skill.isAura())
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_S_EFFECT_CAN_BE_FELT);
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_S_EFFECT_CAN_BE_FELT);
sm.addSkillName(_skill);
_effected.sendPacket(sm);
}
}
else
{
final SystemMessage sm = SystemMessage.getSystemMessage(_skill.isToggle() ? SystemMessageId.S1_HAS_BEEN_ABORTED : SystemMessageId.THE_EFFECT_OF_S1_HAS_BEEN_REMOVED);
final SystemMessage sm = new SystemMessage(_skill.isToggle() ? SystemMessageId.S1_HAS_BEEN_ABORTED : SystemMessageId.THE_EFFECT_OF_S1_HAS_BEEN_REMOVED);
sm.addSkillName(_skill);
_effected.sendPacket(sm);
}
@@ -309,7 +309,7 @@ public final class BuffInfo
// When effects are initialized, the successfully landed.
if (!_hideStartMessage && _effected.isPlayer() && !_skill.isHidingMessages() && !_skill.isAura())
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_S_EFFECT_CAN_BE_FELT);
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_S_EFFECT_CAN_BE_FELT);
sm.addSkillName(_skill);
_effected.sendPacket(sm);
}
@@ -417,7 +417,7 @@ public final class BuffInfo
if ((smId != null) && (_effected.getActingPlayer() != null) && _effected.getActingPlayer().isOnline())
{
final SystemMessage sm = SystemMessage.getSystemMessage(smId);
final SystemMessage sm = new SystemMessage(smId);
sm.addSkillName(_skill);
_effected.sendPacket(sm);
}
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/skills/Skill.java
+2 -2
View File
@@ -1066,7 +1066,7 @@ public final class Skill implements IIdentifiable
if (creature.isPlayer() && creature.getActingPlayer().isMounted() && isBad() && !MountEnabledSkillList.contains(_id))
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CANNOT_BE_USED_DUE_TO_UNSUITABLE_TERMS);
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_CANNOT_BE_USED_DUE_TO_UNSUITABLE_TERMS);
sm.addSkillName(_id);
creature.sendPacket(sm);
return false;
@@ -1076,7 +1076,7 @@ public final class Skill implements IIdentifiable
{
if (!((creature == object) && isBad())) // Self targeted bad skills should not send a message.
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CANNOT_BE_USED_DUE_TO_UNSUITABLE_TERMS);
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_CANNOT_BE_USED_DUE_TO_UNSUITABLE_TERMS);
sm.addSkillName(_id);
creature.sendPacket(sm);
}
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
+7 -7
View File
@@ -329,7 +329,7 @@ public class SkillCaster implements Runnable
if (caster.isPlayer() && !instantCast)
{
// Send a system message to the player.
caster.sendPacket(_skill.getId() != 2046 ? SystemMessage.getSystemMessage(SystemMessageId.YOU_USE_S1).addSkillName(_skill) : SystemMessage.getSystemMessage(SystemMessageId.SUMMONING_YOUR_PET));
caster.sendPacket(_skill.getId() != 2046 ? new SystemMessage(SystemMessageId.YOU_USE_S1).addSkillName(_skill) : new SystemMessage(SystemMessageId.SUMMONING_YOUR_PET));
// Show the gauge bar for casting.
caster.sendPacket(new SetupGauge(caster.getObjectId(), SetupGauge.BLUE, displayedCastTime));
@@ -360,7 +360,7 @@ public class SkillCaster implements Runnable
}
player.setFame(player.getFame() - _skill.getFamePointConsume());
final SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.S1_FAME_HAS_BEEN_CONSUMED);
final SystemMessage msg = new SystemMessage(SystemMessageId.S1_FAME_HAS_BEEN_CONSUMED);
msg.addInt(_skill.getFamePointConsume());
player.sendPacket(msg);
}
@@ -376,7 +376,7 @@ public class SkillCaster implements Runnable
}
clan.takeReputationScore(_skill.getClanRepConsume(), true);
final SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.S1_CLAN_REPUTATION_HAS_BEEN_CONSUMED);
final SystemMessage msg = new SystemMessage(SystemMessageId.S1_CLAN_REPUTATION_HAS_BEEN_CONSUMED);
msg.addInt(_skill.getClanRepConsume());
player.sendPacket(msg);
}
@@ -1020,14 +1020,14 @@ public class SkillCaster implements Runnable
{
if (skill.hasEffectType(EffectType.SUMMON))
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.SUMMONING_A_SERVITOR_COSTS_S2_S1);
final SystemMessage sm = new SystemMessage(SystemMessageId.SUMMONING_A_SERVITOR_COSTS_S2_S1);
sm.addItemName(skill.getItemConsumeId());
sm.addInt(skill.getItemConsumeCount());
caster.sendPacket(sm);
}
else
{
caster.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.THERE_ARE_NOT_ENOUGH_NECESSARY_ITEMS_TO_USE_THE_SKILL));
caster.sendPacket(new SystemMessage(SystemMessageId.THERE_ARE_NOT_ENOUGH_NECESSARY_ITEMS_TO_USE_THE_SKILL));
}
return false;
}
@@ -1056,7 +1056,7 @@ public class SkillCaster implements Runnable
// Check if not in AirShip
if (player.isInAirShip() && !skill.hasEffectType(EffectType.REFUEL_AIRSHIP))
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CANNOT_BE_USED_DUE_TO_UNSUITABLE_TERMS);
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_CANNOT_BE_USED_DUE_TO_UNSUITABLE_TERMS);
sm.addSkillName(skill);
player.sendPacket(sm);
return false;
@@ -1082,7 +1082,7 @@ public class SkillCaster implements Runnable
// Check for skill reuse (fixes macro right click press exploit).
if (caster.hasSkillReuse(skill.getReuseHashCode()))
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_IS_NOT_AVAILABLE_AT_THIS_TIME_BEING_PREPARED_FOR_REUSE);
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_IS_NOT_AVAILABLE_AT_THIS_TIME_BEING_PREPARED_FOR_REUSE);
sm.addSkillName(skill);
caster.sendPacket(sm);
return false;
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/stats/Formulas.java
+10 -10
View File
@@ -174,7 +174,7 @@ public final class Formulas
}
else
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_RESISTED_YOUR_S2);
final SystemMessage sm = new SystemMessage(SystemMessageId.C1_HAS_RESISTED_YOUR_S2);
sm.addString(target.getName());
sm.addSkillName(skill);
attacker.sendPacket(sm);
@@ -184,7 +184,7 @@ public final class Formulas
if (target.isPlayer())
{
final SystemMessage sm = (skill.hasEffectType(EffectType.HP_DRAIN)) ? SystemMessage.getSystemMessage(SystemMessageId.YOU_RESISTED_C1_S_DRAIN) : SystemMessage.getSystemMessage(SystemMessageId.YOU_RESISTED_C1_S_MAGIC);
final SystemMessage sm = (skill.hasEffectType(EffectType.HP_DRAIN)) ? new SystemMessage(SystemMessageId.YOU_RESISTED_C1_S_DRAIN) : new SystemMessage(SystemMessageId.YOU_RESISTED_C1_S_MAGIC);
sm.addString(attacker.getName());
target.sendPacket(sm);
}
@@ -692,7 +692,7 @@ public final class Formulas
if (resisted)
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_RESISTED_YOUR_S2);
final SystemMessage sm = new SystemMessage(SystemMessageId.C1_HAS_RESISTED_YOUR_S2);
sm.addString(target.getName());
sm.addSkillName(skill);
attacker.sendPacket(sm);
@@ -723,7 +723,7 @@ public final class Formulas
if ((finalRate <= Rnd.get(100)) && (target != attacker))
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_RESISTED_YOUR_S2);
final SystemMessage sm = new SystemMessage(SystemMessageId.C1_HAS_RESISTED_YOUR_S2);
sm.addString(target.getName());
sm.addSkillName(skill);
attacker.sendPacket(sm);
@@ -878,7 +878,7 @@ public final class Formulas
{
if (attacker.isPlayer())
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.DAMAGE_IS_DECREASED_BECAUSE_C1_RESISTED_C2_S_MAGIC);
final SystemMessage sm = new SystemMessage(SystemMessageId.DAMAGE_IS_DECREASED_BECAUSE_C1_RESISTED_C2_S_MAGIC);
sm.addString(target.getName());
sm.addString(attacker.getName());
attacker.sendPacket(sm);
@@ -887,7 +887,7 @@ public final class Formulas
if (target.isPlayer())
{
final SystemMessage sm2 = SystemMessage.getSystemMessage(SystemMessageId.C1_WEAKLY_RESISTED_C2_S_MAGIC);
final SystemMessage sm2 = new SystemMessage(SystemMessageId.C1_WEAKLY_RESISTED_C2_S_MAGIC);
sm2.addString(target.getName());
sm2.addString(attacker.getName());
target.sendPacket(sm2);
@@ -928,13 +928,13 @@ public final class Formulas
{
if (creature.isPlayer())
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_DODGED_THE_ATTACK);
final SystemMessage sm = new SystemMessage(SystemMessageId.C1_DODGED_THE_ATTACK);
sm.addString(target.getName());
creature.getActingPlayer().sendPacket(sm);
}
if (target.isPlayer())
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_DODGED_C1_S_ATTACK);
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_DODGED_C1_S_ATTACK);
sm.addString(creature.getName());
target.getActingPlayer().sendPacket(sm);
}
@@ -1017,13 +1017,13 @@ public final class Formulas
{
if (target.isPlayer())
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_COUNTERED_C1_S_ATTACK);
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_COUNTERED_C1_S_ATTACK);
sm.addString(attacker.getName());
target.sendPacket(sm);
}
if (attacker.isPlayer())
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_PERFORMING_A_COUNTERATTACK);
final SystemMessage sm = new SystemMessage(SystemMessageId.C1_IS_PERFORMING_A_COUNTERATTACK);
sm.addString(target.getName());
attacker.sendPacket(sm);
}
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/zone/type/MotherTreeZone.java
+2 -2
View File
@@ -72,7 +72,7 @@ public class MotherTreeZone extends ZoneType
creature.setInsideZone(ZoneId.MOTHER_TREE, true);
if (_enterMsg != 0)
{
player.sendPacket(SystemMessage.getSystemMessage(_enterMsg));
player.sendPacket(new SystemMessage(_enterMsg));
}
}
}
@@ -86,7 +86,7 @@ public class MotherTreeZone extends ZoneType
player.setInsideZone(ZoneId.MOTHER_TREE, false);
if (_leaveMsg != 0)
{
player.sendPacket(SystemMessage.getSystemMessage(_leaveMsg));
player.sendPacket(new SystemMessage(_leaveMsg));
}
}
}
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/GameClient.java
+24 -1
View File
@@ -46,8 +46,10 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.clan.Clan;
import org.l2jmobius.gameserver.model.holders.ClientHardwareInfoHolder;
import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
import org.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage;
import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld;
import org.l2jmobius.gameserver.network.serverpackets.NpcSay;
import org.l2jmobius.gameserver.network.serverpackets.ServerClose;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
import org.l2jmobius.gameserver.security.SecondaryPasswordAuth;
@@ -248,6 +250,27 @@ public final class GameClient extends ChannelInboundHandler<GameClient>
return;
}
// TODO: Set as parameter to packets used?
if (Config.MULTILANG_ENABLE && (_player != null))
{
final String lang = _player.getLang();
if ((lang != null) && !lang.equals("en"))
{
if (packet instanceof SystemMessage)
{
((SystemMessage) packet).setLang(lang);
}
else if (packet instanceof NpcSay)
{
((NpcSay) packet).setLang(lang);
}
else if (packet instanceof ExShowScreenMessage)
{
((ExShowScreenMessage) packet).setLang(lang);
}
}
}
// Write into the channel.
_channel.writeAndFlush(packet);
@@ -260,7 +283,7 @@ public final class GameClient extends ChannelInboundHandler<GameClient>
*/
public void sendPacket(SystemMessageId smId)
{
sendPacket(SystemMessage.getSystemMessage(smId));
sendPacket(new SystemMessage(smId));
}
public boolean isDetached()
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/NpcStringId.java
+151
View File
@@ -16,19 +16,32 @@
*/
package org.l2jmobius.gameserver.network;
import java.io.File;
import java.lang.reflect.Field;
import java.lang.reflect.Modifier;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.xml.parsers.DocumentBuilderFactory;
import org.w3c.dom.Document;
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.model.clientstrings.Builder;
import org.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage;
public final class NpcStringId
{
private static final Logger LOGGER = Logger.getLogger(NpcStringId.class.getName());
private static final NSLocalisation[] EMPTY_NSL_ARRAY = new NSLocalisation[0];
public static final NpcStringId[] EMPTY_ARRAY = new NpcStringId[0];
private static Map<Integer, NpcStringId> VALUES = new HashMap<>();
@ClientString(id = 1, message = "Hello! I am $s1. You are $s2, right? Hehehe")
@@ -37948,6 +37961,7 @@ public final class NpcStringId
static
{
buildFastLookupTable();
loadLocalisations();
}
private static void buildFastLookupTable()
@@ -38024,9 +38038,97 @@ public final class NpcStringId
}
}
public static void loadLocalisations()
{
for (NpcStringId nsId : VALUES.values())
{
if (nsId != null)
{
nsId.removeAllLocalisations();
}
}
if (!Config.MULTILANG_ENABLE)
{
LOGGER.log(Level.INFO, "NpcStringId: MultiLanguage disabled.");
return;
}
final List<String> languages = Config.MULTILANG_ALLOWED;
final DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
factory.setValidating(false);
factory.setIgnoringComments(true);
File file;
Node node;
Document doc;
NamedNodeMap nnmb;
NpcStringId nsId;
String text;
for (String lang : languages)
{
file = new File("data/lang/" + lang + "/NpcStringLocalisation.xml");
if (!file.isFile())
{
continue;
}
LOGGER.log(Level.INFO, "NpcStringId: Loading localisation for '" + lang + "'");
try
{
doc = factory.newDocumentBuilder().parse(file);
for (Node na = doc.getFirstChild(); na != null; na = na.getNextSibling())
{
if ("list".equals(na.getNodeName()))
{
for (Node nb = na.getFirstChild(); nb != null; nb = nb.getNextSibling())
{
if ("localisation".equals(nb.getNodeName()))
{
nnmb = nb.getAttributes();
node = nnmb.getNamedItem("id");
if (node != null)
{
nsId = getNpcStringId(Integer.parseInt(node.getNodeValue()));
if (nsId == null)
{
LOGGER.log(Level.WARNING, "NpcStringId: Unknown NSID '" + node.getNodeValue() + "', lang '" + lang + "'.");
continue;
}
node = nnmb.getNamedItem("text");
if (node == null)
{
LOGGER.log(Level.WARNING, "NpcStringId: No text defined for NSID '" + nsId + "', lang '" + lang + "'.");
continue;
}
text = node.getNodeValue();
if (text.isEmpty() || (text.length() > 255))
{
LOGGER.log(Level.WARNING, "NpcStringId: Invalid text defined for NSID '" + nsId + "' (to long or empty), lang '" + lang + "'.");
continue;
}
nsId.attachLocalizedText(lang, text);
}
}
}
}
}
}
catch (Exception e)
{
LOGGER.log(Level.SEVERE, "NpcStringId: Failed loading '" + file + "'", e);
}
}
}
private final int _id;
private String _name;
private byte _params;
private NSLocalisation[] _localisations;
private ExShowScreenMessage _staticScreenMessage;
protected NpcStringId(int id)
@@ -38071,6 +38173,33 @@ public final class NpcStringId
_params = (byte) params;
}
public final NSLocalisation getLocalisation(String lang)
{
NSLocalisation nsl;
for (int i = _localisations.length; i-- > 0;)
{
nsl = _localisations[i];
if (nsl.getLanguage().hashCode() == lang.hashCode())
{
return nsl;
}
}
return null;
}
public final void attachLocalizedText(String lang, String text)
{
final int length = _localisations.length;
final NSLocalisation[] localisations = Arrays.copyOf(_localisations, length + 1);
localisations[length] = new NSLocalisation(lang, text);
_localisations = localisations;
}
public final void removeAllLocalisations()
{
_localisations = EMPTY_NSL_ARRAY;
}
public final ExShowScreenMessage getStaticScreenMessage()
{
return _staticScreenMessage;
@@ -38086,4 +38215,26 @@ public final class NpcStringId
{
return "NS[" + getId() + ":" + getName() + "]";
}
public static final class NSLocalisation
{
private final String _lang;
private final Builder _builder;
public NSLocalisation(String lang, String text)
{
_lang = lang;
_builder = Builder.newBuilder(text);
}
public final String getLanguage()
{
return _lang;
}
public final String getLocalisation(Object... params)
{
return _builder.toString(params);
}
}
}
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/SystemMessageId.java
+169 -2
View File
@@ -16,18 +16,32 @@
*/
package org.l2jmobius.gameserver.network;
import java.io.File;
import java.lang.reflect.Field;
import java.lang.reflect.Modifier;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.xml.parsers.DocumentBuilderFactory;
import org.w3c.dom.Document;
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.model.clientstrings.Builder;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
public final class SystemMessageId
{
private static final Logger LOGGER = Logger.getLogger(SystemMessageId.class.getName());
private static final SMLocalisation[] EMPTY_SML_ARRAY = new SMLocalisation[0];
public static final SystemMessageId[] EMPTY_ARRAY = new SystemMessageId[0];
private static Map<Integer, SystemMessageId> VALUES = new HashMap<>();
@ClientString(id = 0, message = "You have been disconnected from the server.")
@@ -15834,12 +15848,12 @@ public final class SystemMessageId
static
{
buildFastLookupTable();
loadLocalisations();
}
private static void buildFastLookupTable()
{
final Field[] fields = SystemMessageId.class.getDeclaredFields();
for (Field field : fields)
for (Field field : SystemMessageId.class.getDeclaredFields())
{
final int mod = field.getModifiers();
if (Modifier.isStatic(mod) && Modifier.isPublic(mod) && field.getType().equals(SystemMessageId.class) && field.isAnnotationPresent(ClientString.class))
@@ -15893,14 +15907,115 @@ public final class SystemMessageId
return VALUES.get(id);
}
public static SystemMessageId getSystemMessageId(String name)
{
try
{
return (SystemMessageId) SystemMessageId.class.getField(name).get(null);
}
catch (Exception e)
{
return null;
}
}
public static void loadLocalisations()
{
for (SystemMessageId smId : VALUES.values())
{
if (smId != null)
{
smId.removeAllLocalisations();
}
}
if (!Config.MULTILANG_ENABLE)
{
LOGGER.log(Level.INFO, "SystemMessageId: MultiLanguage disabled.");
return;
}
final List<String> languages = Config.MULTILANG_ALLOWED;
final DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
factory.setValidating(false);
factory.setIgnoringComments(true);
File file;
Node node;
Document doc;
NamedNodeMap nnmb;
SystemMessageId smId;
String text;
for (String lang : languages)
{
file = new File("data/lang/" + lang + "/SystemMessageLocalisation.xml");
if (!file.isFile())
{
continue;
}
LOGGER.log(Level.INFO, "SystemMessageId: Loading localisation for '" + lang + "'");
try
{
doc = factory.newDocumentBuilder().parse(file);
for (Node na = doc.getFirstChild(); na != null; na = na.getNextSibling())
{
if ("list".equals(na.getNodeName()))
{
for (Node nb = na.getFirstChild(); nb != null; nb = nb.getNextSibling())
{
if ("localisation".equals(nb.getNodeName()))
{
nnmb = nb.getAttributes();
node = nnmb.getNamedItem("id");
if (node != null)
{
smId = getSystemMessageId(Integer.parseInt(node.getNodeValue()));
if (smId == null)
{
LOGGER.log(Level.WARNING, "SystemMessageId: Unknown SMID '" + node.getNodeValue() + "', lang '" + lang + "'.");
continue;
}
node = nnmb.getNamedItem("text");
if (node == null)
{
LOGGER.log(Level.WARNING, "SystemMessageId: No text defined for SMID '" + smId + "', lang '" + lang + "'.");
continue;
}
text = node.getNodeValue();
if (text.isEmpty() || (text.length() > 255))
{
LOGGER.log(Level.WARNING, "SystemMessageId: Invalid text defined for SMID '" + smId + "' (to long or empty), lang '" + lang + "'.");
continue;
}
smId.attachLocalizedText(lang, text);
}
}
}
}
}
}
catch (Exception e)
{
LOGGER.log(Level.SEVERE, "SystemMessageId: Failed loading '" + file + "'", e);
}
}
}
private final int _id;
private String _name;
private byte _params;
private SMLocalisation[] _localisations;
private SystemMessage _staticSystemMessage;
private SystemMessageId(int id)
{
_id = id;
_localisations = EMPTY_SML_ARRAY;
}
public final int getId()
@@ -15929,17 +16044,47 @@ public final class SystemMessageId
{
throw new IllegalArgumentException("Invalid negative param count: " + params);
}
if (params > 10)
{
throw new IllegalArgumentException("Maximum param count exceeded: " + params);
}
if (params != 0)
{
_staticSystemMessage = null;
}
_params = (byte) params;
}
public final SMLocalisation getLocalisation(String lang)
{
SMLocalisation sml;
for (int i = _localisations.length; i-- > 0;)
{
sml = _localisations[i];
if (sml.getLanguage().hashCode() == lang.hashCode())
{
return sml;
}
}
return null;
}
public final void attachLocalizedText(String lang, String text)
{
final int length = _localisations.length;
final SMLocalisation[] localisations = Arrays.copyOf(_localisations, length + 1);
localisations[length] = new SMLocalisation(lang, text);
_localisations = localisations;
}
public final void removeAllLocalisations()
{
_localisations = EMPTY_SML_ARRAY;
}
public final SystemMessage getStaticSystemMessage()
{
return _staticSystemMessage;
@@ -15955,4 +16100,26 @@ public final class SystemMessageId
{
return "SM[" + getId() + ": " + getName() + "]";
}
public static final class SMLocalisation
{
private final String _lang;
private final Builder _builder;
public SMLocalisation(String lang, String text)
{
_lang = lang;
_builder = Builder.newBuilder(text);
}
public final String getLanguage()
{
return _lang;
}
public final String getLocalisation(Object... params)
{
return _builder.toString(params);
}
}
}
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/AnswerCoupleAction.java
+1 -1
View File
@@ -81,7 +81,7 @@ public class AnswerCoupleAction implements IClientIncomingPacket
}
else if (_answer == -1) // refused
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_SET_TO_REFUSE_COUPLE_ACTIONS_AND_CANNOT_BE_REQUESTED_FOR_A_COUPLE_ACTION);
final SystemMessage sm = new SystemMessage(SystemMessageId.C1_IS_SET_TO_REFUSE_COUPLE_ACTIONS_AND_CANNOT_BE_REQUESTED_FOR_A_COUPLE_ACTION);
sm.addPcName(player);
target.sendPacket(sm);
}

Some files were not shown because too many files have changed in this diff Show More