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

Retail like builder HTML debugging.

Browse Source
This commit is contained in:
MobiusDev
2018-05-04 00:45:48 +00:00
parent 9a2c032428
commit 672645e672
875 changed files with 2911 additions and 2697 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/cache/HtmCache.java vendored
View File

@ -29,6 +29,8 @@ import java.util.regex.Pattern;
import com.l2jmobius.Config;
import com.l2jmobius.commons.util.file.filter.HTMLFilter;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.util.BuilderUtil;
import com.l2jmobius.gameserver.util.Util;
/**
@ -140,9 +142,9 @@ public class HtmCache
return null;
}
public String getHtmForce(String prefix, String path)
public String getHtmForce(L2PcInstance player, String path)
{
String content = getHtm(prefix, path);
String content = getHtm(player, path);
if (content == null)
{
content = "<html><body>My text is missing:<br>" + path + "</body></html>";
@ -151,8 +153,9 @@ public class HtmCache
return content;
}
public String getHtm(String prefix, String path)
public String getHtm(L2PcInstance player, String path)
{
final String prefix = player != null ? player.getHtmlPrefix() : "en";
String newPath = null;
String content;
if ((prefix != null) && !prefix.isEmpty())
@ -161,6 +164,10 @@ public class HtmCache
content = getHtm(newPath);
if (content != null)
{
if ((player != null) && player.isGM() && Config.GM_DEBUG_HTML_PATHS)
{
BuilderUtil.sendHtmlMessage(player, newPath.substring(5));
}
return content;
}
}
@ -171,6 +178,10 @@ public class HtmCache
_cache.put(newPath, content);
}
if ((player != null) && player.isGM() && (path != null) && Config.GM_DEBUG_HTML_PATHS)
{
BuilderUtil.sendHtmlMessage(player, path.substring(5));
}
return content;
}

2
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/PetitionManager.java
View File

@ -444,7 +444,7 @@ public final class PetitionManager
final SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm");
final NpcHtmlMessage html = new NpcHtmlMessage();
html.setFile(activeChar.getHtmlPrefix(), "data/html/admin/petition.htm");
html.setFile(activeChar, "data/html/admin/petition.htm");
html.replace("%petition%", String.valueOf(currPetition.getId()));
html.replace("%time%", dateFormat.format(new Date(currPetition.getSubmitTime())));
html.replace("%type%", currPetition.getTypeAsString());

8
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/SellBuffsManager.java
View File

@ -86,20 +86,20 @@ public final class SellBuffsManager implements IGameXmlReader
public void sendSellMenu(L2PcInstance player)
{
final String html = HtmCache.getInstance().getHtm(player.getHtmlPrefix(), htmlFolder + (player.isSellingBuffs() ? "BuffMenu_already.html" : "BuffMenu.html"));
final String html = HtmCache.getInstance().getHtm(player, htmlFolder + (player.isSellingBuffs() ? "BuffMenu_already.html" : "BuffMenu.html"));
CommunityBoardHandler.separateAndSend(html, player);
}
public void sendBuffChoiceMenu(L2PcInstance player, int index)
{
String html = HtmCache.getInstance().getHtm(player.getHtmlPrefix(), htmlFolder + "BuffChoice.html");
String html = HtmCache.getInstance().getHtm(player, htmlFolder + "BuffChoice.html");
html = html.replace("%list%", buildSkillMenu(player, index));
CommunityBoardHandler.separateAndSend(html, player);
}
public void sendBuffEditMenu(L2PcInstance player)
{
String html = HtmCache.getInstance().getHtm(player.getHtmlPrefix(), htmlFolder + "BuffChoice.html");
String html = HtmCache.getInstance().getHtm(player, htmlFolder + "BuffChoice.html");
html = html.replace("%list%", buildEditMenu(player));
CommunityBoardHandler.separateAndSend(html, player);
}
@ -111,7 +111,7 @@ public final class SellBuffsManager implements IGameXmlReader
return;
}
String html = HtmCache.getInstance().getHtm(player.getHtmlPrefix(), htmlFolder + "BuffBuyMenu.html");
String html = HtmCache.getInstance().getHtm(player, htmlFolder + "BuffBuyMenu.html");
html = html.replace("%list%", buildBuffMenu(player, seller, index));
CommunityBoardHandler.separateAndSend(html, player);
}

6
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/L2Npc.java
View File

@ -721,7 +721,7 @@ public class L2Npc extends L2Character
*/
private boolean showPkDenyChatWindow(L2PcInstance player, String type)
{
String html = HtmCache.getInstance().getHtm(player.getHtmlPrefix(), "data/html/" + type + "/" + getId() + "-pk.htm");
String html = HtmCache.getInstance().getHtm(player, "data/html/" + type + "/" + getId() + "-pk.htm");
if (html != null)
{
html = html.replaceAll("%objectId%", String.valueOf(getObjectId()));
@ -847,7 +847,7 @@ public class L2Npc extends L2Character
// Send a Server->Client NpcHtmlMessage containing the text of the L2NpcInstance to the L2PcInstance
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), filename);
html.setFile(player, filename);
html.replace("%npcname%", getName());
html.replace("%objectId%", String.valueOf(getObjectId()));
player.sendPacket(html);
@ -865,7 +865,7 @@ public class L2Npc extends L2Character
{
// Send a Server->Client NpcHtmlMessage containing the text of the L2NpcInstance to the L2PcInstance
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), filename);
html.setFile(player, filename);
html.replace("%objectId%", String.valueOf(getObjectId()));
player.sendPacket(html);

6
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2DoormenInstance.java
View File

@ -114,11 +114,11 @@ public class L2DoormenInstance extends L2NpcInstance
if (!isOwnerClan(player))
{
html.setFile(player.getHtmlPrefix(), "data/html/doormen/" + getTemplate().getId() + "-no.htm");
html.setFile(player, "data/html/doormen/" + getTemplate().getId() + "-no.htm");
}
else
{
html.setFile(player.getHtmlPrefix(), "data/html/doormen/" + getTemplate().getId() + ".htm");
html.setFile(player, "data/html/doormen/" + getTemplate().getId() + ".htm");
}
html.replace("%objectId%", String.valueOf(getObjectId()));
@ -152,7 +152,7 @@ public class L2DoormenInstance extends L2NpcInstance
player.sendPacket(ActionFailed.STATIC_PACKET);
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), "data/html/doormen/" + getTemplate().getId() + "-busy.htm");
html.setFile(player, "data/html/doormen/" + getTemplate().getId() + "-busy.htm");
player.sendPacket(html);
}

6
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2FortDoormenInstance.java
View File

@ -40,15 +40,15 @@ public class L2FortDoormenInstance extends L2DoormenInstance
if (!isOwnerClan(player))
{
html.setFile(player.getHtmlPrefix(), "data/html/doormen/" + getTemplate().getId() + "-no.htm");
html.setFile(player, "data/html/doormen/" + getTemplate().getId() + "-no.htm");
}
else if (isUnderSiege())
{
html.setFile(player.getHtmlPrefix(), "data/html/doormen/" + getTemplate().getId() + "-busy.htm");
html.setFile(player, "data/html/doormen/" + getTemplate().getId() + "-busy.htm");
}
else
{
html.setFile(player.getHtmlPrefix(), "data/html/doormen/" + getTemplate().getId() + ".htm");
html.setFile(player, "data/html/doormen/" + getTemplate().getId() + ".htm");
}
html.replace("%objectId%", String.valueOf(getObjectId()));

26
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2FortLogisticsInstance.java
View File

@ -77,12 +77,12 @@ public class L2FortLogisticsInstance extends L2MerchantInstance
{
if (isMyLord)
{
html.setFile(player.getHtmlPrefix(), "data/html/fortress/logistics-rewards.htm");
html.setFile(player, "data/html/fortress/logistics-rewards.htm");
html.replace("%bloodoath%", String.valueOf(player.getClan().getBloodOathCount()));
}
else
{
html.setFile(player.getHtmlPrefix(), "data/html/fortress/logistics-noprivs.htm");
html.setFile(player, "data/html/fortress/logistics-noprivs.htm");
}
html.replace("%objectId%", String.valueOf(getObjectId()));
player.sendPacket(html);
@ -96,16 +96,16 @@ public class L2FortLogisticsInstance extends L2MerchantInstance
{
player.addItem("Quest", 9910, blood, this, true);
player.getClan().resetBloodOathCount();
html.setFile(player.getHtmlPrefix(), "data/html/fortress/logistics-blood.htm");
html.setFile(player, "data/html/fortress/logistics-blood.htm");
}
else
{
html.setFile(player.getHtmlPrefix(), "data/html/fortress/logistics-noblood.htm");
html.setFile(player, "data/html/fortress/logistics-noblood.htm");
}
}
else
{
html.setFile(player.getHtmlPrefix(), "data/html/fortress/logistics-noprivs.htm");
html.setFile(player, "data/html/fortress/logistics-noprivs.htm");
}
html.replace("%objectId%", String.valueOf(getObjectId()));
player.sendPacket(html);
@ -116,17 +116,17 @@ public class L2FortLogisticsInstance extends L2MerchantInstance
{
if (player.isClanLeader())
{
html.setFile(player.getHtmlPrefix(), "data/html/fortress/logistics-supplylvl.htm");
html.setFile(player, "data/html/fortress/logistics-supplylvl.htm");
html.replace("%supplylvl%", String.valueOf(getFort().getSupplyLvL()));
}
else
{
html.setFile(player.getHtmlPrefix(), "data/html/fortress/logistics-noprivs.htm");
html.setFile(player, "data/html/fortress/logistics-noprivs.htm");
}
}
else
{
html.setFile(player.getHtmlPrefix(), "data/html/fortress/logistics-1.htm"); // TODO: Missing HTML?
html.setFile(player, "data/html/fortress/logistics-1.htm"); // TODO: Missing HTML?
}
html.replace("%objectId%", String.valueOf(getObjectId()));
player.sendPacket(html);
@ -137,7 +137,7 @@ public class L2FortLogisticsInstance extends L2MerchantInstance
{
if (getFort().getSiege().isInProgress())
{
html.setFile(player.getHtmlPrefix(), "data/html/fortress/logistics-siege.htm");
html.setFile(player, "data/html/fortress/logistics-siege.htm");
}
else
{
@ -155,17 +155,17 @@ public class L2FortLogisticsInstance extends L2MerchantInstance
getFort().setSupplyLvL(0);
getFort().saveFortVariables();
html.setFile(player.getHtmlPrefix(), "data/html/fortress/logistics-supply.htm");
html.setFile(player, "data/html/fortress/logistics-supply.htm");
}
else
{
html.setFile(player.getHtmlPrefix(), "data/html/fortress/logistics-nosupply.htm");
html.setFile(player, "data/html/fortress/logistics-nosupply.htm");
}
}
}
else
{
html.setFile(player.getHtmlPrefix(), "data/html/fortress/logistics-noprivs.htm");
html.setFile(player, "data/html/fortress/logistics-noprivs.htm");
}
html.replace("%objectId%", String.valueOf(getObjectId()));
player.sendPacket(html);
@ -198,7 +198,7 @@ public class L2FortLogisticsInstance extends L2MerchantInstance
}
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), filename);
html.setFile(player, filename);
html.replace("%objectId%", String.valueOf(getObjectId()));
html.replace("%npcId%", String.valueOf(getId()));
if (getFort().getOwnerClan() != null)

112
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2FortManagerInstance.java
View File

@ -97,14 +97,14 @@ public class L2FortManagerInstance extends L2MerchantInstance
if (player.hasClanPrivilege(ClanPrivilege.CS_DISMISS))
{
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), "data/html/fortress/foreman-expel.htm");
html.setFile(player, "data/html/fortress/foreman-expel.htm");
html.replace("%objectId%", String.valueOf(getObjectId()));
player.sendPacket(html);
}
else
{
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), "data/html/fortress/foreman-noprivs.htm");
html.setFile(player, "data/html/fortress/foreman-noprivs.htm");
html.replace("%objectId%", String.valueOf(getObjectId()));
player.sendPacket(html);
}
@ -116,14 +116,14 @@ public class L2FortManagerInstance extends L2MerchantInstance
{
getFort().banishForeigners(); // Move non-clan members off fortress area
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), "data/html/fortress/foreman-expeled.htm");
html.setFile(player, "data/html/fortress/foreman-expeled.htm");
html.replace("%objectId%", String.valueOf(getObjectId()));
player.sendPacket(html);
}
else
{
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), "data/html/fortress/foreman-noprivs.htm");
html.setFile(player, "data/html/fortress/foreman-noprivs.htm");
html.replace("%objectId%", String.valueOf(getObjectId()));
player.sendPacket(html);
}
@ -134,7 +134,7 @@ public class L2FortManagerInstance extends L2MerchantInstance
if (getFort().getFortState() < 2)
{
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), "data/html/fortress/foreman-report.htm");
html.setFile(player, "data/html/fortress/foreman-report.htm");
html.replace("%objectId%", String.valueOf(getObjectId()));
if (Config.FS_MAX_OWN_TIME > 0)
{
@ -155,7 +155,7 @@ public class L2FortManagerInstance extends L2MerchantInstance
else
{
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), "data/html/fortress/foreman-castlereport.htm");
html.setFile(player, "data/html/fortress/foreman-castlereport.htm");
html.replace("%objectId%", String.valueOf(getObjectId()));
int hour, minutes;
if (Config.FS_MAX_OWN_TIME > 0)
@ -196,14 +196,14 @@ public class L2FortManagerInstance extends L2MerchantInstance
if (open)
{
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), "data/html/fortress/foreman-opened.htm");
html.setFile(player, "data/html/fortress/foreman-opened.htm");
html.replace("%objectId%", String.valueOf(getObjectId()));
player.sendPacket(html);
}
else
{
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), "data/html/fortress/foreman-closed.htm");
html.setFile(player, "data/html/fortress/foreman-closed.htm");
html.replace("%objectId%", String.valueOf(getObjectId()));
player.sendPacket(html);
}
@ -211,7 +211,7 @@ public class L2FortManagerInstance extends L2MerchantInstance
else
{
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), "data/html/fortress/" + getTemplate().getId() + "-d.htm");
html.setFile(player, "data/html/fortress/" + getTemplate().getId() + "-d.htm");
html.replace("%objectId%", String.valueOf(getObjectId()));
html.replace("%npcname%", getName());
player.sendPacket(html);
@ -220,7 +220,7 @@ public class L2FortManagerInstance extends L2MerchantInstance
else
{
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), "data/html/fortress/foreman-noprivs.htm");
html.setFile(player, "data/html/fortress/foreman-noprivs.htm");
html.replace("%objectId%", String.valueOf(getObjectId()));
player.sendPacket(html);
}
@ -241,13 +241,13 @@ public class L2FortManagerInstance extends L2MerchantInstance
}
else
{
html.setFile(player.getHtmlPrefix(), "data/html/fortress/foreman-vault.htm");
html.setFile(player, "data/html/fortress/foreman-vault.htm");
sendHtmlMessage(player, html);
}
}
else
{
html.setFile(player.getHtmlPrefix(), "data/html/fortress/foreman-noprivs.htm");
html.setFile(player, "data/html/fortress/foreman-noprivs.htm");
sendHtmlMessage(player, html);
}
return;
@ -259,11 +259,11 @@ public class L2FortManagerInstance extends L2MerchantInstance
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
if (getFort().getFortFunction(Fort.FUNC_TELEPORT) == null)
{
html.setFile(player.getHtmlPrefix(), "data/html/fortress/foreman-nac.htm");
html.setFile(player, "data/html/fortress/foreman-nac.htm");
}
else
{
html.setFile(player.getHtmlPrefix(), "data/html/fortress/" + getId() + "-t" + getFort().getFortFunction(Fort.FUNC_TELEPORT).getLvl() + ".htm");
html.setFile(player, "data/html/fortress/" + getId() + "-t" + getFort().getFortFunction(Fort.FUNC_TELEPORT).getLvl() + ".htm");
}
sendHtmlMessage(player, html);
}
@ -272,11 +272,11 @@ public class L2FortManagerInstance extends L2MerchantInstance
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
if (getFort().getFortFunction(Fort.FUNC_SUPPORT) == null)
{
html.setFile(player.getHtmlPrefix(), "data/html/fortress/foreman-nac.htm");
html.setFile(player, "data/html/fortress/foreman-nac.htm");
}
else
{
html.setFile(player.getHtmlPrefix(), "data/html/fortress/support" + getFort().getFortFunction(Fort.FUNC_SUPPORT).getLvl() + ".htm");
html.setFile(player, "data/html/fortress/support" + getFort().getFortFunction(Fort.FUNC_SUPPORT).getLvl() + ".htm");
html.replace("%mp%", String.valueOf((int) getCurrentMp()));
}
sendHtmlMessage(player, html);
@ -288,7 +288,7 @@ public class L2FortManagerInstance extends L2MerchantInstance
else
{
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), "data/html/fortress/foreman-functions.htm");
html.setFile(player, "data/html/fortress/foreman-functions.htm");
if (getFort().getFortFunction(Fort.FUNC_RESTORE_EXP) != null)
{
html.replace("%xp_regen%", String.valueOf(getFort().getFortFunction(Fort.FUNC_RESTORE_EXP).getLvl()));
@ -334,7 +334,7 @@ public class L2FortManagerInstance extends L2MerchantInstance
if (val.equalsIgnoreCase("hp_cancel"))
{
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), "data/html/fortress/functions-cancel.htm");
html.setFile(player, "data/html/fortress/functions-cancel.htm");
html.replace("%apply%", "recovery hp 0");
sendHtmlMessage(player, html);
return;
@ -342,7 +342,7 @@ public class L2FortManagerInstance extends L2MerchantInstance
else if (val.equalsIgnoreCase("mp_cancel"))
{
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), "data/html/fortress/functions-cancel.htm");
html.setFile(player, "data/html/fortress/functions-cancel.htm");
html.replace("%apply%", "recovery mp 0");
sendHtmlMessage(player, html);
return;
@ -350,7 +350,7 @@ public class L2FortManagerInstance extends L2MerchantInstance
else if (val.equalsIgnoreCase("exp_cancel"))
{
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), "data/html/fortress/functions-cancel.htm");
html.setFile(player, "data/html/fortress/functions-cancel.htm");
html.replace("%apply%", "recovery exp 0");
sendHtmlMessage(player, html);
return;
@ -359,7 +359,7 @@ public class L2FortManagerInstance extends L2MerchantInstance
{
val = st.nextToken();
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), "data/html/fortress/functions-apply.htm");
html.setFile(player, "data/html/fortress/functions-apply.htm");
html.replace("%name%", "(HP Recovery Device)");
final int percent = Integer.parseInt(val);
int cost;
@ -387,7 +387,7 @@ public class L2FortManagerInstance extends L2MerchantInstance
{
val = st.nextToken();
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), "data/html/fortress/functions-apply.htm");
html.setFile(player, "data/html/fortress/functions-apply.htm");
html.replace("%name%", "(MP Recovery)");
final int percent = Integer.parseInt(val);
int cost;
@ -414,7 +414,7 @@ public class L2FortManagerInstance extends L2MerchantInstance
{
val = st.nextToken();
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), "data/html/fortress/functions-apply.htm");
html.setFile(player, "data/html/fortress/functions-apply.htm");
html.replace("%name%", "(EXP Recovery Device)");
final int percent = Integer.parseInt(val);
int cost;
@ -444,12 +444,12 @@ public class L2FortManagerInstance extends L2MerchantInstance
int fee;
val = st.nextToken();
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), "data/html/fortress/functions-apply_confirmed.htm");
html.setFile(player, "data/html/fortress/functions-apply_confirmed.htm");
if (getFort().getFortFunction(Fort.FUNC_RESTORE_HP) != null)
{
if (getFort().getFortFunction(Fort.FUNC_RESTORE_HP).getLvl() == Integer.parseInt(val))
{
html.setFile(player.getHtmlPrefix(), "data/html/fortress/functions-used.htm");
html.setFile(player, "data/html/fortress/functions-used.htm");
html.replace("%val%", val + "%");
sendHtmlMessage(player, html);
return;
@ -461,7 +461,7 @@ public class L2FortManagerInstance extends L2MerchantInstance
case 0:
{
fee = 0;
html.setFile(player.getHtmlPrefix(), "data/html/fortress/functions-cancel_confirmed.htm");
html.setFile(player, "data/html/fortress/functions-cancel_confirmed.htm");
break;
}
case 300:
@ -477,7 +477,7 @@ public class L2FortManagerInstance extends L2MerchantInstance
}
if (!getFort().updateFunctions(player, Fort.FUNC_RESTORE_HP, percent, fee, Config.FS_HPREG_FEE_RATIO, (getFort().getFortFunction(Fort.FUNC_RESTORE_HP) == null)))
{
html.setFile(player.getHtmlPrefix(), "data/html/fortress/low_adena.htm");
html.setFile(player, "data/html/fortress/low_adena.htm");
sendHtmlMessage(player, html);
}
sendHtmlMessage(player, html);
@ -491,12 +491,12 @@ public class L2FortManagerInstance extends L2MerchantInstance
int fee;
val = st.nextToken();
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), "data/html/fortress/functions-apply_confirmed.htm");
html.setFile(player, "data/html/fortress/functions-apply_confirmed.htm");
if (getFort().getFortFunction(Fort.FUNC_RESTORE_MP) != null)
{
if (getFort().getFortFunction(Fort.FUNC_RESTORE_MP).getLvl() == Integer.parseInt(val))
{
html.setFile(player.getHtmlPrefix(), "data/html/fortress/functions-used.htm");
html.setFile(player, "data/html/fortress/functions-used.htm");
html.replace("%val%", val + "%");
sendHtmlMessage(player, html);
return;
@ -508,7 +508,7 @@ public class L2FortManagerInstance extends L2MerchantInstance
case 0:
{
fee = 0;
html.setFile(player.getHtmlPrefix(), "data/html/fortress/functions-cancel_confirmed.htm");
html.setFile(player, "data/html/fortress/functions-cancel_confirmed.htm");
break;
}
case 40:
@ -524,7 +524,7 @@ public class L2FortManagerInstance extends L2MerchantInstance
}
if (!getFort().updateFunctions(player, Fort.FUNC_RESTORE_MP, percent, fee, Config.FS_MPREG_FEE_RATIO, (getFort().getFortFunction(Fort.FUNC_RESTORE_MP) == null)))
{
html.setFile(player.getHtmlPrefix(), "data/html/fortress/low_adena.htm");
html.setFile(player, "data/html/fortress/low_adena.htm");
sendHtmlMessage(player, html);
}
sendHtmlMessage(player, html);
@ -538,12 +538,12 @@ public class L2FortManagerInstance extends L2MerchantInstance
int fee;
val = st.nextToken();
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), "data/html/fortress/functions-apply_confirmed.htm");
html.setFile(player, "data/html/fortress/functions-apply_confirmed.htm");
if (getFort().getFortFunction(Fort.FUNC_RESTORE_EXP) != null)
{
if (getFort().getFortFunction(Fort.FUNC_RESTORE_EXP).getLvl() == Integer.parseInt(val))
{
html.setFile(player.getHtmlPrefix(), "data/html/fortress/functions-used.htm");
html.setFile(player, "data/html/fortress/functions-used.htm");
html.replace("%val%", val + "%");
sendHtmlMessage(player, html);
return;
@ -555,7 +555,7 @@ public class L2FortManagerInstance extends L2MerchantInstance
case 0:
{
fee = 0;
html.setFile(player.getHtmlPrefix(), "data/html/fortress/functions-cancel_confirmed.htm");
html.setFile(player, "data/html/fortress/functions-cancel_confirmed.htm");
break;
}
case 45:
@ -571,7 +571,7 @@ public class L2FortManagerInstance extends L2MerchantInstance
}
if (!getFort().updateFunctions(player, Fort.FUNC_RESTORE_EXP, percent, fee, Config.FS_EXPREG_FEE_RATIO, (getFort().getFortFunction(Fort.FUNC_RESTORE_EXP) == null)))
{
html.setFile(player.getHtmlPrefix(), "data/html/fortress/low_adena.htm");
html.setFile(player, "data/html/fortress/low_adena.htm");
sendHtmlMessage(player, html);
}
sendHtmlMessage(player, html);
@ -580,7 +580,7 @@ public class L2FortManagerInstance extends L2MerchantInstance
}
}
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), "data/html/fortress/edit_recovery.htm");
html.setFile(player, "data/html/fortress/edit_recovery.htm");
final String hp = "[<a action=\"bypass -h npc_%objectId%_manage recovery edit_hp 300\">300%</a>][<a action=\"bypass -h npc_%objectId%_manage recovery edit_hp 400\">400%</a>]";
final String exp = "[<a action=\"bypass -h npc_%objectId%_manage recovery edit_exp 45\">45%</a>][<a action=\"bypass -h npc_%objectId%_manage recovery edit_exp 50\">50%</a>]";
final String mp = "[<a action=\"bypass -h npc_%objectId%_manage recovery edit_mp 40\">40%</a>][<a action=\"bypass -h npc_%objectId%_manage recovery edit_mp 50\">50%</a>]";
@ -635,7 +635,7 @@ public class L2FortManagerInstance extends L2MerchantInstance
if (val.equalsIgnoreCase("tele_cancel"))
{
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), "data/html/fortress/functions-cancel.htm");
html.setFile(player, "data/html/fortress/functions-cancel.htm");
html.replace("%apply%", "other tele 0");
sendHtmlMessage(player, html);
return;
@ -643,7 +643,7 @@ public class L2FortManagerInstance extends L2MerchantInstance
else if (val.equalsIgnoreCase("support_cancel"))
{
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), "data/html/fortress/functions-cancel.htm");
html.setFile(player, "data/html/fortress/functions-cancel.htm");
html.replace("%apply%", "other support 0");
sendHtmlMessage(player, html);
return;
@ -652,7 +652,7 @@ public class L2FortManagerInstance extends L2MerchantInstance
{
val = st.nextToken();
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), "data/html/fortress/functions-apply.htm");
html.setFile(player, "data/html/fortress/functions-apply.htm");
html.replace("%name%", "Insignia (Supplementary Magic)");
final int stage = Integer.parseInt(val);
int cost;
@ -679,7 +679,7 @@ public class L2FortManagerInstance extends L2MerchantInstance
{
val = st.nextToken();
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), "data/html/fortress/functions-apply.htm");
html.setFile(player, "data/html/fortress/functions-apply.htm");
html.replace("%name%", "Mirror (Teleportation Device)");
final int stage = Integer.parseInt(val);
int cost;
@ -709,12 +709,12 @@ public class L2FortManagerInstance extends L2MerchantInstance
int fee;
val = st.nextToken();
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), "data/html/fortress/functions-apply_confirmed.htm");
html.setFile(player, "data/html/fortress/functions-apply_confirmed.htm");
if (getFort().getFortFunction(Fort.FUNC_TELEPORT) != null)
{
if (getFort().getFortFunction(Fort.FUNC_TELEPORT).getLvl() == Integer.parseInt(val))
{
html.setFile(player.getHtmlPrefix(), "data/html/fortress/functions-used.htm");
html.setFile(player, "data/html/fortress/functions-used.htm");
html.replace("%val%", "Stage " + val);
sendHtmlMessage(player, html);
return;
@ -726,7 +726,7 @@ public class L2FortManagerInstance extends L2MerchantInstance
case 0:
{
fee = 0;
html.setFile(player.getHtmlPrefix(), "data/html/fortress/functions-cancel_confirmed.htm");
html.setFile(player, "data/html/fortress/functions-cancel_confirmed.htm");
break;
}
case 1:
@ -742,7 +742,7 @@ public class L2FortManagerInstance extends L2MerchantInstance
}
if (!getFort().updateFunctions(player, Fort.FUNC_TELEPORT, lvl, fee, Config.FS_TELE_FEE_RATIO, (getFort().getFortFunction(Fort.FUNC_TELEPORT) == null)))
{
html.setFile(player.getHtmlPrefix(), "data/html/fortress/low_adena.htm");
html.setFile(player, "data/html/fortress/low_adena.htm");
sendHtmlMessage(player, html);
}
sendHtmlMessage(player, html);
@ -756,12 +756,12 @@ public class L2FortManagerInstance extends L2MerchantInstance
int fee;
val = st.nextToken();
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), "data/html/fortress/functions-apply_confirmed.htm");
html.setFile(player, "data/html/fortress/functions-apply_confirmed.htm");
if (getFort().getFortFunction(Fort.FUNC_SUPPORT) != null)
{
if (getFort().getFortFunction(Fort.FUNC_SUPPORT).getLvl() == Integer.parseInt(val))
{
html.setFile(player.getHtmlPrefix(), "data/html/fortress/functions-used.htm");
html.setFile(player, "data/html/fortress/functions-used.htm");
html.replace("%val%", "Stage " + val);
sendHtmlMessage(player, html);
return;
@ -773,7 +773,7 @@ public class L2FortManagerInstance extends L2MerchantInstance
case 0:
{
fee = 0;
html.setFile(player.getHtmlPrefix(), "data/html/fortress/functions-cancel_confirmed.htm");
html.setFile(player, "data/html/fortress/functions-cancel_confirmed.htm");
break;
}
case 1:
@ -789,7 +789,7 @@ public class L2FortManagerInstance extends L2MerchantInstance
}
if (!getFort().updateFunctions(player, Fort.FUNC_SUPPORT, lvl, fee, Config.FS_SUPPORT_FEE_RATIO, (getFort().getFortFunction(Fort.FUNC_SUPPORT) == null)))
{
html.setFile(player.getHtmlPrefix(), "data/html/fortress/low_adena.htm");
html.setFile(player, "data/html/fortress/low_adena.htm");
sendHtmlMessage(player, html);
}
else
@ -801,7 +801,7 @@ public class L2FortManagerInstance extends L2MerchantInstance
}
}
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), "data/html/fortress/edit_other.htm");
html.setFile(player, "data/html/fortress/edit_other.htm");
final String tele = "[<a action=\"bypass -h npc_%objectId%_manage other edit_tele 1\">Level 1</a>][<a action=\"bypass -h npc_%objectId%_manage other edit_tele 2\">Level 2</a>]";
final String support = "[<a action=\"bypass -h npc_%objectId%_manage other edit_support 1\">Level 1</a>][<a action=\"bypass -h npc_%objectId%_manage other edit_support 2\">Level 2</a>]";
if (getFort().getFortFunction(Fort.FUNC_TELEPORT) != null)
@ -837,14 +837,14 @@ public class L2FortManagerInstance extends L2MerchantInstance
else
{
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), "data/html/fortress/manage.htm");
html.setFile(player, "data/html/fortress/manage.htm");
sendHtmlMessage(player, html);
}
}
else
{
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), "data/html/fortress/foreman-noprivs.htm");
html.setFile(player, "data/html/fortress/foreman-noprivs.htm");
sendHtmlMessage(player, html);
}
return;
@ -888,12 +888,12 @@ public class L2FortManagerInstance extends L2MerchantInstance
}
else
{
html.setFile(player.getHtmlPrefix(), "data/html/fortress/support-no_mana.htm");
html.setFile(player, "data/html/fortress/support-no_mana.htm");
html.replace("%mp%", String.valueOf((int) getCurrentMp()));
sendHtmlMessage(player, html);
return;
}
html.setFile(player.getHtmlPrefix(), "data/html/fortress/support-done.htm");
html.setFile(player, "data/html/fortress/support-done.htm");
html.replace("%mp%", String.valueOf((int) getCurrentMp()));
sendHtmlMessage(player, html);
}
@ -915,7 +915,7 @@ public class L2FortManagerInstance extends L2MerchantInstance
{
return;
}
html.setFile(player.getHtmlPrefix(), "data/html/fortress/support" + getFort().getFortFunction(Fort.FUNC_SUPPORT).getLvl() + ".htm");
html.setFile(player, "data/html/fortress/support" + getFort().getFortFunction(Fort.FUNC_SUPPORT).getLvl() + ".htm");
html.replace("%mp%", String.valueOf((int) getStatus().getCurrentMp()));
sendHtmlMessage(player, html);
return;
@ -963,7 +963,7 @@ public class L2FortManagerInstance extends L2MerchantInstance
}
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), filename);
html.setFile(player, filename);
html.replace("%objectId%", String.valueOf(getObjectId()));
html.replace("%npcname%", getName());
player.sendPacket(html);
@ -1006,7 +1006,7 @@ public class L2FortManagerInstance extends L2MerchantInstance
else
{
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), "data/html/fortress/foreman-noprivs.htm");
html.setFile(player, "data/html/fortress/foreman-noprivs.htm");
sendHtmlMessage(player, html);
}
}

2
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2ObservationInstance.java
View File

@ -59,7 +59,7 @@ public final class L2ObservationInstance extends L2Npc
}
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), filename);
html.setFile(player, filename);
html.replace("%objectId%", String.valueOf(getObjectId()));
player.sendPacket(html);
}

10
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2PetManagerInstance.java
View File

@ -56,7 +56,7 @@ public class L2PetManagerInstance extends L2MerchantInstance
}
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), filename);
html.setFile(player, filename);
html.replace("%objectId%", String.valueOf(getObjectId()));
html.replace("%npcname%", getName());
player.sendPacket(html);
@ -127,7 +127,7 @@ public class L2PetManagerInstance extends L2MerchantInstance
if (!ok)
{
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), "data/html/petmanager/evolve_no.htm");
html.setFile(player, "data/html/petmanager/evolve_no.htm");
player.sendPacket(html);
}
return;
@ -169,7 +169,7 @@ public class L2PetManagerInstance extends L2MerchantInstance
if (!ok)
{
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), "data/html/petmanager/restore_no.htm");
html.setFile(player, "data/html/petmanager/restore_no.htm");
player.sendPacket(html);
}
return;
@ -186,12 +186,12 @@ public class L2PetManagerInstance extends L2MerchantInstance
if (player.destroyItemByItemId("Consume", itemIdtake, 1, this, true))
{
player.addItem("", itemIdgive, 1, this, true);
html.setFile(player.getHtmlPrefix(), "data/html/petmanager/" + getId() + ".htm");
html.setFile(player, "data/html/petmanager/" + getId() + ".htm");
player.sendPacket(html);
}
else
{
html.setFile(player.getHtmlPrefix(), "data/html/petmanager/exchange_no.htm");
html.setFile(player, "data/html/petmanager/exchange_no.htm");
player.sendPacket(html);
}
}

10
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2RaceManagerInstance.java
View File

@ -355,7 +355,7 @@ public class L2RaceManagerInstance extends L2Npc
String filename, search;
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
filename = getHtmlPath(npcId, 5);
html.setFile(player.getHtmlPrefix(), filename);
html.setFile(player, filename);
for (int i = 0; i < 8; i++)
{
final int n = i + 1;
@ -374,7 +374,7 @@ public class L2RaceManagerInstance extends L2Npc
String filename, search;
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
filename = getHtmlPath(npcId, 6);
html.setFile(player.getHtmlPrefix(), filename);
html.setFile(player, filename);
for (int i = 0; i < 8; i++)
{
final int n = i + 1;
@ -399,7 +399,7 @@ public class L2RaceManagerInstance extends L2Npc
if (val < 10)
{
filename = getHtmlPath(npcId, 2);
html.setFile(player.getHtmlPrefix(), filename);
html.setFile(player, filename);
for (int i = 0; i < 8; i++)
{
final int n = i + 1;
@ -424,7 +424,7 @@ public class L2RaceManagerInstance extends L2Npc
return;
}
filename = getHtmlPath(npcId, 3);
html.setFile(player.getHtmlPrefix(), filename);
html.setFile(player, filename);
html.replace("0place", "" + player.getRace(0));
search = "Mob1";
replace = MonsterRace.getInstance().getMonsters()[player.getRace(0) - 1].getTemplate().getName();
@ -447,7 +447,7 @@ public class L2RaceManagerInstance extends L2Npc
return;
}
filename = getHtmlPath(npcId, 4);
html.setFile(player.getHtmlPrefix(), filename);
html.setFile(player, filename);
html.replace("0place", "" + player.getRace(0));
search = "Mob1";
replace = MonsterRace.getInstance().getMonsters()[player.getRace(0) - 1].getTemplate().getName();

2
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2TeleporterInstance.java
View File

@ -176,7 +176,7 @@ public final class L2TeleporterInstance extends L2Npc
private void sendHtmlMessage(L2PcInstance player, String filename)
{
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), filename);
html.setFile(player, filename);
html.replace("%objectId%", String.valueOf(getObjectId()));
html.replace("%npcname%", getName());
player.sendPacket(html);

10
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2VillageMasterInstance.java
View File

@ -244,11 +244,11 @@ public class L2VillageMasterInstance extends L2NpcInstance
if (clan.getNewLeaderId() == 0)
{
clan.setNewLeaderId(member.getObjectId(), true);
msg.setFile(player.getHtmlPrefix(), "data/scripts/village_master/Clan/9000-07-success.htm");
msg.setFile(player, "data/scripts/village_master/Clan/9000-07-success.htm");
}
else
{
msg.setFile(player.getHtmlPrefix(), "data/scripts/village_master/Clan/9000-07-in-progress.htm");
msg.setFile(player, "data/scripts/village_master/Clan/9000-07-in-progress.htm");
}
player.sendPacket(msg);
}
@ -266,7 +266,7 @@ public class L2VillageMasterInstance extends L2NpcInstance
if (clan.getNewLeaderId() != 0)
{
clan.setNewLeaderId(0, true);
msg.setFile(player.getHtmlPrefix(), "data/scripts/village_master/Clan/9000-07-canceled.htm");
msg.setFile(player, "data/scripts/village_master/Clan/9000-07-canceled.htm");
}
else
{
@ -581,7 +581,7 @@ public class L2VillageMasterInstance extends L2NpcInstance
if (!player.isClanLeader())
{
final NpcHtmlMessage html = new NpcHtmlMessage();
html.setFile(player.getHtmlPrefix(), "data/html/villagemaster/NotClanLeader.htm");
html.setFile(player, "data/html/villagemaster/NotClanLeader.htm");
player.sendPacket(html);
player.sendPacket(ActionFailed.STATIC_PACKET);
return;
@ -607,7 +607,7 @@ public class L2VillageMasterInstance extends L2NpcInstance
else
{
final NpcHtmlMessage html = new NpcHtmlMessage();
html.setFile(player.getHtmlPrefix(), "data/html/villagemaster/NoMoreSkills.htm");
html.setFile(player, "data/html/villagemaster/NoMoreSkills.htm");
player.sendPacket(html);
}
}

2
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java
View File

@ -142,7 +142,7 @@ public class CeremonyOfChaosEvent extends AbstractEvent<CeremonyOfChaosMember>
player.registerOnEvent(this);
// Load the html
msg.setFile(player.getHtmlPrefix(), "data/html/CeremonyOfChaos/started.htm");
msg.setFile(player, "data/html/CeremonyOfChaos/started.htm");
// Remove buffs
player.stopAllEffectsExceptThoseThatLastThroughDeath();

4
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/entity/Hero.java
View File

@ -449,7 +449,7 @@ public class Hero
if (mainList != null)
{
final NpcHtmlMessage DiaryReply = new NpcHtmlMessage();
final String htmContent = HtmCache.getInstance().getHtm(activeChar.getHtmlPrefix(), "data/html/olympiad/herodiary.htm");
final String htmContent = HtmCache.getInstance().getHtm(activeChar, "data/html/olympiad/herodiary.htm");
final String heroMessage = _heroMessage.get(charid);
if ((htmContent != null) && (heroMessage != null))
{
@ -535,7 +535,7 @@ public class Hero
if (heroFights != null)
{
final NpcHtmlMessage FightReply = new NpcHtmlMessage();
final String htmContent = HtmCache.getInstance().getHtm(activeChar.getHtmlPrefix(), "data/html/olympiad/herohistory.htm");
final String htmContent = HtmCache.getInstance().getHtm(activeChar, "data/html/olympiad/herohistory.htm");
if (htmContent != null)
{
FightReply.setHtml(htmContent);

4
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/entity/L2Event.java
View File

@ -131,11 +131,11 @@ public class L2Event
if (_registeredPlayers.contains(player))
{
htmContent = HtmCache.getInstance().getHtm(player.getHtmlPrefix(), "data/html/mods/EventEngine/Participating.htm");
htmContent = HtmCache.getInstance().getHtm(player, "data/html/mods/EventEngine/Participating.htm");
}
else
{
htmContent = HtmCache.getInstance().getHtm(player.getHtmlPrefix(), "data/html/mods/EventEngine/Participation.htm");
htmContent = HtmCache.getInstance().getHtm(player, "data/html/mods/EventEngine/Participation.htm");
}
if (htmContent != null)

4
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/olympiad/OlympiadManager.java
View File

@ -207,7 +207,7 @@ public class OlympiadManager
if ((Config.DUALBOX_CHECK_MAX_OLYMPIAD_PARTICIPANTS_PER_IP > 0) && !AntiFeedManager.getInstance().tryAddPlayer(AntiFeedManager.OLYMPIAD_ID, player, Config.DUALBOX_CHECK_MAX_OLYMPIAD_PARTICIPANTS_PER_IP))
{
final NpcHtmlMessage message = new NpcHtmlMessage(player.getLastHtmlActionOriginId());
message.setFile(player.getHtmlPrefix(), "data/html/mods/OlympiadIPRestriction.htm");
message.setFile(player, "data/html/mods/OlympiadIPRestriction.htm");
message.replace("%max%", String.valueOf(AntiFeedManager.getInstance().getLimit(player, Config.DUALBOX_CHECK_MAX_OLYMPIAD_PARTICIPANTS_PER_IP)));
player.sendPacket(message);
return false;
@ -234,7 +234,7 @@ public class OlympiadManager
if ((Config.DUALBOX_CHECK_MAX_OLYMPIAD_PARTICIPANTS_PER_IP > 0) && !AntiFeedManager.getInstance().tryAddPlayer(AntiFeedManager.OLYMPIAD_ID, player, Config.DUALBOX_CHECK_MAX_OLYMPIAD_PARTICIPANTS_PER_IP))
{
final NpcHtmlMessage message = new NpcHtmlMessage(player.getLastHtmlActionOriginId());
message.setFile(player.getHtmlPrefix(), "data/html/mods/OlympiadIPRestriction.htm");
message.setFile(player, "data/html/mods/OlympiadIPRestriction.htm");
message.replace("%max%", String.valueOf(AntiFeedManager.getInstance().getLimit(player, Config.DUALBOX_CHECK_MAX_OLYMPIAD_PARTICIPANTS_PER_IP)));
player.sendPacket(message);
return false;

18
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/quest/Quest.java
View File

@ -1778,7 +1778,7 @@ public class Quest extends AbstractScript implements IIdentifiable
*/
public static String getNoQuestMsg(L2PcInstance player)
{
final String result = HtmCache.getInstance().getHtm(player.getHtmlPrefix(), "data/html/noquest.htm");
final String result = HtmCache.getInstance().getHtm(player, "data/html/noquest.htm");
if ((result != null) && (result.length() > 0))
{
return result;
@ -1792,7 +1792,7 @@ public class Quest extends AbstractScript implements IIdentifiable
*/
public static String getNoQuestLevelRewardMsg(L2PcInstance player)
{
return HtmCache.getInstance().getHtm(player.getHtmlPrefix(), "data/html/noquestlevelreward.html");
return HtmCache.getInstance().getHtm(player, "data/html/noquestlevelreward.html");
}
/**
@ -1811,7 +1811,7 @@ public class Quest extends AbstractScript implements IIdentifiable
*/
public static String getAlreadyCompletedMsg(L2PcInstance player, QuestType type)
{
return HtmCache.getInstance().getHtm(player.getHtmlPrefix(), (type == QuestType.ONE_TIME ? "data/html/alreadyCompleted.html" : "data/html/alreadyCompletedDaily.html"));
return HtmCache.getInstance().getHtm(player, (type == QuestType.ONE_TIME ? "data/html/alreadyCompleted.html" : "data/html/alreadyCompletedDaily.html"));
}
// TODO: Clean up these methods
@ -2739,7 +2739,7 @@ public class Quest extends AbstractScript implements IIdentifiable
final int questId = getId();
// Create handler to file linked to the quest
String content = getHtm(player.getHtmlPrefix(), filename);
String content = getHtm(player, filename);
// Send message to client if message not empty
if (content != null)
@ -2769,20 +2769,20 @@ public class Quest extends AbstractScript implements IIdentifiable
}
/**
* @param prefix player's language prefix.
* @param player for language prefix.
* @param fileName the html file to be get.
* @return the HTML file contents
*/
public String getHtm(String prefix, String fileName)
public String getHtm(L2PcInstance player, String fileName)
{
final HtmCache hc = HtmCache.getInstance();
String content = hc.getHtm(prefix, fileName.startsWith("data/") ? fileName : "data/scripts/" + getPath().toLowerCase() + "/" + fileName);
String content = hc.getHtm(player, fileName.startsWith("data/") ? fileName : "data/scripts/" + getPath() + "/" + fileName);
if (content == null)
{
content = hc.getHtm(prefix, "data/scripts/" + getPath() + "/" + fileName);
content = hc.getHtm(player, "data/scripts/" + getPath() + "/" + fileName);
if (content == null)
{
content = hc.getHtmForce(prefix, "data/scripts/quests/" + getName() + "/" + fileName);
content = hc.getHtmForce(player, "data/scripts/quests/" + getName() + "/" + fileName);
}
}
return content;

4
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/teleporter/TeleportHolder.java
View File

@ -179,7 +179,7 @@ public final class TeleportHolder
// Send html message
final NpcHtmlMessage msg = new NpcHtmlMessage(npc.getObjectId());
msg.setFile(player.getHtmlPrefix(), "data/html/teleporter/teleports.htm");
msg.setFile(player, "data/html/teleporter/teleports.htm");
msg.replace("%locations%", sb_f.toString());
player.sendPacket(msg);
}
@ -221,7 +221,7 @@ public final class TeleportHolder
if (npc.getCastle().getSiege().isInProgress())
{
final NpcHtmlMessage msg = new NpcHtmlMessage(npc.getObjectId());
msg.setFile(player.getHtmlPrefix(), "data/html/teleporter/castleteleporter-busy.htm");
msg.setFile(player, "data/html/teleporter/castleteleporter-busy.htm");
player.sendPacket(msg);
return;
}

6
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/Debug.java
View File

@ -50,7 +50,7 @@ public class Debug
}
final NpcHtmlMessage msg = new NpcHtmlMessage();
msg.setFile(creature.getActingPlayer().getHtmlPrefix(), "data/html/admin/statsdebug.htm");
msg.setFile(creature.getActingPlayer(), "data/html/admin/statsdebug.htm");
msg.replace("%stat%", String.valueOf(stat));
msg.replace("%mulValue%", Util.formatDouble(creature.getStat().getMul(stat), "#.##"));
msg.replace("%addValue%", creature.getStat().getAdd(stat));
@ -77,7 +77,7 @@ public class Debug
}
final NpcHtmlMessage msg = new NpcHtmlMessage();
msg.setFile(attacker.getActingPlayer().getHtmlPrefix(), "data/html/admin/skilldebug.htm");
msg.setFile(attacker.getActingPlayer(), "data/html/admin/skilldebug.htm");
msg.replace("%patk%", target.getPAtk());
msg.replace("%matk%", target.getMAtk());
msg.replace("%pdef%", target.getPDef());
@ -116,7 +116,7 @@ public class Debug
}
final NpcHtmlMessage msg = new NpcHtmlMessage();
msg.setFile(player.getHtmlPrefix(), "data/html/admin/itemdebug.htm");
msg.setFile(player, "data/html/admin/itemdebug.htm");
msg.replace("%itemName%", item.getName());
msg.replace("%itemSlot%", getBodyPart(item.getItem().getBodyPart()));
msg.replace("%itemType%", item.isArmor() ? "Armor" : item.isWeapon() ? "Weapon" : "Etc");

6
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java
View File

@ -118,7 +118,7 @@ public class CharacterSelect implements IClientIncomingPacket
if ((Config.DUALBOX_CHECK_MAX_PLAYERS_PER_IP > 0) && !AntiFeedManager.getInstance().tryAddClient(AntiFeedManager.GAME_ID, client, Config.DUALBOX_CHECK_MAX_PLAYERS_PER_IP))
{
final NpcHtmlMessage msg = new NpcHtmlMessage();
msg.setFile(info.getHtmlPrefix(), "data/html/mods/IPRestriction.htm");
msg.setFile(null, "data/html/mods/IPRestriction.htm");
msg.replace("%max%", String.valueOf(AntiFeedManager.getInstance().getLimit(client, Config.DUALBOX_CHECK_MAX_PLAYERS_PER_IP)));
client.sendPacket(msg);
return;
@ -129,7 +129,7 @@ public class CharacterSelect implements IClientIncomingPacket
if (info.isGood() && (L2World.getInstance().getAllGoodPlayers().size() >= (L2World.getInstance().getAllEvilPlayers().size() + Config.FACTION_BALANCE_PLAYER_EXCEED_LIMIT)))
{
final NpcHtmlMessage msg = new NpcHtmlMessage();
msg.setFile(info.getHtmlPrefix(), "data/html/mods/Faction/ExceededOnlineLimit.htm");
msg.setFile(null, "data/html/mods/Faction/ExceededOnlineLimit.htm");
msg.replace("%more%", Config.FACTION_GOOD_TEAM_NAME);
msg.replace("%less%", Config.FACTION_EVIL_TEAM_NAME);
client.sendPacket(msg);
@ -138,7 +138,7 @@ public class CharacterSelect implements IClientIncomingPacket
if (info.isEvil() && (L2World.getInstance().getAllEvilPlayers().size() >= (L2World.getInstance().getAllGoodPlayers().size() + Config.FACTION_BALANCE_PLAYER_EXCEED_LIMIT)))
{
final NpcHtmlMessage msg = new NpcHtmlMessage();
msg.setFile(info.getHtmlPrefix(), "data/html/mods/Faction/ExceededOnlineLimit.htm");
msg.setFile(null, "data/html/mods/Faction/ExceededOnlineLimit.htm");
msg.replace("%more%", Config.FACTION_EVIL_TEAM_NAME);
msg.replace("%less%", Config.FACTION_GOOD_TEAM_NAME);
client.sendPacket(msg);

4
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
View File

@ -520,7 +520,7 @@ public class EnterWorld implements IClientIncomingPacket
if (showClanNotice)
{
final NpcHtmlMessage notice = new NpcHtmlMessage();
notice.setFile(activeChar.getHtmlPrefix(), "data/html/clanNotice.htm");
notice.setFile(activeChar, "data/html/clanNotice.htm");
notice.replace("%clan_name%", activeChar.getClan().getName());
notice.replace("%notice_text%", activeChar.getClan().getNotice());
notice.disableValidation();
@ -528,7 +528,7 @@ public class EnterWorld implements IClientIncomingPacket
}
else if (Config.SERVER_NEWS)
{
final String serverNews = HtmCache.getInstance().getHtm(activeChar.getHtmlPrefix(), "data/html/servnews.htm");
final String serverNews = HtmCache.getInstance().getHtm(activeChar, "data/html/servnews.htm");
if (serverNews != null)
{
client.sendPacket(new NpcHtmlMessage(serverNews));

2
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/ExPCCafeRequestOpenWindowWithoutNPC.java
View File

@ -40,7 +40,7 @@ public class ExPCCafeRequestOpenWindowWithoutNPC implements IClientIncomingPacke
if ((activeChar != null) && Config.PC_CAFE_ENABLED)
{
final NpcHtmlMessage html = new NpcHtmlMessage();
html.setFile(activeChar.getHtmlPrefix(), "data/html/pccafe.htm");
html.setFile(activeChar, "data/html/pccafe.htm");
activeChar.sendPacket(html);
}
}

2
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java
View File

@ -74,7 +74,7 @@ public final class RequestLinkHtml implements IClientIncomingPacket
final String filename = "data/html/" + _link;
final NpcHtmlMessage msg = new NpcHtmlMessage(htmlObjectId);
msg.setFile(actor.getHtmlPrefix(), filename);
msg.setFile(actor, filename);
actor.sendPacket(msg);
}
}

2
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/ceremonyofchaos/RequestCuriousHouseHtml.java
View File

@ -59,7 +59,7 @@ public class RequestCuriousHouseHtml implements IClientIncomingPacket
if (CeremonyOfChaosManager.getInstance().canRegister(player, true))
{
final NpcHtmlMessage message = new NpcHtmlMessage(0);
message.setFile(player.getHtmlPrefix(), "data/html/CeremonyOfChaos/invite.htm");
message.setFile(player, "data/html/CeremonyOfChaos/invite.htm");
player.sendPacket(message);
}
}

4
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java
View File

@ -87,9 +87,9 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket
_html = html;
}
public final boolean setFile(String prefix, String path)
public final boolean setFile(L2PcInstance player, String path)
{
final String content = HtmCache.getInstance().getHtm(prefix, path);
final String content = HtmCache.getInstance().getHtm(player, path);
if (content == null)
{
setHtml("<html><body>My Text is missing:<br>" + path + "</body></html>");

10
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/util/BuilderUtil.java
View File

@ -41,6 +41,16 @@ public final class BuilderUtil
player.sendPacket(new CreatureSay(0, ChatType.GENERAL, "SYS", message));
}
/**
* Sends builder html message to the player.
* @param player
* @param message
*/
public static void sendHtmlMessage(L2PcInstance player, String message)
{
player.sendPacket(new CreatureSay(0, ChatType.GENERAL, "HTML", message));
}
/**
* Changes player's hiding state.
* @param player