BETA: Enforcing IIdentifiable interface.

'''Note:''' If you get errors on your custom scripts after synchronizing, just check and change methods from getXXXId() to getId().

L2J_Server_BETA/java/com/l2jserver/gameserver/MonsterRace.java

@@ -62,7 +62,7 @@ public class MonsterRace
 			{
 				for (int j = i - 1; j >= 0; j--)
 				{
-					if (_monsters[j].getTemplate().getNpcId() == (id + random))
+					if (_monsters[j].getTemplate().getId() == (id + random))
 					{
 						random = Rnd.get(24);
 						continue;

L2J_Server_BETA/java/com/l2jserver/gameserver/SevenSignsFestival.java

@@ -1755,7 +1755,7 @@ public class SevenSignsFestival implements SpawnListener
 			return;
 		}
 		
-		int npcId = npc.getNpcId();
+		int npcId = npc.getId();
 		
 		// If the spawned NPC ID matches the ones we need, assign their instances.
 		if (npcId == 31127)

L2J_Server_BETA/java/com/l2jserver/gameserver/ai/L2AttackableAI.java

@@ -101,7 +101,7 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable
 	public L2AttackableAI(L2Character.AIAccessor accessor)
 	{
 		super(accessor);
-		_skillrender = NpcTable.getInstance().getTemplate(getActiveChar().getTemplate().getNpcId());
+		_skillrender = NpcTable.getInstance().getTemplate(getActiveChar().getTemplate().getId());
 		_attackTimeout = Integer.MAX_VALUE;
 		_globalAggro = -10; // 10 seconds timeout of ATTACK after respawn
 	}

L2J_Server_BETA/java/com/l2jserver/gameserver/ai/L2CharacterAI.java

@@ -1261,9 +1261,7 @@ public class L2CharacterAI extends AbstractAI
 			// water movement analysis
 			if (_actor instanceof L2Npc)
 			{
-				int npcId = ((L2Npc) _actor).getNpcId();
-				
-				switch (npcId)
+				switch (_actor.getId())
 				{
 					case 20314: // great white shark
 					case 20849: // Light Worm

L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/CharSummonTable.java

@@ -127,7 +127,7 @@ public class CharSummonTable
 			_log.warning(getClass().getSimpleName() + ": Null pet summoning item for: " + activeChar);
 			return;
 		}
-		final L2PetData petData = PetDataTable.getInstance().getPetDataByItemId(item.getItemId());
+		final L2PetData petData = PetDataTable.getInstance().getPetDataByItemId(item.getId());
 		if (petData == null)
 		{
 			_log.warning(getClass().getSimpleName() + ": Null pet data for: " + activeChar + " and summoning item: " + item);
@@ -245,7 +245,7 @@ public class CharSummonTable
 					if (summon.getLevel() >= ExperienceTable.getInstance().getMaxPetLevel())
 					{
 						summon.getStat().setExp(ExperienceTable.getInstance().getExpForLevel(ExperienceTable.getInstance().getMaxPetLevel() - 1));
-						_log.warning(getClass().getSimpleName() + ": Summon (" + summon.getName() + ") NpcID: " + summon.getNpcId() + " has a level above " + ExperienceTable.getInstance().getMaxPetLevel() + ". Please rectify.");
+						_log.warning(getClass().getSimpleName() + ": Summon (" + summon.getName() + ") NpcID: " + summon.getId() + " has a level above " + ExperienceTable.getInstance().getMaxPetLevel() + ". Please rectify.");
 					}
 					else
 					{

L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/DoorTable.java

@@ -141,7 +141,7 @@ public class DoorTable extends DocumentParser
 	
 	public void putDoor(L2DoorInstance door, int region)
 	{
-		_doors.put(door.getDoorId(), door);
+		_doors.put(door.getId(), door);
 		
 		if (!_regions.containsKey(region))
 		{

L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/EnchantItemData.java

@@ -121,7 +121,7 @@ public class EnchantItemData extends DocumentParser
 	 */
 	public final EnchantScroll getEnchantScroll(L2ItemInstance scroll)
 	{
-		return _scrolls.get(scroll.getItemId());
+		return _scrolls.get(scroll.getId());
 	}
 	
 	/**
@@ -131,7 +131,7 @@ public class EnchantItemData extends DocumentParser
 	 */
 	public final EnchantItem getSupportItem(L2ItemInstance item)
 	{
-		return _supports.get(item.getItemId());
+		return _supports.get(item.getId());
 	}
 	
 	/**

L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/EnchantItemOptionsData.java

@@ -111,7 +111,7 @@ public class EnchantItemOptionsData extends DocumentParser
 	 */
 	public EnchantOptions getOptions(L2ItemInstance item)
 	{
-		return item != null ? getOptions(item.getItemId(), item.getEnchantLevel()) : null;
+		return item != null ? getOptions(item.getId(), item.getEnchantLevel()) : null;
 	}
 	
 	/**

L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/ItemTable.java

@@ -330,7 +330,7 @@ public class ItemTable
 		
 		if (Config.LOG_ITEMS && !process.equals("Reset"))
 		{
-			if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getItemId() == ADENA_ID))))
+			if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID))))
 			{
 				LogRecord record = new LogRecord(Level.INFO, "CREATE:" + process);
 				record.setLoggerName("item");
@@ -419,7 +419,7 @@ public class ItemTable
 			
 			if (Config.LOG_ITEMS)
 			{
-				if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getItemId() == ADENA_ID))))
+				if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID))))
 				{
 					LogRecord record = new LogRecord(Level.INFO, "DELETE:" + process);
 					record.setLoggerName("item");
@@ -450,7 +450,7 @@ public class ItemTable
 					String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
 					if (Config.GMAUDIT)
 					{
-						GMAudit.auditGMAction(actor.getName() + " [" + actor.getObjectId() + "]", process + "(id: " + item.getItemId() + " count: " + item.getCount() + " itemObjId: " + item.getObjectId() + ")", targetName, "L2Object referencing this action is: " + referenceName);
+						GMAudit.auditGMAction(actor.getName() + " [" + actor.getObjectId() + "]", process + "(id: " + item.getId() + " count: " + item.getCount() + " itemObjId: " + item.getObjectId() + ")", targetName, "L2Object referencing this action is: " + referenceName);
 					}
 				}
 			}

L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/MultisellData.java

@@ -229,11 +229,11 @@ public class MultisellData extends DocumentParser
 		ListContainer template = _entries.get(listId);
 		if (template == null)
 		{
-			_log.warning(getClass().getSimpleName() + ": can't find list id: " + listId + " requested by player: " + player.getName() + ", npcId:" + (npc != null ? npc.getNpcId() : 0));
+			_log.warning(getClass().getSimpleName() + ": can't find list id: " + listId + " requested by player: " + player.getName() + ", npcId:" + (npc != null ? npc.getId() : 0));
 			return;
 		}
 		
-		if (((npc != null) && !template.isNpcAllowed(npc.getNpcId())) || ((npc == null) && template.isNpcOnly()))
+		if (((npc != null) && !template.isNpcAllowed(npc.getId())) || ((npc == null) && template.isNpcOnly()))
 		{
 			_log.warning(getClass().getSimpleName() + ": player " + player + " attempted to open multisell " + listId + " from npc " + npc + " which is not allowed!");
 			return;

L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/NpcTable.java

@@ -864,7 +864,7 @@ public class NpcTable extends DocumentParser
 		{
 			for (L2NpcTemplate template : _npcs.values())
 			{
-				final List<ClassId> teachInfo = SkillLearnData.getInstance().getSkillLearnData(template.getNpcId());
+				final List<ClassId> teachInfo = SkillLearnData.getInstance().getSkillLearnData(template.getId());
 				if (teachInfo != null)
 				{
 					template.addTeachInfo(teachInfo);

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

@@ -192,7 +192,7 @@ public final class SpawnTable
 				PreparedStatement insert = con.prepareStatement("INSERT INTO " + spawnTable + "(count,npc_templateid,locx,locy,locz,heading,respawn_delay,respawn_random,loc_id) values(?,?,?,?,?,?,?,?,?)"))
 			{
 				insert.setInt(1, spawn.getAmount());
-				insert.setInt(2, spawn.getNpcid());
+				insert.setInt(2, spawn.getId());
 				insert.setInt(3, spawn.getX());
 				insert.setInt(4, spawn.getY());
 				insert.setInt(5, spawn.getZ());
@@ -229,7 +229,7 @@ public final class SpawnTable
 				delete.setInt(1, spawn.getX());
 				delete.setInt(2, spawn.getY());
 				delete.setInt(3, spawn.getZ());
-				delete.setInt(4, spawn.getNpcid());
+				delete.setInt(4, spawn.getId());
 				delete.setInt(5, spawn.getHeading());
 				delete.execute();
 			}
@@ -246,11 +246,11 @@ public final class SpawnTable
 	 */
 	private void addSpawn(L2Spawn spawn)
 	{
-		if (!_spawnTable.containsKey(spawn.getNpcid()))
+		if (!_spawnTable.containsKey(spawn.getId()))
 		{
-			_spawnTable.put(spawn.getNpcid(), new FastSet<L2Spawn>().shared());
+			_spawnTable.put(spawn.getId(), new FastSet<L2Spawn>().shared());
 		}
-		_spawnTable.get(spawn.getNpcid()).add(spawn);
+		_spawnTable.get(spawn.getId()).add(spawn);
 	}
 	
 	/**
@@ -260,13 +260,13 @@ public final class SpawnTable
 	 */
 	private boolean removeSpawn(L2Spawn spawn)
 	{
-		if (_spawnTable.containsKey(spawn.getNpcid()))
+		if (_spawnTable.containsKey(spawn.getId()))
 		{
-			final Set<L2Spawn> set = _spawnTable.get(spawn.getNpcid());
+			final Set<L2Spawn> set = _spawnTable.get(spawn.getId());
 			boolean removed = set.remove(spawn);
 			if (set.isEmpty())
 			{
-				_spawnTable.remove(spawn.getNpcid());
+				_spawnTable.remove(spawn.getId());
 			}
 			return removed;
 		}

L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/SummonSkillsTable.java

@@ -86,12 +86,12 @@ public class SummonSkillsTable
 	public int getAvailableLevel(L2Summon cha, int skillId)
 	{
 		int lvl = 0;
-		if (!_skillTrees.containsKey(cha.getNpcId()))
+		if (!_skillTrees.containsKey(cha.getId()))
 		{
-			_log.warning(getClass().getSimpleName() + ": Pet id " + cha.getNpcId() + " does not have any skills assigned.");
+			_log.warning(getClass().getSimpleName() + ": Pet id " + cha.getId() + " does not have any skills assigned.");
 			return lvl;
 		}
-		Collection<L2PetSkillLearn> skills = _skillTrees.get(cha.getNpcId()).values();
+		Collection<L2PetSkillLearn> skills = _skillTrees.get(cha.getId()).values();
 		for (L2PetSkillLearn temp : skills)
 		{
 			if (temp.getId() != skillId)
@@ -135,12 +135,12 @@ public class SummonSkillsTable
 	public List<Integer> getAvailableSkills(L2Summon cha)
 	{
 		List<Integer> skillIds = new ArrayList<>();
-		if (!_skillTrees.containsKey(cha.getNpcId()))
+		if (!_skillTrees.containsKey(cha.getId()))
 		{
-			_log.warning(getClass().getSimpleName() + ": Pet id " + cha.getNpcId() + " does not have any skills assigned.");
+			_log.warning(getClass().getSimpleName() + ": Pet id " + cha.getId() + " does not have any skills assigned.");
 			return skillIds;
 		}
-		Collection<L2PetSkillLearn> skills = _skillTrees.get(cha.getNpcId()).values();
+		Collection<L2PetSkillLearn> skills = _skillTrees.get(cha.getId()).values();
 		for (L2PetSkillLearn temp : skills)
 		{
 			if (skillIds.contains(temp.getId()))

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

@@ -288,7 +288,7 @@ public final class CursedWeaponsManager
 	
 	public void activate(L2PcInstance player, L2ItemInstance item)
 	{
-		CursedWeapon cw = _cursedWeapons.get(item.getItemId());
+		CursedWeapon cw = _cursedWeapons.get(item.getId());
 		if (player.isCursedWeaponEquipped()) // cannot own 2 cursed swords
 		{
 			CursedWeapon cw2 = _cursedWeapons.get(player.getCursedWeaponEquippedId());

L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/DayNightSpawnManager.java

@@ -213,7 +213,7 @@ public final class DayNightSpawnManager
 					continue;
 				}
 				
-				if ((boss != null) && (boss.getNpcId() == 25328) && boss.getRaidStatus().equals(RaidBossSpawnManager.StatusEnum.ALIVE))
+				if ((boss != null) && (boss.getId() == 25328) && boss.getRaidStatus().equals(RaidBossSpawnManager.StatusEnum.ALIVE))
 				{
 					handleHellmans(boss, mode);
 				}

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

@@ -953,7 +953,7 @@ public final class FourSepulchersManager
 			_log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't find quest: " + QUEST_ID);
 			return;
 		}
-		int npcId = npc.getNpcId();
+		int npcId = npc.getId();
 		switch (npcId)
 		{
 		// ID ok
@@ -1363,7 +1363,7 @@ public final class FourSepulchersManager
 			return;
 		}
 		
-		L2Spawn spawnDat = _keyBoxSpawns.get(activeChar.getNpcId());
+		L2Spawn spawnDat = _keyBoxSpawns.get(activeChar.getId());
 		
 		if (spawnDat != null)
 		{
@@ -1386,7 +1386,7 @@ public final class FourSepulchersManager
 			return;
 		}
 		
-		L2Spawn spawnDat = _executionerSpawns.get(activeChar.getNpcId());
+		L2Spawn spawnDat = _executionerSpawns.get(activeChar.getId());
 		
 		if (spawnDat != null)
 		{
@@ -1658,7 +1658,7 @@ public final class FourSepulchersManager
 				// hall not used right now, so its manager will not tell you
 				// anything :)
 				// if you don't need this - delete next two lines.
-				if (!_hallInUse.get(temp.getNpcid()).booleanValue())
+				if (!_hallInUse.get(temp.getId()).booleanValue())
 				{
 					continue;
 				}

L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/GrandBossManager.java

@@ -278,7 +278,7 @@ public final class GrandBossManager
 	{
 		if (boss != null)
 		{
-			_bosses.put(boss.getNpcId(), boss);
+			_bosses.put(boss.getId(), boss);
 		}
 	}
 	

L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/ItemsOnGroundManager.java

@@ -128,7 +128,7 @@ public final class ItemsOnGroundManager implements Runnable
 					_items.add(item);
 					count++;
 					// add to ItemsAutoDestroy only items not protected
-					if (!Config.LIST_PROTECTED_ITEMS.contains(item.getItemId()))
+					if (!Config.LIST_PROTECTED_ITEMS.contains(item.getId()))
 					{
 						if (dropTime > -1)
 						{
@@ -218,7 +218,7 @@ public final class ItemsOnGroundManager implements Runnable
 					continue;
 				}
 				
-				if (CursedWeaponsManager.getInstance().isCursed(item.getItemId()))
+				if (CursedWeaponsManager.getInstance().isCursed(item.getId()))
 				{
 					continue; // Cursed Items not saved to ground, prevent double save
 				}
@@ -226,7 +226,7 @@ public final class ItemsOnGroundManager implements Runnable
 				try
 				{
 					statement.setInt(1, item.getObjectId());
-					statement.setInt(2, item.getItemId());
+					statement.setInt(2, item.getId());
 					statement.setLong(3, item.getCount());
 					statement.setInt(4, item.getEnchantLevel());
 					statement.setInt(5, item.getX());

L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/MercTicketManager.java

@@ -238,7 +238,7 @@ public final class MercTicketManager
 		int count = 0;
 		for (L2ItemInstance ticket : _droppedTickets)
 		{
-			if ((ticket != null) && (ticket.getItemId() == itemId))
+			if ((ticket != null) && (ticket.getId() == itemId))
 			{
 				count++;
 			}
@@ -271,7 +271,7 @@ public final class MercTicketManager
 		int count = 0;
 		for (L2ItemInstance ticket : _droppedTickets)
 		{
-			if ((ticket != null) && (getTicketCastleId(ticket.getItemId()) == castleId))
+			if ((ticket != null) && (getTicketCastleId(ticket.getId()) == castleId))
 			{
 				count++;
 			}
@@ -375,7 +375,7 @@ public final class MercTicketManager
 		while (it.hasNext())
 		{
 			L2ItemInstance item = it.next();
-			if ((item != null) && (getTicketCastleId(item.getItemId()) == castleId))
+			if ((item != null) && (getTicketCastleId(item.getId()) == castleId))
 			{
 				item.decayMe();
 				L2World.getInstance().removeObject(item);
@@ -390,7 +390,7 @@ public final class MercTicketManager
 	 */
 	public void removeTicket(L2ItemInstance item)
 	{
-		int itemId = item.getItemId();
+		int itemId = item.getId();
 		int npcId = -1;
 		
 		// find the FIRST ticket itemId with spawns the saved NPC in the saved location

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

@@ -113,7 +113,7 @@ public final class QuestManager extends ScriptManager<Quest>
 	{
 		for (Quest q : _quests.values())
 		{
-			if (q.getQuestIntId() == questId)
+			if (q.getId() == questId)
 			{
 				return q;
 			}

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

@@ -177,12 +177,12 @@ public class RaidBossSpawnManager
 	 */
 	public void updateStatus(L2RaidBossInstance boss, boolean isBossDead)
 	{
-		if (!_storedInfo.containsKey(boss.getNpcId()))
+		if (!_storedInfo.containsKey(boss.getId()))
 		{
 			return;
 		}
 		
-		final StatsSet info = _storedInfo.get(boss.getNpcId());
+		final StatsSet info = _storedInfo.get(boss.getId());
 		
 		if (isBossDead)
 		{
@@ -197,13 +197,13 @@ public class RaidBossSpawnManager
 			info.set("currentMP", boss.getMaxMp());
 			info.set("respawnTime", respawnTime);
 			
-			if (!_schedules.containsKey(boss.getNpcId()) && ((respawnMinDelay > 0) || (respawnMaxDelay > 0)))
+			if (!_schedules.containsKey(boss.getId()) && ((respawnMinDelay > 0) || (respawnMaxDelay > 0)))
 			{
 				final Calendar time = Calendar.getInstance();
 				time.setTimeInMillis(respawnTime);
 				_log.info(getClass().getSimpleName() + ": Updated " + boss.getName() + " respawn time to " + time.getTime());
 				
-				_schedules.put(boss.getNpcId(), ThreadPoolManager.getInstance().scheduleGeneral(new SpawnSchedule(boss.getNpcId()), respawnDelay));
+				_schedules.put(boss.getId(), ThreadPoolManager.getInstance().scheduleGeneral(new SpawnSchedule(boss.getId()), respawnDelay));
 				updateDb();
 			}
 		}
@@ -215,7 +215,7 @@ public class RaidBossSpawnManager
 			info.set("currentMP", boss.getCurrentMp());
 			info.set("respawnTime", 0L);
 		}
-		_storedInfo.put(boss.getNpcId(), info);
+		_storedInfo.put(boss.getId(), info);
 	}
 	
 	/**
@@ -232,12 +232,12 @@ public class RaidBossSpawnManager
 		{
 			return;
 		}
-		if (_spawns.containsKey(spawnDat.getNpcid()))
+		if (_spawns.containsKey(spawnDat.getId()))
 		{
 			return;
 		}
 		
-		final int bossId = spawnDat.getNpcid();
+		final int bossId = spawnDat.getId();
 		final long time = Calendar.getInstance().getTimeInMillis();
 		
 		SpawnTable.getInstance().addNewSpawn(spawnDat, false);
@@ -284,7 +284,7 @@ public class RaidBossSpawnManager
 			try (Connection con = L2DatabaseFactory.getInstance().getConnection();
 				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.getNpcid());
+				statement.setInt(1, spawnDat.getId());
 				statement.setInt(2, spawnDat.getAmount());
 				statement.setInt(3, spawnDat.getX());
 				statement.setInt(4, spawnDat.getY());
@@ -315,7 +315,7 @@ public class RaidBossSpawnManager
 			return;
 		}
 		
-		final int bossId = spawnDat.getNpcid();
+		final int bossId = spawnDat.getId();
 		if (!_spawns.containsKey(bossId))
 		{
 			return;
@@ -515,11 +515,11 @@ public class RaidBossSpawnManager
 		
 		raidboss.setRaidStatus(StatusEnum.ALIVE);
 		
-		_storedInfo.put(raidboss.getNpcId(), info);
+		_storedInfo.put(raidboss.getId(), info);
 		
 		_log.info(getClass().getSimpleName() + ": Spawning Night Raid Boss " + raidboss.getName());
 		
-		_bosses.put(raidboss.getNpcId(), raidboss);
+		_bosses.put(raidboss.getId(), raidboss);
 	}
 	
 	/**

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

@@ -271,7 +271,7 @@ public final class WalkingManager extends DocumentParser
 					
 					if (!npc.isInsideRadius(node, 3000, true, false))
 					{
-						final String message = "Route '" + routeName + "': NPC (id=" + npc.getNpcId() + ", x=" + npc.getX() + ", y=" + npc.getY() + ", z=" + npc.getZ() + ") is too far from starting point (node x=" + node.getX() + ", y=" + node.getY() + ", z=" + node.getZ() + ", range=" + npc.getDistanceSq(node.getX(), node.getY(), node.getZ()) + "), walking will not start";
+						final String message = "Route '" + routeName + "': NPC (id=" + npc.getId() + ", x=" + npc.getX() + ", y=" + npc.getY() + ", z=" + npc.getZ() + ") is too far from starting point (node x=" + node.getX() + ", y=" + node.getY() + ", z=" + node.getZ() + ", range=" + npc.getDistanceSq(node.getX(), node.getY(), node.getZ()) + "), walking will not start";
 						_log.warning(getClass().getSimpleName() + ": " + message);
 						npc.sendDebugMessage(message);
 						return;
@@ -465,9 +465,9 @@ public final class WalkingManager extends DocumentParser
 	 */
 	public void onSpawn(L2Npc npc)
 	{
-		if (_routesToAttach.containsKey(npc.getNpcId()))
+		if (_routesToAttach.containsKey(npc.getId()))
 		{
-			final String routeName = _routesToAttach.get(npc.getNpcId()).getRouteName(npc);
+			final String routeName = _routesToAttach.get(npc.getId()).getRouteName(npc);
 			if (!routeName.isEmpty())
 			{
 				startMoving(npc, routeName);

L2J_Server_BETA/java/com/l2jserver/gameserver/model/L2ArmorSet.java

@@ -158,19 +158,19 @@ public final class L2ArmorSet
 		
 		if (legsItem != null)
 		{
-			legs = legsItem.getItemId();
+			legs = legsItem.getId();
 		}
 		if (headItem != null)
 		{
-			head = headItem.getItemId();
+			head = headItem.getId();
 		}
 		if (glovesItem != null)
 		{
-			gloves = glovesItem.getItemId();
+			gloves = glovesItem.getId();
 		}
 		if (feetItem != null)
 		{
-			feet = feetItem.getItemId();
+			feet = feetItem.getId();
 		}
 		
 		return containAll(_chestId, legs, head, gloves, feet);
@@ -236,7 +236,7 @@ public final class L2ArmorSet
 		Inventory inv = player.getInventory();
 		
 		L2ItemInstance shieldItem = inv.getPaperdollItem(Inventory.PAPERDOLL_LHAND);
-		return ((shieldItem != null) && _shield.contains(Integer.valueOf(shieldItem.getItemId())));
+		return ((shieldItem != null) && _shield.contains(Integer.valueOf(shieldItem.getId())));
 	}
 	
 	public boolean containShield(int shield_id)

L2J_Server_BETA/java/com/l2jserver/gameserver/model/L2GroupSpawn.java

@@ -108,7 +108,7 @@ public class L2GroupSpawn extends L2Spawn
 			
 			if (Config.DEBUG)
 			{
-				_log.finest("Spawned Mob Id: " + _template.getNpcId() + " ,at: X: " + mob.getX() + " Y: " + mob.getY() + " Z: " + mob.getZ());
+				_log.finest("Spawned Mob Id: " + _template.getId() + " ,at: X: " + mob.getX() + " Y: " + mob.getY() + " Z: " + mob.getZ());
 			}
 			return mob;
 			

L2J_Server_BETA/java/com/l2jserver/gameserver/model/L2Object.java

@@ -34,6 +34,7 @@ import com.l2jserver.gameserver.model.actor.knownlist.ObjectKnownList;
 import com.l2jserver.gameserver.model.actor.poly.ObjectPoly;
 import com.l2jserver.gameserver.model.actor.position.ObjectPosition;
 import com.l2jserver.gameserver.model.entity.Instance;
+import com.l2jserver.gameserver.model.interfaces.IIdentifiable;
 import com.l2jserver.gameserver.model.interfaces.IPositionable;
 import com.l2jserver.gameserver.model.zone.ZoneId;
 import com.l2jserver.gameserver.network.SystemMessageId;
@@ -48,7 +49,7 @@ import com.l2jserver.gameserver.network.serverpackets.L2GameServerPacket;
  * <BR>
  * <li>L2Character</li> <li>L2ItemInstance</li>
  */
-public abstract class L2Object implements IPositionable
+public abstract class L2Object implements IPositionable, IIdentifiable
 {
 	private boolean _isVisible; // Object visibility
 	private ObjectKnownList _knownList;

L2J_Server_BETA/java/com/l2jserver/gameserver/model/L2Party.java

@@ -610,14 +610,14 @@ public class L2Party extends AbstractPlayerGroup
 	 */
 	public void distributeItem(L2PcInstance player, L2ItemInstance item)
 	{
-		if (item.getItemId() == PcInventory.ADENA_ID)
+		if (item.getId() == PcInventory.ADENA_ID)
 		{
 			distributeAdena(player, item.getCount(), player);
 			ItemTable.getInstance().destroyItem("Party", item, player, null);
 			return;
 		}
 		
-		L2PcInstance target = getActualLooter(player, item.getItemId(), false, player);
+		L2PcInstance target = getActualLooter(player, item.getId(), false, player);
 		target.addItem("Party", item, player, true);
 		
 		// Send messages to other party members about reward

L2J_Server_BETA/java/com/l2jserver/gameserver/model/L2Spawn.java

@@ -35,6 +35,7 @@ import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2MonsterInstance;
 import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
+import com.l2jserver.gameserver.model.interfaces.IIdentifiable;
 import com.l2jserver.gameserver.model.interfaces.IPositionable;
 import com.l2jserver.util.Rnd;
 
@@ -45,7 +46,7 @@ import com.l2jserver.util.Rnd;
  * The heading of the L2NpcInstance can be a random heading if not defined (value= -1) or an exact heading (ex : merchant...).
  * @author Nightmare
  */
-public class L2Spawn implements IPositionable
+public class L2Spawn implements IPositionable, IIdentifiable
 {
 	protected static final Logger _log = Logger.getLogger(L2Spawn.class.getName());
 	
@@ -235,11 +236,13 @@ public class L2Spawn implements IPositionable
 	}
 	
 	/**
-	 * @return the Identifier of the L2NpcInstance manage by this L2Spawn contained in the L2NpcTemplate.
+	 * Gets the NPC ID.
+	 * @return the NPC ID
 	 */
-	public int getNpcid()
+	@Override
+	public int getId()
 	{
-		return _template.getNpcId();
+		return _template.getId();
 	}
 	
 	/**
@@ -454,7 +457,7 @@ public class L2Spawn implements IPositionable
 		}
 		catch (Exception e)
 		{
-			_log.log(Level.WARNING, "NPC " + _template.getNpcId() + " class not found", e);
+			_log.log(Level.WARNING, "NPC " + _template.getId() + " class not found", e);
 		}
 		return mob;
 	}
@@ -551,7 +554,7 @@ public class L2Spawn implements IPositionable
 		
 		if (Config.DEBUG)
 		{
-			_log.finest("Spawned Mob Id: " + _template.getNpcId() + " , at: X: " + mob.getX() + " Y: " + mob.getY() + " Z: " + mob.getZ());
+			_log.finest("Spawned Mob Id: " + _template.getId() + " , at: X: " + mob.getX() + " Y: " + mob.getY() + " Z: " + mob.getZ());
 		}
 		// Increase the current number of L2NpcInstance managed by this L2Spawn
 		_currentCount++;
@@ -663,7 +666,7 @@ public class L2Spawn implements IPositionable
 	@Override
 	public String toString()
 	{
-		return "L2Spawn [_template=" + getNpcid() + ", _locX=" + getX() + ", _locY=" + getY() + ", _locZ=" + getZ() + ", _heading=" + getHeading() + "]";
+		return "L2Spawn [_template=" + getId() + ", _locX=" + getX() + ", _locY=" + getY() + ", _locZ=" + getZ() + ", _heading=" + getHeading() + "]";
 	}
 	
 	public final boolean isNoRndWalk()

L2J_Server_BETA/java/com/l2jserver/gameserver/model/ShortCuts.java

@@ -125,9 +125,9 @@ public class ShortCuts
 			
 			if ((item != null) && (item.getItemType() == L2EtcItemType.SHOT))
 			{
-				if (_owner.removeAutoSoulShot(item.getItemId()))
+				if (_owner.removeAutoSoulShot(item.getId()))
 				{
-					_owner.sendPacket(new ExAutoSoulShot(item.getItemId(), 0));
+					_owner.sendPacket(new ExAutoSoulShot(item.getId(), 0));
 				}
 			}
 		}

L2J_Server_BETA/java/com/l2jserver/gameserver/model/TempItem.java

@@ -40,7 +40,7 @@ public final class TempItem
 	public TempItem(L2ItemInstance item, int quantity)
 	{
 		super();
-		_itemId = item.getItemId();
+		_itemId = item.getId();
 		_quantity = quantity;
 		_itemName = item.getItem().getName();
 		_referencePrice = item.getReferencePrice();

L2J_Server_BETA/java/com/l2jserver/gameserver/model/TimeStamp.java

@@ -68,7 +68,7 @@ public class TimeStamp
 	 */
 	public TimeStamp(L2ItemInstance item, long reuse)
 	{
-		_id1 = item.getItemId();
+		_id1 = item.getId();
 		_id2 = item.getObjectId();
 		_reuse = reuse;
 		_stamp = System.currentTimeMillis() + reuse;
@@ -82,7 +82,7 @@ public class TimeStamp
 	 */
 	public TimeStamp(L2ItemInstance item, long reuse, long systime)
 	{
-		_id1 = item.getItemId();
+		_id1 = item.getId();
 		_id2 = item.getObjectId();
 		_reuse = reuse;
 		_stamp = systime;

L2J_Server_BETA/java/com/l2jserver/gameserver/model/TradeList.java

@@ -152,7 +152,7 @@ public class TradeList
 		{
 			for (TradeItem exclItem : _items)
 			{
-				if (exclItem.getItem().getItemId() == item.getItemId())
+				if (exclItem.getItem().getItemId() == item.getId())
 				{
 					if (item.getCount() <= exclItem.getCount())
 					{
@@ -225,7 +225,7 @@ public class TradeList
 			return null;
 		}
 		
-		if (!getOwner().getInventory().canManipulateWithItemId(item.getItemId()))
+		if (!getOwner().getInventory().canManipulateWithItemId(item.getId()))
 		{
 			_log.warning(_owner.getName() + ": Attempt to add an item that can't manipualte!");
 			return null;
@@ -989,7 +989,7 @@ public class TradeList
 					continue;
 				}
 			}
-			if (oldItem.getItemId() != item.getItemId())
+			if (oldItem.getId() != item.getItemId())
 			{
 				Util.handleIllegalPlayerAction(player, player + " is cheating with sell items", Config.DEFAULT_PUNISH);
 				return false;

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/L2Character.java

@@ -5629,7 +5629,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder
 			if (isPlayer())
 			{
 				// TODO: Unhardcode it!
-				if ((oldSkill instanceof L2SkillSummon) && (oldSkill.getId() == 710) && hasSummon() && (getSummon().getNpcId() == 14870))
+				if ((oldSkill instanceof L2SkillSummon) && (oldSkill.getId() == 710) && hasSummon() && (getSummon().getId() == 14870))
 				{
 					getActingPlayer().getSummon().unSummon(getActingPlayer());
 				}

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/L2Decoy.java

@@ -109,7 +109,7 @@ public abstract class L2Decoy extends L2Character
 	
 	public final int getNpcId()
 	{
-		return getTemplate().getNpcId();
+		return getTemplate().getId();
 	}
 	
 	@Override

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

@@ -531,11 +531,13 @@ public class L2Npc extends L2Character
 	}
 	
 	/**
-	 * @return the generic Identifier of this L2NpcInstance contained in the L2NpcTemplate.
+	 * Gets the NPC ID.
+	 * @return the NPC ID
 	 */
-	public int getNpcId()
+	@Override
+	public int getId()
 	{
-		return getTemplate().getNpcId();
+		return getTemplate().getId();
 	}
 	
 	@Override
@@ -960,7 +962,7 @@ public class L2Npc extends L2Character
 				}
 				else
 				{
-					_log.info(getClass().getSimpleName() + ": Unknown NPC bypass: \"" + command + "\" NpcId: " + getNpcId());
+					_log.info(getClass().getSimpleName() + ": Unknown NPC bypass: \"" + command + "\" NpcId: " + getId());
 				}
 			}
 		}
@@ -1106,7 +1108,7 @@ public class L2Npc extends L2Character
 	 */
 	private boolean showPkDenyChatWindow(L2PcInstance player, String type)
 	{
-		String html = HtmCache.getInstance().getHtm(player.getHtmlPrefix(), "data/html/" + type + "/" + getNpcId() + "-pk.htm");
+		String html = HtmCache.getInstance().getHtm(player.getHtmlPrefix(), "data/html/" + type + "/" + getId() + "-pk.htm");
 		
 		if (html != null)
 		{
@@ -1133,7 +1135,7 @@ public class L2Npc extends L2Character
 	 */
 	public void showChatWindow(L2PcInstance player, int val)
 	{
-		if (Config.NON_TALKING_NPCS.contains(getNpcId()))
+		if (Config.NON_TALKING_NPCS.contains(getId()))
 		{
 			player.sendPacket(ActionFailed.STATIC_PACKET);
 			return;
@@ -1180,7 +1182,7 @@ public class L2Npc extends L2Character
 			return;
 		}
 		
-		int npcId = getTemplate().getNpcId();
+		int npcId = getTemplate().getId();
 		
 		/* For use with Seven Signs implementation */
 		String filename = SevenSigns.SEVEN_SIGNS_HTML_PATH;
@@ -1567,7 +1569,7 @@ public class L2Npc extends L2Character
 	@Override
 	public String toString()
 	{
-		return getClass().getSimpleName() + ":" + getName() + "(" + getNpcId() + ")" + "[" + getObjectId() + "]";
+		return getClass().getSimpleName() + ":" + getName() + "(" + getId() + ")" + "[" + getObjectId() + "]";
 	}
 	
 	public boolean isDecayed()
@@ -1672,7 +1674,7 @@ public class L2Npc extends L2Character
 	
 	public void showNoTeachHtml(L2PcInstance player)
 	{
-		int npcId = getNpcId();
+		int npcId = getId();
 		String html = "";
 		
 		if (this instanceof L2WarehouseInstance)
@@ -1905,6 +1907,6 @@ public class L2Npc extends L2Character
 	@Override
 	public boolean isInCategory(CategoryType type)
 	{
-		return CategoryData.getInstance().isInCategory(type, getNpcId());
+		return CategoryData.getInstance().isInCategory(type, getId());
 	}
 }

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/L2Summon.java

@@ -297,9 +297,14 @@ public abstract class L2Summon extends L2Playable
 		return _owner;
 	}
 	
-	public final int getNpcId()
+	/**
+	 * Gets the summon ID.
+	 * @return the summon ID
+	 */
+	@Override
+	public final int getId()
 	{
-		return getTemplate().getNpcId();
+		return getTemplate().getId();
 	}
 	
 	public short getSoulShotsPerHit()
@@ -971,7 +976,7 @@ public abstract class L2Summon extends L2Playable
 	@Override
 	public String toString()
 	{
-		return super.toString() + "(" + getNpcId() + ") Owner: " + getOwner();
+		return super.toString() + "(" + getId() + ") Owner: " + getOwner();
 	}
 	
 	@Override
@@ -1034,7 +1039,7 @@ public abstract class L2Summon extends L2Playable
 		}
 		
 		// Sin eater, Big Boom, Wyvern can't attack with attack button.
-		final int npcId = getNpcId();
+		final int npcId = getId();
 		if (Util.contains(PASSIVE_SUMMONS, npcId))
 		{
 			getOwner().sendPacket(ActionFailed.STATIC_PACKET);
@@ -1227,6 +1232,6 @@ public abstract class L2Summon extends L2Playable
 	@Override
 	public boolean isInCategory(CategoryType type)
 	{
-		return CategoryData.getInstance().isInCategory(type, getNpcId());
+		return CategoryData.getInstance().isInCategory(type, getId());
 	}
 }

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2AirShipInstance.java

@@ -32,7 +32,7 @@ import com.l2jserver.gameserver.util.Point3D;
 
 /**
  * Flying airships. Very similar to Maktakien boats (see L2BoatInstance) but these do fly :P
- * @author DrHouse, reworked by DS
+ * @author DrHouse, DS
  */
 public class L2AirShipInstance extends L2Vehicle
 {
@@ -104,6 +104,12 @@ public class L2AirShipInstance extends L2Vehicle
 		
 	}
 	
+	@Override
+	public int getId()
+	{
+		return 0;
+	}
+	
 	@Override
 	public boolean moveToNextRoutePoint()
 	{

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

@@ -670,7 +670,7 @@ public final class L2AuctioneerInstance extends L2Npc
 		NpcHtmlMessage html = new NpcHtmlMessage(1);
 		html.setFile(player.getHtmlPrefix(), filename);
 		html.replace("%objectId%", String.valueOf(getObjectId()));
-		html.replace("%npcId%", String.valueOf(getNpcId()));
+		html.replace("%npcId%", String.valueOf(getId()));
 		html.replace("%npcname%", getName());
 		player.sendPacket(html);
 	}

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2BabyPetInstance.java

@@ -73,10 +73,10 @@ public final class L2BabyPetInstance extends L2PetInstance
 		
 		L2Skill skill;
 		double healPower = 0;
-		for (L2PetSkillLearn psl : PetDataTable.getInstance().getPetData(getNpcId()).getAvailableSkills())
+		for (L2PetSkillLearn psl : PetDataTable.getInstance().getPetData(getId()).getAvailableSkills())
 		{
 			int id = psl.getSkillId();
-			int lvl = PetDataTable.getInstance().getPetData(getNpcId()).getAvailableLevel(id, getLevel());
+			int lvl = PetDataTable.getInstance().getPetData(getId()).getAvailableLevel(id, getLevel());
 			if (lvl == 0)
 			{
 				continue;
@@ -261,7 +261,7 @@ public final class L2BabyPetInstance extends L2PetInstance
 					 * If the owner's HP is more than 80% for Baby Pets and 70% for Improved Baby pets, do nothing. If the owner's HP is very low, under 15% for Baby pets and under 30% for Improved Baby Pets, have 75% chances of using a strong heal. Otherwise, have 25% chances for weak heal.
 					 */
 					final double hpPercent = owner.getCurrentHp() / owner.getMaxHp();
-					final boolean isImprovedBaby = PetDataTable.isUpgradeBabyPetGroup(getNpcId());
+					final boolean isImprovedBaby = PetDataTable.isUpgradeBabyPetGroup(getId());
 					if ((isImprovedBaby && (hpPercent < 0.3)) || (!isImprovedBaby && (hpPercent < 0.15)))
 					{
 						skill = _majorHeal.getSkill();

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2BoatInstance.java

@@ -29,7 +29,7 @@ import com.l2jserver.gameserver.network.serverpackets.VehicleInfo;
 import com.l2jserver.gameserver.network.serverpackets.VehicleStarted;
 
 /**
- * @author Maktakien, reworked by DS
+ * @author Maktakien, DS
  */
 public class L2BoatInstance extends L2Vehicle
 {
@@ -48,6 +48,12 @@ public class L2BoatInstance extends L2Vehicle
 		return true;
 	}
 	
+	@Override
+	public int getId()
+	{
+		return 0;
+	}
+	
 	@Override
 	public boolean moveToNextRoutePoint()
 	{

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2ChestInstance.java

@@ -76,7 +76,7 @@ public final class L2ChestInstance extends L2MonsterInstance
 	@Override
 	public void doItemDrop(L2NpcTemplate npcTemplate, L2Character lastAttacker)
 	{
-		int id = getTemplate().getNpcId();
+		int id = getTemplate().getId();
 		
 		if (!_specialDrop)
 		{

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

@@ -1426,7 +1426,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
 			else if (actualCommand.equalsIgnoreCase("list_back"))
 			{
 				NpcHtmlMessage html = new NpcHtmlMessage(1);
-				String file = "data/html/clanHallManager/chamberlain-" + getNpcId() + ".htm";
+				String file = "data/html/clanHallManager/chamberlain-" + getId() + ".htm";
 				if (!HtmCache.getInstance().isLoadable(file))
 				{
 					file = "data/html/clanHallManager/chamberlain.htm";
@@ -1462,7 +1462,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
 	private void sendHtmlMessage(L2PcInstance player, NpcHtmlMessage html)
 	{
 		html.replace("%objectId%", String.valueOf(getObjectId()));
-		html.replace("%npcId%", String.valueOf(getNpcId()));
+		html.replace("%npcId%", String.valueOf(getId()));
 		player.sendPacket(html);
 	}
 	
@@ -1475,7 +1475,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
 		int condition = validateCondition(player);
 		if (condition == COND_OWNER)
 		{
-			filename = "data/html/clanHallManager/chamberlain-" + getNpcId() + ".htm";
+			filename = "data/html/clanHallManager/chamberlain-" + getId() + ".htm";
 			if (!HtmCache.getInstance().isLoadable(filename))
 			{
 				filename = "data/html/clanHallManager/chamberlain.htm";// Owner message window
@@ -1488,7 +1488,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
 		NpcHtmlMessage html = new NpcHtmlMessage(1);
 		html.setFile(player.getHtmlPrefix(), filename);
 		html.replace("%objectId%", String.valueOf(getObjectId()));
-		html.replace("%npcId%", String.valueOf(getNpcId()));
+		html.replace("%npcId%", String.valueOf(getId()));
 		player.sendPacket(html);
 	}
 	

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2DecoyInstance.java

@@ -77,6 +77,12 @@ public class L2DecoyInstance extends L2Decoy
 		setKnownList(new DecoyKnownList(this));
 	}
 	
+	@Override
+	public int getId()
+	{
+		return 0;
+	}
+	
 	static class DecoyLifetime implements Runnable
 	{
 		private final L2PcInstance _activeChar;

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2DefenderInstance.java

@@ -165,7 +165,7 @@ public class L2DefenderInstance extends L2Attackable
 		_hall = getConquerableHall();
 		if ((_fort == null) && (_castle == null) && (_hall == null))
 		{
-			_log.warning("L2DefenderInstance spawned outside of Fortress, Castle or Siegable hall Zone! NpcId: " + getNpcId() + " x=" + getX() + " y=" + getY() + " z=" + getZ());
+			_log.warning("L2DefenderInstance spawned outside of Fortress, Castle or Siegable hall Zone! NpcId: " + getId() + " x=" + getX() + " y=" + getY() + " z=" + getZ());
 		}
 	}
 	

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2DoorInstance.java

@@ -94,7 +94,7 @@ public class L2DoorInstance extends L2Character
 		
 		if (getGroupName() != null)
 		{
-			DoorTable.addDoorGroup(getGroupName(), getDoorId());
+			DoorTable.addDoorGroup(getGroupName(), getId());
 		}
 		
 		if (isOpenableByTime())
@@ -267,11 +267,13 @@ public class L2DoorInstance extends L2Character
 	}
 	
 	/**
-	 * @return Returns the doorId.
+	 * Gets the door ID.
+	 * @return the door ID
 	 */
-	public int getDoorId()
+	@Override
+	public int getId()
 	{
-		return getTemplate().getDoorId();
+		return getTemplate().getId();
 	}
 	
 	/**
@@ -596,7 +598,7 @@ public class L2DoorInstance extends L2Character
 	@Override
 	public String toString()
 	{
-		return getClass().getSimpleName() + "[" + getTemplate().getDoorId() + "](" + getObjectId() + ")";
+		return getClass().getSimpleName() + "[" + getTemplate().getId() + "](" + getObjectId() + ")";
 	}
 	
 	public String getDoorName()

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

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

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2FestivalGuideInstance.java

@@ -48,7 +48,7 @@ public final class L2FestivalGuideInstance extends L2Npc
 		super(objectId, template);
 		setInstanceType(InstanceType.L2FestivalGiudeInstance);
 		
-		switch (getNpcId())
+		switch (getId())
 		{
 			case 31127:
 			case 31132:

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2FortCommanderInstance.java

@@ -126,7 +126,7 @@ public class L2FortCommanderInstance extends L2DefenderInstance
 			FastList<FortSiegeSpawn> commanders = FortSiegeManager.getInstance().getCommanderSpawnList(getFort().getFortId());
 			for (FortSiegeSpawn spawn2 : commanders)
 			{
-				if (spawn2.getNpcId() == spawn.getNpcid())
+				if (spawn2.getNpcId() == spawn.getId())
 				{
 					NpcStringId npcString = null;
 					switch (spawn2.getId())
@@ -147,7 +147,7 @@ public class L2FortCommanderInstance extends L2DefenderInstance
 					}
 					if (npcString != null)
 					{
-						NpcSay ns = new NpcSay(getObjectId(), Say2.NPC_SHOUT, getNpcId(), npcString);
+						NpcSay ns = new NpcSay(getObjectId(), Say2.NPC_SHOUT, getId(), npcString);
 						if (npcString.getParamCount() == 1)
 						{
 							ns.addStringParameter(attacker.getName());

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

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

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2FortEnvoyInstance.java

@@ -66,7 +66,7 @@ public class L2FortEnvoyInstance extends L2Npc
 		NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
 		html.setFile(player.getHtmlPrefix(), filePath);
 		html.replace("%objectId%", String.valueOf(getObjectId()));
-		html.replace("%castleName%", String.valueOf(fortress.getCastleByAmbassador(getNpcId()).getName()));
+		html.replace("%castleName%", String.valueOf(fortress.getCastleByAmbassador(getId()).getName()));
 		player.sendPacket(html);
 	}
 	
@@ -77,7 +77,7 @@ public class L2FortEnvoyInstance extends L2Npc
 		{
 			String param = command.substring(7);
 			Fort fortress = getFort();
-			Castle castle = fortress.getCastleByAmbassador(getNpcId());
+			Castle castle = fortress.getCastleByAmbassador(getId());
 			String filePath;
 			
 			if (castle.getOwnerId() == 0)

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

@@ -201,7 +201,7 @@ public class L2FortLogisticsInstance extends L2MerchantInstance
 		NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
 		html.setFile(player.getHtmlPrefix(), filename);
 		html.replace("%objectId%", String.valueOf(getObjectId()));
-		html.replace("%npcId%", String.valueOf(getNpcId()));
+		html.replace("%npcId%", String.valueOf(getId()));
 		if (getFort().getOwnerClan() != null)
 		{
 			html.replace("%clanname%", getFort().getOwnerClan().getName());

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

@@ -62,7 +62,7 @@ public class L2FortManagerInstance extends L2MerchantInstance
 	private void sendHtmlMessage(L2PcInstance player, NpcHtmlMessage html)
 	{
 		html.replace("%objectId%", String.valueOf(getObjectId()));
-		html.replace("%npcId%", String.valueOf(getNpcId()));
+		html.replace("%npcId%", String.valueOf(getId()));
 		player.sendPacket(html);
 	}
 	
@@ -213,7 +213,7 @@ public class L2FortManagerInstance extends L2MerchantInstance
 					else
 					{
 						NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
-						html.setFile(player.getHtmlPrefix(), "data/html/fortress/" + getTemplate().getNpcId() + "-d.htm");
+						html.setFile(player.getHtmlPrefix(), "data/html/fortress/" + getTemplate().getId() + "-d.htm");
 						html.replace("%objectId%", String.valueOf(getObjectId()));
 						html.replace("%npcname%", getName());
 						player.sendPacket(html);
@@ -301,7 +301,7 @@ public class L2FortManagerInstance extends L2MerchantInstance
 					}
 					else
 					{
-						html.setFile(player.getHtmlPrefix(), "data/html/fortress/" + getNpcId() + "-t" + getFort().getFunction(Fort.FUNC_TELEPORT).getLvl() + ".htm");
+						html.setFile(player.getHtmlPrefix(), "data/html/fortress/" + getId() + "-t" + getFort().getFunction(Fort.FUNC_TELEPORT).getLvl() + ".htm");
 					}
 					sendHtmlMessage(player, html);
 				}

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2FortSiegeNpcInstance.java

@@ -53,7 +53,7 @@ public class L2FortSiegeNpcInstance extends L2Npc
 		NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
 		html.setFile(player.getHtmlPrefix(), filename);
 		html.replace("%objectId%", String.valueOf(getObjectId()));
-		html.replace("%npcId%", String.valueOf(getNpcId()));
+		html.replace("%npcId%", String.valueOf(getId()));
 		if (getFort().getOwnerClan() != null)
 		{
 			html.replace("%clanname%", getFort().getOwnerClan().getName());

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2FortSupportCaptainInstance.java

@@ -212,7 +212,7 @@ public class L2FortSupportCaptainInstance extends L2MerchantInstance implements
 		NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
 		html.setFile(player.getHtmlPrefix(), filename);
 		html.replace("%objectId%", String.valueOf(getObjectId()));
-		html.replace("%npcId%", String.valueOf(getNpcId()));
+		html.replace("%npcId%", String.valueOf(getId()));
 		if (getFort().getOwnerClan() != null)
 		{
 			html.replace("%clanname%", getFort().getOwnerClan().getName());

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2GrandBossInstance.java

@@ -87,19 +87,19 @@ public final class L2GrandBossInstance extends L2MonsterInstance
 			{
 				for (L2PcInstance member : player.getParty().getMembers())
 				{
-					RaidBossPointsManager.getInstance().addPoints(member, getNpcId(), (getLevel() / 2) + Rnd.get(-5, 5));
+					RaidBossPointsManager.getInstance().addPoints(member, getId(), (getLevel() / 2) + Rnd.get(-5, 5));
 					if (member.isNoble())
 					{
-						Hero.getInstance().setRBkilled(member.getObjectId(), getNpcId());
+						Hero.getInstance().setRBkilled(member.getObjectId(), getId());
 					}
 				}
 			}
 			else
 			{
-				RaidBossPointsManager.getInstance().addPoints(player, getNpcId(), (getLevel() / 2) + Rnd.get(-5, 5));
+				RaidBossPointsManager.getInstance().addPoints(player, getId(), (getLevel() / 2) + Rnd.get(-5, 5));
 				if (player.isNoble())
 				{
-					Hero.getInstance().setRBkilled(player.getObjectId(), getNpcId());
+					Hero.getInstance().setRBkilled(player.getObjectId(), getId());
 				}
 			}
 		}

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

@@ -92,9 +92,9 @@ public class L2MerchantInstance extends L2NpcInstance
 			return;
 		}
 		
-		if (!buyList.isNpcAllowed(getNpcId()))
+		if (!buyList.isNpcAllowed(getId()))
 		{
-			_log.warning("Npc not allowed in BuyList! BuyListId:" + val + " NpcId:" + getNpcId());
+			_log.warning("Npc not allowed in BuyList! BuyListId:" + val + " NpcId:" + getId());
 			player.sendPacket(ActionFailed.STATIC_PACKET);
 			return;
 		}

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2MerchantSummonInstance.java

@@ -217,9 +217,9 @@ public class L2MerchantSummonInstance extends L2ServitorInstance
 			return;
 		}
 		
-		if (!buyList.isNpcAllowed(getNpcId()))
+		if (!buyList.isNpcAllowed(getId()))
 		{
-			_log.warning("Npc not allowed in BuyList! BuyListId:" + val + " NpcId:" + getNpcId());
+			_log.warning("Npc not allowed in BuyList! BuyListId:" + val + " NpcId:" + getId());
 			player.sendPacket(ActionFailed.STATIC_PACKET);
 			return;
 		}
@@ -253,7 +253,7 @@ public class L2MerchantSummonInstance extends L2ServitorInstance
 	private void showMessageWindow(L2PcInstance player)
 	{
 		player.sendPacket(ActionFailed.STATIC_PACKET);
-		final String filename = "data/html/merchant/" + getNpcId() + ".htm";
+		final String filename = "data/html/merchant/" + getId() + ".htm";
 		final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
 		html.setFile(player.getHtmlPrefix(), filename);
 		html.replace("%objectId%", String.valueOf(getObjectId()));

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2NpcBufferInstance.java

@@ -103,7 +103,7 @@ public class L2NpcBufferInstance extends L2Npc
 			target = player.getSummon();
 		}
 		
-		int npcId = getNpcId();
+		int npcId = getId();
 		if (command.startsWith("Chat"))
 		{
 			int val = Integer.parseInt(command.substring(5));

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2NpcInstance.java

@@ -76,7 +76,7 @@ public class L2NpcInstance extends L2Npc
 			_log.fine("SkillList activated on: " + npc.getObjectId());
 		}
 		
-		final int npcId = npc.getTemplate().getNpcId();
+		final int npcId = npc.getTemplate().getId();
 		if (npcId == 32611) // Tolonis (Officer)
 		{
 			final List<L2SkillLearn> skills = SkillTreesData.getInstance().getAvailableCollectSkills(player);

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

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

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

@@ -1532,7 +1532,7 @@ public final class L2PcInstance extends L2Playable
 			{
 				continue;
 			}
-			final int questId = qs.getQuest().getQuestIntId();
+			final int questId = qs.getQuest().getId();
 			if ((questId > 19999) || (questId < 1))
 			{
 				continue;
@@ -1680,7 +1680,7 @@ public final class L2PcInstance extends L2Playable
 				if ((object instanceof L2Npc) && isInsideRadius(object, L2Npc.INTERACTION_DISTANCE, false, false))
 				{
 					L2Npc npc = (L2Npc) object;
-					QuestState[] states = getQuestsForTalk(npc.getNpcId());
+					QuestState[] states = getQuestsForTalk(npc.getId());
 					
 					if (states != null)
 					{
@@ -3535,13 +3535,13 @@ public final class L2PcInstance extends L2Playable
 			{
 				dropItem("InvDrop", newitem, null, true, true);
 			}
-			else if (CursedWeaponsManager.getInstance().isCursed(newitem.getItemId()))
+			else if (CursedWeaponsManager.getInstance().isCursed(newitem.getId()))
 			{
 				CursedWeaponsManager.getInstance().activate(this, newitem);
 			}
 			
 			// Combat Flag
-			else if (FortSiegeManager.getInstance().isCombat(item.getItemId()))
+			else if (FortSiegeManager.getInstance().isCombat(item.getId()))
 			{
 				if (FortSiegeManager.getInstance().activateCombatFlag(this, item))
 				{
@@ -3550,9 +3550,9 @@ public final class L2PcInstance extends L2Playable
 				}
 			}
 			// Territory Ward
-			else if ((item.getItemId() >= 13560) && (item.getItemId() <= 13568))
+			else if ((item.getId() >= 13560) && (item.getId() <= 13568))
 			{
-				TerritoryWard ward = TerritoryWarManager.getInstance().getTerritoryWard(item.getItemId() - 13479);
+				TerritoryWard ward = TerritoryWarManager.getInstance().getTerritoryWard(item.getId() - 13479);
 				if (ward != null)
 				{
 					ward.activate(this, item);
@@ -3629,7 +3629,7 @@ public final class L2PcInstance extends L2Playable
 					IItemHandler handler = ItemHandler.getInstance().getHandler(herb.getEtcItem());
 					if (handler == null)
 					{
-						_log.warning("No item handler registered for Herb - item ID " + herb.getItemId() + ".");
+						_log.warning("No item handler registered for Herb - item ID " + herb.getId() + ".");
 					}
 					else
 					{
@@ -3656,11 +3656,11 @@ public final class L2PcInstance extends L2Playable
 				{
 					dropItem("InvDrop", createdItem, null, true);
 				}
-				else if (CursedWeaponsManager.getInstance().isCursed(createdItem.getItemId()))
+				else if (CursedWeaponsManager.getInstance().isCursed(createdItem.getId()))
 				{
 					CursedWeaponsManager.getInstance().activate(this, createdItem);
 				}
-				else if (FortSiegeManager.getInstance().isCombat(createdItem.getItemId()))
+				else if (FortSiegeManager.getInstance().isCombat(createdItem.getId()))
 				{
 					if (FortSiegeManager.getInstance().activateCombatFlag(this, item))
 					{
@@ -3669,9 +3669,9 @@ public final class L2PcInstance extends L2Playable
 					}
 				}
 				// Territory Ward
-				else if ((createdItem.getItemId() >= 13560) && (createdItem.getItemId() <= 13568))
+				else if ((createdItem.getId() >= 13560) && (createdItem.getId() <= 13568))
 				{
-					TerritoryWard ward = TerritoryWarManager.getInstance().getTerritoryWard(createdItem.getItemId() - 13479);
+					TerritoryWard ward = TerritoryWarManager.getInstance().getTerritoryWard(createdItem.getId() - 13479);
 					if (ward != null)
 					{
 						ward.activate(this, createdItem);
@@ -4048,7 +4048,7 @@ public final class L2PcInstance extends L2Playable
 		
 		item.dropMe(this, (getX() + Rnd.get(50)) - 25, (getY() + Rnd.get(50)) - 25, getZ() + 20);
 		
-		if ((Config.AUTODESTROY_ITEM_AFTER > 0) && Config.DESTROY_DROPPED_PLAYER_ITEM && !Config.LIST_PROTECTED_ITEMS.contains(item.getItemId()))
+		if ((Config.AUTODESTROY_ITEM_AFTER > 0) && Config.DESTROY_DROPPED_PLAYER_ITEM && !Config.LIST_PROTECTED_ITEMS.contains(item.getId()))
 		{
 			if ((item.isEquipable() && Config.DESTROY_EQUIPABLE_PLAYER_ITEM) || !item.isEquipable())
 			{
@@ -4142,7 +4142,7 @@ public final class L2PcInstance extends L2Playable
 		
 		item.dropMe(this, x, y, z);
 		
-		if ((Config.AUTODESTROY_ITEM_AFTER > 0) && Config.DESTROY_DROPPED_PLAYER_ITEM && !Config.LIST_PROTECTED_ITEMS.contains(item.getItemId()))
+		if ((Config.AUTODESTROY_ITEM_AFTER > 0) && Config.DESTROY_DROPPED_PLAYER_ITEM && !Config.LIST_PROTECTED_ITEMS.contains(item.getId()))
 		{
 			if ((item.isEquipable() && Config.DESTROY_EQUIPABLE_PLAYER_ITEM) || !item.isEquipable())
 			{
@@ -4821,7 +4821,7 @@ public final class L2PcInstance extends L2Playable
 			
 			if ((target.getOwnerId() != 0) && (target.getOwnerId() != getObjectId()) && !isInLooterParty(target.getOwnerId()))
 			{
-				if (target.getItemId() == PcInventory.ADENA_ID)
+				if (target.getId() == PcInventory.ADENA_ID)
 				{
 					smsg = SystemMessage.getSystemMessage(SystemMessageId.FAILED_TO_PICKUP_S1_ADENA);
 					smsg.addItemNumber(target.getCount());
@@ -4843,7 +4843,7 @@ public final class L2PcInstance extends L2Playable
 			}
 			
 			// You can pickup only 1 combat flag
-			if (FortSiegeManager.getInstance().isCombat(target.getItemId()))
+			if (FortSiegeManager.getInstance().isCombat(target.getId()))
 			{
 				if (!FortSiegeManager.getInstance().checkIfCanPickup(this))
 				{
@@ -4870,7 +4870,7 @@ public final class L2PcInstance extends L2Playable
 			IItemHandler handler = ItemHandler.getInstance().getHandler(target.getEtcItem());
 			if (handler == null)
 			{
-				_log.fine("No item handler registered for item ID " + target.getItemId() + ".");
+				_log.fine("No item handler registered for item ID " + target.getId() + ".");
 			}
 			else
 			{
@@ -4879,11 +4879,11 @@ public final class L2PcInstance extends L2Playable
 			ItemTable.getInstance().destroyItem("Consume", target, this, null);
 		}
 		// Cursed Weapons are not distributed
-		else if (CursedWeaponsManager.getInstance().isCursed(target.getItemId()))
+		else if (CursedWeaponsManager.getInstance().isCursed(target.getId()))
 		{
 			addItem("Pickup", target, null, true);
 		}
-		else if (FortSiegeManager.getInstance().isCombat(target.getItemId()))
+		else if (FortSiegeManager.getInstance().isCombat(target.getId()))
 		{
 			addItem("Pickup", target, null, true);
 		}
@@ -4897,14 +4897,14 @@ public final class L2PcInstance extends L2Playable
 					smsg = SystemMessage.getSystemMessage(SystemMessageId.ANNOUNCEMENT_C1_PICKED_UP_S2_S3);
 					smsg.addPcName(this);
 					smsg.addNumber(target.getEnchantLevel());
-					smsg.addItemName(target.getItemId());
+					smsg.addItemName(target.getId());
 					broadcastPacket(smsg, 1400);
 				}
 				else
 				{
 					smsg = SystemMessage.getSystemMessage(SystemMessageId.ANNOUNCEMENT_C1_PICKED_UP_S2);
 					smsg.addPcName(this);
-					smsg.addItemName(target.getItemId());
+					smsg.addItemName(target.getId());
 					broadcastPacket(smsg, 1400);
 				}
 			}
@@ -4914,7 +4914,7 @@ public final class L2PcInstance extends L2Playable
 			{
 				getParty().distributeItem(this, target);
 			}
-			else if ((target.getItemId() == PcInventory.ADENA_ID) && (getInventory().getAdenaInstance() != null))
+			else if ((target.getId() == PcInventory.ADENA_ID) && (getInventory().getAdenaInstance() != null))
 			{
 				addAdena("Pickup", target.getCount(), null, true);
 				ItemTable.getInstance().destroyItem("Pickup", target, this, null);
@@ -5690,11 +5690,11 @@ public final class L2PcInstance extends L2Playable
 					// Don't drop
 					if (itemDrop.isShadowItem() || // Dont drop Shadow Items
 					itemDrop.isTimeLimitedItem() || // Dont drop Time Limited Items
-					!itemDrop.isDropable() || (itemDrop.getItemId() == PcInventory.ADENA_ID) || // Adena
+					!itemDrop.isDropable() || (itemDrop.getId() == PcInventory.ADENA_ID) || // Adena
 					(itemDrop.getItem().getType2() == L2Item.TYPE2_QUEST) || // Quest Items
-					(hasSummon() && (getSummon().getControlObjectId() == itemDrop.getItemId())) || // Control Item of active pet
-					(Arrays.binarySearch(Config.KARMA_LIST_NONDROPPABLE_ITEMS, itemDrop.getItemId()) >= 0) || // Item listed in the non droppable item list
-					(Arrays.binarySearch(Config.KARMA_LIST_NONDROPPABLE_PET_ITEMS, itemDrop.getItemId()) >= 0 // Item listed in the non droppable pet item list
+					(hasSummon() && (getSummon().getControlObjectId() == itemDrop.getId())) || // Control Item of active pet
+					(Arrays.binarySearch(Config.KARMA_LIST_NONDROPPABLE_ITEMS, itemDrop.getId()) >= 0) || // Item listed in the non droppable item list
+					(Arrays.binarySearch(Config.KARMA_LIST_NONDROPPABLE_PET_ITEMS, itemDrop.getId()) >= 0 // Item listed in the non droppable pet item list
 					))
 					{
 						continue;
@@ -5718,11 +5718,11 @@ public final class L2PcInstance extends L2Playable
 						
 						if (isKarmaDrop)
 						{
-							_log.warning(getName() + " has karma and dropped id = " + itemDrop.getItemId() + ", count = " + itemDrop.getCount());
+							_log.warning(getName() + " has karma and dropped id = " + itemDrop.getId() + ", count = " + itemDrop.getCount());
 						}
 						else
 						{
-							_log.warning(getName() + " dropped id = " + itemDrop.getItemId() + ", count = " + itemDrop.getCount());
+							_log.warning(getName() + " dropped id = " + itemDrop.getId() + ", count = " + itemDrop.getCount());
 						}
 						
 						if (++dropCount >= dropLimit)
@@ -6695,10 +6695,10 @@ public final class L2PcInstance extends L2Playable
 		}
 		
 		stopAllToggles();
-		setMount(pet.getNpcId(), pet.getLevel());
+		setMount(pet.getId(), pet.getLevel());
 		setMountObjectID(pet.getControlObjectId());
 		clearPetData();
-		startFeed(pet.getNpcId());
+		startFeed(pet.getId());
 		broadcastPacket(new Ride(this));
 		
 		// Notify self and others about speed change
@@ -8274,7 +8274,7 @@ public final class L2PcInstance extends L2Playable
 						isInInventory = false;
 					}
 					
-					if ((item != null) && (item.getItemId() == itemId) && (item.getReuseDelay() > 0))
+					if ((item != null) && (item.getId() == itemId) && (item.getReuseDelay() > 0))
 					{
 						remainingTime = systime - System.currentTimeMillis();
 						// Hardcoded to 10 seconds.
@@ -11370,7 +11370,7 @@ public final class L2PcInstance extends L2Playable
 			return false;
 		}
 		
-		if (CursedWeaponsManager.getInstance().isCursed(item.getItemId()))
+		if (CursedWeaponsManager.getInstance().isCursed(item.getId()))
 		{
 			// can not trade a cursed weapon
 			return false;
@@ -12003,7 +12003,7 @@ public final class L2PcInstance extends L2Playable
 			
 			if (_lure != null)
 			{
-				int lureid = _lure.getItemId();
+				int lureid = _lure.getId();
 				isNoob = _fish.getFishGrade() == 0;
 				isUpperGrade = _fish.getFishGrade() == 2;
 				if ((lureid == 6519) || (lureid == 6522) || (lureid == 6525) || (lureid == 8505) || (lureid == 8508) || (lureid == 8511))
@@ -12025,7 +12025,7 @@ public final class L2PcInstance extends L2Playable
 	
 	private int getRandomFishGrade()
 	{
-		switch (_lure.getItemId())
+		switch (_lure.getId())
 		{
 			case 7807: // green for beginners
 			case 7808: // purple for beginners
@@ -12049,7 +12049,7 @@ public final class L2PcInstance extends L2Playable
 		switch (group)
 		{
 			case 0: // fish for novices
-				switch (_lure.getItemId())
+				switch (_lure.getId())
 				{
 					case 7807: // green lure, preferred by fast-moving (nimble) fish (type 5)
 						if (check <= 54)
@@ -12110,7 +12110,7 @@ public final class L2PcInstance extends L2Playable
 				}
 				break;
 			case 1: // normal fish
-				switch (_lure.getItemId())
+				switch (_lure.getId())
 				{
 					case 7610:
 					case 7611:
@@ -12201,7 +12201,7 @@ public final class L2PcInstance extends L2Playable
 				}
 				break;
 			case 2: // upper grade fish, luminous lure
-				switch (_lure.getItemId())
+				switch (_lure.getId())
 				{
 					case 8506: // green lure, preferred by fast-moving (nimble) fish (type 8)
 						if (check <= 54)
@@ -14987,4 +14987,10 @@ public final class L2PcInstance extends L2Playable
 	{
 		return CategoryData.getInstance().isInCategory(type, getClassId().getId());
 	}
+	
+	@Override
+	public int getId()
+	{
+		return 0;
+	}
 }

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2PetInstance.java

@@ -108,7 +108,7 @@ public class L2PetInstance extends L2Summon
 	{
 		if (_leveldata == null)
 		{
-			_leveldata = PetDataTable.getInstance().getPetLevelData(getTemplate().getNpcId(), getStat().getLevel());
+			_leveldata = PetDataTable.getInstance().getPetLevelData(getTemplate().getId(), getStat().getLevel());
 		}
 		
 		return _leveldata;
@@ -118,7 +118,7 @@ public class L2PetInstance extends L2Summon
 	{
 		if (_data == null)
 		{
-			_data = PetDataTable.getInstance().getPetData(getTemplate().getNpcId());
+			_data = PetDataTable.getInstance().getPetData(getTemplate().getId());
 		}
 		
 		return _data;
@@ -165,7 +165,7 @@ public class L2PetInstance extends L2Summon
 					if (getCurrentFed() == 0)
 					{
 						// Owl Monk remove PK
-						if ((getTemplate().getNpcId() == 16050) && (getOwner() != null))
+						if ((getTemplate().getId() == 16050) && (getOwner() != null))
 						{
 							getOwner().setPkKills(Math.max(0, getOwner().getPkKills() - Rnd.get(1, 6)));
 						}
@@ -201,7 +201,7 @@ public class L2PetInstance extends L2Summon
 					if (handler != null)
 					{
 						SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.PET_TOOK_S1_BECAUSE_HE_WAS_HUNGRY);
-						sm.addItemName(food.getItemId());
+						sm.addItemName(food.getId());
 						sendPacket(sm);
 						handler.useItem(L2PetInstance.this, food, false);
 					}
@@ -264,7 +264,7 @@ public class L2PetInstance extends L2Summon
 		{
 			return null; // owner has a pet listed in world
 		}
-		final L2PetData data = PetDataTable.getInstance().getPetData(template.getNpcId());
+		final L2PetData data = PetDataTable.getInstance().getPetData(template.getId());
 		
 		L2PetInstance pet = restore(control, template, owner);
 		// add the pet instance to world
@@ -308,12 +308,12 @@ public class L2PetInstance extends L2Summon
 		
 		_controlObjectId = control.getObjectId();
 		
-		getStat().setLevel((byte) Math.max(level, PetDataTable.getInstance().getPetMinLevel(template.getNpcId())));
+		getStat().setLevel((byte) Math.max(level, PetDataTable.getInstance().getPetMinLevel(template.getId())));
 		
 		_inventory = new PetInventory(this);
 		_inventory.restore();
 		
-		int npcId = template.getNpcId();
+		int npcId = template.getId();
 		_mountable = PetDataTable.isMountable(npcId);
 		getPetData();
 		getPetLevelData();
@@ -450,14 +450,14 @@ public class L2PetInstance extends L2Summon
 			if (count > 1)
 			{
 				SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S2_S1_DISAPPEARED);
-				sm.addItemName(item.getItemId());
+				sm.addItemName(item.getId());
 				sm.addItemNumber(count);
 				sendPacket(sm);
 			}
 			else
 			{
 				SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_DISAPPEARED);
-				sm.addItemName(item.getItemId());
+				sm.addItemName(item.getId());
 				sendPacket(sm);
 			}
 		}
@@ -497,14 +497,14 @@ public class L2PetInstance extends L2Summon
 			if (count > 1)
 			{
 				SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S2_S1_DISAPPEARED);
-				sm.addItemName(item.getItemId());
+				sm.addItemName(item.getId());
 				sm.addItemNumber(count);
 				sendPacket(sm);
 			}
 			else
 			{
 				SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_DISAPPEARED);
-				sm.addItemName(item.getItemId());
+				sm.addItemName(item.getId());
 				sendPacket(sm);
 			}
 		}
@@ -541,10 +541,10 @@ public class L2PetInstance extends L2Summon
 		L2ItemInstance target = (L2ItemInstance) object;
 		
 		// Cursed weapons
-		if (CursedWeaponsManager.getInstance().isCursed(target.getItemId()))
+		if (CursedWeaponsManager.getInstance().isCursed(target.getId()))
 		{
 			SystemMessage smsg = SystemMessage.getSystemMessage(SystemMessageId.FAILED_TO_PICKUP_S1);
-			smsg.addItemName(target.getItemId());
+			smsg.addItemName(target.getId());
 			sendPacket(smsg);
 			return;
 		}
@@ -578,7 +578,7 @@ public class L2PetInstance extends L2Summon
 			{
 				sendPacket(ActionFailed.STATIC_PACKET);
 				
-				if (target.getItemId() == PcInventory.ADENA_ID)
+				if (target.getId() == PcInventory.ADENA_ID)
 				{
 					SystemMessage smsg = SystemMessage.getSystemMessage(SystemMessageId.FAILED_TO_PICKUP_S1_ADENA);
 					smsg.addItemNumber(target.getCount());
@@ -587,14 +587,14 @@ public class L2PetInstance extends L2Summon
 				else if (target.getCount() > 1)
 				{
 					SystemMessage smsg = SystemMessage.getSystemMessage(SystemMessageId.FAILED_TO_PICKUP_S2_S1_S);
-					smsg.addItemName(target.getItemId());
+					smsg.addItemName(target.getId());
 					smsg.addItemNumber(target.getCount());
 					sendPacket(smsg);
 				}
 				else
 				{
 					SystemMessage smsg = SystemMessage.getSystemMessage(SystemMessageId.FAILED_TO_PICKUP_S1);
-					smsg.addItemName(target.getItemId());
+					smsg.addItemName(target.getId());
 					sendPacket(smsg);
 				}
 				
@@ -627,7 +627,7 @@ public class L2PetInstance extends L2Summon
 			IItemHandler handler = ItemHandler.getInstance().getHandler(target.getEtcItem());
 			if (handler == null)
 			{
-				_log.fine("No item handler registered for item ID " + target.getItemId() + ".");
+				_log.fine("No item handler registered for item ID " + target.getId() + ".");
 			}
 			else
 			{
@@ -640,7 +640,7 @@ public class L2PetInstance extends L2Summon
 		}
 		else
 		{
-			if (target.getItemId() == PcInventory.ADENA_ID)
+			if (target.getId() == PcInventory.ADENA_ID)
 			{
 				SystemMessage sm2 = SystemMessage.getSystemMessage(SystemMessageId.PET_PICKED_S1_ADENA);
 				sm2.addItemNumber(target.getCount());
@@ -746,7 +746,7 @@ public class L2PetInstance extends L2Summon
 	public L2ItemInstance transferItem(String process, int objectId, long count, Inventory target, L2PcInstance actor, L2Object reference)
 	{
 		L2ItemInstance oldItem = getInventory().getItemByObjectId(objectId);
-		L2ItemInstance playerOldItem = target.getItemByItemId(oldItem.getItemId());
+		L2ItemInstance playerOldItem = target.getItemByItemId(oldItem.getId());
 		L2ItemInstance newItem = getInventory().transferItem(process, objectId, count, target, actor, reference);
 		
 		if (newItem == null)
@@ -875,7 +875,7 @@ public class L2PetInstance extends L2Summon
 			{
 				dropit.getDropProtection().protect(getOwner());
 			}
-			_logPet.finer("Item id to drop: " + dropit.getItemId() + " amount: " + dropit.getCount());
+			_logPet.finer("Item id to drop: " + dropit.getId() + " amount: " + dropit.getCount());
 			dropit.dropMe(this, getX(), getY(), getZ() + 100);
 		}
 	}
@@ -928,7 +928,7 @@ public class L2PetInstance extends L2Summon
 				pet.setName(rset.getString("name"));
 				
 				long exp = rset.getLong("exp");
-				L2PetLevelData info = PetDataTable.getInstance().getPetLevelData(pet.getNpcId(), pet.getLevel());
+				L2PetLevelData info = PetDataTable.getInstance().getPetLevelData(pet.getId(), pet.getLevel());
 				// DS: update experience based by level
 				// Avoiding pet delevels due to exp per level values changed.
 				if ((info != null) && (exp < info.getPetMaxExp()))
@@ -1276,7 +1276,7 @@ public class L2PetInstance extends L2Summon
 	@Override
 	public void addExpAndSp(long addToExp, int addToSp)
 	{
-		if (getNpcId() == 12564)
+		if (getId() == 12564)
 		{
 			getStat().addExpAndSp(Math.round(addToExp * Config.SINEATER_XP_RATE), addToSp);
 		}
@@ -1417,7 +1417,7 @@ public class L2PetInstance extends L2Summon
 		L2ItemInstance weapon = getInventory().getPaperdollItem(Inventory.PAPERDOLL_RHAND);
 		if (weapon != null)
 		{
-			return weapon.getItemId();
+			return weapon.getId();
 		}
 		return 0;
 	}
@@ -1428,7 +1428,7 @@ public class L2PetInstance extends L2Summon
 		L2ItemInstance weapon = getInventory().getPaperdollItem(Inventory.PAPERDOLL_CHEST);
 		if (weapon != null)
 		{
-			return weapon.getItemId();
+			return weapon.getId();
 		}
 		return 0;
 	}
@@ -1438,7 +1438,7 @@ public class L2PetInstance extends L2Summon
 		L2ItemInstance weapon = getInventory().getPaperdollItem(Inventory.PAPERDOLL_NECK);
 		if (weapon != null)
 		{
-			return weapon.getItemId();
+			return weapon.getId();
 		}
 		return 0;
 	}

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

@@ -51,15 +51,15 @@ public class L2PetManagerInstance extends L2MerchantInstance
 	@Override
 	public void showChatWindow(L2PcInstance player)
 	{
-		String filename = "data/html/petmanager/" + getNpcId() + ".htm";
-		if ((getNpcId() == 36478) && player.hasSummon())
+		String filename = "data/html/petmanager/" + getId() + ".htm";
+		if ((getId() == 36478) && player.hasSummon())
 		{
 			filename = "data/html/petmanager/restore-unsummonpet.htm";
 		}
 		
 		NpcHtmlMessage html = new NpcHtmlMessage(1);
 		html.setFile(player.getHtmlPrefix(), filename);
-		if (Config.ALLOW_RENTPET && Config.LIST_PET_RENT_NPC.contains(getNpcId()))
+		if (Config.ALLOW_RENTPET && Config.LIST_PET_RENT_NPC.contains(getId()))
 		{
 			html.replace("_Quest", "_RentPet\">Rent Pet</a><br><a action=\"bypass -h npc_%objectId%_Quest");
 		}
@@ -166,7 +166,7 @@ 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/" + getNpcId() + ".htm");
+			html.setFile(player.getHtmlPrefix(), "data/html/petmanager/" + getId() + ".htm");
 			player.sendPacket(html);
 		}
 		else

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2RaceManagerInstance.java

@@ -313,7 +313,7 @@ public class L2RaceManagerInstance extends L2Npc
 		{
 			return;
 		}
-		int npcId = getTemplate().getNpcId();
+		int npcId = getTemplate().getId();
 		String filename, search;
 		NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
 		filename = getHtmlPath(npcId, 5);
@@ -332,7 +332,7 @@ public class L2RaceManagerInstance extends L2Npc
 	
 	public void showMonsterInfo(L2PcInstance player)
 	{
-		int npcId = getTemplate().getNpcId();
+		int npcId = getTemplate().getId();
 		String filename, search;
 		NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
 		filename = getHtmlPath(npcId, 6);
@@ -354,7 +354,7 @@ public class L2RaceManagerInstance extends L2Npc
 		{
 			return;
 		}
-		int npcId = getTemplate().getNpcId();
+		int npcId = getTemplate().getId();
 		SystemMessage sm;
 		String filename, search, replace;
 		NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2RaidBossInstance.java

@@ -99,19 +99,19 @@ public class L2RaidBossInstance extends L2MonsterInstance
 			{
 				for (L2PcInstance member : player.getParty().getMembers())
 				{
-					RaidBossPointsManager.getInstance().addPoints(member, getNpcId(), (getLevel() / 2) + Rnd.get(-5, 5));
+					RaidBossPointsManager.getInstance().addPoints(member, getId(), (getLevel() / 2) + Rnd.get(-5, 5));
 					if (member.isNoble())
 					{
-						Hero.getInstance().setRBkilled(member.getObjectId(), getNpcId());
+						Hero.getInstance().setRBkilled(member.getObjectId(), getId());
 					}
 				}
 			}
 			else
 			{
-				RaidBossPointsManager.getInstance().addPoints(player, getNpcId(), (getLevel() / 2) + Rnd.get(-5, 5));
+				RaidBossPointsManager.getInstance().addPoints(player, getId(), (getLevel() / 2) + Rnd.get(-5, 5));
 				if (player.isNoble())
 				{
-					Hero.getInstance().setRBkilled(player.getObjectId(), getNpcId());
+					Hero.getInstance().setRBkilled(player.getObjectId(), getId());
 				}
 			}
 		}

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2SepulcherMonsterInstance.java

@@ -46,7 +46,7 @@ public class L2SepulcherMonsterInstance extends L2MonsterInstance
 		super(objectId, template);
 		setInstanceType(InstanceType.L2SepulcherMonsterInstance);
 		setShowSummonAnimation(true);
-		switch (template.getNpcId())
+		switch (template.getId())
 		{
 			case 25339:
 			case 25342:
@@ -60,7 +60,7 @@ public class L2SepulcherMonsterInstance extends L2MonsterInstance
 	public void onSpawn()
 	{
 		setShowSummonAnimation(false);
-		switch (getNpcId())
+		switch (getId())
 		{
 			case 18150:
 			case 18151:
@@ -139,7 +139,7 @@ public class L2SepulcherMonsterInstance extends L2MonsterInstance
 			return false;
 		}
 		
-		switch (getNpcId())
+		switch (getId())
 		{
 			case 18120:
 			case 18121:
@@ -291,7 +291,7 @@ public class L2SepulcherMonsterInstance extends L2MonsterInstance
 		int cupId = 0;
 		int oldBrooch = 7262;
 		
-		switch (getNpcId())
+		switch (getId())
 		{
 			case 25339:
 				cupId = 7256;
@@ -357,7 +357,7 @@ public class L2SepulcherMonsterInstance extends L2MonsterInstance
 				return;
 			}
 			
-			broadcastPacket(new NpcSay(getObjectId(), 0, getNpcId(), "forgive me!!"));
+			broadcastPacket(new NpcSay(getObjectId(), 0, getId(), "forgive me!!"));
 		}
 	}
 	
@@ -384,7 +384,7 @@ public class L2SepulcherMonsterInstance extends L2MonsterInstance
 			}
 			
 			FourSepulchersManager.getInstance().spawnKeyBox(_activeChar);
-			broadcastPacket(new NpcSay(getObjectId(), 0, getNpcId(), "Many thanks for rescue me."));
+			broadcastPacket(new NpcSay(getObjectId(), 0, getId(), "Many thanks for rescue me."));
 			if (_victimShout != null)
 			{
 				_victimShout.cancel(true);
@@ -405,7 +405,7 @@ public class L2SepulcherMonsterInstance extends L2MonsterInstance
 		@Override
 		public void run()
 		{
-			switch (_activeChar.getNpcId())
+			switch (_activeChar.getId())
 			{
 				case 18120:
 				case 18121:

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

@@ -181,7 +181,7 @@ public class L2SepulcherNpcInstance extends L2Npc
 			return;
 		}
 		
-		switch (getNpcId())
+		switch (getId())
 		{
 			case 31468:
 			case 31469:
@@ -209,7 +209,7 @@ public class L2SepulcherNpcInstance extends L2Npc
 				{
 					_spawnMonsterTask.cancel(true);
 				}
-				_spawnMonsterTask = ThreadPoolManager.getInstance().scheduleEffect(new SpawnMonster(getNpcId()), 3500);
+				_spawnMonsterTask = ThreadPoolManager.getInstance().scheduleEffect(new SpawnMonster(getId()), 3500);
 				break;
 			
 			case 31455:
@@ -276,7 +276,7 @@ public class L2SepulcherNpcInstance extends L2Npc
 	@Override
 	public void showChatWindow(L2PcInstance player, int val)
 	{
-		String filename = getHtmlPath(getNpcId(), val);
+		String filename = getHtmlPath(getId(), val);
 		NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
 		html.setFile(player.getHtmlPrefix(), filename);
 		html.replace("%objectId%", String.valueOf(getObjectId()));
@@ -320,16 +320,16 @@ public class L2SepulcherNpcInstance extends L2Npc
 			}
 			else if (FourSepulchersManager.getInstance().isAttackTime())
 			{
-				switch (getNpcId())
+				switch (getId())
 				{
 					case 31929:
 					case 31934:
 					case 31939:
 					case 31944:
-						FourSepulchersManager.getInstance().spawnShadow(getNpcId());
+						FourSepulchersManager.getInstance().spawnShadow(getId());
 					default:
 					{
-						openNextDoor(getNpcId());
+						openNextDoor(getId());
 						if (player.getParty() != null)
 						{
 							for (L2PcInstance mem : player.getParty().getMembers())

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2SiegeNpcInstance.java

@@ -63,7 +63,7 @@ public class L2SiegeNpcInstance extends L2NpcInstance
 		else
 		{
 			NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
-			html.setFile(player.getHtmlPrefix(), "data/html/siege/" + getNpcId() + "-busy.htm");
+			html.setFile(player.getHtmlPrefix(), "data/html/siege/" + getId() + "-busy.htm");
 			html.replace("%castlename%", getConquerableHall() != null ? getConquerableHall().getName() : getCastle().getName());
 			html.replace("%objectId%", String.valueOf(getObjectId()));
 			player.sendPacket(html);

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2SignsPriestInstance.java

@@ -98,7 +98,7 @@ public class L2SignsPriestInstance extends L2Npc
 						}
 						catch (Exception e3)
 						{
-							_log.warning("Failed to retrieve cabal from bypass command. NpcId: " + getNpcId() + "; Command: " + command);
+							_log.warning("Failed to retrieve cabal from bypass command. NpcId: " + getId() + "; Command: " + command);
 						}
 					}
 				}

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2StaticObjectInstance.java

@@ -87,9 +87,11 @@ public final class L2StaticObjectInstance extends L2Character
 	}
 	
 	/**
-	 * @return Returns the StaticObjectId.
+	 * Gets the static object ID.
+	 * @return the static object ID
 	 */
-	public int getStaticObjectId()
+	@Override
+	public int getId()
 	{
 		return _staticObjectId;
 	}

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

@@ -79,7 +79,7 @@ public final class L2TeleporterInstance extends L2Npc
 		}
 		else if (actualCommand.equalsIgnoreCase("goto"))
 		{
-			int npcId = getNpcId();
+			int npcId = getId();
 			
 			switch (npcId)
 			{
@@ -181,10 +181,10 @@ public final class L2TeleporterInstance extends L2Npc
 		
 		NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
 		
-		String filename = "data/html/teleporter/free/" + getTemplate().getNpcId() + ".htm";
+		String filename = "data/html/teleporter/free/" + getTemplate().getId() + ".htm";
 		if (!HtmCache.getInstance().isLoadable(filename))
 		{
-			filename = "data/html/teleporter/" + getTemplate().getNpcId() + "-1.htm";
+			filename = "data/html/teleporter/" + getTemplate().getId() + "-1.htm";
 		}
 		
 		html.setFile(player.getHtmlPrefix(), filename);
@@ -202,10 +202,10 @@ public final class L2TeleporterInstance extends L2Npc
 		
 		NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
 		
-		String filename = "data/html/teleporter/half/" + getNpcId() + ".htm";
+		String filename = "data/html/teleporter/half/" + getId() + ".htm";
 		if (!HtmCache.getInstance().isLoadable(filename))
 		{
-			filename = "data/html/teleporter/" + getNpcId() + "-1.htm";
+			filename = "data/html/teleporter/" + getId() + "-1.htm";
 		}
 		
 		html.setFile(player.getHtmlPrefix(), filename);
@@ -233,7 +233,7 @@ public final class L2TeleporterInstance extends L2Npc
 			}
 			else if (condition == COND_OWNER) // Clan owns castle
 			{
-				filename = getHtmlPath(getNpcId(), 0); // Owner message window
+				filename = getHtmlPath(getId(), 0); // Owner message window
 			}
 		}
 		

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2TerritoryWardInstance.java

@@ -135,11 +135,11 @@ public final class L2TerritoryWardInstance extends L2Attackable
 		{
 			if ((((L2PcInstance) killer).getSiegeSide() > 0) && !((L2PcInstance) killer).isCombatFlagEquipped())
 			{
-				((L2PcInstance) killer).addItem("Pickup", getNpcId() - 23012, 1, null, false);
+				((L2PcInstance) killer).addItem("Pickup", getId() - 23012, 1, null, false);
 			}
 			else
 			{
-				TerritoryWarManager.getInstance().getTerritoryWard(getNpcId() - 36491).spawnMe();
+				TerritoryWarManager.getInstance().getTerritoryWard(getId() - 36491).spawnMe();
 			}
 			SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_S1_WARD_HAS_BEEN_DESTROYED_C2_HAS_THE_WARD);
 			sm.addString(getName().replaceAll(" Ward", ""));
@@ -148,7 +148,7 @@ public final class L2TerritoryWardInstance extends L2Attackable
 		}
 		else
 		{
-			TerritoryWarManager.getInstance().getTerritoryWard(getNpcId() - 36491).spawnMe();
+			TerritoryWarManager.getInstance().getTerritoryWard(getId() - 36491).spawnMe();
 		}
 		decayMe();
 		return true;

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2WeddingManagerInstance.java

@@ -232,7 +232,7 @@ public class L2WeddingManagerInstance extends L2Npc
 			L2ItemInstance fw1 = p1.getChestArmorInstance();
 			L2ItemInstance fw2 = p2.getChestArmorInstance();
 			
-			if ((fw1 == null) || (fw2 == null) || (fw1.getItemId() != 6408) || (fw2.getItemId() != 6408))
+			if ((fw1 == null) || (fw2 == null) || (fw1.getId() != 6408) || (fw2.getId() != 6408))
 			{
 				return false;
 			}

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/stat/PetStat.java

@@ -104,13 +104,13 @@ public class PetStat extends SummonStat
 	{
 		try
 		{
-			return PetDataTable.getInstance().getPetLevelData(getActiveChar().getNpcId(), level).getPetMaxExp();
+			return PetDataTable.getInstance().getPetLevelData(getActiveChar().getId(), level).getPetMaxExp();
 		}
 		catch (NullPointerException e)
 		{
 			if (getActiveChar() != null)
 			{
-				_log.warning("Pet objectId:" + getActiveChar().getObjectId() + ", NpcId:" + getActiveChar().getNpcId() + ", level:" + level + " is missing data from pets_stats table!");
+				_log.warning("Pet objectId:" + getActiveChar().getObjectId() + ", NpcId:" + getActiveChar().getId() + ", level:" + level + " is missing data from pets_stats table!");
 			}
 			throw e;
 		}
@@ -135,10 +135,10 @@ public class PetStat extends SummonStat
 	@Override
 	public void setLevel(byte value)
 	{
-		getActiveChar().setPetData(PetDataTable.getInstance().getPetLevelData(getActiveChar().getTemplate().getNpcId(), value));
+		getActiveChar().setPetData(PetDataTable.getInstance().getPetLevelData(getActiveChar().getTemplate().getId(), value));
 		if (getActiveChar().getPetLevelData() == null)
 		{
-			throw new IllegalArgumentException("No pet data for npc: " + getActiveChar().getTemplate().getNpcId() + " level: " + value);
+			throw new IllegalArgumentException("No pet data for npc: " + getActiveChar().getTemplate().getId() + " level: " + value);
 		}
 		getActiveChar().stopFeed();
 		super.setLevel(value);

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/stat/PlayableStat.java

@@ -64,7 +64,7 @@ public class PlayableStat extends CharStat
 		if (getActiveChar() instanceof L2PetInstance)
 		{
 			// get minimum level from L2NpcTemplate
-			minimumLevel = (byte) PetDataTable.getInstance().getPetMinLevel(((L2PetInstance) getActiveChar()).getTemplate().getNpcId());
+			minimumLevel = (byte) PetDataTable.getInstance().getPetMinLevel(((L2PetInstance) getActiveChar()).getTemplate().getId());
 		}
 		
 		byte level = minimumLevel; // minimum level
@@ -99,7 +99,7 @@ public class PlayableStat extends CharStat
 		if (getActiveChar() instanceof L2PetInstance)
 		{
 			// get minimum level from L2NpcTemplate
-			minimumLevel = (byte) PetDataTable.getInstance().getPetMinLevel(((L2PetInstance) getActiveChar()).getTemplate().getNpcId());
+			minimumLevel = (byte) PetDataTable.getInstance().getPetMinLevel(((L2PetInstance) getActiveChar()).getTemplate().getId());
 		}
 		byte level = minimumLevel;
 		

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/tasks/player/PetFeedTask.java

@@ -94,7 +94,7 @@ public class PetFeedTask implements Runnable
 					{
 						handler.useItem(_player, food, false);
 						SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.PET_TOOK_S1_BECAUSE_HE_WAS_HUNGRY);
-						sm.addItemName(food.getItemId());
+						sm.addItemName(food.getId());
 						_player.sendPacket(sm);
 					}
 				}

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/templates/L2DoorTemplate.java

@@ -20,11 +20,13 @@ package com.l2jserver.gameserver.model.actor.templates;
 
 import com.l2jserver.gameserver.model.StatsSet;
 import com.l2jserver.gameserver.model.actor.instance.L2DoorInstance;
+import com.l2jserver.gameserver.model.interfaces.IIdentifiable;
 
 /**
+ * Doors template.
  * @author JIV
  */
-public class L2DoorTemplate extends L2CharTemplate
+public class L2DoorTemplate extends L2CharTemplate implements IIdentifiable
 {
 	private final int _doorId;
 	private final int _nodeX[];
@@ -107,7 +109,12 @@ public class L2DoorTemplate extends L2CharTemplate
 		_clanhallId = set.getInteger("clanhall_id", 0);
 	}
 	
-	public int getDoorId()
+	/**
+	 * Gets the door ID.
+	 * @return the door ID
+	 */
+	@Override
+	public int getId()
 	{
 		return _doorId;
 	}

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/templates/L2NpcTemplate.java

@@ -35,14 +35,16 @@ import com.l2jserver.gameserver.model.L2NpcAIData;
 import com.l2jserver.gameserver.model.StatsSet;
 import com.l2jserver.gameserver.model.base.ClassId;
 import com.l2jserver.gameserver.model.effects.L2EffectType;
+import com.l2jserver.gameserver.model.interfaces.IIdentifiable;
 import com.l2jserver.gameserver.model.quest.Quest;
 import com.l2jserver.gameserver.model.quest.Quest.QuestEventType;
 import com.l2jserver.gameserver.model.skills.L2Skill;
 
 /**
+ * NPC template.
  * @author Zoey76
  */
-public final class L2NpcTemplate extends L2CharTemplate
+public final class L2NpcTemplate extends L2CharTemplate implements IIdentifiable
 {
 	private static final Logger _log = Logger.getLogger(L2NpcTemplate.class.getName());
 	
@@ -174,7 +176,7 @@ public final class L2NpcTemplate extends L2CharTemplate
 		final int herbGroup = set.getInteger("dropHerbGroup");
 		if ((herbGroup > 0) && (HerbDropTable.getInstance().getHerbDroplist(herbGroup) == null))
 		{
-			_log.warning("Missing Herb Drop Group for npcId: " + getNpcId());
+			_log.warning("Missing Herb Drop Group for npcId: " + getId());
 			_dropHerbGroup = 0;
 		}
 		else
@@ -681,9 +683,11 @@ public final class L2NpcTemplate extends L2CharTemplate
 	}
 	
 	/**
-	 * @return the npc Id.
+	 * Gets the NPC ID.
+	 * @return the NPC ID
 	 */
-	public int getNpcId()
+	@Override
+	public int getId()
 	{
 		return _npcId;
 	}

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/transform/Transform.java

@@ -26,13 +26,14 @@ import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.holders.AdditionalItemHolder;
 import com.l2jserver.gameserver.model.holders.AdditionalSkillHolder;
 import com.l2jserver.gameserver.model.holders.SkillHolder;
+import com.l2jserver.gameserver.model.interfaces.IIdentifiable;
 import com.l2jserver.gameserver.model.stats.Stats;
 import com.l2jserver.gameserver.network.serverpackets.ExBasicActionList;
 
 /**
  * @author UnAfraid
  */
-public final class Transform
+public final class Transform implements IIdentifiable
 {
 	private final int _id;
 	private final int _displayId;
@@ -58,6 +59,11 @@ public final class Transform
 		_title = set.getString("setTitle", null);
 	}
 	
+	/**
+	 * Gets the transformation ID.
+	 * @return the transformation ID
+	 */
+	@Override
 	public int getId()
 	{
 		return _id;

L2J_Server_BETA/java/com/l2jserver/gameserver/model/base/ClassId.java

@@ -18,6 +18,8 @@
  */
 package com.l2jserver.gameserver.model.base;
 
+import com.l2jserver.gameserver.model.interfaces.IIdentifiable;
+
 /**
  * This class defines all classes (ex : human fighter, darkFighter...) that a player can chose.<br>
  * Data:
@@ -29,7 +31,7 @@ package com.l2jserver.gameserver.model.base;
  * </ul>
  * @version $Revision: 1.4.4.4 $ $Date: 2005/03/27 15:29:33 $
  */
-public enum ClassId
+public enum ClassId implements IIdentifiable
 {
 	fighter(0x00, false, Race.Human, null),
 	
@@ -244,8 +246,10 @@ public enum ClassId
 	}
 	
 	/**
-	 * @return the Id of the Class.
+	 * Gets the ID of the class.
+	 * @return the ID of the class
 	 */
+	@Override
 	public final int getId()
 	{
 		return _id;

L2J_Server_BETA/java/com/l2jserver/gameserver/model/conditions/ConditionItemId.java

@@ -45,6 +45,6 @@ public final class ConditionItemId extends Condition
 	@Override
 	public boolean testImpl(Env env)
 	{
-		return (env.getItem() != null) && (env.getItem().getItemId() == _itemId);
+		return (env.getItem() != null) && (env.getItem().getId() == _itemId);
 	}
 }

L2J_Server_BETA/java/com/l2jserver/gameserver/model/conditions/ConditionPetType.java

@@ -19,7 +19,6 @@
 package com.l2jserver.gameserver.model.conditions;
 
 import com.l2jserver.gameserver.datatables.PetDataTable;
-import com.l2jserver.gameserver.model.actor.L2Summon;
 import com.l2jserver.gameserver.model.actor.instance.L2PetInstance;
 import com.l2jserver.gameserver.model.items.L2Item;
 import com.l2jserver.gameserver.model.stats.Env;
@@ -44,33 +43,32 @@ public class ConditionPetType extends Condition
 			return false;
 		}
 		
-		int npcid = ((L2Summon) env.getCharacter()).getNpcId();
-		
-		if (PetDataTable.isStrider(npcid) && (petType == L2Item.STRIDER))
+		int npcId = env.getCharacter().getId();
+		if (PetDataTable.isStrider(npcId) && (petType == L2Item.STRIDER))
 		{
 			return true;
 		}
-		else if (PetDataTable.isGrowUpWolfGroup(npcid) && (petType == L2Item.GROWN_UP_WOLF_GROUP))
+		else if (PetDataTable.isGrowUpWolfGroup(npcId) && (petType == L2Item.GROWN_UP_WOLF_GROUP))
 		{
 			return true;
 		}
-		else if (PetDataTable.isHatchlingGroup(npcid) && (petType == L2Item.HATCHLING_GROUP))
+		else if (PetDataTable.isHatchlingGroup(npcId) && (petType == L2Item.HATCHLING_GROUP))
 		{
 			return true;
 		}
-		else if (PetDataTable.isAllWolfGroup(npcid) && (petType == L2Item.ALL_WOLF_GROUP))
+		else if (PetDataTable.isAllWolfGroup(npcId) && (petType == L2Item.ALL_WOLF_GROUP))
 		{
 			return true;
 		}
-		else if (PetDataTable.isBabyPetGroup(npcid) && (petType == L2Item.BABY_PET_GROUP))
+		else if (PetDataTable.isBabyPetGroup(npcId) && (petType == L2Item.BABY_PET_GROUP))
 		{
 			return true;
 		}
-		else if (PetDataTable.isUpgradeBabyPetGroup(npcid) && (petType == L2Item.UPGRADE_BABY_PET_GROUP))
+		else if (PetDataTable.isUpgradeBabyPetGroup(npcId) && (petType == L2Item.UPGRADE_BABY_PET_GROUP))
 		{
 			return true;
 		}
-		else if (PetDataTable.isItemEquipPetGroup(npcid) && (petType == L2Item.ITEM_EQUIP_PET_GROUP))
+		else if (PetDataTable.isItemEquipPetGroup(npcId) && (petType == L2Item.ITEM_EQUIP_PET_GROUP))
 		{
 			return true;
 		}

L2J_Server_BETA/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerHasPet.java

@@ -61,6 +61,6 @@ public class ConditionPlayerHasPet extends Condition
 		}
 		
 		final L2ItemInstance controlItem = ((L2PetInstance) env.getPlayer().getSummon()).getControlItem();
-		return (controlItem != null) && _controlItemIds.contains(controlItem.getItemId());
+		return (controlItem != null) && _controlItemIds.contains(controlItem.getId());
 	}
 }

L2J_Server_BETA/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerRangeFromNpc.java

@@ -19,7 +19,6 @@
 package com.l2jserver.gameserver.model.conditions;
 
 import com.l2jserver.gameserver.model.actor.L2Character;
-import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.stats.Env;
 import com.l2jserver.gameserver.util.Util;
 
@@ -51,7 +50,7 @@ public class ConditionPlayerRangeFromNpc extends Condition
 		{
 			for (L2Character target : env.getCharacter().getKnownList().getKnownCharactersInRadius(_radius))
 			{
-				if (target.isNpc() && Util.contains(_npcIds, ((L2Npc) target).getNpcId()))
+				if (target.isNpc() && Util.contains(_npcIds, target.getId()))
 				{
 					existNpc = true;
 					break;

L2J_Server_BETA/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerServitorNpcId.java

@@ -52,6 +52,6 @@ public class ConditionPlayerServitorNpcId extends Condition
 		{
 			return false;
 		}
-		return (_npcIds == null) || _npcIds.contains(env.getPlayer().getSummon().getNpcId());
+		return (_npcIds == null) || _npcIds.contains(env.getPlayer().getSummon().getId());
 	}
 }

L2J_Server_BETA/java/com/l2jserver/gameserver/model/conditions/ConditionSlotItemId.java

@@ -57,6 +57,6 @@ public final class ConditionSlotItemId extends ConditionInventory
 		{
 			return _itemId == 0;
 		}
-		return (item.getItemId() == _itemId) && (item.getEnchantLevel() >= _enchantLevel);
+		return (item.getId() == _itemId) && (item.getEnchantLevel() >= _enchantLevel);
 	}
 }

L2J_Server_BETA/java/com/l2jserver/gameserver/model/conditions/ConditionTargetNpcId.java

@@ -20,8 +20,6 @@ package com.l2jserver.gameserver.model.conditions;
 
 import java.util.ArrayList;
 
-import com.l2jserver.gameserver.model.actor.L2Npc;
-import com.l2jserver.gameserver.model.actor.instance.L2DoorInstance;
 import com.l2jserver.gameserver.model.stats.Env;
 
 /**
@@ -43,13 +41,9 @@ public class ConditionTargetNpcId extends Condition
 	@Override
 	public boolean testImpl(Env env)
 	{
-		if (env.getTarget() instanceof L2Npc)
+		if (((env.getTarget() != null) && env.getTarget().isNpc()) || env.getTarget().isDoor())
 		{
-			return _npcIds.contains(((L2Npc) env.getTarget()).getNpcId());
-		}
-		if (env.getTarget() instanceof L2DoorInstance)
-		{
-			return _npcIds.contains(((L2DoorInstance) env.getTarget()).getDoorId());
+			return _npcIds.contains(env.getTarget().getId());
 		}
 		return false;
 	}

L2J_Server_BETA/java/com/l2jserver/gameserver/model/enchant/EnchantItem.java

@@ -106,7 +106,7 @@ public class EnchantItem
 		{
 			return false;
 		}
-		else if ((enchantItem.isEnchantable() > 1) && !verifyItemId(enchantItem.getItemId()))
+		else if ((enchantItem.isEnchantable() > 1) && !verifyItemId(enchantItem.getId()))
 		{
 			return false;
 		}

L2J_Server_BETA/java/com/l2jserver/gameserver/model/entity/Castle.java

@@ -959,7 +959,7 @@ public class Castle
 		
 		for (L2DoorInstance door : getDoors())
 		{
-			if (door.getDoorId() == doorId)
+			if (door.getId() == doorId)
 			{
 				return door;
 			}

L2J_Server_BETA/java/com/l2jserver/gameserver/model/entity/ClanHall.java

@@ -294,7 +294,7 @@ public abstract class ClanHall
 		}
 		for (L2DoorInstance door : getDoors())
 		{
-			if (door.getDoorId() == doorId)
+			if (door.getId() == doorId)
 			{
 				return door;
 			}

L2J_Server_BETA/java/com/l2jserver/gameserver/model/entity/Fort.java

@@ -616,7 +616,7 @@ public class Fort
 	public void upgradeDoor(int doorId, int hp, int pDef, int mDef)
 	{
 		L2DoorInstance door = getDoor(doorId);
-		if ((door != null) && (door.getDoorId() == doorId))
+		if ((door != null) && (door.getId() == doorId))
 		{
 			door.setCurrentHp(door.getMaxHp() + hp);
 			
@@ -960,7 +960,7 @@ public class Fort
 		
 		for (L2DoorInstance door : getDoors())
 		{
-			if (door.getDoorId() == doorId)
+			if (door.getId() == doorId)
 			{
 				return door;
 			}

L2J_Server_BETA/java/com/l2jserver/gameserver/model/entity/FortSiege.java

@@ -641,7 +641,7 @@ public class FortSiege implements Siegable
 				FastList<FortSiegeSpawn> commanders = FortSiegeManager.getInstance().getCommanderSpawnList(getFort().getFortId());
 				for (FortSiegeSpawn spawn2 : commanders)
 				{
-					if (spawn2.getNpcId() == spawn.getNpcid())
+					if (spawn2.getNpcId() == spawn.getId())
 					{
 						NpcStringId npcString = null;
 						switch (spawn2.getId())
@@ -661,7 +661,7 @@ public class FortSiege implements Siegable
 						}
 						if (npcString != null)
 						{
-							instance.broadcastPacket(new NpcSay(instance.getObjectId(), Say2.NPC_SHOUT, instance.getNpcId(), npcString));
+							instance.broadcastPacket(new NpcSay(instance.getObjectId(), Say2.NPC_SHOUT, instance.getId(), npcString));
 						}
 					}
 				}
@@ -701,7 +701,7 @@ public class FortSiege implements Siegable
 			}
 			else
 			{
-				_log.warning("FortSiege.killedCommander(): killed commander, but commander not registered for fortress. NpcId: " + instance.getNpcId() + " FortId: " + getFort().getFortId());
+				_log.warning("FortSiege.killedCommander(): killed commander, but commander not registered for fortress. NpcId: " + instance.getId() + " FortId: " + getFort().getFortId());
 			}
 		}
 	}

L2J_Server_BETA/java/com/l2jserver/gameserver/model/entity/clanhall/ClanHallSiegeEngine.java

@@ -479,7 +479,7 @@ public abstract class ClanHallSiegeEngine extends Quest implements Siegable
 	
 	public final void broadcastNpcSay(final L2Npc npc, final int type, final NpcStringId messageId)
 	{
-		final NpcSay npcSay = new NpcSay(npc.getObjectId(), type, npc.getNpcId(), messageId);
+		final NpcSay npcSay = new NpcSay(npc.getObjectId(), type, npc.getId(), messageId);
 		int sourceRegion = MapRegionManager.getInstance().getMapRegionLocId(npc);
 		final L2PcInstance[] charsInside = L2World.getInstance().getAllPlayersArray();
 		

L2J_Server_BETA/java/com/l2jserver/gameserver/model/interfaces/IIdentifiable.java

@@ -0,0 +1,28 @@
+/*
+ * Copyright (C) 2004-2013 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.interfaces;
+
+/**
+ * Identifiable objects interface.
+ * @author Zoey76
+ */
+public interface IIdentifiable
+{
+	public int getId();
+}

L2J_Server_BETA/java/com/l2jserver/gameserver/model/itemcontainer/Inventory.java

@@ -514,15 +514,15 @@ public abstract class Inventory extends ItemContainer
 			}
 			
 			// Checks for armor set for the equipped chest.
-			if (!ArmorSetsData.getInstance().isArmorSet(chestItem.getItemId()))
+			if (!ArmorSetsData.getInstance().isArmorSet(chestItem.getId()))
 			{
 				return;
 			}
-			final L2ArmorSet armorSet = ArmorSetsData.getInstance().getSet(chestItem.getItemId());
+			final L2ArmorSet armorSet = ArmorSetsData.getInstance().getSet(chestItem.getId());
 			boolean update = false;
 			boolean updateTimeStamp = false;
 			// Checks if equipped item is part of set
-			if (armorSet.containItem(slot, item.getItemId()))
+			if (armorSet.containItem(slot, item.getId()))
 			{
 				if (armorSet.containAll(player))
 				{
@@ -594,7 +594,7 @@ public abstract class Inventory extends ItemContainer
 					}
 				}
 			}
-			else if (armorSet.containShield(item.getItemId()))
+			else if (armorSet.containShield(item.getId()))
 			{
 				for (SkillHolder holder : armorSet.getShieldSkillId())
 				{
@@ -639,11 +639,11 @@ public abstract class Inventory extends ItemContainer
 			
 			if (slot == PAPERDOLL_CHEST)
 			{
-				if (!ArmorSetsData.getInstance().isArmorSet(item.getItemId()))
+				if (!ArmorSetsData.getInstance().isArmorSet(item.getId()))
 				{
 					return;
 				}
-				final L2ArmorSet armorSet = ArmorSetsData.getInstance().getSet(item.getItemId());
+				final L2ArmorSet armorSet = ArmorSetsData.getInstance().getSet(item.getId());
 				remove = true;
 				skills = armorSet.getSkills();
 				shieldSkill = armorSet.getShieldSkillId();
@@ -657,20 +657,20 @@ public abstract class Inventory extends ItemContainer
 					return;
 				}
 				
-				L2ArmorSet armorSet = ArmorSetsData.getInstance().getSet(chestItem.getItemId());
+				L2ArmorSet armorSet = ArmorSetsData.getInstance().getSet(chestItem.getId());
 				if (armorSet == null)
 				{
 					return;
 				}
 				
-				if (armorSet.containItem(slot, item.getItemId())) // removed part of set
+				if (armorSet.containItem(slot, item.getId())) // removed part of set
 				{
 					remove = true;
 					skills = armorSet.getSkills();
 					shieldSkill = armorSet.getShieldSkillId();
 					skillId6 = armorSet.getEnchant6skillId();
 				}
-				else if (armorSet.containShield(item.getItemId())) // removed shield
+				else if (armorSet.containShield(item.getId())) // removed shield
 				{
 					remove = true;
 					shieldSkill = armorSet.getShieldSkillId();
@@ -860,7 +860,7 @@ public abstract class Inventory extends ItemContainer
 				item.setLastChange(L2ItemInstance.MODIFIED);
 				item.updateDatabase();
 				
-				item = ItemTable.getInstance().createItem(process, item.getItemId(), count, actor, reference);
+				item = ItemTable.getInstance().createItem(process, item.getId(), count, actor, reference);
 				item.updateDatabase();
 				refreshWeight();
 				return item;
@@ -998,7 +998,7 @@ public abstract class Inventory extends ItemContainer
 		L2ItemInstance item = _paperdoll[slot];
 		if (item != null)
 		{
-			return item.getItemId();
+			return item.getId();
 		}
 		return 0;
 	}
@@ -1400,7 +1400,7 @@ public abstract class Inventory extends ItemContainer
 		
 		// Check if player is using Formal Wear and item isn't Wedding Bouquet.
 		L2ItemInstance formal = getPaperdollItem(PAPERDOLL_CHEST);
-		if ((item.getItemId() != 21163) && (formal != null) && (formal.getItem().getBodyPart() == L2Item.SLOT_ALLDRESS))
+		if ((item.getId() != 21163) && (formal != null) && (formal.getItem().getBodyPart() == L2Item.SLOT_ALLDRESS))
 		{
 			// only chest target can pass this
 			switch (targetSlot)
@@ -1569,7 +1569,7 @@ public abstract class Inventory extends ItemContainer
 				setPaperdollItem(PAPERDOLL_CHEST, item);
 				break;
 			default:
-				_log.warning("Unknown body slot " + targetSlot + " for Item ID:" + item.getItemId());
+				_log.warning("Unknown body slot " + targetSlot + " for Item ID:" + item.getId());
 		}
 	}
 	
@@ -1684,7 +1684,7 @@ public abstract class Inventory extends ItemContainer
 					L2World.getInstance().storeObject(item);
 					
 					// If stackable item is found in inventory just add to current quantity
-					if (item.isStackable() && (getItemByItemId(item.getItemId()) != null))
+					if (item.isStackable() && (getItemByItemId(item.getId()) != null))
 					{
 						addItem("Restore", item, getOwner().getActingPlayer(), null);
 					}
@@ -1719,7 +1719,7 @@ public abstract class Inventory extends ItemContainer
 		{
 			if (_paperdoll[i] != null)
 			{
-				if (getPaperdollItemId(i) == item.getItemId())
+				if (getPaperdollItemId(i) == item.getId())
 				{
 					// overwtite
 					setPaperdollItem(i, item);

L2J_Server_BETA/java/com/l2jserver/gameserver/model/itemcontainer/ItemContainer.java

@@ -94,7 +94,7 @@ public abstract class ItemContainer
 	{
 		for (L2ItemInstance item : _items)
 		{
-			if ((item != null) && (item.getItemId() == itemId))
+			if ((item != null) && (item.getId() == itemId))
 			{
 				return item;
 			}
@@ -111,7 +111,7 @@ public abstract class ItemContainer
 		List<L2ItemInstance> returnList = new FastList<>();
 		for (L2ItemInstance item : _items)
 		{
-			if ((item != null) && (item.getItemId() == itemId))
+			if ((item != null) && (item.getId() == itemId))
 			{
 				returnList.add(item);
 			}
@@ -128,7 +128,7 @@ public abstract class ItemContainer
 	{
 		for (L2ItemInstance item : _items)
 		{
-			if ((item != null) && (item.getItemId() == itemId) && !item.equals(itemToIgnore))
+			if ((item != null) && (item.getId() == itemId) && !item.equals(itemToIgnore))
 			{
 				return item;
 			}
@@ -176,7 +176,7 @@ public abstract class ItemContainer
 		
 		for (L2ItemInstance item : _items)
 		{
-			if ((item.getItemId() == itemId) && ((item.getEnchantLevel() == enchantLevel) || (enchantLevel < 0)) && (includeEquipped || !item.isEquipped()))
+			if ((item.getId() == itemId) && ((item.getEnchantLevel() == enchantLevel) || (enchantLevel < 0)) && (includeEquipped || !item.isEquipped()))
 			{
 				if (item.isStackable())
 				{
@@ -210,7 +210,7 @@ public abstract class ItemContainer
 	 */
 	public L2ItemInstance addItem(String process, L2ItemInstance item, L2PcInstance actor, Object reference)
 	{
-		L2ItemInstance olditem = getItemByItemId(item.getItemId());
+		L2ItemInstance olditem = getItemByItemId(item.getId());
 		
 		// If stackable item is found in inventory just add to current quantity
 		if ((olditem != null) && olditem.isStackable())
@@ -225,7 +225,7 @@ public abstract class ItemContainer
 			item = olditem;
 			
 			// Updates database
-			if ((item.getItemId() == PcInventory.ADENA_ID) && (count < (10000 * Config.RATE_DROP_ITEMS_ID.get(PcInventory.ADENA_ID))))
+			if ((item.getId() == PcInventory.ADENA_ID) && (count < (10000 * Config.RATE_DROP_ITEMS_ID.get(PcInventory.ADENA_ID))))
 			{
 				// Small adena changes won't be saved to database all the time
 				if ((GameTimeController.getInstance().getGameTicks() % 5) == 0)
@@ -346,7 +346,7 @@ public abstract class ItemContainer
 		{
 			return null;
 		}
-		L2ItemInstance targetitem = sourceitem.isStackable() ? target.getItemByItemId(sourceitem.getItemId()) : null;
+		L2ItemInstance targetitem = sourceitem.isStackable() ? target.getItemByItemId(sourceitem.getId()) : null;
 		
 		synchronized (sourceitem)
 		{
@@ -389,7 +389,7 @@ public abstract class ItemContainer
 				else
 				// Otherwise add new item
 				{
-					targetitem = target.addItem(process, sourceitem.getItemId(), count, actor, reference);
+					targetitem = target.addItem(process, sourceitem.getId(), count, actor, reference);
 				}
 			}
 			
@@ -534,7 +534,7 @@ public abstract class ItemContainer
 		long count = 0;
 		for (L2ItemInstance item : _items)
 		{
-			if ((item != null) && (item.getItemId() == PcInventory.ADENA_ID))
+			if ((item != null) && (item.getId() == PcInventory.ADENA_ID))
 			{
 				count = item.getCount();
 				return count;
@@ -631,7 +631,7 @@ public abstract class ItemContainer
 					L2PcInstance owner = getOwner() == null ? null : getOwner().getActingPlayer();
 					
 					// If stackable item is found in inventory just add to current quantity
-					if (item.isStackable() && (getItemByItemId(item.getItemId()) != null))
+					if (item.isStackable() && (getItemByItemId(item.getId()) != null))
 					{
 						addItem("Restore", item, owner, null);
 					}

L2J_Server_BETA/java/com/l2jserver/gameserver/model/itemcontainer/Mail.java

@@ -146,7 +146,7 @@ public class Mail extends ItemContainer
 					L2World.getInstance().storeObject(item);
 					
 					// If stackable item is found just add to current quantity
-					if (item.isStackable() && (getItemByItemId(item.getItemId()) != null))
+					if (item.isStackable() && (getItemByItemId(item.getId()) != null))
 					{
 						addItem("Restore", item, null, null);
 					}

L2J_Server_BETA/java/com/l2jserver/gameserver/model/itemcontainer/PcInventory.java

@@ -142,18 +142,18 @@ public class PcInventory extends Inventory
 			{
 				continue;
 			}
-			if ((!allowAdena && (item.getItemId() == ADENA_ID)))
+			if ((!allowAdena && (item.getId() == ADENA_ID)))
 			{
 				continue;
 			}
-			if ((!allowAncientAdena && (item.getItemId() == ANCIENT_ADENA_ID)))
+			if ((!allowAncientAdena && (item.getId() == ANCIENT_ADENA_ID)))
 			{
 				continue;
 			}
 			boolean isDuplicate = false;
 			for (L2ItemInstance litem : list)
 			{
-				if (litem.getItemId() == item.getItemId())
+				if (litem.getId() == item.getId())
 				{
 					isDuplicate = true;
 					break;
@@ -191,11 +191,11 @@ public class PcInventory extends Inventory
 			{
 				continue;
 			}
-			if ((!allowAdena && (item.getItemId() == ADENA_ID)))
+			if ((!allowAdena && (item.getId() == ADENA_ID)))
 			{
 				continue;
 			}
-			if ((!allowAncientAdena && (item.getItemId() == ANCIENT_ADENA_ID)))
+			if ((!allowAncientAdena && (item.getId() == ANCIENT_ADENA_ID)))
 			{
 				continue;
 			}
@@ -203,7 +203,7 @@ public class PcInventory extends Inventory
 			boolean isDuplicate = false;
 			for (L2ItemInstance litem : list)
 			{
-				if ((litem.getItemId() == item.getItemId()) && (litem.getEnchantLevel() == item.getEnchantLevel()))
+				if ((litem.getId() == item.getId()) && (litem.getEnchantLevel() == item.getEnchantLevel()))
 				{
 					isDuplicate = true;
 					break;
@@ -247,7 +247,7 @@ public class PcInventory extends Inventory
 				continue;
 			}
 			
-			if ((item.getItemId() == itemId) && (includeEquipped || !item.isEquipped()))
+			if ((item.getId() == itemId) && (includeEquipped || !item.isEquipped()))
 			{
 				list.add(item);
 			}
@@ -286,7 +286,7 @@ public class PcInventory extends Inventory
 				continue;
 			}
 			
-			if ((item.getItemId() == itemId) && (item.getEnchantLevel() == enchantment) && (includeEquipped || !item.isEquipped()))
+			if ((item.getId() == itemId) && (item.getEnchantLevel() == enchantment) && (includeEquipped || !item.isEquipped()))
 			{
 				list.add(item);
 			}
@@ -309,7 +309,7 @@ public class PcInventory extends Inventory
 		FastList<L2ItemInstance> list = FastList.newInstance();
 		for (L2ItemInstance item : _items)
 		{
-			if ((item == null) || !item.isAvailable(getOwner(), allowAdena, allowNonTradeable) || !canManipulateWithItemId(item.getItemId()))
+			if ((item == null) || !item.isAvailable(getOwner(), allowAdena, allowNonTradeable) || !canManipulateWithItemId(item.getId()))
 			{
 				continue;
 			}
@@ -516,12 +516,12 @@ public class PcInventory extends Inventory
 	{
 		item = super.addItem(process, item, actor, reference);
 		
-		if ((item != null) && (item.getItemId() == ADENA_ID) && !item.equals(_adena))
+		if ((item != null) && (item.getId() == ADENA_ID) && !item.equals(_adena))
 		{
 			_adena = item;
 		}
 		
-		if ((item != null) && (item.getItemId() == ANCIENT_ADENA_ID) && !item.equals(_ancientAdena))
+		if ((item != null) && (item.getId() == ANCIENT_ADENA_ID) && !item.equals(_ancientAdena))
 		{
 			_ancientAdena = item;
 		}
@@ -544,12 +544,12 @@ public class PcInventory extends Inventory
 	{
 		L2ItemInstance item = super.addItem(process, itemId, count, actor, reference);
 		
-		if ((item != null) && (item.getItemId() == ADENA_ID) && !item.equals(_adena))
+		if ((item != null) && (item.getId() == ADENA_ID) && !item.equals(_adena))
 		{
 			_adena = item;
 		}
 		
-		if ((item != null) && (item.getItemId() == ANCIENT_ADENA_ID) && !item.equals(_ancientAdena))
+		if ((item != null) && (item.getId() == ANCIENT_ADENA_ID) && !item.equals(_ancientAdena))
 		{
 			_ancientAdena = item;
 		}
@@ -760,11 +760,11 @@ public class PcInventory extends Inventory
 			getOwner().setActiveEnchantItemId(L2PcInstance.ID_NONE);
 		}
 		
-		if (item.getItemId() == ADENA_ID)
+		if (item.getId() == ADENA_ID)
 		{
 			_adena = null;
 		}
-		else if (item.getItemId() == ANCIENT_ADENA_ID)
+		else if (item.getId() == ANCIENT_ADENA_ID)
 		{
 			_ancientAdena = null;
 		}
@@ -876,7 +876,7 @@ public class PcInventory extends Inventory
 	public boolean validateCapacity(L2ItemInstance item)
 	{
 		int slots = 0;
-		if (!item.isStackable() || (getInventoryItemCount(item.getItemId(), -1) <= 0) || (item.getItemType() != L2EtcItemType.HERB))
+		if (!item.isStackable() || (getInventoryItemCount(item.getId(), -1) <= 0) || (item.getItemType() != L2EtcItemType.HERB))
 		{
 			slots++;
 		}
@@ -1072,7 +1072,7 @@ public class PcInventory extends Inventory
 					event.setPlayer(actor);
 					for (ItemTracker tracker : itemTrackers)
 					{
-						if (tracker.containsItemId(item.getItemId()))
+						if (tracker.containsItemId(item.getId()))
 						{
 							tracker.onAddToInventory(event);
 						}
@@ -1087,7 +1087,7 @@ public class PcInventory extends Inventory
 					event.setLocation(actor.getLocation());
 					for (ItemTracker tracker : itemTrackers)
 					{
-						if (tracker.containsItemId(item.getItemId()))
+						if (tracker.containsItemId(item.getId()))
 						{
 							tracker.onDrop(event);
 						}
@@ -1101,7 +1101,7 @@ public class PcInventory extends Inventory
 					event.setPlayer(actor);
 					for (ItemTracker tracker : itemTrackers)
 					{
-						if (tracker.containsItemId(item.getItemId()))
+						if (tracker.containsItemId(item.getId()))
 						{
 							tracker.onDestroy(event);
 						}
@@ -1118,7 +1118,7 @@ public class PcInventory extends Inventory
 						event.setTarget(target);
 						for (ItemTracker tracker : itemTrackers)
 						{
-							if (tracker.containsItemId(item.getItemId()))
+							if (tracker.containsItemId(item.getId()))
 							{
 								tracker.onTransfer(event);
 							}

L2J_Server_BETA/java/com/l2jserver/gameserver/model/itemcontainer/PetInventory.java

@@ -70,7 +70,7 @@ public class PetInventory extends Inventory
 	{
 		int slots = 0;
 		
-		if (!(item.isStackable() && (getItemByItemId(item.getItemId()) != null)) && (item.getItemType() != L2EtcItemType.HERB))
+		if (!(item.isStackable() && (getItemByItemId(item.getId()) != null)) && (item.getItemType() != L2EtcItemType.HERB))
 		{
 			slots++;
 		}
@@ -87,7 +87,7 @@ public class PetInventory extends Inventory
 	public boolean validateWeight(L2ItemInstance item, long count)
 	{
 		int weight = 0;
-		L2Item template = ItemTable.getInstance().getTemplate(item.getItemId());
+		L2Item template = ItemTable.getInstance().getTemplate(item.getId());
 		if (template == null)
 		{
 			return false;

L2J_Server_BETA/java/com/l2jserver/gameserver/model/items/instance/L2ItemInstance.java

@@ -287,7 +287,7 @@ public final class L2ItemInstance extends L2Object
 		}
 		
 		// if this item is a mercenary ticket, remove the spawns!
-		int itemId = getItemId();
+		int itemId = getId();
 		
 		if (MercTicketManager.getInstance().getTicketCastleId(itemId) > 0)
 		{
@@ -357,7 +357,7 @@ public final class L2ItemInstance extends L2Object
 				String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
 				if (Config.GMAUDIT)
 				{
-					GMAudit.auditGMAction(creator.getName() + " [" + creator.getObjectId() + "]", process + "(id: " + getItemId() + " name: " + getName() + ")", targetName, "L2Object referencing this action is: " + referenceName);
+					GMAudit.auditGMAction(creator.getName() + " [" + creator.getObjectId() + "]", process + "(id: " + getId() + " name: " + getName() + ")", targetName, "L2Object referencing this action is: " + referenceName);
 				}
 			}
 		}
@@ -474,7 +474,7 @@ public final class L2ItemInstance extends L2Object
 			return;
 		}
 		long old = getCount();
-		long max = getItemId() == ADENA_ID ? MAX_ADENA : Integer.MAX_VALUE;
+		long max = getId() == ADENA_ID ? MAX_ADENA : Integer.MAX_VALUE;
 		
 		if ((count > 0) && (getCount() > (max - count)))
 		{
@@ -525,7 +525,7 @@ public final class L2ItemInstance extends L2Object
 				String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
 				if (Config.GMAUDIT)
 				{
-					GMAudit.auditGMAction(creator.getName() + " [" + creator.getObjectId() + "]", process + "(id: " + getItemId() + " objId: " + getObjectId() + " name: " + getName() + " count: " + count + ")", targetName, "L2Object referencing this action is: " + referenceName);
+					GMAudit.auditGMAction(creator.getName() + " [" + creator.getObjectId() + "]", process + "(id: " + getId() + " objId: " + getObjectId() + " name: " + getName() + " count: " + count + ")", targetName, "L2Object referencing this action is: " + referenceName);
 				}
 			}
 		}
@@ -626,9 +626,11 @@ public final class L2ItemInstance extends L2Object
 	}
 	
 	/**
-	 * @return the Id of the item.
+	 * Gets the item ID.
+	 * @return the item ID
 	 */
-	public int getItemId()
+	@Override
+	public int getId()
 	{
 		return _itemId;
 	}
@@ -884,8 +886,8 @@ public final class L2ItemInstance extends L2Object
 			&& (player.getActiveEnchantItemId() != getObjectId()) // Not momentarily used enchant scroll
 			&& (player.getActiveEnchantSupportItemId() != getObjectId()) // Not momentarily used enchant support item
 			&& (player.getActiveEnchantAttrItemId() != getObjectId()) // Not momentarily used enchant attribute item
-			&& (allowAdena || (getItemId() != PcInventory.ADENA_ID)) // Not Adena
-			&& ((player.getCurrentSkill() == null) || (player.getCurrentSkill().getSkill().getItemConsumeId() != getItemId())) && (!player.isCastingSimultaneouslyNow() || (player.getLastSimultaneousSkillCast() == null) || (player.getLastSimultaneousSkillCast().getItemConsumeId() != getItemId())) && (allowNonTradeable || (isTradeable() && (!((getItem().getItemType() == L2EtcItemType.PET_COLLAR) && player.havePetInvItems())))));
+			&& (allowAdena || (getId() != PcInventory.ADENA_ID)) // Not Adena
+			&& ((player.getCurrentSkill() == null) || (player.getCurrentSkill().getSkill().getItemConsumeId() != getId())) && (!player.isCastingSimultaneouslyNow() || (player.getLastSimultaneousSkillCast() == null) || (player.getLastSimultaneousSkillCast().getItemConsumeId() != getId())) && (allowNonTradeable || (isTradeable() && (!((getItem().getItemType() == L2EtcItemType.PET_COLLAR) && player.havePetInvItems())))));
 	}
 	
 	/**
@@ -2144,7 +2146,7 @@ public final class L2ItemInstance extends L2Object
 			
 			if (q != null)
 			{
-				if (((q.getQuestIntId() >= 1) && (q.getQuestIntId() < 20000)) && ((activeChar.getWeightPenalty() >= 3) || !activeChar.isInventoryUnder90(true)))
+				if (((q.getId() >= 1) && (q.getId() < 20000)) && ((activeChar.getWeightPenalty() >= 3) || !activeChar.isInventoryUnder90(true)))
 				{
 					activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.INVENTORY_LESS_THAN_80_PERCENT));
 					return;
@@ -2152,7 +2154,7 @@ public final class L2ItemInstance extends L2Object
 				
 				if (qs == null)
 				{
-					if ((q.getQuestIntId() >= 1) && (q.getQuestIntId() < 20000))
+					if ((q.getId() >= 1) && (q.getId() < 20000))
 					{
 						if (activeChar.getAllActiveQuests().length > 40)
 						{
@@ -2201,7 +2203,7 @@ public final class L2ItemInstance extends L2Object
 	 */
 	public void showChatWindow(L2PcInstance activeChar, String content)
 	{
-		NpcHtmlMessage html = new NpcHtmlMessage(0, getItemId());
+		NpcHtmlMessage html = new NpcHtmlMessage(0, getId());
 		html.setHtml(content);
 		html.replace("%itemId%", String.valueOf(getObjectId()));
 		activeChar.sendPacket(html);

L2J_Server_BETA/java/com/l2jserver/gameserver/model/multisell/PreparedListContainer.java

@@ -80,7 +80,7 @@ public class PreparedListContainer extends ListContainer
 						// check ingredients of this entry to see if it's an entry we'd like to include.
 						for (Ingredient ing : ent.getIngredients())
 						{
-							if (item.getItemId() == ing.getItemId())
+							if (item.getId() == ing.getItemId())
 							{
 								_entries.add(new PreparedEntry(ent, item, _applyTaxes, _maintainEnchantment, taxRate));
 								break; // next entry