Separated the Classic Datapack to it's own folder.

trunk/java/com/l2jserver/gameserver/GameServer.java

@@ -336,7 +336,7 @@ public final class GameServer
 			_log.info(getClass().getSimpleName() + ": Loading server scripts:");
 			if (!Config.ALT_DEV_NO_HANDLERS || !Config.ALT_DEV_NO_QUESTS)
 			{
-				L2ScriptEngineManager.getInstance().executeScriptList(new File(Config.DATAPACK_ROOT, "data/scripts.cfg"));
+				L2ScriptEngineManager.getInstance().executeScriptList(new File(Config.DATAPACK_ROOT, "scripts.cfg"));
 			}
 		}
 		catch (IOException ioe)
@@ -479,7 +479,7 @@ public final class GameServer
 		
 		/*** Main ***/
 		// Create log folder
-		File logFolder = new File(Config.DATAPACK_ROOT, LOG_FOLDER);
+		File logFolder = new File(".", LOG_FOLDER);
 		logFolder.mkdir();
 		
 		// Create input stream for log file -- or store file data into memory

trunk/java/com/l2jserver/gameserver/cache/HtmCache.java

@@ -114,8 +114,7 @@ public class HtmCache
 			return null;
 		}
 		
-		String relpath = Util.getRelativePath(Config.DATAPACK_ROOT, file);
-		relpath = relpath.replace("_classic", ""); // html files and folders should not contain "_classic" to avoid problems.
+		final String relpath = Util.getRelativePath(Config.DATAPACK_ROOT, file);
 		String content = null;
 		try (FileInputStream fis = new FileInputStream(file);
 			BufferedInputStream bis = new BufferedInputStream(fis))

trunk/java/com/l2jserver/gameserver/data/xml/impl/AdminData.java

@@ -60,9 +60,9 @@ public final class AdminData implements IXmlReader
 	{
 		_accessLevels.clear();
 		_adminCommandAccessRights.clear();
-		parseDatapackFile("config/accessLevels.xml");
+		parseDatapackFile("../config/accessLevels.xml");
 		LOGGER.log(Level.INFO, getClass().getSimpleName() + ": Loaded: " + _accessLevels.size() + " Access Levels.");
-		parseDatapackFile("config/adminCommands.xml");
+		parseDatapackFile("../config/adminCommands.xml");
 		LOGGER.log(Level.INFO, getClass().getSimpleName() + ": Loaded: " + _adminCommandAccessRights.size() + " Access Commands.");
 	}
 	

trunk/java/com/l2jserver/gameserver/data/xml/impl/AppearanceItemData.java

@@ -49,7 +49,7 @@ public class AppearanceItemData implements IXmlReader
 	@Override
 	public void load()
 	{
-		parseDatapackFile("data/AppearanceStones.xml");
+		parseDatapackFile("AppearanceStones.xml");
 		LOGGER.log(Level.INFO, getClass().getSimpleName() + ": Loaded: " + _stones.size() + " Stones");
 		
 		//@formatter:off

trunk/java/com/l2jserver/gameserver/data/xml/impl/ArmorSetsData.java

@@ -50,7 +50,7 @@ public final class ArmorSetsData implements IXmlReader
 	public void load()
 	{
 		_armorSets.clear();
-		parseDatapackDirectory("data/stats/armorsets", false);
+		parseDatapackDirectory("stats/armorsets", false);
 		LOGGER.info(getClass().getSimpleName() + ": Loaded " + _armorSets.size() + " Armor sets.");
 	}
 	

trunk/java/com/l2jserver/gameserver/data/xml/impl/BeautyShopData.java

@@ -50,7 +50,7 @@ public final class BeautyShopData implements IXmlReader
 	{
 		_beautyList.clear();
 		_beautyData.clear();
-		parseDatapackFile("data/BeautyShop.xml");
+		parseDatapackFile("BeautyShop.xml");
 	}
 	
 	@Override

trunk/java/com/l2jserver/gameserver/data/xml/impl/BuyListData.java

@@ -58,10 +58,10 @@ public final class BuyListData implements IXmlReader
 	public synchronized void load()
 	{
 		_buyLists.clear();
-		parseDatapackDirectory("data/buylists", false);
+		parseDatapackDirectory("buylists", false);
 		if (Config.CUSTOM_BUYLIST_LOAD)
 		{
-			parseDatapackDirectory("data/buylists/custom", false);
+			parseDatapackDirectory("buylists/custom", false);
 		}
 		
 		LOGGER.info(getClass().getSimpleName() + ": Loaded " + _buyLists.size() + " BuyLists.");

trunk/java/com/l2jserver/gameserver/data/xml/impl/CastleData.java

@@ -49,7 +49,7 @@ public final class CastleData implements IXmlReader
 	public void load()
 	{
 		_castles.clear();
-		parseDatapackDirectory("data/castles", true);
+		parseDatapackDirectory("/castles", true);
 	}
 	
 	@Override

trunk/java/com/l2jserver/gameserver/data/xml/impl/CategoryData.java

@@ -51,7 +51,7 @@ public final class CategoryData implements IXmlReader
 	public void load()
 	{
 		_categories.clear();
-		parseDatapackFile("data/categoryData.xml");
+		parseDatapackFile("categoryData.xml");
 		LOGGER.info(getClass().getSimpleName() + ": Loaded " + _categories.size() + " Categories.");
 	}
 	

trunk/java/com/l2jserver/gameserver/data/xml/impl/ClassListData.java

@@ -49,7 +49,7 @@ public final class ClassListData implements IXmlReader
 	public void load()
 	{
 		_classData.clear();
-		parseDatapackFile("data/stats/chars/classList.xml");
+		parseDatapackFile("stats/chars/classList.xml");
 		LOGGER.info(getClass().getSimpleName() + ": Loaded " + _classData.size() + " Class data.");
 	}
 	

trunk/java/com/l2jserver/gameserver/data/xml/impl/DoorData.java

@@ -60,7 +60,7 @@ public class DoorData implements IXmlReader
 		_doors.clear();
 		_groups.clear();
 		_regions.clear();
-		parseDatapackFile("data/doors.xml");
+		parseDatapackFile("doors.xml");
 	}
 	
 	@Override

trunk/java/com/l2jserver/gameserver/data/xml/impl/EnchantItemData.java

@@ -54,7 +54,7 @@ public class EnchantItemData implements IXmlReader
 	{
 		_scrolls.clear();
 		_supports.clear();
-		parseDatapackFile("data/enchantItemData.xml");
+		parseDatapackFile("enchantItemData.xml");
 		LOGGER.info(getClass().getSimpleName() + ": Loaded " + _scrolls.size() + " Enchant Scrolls.");
 		LOGGER.info(getClass().getSimpleName() + ": Loaded " + _supports.size() + " Support Items.");
 	}

trunk/java/com/l2jserver/gameserver/data/xml/impl/EnchantItemGroupsData.java

@@ -53,7 +53,7 @@ public final class EnchantItemGroupsData implements IXmlReader
 	{
 		_itemGroups.clear();
 		_scrollGroups.clear();
-		parseDatapackFile("data/enchantItemGroups.xml");
+		parseDatapackFile("enchantItemGroups.xml");
 		LOGGER.log(Level.INFO, getClass().getSimpleName() + ": Loaded: " + _itemGroups.size() + " item group templates.");
 		LOGGER.log(Level.INFO, getClass().getSimpleName() + ": Loaded: " + _scrollGroups.size() + " scroll group templates.");
 	}

trunk/java/com/l2jserver/gameserver/data/xml/impl/EnchantItemHPBonusData.java

@@ -115,7 +115,7 @@ public class EnchantItemHPBonusData implements IXmlReader
 	public void load()
 	{
 		_armorHPBonuses.clear();
-		parseDatapackFile("data/stats/enchantHPBonus.xml");
+		parseDatapackFile("stats/enchantHPBonus.xml");
 		LOGGER.info(getClass().getSimpleName() + ": Loaded " + _armorHPBonuses.size() + " Enchant HP Bonuses.");
 	}
 	

trunk/java/com/l2jserver/gameserver/data/xml/impl/EnchantItemOptionsData.java

@@ -46,7 +46,7 @@ public class EnchantItemOptionsData implements IXmlReader
 	public synchronized void load()
 	{
 		_data.clear();
-		parseDatapackFile("data/enchantItemOptions.xml");
+		parseDatapackFile("enchantItemOptions.xml");
 	}
 	
 	@Override

trunk/java/com/l2jserver/gameserver/data/xml/impl/EnchantSkillGroupsData.java

@@ -65,7 +65,7 @@ public class EnchantSkillGroupsData implements IXmlReader
 	{
 		_enchantSkillGroups.clear();
 		_enchantSkillTrees.clear();
-		parseDatapackFile("data/enchantSkillGroups.xml");
+		parseDatapackFile("enchantSkillGroups.xml");
 		int routes = 0;
 		for (L2EnchantSkillGroup group : _enchantSkillGroups.values())
 		{

trunk/java/com/l2jserver/gameserver/data/xml/impl/ExperienceData.java

@@ -50,7 +50,7 @@ public final class ExperienceData implements IXmlReader
 	public void load()
 	{
 		_expTable.clear();
-		parseDatapackFile("data/stats/experience.xml");
+		parseDatapackFile("stats/experience.xml");
 		LOGGER.info(getClass().getSimpleName() + ": Loaded " + _expTable.size() + " levels.");
 		LOGGER.info(getClass().getSimpleName() + ": Max Player Level is: " + (MAX_LEVEL - 1));
 		LOGGER.info(getClass().getSimpleName() + ": Max Pet Level is: " + (MAX_PET_LEVEL - 1));

trunk/java/com/l2jserver/gameserver/data/xml/impl/FishData.java

@@ -55,7 +55,7 @@ public final class FishData implements IXmlReader
 		_fishEasy.clear();
 		_fishNormal.clear();
 		_fishHard.clear();
-		parseDatapackFile("data/stats/fishing/fishes.xml");
+		parseDatapackFile("stats/fishing/fishes.xml");
 		LOGGER.info(getClass().getSimpleName() + ": Loaded " + (_fishEasy.size() + _fishNormal.size() + _fishHard.size()) + " Fishes.");
 	}
 	

trunk/java/com/l2jserver/gameserver/data/xml/impl/FishingMonstersData.java

@@ -49,7 +49,7 @@ public final class FishingMonstersData implements IXmlReader
 	public void load()
 	{
 		_fishingMonstersData.clear();
-		parseDatapackFile("data/stats/fishing/fishingMonsters.xml");
+		parseDatapackFile("stats/fishing/fishingMonsters.xml");
 		LOGGER.info(getClass().getSimpleName() + ": Loaded " + _fishingMonstersData.size() + " Fishing Monsters.");
 	}
 	

trunk/java/com/l2jserver/gameserver/data/xml/impl/FishingRodsData.java

@@ -49,7 +49,7 @@ public final class FishingRodsData implements IXmlReader
 	public void load()
 	{
 		_fishingRods.clear();
-		parseDatapackFile("data/stats/fishing/fishingRods.xml");
+		parseDatapackFile("stats/fishing/fishingRods.xml");
 		LOGGER.info(getClass().getSimpleName() + ": Loaded " + _fishingRods.size() + " Fishing Rods.");
 	}
 	

trunk/java/com/l2jserver/gameserver/data/xml/impl/HennaData.java

@@ -55,7 +55,7 @@ public final class HennaData implements IXmlReader
 	public void load()
 	{
 		_hennaList.clear();
-		parseDatapackFile("data/stats/hennaList.xml");
+		parseDatapackFile("stats/hennaList.xml");
 		LOGGER.info(getClass().getSimpleName() + ": Loaded " + _hennaList.size() + " Henna data.");
 	}
 	

trunk/java/com/l2jserver/gameserver/data/xml/impl/HitConditionBonusData.java

@@ -52,7 +52,7 @@ public final class HitConditionBonusData implements IXmlReader
 	@Override
 	public void load()
 	{
-		parseDatapackFile("data/stats/hitConditionBonus.xml");
+		parseDatapackFile("stats/hitConditionBonus.xml");
 		LOGGER.info(getClass().getSimpleName() + ": Loaded Hit Condition bonuses.");
 		if (Config.DEBUG)
 		{

trunk/java/com/l2jserver/gameserver/data/xml/impl/InitialEquipmentData.java

@@ -41,8 +41,8 @@ import com.l2jserver.util.data.xml.IXmlReader;
 public final class InitialEquipmentData implements IXmlReader
 {
 	private final Map<ClassId, List<PcItemTemplate>> _initialEquipmentList = new HashMap<>();
-	private static final String NORMAL = "data/stats/initialEquipment.xml";
-	private static final String EVENT = "data/stats/initialEquipmentEvent.xml";
+	private static final String NORMAL = "stats/initialEquipment.xml";
+	private static final String EVENT = "stats/initialEquipmentEvent.xml";
 	
 	/**
 	 * Instantiates a new initial equipment data.

trunk/java/com/l2jserver/gameserver/data/xml/impl/InitialShortcutData.java

@@ -63,7 +63,7 @@ public final class InitialShortcutData implements IXmlReader
 		_initialShortcutData.clear();
 		_initialGlobalShortcutList.clear();
 		
-		parseDatapackFile("data/stats/initialShortcuts.xml");
+		parseDatapackFile("stats/initialShortcuts.xml");
 		
 		LOGGER.info(getClass().getSimpleName() + ": Loaded " + _initialGlobalShortcutList.size() + " Initial Global Shortcuts data.");
 		LOGGER.info(getClass().getSimpleName() + ": Loaded " + _initialShortcutData.size() + " Initial Shortcuts data.");

trunk/java/com/l2jserver/gameserver/data/xml/impl/ItemCrystalizationData.java

@@ -45,7 +45,7 @@ public final class ItemCrystalizationData implements IXmlReader
 	@Override
 	public void load()
 	{
-		parseDatapackFile("data/CrystalizableItems.xml");
+		parseDatapackFile("CrystalizableItems.xml");
 		LOGGER.log(Level.INFO, getClass().getSimpleName() + ": Loaded: " + _items.size() + " Items");
 	}
 	

trunk/java/com/l2jserver/gameserver/data/xml/impl/KarmaData.java

@@ -44,7 +44,7 @@ public class KarmaData implements IXmlReader
 	public synchronized void load()
 	{
 		_karmaTable.clear();
-		parseDatapackFile("data/stats/chars/pcKarmaIncrease.xml");
+		parseDatapackFile("stats/chars/pcKarmaIncrease.xml");
 		LOGGER.log(Level.INFO, getClass().getSimpleName() + ": Loaded " + _karmaTable.size() + " karma modifiers.");
 	}
 	

trunk/java/com/l2jserver/gameserver/data/xml/impl/MultisellData.java

@@ -68,10 +68,10 @@ public final class MultisellData implements IXmlReader
 	public void load()
 	{
 		_entries.clear();
-		parseDatapackDirectory("data/multisell", false);
+		parseDatapackDirectory("multisell", false);
 		if (Config.CUSTOM_MULTISELL_LOAD)
 		{
-			parseDatapackDirectory("data/multisell/custom", false);
+			parseDatapackDirectory("multisell/custom", false);
 		}
 		
 		verify();

trunk/java/com/l2jserver/gameserver/data/xml/impl/NpcData.java

@@ -72,13 +72,13 @@ public class NpcData implements IXmlReader
 	{
 		_minionData = new MinionData();
 		
-		parseDatapackDirectory("data/stats/npcs", false);
+		parseDatapackDirectory("stats/npcs", false);
 		LOGGER.info(getClass().getSimpleName() + ": Loaded " + _npcs.size() + " NPCs.");
 		
 		if (Config.CUSTOM_NPC_DATA)
 		{
 			final int npcCount = _npcs.size();
-			parseDatapackDirectory("data/stats/npcs/custom", true);
+			parseDatapackDirectory("stats/npcs/custom", true);
 			LOGGER.info(getClass().getSimpleName() + ": Loaded " + (_npcs.size() - npcCount) + " Custom NPCs.");
 		}
 		
@@ -820,7 +820,7 @@ public class NpcData implements IXmlReader
 		public void load()
 		{
 			_tempMinions.clear();
-			parseDatapackFile("data/minionData.xml");
+			parseDatapackFile("minionData.xml");
 			LOGGER.info(getClass().getSimpleName() + ": Loaded " + _tempMinions.size() + " minions data.");
 		}
 		

trunk/java/com/l2jserver/gameserver/data/xml/impl/OptionData.java

@@ -50,7 +50,7 @@ public class OptionData implements IXmlReader
 	public synchronized void load()
 	{
 		_optionData.clear();
-		parseDatapackDirectory("data/stats/options", false);
+		parseDatapackDirectory("stats/options", false);
 		LOGGER.log(Level.INFO, getClass().getSimpleName() + ": Loaded: " + _optionData.size() + " Options.");
 	}
 	

trunk/java/com/l2jserver/gameserver/data/xml/impl/PetDataTable.java

@@ -52,7 +52,7 @@ public final class PetDataTable implements IXmlReader
 	public void load()
 	{
 		_pets.clear();
-		parseDatapackDirectory("data/stats/pets", false);
+		parseDatapackDirectory("stats/pets", false);
 		LOGGER.info(getClass().getSimpleName() + ": Loaded " + _pets.size() + " Pets.");
 	}
 	

trunk/java/com/l2jserver/gameserver/data/xml/impl/PlayerTemplateData.java

@@ -55,7 +55,7 @@ public final class PlayerTemplateData implements IXmlReader
 	public void load()
 	{
 		_playerTemplates.clear();
-		parseDatapackDirectory("data/stats/chars/baseStats", false);
+		parseDatapackDirectory("stats/chars/baseStats", false);
 		LOGGER.info(getClass().getSimpleName() + ": Loaded " + _playerTemplates.size() + " character templates.");
 		LOGGER.info(getClass().getSimpleName() + ": Loaded " + _dataCount + " level up gain records.");
 	}

trunk/java/com/l2jserver/gameserver/data/xml/impl/PlayerXpPercentLostData.java

@@ -44,7 +44,7 @@ public final class PlayerXpPercentLostData implements IXmlReader
 	@Override
 	public void load()
 	{
-		parseDatapackFile("data/stats/chars/playerXpPercentLost.xml");
+		parseDatapackFile("stats/chars/playerXpPercentLost.xml");
 	}
 	
 	@Override

trunk/java/com/l2jserver/gameserver/data/xml/impl/PrimeShopData.java

@@ -52,7 +52,7 @@ public class PrimeShopData implements IXmlReader
 	public void load()
 	{
 		_primeItems.clear();
-		parseDatapackFile("data/PrimeShop.xml");
+		parseDatapackFile("PrimeShop.xml");
 		
 		if (_primeItems.size() > 0)
 		{

trunk/java/com/l2jserver/gameserver/data/xml/impl/RecipeData.java

@@ -54,7 +54,7 @@ public class RecipeData implements IXmlReader
 	public void load()
 	{
 		_recipes.clear();
-		parseDatapackFile("data/recipes.xml");
+		parseDatapackFile("recipes.xml");
 		LOGGER.info(getClass().getSimpleName() + ": Loaded " + _recipes.size() + " recipes.");
 	}
 	

trunk/java/com/l2jserver/gameserver/data/xml/impl/ShuttleData.java

@@ -62,7 +62,7 @@ public final class ShuttleData implements IXmlReader
 			}
 			_shuttleInstances.clear();
 		}
-		parseDatapackFile("data/shuttledata.xml");
+		parseDatapackFile("shuttledata.xml");
 		init();
 		LOGGER.log(Level.INFO, getClass().getSimpleName() + ": Loaded: " + _shuttles.size() + " Shuttles.");
 	}

trunk/java/com/l2jserver/gameserver/data/xml/impl/SiegeScheduleData.java

@@ -48,7 +48,7 @@ public class SiegeScheduleData implements IXmlReader
 	public synchronized void load()
 	{
 		_scheduleData.clear();
-		parseDatapackFile("config/SiegeSchedule.xml");
+		parseDatapackFile("../config/SiegeSchedule.xml");
 		LOGGER.log(Level.INFO, getClass().getSimpleName() + ": Loaded: " + _scheduleData.size() + " siege schedulers.");
 		if (_scheduleData.isEmpty())
 		{

trunk/java/com/l2jserver/gameserver/data/xml/impl/SkillLearnData.java

@@ -46,7 +46,7 @@ public final class SkillLearnData implements IXmlReader
 	public synchronized void load()
 	{
 		_skillLearn.clear();
-		parseDatapackFile("data/skillLearn.xml");
+		parseDatapackFile("skillLearn.xml");
 		LOGGER.info(getClass().getSimpleName() + ": Loaded " + _skillLearn.size() + " Skill Learn data.");
 	}
 	

trunk/java/com/l2jserver/gameserver/data/xml/impl/SkillTreesData.java

@@ -145,14 +145,7 @@ public final class SkillTreesData implements IXmlReader
 		_dualClassSkillTree.clear();
 		
 		// Load files.
-		if (Config.SERVER_CLASSIC_SUPPORT)
-		{
-			parseDatapackDirectory("data/skillTrees/", false);
-		}
-		else
-		{
-			parseDatapackDirectory("data/skillTrees/", true);
-		}
+		parseDatapackDirectory("skillTrees/", true);
 		
 		// Generate check arrays.
 		generateCheckArrays();

trunk/java/com/l2jserver/gameserver/data/xml/impl/StaticObjectData.java

@@ -51,7 +51,7 @@ public final class StaticObjectData implements IXmlReader
 	public void load()
 	{
 		_staticObjects.clear();
-		parseDatapackFile("data/staticObjects.xml");
+		parseDatapackFile("staticObjects.xml");
 		LOGGER.info(getClass().getSimpleName() + ": Loaded " + _staticObjects.size() + " static object templates.");
 	}
 	

trunk/java/com/l2jserver/gameserver/data/xml/impl/TeleportersData.java

@@ -48,7 +48,7 @@ public class TeleportersData implements IXmlReader
 	public void load()
 	{
 		_teleporters.clear();
-		parseDatapackDirectory("data/teleporters", true);
+		parseDatapackDirectory("teleporters", true);
 		LOGGER.log(Level.INFO, "Loaded: " + _teleporters.size() + " npc teleporters.");
 	}
 	

trunk/java/com/l2jserver/gameserver/data/xml/impl/TransformData.java

@@ -53,7 +53,7 @@ public final class TransformData implements IXmlReader
 	public synchronized void load()
 	{
 		_transformData.clear();
-		parseDatapackDirectory("data/stats/transformations", false);
+		parseDatapackDirectory("stats/transformations", false);
 		LOGGER.log(Level.INFO, getClass().getSimpleName() + ": Loaded: " + _transformData.size() + " transform templates.");
 	}
 	

trunk/java/com/l2jserver/gameserver/data/xml/impl/UIData.java

@@ -51,7 +51,7 @@ public class UIData implements IXmlReader
 	{
 		_storedKeys.clear();
 		_storedCategories.clear();
-		parseDatapackFile("data/ui/ui_en.xml");
+		parseDatapackFile("ui/ui_en.xml");
 		LOGGER.info(getClass().getSimpleName() + ": Loaded " + _storedKeys.size() + " keys " + _storedCategories.size() + " categories.");
 	}
 	

trunk/java/com/l2jserver/gameserver/datatables/AugmentationData.java

@@ -236,7 +236,7 @@ public class AugmentationData
 				factory.setValidating(false);
 				factory.setIgnoringComments(true);
 				
-				File file = new File(Config.DATAPACK_ROOT + "/data/stats/augmentation/augmentation_skillmap.xml");
+				File file = new File(Config.DATAPACK_ROOT + "/stats/augmentation/augmentation_skillmap.xml");
 				if (!file.exists())
 				{
 					LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": ERROR The augmentation skillmap file is missing.");
@@ -323,7 +323,7 @@ public class AugmentationData
 			factory.setValidating(false);
 			factory.setIgnoringComments(true);
 			
-			File aFile = new File(Config.DATAPACK_ROOT + "/data/stats/augmentation/retailchances.xml");
+			File aFile = new File(Config.DATAPACK_ROOT + "/stats/augmentation/retailchances.xml");
 			if (aFile.exists())
 			{
 				Document aDoc = null;
@@ -420,7 +420,7 @@ public class AugmentationData
 			factory3.setValidating(false);
 			factory3.setIgnoringComments(true);
 			
-			File aFile3 = new File(Config.DATAPACK_ROOT + "/data/stats/augmentation/retailchances_accessory.xml");
+			File aFile3 = new File(Config.DATAPACK_ROOT + "/stats/augmentation/retailchances_accessory.xml");
 			if (aFile3.exists())
 			{
 				Document aDoc = null;

trunk/java/com/l2jserver/gameserver/datatables/MerchantPriceConfigTable.java

@@ -78,7 +78,7 @@ public class MerchantPriceConfigTable implements InstanceListManager
 		DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
 		factory.setValidating(false);
 		factory.setIgnoringComments(true);
-		File file = new File(Config.DATAPACK_ROOT + "/data/" + MPCS_FILE);
+		File file = new File(Config.DATAPACK_ROOT + "/" + MPCS_FILE);
 		if (file.exists())
 		{
 			int defaultPriceConfigId;

trunk/java/com/l2jserver/gameserver/datatables/SpawnTable.java

@@ -53,7 +53,7 @@ public final class SpawnTable implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(SpawnTable.class.getName());
 	// SQL
-	private static final String SELECT_SPAWNS = "SELECT count, npc_templateid, locx, locy, locz, heading, respawn_delay, respawn_random, loc_id, periodOfDay FROM " + (Config.SERVER_CLASSIC_SUPPORT ? "classic_spawnlist" : "spawnlist");
+	private static final String SELECT_SPAWNS = "SELECT count, npc_templateid, locx, locy, locz, heading, respawn_delay, respawn_random, loc_id, periodOfDay FROM spawnlist";
 	private static final String SELECT_CUSTOM_SPAWNS = "SELECT count, npc_templateid, locx, locy, locz, heading, respawn_delay, respawn_random, loc_id, periodOfDay FROM custom_spawnlist";
 	
 	private static final Map<Integer, Set<L2Spawn>> _spawnTable = new ConcurrentHashMap<>();
@@ -78,7 +78,7 @@ public final class SpawnTable implements IXmlReader
 			}
 			
 			// Load XML list
-			parseDatapackDirectory("data/spawnlist", false);
+			parseDatapackDirectory("spawnlist", false);
 			LOGGER.info(getClass().getSimpleName() + ": Loaded " + _xmlSpawnCount + " npc spawns from XML.");
 		}
 	}

trunk/java/com/l2jserver/gameserver/engines/DocumentEngine.java

@@ -49,15 +49,15 @@ public class DocumentEngine
 	
 	protected DocumentEngine()
 	{
-		hashFiles("data/stats/items", _itemFiles);
+		hashFiles("stats/items", _itemFiles);
 		if (Config.CUSTOM_ITEMS_LOAD)
 		{
-			hashFiles("data/stats/items/custom", _itemFiles);
+			hashFiles("stats/items/custom", _itemFiles);
 		}
-		hashFiles("data/stats/skills", _skillFiles);
+		hashFiles("stats/skills", _skillFiles);
 		if (Config.CUSTOM_SKILLS_LOAD)
 		{
-			hashFiles("data/stats/skills/custom", _skillFiles);
+			hashFiles("stats/skills/custom", _skillFiles);
 		}
 	}
 	

trunk/java/com/l2jserver/gameserver/instancemanager/CastleManorManager.java

@@ -123,7 +123,7 @@ public final class CastleManorManager implements IXmlReader, IStorable
 	@Override
 	public final void load()
 	{
-		parseDatapackFile("data/seeds.xml");
+		parseDatapackFile("seeds.xml");
 		LOGGER.info(getClass().getSimpleName() + ": Loaded " + _seeds.size() + " seeds.");
 	}
 	

trunk/java/com/l2jserver/gameserver/instancemanager/CursedWeaponsManager.java

@@ -96,10 +96,10 @@ public final class CursedWeaponsManager
 			factory.setValidating(false);
 			factory.setIgnoringComments(true);
 			
-			File file = new File(Config.DATAPACK_ROOT + "/data/cursedWeapons.xml");
+			File file = new File(Config.DATAPACK_ROOT + "/cursedWeapons.xml");
 			if (!file.exists())
 			{
-				_log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't find data/" + file.getName());
+				_log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't find " + file.getName());
 				return;
 			}
 			

trunk/java/com/l2jserver/gameserver/instancemanager/FishingChampionshipManager.java

@@ -306,7 +306,7 @@ public class FishingChampionshipManager
 						pl.addItem("fishing_reward", Config.ALT_FISH_CHAMPIONSHIP_REWARD_ITEM, rewardCnt, null, true);
 						
 						final NpcHtmlMessage html = new NpcHtmlMessage();
-						html.setFile(pl.getHtmlPrefix(), "data/html/fisherman/championship/fish_event_reward001.htm");
+						html.setFile(pl.getHtmlPrefix(), "html/fisherman/championship/fish_event_reward001.htm");
 						pl.sendPacket(html);
 					}
 				}
@@ -320,7 +320,7 @@ public class FishingChampionshipManager
 		
 		if (_needRefresh)
 		{
-			html.setFile(pl.getHtmlPrefix(), "data/html/fisherman/championship/fish_event003.htm");
+			html.setFile(pl.getHtmlPrefix(), "html/fisherman/championship/fish_event003.htm");
 			pl.sendPacket(html);
 			
 			refreshResult();
@@ -328,7 +328,7 @@ public class FishingChampionshipManager
 			return;
 		}
 		
-		html.setFile(pl.getHtmlPrefix(), "data/html/fisherman/championship/fish_event002.htm");
+		html.setFile(pl.getHtmlPrefix(), "html/fisherman/championship/fish_event002.htm");
 		
 		String str = null;
 		for (int x = 1; x <= 5; x++)
@@ -350,7 +350,7 @@ public class FishingChampionshipManager
 	public void showChampScreen(L2PcInstance pl, L2NpcInstance npc)
 	{
 		final NpcHtmlMessage html = new NpcHtmlMessage();
-		html.setFile(pl.getHtmlPrefix(), "data/html/fisherman/championship/fish_event001.htm");
+		html.setFile(pl.getHtmlPrefix(), "html/fisherman/championship/fish_event001.htm");
 		
 		String str = null;
 		for (int x = 1; x <= 5; x++)

trunk/java/com/l2jserver/gameserver/instancemanager/FourSepulchersManager.java

@@ -1551,7 +1551,7 @@ public final class FourSepulchersManager
 	public void showHtmlFile(L2PcInstance player, String file, L2Npc npc, L2PcInstance member)
 	{
 		final NpcHtmlMessage html = new NpcHtmlMessage(npc.getObjectId());
-		html.setFile(player.getHtmlPrefix(), "data/html/SepulcherNpc/" + file);
+		html.setFile(player.getHtmlPrefix(), "html/SepulcherNpc/" + file);
 		if (member != null)
 		{
 			html.replace("%member%", member.getName());

trunk/java/com/l2jserver/gameserver/instancemanager/InstanceManager.java

@@ -67,7 +67,7 @@ public final class InstanceManager implements IXmlReader
 	public void load()
 	{
 		_instanceIdNames.clear();
-		parseDatapackFile("data/instancenames.xml");
+		parseDatapackFile("instancenames.xml");
 		LOGGER.info(getClass().getSimpleName() + ": Loaded " + _instanceIdNames.size() + " instance names.");
 	}
 	

trunk/java/com/l2jserver/gameserver/instancemanager/ItemAuctionManager.java

@@ -74,7 +74,7 @@ public final class ItemAuctionManager
 			_log.log(Level.SEVERE, getClass().getSimpleName() + ": Failed loading auctions.", e);
 		}
 		
-		final File file = new File(Config.DATAPACK_ROOT + "/data/ItemAuctions.xml");
+		final File file = new File(Config.DATAPACK_ROOT + "/ItemAuctions.xml");
 		if (!file.exists())
 		{
 			_log.log(Level.WARNING, getClass().getSimpleName() + ": Missing ItemAuctions.xml!");

trunk/java/com/l2jserver/gameserver/instancemanager/JumpManager.java

@@ -108,7 +108,7 @@ public class JumpManager
 		DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
 		factory.setValidating(false);
 		factory.setIgnoringComments(true);
-		File file = new File(Config.DATAPACK_ROOT, "data/JumpTrack.xml");
+		File file = new File(Config.DATAPACK_ROOT, "JumpTrack.xml");
 		Document doc = null;
 		
 		if (file.exists())

trunk/java/com/l2jserver/gameserver/instancemanager/MapRegionManager.java

@@ -60,7 +60,7 @@ public final class MapRegionManager implements IXmlReader
 	public void load()
 	{
 		_regions.clear();
-		parseDatapackDirectory("data/mapregion", false);
+		parseDatapackDirectory("mapregion", false);
 		LOGGER.info(getClass().getSimpleName() + ": Loaded " + _regions.size() + " map regions.");
 	}
 	

trunk/java/com/l2jserver/gameserver/instancemanager/PetitionManager.java

@@ -446,7 +446,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.getHtmlPrefix(), "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());

trunk/java/com/l2jserver/gameserver/instancemanager/QuestManager.java

@@ -103,7 +103,7 @@ public final class QuestManager extends ScriptManager<Quest>
 		
 		try
 		{
-			L2ScriptEngineManager.getInstance().executeScriptList(new File(Config.DATAPACK_ROOT, "data/scripts.cfg"));
+			L2ScriptEngineManager.getInstance().executeScriptList(new File(Config.DATAPACK_ROOT, "scripts.cfg"));
 		}
 		catch (IOException e)
 		{

trunk/java/com/l2jserver/gameserver/instancemanager/RaidBossSpawnManager.java

@@ -77,7 +77,7 @@ public class RaidBossSpawnManager
 		_schedules.clear();
 		
 		try (Connection con = L2DatabaseFactory.getInstance().getConnection();
-			PreparedStatement statement = con.prepareStatement("SELECT * FROM " + (Config.SERVER_CLASSIC_SUPPORT ? "classic_raidboss_spawnlist" : "raidboss_spawnlist") + " ORDER BY boss_id");
+			PreparedStatement statement = con.prepareStatement("SELECT * FROM raidboss_spawnlist ORDER BY boss_id");
 			ResultSet rset = statement.executeQuery())
 		{
 			while (rset.next())
@@ -266,7 +266,7 @@ public class RaidBossSpawnManager
 		if (storeInDb)
 		{
 			try (Connection con = L2DatabaseFactory.getInstance().getConnection();
-				PreparedStatement statement = con.prepareStatement("INSERT INTO " + (Config.SERVER_CLASSIC_SUPPORT ? "classic_raidboss_spawnlist" : "raidboss_spawnlist") + " (boss_id,amount,loc_x,loc_y,loc_z,heading,respawn_time,currentHp,currentMp) VALUES(?,?,?,?,?,?,?,?,?)"))
+				PreparedStatement statement = con.prepareStatement("INSERT INTO raidboss_spawnlist (boss_id,amount,loc_x,loc_y,loc_z,heading,respawn_time,currentHp,currentMp) VALUES(?,?,?,?,?,?,?,?,?)"))
 			{
 				statement.setInt(1, spawnDat.getId());
 				statement.setInt(2, spawnDat.getAmount());
@@ -327,7 +327,7 @@ public class RaidBossSpawnManager
 		if (updateDb)
 		{
 			try (Connection con = L2DatabaseFactory.getInstance().getConnection();
-				PreparedStatement statement = con.prepareStatement("DELETE FROM " + (Config.SERVER_CLASSIC_SUPPORT ? "classic_raidboss_spawnlist" : "raidboss_spawnlist") + " WHERE boss_id=?"))
+				PreparedStatement statement = con.prepareStatement("DELETE FROM raidboss_spawnlist WHERE boss_id=?"))
 			{
 				statement.setInt(1, bossId);
 				statement.execute();
@@ -346,7 +346,7 @@ public class RaidBossSpawnManager
 	private void updateDb()
 	{
 		try (Connection con = L2DatabaseFactory.getInstance().getConnection();
-			PreparedStatement statement = con.prepareStatement("UPDATE " + (Config.SERVER_CLASSIC_SUPPORT ? "classic_raidboss_spawnlist" : "raidboss_spawnlist") + " SET respawn_time = ?, currentHP = ?, currentMP = ? WHERE boss_id = ?"))
+			PreparedStatement statement = con.prepareStatement("UPDATE raidboss_spawnlist SET respawn_time = ?, currentHP = ?, currentMP = ? WHERE boss_id = ?"))
 		{
 			for (Integer bossId : _storedInfo.keySet())
 			{

trunk/java/com/l2jserver/gameserver/instancemanager/WalkingManager.java

@@ -27,7 +27,6 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jserver.Config;
 import com.l2jserver.gameserver.ThreadPoolManager;
 import com.l2jserver.gameserver.ai.CtrlIntention;
 import com.l2jserver.gameserver.enums.ChatType;
@@ -75,7 +74,7 @@ public final class WalkingManager implements IXmlReader
 	@Override
 	public final void load()
 	{
-		parseDatapackFile(Config.SERVER_CLASSIC_SUPPORT ? "data/classic_routes.xml" : "data/Routes.xml");
+		parseDatapackFile("Routes.xml");
 		LOGGER.info(getClass().getSimpleName() + ": Loaded " + _routes.size() + " walking routes.");
 	}
 	

trunk/java/com/l2jserver/gameserver/instancemanager/ZoneManager.java

@@ -384,8 +384,8 @@ public final class ZoneManager implements IXmlReader
 	{
 		_classZones.clear();
 		_spawnTerritories.clear();
-		parseDatapackDirectory("data/zones", false);
-		parseDatapackDirectory("data/zones/npcSpawnTerritories", false);
+		parseDatapackDirectory("zones", false);
+		parseDatapackDirectory("zones/npcSpawnTerritories", false);
 		LOGGER.info(getClass().getSimpleName() + ": Loaded " + _classZones.size() + " zone classes and " + getSize() + " zones.");
 		LOGGER.info(getClass().getSimpleName() + ": Loaded " + _spawnTerritories.size() + " NPC spawn territoriers.");
 	}

trunk/java/com/l2jserver/gameserver/model/actor/L2Npc.java

@@ -854,7 +854,7 @@ public class L2Npc extends L2Character
 				player.sendPacket(ActionFailed.STATIC_PACKET);
 				
 				final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
-				html.setFile(player.getHtmlPrefix(), "data/html/npcbusy.htm");
+				html.setFile(player.getHtmlPrefix(), "html/npcbusy.htm");
 				html.replace("%busymessage%", getBusyMessage());
 				html.replace("%npcname%", getName());
 				html.replace("%playername%", player.getName());
@@ -957,9 +957,9 @@ public class L2Npc extends L2Character
 	/**
 	 * <B><U Format of the pathfile</U>:</B>
 	 * <ul>
-	 * <li>if the file exists on the server (page number = 0) : <B>data/html/default/12006.htm</B> (npcId-page number)</li>
-	 * <li>if the file exists on the server (page number > 0) : <B>data/html/default/12006-1.htm</B> (npcId-page number)</li>
-	 * <li>if the file doesn't exist on the server : <B>data/html/npcdefault.htm</B> (message : "I have nothing to say to you")</li>
+	 * <li>if the file exists on the server (page number = 0) : <B>html/default/12006.htm</B> (npcId-page number)</li>
+	 * <li>if the file exists on the server (page number > 0) : <B>html/default/12006-1.htm</B> (npcId-page number)</li>
+	 * <li>if the file doesn't exist on the server : <B>html/npcdefault.htm</B> (message : "I have nothing to say to you")</li>
 	 * </ul>
 	 * @param npcId The Identifier of the L2NpcInstance whose text must be display
 	 * @param val The number of the page to display
@@ -978,7 +978,7 @@ public class L2Npc extends L2Character
 			pom = npcId + "-" + val;
 		}
 		
-		String temp = "data/html/default/" + pom + ".htm";
+		String temp = "html/default/" + pom + ".htm";
 		
 		if (!Config.LAZY_CACHE)
 		{
@@ -997,7 +997,7 @@ public class L2Npc extends L2Character
 		}
 		
 		// If the file is not found, the standard message "I have nothing to say to you" is returned
-		return "data/html/npcdefault.htm";
+		return "html/npcdefault.htm";
 	}
 	
 	public void showChatWindow(L2PcInstance player)
@@ -1013,7 +1013,7 @@ public class L2Npc extends L2Character
 	 */
 	private boolean showPkDenyChatWindow(L2PcInstance player, String type)
 	{
-		final String html = HtmCache.getInstance().getHtm(player.getHtmlPrefix(), "data/html/" + type + "/" + getId() + "-pk.htm");
+		final String html = HtmCache.getInstance().getHtm(player.getHtmlPrefix(), "html/" + type + "/" + getId() + "-pk.htm");
 		if (html != null)
 		{
 			insertObjectIdAndShowChatWindow(player, html);
@@ -1478,15 +1478,15 @@ public class L2Npc extends L2Character
 		
 		if (this instanceof L2WarehouseInstance)
 		{
-			html = HtmCache.getInstance().getHtm(player.getHtmlPrefix(), "data/html/warehouse/" + npcId + "-noteach.htm");
+			html = HtmCache.getInstance().getHtm(player.getHtmlPrefix(), "html/warehouse/" + npcId + "-noteach.htm");
 		}
 		else if (this instanceof L2TrainerInstance)
 		{
-			html = HtmCache.getInstance().getHtm(player.getHtmlPrefix(), "data/html/trainer/" + npcId + "-noteach.htm");
+			html = HtmCache.getInstance().getHtm(player.getHtmlPrefix(), "html/trainer/" + npcId + "-noteach.htm");
 			// Trainer Healer?
 			if (html == null)
 			{
-				html = HtmCache.getInstance().getHtm(player.getHtmlPrefix(), "data/scripts/ai/npc/Trainers/HealerTrainer/" + npcId + "-noteach.html");
+				html = HtmCache.getInstance().getHtm(player.getHtmlPrefix(), "scripts/ai/npc/Trainers/HealerTrainer/" + npcId + "-noteach.html");
 			}
 		}
 		

trunk/java/com/l2jserver/gameserver/model/actor/instance/L2AdventurerInstance.java

@@ -48,6 +48,6 @@ public class L2AdventurerInstance extends L2NpcInstance
 			pom = npcId + "-" + val;
 		}
 		
-		return "data/html/adventurer_guildsman/" + pom + ".htm";
+		return "html/adventurer_guildsman/" + pom + ".htm";
 	}
 }

trunk/java/com/l2jserver/gameserver/model/actor/instance/L2AuctioneerInstance.java

@@ -66,7 +66,7 @@ public final class L2AuctioneerInstance extends L2Npc
 		}
 		else if (condition == COND_BUSY_BECAUSE_OF_SIEGE)
 		{
-			String filename = "data/html/auction/auction-busy.htm";
+			String filename = "html/auction/auction-busy.htm";
 			final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
 			html.setFile(player.getHtmlPrefix(), filename);
 			html.replace("%objectId%", String.valueOf(getObjectId()));
@@ -111,7 +111,7 @@ public final class L2AuctioneerInstance extends L2Npc
 						
 						_pendingAuctions.put(a.getId(), a);
 						
-						String filename = "data/html/auction/AgitSale3.htm";
+						String filename = "html/auction/AgitSale3.htm";
 						final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
 						html.setFile(player.getHtmlPrefix(), filename);
 						html.replace("%x%", val);
@@ -170,7 +170,7 @@ public final class L2AuctioneerInstance extends L2Npc
 						_log.warning("auction test started");
 					}
 					
-					String filename = "data/html/auction/AgitAuctionInfo.htm";
+					String filename = "html/auction/AgitAuctionInfo.htm";
 					Auction a = ClanHallAuctionManager.getInstance().getAuction(auctionId);
 					
 					final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
@@ -257,7 +257,7 @@ public final class L2AuctioneerInstance extends L2Npc
 				
 				try
 				{
-					String filename = "data/html/auction/AgitBid1.htm";
+					String filename = "html/auction/AgitBid1.htm";
 					
 					long minimumBid = ClanHallAuctionManager.getInstance().getAuction(Integer.parseInt(val)).getHighestBidderMaxBid();
 					if (minimumBid == 0)
@@ -362,7 +362,7 @@ public final class L2AuctioneerInstance extends L2Npc
 				}
 				
 				items.append("</table>");
-				String filename = "data/html/auction/AgitAuctionList.htm";
+				String filename = "html/auction/AgitAuctionList.htm";
 				
 				final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
 				html.setFile(player.getHtmlPrefix(), filename);
@@ -398,7 +398,7 @@ public final class L2AuctioneerInstance extends L2Npc
 				{
 					biders += "<tr>" + "<td>" + b.getClanName() + "</td><td>" + b.getName() + "</td><td>" + b.getTimeBid().get(Calendar.YEAR) + "/" + (b.getTimeBid().get(Calendar.MONTH) + 1) + "/" + b.getTimeBid().get(Calendar.DATE) + "</td><td>" + b.getBid() + "</td>" + "</tr>";
 				}
-				String filename = "data/html/auction/AgitBidderList.htm";
+				String filename = "html/auction/AgitBidderList.htm";
 				
 				final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
 				html.setFile(player.getHtmlPrefix(), filename);
@@ -414,7 +414,7 @@ public final class L2AuctioneerInstance extends L2Npc
 				if ((player.getClan() != null) && (player.getClan().getHideoutId() == 0) && (player.getClan().getAuctionBiddedAt() > 0))
 				{
 					SimpleDateFormat format = new SimpleDateFormat("dd/MM/yyyy HH:mm");
-					String filename = "data/html/auction/AgitBidInfo.htm";
+					String filename = "html/auction/AgitBidInfo.htm";
 					final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
 					html.setFile(player.getHtmlPrefix(), filename);
 					Auction a = ClanHallAuctionManager.getInstance().getAuction(player.getClan().getAuctionBiddedAt());
@@ -445,7 +445,7 @@ public final class L2AuctioneerInstance extends L2Npc
 				else if ((player.getClan() != null) && (ClanHallAuctionManager.getInstance().getAuction(player.getClan().getHideoutId()) != null))
 				{
 					SimpleDateFormat format = new SimpleDateFormat("dd/MM/yyyy HH:mm");
-					String filename = "data/html/auction/AgitSaleInfo.htm";
+					String filename = "html/auction/AgitSaleInfo.htm";
 					final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
 					html.setFile(player.getHtmlPrefix(), filename);
 					Auction a = ClanHallAuctionManager.getInstance().getAuction(player.getClan().getHideoutId());
@@ -477,7 +477,7 @@ public final class L2AuctioneerInstance extends L2Npc
 				else if ((player.getClan() != null) && (player.getClan().getHideoutId() != 0))
 				{
 					int ItemId = player.getClan().getHideoutId();
-					String filename = "data/html/auction/AgitInfo.htm";
+					String filename = "html/auction/AgitInfo.htm";
 					final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
 					html.setFile(player.getHtmlPrefix(), filename);
 					if (ClanHallManager.getInstance().getAuctionableHallById(ItemId) != null)
@@ -513,7 +513,7 @@ public final class L2AuctioneerInstance extends L2Npc
 			else if (actualCommand.equalsIgnoreCase("cancelBid"))
 			{
 				long bid = ClanHallAuctionManager.getInstance().getAuction(player.getClan().getAuctionBiddedAt()).getBidders().get(player.getClanId()).getBid();
-				String filename = "data/html/auction/AgitBidCancel.htm";
+				String filename = "html/auction/AgitBidCancel.htm";
 				final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
 				html.setFile(player.getHtmlPrefix(), filename);
 				html.replace("%AGIT_BID%", String.valueOf(bid));
@@ -536,14 +536,14 @@ public final class L2AuctioneerInstance extends L2Npc
 			{
 				if (!player.hasClanPrivilege(ClanPrivilege.CH_AUCTION))
 				{
-					String filename = "data/html/auction/not_authorized.htm";
+					String filename = "html/auction/not_authorized.htm";
 					final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
 					html.setFile(player.getHtmlPrefix(), filename);
 					html.replace("%objectId%", String.valueOf(getObjectId()));
 					player.sendPacket(html);
 					return;
 				}
-				String filename = "data/html/auction/AgitSaleCancel.htm";
+				String filename = "html/auction/AgitSaleCancel.htm";
 				final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
 				html.setFile(player.getHtmlPrefix(), filename);
 				html.replace("%AGIT_DEPOSIT%", String.valueOf(ClanHallManager.getInstance().getClanHallByOwner(player.getClan()).getLease()));
@@ -563,7 +563,7 @@ public final class L2AuctioneerInstance extends L2Npc
 			}
 			else if (actualCommand.equalsIgnoreCase("sale2"))
 			{
-				String filename = "data/html/auction/AgitSale2.htm";
+				String filename = "html/auction/AgitSale2.htm";
 				final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
 				html.setFile(player.getHtmlPrefix(), filename);
 				html.replace("%AGIT_LAST_PRICE%", String.valueOf(ClanHallManager.getInstance().getClanHallByOwner(player.getClan()).getLease()));
@@ -576,14 +576,14 @@ public final class L2AuctioneerInstance extends L2Npc
 			{
 				if (!player.hasClanPrivilege(ClanPrivilege.CH_AUCTION))
 				{
-					String filename = "data/html/auction/not_authorized.htm";
+					String filename = "html/auction/not_authorized.htm";
 					final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
 					html.setFile(player.getHtmlPrefix(), filename);
 					html.replace("%objectId%", String.valueOf(getObjectId()));
 					player.sendPacket(html);
 					return;
 				}
-				String filename = "data/html/auction/AgitSale1.htm";
+				String filename = "html/auction/AgitSale1.htm";
 				final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
 				html.setFile(player.getHtmlPrefix(), filename);
 				html.replace("%AGIT_DEPOSIT%", String.valueOf(ClanHallManager.getInstance().getClanHallByOwner(player.getClan()).getLease()));
@@ -598,7 +598,7 @@ public final class L2AuctioneerInstance extends L2Npc
 				SimpleDateFormat format = new SimpleDateFormat("dd/MM/yyyy HH:mm");
 				if (!player.hasClanPrivilege(ClanPrivilege.CH_AUCTION))
 				{
-					String filename = "data/html/auction/not_authorized.htm";
+					String filename = "html/auction/not_authorized.htm";
 					final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
 					html.setFile(player.getHtmlPrefix(), filename);
 					html.replace("%objectId%", String.valueOf(getObjectId()));
@@ -607,7 +607,7 @@ public final class L2AuctioneerInstance extends L2Npc
 				}
 				try
 				{
-					String filename = "data/html/auction/AgitBid2.htm";
+					String filename = "html/auction/AgitBid2.htm";
 					final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
 					html.setFile(player.getHtmlPrefix(), filename);
 					Auction a = ClanHallAuctionManager.getInstance().getAuction(player.getClan().getAuctionBiddedAt());
@@ -635,7 +635,7 @@ public final class L2AuctioneerInstance extends L2Npc
 			else if (actualCommand.equalsIgnoreCase("location"))
 			{
 				final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
-				html.setFile(player.getHtmlPrefix(), "data/html/auction/location.htm");
+				html.setFile(player.getHtmlPrefix(), "html/auction/location.htm");
 				html.replace("%location%", MapRegionManager.getInstance().getClosestTownName(player));
 				html.replace("%LOCATION%", getPictureName(player));
 				html.replace("%AGIT_LINK_BACK%", "bypass -h npc_" + getObjectId() + "_start");
@@ -655,16 +655,16 @@ public final class L2AuctioneerInstance extends L2Npc
 	@Override
 	public void showChatWindow(L2PcInstance player)
 	{
-		String filename = "data/html/auction/auction-no.htm";
+		String filename = "html/auction/auction-no.htm";
 		
 		int condition = validateCondition(player);
 		if (condition == COND_BUSY_BECAUSE_OF_SIEGE)
 		{
-			filename = "data/html/auction/auction-busy.htm"; // Busy because of siege
+			filename = "html/auction/auction-busy.htm"; // Busy because of siege
 		}
 		else
 		{
-			filename = "data/html/auction/auction.htm";
+			filename = "html/auction/auction.htm";
 		}
 		
 		final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());

trunk/java/com/l2jserver/gameserver/model/actor/instance/L2ClanHallDoormenInstance.java

@@ -101,11 +101,11 @@ public class L2ClanHallDoormenInstance extends L2DoormenInstance
 				final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
 				if (ok)
 				{
-					html.setFile(player.getHtmlPrefix(), "data/html/clanHallDoormen/evolve-ok.htm");
+					html.setFile(player.getHtmlPrefix(), "html/clanHallDoormen/evolve-ok.htm");
 				}
 				else
 				{
-					html.setFile(player.getHtmlPrefix(), "data/html/clanHallDoormen/evolve-no.htm");
+					html.setFile(player.getHtmlPrefix(), "html/clanHallDoormen/evolve-no.htm");
 				}
 				player.sendPacket(html);
 				return;
@@ -128,12 +128,12 @@ public class L2ClanHallDoormenInstance extends L2DoormenInstance
 			{
 				if (_hasEvolve)
 				{
-					html.setFile(player.getHtmlPrefix(), "data/html/clanHallDoormen/doormen2.htm");
+					html.setFile(player.getHtmlPrefix(), "html/clanHallDoormen/doormen2.htm");
 					html.replace("%clanname%", owner.getName());
 				}
 				else
 				{
-					html.setFile(player.getHtmlPrefix(), "data/html/clanHallDoormen/doormen1.htm");
+					html.setFile(player.getHtmlPrefix(), "html/clanHallDoormen/doormen1.htm");
 					html.replace("%clanname%", owner.getName());
 				}
 			}
@@ -141,13 +141,13 @@ public class L2ClanHallDoormenInstance extends L2DoormenInstance
 			{
 				if ((owner != null) && (owner.getLeader() != null))
 				{
-					html.setFile(player.getHtmlPrefix(), "data/html/clanHallDoormen/doormen-no.htm");
+					html.setFile(player.getHtmlPrefix(), "html/clanHallDoormen/doormen-no.htm");
 					html.replace("%leadername%", owner.getLeaderName());
 					html.replace("%clanname%", owner.getName());
 				}
 				else
 				{
-					html.setFile(player.getHtmlPrefix(), "data/html/clanHallDoormen/emptyowner.htm");
+					html.setFile(player.getHtmlPrefix(), "html/clanHallDoormen/emptyowner.htm");
 					html.replace("%hallname%", getClanHall().getName());
 				}
 			}
@@ -166,7 +166,7 @@ public class L2ClanHallDoormenInstance extends L2DoormenInstance
 	{
 		getClanHall().openCloseDoors(true);
 		final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
-		html.setFile(player.getHtmlPrefix(), "data/html/clanHallDoormen/doormen-opened.htm");
+		html.setFile(player.getHtmlPrefix(), "html/clanHallDoormen/doormen-opened.htm");
 		html.replace("%objectId%", String.valueOf(getObjectId()));
 		player.sendPacket(html);
 	}
@@ -176,7 +176,7 @@ public class L2ClanHallDoormenInstance extends L2DoormenInstance
 	{
 		getClanHall().openCloseDoors(false);
 		final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
-		html.setFile(player.getHtmlPrefix(), "data/html/clanHallDoormen/doormen-closed.htm");
+		html.setFile(player.getHtmlPrefix(), "html/clanHallDoormen/doormen-closed.htm");
 		html.replace("%objectId%", String.valueOf(getObjectId()));
 		player.sendPacket(html);
 	}

trunk/java/com/l2jserver/gameserver/model/actor/instance/L2ClanHallManagerInstance.java

@@ -98,17 +98,17 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
 				{
 					if (val.equalsIgnoreCase("list"))
 					{
-						html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/banish-list.htm");
+						html.setFile(player.getHtmlPrefix(), "html/clanHallManager/banish-list.htm");
 					}
 					else if (val.equalsIgnoreCase("banish"))
 					{
 						getClanHall().banishForeigners();
-						html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/banish.htm");
+						html.setFile(player.getHtmlPrefix(), "html/clanHallManager/banish.htm");
 					}
 				}
 				else
 				{
-					html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/not_authorized.htm");
+					html.setFile(player.getHtmlPrefix(), "html/clanHallManager/not_authorized.htm");
 				}
 				sendHtmlMessage(player, html);
 				return;
@@ -120,11 +120,11 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
 				{
 					if (getClanHall().getLease() <= 0)
 					{
-						html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/vault-chs.htm");
+						html.setFile(player.getHtmlPrefix(), "html/clanHallManager/vault-chs.htm");
 					}
 					else
 					{
-						html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/vault.htm");
+						html.setFile(player.getHtmlPrefix(), "html/clanHallManager/vault.htm");
 						html.replace("%rent%", String.valueOf(getClanHall().getLease()));
 						html.replace("%date%", format.format(getClanHall().getPaidUntil()));
 					}
@@ -132,7 +132,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
 				}
 				else
 				{
-					html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/not_authorized.htm");
+					html.setFile(player.getHtmlPrefix(), "html/clanHallManager/not_authorized.htm");
 					sendHtmlMessage(player, html);
 				}
 				return;
@@ -145,22 +145,22 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
 					if (val.equalsIgnoreCase("open"))
 					{
 						getClanHall().openCloseDoors(true);
-						html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/door-open.htm");
+						html.setFile(player.getHtmlPrefix(), "html/clanHallManager/door-open.htm");
 					}
 					else if (val.equalsIgnoreCase("close"))
 					{
 						getClanHall().openCloseDoors(false);
-						html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/door-close.htm");
+						html.setFile(player.getHtmlPrefix(), "html/clanHallManager/door-close.htm");
 					}
 					else
 					{
-						html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/door.htm");
+						html.setFile(player.getHtmlPrefix(), "html/clanHallManager/door.htm");
 					}
 					sendHtmlMessage(player, html);
 				}
 				else
 				{
-					html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/not_authorized.htm");
+					html.setFile(player.getHtmlPrefix(), "html/clanHallManager/not_authorized.htm");
 					sendHtmlMessage(player, html);
 				}
 				return;
@@ -172,11 +172,11 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
 					final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
 					if (getClanHall().getFunction(ClanHall.FUNC_TELEPORT) == null)
 					{
-						html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/chamberlain-nac.htm");
+						html.setFile(player.getHtmlPrefix(), "html/clanHallManager/chamberlain-nac.htm");
 					}
 					else
 					{
-						html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/tele" + getClanHall().getLocation() + getClanHall().getFunction(ClanHall.FUNC_TELEPORT).getLvl() + ".htm");
+						html.setFile(player.getHtmlPrefix(), "html/clanHallManager/tele" + getClanHall().getLocation() + getClanHall().getFunction(ClanHall.FUNC_TELEPORT).getLvl() + ".htm");
 					}
 					sendHtmlMessage(player, html);
 				}
@@ -185,7 +185,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
 					if (getClanHall().getFunction(ClanHall.FUNC_ITEM_CREATE) == null)
 					{
 						final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
-						html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/chamberlain-nac.htm");
+						html.setFile(player.getHtmlPrefix(), "html/clanHallManager/chamberlain-nac.htm");
 						sendHtmlMessage(player, html);
 						return;
 					}
@@ -202,11 +202,11 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
 					final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
 					if (getClanHall().getFunction(ClanHall.FUNC_SUPPORT) == null)
 					{
-						html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/chamberlain-nac.htm");
+						html.setFile(player.getHtmlPrefix(), "html/clanHallManager/chamberlain-nac.htm");
 					}
 					else
 					{
-						html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/support" + getClanHall().getFunction(ClanHall.FUNC_SUPPORT).getLvl() + ".htm");
+						html.setFile(player.getHtmlPrefix(), "html/clanHallManager/support" + getClanHall().getFunction(ClanHall.FUNC_SUPPORT).getLvl() + ".htm");
 						html.replace("%mp%", String.valueOf((int) getCurrentMp()));
 					}
 					sendHtmlMessage(player, html);
@@ -218,7 +218,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
 				else
 				{
 					final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
-					html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/functions.htm");
+					html.setFile(player.getHtmlPrefix(), "html/clanHallManager/functions.htm");
 					if (getClanHall().getFunction(ClanHall.FUNC_RESTORE_EXP) != null)
 					{
 						html.replace("%xp_regen%", String.valueOf(getClanHall().getFunction(ClanHall.FUNC_RESTORE_EXP).getLvl()));
@@ -264,7 +264,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
 							if (val.equalsIgnoreCase("hp_cancel"))
 							{
 								final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
-								html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/functions-cancel.htm");
+								html.setFile(player.getHtmlPrefix(), "html/clanHallManager/functions-cancel.htm");
 								html.replace("%apply%", "recovery hp 0");
 								sendHtmlMessage(player, html);
 								return;
@@ -272,7 +272,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
 							else if (val.equalsIgnoreCase("mp_cancel"))
 							{
 								final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
-								html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/functions-cancel.htm");
+								html.setFile(player.getHtmlPrefix(), "html/clanHallManager/functions-cancel.htm");
 								html.replace("%apply%", "recovery mp 0");
 								sendHtmlMessage(player, html);
 								return;
@@ -280,7 +280,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
 							else if (val.equalsIgnoreCase("exp_cancel"))
 							{
 								final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
-								html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/functions-cancel.htm");
+								html.setFile(player.getHtmlPrefix(), "html/clanHallManager/functions-cancel.htm");
 								html.replace("%apply%", "recovery exp 0");
 								sendHtmlMessage(player, html);
 								return;
@@ -289,7 +289,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
 							{
 								val = st.nextToken();
 								final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
-								html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/functions-apply.htm");
+								html.setFile(player.getHtmlPrefix(), "html/clanHallManager/functions-apply.htm");
 								html.replace("%name%", "Fireplace (HP Recovery Device)");
 								int percent = Integer.parseInt(val);
 								int cost;
@@ -346,7 +346,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
 							{
 								val = st.nextToken();
 								final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
-								html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/functions-apply.htm");
+								html.setFile(player.getHtmlPrefix(), "html/clanHallManager/functions-apply.htm");
 								html.replace("%name%", "Carpet (MP Recovery)");
 								int percent = Integer.parseInt(val);
 								int cost;
@@ -378,7 +378,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
 							{
 								val = st.nextToken();
 								final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
-								html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/functions-apply.htm");
+								html.setFile(player.getHtmlPrefix(), "html/clanHallManager/functions-apply.htm");
 								html.replace("%name%", "Chandelier (EXP Recovery Device)");
 								int percent = Integer.parseInt(val);
 								int cost;
@@ -423,12 +423,12 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
 									}
 									val = st.nextToken();
 									final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
-									html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/functions-apply_confirmed.htm");
+									html.setFile(player.getHtmlPrefix(), "html/clanHallManager/functions-apply_confirmed.htm");
 									if (getClanHall().getFunction(ClanHall.FUNC_RESTORE_HP) != null)
 									{
 										if (getClanHall().getFunction(ClanHall.FUNC_RESTORE_HP).getLvl() == Integer.parseInt(val))
 										{
-											html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/functions-used.htm");
+											html.setFile(player.getHtmlPrefix(), "html/clanHallManager/functions-used.htm");
 											html.replace("%val%", String.valueOf(val) + "%");
 											sendHtmlMessage(player, html);
 											return;
@@ -439,7 +439,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
 									{
 										case 0:
 											fee = 0;
-											html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/functions-cancel_confirmed.htm");
+											html.setFile(player.getHtmlPrefix(), "html/clanHallManager/functions-cancel_confirmed.htm");
 											break;
 										case 20:
 											fee = Config.CH_HPREG1_FEE;
@@ -483,7 +483,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
 									}
 									if (!getClanHall().updateFunctions(player, ClanHall.FUNC_RESTORE_HP, percent, fee, Config.CH_HPREG_FEE_RATIO, (getClanHall().getFunction(ClanHall.FUNC_RESTORE_HP) == null)))
 									{
-										html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/low_adena.htm");
+										html.setFile(player.getHtmlPrefix(), "html/clanHallManager/low_adena.htm");
 										sendHtmlMessage(player, html);
 									}
 									else
@@ -505,12 +505,12 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
 									}
 									val = st.nextToken();
 									final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
-									html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/functions-apply_confirmed.htm");
+									html.setFile(player.getHtmlPrefix(), "html/clanHallManager/functions-apply_confirmed.htm");
 									if (getClanHall().getFunction(ClanHall.FUNC_RESTORE_MP) != null)
 									{
 										if (getClanHall().getFunction(ClanHall.FUNC_RESTORE_MP).getLvl() == Integer.parseInt(val))
 										{
-											html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/functions-used.htm");
+											html.setFile(player.getHtmlPrefix(), "html/clanHallManager/functions-used.htm");
 											html.replace("%val%", String.valueOf(val) + "%");
 											sendHtmlMessage(player, html);
 											return;
@@ -521,7 +521,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
 									{
 										case 0:
 											fee = 0;
-											html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/functions-cancel_confirmed.htm");
+											html.setFile(player.getHtmlPrefix(), "html/clanHallManager/functions-cancel_confirmed.htm");
 											break;
 										case 5:
 											fee = Config.CH_MPREG1_FEE;
@@ -541,7 +541,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
 									}
 									if (!getClanHall().updateFunctions(player, ClanHall.FUNC_RESTORE_MP, percent, fee, Config.CH_MPREG_FEE_RATIO, (getClanHall().getFunction(ClanHall.FUNC_RESTORE_MP) == null)))
 									{
-										html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/low_adena.htm");
+										html.setFile(player.getHtmlPrefix(), "html/clanHallManager/low_adena.htm");
 										sendHtmlMessage(player, html);
 									}
 									else
@@ -563,12 +563,12 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
 									}
 									val = st.nextToken();
 									final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
-									html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/functions-apply_confirmed.htm");
+									html.setFile(player.getHtmlPrefix(), "html/clanHallManager/functions-apply_confirmed.htm");
 									if (getClanHall().getFunction(ClanHall.FUNC_RESTORE_EXP) != null)
 									{
 										if (getClanHall().getFunction(ClanHall.FUNC_RESTORE_EXP).getLvl() == Integer.parseInt(val))
 										{
-											html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/functions-used.htm");
+											html.setFile(player.getHtmlPrefix(), "html/clanHallManager/functions-used.htm");
 											html.replace("%val%", String.valueOf(val) + "%");
 											sendHtmlMessage(player, html);
 											return;
@@ -579,7 +579,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
 									{
 										case 0:
 											fee = 0;
-											html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/functions-cancel_confirmed.htm");
+											html.setFile(player.getHtmlPrefix(), "html/clanHallManager/functions-cancel_confirmed.htm");
 											break;
 										case 5:
 											fee = Config.CH_EXPREG1_FEE;
@@ -605,7 +605,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
 									}
 									if (!getClanHall().updateFunctions(player, ClanHall.FUNC_RESTORE_EXP, percent, fee, Config.CH_EXPREG_FEE_RATIO, (getClanHall().getFunction(ClanHall.FUNC_RESTORE_EXP) == null)))
 									{
-										html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/low_adena.htm");
+										html.setFile(player.getHtmlPrefix(), "html/clanHallManager/low_adena.htm");
 										sendHtmlMessage(player, html);
 									}
 									else
@@ -618,7 +618,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
 							}
 						}
 						final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
-						html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/edit_recovery.htm");
+						html.setFile(player.getHtmlPrefix(), "html/clanHallManager/edit_recovery.htm");
 						String hp_grade0 = "[<a action=\"bypass -h npc_%objectId%_manage recovery edit_hp 20\">20%</a>][<a action=\"bypass -h npc_%objectId%_manage recovery edit_hp 40\">40%</a>][<a action=\"bypass -h npc_%objectId%_manage recovery edit_hp 220\">220%</a>]";
 						String hp_grade1 = "[<a action=\"bypass -h npc_%objectId%_manage recovery edit_hp 40\">40%</a>][<a action=\"bypass -h npc_%objectId%_manage recovery edit_hp 100\">100%</a>][<a action=\"bypass -h npc_%objectId%_manage recovery edit_hp 160\">160%</a>]";
 						String hp_grade2 = "[<a action=\"bypass -h npc_%objectId%_manage recovery edit_hp 80\">80%</a>][<a action=\"bypass -h npc_%objectId%_manage recovery edit_hp 140\">140%</a>][<a action=\"bypass -h npc_%objectId%_manage recovery edit_hp 200\">200%</a>][<a action=\"bypass -h npc_%objectId%_manage recovery edit_hp 260\">260%</a>]";
@@ -772,7 +772,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
 							if (val.equalsIgnoreCase("item_cancel"))
 							{
 								final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
-								html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/functions-cancel.htm");
+								html.setFile(player.getHtmlPrefix(), "html/clanHallManager/functions-cancel.htm");
 								html.replace("%apply%", "other item 0");
 								sendHtmlMessage(player, html);
 								return;
@@ -780,7 +780,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
 							else if (val.equalsIgnoreCase("tele_cancel"))
 							{
 								final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
-								html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/functions-cancel.htm");
+								html.setFile(player.getHtmlPrefix(), "html/clanHallManager/functions-cancel.htm");
 								html.replace("%apply%", "other tele 0");
 								sendHtmlMessage(player, html);
 								return;
@@ -788,7 +788,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
 							else if (val.equalsIgnoreCase("support_cancel"))
 							{
 								final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
-								html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/functions-cancel.htm");
+								html.setFile(player.getHtmlPrefix(), "html/clanHallManager/functions-cancel.htm");
 								html.replace("%apply%", "other support 0");
 								sendHtmlMessage(player, html);
 								return;
@@ -797,7 +797,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
 							{
 								val = st.nextToken();
 								final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
-								html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/functions-apply.htm");
+								html.setFile(player.getHtmlPrefix(), "html/clanHallManager/functions-apply.htm");
 								html.replace("%name%", "Magic Equipment (Item Production Facilities)");
 								int stage = Integer.parseInt(val);
 								int cost;
@@ -823,7 +823,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
 							{
 								val = st.nextToken();
 								final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
-								html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/functions-apply.htm");
+								html.setFile(player.getHtmlPrefix(), "html/clanHallManager/functions-apply.htm");
 								html.replace("%name%", "Insignia (Supplementary Magic)");
 								int stage = Integer.parseInt(val);
 								int cost;
@@ -864,7 +864,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
 							{
 								val = st.nextToken();
 								final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
-								html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/functions-apply.htm");
+								html.setFile(player.getHtmlPrefix(), "html/clanHallManager/functions-apply.htm");
 								html.replace("%name%", "Mirror (Teleportation Device)");
 								int stage = Integer.parseInt(val);
 								int cost;
@@ -898,12 +898,12 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
 									}
 									val = st.nextToken();
 									final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
-									html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/functions-apply_confirmed.htm");
+									html.setFile(player.getHtmlPrefix(), "html/clanHallManager/functions-apply_confirmed.htm");
 									if (getClanHall().getFunction(ClanHall.FUNC_ITEM_CREATE) != null)
 									{
 										if (getClanHall().getFunction(ClanHall.FUNC_ITEM_CREATE).getLvl() == Integer.parseInt(val))
 										{
-											html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/functions-used.htm");
+											html.setFile(player.getHtmlPrefix(), "html/clanHallManager/functions-used.htm");
 											html.replace("%val%", "Stage " + String.valueOf(val));
 											sendHtmlMessage(player, html);
 											return;
@@ -915,7 +915,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
 									{
 										case 0:
 											fee = 0;
-											html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/functions-cancel_confirmed.htm");
+											html.setFile(player.getHtmlPrefix(), "html/clanHallManager/functions-cancel_confirmed.htm");
 											break;
 										case 1:
 											fee = Config.CH_ITEM1_FEE;
@@ -929,7 +929,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
 									}
 									if (!getClanHall().updateFunctions(player, ClanHall.FUNC_ITEM_CREATE, lvl, fee, Config.CH_ITEM_FEE_RATIO, (getClanHall().getFunction(ClanHall.FUNC_ITEM_CREATE) == null)))
 									{
-										html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/low_adena.htm");
+										html.setFile(player.getHtmlPrefix(), "html/clanHallManager/low_adena.htm");
 										sendHtmlMessage(player, html);
 									}
 									else
@@ -951,12 +951,12 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
 									}
 									val = st.nextToken();
 									final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
-									html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/functions-apply_confirmed.htm");
+									html.setFile(player.getHtmlPrefix(), "html/clanHallManager/functions-apply_confirmed.htm");
 									if (getClanHall().getFunction(ClanHall.FUNC_TELEPORT) != null)
 									{
 										if (getClanHall().getFunction(ClanHall.FUNC_TELEPORT).getLvl() == Integer.parseInt(val))
 										{
-											html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/functions-used.htm");
+											html.setFile(player.getHtmlPrefix(), "html/clanHallManager/functions-used.htm");
 											html.replace("%val%", "Stage " + String.valueOf(val));
 											sendHtmlMessage(player, html);
 											return;
@@ -967,7 +967,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
 									{
 										case 0:
 											fee = 0;
-											html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/functions-cancel_confirmed.htm");
+											html.setFile(player.getHtmlPrefix(), "html/clanHallManager/functions-cancel_confirmed.htm");
 											break;
 										case 1:
 											fee = Config.CH_TELE1_FEE;
@@ -978,7 +978,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
 									}
 									if (!getClanHall().updateFunctions(player, ClanHall.FUNC_TELEPORT, lvl, fee, Config.CH_TELE_FEE_RATIO, (getClanHall().getFunction(ClanHall.FUNC_TELEPORT) == null)))
 									{
-										html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/low_adena.htm");
+										html.setFile(player.getHtmlPrefix(), "html/clanHallManager/low_adena.htm");
 										sendHtmlMessage(player, html);
 									}
 									else
@@ -1000,12 +1000,12 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
 									}
 									val = st.nextToken();
 									final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
-									html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/functions-apply_confirmed.htm");
+									html.setFile(player.getHtmlPrefix(), "html/clanHallManager/functions-apply_confirmed.htm");
 									if (getClanHall().getFunction(ClanHall.FUNC_SUPPORT) != null)
 									{
 										if (getClanHall().getFunction(ClanHall.FUNC_SUPPORT).getLvl() == Integer.parseInt(val))
 										{
-											html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/functions-used.htm");
+											html.setFile(player.getHtmlPrefix(), "html/clanHallManager/functions-used.htm");
 											html.replace("%val%", "Stage " + String.valueOf(val));
 											sendHtmlMessage(player, html);
 											return;
@@ -1016,7 +1016,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
 									{
 										case 0:
 											fee = 0;
-											html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/functions-cancel_confirmed.htm");
+											html.setFile(player.getHtmlPrefix(), "html/clanHallManager/functions-cancel_confirmed.htm");
 											break;
 										case 1:
 											fee = Config.CH_SUPPORT1_FEE;
@@ -1045,7 +1045,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
 									}
 									if (!getClanHall().updateFunctions(player, ClanHall.FUNC_SUPPORT, lvl, fee, Config.CH_SUPPORT_FEE_RATIO, (getClanHall().getFunction(ClanHall.FUNC_SUPPORT) == null)))
 									{
-										html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/low_adena.htm");
+										html.setFile(player.getHtmlPrefix(), "html/clanHallManager/low_adena.htm");
 										sendHtmlMessage(player, html);
 									}
 									else
@@ -1058,7 +1058,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
 							}
 						}
 						final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
-						html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/edit_other.htm");
+						html.setFile(player.getHtmlPrefix(), "html/clanHallManager/edit_other.htm");
 						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>]";
 						String support_grade0 = "[<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>]";
 						String support_grade1 = "[<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>][<a action=\"bypass -h npc_%objectId%_manage other edit_support 4\">Level 4</a>]";
@@ -1146,7 +1146,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
 							if (val.equalsIgnoreCase("curtains_cancel"))
 							{
 								final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
-								html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/functions-cancel.htm");
+								html.setFile(player.getHtmlPrefix(), "html/clanHallManager/functions-cancel.htm");
 								html.replace("%apply%", "deco curtains 0");
 								sendHtmlMessage(player, html);
 								return;
@@ -1154,7 +1154,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
 							else if (val.equalsIgnoreCase("fixtures_cancel"))
 							{
 								final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
-								html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/functions-cancel.htm");
+								html.setFile(player.getHtmlPrefix(), "html/clanHallManager/functions-cancel.htm");
 								html.replace("%apply%", "deco fixtures 0");
 								sendHtmlMessage(player, html);
 								return;
@@ -1163,7 +1163,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
 							{
 								val = st.nextToken();
 								final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
-								html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/functions-apply.htm");
+								html.setFile(player.getHtmlPrefix(), "html/clanHallManager/functions-apply.htm");
 								html.replace("%name%", "Curtains (Decoration)");
 								int stage = Integer.parseInt(val);
 								int cost;
@@ -1186,7 +1186,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
 							{
 								val = st.nextToken();
 								final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
-								html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/functions-apply.htm");
+								html.setFile(player.getHtmlPrefix(), "html/clanHallManager/functions-apply.htm");
 								html.replace("%name%", "Front Platform (Decoration)");
 								int stage = Integer.parseInt(val);
 								int cost;
@@ -1216,12 +1216,12 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
 									}
 									val = st.nextToken();
 									final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
-									html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/functions-apply_confirmed.htm");
+									html.setFile(player.getHtmlPrefix(), "html/clanHallManager/functions-apply_confirmed.htm");
 									if (getClanHall().getFunction(ClanHall.FUNC_DECO_CURTAINS) != null)
 									{
 										if (getClanHall().getFunction(ClanHall.FUNC_DECO_CURTAINS).getLvl() == Integer.parseInt(val))
 										{
-											html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/functions-used.htm");
+											html.setFile(player.getHtmlPrefix(), "html/clanHallManager/functions-used.htm");
 											html.replace("%val%", "Stage " + String.valueOf(val));
 											sendHtmlMessage(player, html);
 											return;
@@ -1232,7 +1232,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
 									{
 										case 0:
 											fee = 0;
-											html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/functions-cancel_confirmed.htm");
+											html.setFile(player.getHtmlPrefix(), "html/clanHallManager/functions-cancel_confirmed.htm");
 											break;
 										case 1:
 											fee = Config.CH_CURTAIN1_FEE;
@@ -1243,7 +1243,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
 									}
 									if (!getClanHall().updateFunctions(player, ClanHall.FUNC_DECO_CURTAINS, lvl, fee, Config.CH_CURTAIN_FEE_RATIO, (getClanHall().getFunction(ClanHall.FUNC_DECO_CURTAINS) == null)))
 									{
-										html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/low_adena.htm");
+										html.setFile(player.getHtmlPrefix(), "html/clanHallManager/low_adena.htm");
 										sendHtmlMessage(player, html);
 									}
 									else
@@ -1265,12 +1265,12 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
 									}
 									val = st.nextToken();
 									final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
-									html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/functions-apply_confirmed.htm");
+									html.setFile(player.getHtmlPrefix(), "html/clanHallManager/functions-apply_confirmed.htm");
 									if (getClanHall().getFunction(ClanHall.FUNC_DECO_FRONTPLATEFORM) != null)
 									{
 										if (getClanHall().getFunction(ClanHall.FUNC_DECO_FRONTPLATEFORM).getLvl() == Integer.parseInt(val))
 										{
-											html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/functions-used.htm");
+											html.setFile(player.getHtmlPrefix(), "html/clanHallManager/functions-used.htm");
 											html.replace("%val%", "Stage " + String.valueOf(val));
 											sendHtmlMessage(player, html);
 											return;
@@ -1281,7 +1281,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
 									{
 										case 0:
 											fee = 0;
-											html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/functions-cancel_confirmed.htm");
+											html.setFile(player.getHtmlPrefix(), "html/clanHallManager/functions-cancel_confirmed.htm");
 											break;
 										case 1:
 											fee = Config.CH_FRONT1_FEE;
@@ -1292,7 +1292,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
 									}
 									if (!getClanHall().updateFunctions(player, ClanHall.FUNC_DECO_FRONTPLATEFORM, lvl, fee, Config.CH_FRONT_FEE_RATIO, (getClanHall().getFunction(ClanHall.FUNC_DECO_FRONTPLATEFORM) == null)))
 									{
-										html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/low_adena.htm");
+										html.setFile(player.getHtmlPrefix(), "html/clanHallManager/low_adena.htm");
 										sendHtmlMessage(player, html);
 									}
 									else
@@ -1305,7 +1305,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
 							}
 						}
 						final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
-						html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/deco.htm");
+						html.setFile(player.getHtmlPrefix(), "html/clanHallManager/deco.htm");
 						String curtains = "[<a action=\"bypass -h npc_%objectId%_manage deco edit_curtains 1\">Level 1</a>][<a action=\"bypass -h npc_%objectId%_manage deco edit_curtains 2\">Level 2</a>]";
 						String fixtures = "[<a action=\"bypass -h npc_%objectId%_manage deco edit_fixtures 1\">Level 1</a>][<a action=\"bypass -h npc_%objectId%_manage deco edit_fixtures 2\">Level 2</a>]";
 						if (getClanHall().getFunction(ClanHall.FUNC_DECO_CURTAINS) != null)
@@ -1341,14 +1341,14 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
 					else
 					{
 						final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
-						html.setFile(player.getHtmlPrefix(), getClanHall().isSiegableHall() ? "data/html/clanHallManager/manage_siegable.htm" : "data/html/clanHallManager/manage.htm");
+						html.setFile(player.getHtmlPrefix(), getClanHall().isSiegableHall() ? "html/clanHallManager/manage_siegable.htm" : "html/clanHallManager/manage.htm");
 						sendHtmlMessage(player, html);
 					}
 				}
 				else
 				{
 					final NpcHtmlMessage html = new NpcHtmlMessage(1);
-					html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/not_authorized.htm");
+					html.setFile(player.getHtmlPrefix(), "html/clanHallManager/not_authorized.htm");
 					sendHtmlMessage(player, html);
 				}
 				return;
@@ -1394,7 +1394,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
 							else
 							{
 								final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
-								html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/support-no_mana.htm");
+								html.setFile(player.getHtmlPrefix(), "html/clanHallManager/support-no_mana.htm");
 								html.replace("%mp%", String.valueOf((int) getCurrentMp()));
 								sendHtmlMessage(player, html);
 								return;
@@ -1409,7 +1409,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
 						{
 							return;
 						}
-						html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/support-done.htm");
+						html.setFile(player.getHtmlPrefix(), "html/clanHallManager/support-done.htm");
 						html.replace("%mp%", String.valueOf((int) getCurrentMp()));
 						sendHtmlMessage(player, html);
 					}
@@ -1427,10 +1427,10 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
 			else if (actualCommand.equalsIgnoreCase("list_back"))
 			{
 				final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
-				String file = "data/html/clanHallManager/chamberlain-" + getId() + ".htm";
+				String file = "html/clanHallManager/chamberlain-" + getId() + ".htm";
 				if (!HtmCache.getInstance().isLoadable(file))
 				{
-					file = "data/html/clanHallManager/chamberlain.htm";
+					file = "html/clanHallManager/chamberlain.htm";
 				}
 				html.setFile(player.getHtmlPrefix(), file);
 				html.replace("%objectId%", String.valueOf(getObjectId()));
@@ -1445,7 +1445,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
 				{
 					return;
 				}
-				html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/support" + getClanHall().getFunction(ClanHall.FUNC_SUPPORT).getLvl() + ".htm");
+				html.setFile(player.getHtmlPrefix(), "html/clanHallManager/support" + getClanHall().getFunction(ClanHall.FUNC_SUPPORT).getLvl() + ".htm");
 				html.replace("%mp%", String.valueOf((int) getStatus().getCurrentMp()));
 				sendHtmlMessage(player, html);
 				return;
@@ -1471,20 +1471,20 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
 	public void showChatWindow(L2PcInstance player)
 	{
 		player.sendPacket(ActionFailed.STATIC_PACKET);
-		String filename = "data/html/clanHallManager/chamberlain-no.htm";
+		String filename = "html/clanHallManager/chamberlain-no.htm";
 		
 		int condition = validateCondition(player);
 		if (condition == COND_OWNER)
 		{
-			filename = "data/html/clanHallManager/chamberlain-" + getId() + ".htm";
+			filename = "html/clanHallManager/chamberlain-" + getId() + ".htm";
 			if (!HtmCache.getInstance().isLoadable(filename))
 			{
-				filename = "data/html/clanHallManager/chamberlain.htm";// Owner message window
+				filename = "html/clanHallManager/chamberlain.htm";// Owner message window
 			}
 		}
 		else if (condition == COND_OWNER_FALSE)
 		{
-			filename = "data/html/clanHallManager/chamberlain-of.htm";
+			filename = "html/clanHallManager/chamberlain-of.htm";
 		}
 		final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
 		html.setFile(player.getHtmlPrefix(), filename);

trunk/java/com/l2jserver/gameserver/model/actor/instance/L2ClassMasterInstance.java

@@ -64,7 +64,7 @@ public final class L2ClassMasterInstance extends L2MerchantInstance
 			pom = npcId + "-" + val;
 		}
 		
-		return "data/html/classmaster/" + pom + ".htm";
+		return "html/classmaster/" + pom + ".htm";
 	}
 	
 	@Override
@@ -89,7 +89,7 @@ public final class L2ClassMasterInstance extends L2MerchantInstance
 			if (checkAndChangeClass(player, val))
 			{
 				final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
-				html.setFile(player.getHtmlPrefix(), "data/html/classmaster/ok.htm");
+				html.setFile(player.getHtmlPrefix(), "html/classmaster/ok.htm");
 				html.replace("%name%", ClassListData.getInstance().getClass(val).getClientCode());
 				player.sendPacket(html);
 			}
@@ -101,7 +101,7 @@ public final class L2ClassMasterInstance extends L2MerchantInstance
 				player.setNoble(true);
 				player.sendPacket(new UserInfo(player));
 				final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
-				html.setFile(player.getHtmlPrefix(), "data/html/classmaster/nobleok.htm");
+				html.setFile(player.getHtmlPrefix(), "html/classmaster/nobleok.htm");
 				player.sendPacket(html);
 			}
 		}
@@ -114,13 +114,13 @@ public final class L2ClassMasterInstance extends L2MerchantInstance
 			if (!player.isClanLeader())
 			{
 				final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
-				html.setFile(player.getHtmlPrefix(), "data/html/classmaster/noclanleader.htm");
+				html.setFile(player.getHtmlPrefix(), "html/classmaster/noclanleader.htm");
 				player.sendPacket(html);
 			}
 			else if (player.getClan().getLevel() >= 5)
 			{
 				final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
-				html.setFile(player.getHtmlPrefix(), "data/html/classmaster/noclanlevel.htm");
+				html.setFile(player.getHtmlPrefix(), "html/classmaster/noclanlevel.htm");
 				player.sendPacket(html);
 			}
 			else
@@ -194,7 +194,7 @@ public final class L2ClassMasterInstance extends L2MerchantInstance
 		
 		if (!Config.ALLOW_CLASS_MASTERS)
 		{
-			html.setFile(player.getHtmlPrefix(), "data/html/classmaster/disabled.htm");
+			html.setFile(player.getHtmlPrefix(), "html/classmaster/disabled.htm");
 		}
 		else if (!Config.CLASS_MASTER_SETTINGS.isAllowed(level))
 		{
@@ -257,7 +257,7 @@ public final class L2ClassMasterInstance extends L2MerchantInstance
 			final ClassId currentClassId = player.getClassId();
 			if (currentClassId.level() >= level)
 			{
-				html.setFile(player.getHtmlPrefix(), "data/html/classmaster/nomore.htm");
+				html.setFile(player.getHtmlPrefix(), "html/classmaster/nomore.htm");
 			}
 			else
 			{
@@ -279,13 +279,13 @@ public final class L2ClassMasterInstance extends L2MerchantInstance
 					
 					if (menu.length() > 0)
 					{
-						html.setFile(player.getHtmlPrefix(), "data/html/classmaster/template.htm");
+						html.setFile(player.getHtmlPrefix(), "html/classmaster/template.htm");
 						html.replace("%name%", ClassListData.getInstance().getClass(currentClassId).getClientCode());
 						html.replace("%menu%", menu.toString());
 					}
 					else
 					{
-						html.setFile(player.getHtmlPrefix(), "data/html/classmaster/comebacklater.htm");
+						html.setFile(player.getHtmlPrefix(), "html/classmaster/comebacklater.htm");
 						html.replace("%level%", String.valueOf(getMinLevel(level - 1)));
 					}
 				}
@@ -293,12 +293,12 @@ public final class L2ClassMasterInstance extends L2MerchantInstance
 				{
 					if (minLevel < Integer.MAX_VALUE)
 					{
-						html.setFile(player.getHtmlPrefix(), "data/html/classmaster/comebacklater.htm");
+						html.setFile(player.getHtmlPrefix(), "html/classmaster/comebacklater.htm");
 						html.replace("%level%", String.valueOf(minLevel));
 					}
 					else
 					{
-						html.setFile(player.getHtmlPrefix(), "data/html/classmaster/nomore.htm");
+						html.setFile(player.getHtmlPrefix(), "html/classmaster/nomore.htm");
 					}
 				}
 			}
@@ -317,7 +317,7 @@ public final class L2ClassMasterInstance extends L2MerchantInstance
 			return;
 		}
 		
-		String msg = HtmCache.getInstance().getHtm(player.getHtmlPrefix(), "data/html/classmaster/tutorialtemplate.htm");
+		String msg = HtmCache.getInstance().getHtm(player.getHtmlPrefix(), "html/classmaster/tutorialtemplate.htm");
 		msg = msg.replaceAll("%name%", ClassListData.getInstance().getClass(currentClassId).getEscapedClientCode());
 		
 		final StringBuilder menu = new StringBuilder(100);

trunk/java/com/l2jserver/gameserver/model/actor/instance/L2DoormenInstance.java

@@ -98,11 +98,11 @@ public class L2DoormenInstance extends L2NpcInstance
 		
 		if (!isOwnerClan(player))
 		{
-			html.setFile(player.getHtmlPrefix(), "data/html/doormen/" + getTemplate().getId() + "-no.htm");
+			html.setFile(player.getHtmlPrefix(), "html/doormen/" + getTemplate().getId() + "-no.htm");
 		}
 		else
 		{
-			html.setFile(player.getHtmlPrefix(), "data/html/doormen/" + getTemplate().getId() + ".htm");
+			html.setFile(player.getHtmlPrefix(), "html/doormen/" + getTemplate().getId() + ".htm");
 		}
 		
 		html.replace("%objectId%", String.valueOf(getObjectId()));
@@ -136,7 +136,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.getHtmlPrefix(), "html/doormen/" + getTemplate().getId() + "-busy.htm");
 		player.sendPacket(html);
 	}
 	

trunk/java/com/l2jserver/gameserver/model/actor/instance/L2FishermanInstance.java

@@ -55,7 +55,7 @@ public final class L2FishermanInstance extends L2MerchantInstance
 			pom = npcId + "-" + val;
 		}
 		
-		return "data/html/fisherman/" + pom + ".htm";
+		return "html/fisherman/" + pom + ".htm";
 	}
 	
 	@Override

trunk/java/com/l2jserver/gameserver/model/actor/instance/L2FortDoormenInstance.java

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

trunk/java/com/l2jserver/gameserver/model/actor/instance/L2FortLogisticsInstance.java

@@ -82,12 +82,12 @@ public class L2FortLogisticsInstance extends L2MerchantInstance
 		{
 			if (isMyLord(player))
 			{
-				html.setFile(player.getHtmlPrefix(), "data/html/fortress/logistics-rewards.htm");
+				html.setFile(player.getHtmlPrefix(), "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.getHtmlPrefix(), "html/fortress/logistics-noprivs.htm");
 			}
 			html.replace("%objectId%", String.valueOf(getObjectId()));
 			player.sendPacket(html);
@@ -101,16 +101,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.getHtmlPrefix(), "html/fortress/logistics-blood.htm");
 				}
 				else
 				{
-					html.setFile(player.getHtmlPrefix(), "data/html/fortress/logistics-noblood.htm");
+					html.setFile(player.getHtmlPrefix(), "html/fortress/logistics-noblood.htm");
 				}
 			}
 			else
 			{
-				html.setFile(player.getHtmlPrefix(), "data/html/fortress/logistics-noprivs.htm");
+				html.setFile(player.getHtmlPrefix(), "html/fortress/logistics-noprivs.htm");
 			}
 			html.replace("%objectId%", String.valueOf(getObjectId()));
 			player.sendPacket(html);
@@ -121,17 +121,17 @@ public class L2FortLogisticsInstance extends L2MerchantInstance
 			{
 				if (player.isClanLeader())
 				{
-					html.setFile(player.getHtmlPrefix(), "data/html/fortress/logistics-supplylvl.htm");
+					html.setFile(player.getHtmlPrefix(), "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.getHtmlPrefix(), "html/fortress/logistics-noprivs.htm");
 				}
 			}
 			else
 			{
-				html.setFile(player.getHtmlPrefix(), "data/html/fortress/logistics-1.htm"); // TODO: Missing HTML?
+				html.setFile(player.getHtmlPrefix(), "html/fortress/logistics-1.htm"); // TODO: Missing HTML?
 			}
 			html.replace("%objectId%", String.valueOf(getObjectId()));
 			player.sendPacket(html);
@@ -142,7 +142,7 @@ public class L2FortLogisticsInstance extends L2MerchantInstance
 			{
 				if (getFort().getSiege().isInProgress())
 				{
-					html.setFile(player.getHtmlPrefix(), "data/html/fortress/logistics-siege.htm");
+					html.setFile(player.getHtmlPrefix(), "html/fortress/logistics-siege.htm");
 				}
 				else
 				{
@@ -160,17 +160,17 @@ public class L2FortLogisticsInstance extends L2MerchantInstance
 						getFort().setSupplyLvL(0);
 						getFort().saveFortVariables();
 						
-						html.setFile(player.getHtmlPrefix(), "data/html/fortress/logistics-supply.htm");
+						html.setFile(player.getHtmlPrefix(), "html/fortress/logistics-supply.htm");
 					}
 					else
 					{
-						html.setFile(player.getHtmlPrefix(), "data/html/fortress/logistics-nosupply.htm");
+						html.setFile(player.getHtmlPrefix(), "html/fortress/logistics-nosupply.htm");
 					}
 				}
 			}
 			else
 			{
-				html.setFile(player.getHtmlPrefix(), "data/html/fortress/logistics-noprivs.htm");
+				html.setFile(player.getHtmlPrefix(), "html/fortress/logistics-noprivs.htm");
 			}
 			html.replace("%objectId%", String.valueOf(getObjectId()));
 			player.sendPacket(html);
@@ -195,11 +195,11 @@ public class L2FortLogisticsInstance extends L2MerchantInstance
 		
 		if (val == 0)
 		{
-			filename = "data/html/fortress/logistics.htm";
+			filename = "html/fortress/logistics.htm";
 		}
 		else
 		{
-			filename = "data/html/fortress/logistics-" + val + ".htm";
+			filename = "html/fortress/logistics-" + val + ".htm";
 		}
 		
 		final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
@@ -231,7 +231,7 @@ public class L2FortLogisticsInstance extends L2MerchantInstance
 			pom = "logistics-" + val;
 		}
 		
-		return "data/html/fortress/" + pom + ".htm";
+		return "html/fortress/" + pom + ".htm";
 	}
 	
 	@Override

trunk/java/com/l2jserver/gameserver/model/actor/instance/L2FortManagerInstance.java

@@ -104,14 +104,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.getHtmlPrefix(), "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.getHtmlPrefix(), "html/fortress/foreman-noprivs.htm");
 					html.replace("%objectId%", String.valueOf(getObjectId()));
 					player.sendPacket(html);
 				}
@@ -123,14 +123,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.getHtmlPrefix(), "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.getHtmlPrefix(), "html/fortress/foreman-noprivs.htm");
 					html.replace("%objectId%", String.valueOf(getObjectId()));
 					player.sendPacket(html);
 				}
@@ -141,7 +141,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.getHtmlPrefix(), "html/fortress/foreman-report.htm");
 					html.replace("%objectId%", String.valueOf(getObjectId()));
 					if (Config.FS_MAX_OWN_TIME > 0)
 					{
@@ -162,7 +162,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.getHtmlPrefix(), "html/fortress/foreman-castlereport.htm");
 					html.replace("%objectId%", String.valueOf(getObjectId()));
 					int hour, minutes;
 					if (Config.FS_MAX_OWN_TIME > 0)
@@ -203,14 +203,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.getHtmlPrefix(), "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.getHtmlPrefix(), "html/fortress/foreman-closed.htm");
 							html.replace("%objectId%", String.valueOf(getObjectId()));
 							player.sendPacket(html);
 						}
@@ -218,7 +218,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.getHtmlPrefix(), "html/fortress/" + getTemplate().getId() + "-d.htm");
 						html.replace("%objectId%", String.valueOf(getObjectId()));
 						html.replace("%npcname%", getName());
 						player.sendPacket(html);
@@ -227,7 +227,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.getHtmlPrefix(), "html/fortress/foreman-noprivs.htm");
 					html.replace("%objectId%", String.valueOf(getObjectId()));
 					player.sendPacket(html);
 				}
@@ -246,7 +246,7 @@ public class L2FortManagerInstance extends L2MerchantInstance
 					{
 						if (Config.L2JMOD_ENABLE_WAREHOUSESORTING_CLAN)
 						{
-							String htmFile = "data/html/mods/WhSortedC.htm";
+							String htmFile = "html/mods/WhSortedC.htm";
 							String htmContent = HtmCache.getInstance().getHtm(player.getHtmlPrefix(), htmFile);
 							if (htmContent != null)
 							{
@@ -267,13 +267,13 @@ public class L2FortManagerInstance extends L2MerchantInstance
 					}
 					else
 					{
-						html.setFile(player.getHtmlPrefix(), "data/html/fortress/foreman-vault.htm");
+						html.setFile(player.getHtmlPrefix(), "html/fortress/foreman-vault.htm");
 						sendHtmlMessage(player, html);
 					}
 				}
 				else
 				{
-					html.setFile(player.getHtmlPrefix(), "data/html/fortress/foreman-noprivs.htm");
+					html.setFile(player.getHtmlPrefix(), "html/fortress/foreman-noprivs.htm");
 					sendHtmlMessage(player, html);
 				}
 				return;
@@ -302,11 +302,11 @@ public class L2FortManagerInstance extends L2MerchantInstance
 					final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
 					if (getFort().getFunction(Fort.FUNC_TELEPORT) == null)
 					{
-						html.setFile(player.getHtmlPrefix(), "data/html/fortress/foreman-nac.htm");
+						html.setFile(player.getHtmlPrefix(), "html/fortress/foreman-nac.htm");
 					}
 					else
 					{
-						html.setFile(player.getHtmlPrefix(), "data/html/fortress/" + getId() + "-t" + getFort().getFunction(Fort.FUNC_TELEPORT).getLvl() + ".htm");
+						html.setFile(player.getHtmlPrefix(), "html/fortress/" + getId() + "-t" + getFort().getFunction(Fort.FUNC_TELEPORT).getLvl() + ".htm");
 					}
 					sendHtmlMessage(player, html);
 				}
@@ -315,11 +315,11 @@ public class L2FortManagerInstance extends L2MerchantInstance
 					final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
 					if (getFort().getFunction(Fort.FUNC_SUPPORT) == null)
 					{
-						html.setFile(player.getHtmlPrefix(), "data/html/fortress/foreman-nac.htm");
+						html.setFile(player.getHtmlPrefix(), "html/fortress/foreman-nac.htm");
 					}
 					else
 					{
-						html.setFile(player.getHtmlPrefix(), "data/html/fortress/support" + getFort().getFunction(Fort.FUNC_SUPPORT).getLvl() + ".htm");
+						html.setFile(player.getHtmlPrefix(), "html/fortress/support" + getFort().getFunction(Fort.FUNC_SUPPORT).getLvl() + ".htm");
 						html.replace("%mp%", String.valueOf((int) getCurrentMp()));
 					}
 					sendHtmlMessage(player, html);
@@ -331,7 +331,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.getHtmlPrefix(), "html/fortress/foreman-functions.htm");
 					if (getFort().getFunction(Fort.FUNC_RESTORE_EXP) != null)
 					{
 						html.replace("%xp_regen%", String.valueOf(getFort().getFunction(Fort.FUNC_RESTORE_EXP).getLvl()));
@@ -377,7 +377,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.getHtmlPrefix(), "html/fortress/functions-cancel.htm");
 								html.replace("%apply%", "recovery hp 0");
 								sendHtmlMessage(player, html);
 								return;
@@ -385,7 +385,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.getHtmlPrefix(), "html/fortress/functions-cancel.htm");
 								html.replace("%apply%", "recovery mp 0");
 								sendHtmlMessage(player, html);
 								return;
@@ -393,7 +393,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.getHtmlPrefix(), "html/fortress/functions-cancel.htm");
 								html.replace("%apply%", "recovery exp 0");
 								sendHtmlMessage(player, html);
 								return;
@@ -402,7 +402,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.getHtmlPrefix(), "html/fortress/functions-apply.htm");
 								html.replace("%name%", "(HP Recovery Device)");
 								int percent = Integer.parseInt(val);
 								int cost;
@@ -426,7 +426,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.getHtmlPrefix(), "html/fortress/functions-apply.htm");
 								html.replace("%name%", "(MP Recovery)");
 								int percent = Integer.parseInt(val);
 								int cost;
@@ -449,7 +449,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.getHtmlPrefix(), "html/fortress/functions-apply.htm");
 								html.replace("%name%", "(EXP Recovery Device)");
 								int percent = Integer.parseInt(val);
 								int cost;
@@ -479,12 +479,12 @@ public class L2FortManagerInstance extends L2MerchantInstance
 									}
 									val = st.nextToken();
 									final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
-									html.setFile(player.getHtmlPrefix(), "data/html/fortress/functions-apply_confirmed.htm");
+									html.setFile(player.getHtmlPrefix(), "html/fortress/functions-apply_confirmed.htm");
 									if (getFort().getFunction(Fort.FUNC_RESTORE_HP) != null)
 									{
 										if (getFort().getFunction(Fort.FUNC_RESTORE_HP).getLvl() == Integer.parseInt(val))
 										{
-											html.setFile(player.getHtmlPrefix(), "data/html/fortress/functions-used.htm");
+											html.setFile(player.getHtmlPrefix(), "html/fortress/functions-used.htm");
 											html.replace("%val%", String.valueOf(val) + "%");
 											sendHtmlMessage(player, html);
 											return;
@@ -495,7 +495,7 @@ public class L2FortManagerInstance extends L2MerchantInstance
 									{
 										case 0:
 											fee = 0;
-											html.setFile(player.getHtmlPrefix(), "data/html/fortress/functions-cancel_confirmed.htm");
+											html.setFile(player.getHtmlPrefix(), "html/fortress/functions-cancel_confirmed.htm");
 											break;
 										case 300:
 											fee = Config.FS_HPREG1_FEE;
@@ -506,7 +506,7 @@ public class L2FortManagerInstance extends L2MerchantInstance
 									}
 									if (!getFort().updateFunctions(player, Fort.FUNC_RESTORE_HP, percent, fee, Config.FS_HPREG_FEE_RATIO, (getFort().getFunction(Fort.FUNC_RESTORE_HP) == null)))
 									{
-										html.setFile(player.getHtmlPrefix(), "data/html/fortress/low_adena.htm");
+										html.setFile(player.getHtmlPrefix(), "html/fortress/low_adena.htm");
 										sendHtmlMessage(player, html);
 									}
 									sendHtmlMessage(player, html);
@@ -524,12 +524,12 @@ public class L2FortManagerInstance extends L2MerchantInstance
 									}
 									val = st.nextToken();
 									final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
-									html.setFile(player.getHtmlPrefix(), "data/html/fortress/functions-apply_confirmed.htm");
+									html.setFile(player.getHtmlPrefix(), "html/fortress/functions-apply_confirmed.htm");
 									if (getFort().getFunction(Fort.FUNC_RESTORE_MP) != null)
 									{
 										if (getFort().getFunction(Fort.FUNC_RESTORE_MP).getLvl() == Integer.parseInt(val))
 										{
-											html.setFile(player.getHtmlPrefix(), "data/html/fortress/functions-used.htm");
+											html.setFile(player.getHtmlPrefix(), "html/fortress/functions-used.htm");
 											html.replace("%val%", String.valueOf(val) + "%");
 											sendHtmlMessage(player, html);
 											return;
@@ -540,7 +540,7 @@ public class L2FortManagerInstance extends L2MerchantInstance
 									{
 										case 0:
 											fee = 0;
-											html.setFile(player.getHtmlPrefix(), "data/html/fortress/functions-cancel_confirmed.htm");
+											html.setFile(player.getHtmlPrefix(), "html/fortress/functions-cancel_confirmed.htm");
 											break;
 										case 40:
 											fee = Config.FS_MPREG1_FEE;
@@ -551,7 +551,7 @@ public class L2FortManagerInstance extends L2MerchantInstance
 									}
 									if (!getFort().updateFunctions(player, Fort.FUNC_RESTORE_MP, percent, fee, Config.FS_MPREG_FEE_RATIO, (getFort().getFunction(Fort.FUNC_RESTORE_MP) == null)))
 									{
-										html.setFile(player.getHtmlPrefix(), "data/html/fortress/low_adena.htm");
+										html.setFile(player.getHtmlPrefix(), "html/fortress/low_adena.htm");
 										sendHtmlMessage(player, html);
 									}
 									sendHtmlMessage(player, html);
@@ -569,12 +569,12 @@ public class L2FortManagerInstance extends L2MerchantInstance
 									}
 									val = st.nextToken();
 									final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
-									html.setFile(player.getHtmlPrefix(), "data/html/fortress/functions-apply_confirmed.htm");
+									html.setFile(player.getHtmlPrefix(), "html/fortress/functions-apply_confirmed.htm");
 									if (getFort().getFunction(Fort.FUNC_RESTORE_EXP) != null)
 									{
 										if (getFort().getFunction(Fort.FUNC_RESTORE_EXP).getLvl() == Integer.parseInt(val))
 										{
-											html.setFile(player.getHtmlPrefix(), "data/html/fortress/functions-used.htm");
+											html.setFile(player.getHtmlPrefix(), "html/fortress/functions-used.htm");
 											html.replace("%val%", String.valueOf(val) + "%");
 											sendHtmlMessage(player, html);
 											return;
@@ -585,7 +585,7 @@ public class L2FortManagerInstance extends L2MerchantInstance
 									{
 										case 0:
 											fee = 0;
-											html.setFile(player.getHtmlPrefix(), "data/html/fortress/functions-cancel_confirmed.htm");
+											html.setFile(player.getHtmlPrefix(), "html/fortress/functions-cancel_confirmed.htm");
 											break;
 										case 45:
 											fee = Config.FS_EXPREG1_FEE;
@@ -596,7 +596,7 @@ public class L2FortManagerInstance extends L2MerchantInstance
 									}
 									if (!getFort().updateFunctions(player, Fort.FUNC_RESTORE_EXP, percent, fee, Config.FS_EXPREG_FEE_RATIO, (getFort().getFunction(Fort.FUNC_RESTORE_EXP) == null)))
 									{
-										html.setFile(player.getHtmlPrefix(), "data/html/fortress/low_adena.htm");
+										html.setFile(player.getHtmlPrefix(), "html/fortress/low_adena.htm");
 										sendHtmlMessage(player, html);
 									}
 									sendHtmlMessage(player, html);
@@ -605,7 +605,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.getHtmlPrefix(), "html/fortress/edit_recovery.htm");
 						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>]";
 						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>]";
 						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>]";
@@ -660,7 +660,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.getHtmlPrefix(), "html/fortress/functions-cancel.htm");
 								html.replace("%apply%", "other tele 0");
 								sendHtmlMessage(player, html);
 								return;
@@ -668,7 +668,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.getHtmlPrefix(), "html/fortress/functions-cancel.htm");
 								html.replace("%apply%", "other support 0");
 								sendHtmlMessage(player, html);
 								return;
@@ -677,7 +677,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.getHtmlPrefix(), "html/fortress/functions-apply.htm");
 								html.replace("%name%", "Insignia (Supplementary Magic)");
 								int stage = Integer.parseInt(val);
 								int cost;
@@ -700,7 +700,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.getHtmlPrefix(), "html/fortress/functions-apply.htm");
 								html.replace("%name%", "Mirror (Teleportation Device)");
 								int stage = Integer.parseInt(val);
 								int cost;
@@ -730,12 +730,12 @@ public class L2FortManagerInstance extends L2MerchantInstance
 									}
 									val = st.nextToken();
 									final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
-									html.setFile(player.getHtmlPrefix(), "data/html/fortress/functions-apply_confirmed.htm");
+									html.setFile(player.getHtmlPrefix(), "html/fortress/functions-apply_confirmed.htm");
 									if (getFort().getFunction(Fort.FUNC_TELEPORT) != null)
 									{
 										if (getFort().getFunction(Fort.FUNC_TELEPORT).getLvl() == Integer.parseInt(val))
 										{
-											html.setFile(player.getHtmlPrefix(), "data/html/fortress/functions-used.htm");
+											html.setFile(player.getHtmlPrefix(), "html/fortress/functions-used.htm");
 											html.replace("%val%", "Stage " + String.valueOf(val));
 											sendHtmlMessage(player, html);
 											return;
@@ -746,7 +746,7 @@ public class L2FortManagerInstance extends L2MerchantInstance
 									{
 										case 0:
 											fee = 0;
-											html.setFile(player.getHtmlPrefix(), "data/html/fortress/functions-cancel_confirmed.htm");
+											html.setFile(player.getHtmlPrefix(), "html/fortress/functions-cancel_confirmed.htm");
 											break;
 										case 1:
 											fee = Config.FS_TELE1_FEE;
@@ -757,7 +757,7 @@ public class L2FortManagerInstance extends L2MerchantInstance
 									}
 									if (!getFort().updateFunctions(player, Fort.FUNC_TELEPORT, lvl, fee, Config.FS_TELE_FEE_RATIO, (getFort().getFunction(Fort.FUNC_TELEPORT) == null)))
 									{
-										html.setFile(player.getHtmlPrefix(), "data/html/fortress/low_adena.htm");
+										html.setFile(player.getHtmlPrefix(), "html/fortress/low_adena.htm");
 										sendHtmlMessage(player, html);
 									}
 									sendHtmlMessage(player, html);
@@ -775,12 +775,12 @@ public class L2FortManagerInstance extends L2MerchantInstance
 									}
 									val = st.nextToken();
 									final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
-									html.setFile(player.getHtmlPrefix(), "data/html/fortress/functions-apply_confirmed.htm");
+									html.setFile(player.getHtmlPrefix(), "html/fortress/functions-apply_confirmed.htm");
 									if (getFort().getFunction(Fort.FUNC_SUPPORT) != null)
 									{
 										if (getFort().getFunction(Fort.FUNC_SUPPORT).getLvl() == Integer.parseInt(val))
 										{
-											html.setFile(player.getHtmlPrefix(), "data/html/fortress/functions-used.htm");
+											html.setFile(player.getHtmlPrefix(), "html/fortress/functions-used.htm");
 											html.replace("%val%", "Stage " + String.valueOf(val));
 											sendHtmlMessage(player, html);
 											return;
@@ -791,7 +791,7 @@ public class L2FortManagerInstance extends L2MerchantInstance
 									{
 										case 0:
 											fee = 0;
-											html.setFile(player.getHtmlPrefix(), "data/html/fortress/functions-cancel_confirmed.htm");
+											html.setFile(player.getHtmlPrefix(), "html/fortress/functions-cancel_confirmed.htm");
 											break;
 										case 1:
 											fee = Config.FS_SUPPORT1_FEE;
@@ -802,7 +802,7 @@ public class L2FortManagerInstance extends L2MerchantInstance
 									}
 									if (!getFort().updateFunctions(player, Fort.FUNC_SUPPORT, lvl, fee, Config.FS_SUPPORT_FEE_RATIO, (getFort().getFunction(Fort.FUNC_SUPPORT) == null)))
 									{
-										html.setFile(player.getHtmlPrefix(), "data/html/fortress/low_adena.htm");
+										html.setFile(player.getHtmlPrefix(), "html/fortress/low_adena.htm");
 										sendHtmlMessage(player, html);
 									}
 									else
@@ -814,7 +814,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.getHtmlPrefix(), "html/fortress/edit_other.htm");
 						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>]";
 						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().getFunction(Fort.FUNC_TELEPORT) != null)
@@ -850,14 +850,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.getHtmlPrefix(), "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.getHtmlPrefix(), "html/fortress/foreman-noprivs.htm");
 					sendHtmlMessage(player, html);
 				}
 				return;
@@ -903,13 +903,13 @@ public class L2FortManagerInstance extends L2MerchantInstance
 							}
 							else
 							{
-								html.setFile(player.getHtmlPrefix(), "data/html/fortress/support-no_mana.htm");
+								html.setFile(player.getHtmlPrefix(), "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.getHtmlPrefix(), "html/fortress/support-done.htm");
 						html.replace("%mp%", String.valueOf((int) getCurrentMp()));
 						sendHtmlMessage(player, html);
 					}
@@ -931,7 +931,7 @@ public class L2FortManagerInstance extends L2MerchantInstance
 				{
 					return;
 				}
-				html.setFile(player.getHtmlPrefix(), "data/html/fortress/support" + getFort().getFunction(Fort.FUNC_SUPPORT).getLvl() + ".htm");
+				html.setFile(player.getHtmlPrefix(), "html/fortress/support" + getFort().getFunction(Fort.FUNC_SUPPORT).getLvl() + ".htm");
 				html.replace("%mp%", String.valueOf((int) getStatus().getCurrentMp()));
 				sendHtmlMessage(player, html);
 				return;
@@ -950,18 +950,18 @@ public class L2FortManagerInstance extends L2MerchantInstance
 	public void showChatWindow(L2PcInstance player)
 	{
 		player.sendPacket(ActionFailed.STATIC_PACKET);
-		String filename = "data/html/fortress/foreman-no.htm";
+		String filename = "html/fortress/foreman-no.htm";
 		
 		int condition = validateCondition(player);
 		if (condition > COND_ALL_FALSE)
 		{
 			if (condition == COND_BUSY_BECAUSE_OF_SIEGE)
 			{
-				filename = "data/html/fortress/foreman-busy.htm"; // Busy because of siege
+				filename = "html/fortress/foreman-busy.htm"; // Busy because of siege
 			}
 			else if (condition == COND_OWNER)
 			{
-				filename = "data/html/fortress/foreman.htm"; // Owner message window
+				filename = "html/fortress/foreman.htm"; // Owner message window
 			}
 		}
 		
@@ -1041,7 +1041,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.getHtmlPrefix(), "html/fortress/foreman-noprivs.htm");
 			sendHtmlMessage(player, html);
 		}
 	}

trunk/java/com/l2jserver/gameserver/model/actor/instance/L2GuardInstance.java

@@ -99,8 +99,8 @@ public class L2GuardInstance extends L2Attackable
 	 * Return the pathfile of the selected HTML file in function of the L2GuardInstance Identifier and of the page number.<br>
 	 * <B><U> Format of the pathfile </U> :</B>
 	 * <ul>
-	 * <li>if page number = 0 : <B>data/html/guard/12006.htm</B> (npcId-page number)</li>
-	 * <li>if page number > 0 : <B>data/html/guard/12006-1.htm</B> (npcId-page number)</li>
+	 * <li>if page number = 0 : <B>html/guard/12006.htm</B> (npcId-page number)</li>
+	 * <li>if page number > 0 : <B>html/guard/12006-1.htm</B> (npcId-page number)</li>
 	 * </ul>
 	 * @param npcId The Identifier of the L2NpcInstance whose text must be display
 	 * @param val The number of the page to display
@@ -117,7 +117,7 @@ public class L2GuardInstance extends L2Attackable
 		{
 			pom = npcId + "-" + val;
 		}
-		return "data/html/guard/" + pom + ".htm";
+		return "html/guard/" + pom + ".htm";
 	}
 	
 	/**

trunk/java/com/l2jserver/gameserver/model/actor/instance/L2MerchantInstance.java

@@ -67,7 +67,7 @@ public class L2MerchantInstance extends L2NpcInstance
 			pom = npcId + "-" + val;
 		}
 		
-		return "data/html/merchant/" + pom + ".htm";
+		return "html/merchant/" + pom + ".htm";
 	}
 	
 	/**

trunk/java/com/l2jserver/gameserver/model/actor/instance/L2ObservationInstance.java

@@ -48,22 +48,22 @@ public final class L2ObservationInstance extends L2Npc
 		{
 			if (val == 0)
 			{
-				filename = "data/html/observation/" + getId() + "-Oracle.htm";
+				filename = "html/observation/" + getId() + "-Oracle.htm";
 			}
 			else
 			{
-				filename = "data/html/observation/" + getId() + "-Oracle-" + val + ".htm";
+				filename = "html/observation/" + getId() + "-Oracle-" + val + ".htm";
 			}
 		}
 		else
 		{
 			if (val == 0)
 			{
-				filename = "data/html/observation/" + getId() + ".htm";
+				filename = "html/observation/" + getId() + ".htm";
 			}
 			else
 			{
-				filename = "data/html/observation/" + getId() + "-" + val + ".htm";
+				filename = "html/observation/" + getId() + "-" + val + ".htm";
 			}
 		}
 		

trunk/java/com/l2jserver/gameserver/model/actor/instance/L2PcInstance.java

@@ -14022,7 +14022,7 @@ public final class L2PcInstance extends L2Playable
 				_lang = Config.L2JMOD_MULTILANG_DEFAULT;
 			}
 			
-			_htmlPrefix = "data/lang/" + _lang + "/";
+			_htmlPrefix = "lang/" + _lang + "/";
 		}
 		else
 		{

trunk/java/com/l2jserver/gameserver/model/actor/instance/L2PetManagerInstance.java

@@ -50,16 +50,16 @@ public class L2PetManagerInstance extends L2MerchantInstance
 			pom = npcId + "-" + val;
 		}
 		
-		return "data/html/petmanager/" + pom + ".htm";
+		return "html/petmanager/" + pom + ".htm";
 	}
 	
 	@Override
 	public void showChatWindow(L2PcInstance player)
 	{
-		String filename = "data/html/petmanager/" + getId() + ".htm";
+		String filename = "html/petmanager/" + getId() + ".htm";
 		if ((getId() == 36478) && player.hasSummon())
 		{
-			filename = "data/html/petmanager/restore-unsummonpet.htm";
+			filename = "html/petmanager/restore-unsummonpet.htm";
 		}
 		
 		final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
@@ -122,7 +122,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.getHtmlPrefix(), "html/petmanager/evolve_no.htm");
 				player.sendPacket(html);
 			}
 			return;
@@ -154,7 +154,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.getHtmlPrefix(), "html/petmanager/restore_no.htm");
 				player.sendPacket(html);
 			}
 			return;
@@ -171,12 +171,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.getHtmlPrefix(), "html/petmanager/" + getId() + ".htm");
 			player.sendPacket(html);
 		}
 		else
 		{
-			html.setFile(player.getHtmlPrefix(), "data/html/petmanager/exchange_no.htm");
+			html.setFile(player.getHtmlPrefix(), "html/petmanager/exchange_no.htm");
 			player.sendPacket(html);
 		}
 	}

trunk/java/com/l2jserver/gameserver/model/actor/instance/L2SepulcherNpcInstance.java

@@ -51,7 +51,7 @@ public class L2SepulcherNpcInstance extends L2Npc
 	protected Future<?> _spawnNextMysteriousBoxTask = null;
 	protected Future<?> _spawnMonsterTask = null;
 	
-	private static final String HTML_FILE_PATH = "data/html/SepulcherNpc/";
+	private static final String HTML_FILE_PATH = "html/SepulcherNpc/";
 	private static final int HALLS_KEY = 7260;
 	
 	/**
@@ -291,7 +291,7 @@ public class L2SepulcherNpcInstance extends L2Npc
 		if (isBusy())
 		{
 			final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
-			html.setFile(player.getHtmlPrefix(), "data/html/npcbusy.htm");
+			html.setFile(player.getHtmlPrefix(), "html/npcbusy.htm");
 			html.replace("%busymessage%", getBusyMessage());
 			html.replace("%npcname%", getName());
 			html.replace("%playername%", player.getName());
@@ -450,7 +450,7 @@ public class L2SepulcherNpcInstance extends L2Npc
 	public void showHtmlFile(L2PcInstance player, String file)
 	{
 		final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
-		html.setFile(player.getHtmlPrefix(), "data/html/SepulcherNpc/" + file);
+		html.setFile(player.getHtmlPrefix(), "html/SepulcherNpc/" + file);
 		html.replace("%npcname%", getName());
 		player.sendPacket(html);
 	}

trunk/java/com/l2jserver/gameserver/model/actor/instance/L2TeleporterInstance.java

@@ -82,7 +82,7 @@ public final class L2TeleporterInstance extends L2Npc
 			case "showNoblesSelect":
 			{
 				final NpcHtmlMessage msg = new NpcHtmlMessage(getObjectId());
-				msg.setFile(player.getHtmlPrefix(), "data/html/teleporter/" + (player.isNoble() ? "nobles_select" : "not_nobles") + ".htm");
+				msg.setFile(player.getHtmlPrefix(), "html/teleporter/" + (player.isNoble() ? "nobles_select" : "not_nobles") + ".htm");
 				msg.replace("%objectId%", getObjectId());
 				player.sendPacket(msg);
 				break;
@@ -104,7 +104,7 @@ public final class L2TeleporterInstance extends L2Npc
 				}
 				
 				final NpcHtmlMessage msg = new NpcHtmlMessage(getObjectId());
-				msg.setFile(player.getHtmlPrefix(), "data/html/teleporter/teleports.htm");
+				msg.setFile(player.getHtmlPrefix(), "html/teleporter/teleports.htm");
 				final StringBuilder sb = new StringBuilder();
 				final Collection<TeleportLocation> locs = holder.getLocations(type);
 				final List<NpcStringId> questLocations = new ArrayList<>();
@@ -181,7 +181,7 @@ public final class L2TeleporterInstance extends L2Npc
 				else if (getCastle().getSiege().isInProgress())
 				{
 					final NpcHtmlMessage msg = new NpcHtmlMessage(getObjectId());
-					msg.setFile(player.getHtmlPrefix(), "data/html/teleporter/castleteleporter-busy.htm");
+					msg.setFile(player.getHtmlPrefix(), "html/teleporter/castleteleporter-busy.htm");
 					player.sendPacket(msg);
 				}
 				else if (!Config.ALT_GAME_KARMA_PLAYER_CAN_USE_GK && (player.getKarma() != 0)) // TODO: Update me when Karma is replaced with Reputation system!
@@ -330,7 +330,7 @@ public final class L2TeleporterInstance extends L2Npc
 		{
 			final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
 			
-			String filename = "data/html/teleporter/epictransformed.htm";
+			String filename = "html/teleporter/epictransformed.htm";
 			
 			html.setFile(player.getHtmlPrefix(), filename);
 			html.replace("%objectId%", String.valueOf(getObjectId()));
@@ -429,7 +429,7 @@ public final class L2TeleporterInstance extends L2Npc
 			pom = npcId + "-" + val;
 		}
 		
-		return "data/html/teleporter/" + pom + ".htm";
+		return "html/teleporter/" + pom + ".htm";
 	}
 	
 	private void showNewbieHtml(L2PcInstance player)
@@ -441,10 +441,10 @@ public final class L2TeleporterInstance extends L2Npc
 		
 		final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
 		
-		String filename = "data/html/teleporter/free/" + getTemplate().getId() + ".htm";
+		String filename = "html/teleporter/free/" + getTemplate().getId() + ".htm";
 		if (!HtmCache.getInstance().isLoadable(filename))
 		{
-			filename = "data/html/teleporter/" + getTemplate().getId() + "-1.htm";
+			filename = "html/teleporter/" + getTemplate().getId() + "-1.htm";
 		}
 		
 		html.setFile(player.getHtmlPrefix(), filename);
@@ -462,10 +462,10 @@ public final class L2TeleporterInstance extends L2Npc
 		
 		final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
 		
-		String filename = "data/html/teleporter/half/" + getId() + ".htm";
+		String filename = "html/teleporter/half/" + getId() + ".htm";
 		if (!HtmCache.getInstance().isLoadable(filename))
 		{
-			filename = "data/html/teleporter/" + getId() + "-1.htm";
+			filename = "html/teleporter/" + getId() + "-1.htm";
 		}
 		
 		html.setFile(player.getHtmlPrefix(), filename);
@@ -477,7 +477,7 @@ public final class L2TeleporterInstance extends L2Npc
 	@Override
 	public void showChatWindow(L2PcInstance player)
 	{
-		String filename = "data/html/teleporter/castleteleporter-no.htm";
+		String filename = "html/teleporter/castleteleporter-no.htm";
 		
 		int condition = validateCondition(player);
 		if (condition == COND_REGULAR)
@@ -489,7 +489,7 @@ public final class L2TeleporterInstance extends L2Npc
 		{
 			if (condition == COND_BUSY_BECAUSE_OF_SIEGE)
 			{
-				filename = "data/html/teleporter/castleteleporter-busy.htm"; // Busy because of siege
+				filename = "html/teleporter/castleteleporter-busy.htm"; // Busy because of siege
 			}
 			else if (condition == COND_OWNER) // Clan owns castle
 			{
@@ -532,7 +532,7 @@ public final class L2TeleporterInstance extends L2Npc
 			}
 			else if (list.getIsForNoble() && !player.isNoble())
 			{
-				String filename = "data/html/teleporter/nobleteleporter-no.htm";
+				String filename = "html/teleporter/nobleteleporter-no.htm";
 				final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
 				html.setFile(player.getHtmlPrefix(), filename);
 				html.replace("%objectId%", String.valueOf(getObjectId()));

trunk/java/com/l2jserver/gameserver/model/actor/instance/L2TrainerInstance.java

@@ -46,6 +46,6 @@ public class L2TrainerInstance extends L2NpcInstance
 			pom = npcId + "-" + val;
 		}
 		
-		return "data/html/trainer/" + pom + ".htm";
+		return "html/trainer/" + pom + ".htm";
 	}
 }

trunk/java/com/l2jserver/gameserver/model/actor/instance/L2VillageMasterInstance.java

@@ -83,7 +83,7 @@ public class L2VillageMasterInstance extends L2NpcInstance
 			pom = npcId + "-" + val;
 		}
 		
-		return "data/html/villagemaster/" + pom + ".htm";
+		return "html/villagemaster/" + pom + ".htm";
 	}
 	
 	@Override
@@ -239,11 +239,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.getHtmlPrefix(), "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.getHtmlPrefix(), "scripts/village_master/Clan/9000-07-in-progress.htm");
 				}
 				player.sendPacket(msg);
 			}
@@ -261,7 +261,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.getHtmlPrefix(), "scripts/village_master/Clan/9000-07-canceled.htm");
 			}
 			else
 			{
@@ -606,7 +606,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.getHtmlPrefix(), "html/villagemaster/NotClanLeader.htm");
 			player.sendPacket(html);
 			player.sendPacket(ActionFailed.STATIC_PACKET);
 			return;
@@ -632,7 +632,7 @@ public class L2VillageMasterInstance extends L2NpcInstance
 			else
 			{
 				final NpcHtmlMessage html = new NpcHtmlMessage();
-				html.setFile(player.getHtmlPrefix(), "data/html/villagemaster/NoMoreSkills.htm");
+				html.setFile(player.getHtmlPrefix(), "html/villagemaster/NoMoreSkills.htm");
 				player.sendPacket(html);
 			}
 		}

trunk/java/com/l2jserver/gameserver/model/actor/instance/L2WarehouseInstance.java

@@ -53,6 +53,6 @@ public class L2WarehouseInstance extends L2NpcInstance
 			pom = npcId + "-" + val;
 		}
 		
-		return "data/html/warehouse/" + pom + ".htm";
+		return "html/warehouse/" + pom + ".htm";
 	}
 }

trunk/java/com/l2jserver/gameserver/model/actor/stat/PcStat.java

@@ -83,10 +83,6 @@ public class PcStat extends PlayableStat
 		{
 			return false;
 		}
-		if (Config.SERVER_CLASSIC_SUPPORT && (getActiveChar().getLevel() >= Config.MAX_CLASSIC_PLAYER_LEVEL))
-		{
-			return false;
-		}
 		
 		if (!super.addExp(value))
 		{
@@ -461,9 +457,9 @@ public class PcStat extends PlayableStat
 	@Override
 	public final void setLevel(byte value)
 	{
-		if (value > (Config.SERVER_CLASSIC_SUPPORT ? Config.MAX_CLASSIC_PLAYER_LEVEL : ExperienceData.getInstance().getMaxLevel() - 1))
+		if (value > (ExperienceData.getInstance().getMaxLevel() - 1))
 		{
-			value = Config.SERVER_CLASSIC_SUPPORT ? Config.MAX_CLASSIC_PLAYER_LEVEL : (byte) (ExperienceData.getInstance().getMaxLevel() - 1);
+			value = (byte) (ExperienceData.getInstance().getMaxLevel() - 1);
 		}
 		
 		if (getActiveChar().isSubClassActive())

trunk/java/com/l2jserver/gameserver/model/entity/Hero.java

@@ -447,7 +447,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.getHtmlPrefix(), "html/olympiad/herodiary.htm");
 			final String heroMessage = HERO_MESSAGE.get(charid);
 			if ((htmContent != null) && (heroMessage != null))
 			{
@@ -533,7 +533,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.getHtmlPrefix(), "html/olympiad/herohistory.htm");
 			if (htmContent != null)
 			{
 				FightReply.setHtml(htmContent);

trunk/java/com/l2jserver/gameserver/model/entity/Instance.java

@@ -434,7 +434,7 @@ public final class Instance
 	public void loadInstanceTemplate(String filename)
 	{
 		Document doc = null;
-		File xml = new File(Config.DATAPACK_ROOT, "data/instances/" + filename);
+		File xml = new File(Config.DATAPACK_ROOT, "instances/" + filename);
 		
 		try
 		{

trunk/java/com/l2jserver/gameserver/model/entity/L2Event.java

@@ -134,11 +134,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.getHtmlPrefix(), "html/mods/EventEngine/Participating.htm");
 				}
 				else
 				{
-					htmContent = HtmCache.getInstance().getHtm(player.getHtmlPrefix(), "data/html/mods/EventEngine/Participation.htm");
+					htmContent = HtmCache.getInstance().getHtm(player.getHtmlPrefix(), "html/mods/EventEngine/Participation.htm");
 				}
 				
 				if (htmContent != null)
@@ -372,7 +372,7 @@ public class L2Event
 				return "Cannot start event, invalid npc id.";
 			}
 			
-			try (FileReader fr = new FileReader(Config.DATAPACK_ROOT + "/data/events/" + _eventName);
+			try (FileReader fr = new FileReader(Config.DATAPACK_ROOT + "/events/" + _eventName);
 				BufferedReader br = new BufferedReader(fr))
 			{
 				_eventCreator = br.readLine();

trunk/java/com/l2jserver/gameserver/model/entity/TvTEvent.java

@@ -77,7 +77,7 @@ public class TvTEvent
 	
 	protected static final Logger _log = Logger.getLogger(TvTEvent.class.getName());
 	/** html path **/
-	private static final String htmlPath = "data/scripts/custom/events/TvT/TvTManager/";
+	private static final String htmlPath = "scripts/custom/events/TvT/TvTManager/";
 	/** The teams of the TvTEvent<br> */
 	private static TvTEventTeam[] _teams = new TvTEventTeam[2];
 	/** The state of the TvTEvent<br> */

trunk/java/com/l2jserver/gameserver/model/event/LongTimeEvent.java

@@ -110,7 +110,7 @@ public class LongTimeEvent extends Quest
 	 */
 	private void loadConfig()
 	{
-		File configFile = new File("data/scripts/events/" + getName() + "/config.xml");
+		File configFile = new File("scripts/events/" + getName() + "/config.xml");
 		try
 		{
 			DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();

trunk/java/com/l2jserver/gameserver/model/olympiad/Olympiad.java

@@ -62,7 +62,7 @@ public class Olympiad extends ListenersContainer
 	private static final List<StatsSet> HEROS_TO_BE = new ArrayList<>();
 	private static final Map<Integer, Integer> NOBLES_RANK = new HashMap<>();
 	
-	public static final String OLYMPIAD_HTML_PATH = "data/html/olympiad/";
+	public static final String OLYMPIAD_HTML_PATH = "html/olympiad/";
 	private static final String OLYMPIAD_LOAD_DATA = "SELECT current_cycle, period, olympiad_end, validation_end, " + "next_weekly_change FROM olympiad_data WHERE id = 0";
 	private static final String OLYMPIAD_SAVE_DATA = "INSERT INTO olympiad_data (id, current_cycle, " + "period, olympiad_end, validation_end, next_weekly_change) VALUES (0,?,?,?,?,?) " + "ON DUPLICATE KEY UPDATE current_cycle=?, period=?, olympiad_end=?, " + "validation_end=?, next_weekly_change=?";
 	private static final String OLYMPIAD_LOAD_NOBLES = "SELECT olympiad_nobles.charId, olympiad_nobles.class_id, " + "characters.char_name, olympiad_nobles.olympiad_points, olympiad_nobles.competitions_done, " + "olympiad_nobles.competitions_won, olympiad_nobles.competitions_lost, olympiad_nobles.competitions_drawn, " + "olympiad_nobles.competitions_done_week, olympiad_nobles.competitions_done_week_classed, olympiad_nobles.competitions_done_week_non_classed, olympiad_nobles.competitions_done_week_team " + "FROM olympiad_nobles, characters WHERE characters.charId = olympiad_nobles.charId";

trunk/java/com/l2jserver/gameserver/model/olympiad/OlympiadManager.java

@@ -527,7 +527,7 @@ public class OlympiadManager
 		if (points <= 0)
 		{
 			final NpcHtmlMessage message = new NpcHtmlMessage(player.getLastHtmlActionOriginId());
-			message.setFile(player.getHtmlPrefix(), "data/html/olympiad/noble_nopoints1.htm");
+			message.setFile(player.getHtmlPrefix(), "html/olympiad/noble_nopoints1.htm");
 			message.replace("%objectId%", String.valueOf(noble.getLastHtmlActionOriginId()));
 			player.sendPacket(message);
 			return false;
@@ -536,7 +536,7 @@ public class OlympiadManager
 		if ((Config.L2JMOD_DUALBOX_CHECK_MAX_OLYMPIAD_PARTICIPANTS_PER_IP > 0) && !AntiFeedManager.getInstance().tryAddPlayer(AntiFeedManager.OLYMPIAD_ID, noble, Config.L2JMOD_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.getHtmlPrefix(), "html/mods/OlympiadIPRestriction.htm");
 			message.replace("%max%", String.valueOf(AntiFeedManager.getInstance().getLimit(player, Config.L2JMOD_DUALBOX_CHECK_MAX_OLYMPIAD_PARTICIPANTS_PER_IP)));
 			player.sendPacket(message);
 			return false;

trunk/java/com/l2jserver/gameserver/model/quest/Quest.java

@@ -1779,7 +1779,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.getHtmlPrefix(), "html/noquest.htm");
 		if ((result != null) && (result.length() > 0))
 		{
 			return result;
@@ -1793,7 +1793,7 @@ public class Quest extends AbstractScript implements IIdentifiable
 	 */
 	public static String getAlreadyCompletedMsg(L2PcInstance player)
 	{
-		final String result = HtmCache.getInstance().getHtm(player.getHtmlPrefix(), "data/html/alreadycompleted.htm");
+		final String result = HtmCache.getInstance().getHtm(player.getHtmlPrefix(), "html/alreadycompleted.htm");
 		if ((result != null) && (result.length() > 0))
 		{
 			return result;
@@ -2689,13 +2689,13 @@ public class Quest extends AbstractScript implements IIdentifiable
 	public String getHtm(String prefix, String fileName)
 	{
 		final HtmCache hc = HtmCache.getInstance();
-		String content = hc.getHtm(prefix, fileName.startsWith("data/") ? fileName : "data/scripts/" + getDescr().toLowerCase() + "/" + getName() + "/" + fileName);
+		String content = hc.getHtm(prefix, !fileName.startsWith("scripts/") ? fileName : "scripts/" + getDescr().toLowerCase() + "/" + getName() + "/" + fileName);
 		if (content == null)
 		{
-			content = hc.getHtm(prefix, "data/scripts/" + getDescr() + "/" + getName() + "/" + fileName);
+			content = hc.getHtm(prefix, "scripts/" + getDescr() + "/" + getName() + "/" + fileName);
 			if (content == null)
 			{
-				content = hc.getHtmForce(prefix, "data/scripts/quests/" + getName() + "/" + fileName);
+				content = hc.getHtmForce(prefix, "scripts/quests/" + getName() + "/" + fileName);
 			}
 		}
 		return content;

trunk/java/com/l2jserver/gameserver/network/Debug.java

@@ -49,7 +49,7 @@ public class Debug
 		}
 		
 		final NpcHtmlMessage msg = new NpcHtmlMessage();
-		msg.setFile(attacker.getActingPlayer().getHtmlPrefix(), "data/html/admin/skilldebug.htm");
+		msg.setFile(attacker.getActingPlayer().getHtmlPrefix(), "html/admin/skilldebug.htm");
 		msg.replace("%patk%", target.getPAtk(target));
 		msg.replace("%matk%", target.getMAtk(target, skill));
 		msg.replace("%pdef%", target.getPDef(target));
@@ -88,7 +88,7 @@ public class Debug
 		}
 		
 		final NpcHtmlMessage msg = new NpcHtmlMessage();
-		msg.setFile(player.getHtmlPrefix(), "data/html/admin/itemdebug.htm");
+		msg.setFile(player.getHtmlPrefix(), "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");

trunk/java/com/l2jserver/gameserver/network/NpcStringId.java

@@ -33203,7 +33203,7 @@ public final class NpcStringId
 		String text;
 		for (final String lang : languages)
 		{
-			file = new File(Config.DATAPACK_ROOT, "/data/lang/" + lang + "/ns/NpcStringLocalisation.xml");
+			file = new File(Config.DATAPACK_ROOT, "/lang/" + lang + "/ns/NpcStringLocalisation.xml");
 			if (!file.isFile())
 			{
 				continue;

trunk/java/com/l2jserver/gameserver/network/SystemMessageId.java

@@ -13979,7 +13979,7 @@ public final class SystemMessageId
 		String text;
 		for (final String lang : languages)
 		{
-			file = new File(Config.DATAPACK_ROOT, "/data/lang/" + lang + "/sm/SystemMessageLocalisation.xml");
+			file = new File(Config.DATAPACK_ROOT, "/lang/" + lang + "/sm/SystemMessageLocalisation.xml");
 			if (!file.isFile())
 			{
 				continue;

trunk/java/com/l2jserver/gameserver/network/clientpackets/CharacterCreate.java

@@ -299,44 +299,6 @@ public final class CharacterCreate extends L2GameClientPacket
 		{
 			newChar.setXYZInvisible(Config.FACTION_STARTING_LOCATION.getX(), Config.FACTION_STARTING_LOCATION.getY(), Config.FACTION_STARTING_LOCATION.getZ());
 		}
-		else if (Config.SERVER_CLASSIC_SUPPORT)
-		{
-			switch (template.getRace())
-			{
-				case HUMAN:
-				{
-					if (template.getClassId().isMage())
-					{
-						newChar.setXYZInvisible(-90875, 248162, -3570);
-					}
-					else
-					{
-						newChar.setXYZInvisible(-71338, 258271, -3104);
-					}
-					break;
-				}
-				case ELF:
-				{
-					newChar.setXYZInvisible(46045, 41251, -3440);
-					break;
-				}
-				case DARK_ELF:
-				{
-					newChar.setXYZInvisible(28295, 11063, -4224);
-					break;
-				}
-				case ORC:
-				{
-					newChar.setXYZInvisible(-56733, -113459, -690);
-					break;
-				}
-				case DWARF:
-				{
-					newChar.setXYZInvisible(108644, -173947, -400);
-					break;
-				}
-			}
-		}
 		else
 		{
 			Location createLoc = template.getCreationPoint();

trunk/java/com/l2jserver/gameserver/network/clientpackets/CharacterSelect.java

@@ -121,7 +121,7 @@ public class CharacterSelect extends L2GameClientPacket
 					if ((Config.L2JMOD_DUALBOX_CHECK_MAX_PLAYERS_PER_IP > 0) && !AntiFeedManager.getInstance().tryAddClient(AntiFeedManager.GAME_ID, client, Config.L2JMOD_DUALBOX_CHECK_MAX_PLAYERS_PER_IP))
 					{
 						final NpcHtmlMessage msg = new NpcHtmlMessage();
-						msg.setFile(info.getHtmlPrefix(), "data/html/mods/IPRestriction.htm");
+						msg.setFile(info.getHtmlPrefix(), "html/mods/IPRestriction.htm");
 						msg.replace("%max%", String.valueOf(AntiFeedManager.getInstance().getLimit(client, Config.L2JMOD_DUALBOX_CHECK_MAX_PLAYERS_PER_IP)));
 						client.sendPacket(msg);
 						return;
@@ -132,7 +132,7 @@ public class CharacterSelect extends L2GameClientPacket
 						if (info.isGood() && (L2World.getInstance().getAllGoodPlayersCount() >= ((L2World.getInstance().getAllEvilPlayersCount() + Config.FACTION_BALANCE_PLAYER_EXCEED_LIMIT))))
 						{
 							final NpcHtmlMessage msg = new NpcHtmlMessage();
-							msg.setFile(info.getHtmlPrefix(), "data/html/mods/Faction/ExceededOnlineLimit.htm");
+							msg.setFile(info.getHtmlPrefix(), "html/mods/Faction/ExceededOnlineLimit.htm");
 							msg.replace("%more%", Config.FACTION_GOOD_TEAM_NAME);
 							msg.replace("%less%", Config.FACTION_EVIL_TEAM_NAME);
 							client.sendPacket(msg);
@@ -141,7 +141,7 @@ public class CharacterSelect extends L2GameClientPacket
 						if (info.isEvil() && (L2World.getInstance().getAllEvilPlayersCount() >= ((L2World.getInstance().getAllGoodPlayersCount() + Config.FACTION_BALANCE_PLAYER_EXCEED_LIMIT))))
 						{
 							final NpcHtmlMessage msg = new NpcHtmlMessage();
-							msg.setFile(info.getHtmlPrefix(), "data/html/mods/Faction/ExceededOnlineLimit.htm");
+							msg.setFile(info.getHtmlPrefix(), "html/mods/Faction/ExceededOnlineLimit.htm");
 							msg.replace("%more%", Config.FACTION_EVIL_TEAM_NAME);
 							msg.replace("%less%", Config.FACTION_GOOD_TEAM_NAME);
 							client.sendPacket(msg);

trunk/java/com/l2jserver/gameserver/network/clientpackets/EnterWorld.java

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

trunk/java/com/l2jserver/gameserver/network/clientpackets/ExPCCafeRequestOpenWindowWithoutNPC.java

@@ -42,7 +42,7 @@ public class ExPCCafeRequestOpenWindowWithoutNPC extends L2GameClientPacket
 	public void getHtmlPage(L2PcInstance player)
 	{
 		final NpcHtmlMessage html = new NpcHtmlMessage();
-		html.setFile(player.getHtmlPrefix(), "data/html/pccafe.htm");
+		html.setFile(player.getHtmlPrefix(), "html/pccafe.htm");
 		player.sendPacket(html);
 	}
 	

trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestLinkHtml.java

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

trunk/java/com/l2jserver/gameserver/network/serverpackets/CharSelectionInfo.java

@@ -318,7 +318,7 @@ public class CharSelectionInfo extends L2GameServerPacket
 			{
 				lang = Config.L2JMOD_MULTILANG_DEFAULT;
 			}
-			charInfopackage.setHtmlPrefix("data/lang/" + lang + "/");
+			charInfopackage.setHtmlPrefix("lang/" + lang + "/");
 		}
 		
 		// if is in subclass, load subclass exp, sp, lvl info

trunk/java/com/l2jserver/gameserver/script/faenor/FaenorScriptEngine.java

@@ -42,7 +42,7 @@ import com.l2jserver.util.file.filter.XMLFilter;
 public class FaenorScriptEngine extends ScriptEngine
 {
 	private static final Logger _log = Logger.getLogger(FaenorScriptEngine.class.getName());
-	public static final String PACKAGE_DIRECTORY = "data/faenor/";
+	public static final String PACKAGE_DIRECTORY = "faenor/";
 	
 	protected FaenorScriptEngine()
 	{

trunk/java/com/l2jserver/gameserver/scripting/L2ScriptEngineManager.java

@@ -53,7 +53,7 @@ public final class L2ScriptEngineManager
 {
 	private static final Logger _log = Logger.getLogger(L2ScriptEngineManager.class.getName());
 	
-	public static final File SCRIPT_FOLDER = new File(Config.DATAPACK_ROOT.getAbsolutePath(), "data/scripts");
+	public static final File SCRIPT_FOLDER = new File(Config.DATAPACK_ROOT.getAbsolutePath(), "scripts");
 	
 	public static L2ScriptEngineManager getInstance()
 	{