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

Separated the Classic Datapack to it's own folder.

Browse Source
This commit is contained in:
MobiusDev
2015-05-02 03:45:56 +00:00
parent 08e28fe058
commit 484bff80bb
11501 changed files with 2200482 additions and 627 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminAnnouncements.java vendored
View File

@@ -92,7 +92,7 @@ public class AdminAnnouncements implements IAdminCommandHandler
{
if (!st.hasMoreTokens())
{
String content = HtmCache.getInstance().getHtm(activeChar.getHtmlPrefix(), "data/html/admin/announces-add.htm");
String content = HtmCache.getInstance().getHtm(activeChar.getHtmlPrefix(), "html/admin/announces-add.htm");
Util.sendCBHtml(activeChar, content);
break;
}
@@ -193,7 +193,7 @@ public class AdminAnnouncements implements IAdminCommandHandler
}
if (!st.hasMoreTokens())
{
String content = HtmCache.getInstance().getHtm(activeChar.getHtmlPrefix(), "data/html/admin/announces-edit.htm");
String content = HtmCache.getInstance().getHtm(activeChar.getHtmlPrefix(), "html/admin/announces-edit.htm");
String announcementId = "" + announce.getId();
String announcementType = announce.getType().name();
String announcementInital = "0";
@@ -419,7 +419,7 @@ public class AdminAnnouncements implements IAdminCommandHandler
final IAnnouncement announce = AnnouncementsTable.getInstance().getAnnounce(id);
if (announce != null)
{
String content = HtmCache.getInstance().getHtm(activeChar.getHtmlPrefix(), "data/html/admin/announces-show.htm");
String content = HtmCache.getInstance().getHtm(activeChar.getHtmlPrefix(), "html/admin/announces-show.htm");
String announcementId = "" + announce.getId();
String announcementType = announce.getType().name();
String announcementInital = "0";
@@ -459,7 +459,7 @@ public class AdminAnnouncements implements IAdminCommandHandler
}
}
String content = HtmCache.getInstance().getHtm(activeChar.getHtmlPrefix(), "data/html/admin/announces-list.htm");
String content = HtmCache.getInstance().getHtm(activeChar.getHtmlPrefix(), "html/admin/announces-list.htm");
final PageResult result = HtmlUtil.createPage(AnnouncementsTable.getInstance().getAllAnnouncements(), page, 8, currentPage ->
{
return "<td align=center><button action=\"bypass admin_announces list " + currentPage + "\" value=\"" + (currentPage + 1) + "\" width=35 height=20 back=\"L2UI_CT1.Button_DF_Down\" fore=\"L2UI_CT1.Button_DF\"></td>";

2
trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminCHSiege.java vendored
View File

@@ -357,7 +357,7 @@ public final class AdminCHSiege implements IAdminCommandHandler
private void sendSiegableHallPage(L2PcInstance activeChar, String hallId, SiegableHall hall)
{
final NpcHtmlMessage msg = new NpcHtmlMessage();
msg.setFile(null, "data/html/admin/siegablehall.htm");
msg.setFile(null, "html/admin/siegablehall.htm");
msg.replace("%clanhallId%", hallId);
msg.replace("%clanhallName%", hall.getName());
if (hall.getOwnerId() > 0)

4
trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminCastle.java vendored
View File

@@ -225,7 +225,7 @@ public final class AdminCastle implements IAdminCommandHandler
else
{
final NpcHtmlMessage html = new NpcHtmlMessage(0, 0);
html.setHtml(HtmCache.getInstance().getHtm(activeChar.getHtmlPrefix(), "data/html/admin/castlemanage.htm"));
html.setHtml(HtmCache.getInstance().getHtm(activeChar.getHtmlPrefix(), "html/admin/castlemanage.htm"));
activeChar.sendPacket(html);
}
}
@@ -240,7 +240,7 @@ public final class AdminCastle implements IAdminCommandHandler
{
final L2Clan ownerClan = castle.getOwner();
final NpcHtmlMessage html = new NpcHtmlMessage(0, 0);
html.setHtml(HtmCache.getInstance().getHtm(player.getHtmlPrefix(), "data/html/admin/castlemanage_selected.htm"));
html.setHtml(HtmCache.getInstance().getHtm(player.getHtmlPrefix(), "html/admin/castlemanage_selected.htm"));
html.replace("%castleId%", castle.getResidenceId());
html.replace("%castleName%", castle.getName());
html.replace("%ownerName%", ownerClan != null ? ownerClan.getLeaderName() : "NPC");

4
trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminClan.java vendored
View File

@@ -71,7 +71,7 @@ public class AdminClan implements IAdminCommandHandler
}
final NpcHtmlMessage html = new NpcHtmlMessage(0, 1);
html.setHtml(HtmCache.getInstance().getHtm(activeChar.getHtmlPrefix(), "data/html/admin/claninfo.htm"));
html.setHtml(HtmCache.getInstance().getHtm(activeChar.getHtmlPrefix(), "html/admin/claninfo.htm"));
html.replace("%clan_name%", clan.getName());
html.replace("%clan_leader%", clan.getLeaderName());
html.replace("%clan_level%", String.valueOf(clan.getLevel()));
@@ -118,7 +118,7 @@ public class AdminClan implements IAdminCommandHandler
case "admin_clan_show_pending":
{
final NpcHtmlMessage html = new NpcHtmlMessage(0, 1);
html.setHtml(HtmCache.getInstance().getHtm(activeChar.getHtmlPrefix(), "data/html/admin/clanchanges.htm"));
html.setHtml(HtmCache.getInstance().getHtm(activeChar.getHtmlPrefix(), "html/admin/clanchanges.htm"));
StringBuilder sb = new StringBuilder();
for (L2Clan clan : ClanTable.getInstance().getClans())
{

6
trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminClanHall.java vendored
View File

@@ -180,7 +180,7 @@ public class AdminClanHall implements IAdminCommandHandler
{
int i = 0;
final NpcHtmlMessage adminReply = new NpcHtmlMessage();
adminReply.setFile(activeChar.getHtmlPrefix(), "data/html/admin/clanhalls.htm");
adminReply.setFile(activeChar.getHtmlPrefix(), "html/admin/clanhalls.htm");
final StringBuilder cList = new StringBuilder(500);
for (SiegableHall hall : CHSiegeManager.getInstance().getConquerableHalls().values())
{
@@ -239,7 +239,7 @@ public class AdminClanHall implements IAdminCommandHandler
private void showClanHallPage(L2PcInstance activeChar, ClanHall clanhall)
{
final NpcHtmlMessage adminReply = new NpcHtmlMessage();
adminReply.setFile(activeChar.getHtmlPrefix(), "data/html/admin/clanhall.htm");
adminReply.setFile(activeChar.getHtmlPrefix(), "html/admin/clanhall.htm");
adminReply.replace("%clanhallName%", clanhall.getName());
adminReply.replace("%clanhallId%", String.valueOf(clanhall.getId()));
final L2Clan owner = ClanTable.getInstance().getClan(clanhall.getOwnerId());
@@ -255,7 +255,7 @@ public class AdminClanHall implements IAdminCommandHandler
private void showSiegableHallPage(L2PcInstance activeChar, SiegableHall hall)
{
final NpcHtmlMessage msg = new NpcHtmlMessage();
msg.setFile(null, "data/html/admin/siegablehall.htm");
msg.setFile(null, "html/admin/siegablehall.htm");
msg.replace("%clanhallId%", String.valueOf(hall.getId()));
msg.replace("%clanhallName%", hall.getName());
if (hall.getOwnerId() > 0)

2
trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java vendored
View File

@@ -93,7 +93,7 @@ public class AdminCursedWeapons implements IAdminCommandHandler
final Collection<CursedWeapon> cws = cwm.getCursedWeapons();
final StringBuilder replyMSG = new StringBuilder(cws.size() * 300);
final NpcHtmlMessage adminReply = new NpcHtmlMessage();
adminReply.setFile(activeChar.getHtmlPrefix(), "data/html/admin/cwinfo.htm");
adminReply.setFile(activeChar.getHtmlPrefix(), "html/admin/cwinfo.htm");
for (CursedWeapon cw : cwm.getCursedWeapons())
{
itemId = cw.getItemId();

18
trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java vendored
View File

@@ -892,7 +892,7 @@ public class AdminEditChar implements IAdminCommandHandler
final L2PcInstance[] players = L2World.getInstance().getPlayersSortedBy(Comparator.comparingLong(L2PcInstance::getUptime));
final NpcHtmlMessage html = new NpcHtmlMessage();
html.setFile(activeChar.getHtmlPrefix(), "data/html/admin/charlist.htm");
html.setFile(activeChar.getHtmlPrefix(), "html/admin/charlist.htm");
final PageResult result = HtmlUtil.createPage(players, page, 20, i ->
{
@@ -972,7 +972,7 @@ public class AdminEditChar implements IAdminCommandHandler
}
final NpcHtmlMessage adminReply = new NpcHtmlMessage();
adminReply.setFile(activeChar.getHtmlPrefix(), "data/html/admin/" + filename);
adminReply.setFile(activeChar.getHtmlPrefix(), "html/admin/" + filename);
adminReply.replace("%name%", player.getName());
adminReply.replace("%level%", String.valueOf(player.getLevel()));
adminReply.replace("%clan%", String.valueOf(player.getClan() != null ? "<a action=\"bypass -h admin_clan_info " + player.getObjectId() + "\">" + player.getClan().getName() + "</a>" : null));
@@ -1087,7 +1087,7 @@ public class AdminEditChar implements IAdminCommandHandler
int CharactersFound = 0;
String name;
final NpcHtmlMessage adminReply = new NpcHtmlMessage();
adminReply.setFile(activeChar.getHtmlPrefix(), "data/html/admin/charfind.htm");
adminReply.setFile(activeChar.getHtmlPrefix(), "html/admin/charfind.htm");
final StringBuilder replyMSG = new StringBuilder(1000);
@@ -1157,7 +1157,7 @@ public class AdminEditChar implements IAdminCommandHandler
String name, ip = "0.0.0.0";
final StringBuilder replyMSG = new StringBuilder(1000);
final NpcHtmlMessage adminReply = new NpcHtmlMessage();
adminReply.setFile(activeChar.getHtmlPrefix(), "data/html/admin/ipfind.htm");
adminReply.setFile(activeChar.getHtmlPrefix(), "html/admin/ipfind.htm");
for (L2PcInstance player : L2World.getInstance().getPlayersSortedBy(Comparator.comparingLong(L2PcInstance::getUptime)))
{
client = player.getClient();
@@ -1241,7 +1241,7 @@ public class AdminEditChar implements IAdminCommandHandler
chars.values().stream().forEachOrdered(name -> StringUtil.append(replyMSG, name, "<br1>"));
final NpcHtmlMessage adminReply = new NpcHtmlMessage();
adminReply.setFile(activeChar.getHtmlPrefix(), "data/html/admin/accountinfo.htm");
adminReply.setFile(activeChar.getHtmlPrefix(), "html/admin/accountinfo.htm");
adminReply.replace("%account%", player.getAccountName());
adminReply.replace("%player%", characterName);
adminReply.replace("%characters%", replyMSG.toString());
@@ -1298,7 +1298,7 @@ public class AdminEditChar implements IAdminCommandHandler
}
final NpcHtmlMessage adminReply = new NpcHtmlMessage();
adminReply.setFile(activeChar.getHtmlPrefix(), "data/html/admin/dualbox.htm");
adminReply.setFile(activeChar.getHtmlPrefix(), "html/admin/dualbox.htm");
adminReply.replace("%multibox%", String.valueOf(multibox));
adminReply.replace("%results%", results.toString());
adminReply.replace("%strict%", "");
@@ -1350,7 +1350,7 @@ public class AdminEditChar implements IAdminCommandHandler
}
final NpcHtmlMessage adminReply = new NpcHtmlMessage();
adminReply.setFile(activeChar.getHtmlPrefix(), "data/html/admin/dualbox.htm");
adminReply.setFile(activeChar.getHtmlPrefix(), "html/admin/dualbox.htm");
adminReply.replace("%multibox%", String.valueOf(multibox));
adminReply.replace("%results%", results.toString());
adminReply.replace("%strict%", "strict_");
@@ -1434,7 +1434,7 @@ public class AdminEditChar implements IAdminCommandHandler
private void gatherSummonInfo(L2Summon target, L2PcInstance activeChar)
{
final NpcHtmlMessage html = new NpcHtmlMessage();
html.setFile(activeChar.getHtmlPrefix(), "data/html/admin/petinfo.htm");
html.setFile(activeChar.getHtmlPrefix(), "html/admin/petinfo.htm");
String name = target.getName();
html.replace("%name%", name == null ? "N/A" : name);
html.replace("%level%", Integer.toString(target.getLevel()));
@@ -1473,7 +1473,7 @@ public class AdminEditChar implements IAdminCommandHandler
{
boolean color = true;
final NpcHtmlMessage html = new NpcHtmlMessage();
html.setFile(activeChar.getHtmlPrefix(), "data/html/admin/partyinfo.htm");
html.setFile(activeChar.getHtmlPrefix(), "html/admin/partyinfo.htm");
StringBuilder text = new StringBuilder(400);
for (L2PcInstance member : target.getParty().getMembers())
{

2
trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java vendored
View File

@@ -583,7 +583,7 @@ public class AdminEffects implements IAdminCommandHandler
sb.append("<button action=\"bypass admin_ave_abnormal " + abnormalVisualEffect.name() + "\" align=left icon=teleport>" + abnormalVisualEffect.name() + "</button>");
}
final NpcHtmlMessage html = new NpcHtmlMessage(0, 1);
html.setFile(activeChar.getHtmlPrefix(), "data/html/admin/ave_abnormal.htm");
html.setFile(activeChar.getHtmlPrefix(), "html/admin/ave_abnormal.htm");
html.replace("%abnormals%", sb.toString());
activeChar.sendPacket(html);
activeChar.sendMessage("Usage: //" + command.replace("admin_", "") + " <AbnormalVisualEffect> [radius]");

10
trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminEventEngine.java vendored
View File

@@ -123,9 +123,9 @@ public class AdminEventEngine implements IAdminCommandHandler
{
final NpcHtmlMessage adminReply = new NpcHtmlMessage();
DataInputStream in = new DataInputStream(new BufferedInputStream(new FileInputStream(Config.DATAPACK_ROOT + "/data/events/" + eventName)));
DataInputStream in = new DataInputStream(new BufferedInputStream(new FileInputStream(Config.DATAPACK_ROOT + "events/" + eventName)));
BufferedReader inbr = new BufferedReader(new InputStreamReader(in));
adminReply.setFile("en", "data/html/mods/EventEngine/Participation.htm");
adminReply.setFile("en", "html/mods/EventEngine/Participation.htm");
adminReply.replace("%eventName%", eventName);
adminReply.replace("%eventCreator%", inbr.readLine());
adminReply.replace("%eventInfo%", inbr.readLine());
@@ -146,7 +146,7 @@ public class AdminEventEngine implements IAdminCommandHandler
{
// There is an exception here for not using the ST. We use spaces (ST delim) for the event name.
String eventName = command.substring(16);
File file = new File(Config.DATAPACK_ROOT + "/data/events/" + eventName);
File file = new File(Config.DATAPACK_ROOT + "events/" + eventName);
file.delete();
showMainPage(activeChar);
}
@@ -165,7 +165,7 @@ public class AdminEventEngine implements IAdminCommandHandler
{
try
{
FileOutputStream file = new FileOutputStream(new File(Config.DATAPACK_ROOT, "data/events/" + tempName));
FileOutputStream file = new FileOutputStream(new File(Config.DATAPACK_ROOT, "events/" + tempName));
PrintStream p = new PrintStream(file);
p.println(activeChar.getName());
p.println(tempBuffer);
@@ -438,7 +438,7 @@ public class AdminEventEngine implements IAdminCommandHandler
private String showStoredEvents()
{
final File dir = new File(Config.DATAPACK_ROOT, "/data/events");
final File dir = new File(Config.DATAPACK_ROOT, "events/");
if (dir.isFile())
{
return "<font color=\"FF0000\">The directory '" + dir.getAbsolutePath() + "' is a file or is corrupted!</font><br>";

2
trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminEvents.java vendored
View File

@@ -152,7 +152,7 @@ public class AdminEvents implements IAdminCommandHandler
private void showMenu(L2PcInstance activeChar)
{
final NpcHtmlMessage html = new NpcHtmlMessage();
html.setFile(activeChar.getHtmlPrefix(), "data/html/admin/gm_events.htm");
html.setFile(activeChar.getHtmlPrefix(), "html/admin/gm_events.htm");
final StringBuilder cList = new StringBuilder(500);
for (Quest event : QuestManager.getInstance().getScripts().values())
{

2
trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminExpSp.java vendored
View File

@@ -102,7 +102,7 @@ public class AdminExpSp implements IAdminCommandHandler
return;
}
final NpcHtmlMessage adminReply = new NpcHtmlMessage();
adminReply.setFile(activeChar.getHtmlPrefix(), "data/html/admin/expsp.htm");
adminReply.setFile(activeChar.getHtmlPrefix(), "html/admin/expsp.htm");
adminReply.replace("%name%", player.getName());
adminReply.replace("%level%", String.valueOf(player.getLevel()));
adminReply.replace("%xp%", String.valueOf(player.getExp()));

4
trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminFortSiege.java vendored
View File

@@ -154,7 +154,7 @@ public class AdminFortSiege implements IAdminCommandHandler
{
int i = 0;
final NpcHtmlMessage adminReply = new NpcHtmlMessage();
adminReply.setFile(activeChar.getHtmlPrefix(), "data/html/admin/forts.htm");
adminReply.setFile(activeChar.getHtmlPrefix(), "html/admin/forts.htm");
final List<Fort> forts = FortManager.getInstance().getForts();
final StringBuilder cList = new StringBuilder(forts.size() * 100);
@@ -181,7 +181,7 @@ public class AdminFortSiege implements IAdminCommandHandler
private void showFortSiegePage(L2PcInstance activeChar, Fort fort)
{
final NpcHtmlMessage adminReply = new NpcHtmlMessage();
adminReply.setFile(activeChar.getHtmlPrefix(), "data/html/admin/fort.htm");
adminReply.setFile(activeChar.getHtmlPrefix(), "html/admin/fort.htm");
adminReply.replace("%fortName%", fort.getName());
adminReply.replace("%fortId%", String.valueOf(fort.getResidenceId()));
activeChar.sendPacket(adminReply);

2
trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java vendored
View File

@@ -63,7 +63,7 @@ public class AdminGraciaSeeds implements IAdminCommandHandler
private void showMenu(L2PcInstance activeChar)
{
final NpcHtmlMessage html = new NpcHtmlMessage();
html.setFile(activeChar.getHtmlPrefix(), "data/html/admin/graciaseeds.htm");
html.setFile(activeChar.getHtmlPrefix(), "html/admin/graciaseeds.htm");
html.replace("%sodstate%", String.valueOf(GraciaSeedsManager.getInstance().getSoDState()));
html.replace("%sodtiatkill%", String.valueOf(GraciaSeedsManager.getInstance().getSoDTiatKilled()));
if (GraciaSeedsManager.getInstance().getSoDTimeForNextStateChange() > 0)

14
trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java vendored
View File

@@ -76,7 +76,7 @@ public class AdminGrandBoss implements IAdminCommandHandler
else
{
NpcHtmlMessage html = new NpcHtmlMessage(0, 1);
html.setHtml(HtmCache.getInstance().getHtm(activeChar.getHtmlPrefix(), "data/html/admin/grandboss.htm"));
html.setHtml(HtmCache.getInstance().getHtm(activeChar.getHtmlPrefix(), "html/admin/grandboss.htm"));
activeChar.sendPacket(html);
}
break;
@@ -218,33 +218,33 @@ public class AdminGrandBoss implements IAdminCommandHandler
case ANTHARAS:
{
bossZone = ZoneManager.getInstance().getZoneById(ANTHARAS_ZONE, L2NoRestartZone.class);
htmlPatch = "data/html/admin/grandboss_antharas.htm";
htmlPatch = "html/admin/grandboss_antharas.htm";
break;
}
case VALAKAS:
{
htmlPatch = "data/html/admin/grandboss_valakas.htm";
htmlPatch = "html/admin/grandboss_valakas.htm";
break;
}
case BAIUM:
{
bossZone = ZoneManager.getInstance().getZoneById(BAIUM_ZONE, L2NoRestartZone.class);
htmlPatch = "data/html/admin/grandboss_baium.htm";
htmlPatch = "html/admin/grandboss_baium.htm";
break;
}
case QUEENANT:
{
htmlPatch = "data/html/admin/grandboss_queenant.htm";
htmlPatch = "html/admin/grandboss_queenant.htm";
break;
}
case ORFEN:
{
htmlPatch = "data/html/admin/grandboss_orfen.htm";
htmlPatch = "html/admin/grandboss_orfen.htm";
break;
}
case CORE:
{
htmlPatch = "data/html/admin/grandboss_core.htm";
htmlPatch = "html/admin/grandboss_core.htm";
break;
}
}

4
trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminHtml.java vendored
View File

@@ -76,11 +76,11 @@ public class AdminHtml implements IAdminCommandHandler
/**
* Shows a html message to activeChar
* @param activeChar activeChar where html is shown
* @param path relative path from directory data/html/admin/ to html
* @param path relative path from directory html/admin/ to html
*/
public static void showAdminHtml(L2PcInstance activeChar, String path)
{
showHtml(activeChar, "data/html/admin/" + path, false);
showHtml(activeChar, "html/admin/" + path, false);
}
/**

3
trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminLevel.java vendored
View File

@@ -20,7 +20,6 @@ package handlers.admincommandhandlers;
import java.util.StringTokenizer;
import com.l2jserver.Config;
import com.l2jserver.gameserver.data.xml.impl.ExperienceData;
import com.l2jserver.gameserver.handler.IAdminCommandHandler;
import com.l2jserver.gameserver.model.L2Object;
@@ -65,7 +64,7 @@ public class AdminLevel implements IAdminCommandHandler
}
else if (actualCommand.equalsIgnoreCase("admin_set_level"))
{
final int maxLevel = Config.SERVER_CLASSIC_SUPPORT ? Config.MAX_CLASSIC_PLAYER_LEVEL : ExperienceData.getInstance().getMaxLevel();
final int maxLevel = ExperienceData.getInstance().getMaxLevel();
try
{
if (!(targetChar instanceof L2PcInstance))

2
trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminLogin.java vendored
View File

@@ -168,7 +168,7 @@ public class AdminLogin implements IAdminCommandHandler
private void showMainPage(L2PcInstance activeChar)
{
final NpcHtmlMessage html = new NpcHtmlMessage();
html.setFile(activeChar.getHtmlPrefix(), "data/html/admin/login.htm");
html.setFile(activeChar.getHtmlPrefix(), "html/admin/login.htm");
html.replace("%server_name%", LoginServerThread.getInstance().getServerName());
html.replace("%status%", LoginServerThread.getInstance().getStatusString());
html.replace("%clock%", getServerTypeName(Config.SERVER_LIST_TYPE));

2
trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminManor.java vendored
View File

@@ -37,7 +37,7 @@ public final class AdminManor implements IAdminCommandHandler
{
final CastleManorManager manor = CastleManorManager.getInstance();
final NpcHtmlMessage msg = new NpcHtmlMessage();
msg.setFile(activeChar.getHtmlPrefix(), "data/html/admin/manor.htm");
msg.setFile(activeChar.getHtmlPrefix(), "html/admin/manor.htm");
msg.replace("%status%", manor.getCurrentModeName());
msg.replace("%change%", manor.getNextModeChange());

2
trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminPCBangPoints.java vendored
View File

@@ -199,7 +199,7 @@ public final class AdminPCBangPoints implements IAdminCommandHandler
final NpcHtmlMessage html = new NpcHtmlMessage(0, 0);
final L2PcInstance target = getTarget(activeChar);
final int points = target.getPcBangPoints();
html.setHtml(HtmCache.getInstance().getHtm(activeChar.getHtmlPrefix(), "data/html/admin/pcbang.htm"));
html.setHtml(HtmCache.getInstance().getHtm(activeChar.getHtmlPrefix(), "html/admin/pcbang.htm"));
html.replace("%points%", Util.formatAdena(points));
html.replace("%targetName%", target.getName());
activeChar.sendPacket(html);

4
trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminPForge.java vendored
View File

@@ -209,7 +209,7 @@ public final class AdminPForge implements IAdminCommandHandler
private void showValuesPage(L2PcInstance activeChar, String[] opCodes, String format)
{
String sendBypass = null;
String valuesHtml = HtmCache.getInstance().getHtmForce(activeChar.getHtmlPrefix(), "data/html/admin/pforge/values.htm");
String valuesHtml = HtmCache.getInstance().getHtmForce(activeChar.getHtmlPrefix(), "html/admin/pforge/values.htm");
if (opCodes.length == 3)
{
valuesHtml = valuesHtml.replace("%opformat%", "chd");
@@ -240,7 +240,7 @@ public final class AdminPForge implements IAdminCommandHandler
valuesHtml = valuesHtml.replace("%format%", format);
sendBypass += " " + format;
String editorTemplate = HtmCache.getInstance().getHtm(activeChar.getHtmlPrefix(), "data/html/admin/pforge/inc/editor.htm");
String editorTemplate = HtmCache.getInstance().getHtm(activeChar.getHtmlPrefix(), "html/admin/pforge/inc/editor.htm");
if (editorTemplate != null)
{

2
trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminPcCondOverride.java vendored
View File

@@ -50,7 +50,7 @@ public class AdminPcCondOverride implements IAdminCommandHandler
case "admin_exceptions":
{
final NpcHtmlMessage msg = new NpcHtmlMessage(0, 1);
msg.setFile(activeChar.getHtmlPrefix(), "data/html/admin/cond_override.htm");
msg.setFile(activeChar.getHtmlPrefix(), "html/admin/cond_override.htm");
StringBuilder sb = new StringBuilder();
for (PcCondOverride ex : PcCondOverride.values())
{

2
trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminPremium.java vendored
View File

@@ -111,7 +111,7 @@ public class AdminPremium implements IAdminCommandHandler
}
final NpcHtmlMessage html = new NpcHtmlMessage(0, 0);
html.setHtml(HtmCache.getInstance().getHtm(activeChar.getHtmlPrefix(), "data/html/admin/premium_menu.htm"));
html.setHtml(HtmCache.getInstance().getHtm(activeChar.getHtmlPrefix(), "html/admin/premium_menu.htm"));
activeChar.sendPacket(html);
return true;
}

2
trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminPrimePoints.java vendored
View File

@@ -182,7 +182,7 @@ public final class AdminPrimePoints implements IAdminCommandHandler
final NpcHtmlMessage html = new NpcHtmlMessage(0, 0);
final L2PcInstance target = getTarget(activeChar);
final int points = target.getPrimePoints();
html.setHtml(HtmCache.getInstance().getHtm(activeChar.getHtmlPrefix(), "data/html/admin/primepoints.htm"));
html.setHtml(HtmCache.getInstance().getHtm(activeChar.getHtmlPrefix(), "html/admin/primepoints.htm"));
html.replace("%points%", Util.formatAdena(points));
html.replace("%targetName%", target.getName());
activeChar.sendPacket(html);

12
trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java vendored
View File

@@ -79,7 +79,7 @@ public class AdminPunishment implements IAdminCommandHandler
{
if (!st.hasMoreTokens())
{
String content = HtmCache.getInstance().getHtm(activeChar.getHtmlPrefix(), "data/html/admin/punishment.htm");
String content = HtmCache.getInstance().getHtm(activeChar.getHtmlPrefix(), "html/admin/punishment.htm");
if (content != null)
{
content = content.replaceAll("%punishments%", Util.implode(PunishmentType.values(), ";"));
@@ -88,7 +88,7 @@ public class AdminPunishment implements IAdminCommandHandler
}
else
{
_log.log(Level.WARNING, getClass().getSimpleName() + ": data/html/admin/punishment.htm is missing");
_log.log(Level.WARNING, getClass().getSimpleName() + ": html/admin/punishment.htm is missing");
}
}
else
@@ -120,7 +120,7 @@ public class AdminPunishment implements IAdminCommandHandler
key = findCharId(key);
}
String content = HtmCache.getInstance().getHtm(activeChar.getHtmlPrefix(), "data/html/admin/punishment-info.htm");
String content = HtmCache.getInstance().getHtm(activeChar.getHtmlPrefix(), "html/admin/punishment-info.htm");
if (content != null)
{
StringBuilder sb = new StringBuilder();
@@ -151,7 +151,7 @@ public class AdminPunishment implements IAdminCommandHandler
}
else
{
_log.log(Level.WARNING, getClass().getSimpleName() + ": data/html/admin/punishment-info.htm is missing");
_log.log(Level.WARNING, getClass().getSimpleName() + ": html/admin/punishment-info.htm is missing");
}
break;
}
@@ -176,7 +176,7 @@ public class AdminPunishment implements IAdminCommandHandler
{
target = activeChar.getTarget().getActingPlayer();
}
String content = HtmCache.getInstance().getHtm(activeChar.getHtmlPrefix(), "data/html/admin/punishment-player.htm");
String content = HtmCache.getInstance().getHtm(activeChar.getHtmlPrefix(), "html/admin/punishment-player.htm");
if (content != null)
{
content = content.replaceAll("%player_name%", target.getName());
@@ -188,7 +188,7 @@ public class AdminPunishment implements IAdminCommandHandler
}
else
{
_log.log(Level.WARNING, getClass().getSimpleName() + ": data/html/admin/punishment-player.htm is missing");
_log.log(Level.WARNING, getClass().getSimpleName() + ": html/admin/punishment-player.htm is missing");
}
break;
}

4
trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminQuest.java vendored
View File

@@ -216,7 +216,7 @@ public class AdminQuest implements IAdminCommandHandler
}
final NpcHtmlMessage msg = new NpcHtmlMessage(0, 1);
msg.setFile(activeChar.getHtmlPrefix(), "data/html/admin/npc-quests.htm");
msg.setFile(activeChar.getHtmlPrefix(), "html/admin/npc-quests.htm");
msg.replace("%quests%", sb.toString());
msg.replace("%objid%", character.getObjectId());
msg.replace("%questName%", "");
@@ -322,7 +322,7 @@ public class AdminQuest implements IAdminCommandHandler
}
final NpcHtmlMessage msg = new NpcHtmlMessage(0, 1);
msg.setFile(activeChar.getHtmlPrefix(), "data/html/admin/npc-quests.htm");
msg.setFile(activeChar.getHtmlPrefix(), "html/admin/npc-quests.htm");
msg.replace("%quests%", sb.toString());
msg.replace("%questName%", "<table><tr><td width=\"50\" align=\"left\"><a action=\"bypass -h admin_script_load " + quest.getName() + "\">Reload</a></td> <td width=\"150\" align=\"center\"><a action=\"bypass -h admin_quest_info " + quest.getName() + "\">" + quest.getName() + "</a></td> <td width=\"50\" align=\"right\"><a action=\"bypass -h admin_script_unload " + quest.getName() + "\">Unload</a></tr></td></table>");
activeChar.sendPacket(msg);

10
trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminReload.java vendored
View File

@@ -136,14 +136,8 @@ public class AdminReload implements IAdminCommandHandler
if (st.hasMoreElements())
{
final String path = st.nextToken();
final File file = new File(Config.DATAPACK_ROOT, "data/html/" + path);
final File file_classic = new File(Config.DATAPACK_ROOT, "data/html_classic/" + path);
if (Config.SERVER_CLASSIC_SUPPORT && file_classic.exists())
{
HtmCache.getInstance().reload(file_classic);
AdminData.getInstance().broadcastMessageToGMs(activeChar.getName() + ": Reloaded Htm File:" + file_classic.getName() + ".");
}
else if (file.exists())
final File file = new File(Config.DATAPACK_ROOT, "html/" + path);
if (file.exists())
{
HtmCache.getInstance().reload(file);
AdminData.getInstance().broadcastMessageToGMs(activeChar.getName() + ": Reloaded Htm File:" + file.getName() + ".");

2
trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminScan.java vendored
View File

@@ -125,7 +125,7 @@ public class AdminScan implements IAdminCommandHandler
private void sendNpcList(L2PcInstance activeChar, int radius)
{
final NpcHtmlMessage html = new NpcHtmlMessage();
html.setFile(activeChar.getHtmlPrefix(), "data/html/admin/scan.htm");
html.setFile(activeChar.getHtmlPrefix(), "html/admin/scan.htm");
final StringBuilder sb = new StringBuilder();
for (L2Character character : activeChar.getKnownList().getKnownCharactersInRadius(radius))
{

2
trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminServerInfo.java vendored
View File

@@ -56,7 +56,7 @@ public class AdminServerInfo implements IAdminCommandHandler
final NpcHtmlMessage html = new NpcHtmlMessage();
final Runtime RunTime = Runtime.getRuntime();
final int mb = 1024 * 1024;
html.setHtml(HtmCache.getInstance().getHtm(activeChar.getHtmlPrefix(), "data/html/admin/serverinfo.htm"));
html.setHtml(HtmCache.getInstance().getHtm(activeChar.getHtmlPrefix(), "html/admin/serverinfo.htm"));
html.replace("%os_name%", System.getProperty("os.name"));
html.replace("%os_ver%", System.getProperty("os.version"));

2
trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminShutdown.java vendored
View File

@@ -111,7 +111,7 @@ public class AdminShutdown implements IAdminCommandHandler
Calendar cal = Calendar.getInstance();
cal.set(Calendar.HOUR_OF_DAY, h);
cal.set(Calendar.MINUTE, m);
adminReply.setFile(activeChar.getHtmlPrefix(), "data/html/admin/shutdown.htm");
adminReply.setFile(activeChar.getHtmlPrefix(), "html/admin/shutdown.htm");
adminReply.replace("%count%", String.valueOf(L2World.getInstance().getAllPlayersCount()));
adminReply.replace("%used%", String.valueOf(Runtime.getRuntime().totalMemory() - Runtime.getRuntime().freeMemory()));
adminReply.replace("%time%", String.valueOf(format.format(cal.getTime())));

2
trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminSkill.java vendored
View File

@@ -350,7 +350,7 @@ public class AdminSkill implements IAdminCommandHandler
}
final L2PcInstance player = target.getActingPlayer();
final NpcHtmlMessage adminReply = new NpcHtmlMessage();
adminReply.setFile(activeChar.getHtmlPrefix(), "data/html/admin/charskills.htm");
adminReply.setFile(activeChar.getHtmlPrefix(), "html/admin/charskills.htm");
adminReply.replace("%name%", player.getName());
adminReply.replace("%level%", String.valueOf(player.getLevel()));
adminReply.replace("%class%", ClassListData.getInstance().getClass(player.getClassId()).getClientCode());

2
trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminZone.java vendored
View File

@@ -113,7 +113,7 @@ public class AdminZone implements IAdminCommandHandler
private static void showHtml(L2PcInstance activeChar)
{
final String htmContent = HtmCache.getInstance().getHtm(activeChar.getHtmlPrefix(), "data/html/admin/zone.htm");
final String htmContent = HtmCache.getInstance().getHtm(activeChar.getHtmlPrefix(), "html/admin/zone.htm");
final NpcHtmlMessage adminReply = new NpcHtmlMessage();
adminReply.setHtml(htmContent);
adminReply.replace("%PEACE%", (activeChar.isInsideZone(ZoneId.PEACE) ? "<font color=\"LEVEL\">YES</font>" : "NO"));