BETA: Moving more enums from classes into their own package.

L2J_Server_BETA/java/com/l2jserver/gameserver/ItemsAutoDestroy.java

@@ -23,10 +23,10 @@ import java.util.List;
 import javolution.util.FastList;
 
 import com.l2jserver.Config;
+import com.l2jserver.gameserver.enums.ItemLocation;
 import com.l2jserver.gameserver.instancemanager.ItemsOnGroundManager;
 import com.l2jserver.gameserver.model.L2World;
 import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
-import com.l2jserver.gameserver.model.items.instance.L2ItemInstance.ItemLocation;
 import com.l2jserver.gameserver.model.items.type.L2EtcItemType;
 
 public class ItemsAutoDestroy

L2J_Server_BETA/java/com/l2jserver/gameserver/RecipeController.java

@@ -28,6 +28,7 @@ import javolution.util.FastMap;
 import com.l2jserver.Config;
 import com.l2jserver.gameserver.datatables.ItemTable;
 import com.l2jserver.gameserver.datatables.RecipeData;
+import com.l2jserver.gameserver.enums.StatType;
 import com.l2jserver.gameserver.model.L2ManufactureItem;
 import com.l2jserver.gameserver.model.L2RecipeInstance;
 import com.l2jserver.gameserver.model.L2RecipeList;
@@ -512,15 +513,15 @@ public class RecipeController
 			
 			for (L2RecipeStatInstance altStatChange : _recipeList.getAltStatChange())
 			{
-				if (altStatChange.getType() == L2RecipeStatInstance.StatType.XP)
+				if (altStatChange.getType() == StatType.XP)
 				{
 					_exp = altStatChange.getValue();
 				}
-				else if (altStatChange.getType() == L2RecipeStatInstance.StatType.SP)
+				else if (altStatChange.getType() == StatType.SP)
 				{
 					_sp = altStatChange.getValue();
 				}
-				else if (altStatChange.getType() == L2RecipeStatInstance.StatType.GIM)
+				else if (altStatChange.getType() == StatType.GIM)
 				{
 					_itemGrab *= altStatChange.getValue();
 				}
@@ -540,7 +541,7 @@ public class RecipeController
 			for (L2RecipeStatInstance statUse : _recipeList.getStatUse())
 			{
 				double modifiedValue = statUse.getValue() / _creationPasses;
-				if (statUse.getType() == L2RecipeStatInstance.StatType.HP)
+				if (statUse.getType() == StatType.HP)
 				{
 					// we do not want to kill the player, so its CurrentHP must be greater than the reduce value
 					if (_player.getCurrentHp() <= modifiedValue)
@@ -563,7 +564,7 @@ public class RecipeController
 						_player.reduceCurrentHp(modifiedValue, _player, _skill);
 					}
 				}
-				else if (statUse.getType() == L2RecipeStatInstance.StatType.MP)
+				else if (statUse.getType() == StatType.MP)
 				{
 					if (_player.getCurrentMp() < modifiedValue)
 					{

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

@@ -34,6 +34,7 @@ import com.l2jserver.gameserver.ThreadPoolManager;
 import com.l2jserver.gameserver.datatables.NpcTable;
 import com.l2jserver.gameserver.datatables.TerritoryTable;
 import com.l2jserver.gameserver.enums.AIType;
+import com.l2jserver.gameserver.enums.QuestEventType;
 import com.l2jserver.gameserver.instancemanager.DimensionalRiftManager;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.Location;
@@ -55,7 +56,6 @@ import com.l2jserver.gameserver.model.actor.instance.L2StaticObjectInstance;
 import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
 import com.l2jserver.gameserver.model.effects.L2EffectType;
 import com.l2jserver.gameserver.model.quest.Quest;
-import com.l2jserver.gameserver.model.quest.Quest.QuestEventType;
 import com.l2jserver.gameserver.model.skills.L2Skill;
 import com.l2jserver.gameserver.model.skills.targets.L2TargetType;
 import com.l2jserver.gameserver.model.zone.ZoneId;

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

@@ -36,6 +36,8 @@ import com.l2jserver.Config;
 import com.l2jserver.gameserver.GameTimeController;
 import com.l2jserver.gameserver.GeoData;
 import com.l2jserver.gameserver.ThreadPoolManager;
+import com.l2jserver.gameserver.enums.ItemLocation;
+import com.l2jserver.gameserver.enums.QuestEventType;
 import com.l2jserver.gameserver.instancemanager.WalkingManager;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.Location;
@@ -50,7 +52,6 @@ import com.l2jserver.gameserver.model.effects.L2Effect;
 import com.l2jserver.gameserver.model.effects.L2EffectType;
 import com.l2jserver.gameserver.model.items.L2Weapon;
 import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
-import com.l2jserver.gameserver.model.items.instance.L2ItemInstance.ItemLocation;
 import com.l2jserver.gameserver.model.items.type.L2WeaponType;
 import com.l2jserver.gameserver.model.quest.Quest;
 import com.l2jserver.gameserver.model.skills.L2Skill;
@@ -748,9 +749,9 @@ public class L2CharacterAI extends AbstractAI
 			WalkingManager.getInstance().onArrived(npc); // Walking Manager support
 			
 			// Notify quest
-			if (npc.getTemplate().getEventQuests(Quest.QuestEventType.ON_MOVE_FINISHED) != null)
+			if (npc.getTemplate().getEventQuests(QuestEventType.ON_MOVE_FINISHED) != null)
 			{
-				for (Quest quest : npc.getTemplate().getEventQuests(Quest.QuestEventType.ON_MOVE_FINISHED))
+				for (Quest quest : npc.getTemplate().getEventQuests(QuestEventType.ON_MOVE_FINISHED))
 				{
 					quest.notifyMoveFinished(npc);
 				}

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

@@ -37,6 +37,7 @@ import com.l2jserver.L2DatabaseFactory;
 import com.l2jserver.gameserver.ThreadPoolManager;
 import com.l2jserver.gameserver.engines.DocumentEngine;
 import com.l2jserver.gameserver.engines.items.Item;
+import com.l2jserver.gameserver.enums.ItemLocation;
 import com.l2jserver.gameserver.idfactory.IdFactory;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.L2World;
@@ -48,7 +49,6 @@ import com.l2jserver.gameserver.model.items.L2EtcItem;
 import com.l2jserver.gameserver.model.items.L2Item;
 import com.l2jserver.gameserver.model.items.L2Weapon;
 import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
-import com.l2jserver.gameserver.model.items.instance.L2ItemInstance.ItemLocation;
 import com.l2jserver.gameserver.model.items.type.L2ArmorType;
 import com.l2jserver.gameserver.model.items.type.L2WeaponType;
 import com.l2jserver.gameserver.scripting.scriptengine.events.ItemCreateEvent;

L2J_Server_BETA/java/com/l2jserver/gameserver/enums/AuctionItemType.java

@@ -0,0 +1,27 @@
+/*
+ * 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.enums;
+
+/**
+ * @author unknown
+ */
+public enum AuctionItemType
+{
+	ClanHall
+}

L2J_Server_BETA/java/com/l2jserver/gameserver/enums/DuelResult.java

@@ -0,0 +1,33 @@
+/*
+ * 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.enums;
+
+/**
+ * @author unknown
+ */
+public enum DuelResult
+{
+	Continue,
+	Team1Win,
+	Team2Win,
+	Team1Surrender,
+	Team2Surrender,
+	Canceled,
+	Timeout
+}

L2J_Server_BETA/java/com/l2jserver/gameserver/enums/FortTeleportWhoType.java

@@ -0,0 +1,29 @@
+/*
+ * 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.enums;
+
+/**
+ * @author unknown
+ */
+public enum FortTeleportWhoType
+{
+	All,
+	Attacker,
+	Owner,
+}

L2J_Server_BETA/java/com/l2jserver/gameserver/enums/ItemLocation.java

@@ -0,0 +1,37 @@
+/*
+ * 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.enums;
+
+/**
+ * @author unknown
+ */
+public enum ItemLocation
+{
+	VOID,
+	INVENTORY,
+	PAPERDOLL,
+	WAREHOUSE,
+	CLANWH,
+	PET,
+	PET_EQUIP,
+	LEASE,
+	REFUND,
+	MAIL,
+	FREIGHT
+}

L2J_Server_BETA/java/com/l2jserver/gameserver/enums/QuestEventType.java

@@ -0,0 +1,60 @@
+/*
+ * 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.enums;
+
+/**
+ * @author unknown
+ */
+public enum QuestEventType
+{
+	ON_FIRST_TALK(false), // control the first dialog shown by NPCs when they are clicked (some quests must override the default npc action)
+	QUEST_START(true), // onTalk action from start npcs
+	ON_TALK(true), // onTalk action from npcs participating in a quest
+	ON_ATTACK(true), // onAttack action triggered when a mob gets attacked by someone
+	ON_KILL(true), // onKill action triggered when a mob gets killed.
+	ON_SPAWN(true), // onSpawn action triggered when an NPC is spawned or respawned.
+	ON_SKILL_SEE(true), // NPC or Mob saw a person casting a skill (regardless what the target is).
+	ON_FACTION_CALL(true), // NPC or Mob saw a person casting a skill (regardless what the target is).
+	ON_AGGRO_RANGE_ENTER(true), // a person came within the Npc/Mob's range
+	ON_SPELL_FINISHED(true), // on spell finished action when npc finish casting skill
+	ON_SKILL_LEARN(false), // control the AcquireSkill dialog from quest script
+	ON_ENTER_ZONE(true), // on zone enter
+	ON_EXIT_ZONE(true), // on zone exit
+	ON_TRAP_ACTION(true), // on zone exit
+	ON_ITEM_USE(true),
+	ON_EVENT_RECEIVED(true), // onEventReceived action, triggered when NPC receiving an event, sent by other NPC
+	ON_MOVE_FINISHED(true), // onMoveFinished action, triggered when NPC stops after moving
+	ON_NODE_ARRIVED(true), // onNodeArrived action, triggered when NPC, controlled by Walking Manager, arrives to next node
+	ON_SEE_CREATURE(true), // onSeeCreature action, triggered when NPC's known list include the character
+	ON_ROUTE_FINISHED(true); // onRouteFinished action, triggered when NPC, controlled by Walking Manager, arrives to last node
+	
+	// control whether this event type is allowed for the same npc template in multiple quests
+	// or if the npc must be registered in at most one quest for the specified event
+	private boolean _allowMultipleRegistration;
+	
+	private QuestEventType(boolean allowMultipleRegistration)
+	{
+		_allowMultipleRegistration = allowMultipleRegistration;
+	}
+	
+	public boolean isMultipleRegistrationAllowed()
+	{
+		return _allowMultipleRegistration;
+	}
+}

L2J_Server_BETA/java/com/l2jserver/gameserver/enums/QuestSound.java

@@ -0,0 +1,172 @@
+/*
+ * 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.enums;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import com.l2jserver.gameserver.network.serverpackets.PlaySound;
+
+/**
+ * This enum contains known sound effects used by quests.<br>
+ * The idea is to have only a single object of each quest sound instead of constructing a new one every time a script calls the playSound method.<br>
+ * This is pretty much just a memory and CPU cycle optimization; avoids constructing/deconstructing objects all the time if they're all the same.<br>
+ * For datapack scripts written in Java and extending the Quest class, this does not need an extra import.
+ * @author jurchiks
+ */
+public enum QuestSound
+{
+	ITEMSOUND_QUEST_ACCEPT(new PlaySound("ItemSound.quest_accept")),
+	ITEMSOUND_QUEST_MIDDLE(new PlaySound("ItemSound.quest_middle")),
+	ITEMSOUND_QUEST_FINISH(new PlaySound("ItemSound.quest_finish")),
+	ITEMSOUND_QUEST_ITEMGET(new PlaySound("ItemSound.quest_itemget")),
+	// Newbie Guide tutorial (incl. some quests), Mutated Kaneus quests, Quest 192
+	ITEMSOUND_QUEST_TUTORIAL(new PlaySound("ItemSound.quest_tutorial")),
+	// Quests 107, 363, 364
+	ITEMSOUND_QUEST_GIVEUP(new PlaySound("ItemSound.quest_giveup")),
+	// Quests 212, 217, 224, 226, 416
+	ITEMSOUND_QUEST_BEFORE_BATTLE(new PlaySound("ItemSound.quest_before_battle")),
+	// Quests 211, 258, 266, 330
+	ITEMSOUND_QUEST_JACKPOT(new PlaySound("ItemSound.quest_jackpot")),
+	// Quests 508, 509 and 510
+	ITEMSOUND_QUEST_FANFARE_1(new PlaySound("ItemSound.quest_fanfare_1")),
+	// Played only after class transfer via Test Server Helpers (ID 31756 and 31757)
+	ITEMSOUND_QUEST_FANFARE_2(new PlaySound("ItemSound.quest_fanfare_2")),
+	// Quest 336
+	ITEMSOUND_QUEST_FANFARE_MIDDLE(new PlaySound("ItemSound.quest_fanfare_middle")),
+	// Quest 114
+	ITEMSOUND_ARMOR_WOOD(new PlaySound("ItemSound.armor_wood_3")),
+	// Quest 21
+	ITEMSOUND_ARMOR_CLOTH(new PlaySound("ItemSound.item_drop_equip_armor_cloth")),
+	AMDSOUND_ED_CHIMES(new PlaySound("AmdSound.ed_chimes_05")),
+	HORROR_01(new PlaySound("horror_01")), // played when spawned monster sees player
+	// Quest 22
+	AMBSOUND_HORROR_01(new PlaySound("AmbSound.dd_horror_01")),
+	AMBSOUND_HORROR_03(new PlaySound("AmbSound.d_horror_03")),
+	AMBSOUND_HORROR_15(new PlaySound("AmbSound.d_horror_15")),
+	// Quest 23
+	ITEMSOUND_ARMOR_LEATHER(new PlaySound("ItemSound.itemdrop_armor_leather")),
+	ITEMSOUND_WEAPON_SPEAR(new PlaySound("ItemSound.itemdrop_weapon_spear")),
+	AMBSOUND_MT_CREAK(new PlaySound("AmbSound.mt_creak01")),
+	AMBSOUND_EG_DRON(new PlaySound("AmbSound.eg_dron_02")),
+	SKILLSOUND_HORROR_02(new PlaySound("SkillSound5.horror_02")),
+	CHRSOUND_MHFIGHTER_CRY(new PlaySound("ChrSound.MHFighter_cry")),
+	// Quest 24
+	AMDSOUND_WIND_LOOT(new PlaySound("AmdSound.d_wind_loot_02")),
+	INTERFACESOUND_CHARSTAT_OPEN(new PlaySound("InterfaceSound.charstat_open_01")),
+	// Quest 25
+	AMDSOUND_HORROR_02(new PlaySound("AmdSound.dd_horror_02")),
+	CHRSOUND_FDELF_CRY(new PlaySound("ChrSound.FDElf_Cry")),
+	// Quest 115
+	AMBSOUND_WINGFLAP(new PlaySound("AmbSound.t_wingflap_04")),
+	AMBSOUND_THUNDER(new PlaySound("AmbSound.thunder_02")),
+	// Quest 120
+	AMBSOUND_DRONE(new PlaySound("AmbSound.ed_drone_02")),
+	AMBSOUND_CRYSTAL_LOOP(new PlaySound("AmbSound.cd_crystal_loop")),
+	AMBSOUND_PERCUSSION_01(new PlaySound("AmbSound.dt_percussion_01")),
+	AMBSOUND_PERCUSSION_02(new PlaySound("AmbSound.ac_percussion_02")),
+	// Quest 648 and treasure chests
+	ITEMSOUND_BROKEN_KEY(new PlaySound("ItemSound2.broken_key")),
+	// Quest 184
+	ITEMSOUND_SIREN(new PlaySound("ItemSound3.sys_siren")),
+	// Quest 648
+	ITEMSOUND_ENCHANT_SUCCESS(new PlaySound("ItemSound3.sys_enchant_success")),
+	ITEMSOUND_ENCHANT_FAILED(new PlaySound("ItemSound3.sys_enchant_failed")),
+	// Best farm mobs
+	ITEMSOUND_SOW_SUCCESS(new PlaySound("ItemSound3.sys_sow_success")),
+	// Quest 25
+	SKILLSOUND_HORROR_1(new PlaySound("SkillSound5.horror_01")),
+	// Quests 21 and 23
+	SKILLSOUND_HORROR_2(new PlaySound("SkillSound5.horror_02")),
+	// Quest 22
+	SKILLSOUND_ANTARAS_FEAR(new PlaySound("SkillSound3.antaras_fear")),
+	// Quest 505
+	SKILLSOUND_JEWEL_CELEBRATE(new PlaySound("SkillSound2.jewel.celebrate")),
+	// Quest 373
+	SKILLSOUND_LIQUID_MIX(new PlaySound("SkillSound5.liquid_mix_01")),
+	SKILLSOUND_LIQUID_SUCCESS(new PlaySound("SkillSound5.liquid_success_01")),
+	SKILLSOUND_LIQUID_FAIL(new PlaySound("SkillSound5.liquid_fail_01")),
+	// Quest 111
+	ETCSOUND_ELROKI_SONG_FULL(new PlaySound("EtcSound.elcroki_song_full")),
+	ETCSOUND_ELROKI_SONG_1ST(new PlaySound("EtcSound.elcroki_song_1st")),
+	ETCSOUND_ELROKI_SONG_2ND(new PlaySound("EtcSound.elcroki_song_2nd")),
+	ETCSOUND_ELROKI_SONG_3RD(new PlaySound("EtcSound.elcroki_song_3rd")),
+	// Long duration AI sounds
+	BS01_A(new PlaySound("BS01_A")),
+	BS02_A(new PlaySound("BS02_A")),
+	BS03_A(new PlaySound("BS03_A")),
+	BS04_A(new PlaySound("BS04_A")),
+	BS06_A(new PlaySound("BS06_A")),
+	BS07_A(new PlaySound("BS07_A")),
+	BS08_A(new PlaySound("BS08_A")),
+	BS01_D(new PlaySound("BS01_D")),
+	BS02_D(new PlaySound("BS02_D")),
+	BS05_D(new PlaySound("BS05_D")),
+	BS07_D(new PlaySound("BS07_D"));
+	
+	private final PlaySound _playSound;
+	
+	private static Map<String, PlaySound> soundPackets = new HashMap<>();
+	
+	private QuestSound(PlaySound playSound)
+	{
+		_playSound = playSound;
+	}
+	
+	/**
+	 * Get a {@link PlaySound} packet by its name.
+	 * @param soundName the name of the sound to look for
+	 * @return the {@link PlaySound} packet with the specified sound or {@code null} if one was not found
+	 */
+	public static PlaySound getSound(String soundName)
+	{
+		if (soundPackets.containsKey(soundName))
+		{
+			return soundPackets.get(soundName);
+		}
+		
+		for (QuestSound qs : QuestSound.values())
+		{
+			if (qs._playSound.getSoundName().equals(soundName))
+			{
+				soundPackets.put(soundName, qs._playSound); // cache in map to avoid looping repeatedly
+				return qs._playSound;
+			}
+		}
+		
+		soundPackets.put(soundName, new PlaySound(soundName));
+		return soundPackets.get(soundName);
+	}
+	
+	/**
+	 * @return the name of the sound of this QuestSound object
+	 */
+	public String getSoundName()
+	{
+		return _playSound.getSoundName();
+	}
+	
+	/**
+	 * @return the {@link PlaySound} packet of this QuestSound object
+	 */
+	public PlaySound getPacket()
+	{
+		return _playSound;
+	}
+}

L2J_Server_BETA/java/com/l2jserver/gameserver/enums/QuestType.java

@@ -0,0 +1,29 @@
+/*
+ * 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.enums;
+
+/**
+ * @author Luis Arias
+ */
+public enum QuestType
+{
+	REPEATABLE,
+	ONE_TIME,
+	DAILY
+}

L2J_Server_BETA/java/com/l2jserver/gameserver/enums/SiegeTeleportWhoType.java

@@ -0,0 +1,31 @@
+/*
+ * 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.enums;
+
+/**
+ * @author unknown
+ */
+public enum SiegeTeleportWhoType
+{
+	All,
+	Attacker,
+	DefenderNotOwner,
+	Owner,
+	Spectator
+}

L2J_Server_BETA/java/com/l2jserver/gameserver/enums/StatType.java

@@ -0,0 +1,35 @@
+/*
+ * 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.enums;
+
+/**
+ * @author unknown
+ */
+public enum StatType
+{
+	
+	HP,
+	MP,
+	XP,
+	SP,
+	GIM // grab item modifier:
+	// GIM: the default function uses only the skilllevel to determine
+	// how many item is grabbed in each step
+	// with this stat changer you can multiple this
+}

L2J_Server_BETA/java/com/l2jserver/gameserver/enums/TrapAction.java

@@ -0,0 +1,29 @@
+/*
+ * 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.enums;
+
+/**
+ * @author unknown
+ */
+public enum TrapAction
+{
+	TRAP_TRIGGERED,
+	TRAP_DETECTED,
+	TRAP_DISARMED
+}

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

@@ -30,6 +30,7 @@ import javolution.util.FastList;
 
 import com.l2jserver.L2DatabaseFactory;
 import com.l2jserver.gameserver.datatables.NpcTable;
+import com.l2jserver.gameserver.enums.ItemLocation;
 import com.l2jserver.gameserver.idfactory.IdFactory;
 import com.l2jserver.gameserver.model.L2World;
 import com.l2jserver.gameserver.model.actor.instance.L2DefenderInstance;
@@ -191,7 +192,7 @@ public final class MercTicketManager
 							itemId = ITEM_IDS[i];
 							// create the ticket in the gameworld
 							L2ItemInstance dropticket = new L2ItemInstance(IdFactory.getInstance().getNextId(), itemId);
-							dropticket.setItemLocation(L2ItemInstance.ItemLocation.VOID);
+							dropticket.setItemLocation(ItemLocation.VOID);
 							dropticket.dropMe(null, x, y, z);
 							dropticket.setDropTime(0); // avoids it from being removed by the auto item destroyer
 							L2World.getInstance().storeObject(dropticket);
@@ -335,7 +336,7 @@ public final class MercTicketManager
 				
 				// create the ticket in the gameworld
 				L2ItemInstance dropticket = new L2ItemInstance(IdFactory.getInstance().getNextId(), itemId);
-				dropticket.setItemLocation(L2ItemInstance.ItemLocation.VOID);
+				dropticket.setItemLocation(ItemLocation.VOID);
 				dropticket.dropMe(null, x, y, z);
 				dropticket.setDropTime(0); // avoids it from beeing removed by the auto item destroyer
 				L2World.getInstance().storeObject(dropticket); // add to the world

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

@@ -29,6 +29,7 @@ import org.w3c.dom.Node;
 import com.l2jserver.gameserver.ThreadPoolManager;
 import com.l2jserver.gameserver.ai.CtrlIntention;
 import com.l2jserver.gameserver.engines.DocumentParser;
+import com.l2jserver.gameserver.enums.QuestEventType;
 import com.l2jserver.gameserver.instancemanager.tasks.StartMovingTask;
 import com.l2jserver.gameserver.model.L2NpcWalkerNode;
 import com.l2jserver.gameserver.model.L2WalkRoute;
@@ -410,9 +411,9 @@ public final class WalkingManager extends DocumentParser
 		if (_activeRoutes.containsKey(npc.getObjectId()))
 		{
 			// Notify quest
-			if (npc.getTemplate().getEventQuests(Quest.QuestEventType.ON_NODE_ARRIVED) != null)
+			if (npc.getTemplate().getEventQuests(QuestEventType.ON_NODE_ARRIVED) != null)
 			{
-				for (Quest quest : npc.getTemplate().getEventQuests(Quest.QuestEventType.ON_NODE_ARRIVED))
+				for (Quest quest : npc.getTemplate().getEventQuests(QuestEventType.ON_NODE_ARRIVED))
 				{
 					quest.notifyNodeArrived(npc);
 				}

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

@@ -18,23 +18,13 @@
  */
 package com.l2jserver.gameserver.model;
 
+import com.l2jserver.gameserver.enums.StatType;
+
 /**
  * This class describes a RecipeList statUse and altStatChange component.
  */
 public class L2RecipeStatInstance
 {
-	public static enum StatType
-	{
-		HP,
-		MP,
-		XP,
-		SP,
-		GIM // grab item modifier:
-		// GIM: the default function uses only the skilllevel to determine
-		// how many item is grabbed in each step
-		// with this stat changer you can multiple this
-	}
-	
 	/** The Identifier of the statType */
 	private final StatType _type;
 	

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

@@ -20,6 +20,7 @@ package com.l2jserver.gameserver.model;
 
 import java.util.concurrent.ScheduledFuture;
 
+import com.l2jserver.gameserver.enums.QuestEventType;
 import com.l2jserver.gameserver.instancemanager.WalkingManager;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.quest.Quest;
@@ -95,9 +96,9 @@ public class WalkInfo
 			if (_currentNode == getRoute().getNodesCount()) // Last node arrived
 			{
 				// Notify quest
-				if (npc.getTemplate().getEventQuests(Quest.QuestEventType.ON_ROUTE_FINISHED) != null)
+				if (npc.getTemplate().getEventQuests(QuestEventType.ON_ROUTE_FINISHED) != null)
 				{
-					for (Quest quest : npc.getTemplate().getEventQuests(Quest.QuestEventType.ON_ROUTE_FINISHED))
+					for (Quest quest : npc.getTemplate().getEventQuests(QuestEventType.ON_ROUTE_FINISHED))
 					{
 						quest.notifyRouteFinished(npc);
 					}

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

@@ -41,6 +41,7 @@ import com.l2jserver.gameserver.datatables.HerbDropTable;
 import com.l2jserver.gameserver.datatables.ItemTable;
 import com.l2jserver.gameserver.datatables.ManorData;
 import com.l2jserver.gameserver.enums.InstanceType;
+import com.l2jserver.gameserver.enums.QuestEventType;
 import com.l2jserver.gameserver.instancemanager.CursedWeaponsManager;
 import com.l2jserver.gameserver.instancemanager.WalkingManager;
 import com.l2jserver.gameserver.model.L2CommandChannel;
@@ -551,9 +552,9 @@ public class L2Attackable extends L2Npc
 			
 			if (player != null)
 			{
-				if (getTemplate().getEventQuests(Quest.QuestEventType.ON_KILL) != null)
+				if (getTemplate().getEventQuests(QuestEventType.ON_KILL) != null)
 				{
-					for (Quest quest : getTemplate().getEventQuests(Quest.QuestEventType.ON_KILL))
+					for (Quest quest : getTemplate().getEventQuests(QuestEventType.ON_KILL))
 					{
 						ThreadPoolManager.getInstance().scheduleEffect(new OnKillNotifyTask(this, quest, player, (killer != null) && killer.isSummon()), _onKillDelay);
 					}
@@ -893,9 +894,9 @@ public class L2Attackable extends L2Npc
 				L2PcInstance player = attacker.getActingPlayer();
 				if (player != null)
 				{
-					if (getTemplate().getEventQuests(Quest.QuestEventType.ON_ATTACK) != null)
+					if (getTemplate().getEventQuests(QuestEventType.ON_ATTACK) != null)
 					{
-						for (Quest quest : getTemplate().getEventQuests(Quest.QuestEventType.ON_ATTACK))
+						for (Quest quest : getTemplate().getEventQuests(QuestEventType.ON_ATTACK))
 						{
 							quest.notifyAttack(this, player, damage, attacker.isSummon(), skill);
 						}
@@ -947,9 +948,9 @@ public class L2Attackable extends L2Npc
 		
 		if ((targetPlayer != null) && (aggro == 0))
 		{
-			if (getTemplate().getEventQuests(Quest.QuestEventType.ON_AGGRO_RANGE_ENTER) != null)
+			if (getTemplate().getEventQuests(QuestEventType.ON_AGGRO_RANGE_ENTER) != null)
 			{
-				for (Quest quest : getTemplate().getEventQuests(Quest.QuestEventType.ON_AGGRO_RANGE_ENTER))
+				for (Quest quest : getTemplate().getEventQuests(QuestEventType.ON_AGGRO_RANGE_ENTER))
 				{
 					quest.notifyAggroRangeEnter(this, targetPlayer, attacker.isSummon());
 				}

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

@@ -49,6 +49,7 @@ import com.l2jserver.gameserver.datatables.ItemTable;
 import com.l2jserver.gameserver.datatables.SkillTable;
 import com.l2jserver.gameserver.enums.CategoryType;
 import com.l2jserver.gameserver.enums.InstanceType;
+import com.l2jserver.gameserver.enums.QuestEventType;
 import com.l2jserver.gameserver.enums.ShotType;
 import com.l2jserver.gameserver.handler.ISkillHandler;
 import com.l2jserver.gameserver.handler.SkillHandler;
@@ -6508,9 +6509,9 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
 					{
 						L2Npc npcMob = (L2Npc) spMob;
 						
-						if ((npcMob.isInsideRadius(player, 1000, true, true)) && (npcMob.getTemplate().getEventQuests(Quest.QuestEventType.ON_SKILL_SEE) != null))
+						if ((npcMob.isInsideRadius(player, 1000, true, true)) && (npcMob.getTemplate().getEventQuests(QuestEventType.ON_SKILL_SEE) != null))
 						{
-							for (Quest quest : npcMob.getTemplate().getEventQuests(Quest.QuestEventType.ON_SKILL_SEE))
+							for (Quest quest : npcMob.getTemplate().getEventQuests(QuestEventType.ON_SKILL_SEE))
 							{
 								quest.notifySkillSee(npcMob, player, skill, targets, isSummon());
 							}

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

@@ -35,6 +35,7 @@ import com.l2jserver.gameserver.datatables.ItemTable;
 import com.l2jserver.gameserver.enums.AIType;
 import com.l2jserver.gameserver.enums.CategoryType;
 import com.l2jserver.gameserver.enums.InstanceType;
+import com.l2jserver.gameserver.enums.QuestEventType;
 import com.l2jserver.gameserver.enums.ShotType;
 import com.l2jserver.gameserver.handler.BypassHandler;
 import com.l2jserver.gameserver.handler.IBypassHandler;
@@ -70,7 +71,6 @@ import com.l2jserver.gameserver.model.items.L2Weapon;
 import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
 import com.l2jserver.gameserver.model.olympiad.Olympiad;
 import com.l2jserver.gameserver.model.quest.Quest;
-import com.l2jserver.gameserver.model.quest.Quest.QuestEventType;
 import com.l2jserver.gameserver.model.skills.L2Skill;
 import com.l2jserver.gameserver.model.skills.targets.L2TargetType;
 import com.l2jserver.gameserver.model.zone.type.L2TownZone;

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

@@ -27,6 +27,7 @@ import com.l2jserver.gameserver.ThreadPoolManager;
 import com.l2jserver.gameserver.ai.CtrlIntention;
 import com.l2jserver.gameserver.ai.L2AttackableAI;
 import com.l2jserver.gameserver.enums.InstanceType;
+import com.l2jserver.gameserver.enums.QuestEventType;
 import com.l2jserver.gameserver.model.L2World;
 import com.l2jserver.gameserver.model.L2WorldRegion;
 import com.l2jserver.gameserver.model.actor.L2Attackable;
@@ -34,7 +35,6 @@ import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.knownlist.GuardKnownList;
 import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
 import com.l2jserver.gameserver.model.quest.Quest;
-import com.l2jserver.gameserver.model.quest.Quest.QuestEventType;
 import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
 import com.l2jserver.gameserver.network.serverpackets.SocialAction;
 import com.l2jserver.util.Rnd;

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

@@ -92,6 +92,7 @@ import com.l2jserver.gameserver.enums.CategoryType;
 import com.l2jserver.gameserver.enums.InstanceType;
 import com.l2jserver.gameserver.enums.MountType;
 import com.l2jserver.gameserver.enums.PcRace;
+import com.l2jserver.gameserver.enums.QuestEventType;
 import com.l2jserver.gameserver.enums.Sex;
 import com.l2jserver.gameserver.enums.ShotType;
 import com.l2jserver.gameserver.handler.IItemHandler;
@@ -229,7 +230,6 @@ import com.l2jserver.gameserver.model.olympiad.OlympiadManager;
 import com.l2jserver.gameserver.model.punishment.PunishmentAffect;
 import com.l2jserver.gameserver.model.punishment.PunishmentType;
 import com.l2jserver.gameserver.model.quest.Quest;
-import com.l2jserver.gameserver.model.quest.Quest.QuestEventType;
 import com.l2jserver.gameserver.model.quest.QuestState;
 import com.l2jserver.gameserver.model.quest.State;
 import com.l2jserver.gameserver.model.skills.L2Skill;

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

@@ -41,6 +41,7 @@ import com.l2jserver.gameserver.datatables.SkillTable;
 import com.l2jserver.gameserver.datatables.SummonEffectsTable;
 import com.l2jserver.gameserver.datatables.SummonEffectsTable.SummonEffect;
 import com.l2jserver.gameserver.enums.InstanceType;
+import com.l2jserver.gameserver.enums.ItemLocation;
 import com.l2jserver.gameserver.handler.IItemHandler;
 import com.l2jserver.gameserver.handler.ItemHandler;
 import com.l2jserver.gameserver.idfactory.IdFactory;
@@ -372,7 +373,7 @@ public class L2PetInstance extends L2Summon
 	{
 		for (L2ItemInstance item : getInventory().getItems())
 		{
-			if ((item.getItemLocation() == L2ItemInstance.ItemLocation.PET_EQUIP) && (item.getItem().getBodyPart() == L2Item.SLOT_R_HAND))
+			if ((item.getItemLocation() == ItemLocation.PET_EQUIP) && (item.getItem().getBodyPart() == L2Item.SLOT_R_HAND))
 			{
 				return item;
 			}

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

@@ -20,6 +20,7 @@ package com.l2jserver.gameserver.model.actor.instance;
 
 import com.l2jserver.gameserver.ThreadPoolManager;
 import com.l2jserver.gameserver.enums.InstanceType;
+import com.l2jserver.gameserver.enums.QuestEventType;
 import com.l2jserver.gameserver.model.actor.L2Attackable;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
@@ -48,9 +49,9 @@ public final class L2QuestGuardInstance extends L2GuardInstance
 		
 		if (attacker instanceof L2Attackable)
 		{
-			if (getTemplate().getEventQuests(Quest.QuestEventType.ON_ATTACK) != null)
+			if (getTemplate().getEventQuests(QuestEventType.ON_ATTACK) != null)
 			{
-				for (Quest quest : getTemplate().getEventQuests(Quest.QuestEventType.ON_ATTACK))
+				for (Quest quest : getTemplate().getEventQuests(QuestEventType.ON_ATTACK))
 				{
 					quest.notifyAttack(this, null, damage, false, skill);
 				}
@@ -69,9 +70,9 @@ public final class L2QuestGuardInstance extends L2GuardInstance
 		
 		if (killer instanceof L2Attackable)
 		{
-			if (getTemplate().getEventQuests(Quest.QuestEventType.ON_KILL) != null)
+			if (getTemplate().getEventQuests(QuestEventType.ON_KILL) != null)
 			{
-				for (Quest quest : getTemplate().getEventQuests(Quest.QuestEventType.ON_KILL))
+				for (Quest quest : getTemplate().getEventQuests(QuestEventType.ON_KILL))
 				{
 					ThreadPoolManager.getInstance().scheduleEffect(new OnKillNotifyTask(this, quest, null, false), _onKillDelay);
 				}

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

@@ -26,6 +26,7 @@ import com.l2jserver.gameserver.ThreadPoolManager;
 import com.l2jserver.gameserver.ai.CtrlIntention;
 import com.l2jserver.gameserver.datatables.DoorTable;
 import com.l2jserver.gameserver.enums.InstanceType;
+import com.l2jserver.gameserver.enums.QuestEventType;
 import com.l2jserver.gameserver.instancemanager.FourSepulchersManager;
 import com.l2jserver.gameserver.model.L2World;
 import com.l2jserver.gameserver.model.actor.L2Npc;
@@ -236,8 +237,8 @@ public class L2SepulcherNpcInstance extends L2Npc
 			
 			default:
 			{
-				List<Quest> qlsa = getTemplate().getEventQuests(Quest.QuestEventType.QUEST_START);
-				List<Quest> qlst = getTemplate().getEventQuests(Quest.QuestEventType.ON_FIRST_TALK);
+				List<Quest> qlsa = getTemplate().getEventQuests(QuestEventType.QUEST_START);
+				List<Quest> qlst = getTemplate().getEventQuests(QuestEventType.ON_FIRST_TALK);
 				
 				if ((qlsa != null) && !qlsa.isEmpty())
 				{

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

@@ -23,6 +23,8 @@ import java.util.List;
 
 import com.l2jserver.gameserver.ThreadPoolManager;
 import com.l2jserver.gameserver.enums.InstanceType;
+import com.l2jserver.gameserver.enums.QuestEventType;
+import com.l2jserver.gameserver.enums.TrapAction;
 import com.l2jserver.gameserver.model.actor.L2Attackable;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.L2Npc;
@@ -34,7 +36,6 @@ import com.l2jserver.gameserver.model.items.L2Weapon;
 import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
 import com.l2jserver.gameserver.model.olympiad.OlympiadGameManager;
 import com.l2jserver.gameserver.model.quest.Quest;
-import com.l2jserver.gameserver.model.quest.Quest.TrapAction;
 import com.l2jserver.gameserver.model.skills.L2Skill;
 import com.l2jserver.gameserver.model.zone.ZoneId;
 import com.l2jserver.gameserver.network.SystemMessageId;
@@ -375,9 +376,9 @@ public final class L2TrapInstance extends L2Npc
 		
 		_playersWhoDetectedMe.add(detector.getObjectId());
 		
-		if (getTemplate().getEventQuests(Quest.QuestEventType.ON_TRAP_ACTION) != null)
+		if (getTemplate().getEventQuests(QuestEventType.ON_TRAP_ACTION) != null)
 		{
-			for (Quest quest : getTemplate().getEventQuests(Quest.QuestEventType.ON_TRAP_ACTION))
+			for (Quest quest : getTemplate().getEventQuests(QuestEventType.ON_TRAP_ACTION))
 			{
 				quest.notifyTrapAction(this, detector, TrapAction.TRAP_DETECTED);
 			}
@@ -400,9 +401,9 @@ public final class L2TrapInstance extends L2Npc
 		broadcastPacket(new TrapInfo(this, null));
 		setTarget(target);
 		
-		if (getTemplate().getEventQuests(Quest.QuestEventType.ON_TRAP_ACTION) != null)
+		if (getTemplate().getEventQuests(QuestEventType.ON_TRAP_ACTION) != null)
 		{
-			for (Quest quest : getTemplate().getEventQuests(Quest.QuestEventType.ON_TRAP_ACTION))
+			for (Quest quest : getTemplate().getEventQuests(QuestEventType.ON_TRAP_ACTION))
 			{
 				quest.notifyTrapAction(this, target, TrapAction.TRAP_TRIGGERED);
 			}

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/knownlist/NpcKnownList.java

@@ -25,6 +25,7 @@ import java.util.concurrent.ScheduledFuture;
 import com.l2jserver.gameserver.ThreadPoolManager;
 import com.l2jserver.gameserver.ai.CtrlIntention;
 import com.l2jserver.gameserver.enums.InstanceType;
+import com.l2jserver.gameserver.enums.QuestEventType;
 import com.l2jserver.gameserver.instancemanager.WalkingManager;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.actor.L2Attackable;
@@ -54,7 +55,7 @@ public class NpcKnownList extends CharKnownList
 		if (getActiveObject().isNpc() && (object instanceof L2Character))
 		{
 			final L2Npc npc = (L2Npc) getActiveObject();
-			final List<Quest> quests = npc.getTemplate().getEventQuests(Quest.QuestEventType.ON_SEE_CREATURE);
+			final List<Quest> quests = npc.getTemplate().getEventQuests(QuestEventType.ON_SEE_CREATURE);
 			if (quests != null)
 			{
 				for (Quest quest : quests)

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

@@ -30,6 +30,7 @@ import java.util.logging.Logger;
 import com.l2jserver.gameserver.datatables.HerbDropTable;
 import com.l2jserver.gameserver.enums.AISkillType;
 import com.l2jserver.gameserver.enums.NpcRace;
+import com.l2jserver.gameserver.enums.QuestEventType;
 import com.l2jserver.gameserver.model.L2DropCategory;
 import com.l2jserver.gameserver.model.L2DropData;
 import com.l2jserver.gameserver.model.L2MinionData;
@@ -39,7 +40,6 @@ 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;
 
 /**

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

@@ -34,6 +34,7 @@ import javolution.util.FastMap;
 import com.l2jserver.L2DatabaseFactory;
 import com.l2jserver.gameserver.ThreadPoolManager;
 import com.l2jserver.gameserver.datatables.ClanTable;
+import com.l2jserver.gameserver.enums.AuctionItemType;
 import com.l2jserver.gameserver.idfactory.IdFactory;
 import com.l2jserver.gameserver.instancemanager.AuctionManager;
 import com.l2jserver.gameserver.instancemanager.ClanHallManager;
@@ -68,11 +69,6 @@ public class Auction
 		"ClanHall"
 	};
 	
-	public static enum ItemTypeEnum
-	{
-		ClanHall
-	}
-	
 	public static class Bidder
 	{
 		private final String _name; // TODO replace with objid
@@ -244,7 +240,7 @@ public class Auction
 		ThreadPoolManager.getInstance().scheduleGeneral(new AutoEndTask(), taskDelay);
 	}
 	
-	public static String getItemTypeName(ItemTypeEnum value)
+	public static String getItemTypeName(AuctionItemType value)
 	{
 		return ItemTypeName[value.ordinal()];
 	}

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

@@ -26,6 +26,7 @@ import javolution.util.FastList;
 
 import com.l2jserver.gameserver.ThreadPoolManager;
 import com.l2jserver.gameserver.ai.CtrlIntention;
+import com.l2jserver.gameserver.enums.DuelResult;
 import com.l2jserver.gameserver.instancemanager.DuelManager;
 import com.l2jserver.gameserver.model.Location;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@@ -63,17 +64,6 @@ public class Duel
 	
 	private FastList<PlayerCondition> _playerConditions;
 	
-	public static enum DuelResultEnum
-	{
-		Continue,
-		Team1Win,
-		Team2Win,
-		Team1Surrender,
-		Team2Surrender,
-		Canceled,
-		Timeout
-	}
-	
 	public Duel(L2PcInstance playerA, L2PcInstance playerB, int partyDuel, int duelId)
 	{
 		_duelId = duelId;
@@ -202,15 +192,15 @@ public class Duel
 		{
 			try
 			{
-				DuelResultEnum status = _duel.checkEndDuelCondition();
+				DuelResult status = _duel.checkEndDuelCondition();
 				
-				if (status == DuelResultEnum.Canceled)
+				if (status == DuelResult.Canceled)
 				{
 					// do not schedule duel end if it was interrupted
 					setFinished(true);
 					_duel.endDuel(status);
 				}
-				else if (status != DuelResultEnum.Continue)
+				else if (status != DuelResult.Continue)
 				{
 					setFinished(true);
 					playKneelAnimation();
@@ -274,9 +264,9 @@ public class Duel
 	public static class ScheduleEndDuelTask implements Runnable
 	{
 		private final Duel _duel;
-		private final DuelResultEnum _result;
+		private final DuelResult _result;
 		
-		public ScheduleEndDuelTask(Duel duel, DuelResultEnum result)
+		public ScheduleEndDuelTask(Duel duel, DuelResult result)
 		{
 			_duel = duel;
 			_result = result;
@@ -738,7 +728,7 @@ public class Duel
 	 * The duel has reached a state in which it can no longer continue
 	 * @param result the duel result.
 	 */
-	public void endDuel(DuelResultEnum result)
+	public void endDuel(DuelResult result)
 	{
 		if ((_playerA == null) || (_playerB == null))
 		{
@@ -832,14 +822,14 @@ public class Duel
 	
 	/**
 	 * Did a situation occur in which the duel has to be ended?
-	 * @return DuelResultEnum duel status
+	 * @return DuelResult duel status
 	 */
-	public DuelResultEnum checkEndDuelCondition()
+	public DuelResult checkEndDuelCondition()
 	{
 		// one of the players might leave during duel
 		if ((_playerA == null) || (_playerB == null))
 		{
-			return DuelResultEnum.Canceled;
+			return DuelResult.Canceled;
 		}
 		
 		// got a duel surrender request?
@@ -847,27 +837,27 @@ public class Duel
 		{
 			if (_surrenderRequest == 1)
 			{
-				return DuelResultEnum.Team1Surrender;
+				return DuelResult.Team1Surrender;
 			}
-			return DuelResultEnum.Team2Surrender;
+			return DuelResult.Team2Surrender;
 		}
 		// duel timed out
 		else if (getRemainingTime() <= 0)
 		{
-			return DuelResultEnum.Timeout;
+			return DuelResult.Timeout;
 		}
 		// Has a player been declared winner yet?
 		else if (_playerA.getDuelState() == DUELSTATE_WINNER)
 		{
 			// If there is a Winner already there should be no more fighting going on
 			stopFighting();
-			return DuelResultEnum.Team1Win;
+			return DuelResult.Team1Win;
 		}
 		else if (_playerB.getDuelState() == DUELSTATE_WINNER)
 		{
 			// If there is a Winner already there should be no more fighting going on
 			stopFighting();
-			return DuelResultEnum.Team2Win;
+			return DuelResult.Team2Win;
 		}
 		
 		// More end duel conditions for 1on1 duels
@@ -876,29 +866,29 @@ public class Duel
 			// Duel was interrupted e.g.: player was attacked by mobs / other players
 			if ((_playerA.getDuelState() == DUELSTATE_INTERRUPTED) || (_playerB.getDuelState() == DUELSTATE_INTERRUPTED))
 			{
-				return DuelResultEnum.Canceled;
+				return DuelResult.Canceled;
 			}
 			
 			// Are the players too far apart?
 			if (!_playerA.isInsideRadius(_playerB, 1600, false, false))
 			{
-				return DuelResultEnum.Canceled;
+				return DuelResult.Canceled;
 			}
 			
 			// Did one of the players engage in PvP combat?
 			if (isDuelistInPvp(true))
 			{
-				return DuelResultEnum.Canceled;
+				return DuelResult.Canceled;
 			}
 			
 			// is one of the players in a Siege, Peace or PvP zone?
 			if (_playerA.isInsideZone(ZoneId.PEACE) || _playerB.isInsideZone(ZoneId.PEACE) || _playerA.isInsideZone(ZoneId.SIEGE) || _playerB.isInsideZone(ZoneId.SIEGE) || _playerA.isInsideZone(ZoneId.PVP) || _playerB.isInsideZone(ZoneId.PVP))
 			{
-				return DuelResultEnum.Canceled;
+				return DuelResult.Canceled;
 			}
 		}
 		
-		return DuelResultEnum.Continue;
+		return DuelResult.Continue;
 	}
 	
 	/**

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

@@ -34,6 +34,7 @@ import com.l2jserver.L2DatabaseFactory;
 import com.l2jserver.gameserver.ThreadPoolManager;
 import com.l2jserver.gameserver.datatables.ClanTable;
 import com.l2jserver.gameserver.datatables.NpcTable;
+import com.l2jserver.gameserver.enums.FortTeleportWhoType;
 import com.l2jserver.gameserver.instancemanager.FortManager;
 import com.l2jserver.gameserver.instancemanager.FortSiegeGuardManager;
 import com.l2jserver.gameserver.instancemanager.FortSiegeManager;
@@ -66,13 +67,6 @@ public class FortSiege implements Siegable
 	
 	private static FastList<FortSiegeListener> fortSiegeListeners = new FastList<FortSiegeListener>().shared();
 	
-	public static enum TeleportWhoType
-	{
-		All,
-		Attacker,
-		Owner,
-	}
-	
 	// SQL
 	private static final String DELETE_FORT_SIEGECLANS_BY_CLAN_ID = "DELETE FROM fortsiege_clans WHERE fort_id = ? AND clan_id = ?";
 	private static final String DELETE_FORT_SIEGECLANS = "DELETE FROM fortsiege_clans WHERE fort_id = ?";
@@ -344,7 +338,7 @@ public class FortSiege implements Siegable
 			
 			loadSiegeClan(); // Load siege clan from db
 			updatePlayerSiegeStateFlags(false);
-			teleportPlayer(FortSiege.TeleportWhoType.Attacker, TeleportWhereType.TOWN); // Teleport to the closest town
+			teleportPlayer(FortTeleportWhoType.Attacker, TeleportWhereType.TOWN); // Teleport to the closest town
 			
 			getFort().despawnNpcCommanders(); // Despawn NPC commanders
 			spawnCommanders(); // Spawn commanders
@@ -908,7 +902,7 @@ public class FortSiege implements Siegable
 	 * @param teleportWho
 	 * @param teleportWhere
 	 */
-	public void teleportPlayer(TeleportWhoType teleportWho, TeleportWhereType teleportWhere)
+	public void teleportPlayer(FortTeleportWhoType teleportWho, TeleportWhereType teleportWhere)
 	{
 		List<L2PcInstance> players;
 		switch (teleportWho)

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

@@ -37,6 +37,7 @@ import com.l2jserver.gameserver.SevenSigns;
 import com.l2jserver.gameserver.ThreadPoolManager;
 import com.l2jserver.gameserver.datatables.ClanTable;
 import com.l2jserver.gameserver.datatables.NpcTable;
+import com.l2jserver.gameserver.enums.SiegeTeleportWhoType;
 import com.l2jserver.gameserver.instancemanager.MercTicketManager;
 import com.l2jserver.gameserver.instancemanager.SiegeGuardManager;
 import com.l2jserver.gameserver.instancemanager.SiegeManager;
@@ -75,15 +76,6 @@ public class Siege implements Siegable
 	public static final byte ATTACKER = 1;
 	public static final byte DEFENDER_NOT_APPROWED = 2;
 	
-	public static enum TeleportWhoType
-	{
-		All,
-		Attacker,
-		DefenderNotOwner,
-		Owner,
-		Spectator
-	}
-	
 	private int _controlTowerCount;
 	
 	public class ScheduleEndSiegeTask implements Runnable
@@ -298,9 +290,9 @@ public class Siege implements Siegable
 			
 			getCastle().updateClansReputation();
 			removeFlags(); // Removes all flags. Note: Remove flag before teleporting players
-			teleportPlayer(Siege.TeleportWhoType.Attacker, TeleportWhereType.TOWN); // Teleport to the second closest town
-			teleportPlayer(Siege.TeleportWhoType.DefenderNotOwner, TeleportWhereType.TOWN); // Teleport to the second closest town
-			teleportPlayer(Siege.TeleportWhoType.Spectator, TeleportWhereType.TOWN); // Teleport to the second closest town
+			teleportPlayer(SiegeTeleportWhoType.Attacker, TeleportWhereType.TOWN); // Teleport to the second closest town
+			teleportPlayer(SiegeTeleportWhoType.DefenderNotOwner, TeleportWhereType.TOWN); // Teleport to the second closest town
+			teleportPlayer(SiegeTeleportWhoType.Spectator, TeleportWhereType.TOWN); // Teleport to the second closest town
 			_isInProgress = false; // Flag so that siege instance can be started
 			updatePlayerSiegeStateFlags(true);
 			saveCastleSiege(); // Save castle specific data
@@ -432,8 +424,8 @@ public class Siege implements Siegable
 						addDefender(sc, SiegeClanType.DEFENDER);
 					}
 				}
-				teleportPlayer(Siege.TeleportWhoType.Attacker, TeleportWhereType.SIEGEFLAG); // Teleport to the second closest town
-				teleportPlayer(Siege.TeleportWhoType.Spectator, TeleportWhereType.TOWN); // Teleport to the second closest town
+				teleportPlayer(SiegeTeleportWhoType.Attacker, TeleportWhereType.SIEGEFLAG); // Teleport to the second closest town
+				teleportPlayer(SiegeTeleportWhoType.Spectator, TeleportWhereType.TOWN); // Teleport to the second closest town
 				
 				removeDefenderFlags(); // Removes defenders' flags
 				getCastle().removeUpgrade(); // Remove all castle upgrade
@@ -487,8 +479,8 @@ public class Siege implements Siegable
 			
 			loadSiegeClan(); // Load siege clan from db
 			updatePlayerSiegeStateFlags(false);
-			teleportPlayer(Siege.TeleportWhoType.Attacker, TeleportWhereType.TOWN); // Teleport to the closest town
-			// teleportPlayer(Siege.TeleportWhoType.Spectator, MapRegionTable.TeleportWhereType.Town); // Teleport to the second closest town
+			teleportPlayer(SiegeTeleportWhoType.Attacker, TeleportWhereType.TOWN); // Teleport to the closest town
+			// teleportPlayer(SiegeTeleportWhoType.Spectator, MapRegionTable.TeleportWhereType.Town); // Teleport to the second closest town
 			_controlTowerCount = 0;
 			spawnControlTower(); // Spawn control tower
 			spawnFlameTower(); // Spawn control tower
@@ -1049,7 +1041,7 @@ public class Siege implements Siegable
 	 * @param teleportWho
 	 * @param teleportWhere
 	 */
-	public void teleportPlayer(TeleportWhoType teleportWho, TeleportWhereType teleportWhere)
+	public void teleportPlayer(SiegeTeleportWhoType teleportWho, TeleportWhereType teleportWhere)
 	{
 		List<L2PcInstance> players;
 		switch (teleportWho)

L2J_Server_BETA/java/com/l2jserver/gameserver/model/itemauction/ItemAuctionInstance.java

@@ -40,12 +40,12 @@ import com.l2jserver.Config;
 import com.l2jserver.L2DatabaseFactory;
 import com.l2jserver.gameserver.ThreadPoolManager;
 import com.l2jserver.gameserver.datatables.CharNameTable;
+import com.l2jserver.gameserver.enums.ItemLocation;
 import com.l2jserver.gameserver.instancemanager.ItemAuctionManager;
 import com.l2jserver.gameserver.model.L2World;
 import com.l2jserver.gameserver.model.StatsSet;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
-import com.l2jserver.gameserver.model.items.instance.L2ItemInstance.ItemLocation;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
 import com.l2jserver.util.Rnd;

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

@@ -21,10 +21,10 @@ package com.l2jserver.gameserver.model.itemcontainer;
 import javolution.util.FastList;
 
 import com.l2jserver.Config;
+import com.l2jserver.gameserver.enums.ItemLocation;
 import com.l2jserver.gameserver.model.L2Clan;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
-import com.l2jserver.gameserver.model.items.instance.L2ItemInstance.ItemLocation;
 import com.l2jserver.gameserver.scripting.scriptengine.events.ClanWarehouseAddItemEvent;
 import com.l2jserver.gameserver.scripting.scriptengine.events.ClanWarehouseDeleteItemEvent;
 import com.l2jserver.gameserver.scripting.scriptengine.events.ClanWarehouseTransferEvent;

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

@@ -32,6 +32,7 @@ import com.l2jserver.Config;
 import com.l2jserver.L2DatabaseFactory;
 import com.l2jserver.gameserver.datatables.ArmorSetsData;
 import com.l2jserver.gameserver.datatables.ItemTable;
+import com.l2jserver.gameserver.enums.ItemLocation;
 import com.l2jserver.gameserver.handler.ISkillHandler;
 import com.l2jserver.gameserver.handler.SkillHandler;
 import com.l2jserver.gameserver.model.L2ArmorSet;
@@ -41,7 +42,6 @@ import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.holders.SkillHolder;
 import com.l2jserver.gameserver.model.items.L2Item;
 import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
-import com.l2jserver.gameserver.model.items.instance.L2ItemInstance.ItemLocation;
 import com.l2jserver.gameserver.model.items.type.L2EtcItemType;
 import com.l2jserver.gameserver.model.items.type.L2WeaponType;
 import com.l2jserver.gameserver.model.skills.L2Skill;

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

@@ -31,13 +31,13 @@ import com.l2jserver.Config;
 import com.l2jserver.L2DatabaseFactory;
 import com.l2jserver.gameserver.GameTimeController;
 import com.l2jserver.gameserver.datatables.ItemTable;
+import com.l2jserver.gameserver.enums.ItemLocation;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.L2World;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.items.L2Item;
 import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
-import com.l2jserver.gameserver.model.items.instance.L2ItemInstance.ItemLocation;
 
 /**
  * @author Advi

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

@@ -24,10 +24,10 @@ import java.sql.ResultSet;
 import java.util.logging.Level;
 
 import com.l2jserver.L2DatabaseFactory;
+import com.l2jserver.gameserver.enums.ItemLocation;
 import com.l2jserver.gameserver.model.L2World;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
-import com.l2jserver.gameserver.model.items.instance.L2ItemInstance.ItemLocation;
 
 /**
  * @author DS

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

@@ -19,8 +19,8 @@
 package com.l2jserver.gameserver.model.itemcontainer;
 
 import com.l2jserver.Config;
+import com.l2jserver.gameserver.enums.ItemLocation;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jserver.gameserver.model.items.instance.L2ItemInstance.ItemLocation;
 import com.l2jserver.gameserver.model.stats.Stats;
 
 /**

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

@@ -30,12 +30,12 @@ import javolution.util.FastList;
 import com.l2jserver.Config;
 import com.l2jserver.L2DatabaseFactory;
 import com.l2jserver.gameserver.datatables.ItemTable;
+import com.l2jserver.gameserver.enums.ItemLocation;
 import com.l2jserver.gameserver.model.TradeItem;
 import com.l2jserver.gameserver.model.TradeList;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.items.L2Item;
 import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
-import com.l2jserver.gameserver.model.items.instance.L2ItemInstance.ItemLocation;
 import com.l2jserver.gameserver.model.items.type.L2EtcItemType;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.InventoryUpdate;

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

@@ -21,9 +21,9 @@ package com.l2jserver.gameserver.model.itemcontainer;
 import java.util.logging.Level;
 
 import com.l2jserver.gameserver.datatables.ItemTable;
+import com.l2jserver.gameserver.enums.ItemLocation;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
-import com.l2jserver.gameserver.model.items.instance.L2ItemInstance.ItemLocation;
 
 /**
  * @author DS

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

@@ -18,8 +18,8 @@
  */
 package com.l2jserver.gameserver.model.itemcontainer;
 
+import com.l2jserver.gameserver.enums.ItemLocation;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jserver.gameserver.model.items.instance.L2ItemInstance.ItemLocation;
 
 public class PcWarehouse extends Warehouse
 {

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

@@ -19,10 +19,10 @@
 package com.l2jserver.gameserver.model.itemcontainer;
 
 import com.l2jserver.gameserver.datatables.ItemTable;
+import com.l2jserver.gameserver.enums.ItemLocation;
 import com.l2jserver.gameserver.model.actor.instance.L2PetInstance;
 import com.l2jserver.gameserver.model.items.L2Item;
 import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
-import com.l2jserver.gameserver.model.items.instance.L2ItemInstance.ItemLocation;
 import com.l2jserver.gameserver.model.items.type.L2EtcItemType;
 
 public class PetInventory extends Inventory

L2J_Server_BETA/java/com/l2jserver/gameserver/model/items/L2Weapon.java

@@ -23,6 +23,7 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 
+import com.l2jserver.gameserver.enums.QuestEventType;
 import com.l2jserver.gameserver.handler.ISkillHandler;
 import com.l2jserver.gameserver.handler.SkillHandler;
 import com.l2jserver.gameserver.model.L2Object;
@@ -36,7 +37,6 @@ import com.l2jserver.gameserver.model.effects.L2Effect;
 import com.l2jserver.gameserver.model.holders.SkillHolder;
 import com.l2jserver.gameserver.model.items.type.L2WeaponType;
 import com.l2jserver.gameserver.model.quest.Quest;
-import com.l2jserver.gameserver.model.quest.Quest.QuestEventType;
 import com.l2jserver.gameserver.model.skills.L2Skill;
 import com.l2jserver.gameserver.model.stats.Env;
 import com.l2jserver.gameserver.model.stats.Formulas;

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

@@ -44,6 +44,7 @@ import com.l2jserver.gameserver.datatables.EnchantItemOptionsData;
 import com.l2jserver.gameserver.datatables.ItemTable;
 import com.l2jserver.gameserver.datatables.OptionsData;
 import com.l2jserver.gameserver.enums.InstanceType;
+import com.l2jserver.gameserver.enums.ItemLocation;
 import com.l2jserver.gameserver.enums.ShotType;
 import com.l2jserver.gameserver.instancemanager.ItemsOnGroundManager;
 import com.l2jserver.gameserver.instancemanager.MercTicketManager;
@@ -100,22 +101,6 @@ public final class L2ItemInstance extends L2Object
 	private static FastList<AugmentListener> augmentListeners = new FastList<AugmentListener>().shared();
 	private static FastList<DropListener> dropListeners = new FastList<DropListener>().shared();
 	
-	/** Enumeration of locations for item */
-	public static enum ItemLocation
-	{
-		VOID,
-		INVENTORY,
-		PAPERDOLL,
-		WAREHOUSE,
-		CLANWH,
-		PET,
-		PET_EQUIP,
-		LEASE,
-		REFUND,
-		MAIL,
-		FREIGHT
-	}
-	
 	/** ID of the owner */
 	private int _ownerId;
 	

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

@@ -42,6 +42,9 @@ import com.l2jserver.gameserver.cache.HtmCache;
 import com.l2jserver.gameserver.datatables.DoorTable;
 import com.l2jserver.gameserver.datatables.ItemTable;
 import com.l2jserver.gameserver.datatables.NpcTable;
+import com.l2jserver.gameserver.enums.QuestEventType;
+import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.TrapAction;
 import com.l2jserver.gameserver.idfactory.IdFactory;
 import com.l2jserver.gameserver.instancemanager.InstanceManager;
 import com.l2jserver.gameserver.instancemanager.QuestManager;
@@ -79,7 +82,6 @@ import com.l2jserver.gameserver.network.serverpackets.ExShowScreenMessage;
 import com.l2jserver.gameserver.network.serverpackets.InventoryUpdate;
 import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage;
 import com.l2jserver.gameserver.network.serverpackets.NpcQuestHtmlMessage;
-import com.l2jserver.gameserver.network.serverpackets.PlaySound;
 import com.l2jserver.gameserver.network.serverpackets.StatusUpdate;
 import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
 import com.l2jserver.gameserver.scripting.ManagedScript;
@@ -127,155 +129,6 @@ public class Quest extends ManagedScript implements IIdentifiable
 	private static final int RESET_HOUR = 6;
 	private static final int RESET_MINUTES = 30;
 	
-	/**
-	 * This enum contains known sound effects used by quests.<br>
-	 * The idea is to have only a single object of each quest sound instead of constructing a new one every time a script calls the playSound method.<br>
-	 * This is pretty much just a memory and CPU cycle optimization; avoids constructing/deconstructing objects all the time if they're all the same.<br>
-	 * For datapack scripts written in Java and extending the Quest class, this does not need an extra import.
-	 * @author jurchiks
-	 */
-	public static enum QuestSound
-	{
-		ITEMSOUND_QUEST_ACCEPT(new PlaySound("ItemSound.quest_accept")),
-		ITEMSOUND_QUEST_MIDDLE(new PlaySound("ItemSound.quest_middle")),
-		ITEMSOUND_QUEST_FINISH(new PlaySound("ItemSound.quest_finish")),
-		ITEMSOUND_QUEST_ITEMGET(new PlaySound("ItemSound.quest_itemget")),
-		// Newbie Guide tutorial (incl. some quests), Mutated Kaneus quests, Quest 192
-		ITEMSOUND_QUEST_TUTORIAL(new PlaySound("ItemSound.quest_tutorial")),
-		// Quests 107, 363, 364
-		ITEMSOUND_QUEST_GIVEUP(new PlaySound("ItemSound.quest_giveup")),
-		// Quests 212, 217, 224, 226, 416
-		ITEMSOUND_QUEST_BEFORE_BATTLE(new PlaySound("ItemSound.quest_before_battle")),
-		// Quests 211, 258, 266, 330
-		ITEMSOUND_QUEST_JACKPOT(new PlaySound("ItemSound.quest_jackpot")),
-		// Quests 508, 509 and 510
-		ITEMSOUND_QUEST_FANFARE_1(new PlaySound("ItemSound.quest_fanfare_1")),
-		// Played only after class transfer via Test Server Helpers (ID 31756 and 31757)
-		ITEMSOUND_QUEST_FANFARE_2(new PlaySound("ItemSound.quest_fanfare_2")),
-		// Quest 336
-		ITEMSOUND_QUEST_FANFARE_MIDDLE(new PlaySound("ItemSound.quest_fanfare_middle")),
-		// Quest 114
-		ITEMSOUND_ARMOR_WOOD(new PlaySound("ItemSound.armor_wood_3")),
-		// Quest 21
-		ITEMSOUND_ARMOR_CLOTH(new PlaySound("ItemSound.item_drop_equip_armor_cloth")),
-		AMDSOUND_ED_CHIMES(new PlaySound("AmdSound.ed_chimes_05")),
-		HORROR_01(new PlaySound("horror_01")), // played when spawned monster sees player
-		// Quest 22
-		AMBSOUND_HORROR_01(new PlaySound("AmbSound.dd_horror_01")),
-		AMBSOUND_HORROR_03(new PlaySound("AmbSound.d_horror_03")),
-		AMBSOUND_HORROR_15(new PlaySound("AmbSound.d_horror_15")),
-		// Quest 23
-		ITEMSOUND_ARMOR_LEATHER(new PlaySound("ItemSound.itemdrop_armor_leather")),
-		ITEMSOUND_WEAPON_SPEAR(new PlaySound("ItemSound.itemdrop_weapon_spear")),
-		AMBSOUND_MT_CREAK(new PlaySound("AmbSound.mt_creak01")),
-		AMBSOUND_EG_DRON(new PlaySound("AmbSound.eg_dron_02")),
-		SKILLSOUND_HORROR_02(new PlaySound("SkillSound5.horror_02")),
-		CHRSOUND_MHFIGHTER_CRY(new PlaySound("ChrSound.MHFighter_cry")),
-		// Quest 24
-		AMDSOUND_WIND_LOOT(new PlaySound("AmdSound.d_wind_loot_02")),
-		INTERFACESOUND_CHARSTAT_OPEN(new PlaySound("InterfaceSound.charstat_open_01")),
-		// Quest 25
-		AMDSOUND_HORROR_02(new PlaySound("AmdSound.dd_horror_02")),
-		CHRSOUND_FDELF_CRY(new PlaySound("ChrSound.FDElf_Cry")),
-		// Quest 115
-		AMBSOUND_WINGFLAP(new PlaySound("AmbSound.t_wingflap_04")),
-		AMBSOUND_THUNDER(new PlaySound("AmbSound.thunder_02")),
-		// Quest 120
-		AMBSOUND_DRONE(new PlaySound("AmbSound.ed_drone_02")),
-		AMBSOUND_CRYSTAL_LOOP(new PlaySound("AmbSound.cd_crystal_loop")),
-		AMBSOUND_PERCUSSION_01(new PlaySound("AmbSound.dt_percussion_01")),
-		AMBSOUND_PERCUSSION_02(new PlaySound("AmbSound.ac_percussion_02")),
-		// Quest 648 and treasure chests
-		ITEMSOUND_BROKEN_KEY(new PlaySound("ItemSound2.broken_key")),
-		// Quest 184
-		ITEMSOUND_SIREN(new PlaySound("ItemSound3.sys_siren")),
-		// Quest 648
-		ITEMSOUND_ENCHANT_SUCCESS(new PlaySound("ItemSound3.sys_enchant_success")),
-		ITEMSOUND_ENCHANT_FAILED(new PlaySound("ItemSound3.sys_enchant_failed")),
-		// Best farm mobs
-		ITEMSOUND_SOW_SUCCESS(new PlaySound("ItemSound3.sys_sow_success")),
-		// Quest 25
-		SKILLSOUND_HORROR_1(new PlaySound("SkillSound5.horror_01")),
-		// Quests 21 and 23
-		SKILLSOUND_HORROR_2(new PlaySound("SkillSound5.horror_02")),
-		// Quest 22
-		SKILLSOUND_ANTARAS_FEAR(new PlaySound("SkillSound3.antaras_fear")),
-		// Quest 505
-		SKILLSOUND_JEWEL_CELEBRATE(new PlaySound("SkillSound2.jewel.celebrate")),
-		// Quest 373
-		SKILLSOUND_LIQUID_MIX(new PlaySound("SkillSound5.liquid_mix_01")),
-		SKILLSOUND_LIQUID_SUCCESS(new PlaySound("SkillSound5.liquid_success_01")),
-		SKILLSOUND_LIQUID_FAIL(new PlaySound("SkillSound5.liquid_fail_01")),
-		// Quest 111
-		ETCSOUND_ELROKI_SONG_FULL(new PlaySound("EtcSound.elcroki_song_full")),
-		ETCSOUND_ELROKI_SONG_1ST(new PlaySound("EtcSound.elcroki_song_1st")),
-		ETCSOUND_ELROKI_SONG_2ND(new PlaySound("EtcSound.elcroki_song_2nd")),
-		ETCSOUND_ELROKI_SONG_3RD(new PlaySound("EtcSound.elcroki_song_3rd")),
-		// Long duration AI sounds
-		BS01_A(new PlaySound("BS01_A")),
-		BS02_A(new PlaySound("BS02_A")),
-		BS03_A(new PlaySound("BS03_A")),
-		BS04_A(new PlaySound("BS04_A")),
-		BS06_A(new PlaySound("BS06_A")),
-		BS07_A(new PlaySound("BS07_A")),
-		BS08_A(new PlaySound("BS08_A")),
-		BS01_D(new PlaySound("BS01_D")),
-		BS02_D(new PlaySound("BS02_D")),
-		BS05_D(new PlaySound("BS05_D")),
-		BS07_D(new PlaySound("BS07_D"));
-		
-		private final PlaySound _playSound;
-		
-		private static Map<String, PlaySound> soundPackets = new HashMap<>();
-		
-		private QuestSound(PlaySound playSound)
-		{
-			_playSound = playSound;
-		}
-		
-		/**
-		 * Get a {@link PlaySound} packet by its name.
-		 * @param soundName the name of the sound to look for
-		 * @return the {@link PlaySound} packet with the specified sound or {@code null} if one was not found
-		 */
-		public static PlaySound getSound(String soundName)
-		{
-			if (soundPackets.containsKey(soundName))
-			{
-				return soundPackets.get(soundName);
-			}
-			
-			for (QuestSound qs : QuestSound.values())
-			{
-				if (qs._playSound.getSoundName().equals(soundName))
-				{
-					soundPackets.put(soundName, qs._playSound); // cache in map to avoid looping repeatedly
-					return qs._playSound;
-				}
-			}
-			
-			_log.info("Missing QuestSound enum for sound: " + soundName);
-			soundPackets.put(soundName, new PlaySound(soundName));
-			return soundPackets.get(soundName);
-		}
-		
-		/**
-		 * @return the name of the sound of this QuestSound object
-		 */
-		public String getSoundName()
-		{
-			return _playSound.getSoundName();
-		}
-		
-		/**
-		 * @return the {@link PlaySound} packet of this QuestSound object
-		 */
-		public PlaySound getPacket()
-		{
-			return _playSound;
-		}
-	}
-	
 	/**
 	 * @return the reset hour for a daily quest, could be overridden on a script.
 	 */
@@ -344,59 +197,6 @@ public class Quest extends ManagedScript implements IIdentifiable
 		
 	}
 	
-	/**
-	 * Trap actions:<br>
-	 * <ul>
-	 * <li>Triggered</li>
-	 * <li>Detected</li>
-	 * <li>Disarmed</li>
-	 * </ul>
-	 */
-	public static enum TrapAction
-	{
-		TRAP_TRIGGERED,
-		TRAP_DETECTED,
-		TRAP_DISARMED
-	}
-	
-	public static enum QuestEventType
-	{
-		ON_FIRST_TALK(false), // control the first dialog shown by NPCs when they are clicked (some quests must override the default npc action)
-		QUEST_START(true), // onTalk action from start npcs
-		ON_TALK(true), // onTalk action from npcs participating in a quest
-		ON_ATTACK(true), // onAttack action triggered when a mob gets attacked by someone
-		ON_KILL(true), // onKill action triggered when a mob gets killed.
-		ON_SPAWN(true), // onSpawn action triggered when an NPC is spawned or respawned.
-		ON_SKILL_SEE(true), // NPC or Mob saw a person casting a skill (regardless what the target is).
-		ON_FACTION_CALL(true), // NPC or Mob saw a person casting a skill (regardless what the target is).
-		ON_AGGRO_RANGE_ENTER(true), // a person came within the Npc/Mob's range
-		ON_SPELL_FINISHED(true), // on spell finished action when npc finish casting skill
-		ON_SKILL_LEARN(false), // control the AcquireSkill dialog from quest script
-		ON_ENTER_ZONE(true), // on zone enter
-		ON_EXIT_ZONE(true), // on zone exit
-		ON_TRAP_ACTION(true), // on zone exit
-		ON_ITEM_USE(true),
-		ON_EVENT_RECEIVED(true), // onEventReceived action, triggered when NPC receiving an event, sent by other NPC
-		ON_MOVE_FINISHED(true), // onMoveFinished action, triggered when NPC stops after moving
-		ON_NODE_ARRIVED(true), // onNodeArrived action, triggered when NPC, controlled by Walking Manager, arrives to next node
-		ON_SEE_CREATURE(true), // onSeeCreature action, triggered when NPC's known list include the character
-		ON_ROUTE_FINISHED(true); // onRouteFinished action, triggered when NPC, controlled by Walking Manager, arrives to last node
-		
-		// control whether this event type is allowed for the same npc template in multiple quests
-		// or if the npc must be registered in at most one quest for the specified event
-		private boolean _allowMultipleRegistration;
-		
-		private QuestEventType(boolean allowMultipleRegistration)
-		{
-			_allowMultipleRegistration = allowMultipleRegistration;
-		}
-		
-		public boolean isMultipleRegistrationAllowed()
-		{
-			return _allowMultipleRegistration;
-		}
-	}
-	
 	/**
 	 * Gets the quest ID.
 	 * @return the quest ID

L2J_Server_BETA/java/com/l2jserver/gameserver/model/quest/QuestState.java

@@ -29,6 +29,8 @@ import java.util.logging.Logger;
 
 import com.l2jserver.L2DatabaseFactory;
 import com.l2jserver.gameserver.cache.HtmCache;
+import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.QuestType;
 import com.l2jserver.gameserver.instancemanager.QuestManager;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.L2Npc;
@@ -36,7 +38,6 @@ import com.l2jserver.gameserver.model.actor.instance.L2MonsterInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.holders.ItemHolder;
 import com.l2jserver.gameserver.model.itemcontainer.PcInventory;
-import com.l2jserver.gameserver.model.quest.Quest.QuestSound;
 import com.l2jserver.gameserver.network.serverpackets.ExShowQuestMark;
 import com.l2jserver.gameserver.network.serverpackets.PlaySound;
 import com.l2jserver.gameserver.network.serverpackets.QuestList;
@@ -71,16 +72,6 @@ public final class QuestState
 	 */
 	private boolean _isExitQuestOnCleanUp = false;
 	
-	/**
-	 * This enumerate represent the different quest types.
-	 */
-	public static enum QuestType
-	{
-		REPEATABLE,
-		ONE_TIME,
-		DAILY
-	}
-	
 	/**
 	 * Constructor of the QuestState. Creates the QuestState object and sets the player's progress of the quest to this QuestState.
 	 * @param quest the {@link Quest} object associated with the QuestState

L2J_Server_BETA/java/com/l2jserver/gameserver/model/zone/L2ZoneType.java

@@ -28,13 +28,13 @@ import java.util.logging.Logger;
 import javolution.util.FastMap;
 
 import com.l2jserver.gameserver.enums.InstanceType;
+import com.l2jserver.gameserver.enums.QuestEventType;
 import com.l2jserver.gameserver.instancemanager.InstanceManager;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.Location;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.quest.Quest;
-import com.l2jserver.gameserver.model.quest.Quest.QuestEventType;
 import com.l2jserver.gameserver.network.serverpackets.L2GameServerPacket;
 
 /**
@@ -437,7 +437,7 @@ public abstract class L2ZoneType
 			// Was the character not yet inside this zone?
 			if (!_characterList.containsKey(character.getObjectId()))
 			{
-				List<Quest> quests = getQuestByEvent(Quest.QuestEventType.ON_ENTER_ZONE);
+				List<Quest> quests = getQuestByEvent(QuestEventType.ON_ENTER_ZONE);
 				if (quests != null)
 				{
 					for (Quest quest : quests)
@@ -454,7 +454,7 @@ public abstract class L2ZoneType
 			// Was the character inside this zone?
 			if (_characterList.containsKey(character.getObjectId()))
 			{
-				List<Quest> quests = getQuestByEvent(Quest.QuestEventType.ON_EXIT_ZONE);
+				List<Quest> quests = getQuestByEvent(QuestEventType.ON_EXIT_ZONE);
 				if (quests != null)
 				{
 					for (Quest quest : quests)
@@ -476,7 +476,7 @@ public abstract class L2ZoneType
 	{
 		if (_characterList.containsKey(character.getObjectId()))
 		{
-			List<Quest> quests = getQuestByEvent(Quest.QuestEventType.ON_EXIT_ZONE);
+			List<Quest> quests = getQuestByEvent(QuestEventType.ON_EXIT_ZONE);
 			if (quests != null)
 			{
 				for (Quest quest : quests)
@@ -545,7 +545,7 @@ public abstract class L2ZoneType
 		return players;
 	}
 	
-	public void addQuestEvent(Quest.QuestEventType EventType, Quest q)
+	public void addQuestEvent(QuestEventType EventType, Quest q)
 	{
 		if (_questEvents == null)
 		{
@@ -563,7 +563,7 @@ public abstract class L2ZoneType
 		_questEvents.put(EventType, questByEvents);
 	}
 	
-	public List<Quest> getQuestByEvent(Quest.QuestEventType EventType)
+	public List<Quest> getQuestByEvent(QuestEventType EventType)
 	{
 		if (_questEvents == null)
 		{

L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/AbstractRefinePacket.java

@@ -23,12 +23,12 @@ import java.util.HashMap;
 import java.util.Map;
 
 import com.l2jserver.Config;
+import com.l2jserver.gameserver.enums.ItemLocation;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.items.L2Armor;
 import com.l2jserver.gameserver.model.items.L2Item;
 import com.l2jserver.gameserver.model.items.L2Weapon;
 import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
-import com.l2jserver.gameserver.model.items.instance.L2ItemInstance.ItemLocation;
 import com.l2jserver.gameserver.network.SystemMessageId;
 
 public abstract class AbstractRefinePacket extends L2GameClientPacket

L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestAcquireSkill.java

@@ -21,6 +21,7 @@ package com.l2jserver.gameserver.network.clientpackets;
 import com.l2jserver.Config;
 import com.l2jserver.gameserver.datatables.SkillTable;
 import com.l2jserver.gameserver.datatables.SkillTreesData;
+import com.l2jserver.gameserver.enums.QuestEventType;
 import com.l2jserver.gameserver.instancemanager.QuestManager;
 import com.l2jserver.gameserver.model.L2Clan;
 import com.l2jserver.gameserver.model.L2SkillLearn;
@@ -35,7 +36,6 @@ import com.l2jserver.gameserver.model.holders.ItemHolder;
 import com.l2jserver.gameserver.model.holders.SkillHolder;
 import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
 import com.l2jserver.gameserver.model.quest.Quest;
-import com.l2jserver.gameserver.model.quest.Quest.QuestEventType;
 import com.l2jserver.gameserver.model.quest.QuestState;
 import com.l2jserver.gameserver.model.skills.L2Skill;
 import com.l2jserver.gameserver.network.SystemMessageId;

L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestCancelPostAttachment.java

@@ -19,13 +19,13 @@
 package com.l2jserver.gameserver.network.clientpackets;
 
 import com.l2jserver.Config;
+import com.l2jserver.gameserver.enums.ItemLocation;
 import com.l2jserver.gameserver.instancemanager.MailManager;
 import com.l2jserver.gameserver.model.L2World;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.entity.Message;
 import com.l2jserver.gameserver.model.itemcontainer.ItemContainer;
 import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
-import com.l2jserver.gameserver.model.items.instance.L2ItemInstance.ItemLocation;
 import com.l2jserver.gameserver.model.zone.ZoneId;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.ExChangePostState;

L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestPostAttachment.java

@@ -22,13 +22,13 @@ import static com.l2jserver.gameserver.model.itemcontainer.PcInventory.ADENA_ID;
 
 import com.l2jserver.Config;
 import com.l2jserver.gameserver.datatables.ItemTable;
+import com.l2jserver.gameserver.enums.ItemLocation;
 import com.l2jserver.gameserver.instancemanager.MailManager;
 import com.l2jserver.gameserver.model.L2World;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.entity.Message;
 import com.l2jserver.gameserver.model.itemcontainer.ItemContainer;
 import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
-import com.l2jserver.gameserver.model.items.instance.L2ItemInstance.ItemLocation;
 import com.l2jserver.gameserver.model.zone.ZoneId;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.ExChangePostState;

L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestSaveInventoryOrder.java

@@ -21,10 +21,10 @@ package com.l2jserver.gameserver.network.clientpackets;
 import java.util.ArrayList;
 import java.util.List;
 
+import com.l2jserver.gameserver.enums.ItemLocation;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.itemcontainer.Inventory;
 import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
-import com.l2jserver.gameserver.model.items.instance.L2ItemInstance.ItemLocation;
 
 /**
  * Format:(ch) d[dd]