Moved Gracia scripts to zones package.

trunk/dist/game/data/scripts.cfg

@@ -143,7 +143,6 @@ ai/npc/Teleports/PaganTeleporters/PaganTeleporters.java
 ai/npc/Teleports/StakatoNestTeleporter/StakatoNestTeleporter.java
 ai/npc/Teleports/SteelCitadelTeleport/SteelCitadelTeleport.java
 ai/npc/Teleports/StrongholdsTeleports/StrongholdsTeleports.java
-ai/npc/Teleports/Survivor/Survivor.java
 ai/npc/Teleports/TeleportToFantasy/TeleportToFantasy.java
 ai/npc/Teleports/TeleportToRaceTrack/TeleportToRaceTrack.java
 ai/npc/Teleports/TeleportToUndergroundColiseum/TeleportToUndergroundColiseum.java
@@ -176,6 +175,29 @@ ai/zones/FantasyIsle/HandysBlockCheckerEvent.java
 ai/zones/FantasyIsle/Parade.java
 ai/zones/FantasyIsle/TalentShow.java
 
+# Gracia
+ai/zones/Gracia/EnergySeeds.java
+ai/zones/Gracia/SeedOfAnnihilation.java
+ai/zones/Gracia/StarStones.java
+ai/zones/Gracia/instances/SecretArea/SecretArea.java
+ai/zones/Gracia/instances/SeedOfDestruction/Stage1.java
+ai/zones/Gracia/instances/SeedOfInfinity/HallOfSuffering/HallOfSuffering.java
+ai/zones/Gracia/npcs/GeneralDilios.java
+ai/zones/Gracia/npcs/Lindvior.java
+ai/zones/Gracia/npcs/Maguen.java
+ai/zones/Gracia/npcs/FortuneTelling/FortuneTelling.java
+ai/zones/Gracia/npcs/Lekon/Lekon.java
+ai/zones/Gracia/npcs/Nemo/Nemo.java
+ai/zones/Gracia/npcs/Nottingale/Nottingale.java
+ai/zones/Gracia/npcs/Seyo/Seyo.java
+ai/zones/Gracia/npcs/Survivor/Survivor.java
+ai/zones/Gracia/npcs/ZealotOfShilen/ZealotOfShilen.java
+ai/zones/Gracia/vehicles/AirShipGludioGracia/AirShipGludioGracia.java
+ai/zones/Gracia/vehicles/KeucereusNorthController/KeucereusNorthController.java
+ai/zones/Gracia/vehicles/KeucereusSouthController/KeucereusSouthController.java
+ai/zones/Gracia/vehicles/SoIController/SoIController.java
+ai/zones/Gracia/vehicles/SoDController/SoDController.java
+		
 # Magmeld
 ai/zones/Magmeld/AnghelWaterfallPortal.java
 ai/zones/Magmeld/ArcanRitual.java
@@ -229,9 +251,6 @@ village_master/ProofOfJustice/ProofOfJustice.java
 # Instance Section
 instances/InstanceLoader.java
 
-# Gracia Section
-gracia/GraciaLoader.java
-
 # Quests Section
 quests/QuestMasterHandler.java
 

trunk/dist/game/data/scripts/ai/zones/Gracia/EnergySeeds.java

@@ -14,7 +14,7 @@
  * 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 gracia.AI;
+package ai.zones.Gracia;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -88,9 +88,9 @@ public class EnergySeeds extends AbstractNpcAI
 		ANNIHILATION_COKRAKON
 	}
 	
-	public EnergySeeds()
+	private EnergySeeds()
 	{
-		super(EnergySeeds.class.getSimpleName(), "gracia/AI");
+		super(EnergySeeds.class.getSimpleName(), "ai/zones/Gracia");
 		registerMobs(SEED_IDS);
 		addFirstTalkId(SEED_IDS);
 		addFirstTalkId(TEMPORARY_TELEPORTER);
@@ -739,4 +739,9 @@ public class EnergySeeds extends AbstractNpcAI
 			}, waitTime);
 		}
 	}
+	
+	public static void main(String[] args)
+	{
+		new EnergySeeds();
+	}
 }

trunk/dist/game/data/scripts/ai/zones/Gracia/SeedOfAnnihilation.java

@@ -14,7 +14,7 @@
  * 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 gracia.AI.SeedOfAnnihilation;
+package ai.zones.Gracia;
 
 import java.util.Calendar;
 import java.util.HashMap;
@@ -74,9 +74,9 @@ public class SeedOfAnnihilation extends AbstractNpcAI
 		TELEPORT_ZONES.put(60005, new Location(-179275, 186802, -10720));
 	}
 	
-	public SeedOfAnnihilation()
+	private SeedOfAnnihilation()
 	{
-		super(SeedOfAnnihilation.class.getSimpleName(), "gracia/AI");
+		super(SeedOfAnnihilation.class.getSimpleName(), "ai/zones/Gracia");
 		loadSeedRegionData();
 		for (int i : TELEPORT_ZONES.keySet())
 		{
@@ -361,4 +361,9 @@ public class SeedOfAnnihilation extends AbstractNpcAI
 			af_spawns = as;
 		}
 	}
+	
+	public static void main(String[] args)
+	{
+		new SeedOfAnnihilation();
+	}
 }

trunk/dist/game/data/scripts/ai/zones/Gracia/StarStones.java

@@ -14,7 +14,7 @@
  * 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 gracia.AI;
+package ai.zones.Gracia;
 
 import com.l2jmobius.gameserver.model.L2Object;
 import com.l2jmobius.gameserver.model.actor.L2Npc;
@@ -39,9 +39,9 @@ public class StarStones extends AbstractNpcAI
 	
 	private static final int COLLECTION_RATE = 1;
 	
-	public StarStones()
+	private StarStones()
 	{
-		super(StarStones.class.getSimpleName(), "gracia/AI");
+		super(StarStones.class.getSimpleName(), "ai/zones/Gracia");
 		addSkillSeeId(MOBS);
 	}
 	
@@ -102,4 +102,9 @@ public class StarStones extends AbstractNpcAI
 		}
 		return super.onSkillSee(npc, caster, skill, targets, isSummon);
 	}
+	
+	public static void main(String[] args)
+	{
+		new StarStones();
+	}
 }

trunk/dist/game/data/scripts/ai/zones/Gracia/instances/SecretArea/SecretArea.java

@@ -14,7 +14,7 @@
  * 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 gracia.instances.SecretArea;
+package ai.zones.Gracia.instances.SecretArea;
 
 import com.l2jmobius.gameserver.instancemanager.InstanceManager;
 import com.l2jmobius.gameserver.model.Location;
@@ -45,9 +45,9 @@ public final class SecretArea extends Quest
 	{
 	}
 	
-	public SecretArea()
+	private SecretArea()
 	{
-		super(-1, SecretArea.class.getSimpleName(), "gracia/instances");
+		super(-1, SecretArea.class.getSimpleName(), "ai/zones/Gracia/instances");
 		addStartNpc(GINBY);
 		addTalkId(GINBY);
 		addTalkId(LELRIKIA);
@@ -93,4 +93,9 @@ public final class SecretArea extends Quest
 		}
 		return htmltext;
 	}
+	
+	public static void main(String[] args)
+	{
+		new SecretArea();
+	}
 }

trunk/dist/game/data/scripts/ai/zones/Gracia/instances/SeedOfDestruction/Stage1.java

@@ -14,7 +14,7 @@
  * 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 gracia.instances.SeedOfDestruction;
+package ai.zones.Gracia.instances.SeedOfDestruction;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -212,10 +212,10 @@ public final class Stage1 extends Quest
 	private static final int RESET_DAY_1 = 4;
 	private static final int RESET_DAY_2 = 7;
 	
-	public Stage1()
+	private Stage1()
 	{
 		// TODO change name to use actual class name
-		super(-1, "Stage1", "gracia/instances");
+		super(-1, "Stage1", "ai/zones/Gracia/instances");
 		load();
 		addStartNpc(ALENOS);
 		addTalkId(ALENOS);
@@ -1043,4 +1043,9 @@ public final class Stage1 extends Quest
 		}
 		return null;
 	}
+	
+	public static void main(String[] args)
+	{
+		new Stage1();
+	}
 }

trunk/dist/game/data/scripts/ai/zones/Gracia/instances/SeedOfInfinity/HallOfSuffering/HallOfSuffering.java

@@ -14,7 +14,7 @@
  * 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 gracia.instances.SeedOfInfinity.HallOfSuffering;
+package ai.zones.Gracia.instances.SeedOfInfinity.HallOfSuffering;
 
 import java.util.Calendar;
 import java.util.HashMap;
@@ -183,9 +183,9 @@ public final class HallOfSuffering extends AbstractNpcAI
 	private static final int MIN_LEVEL = 75;
 	private static final int MAX_LEVEL = 82;
 	
-	public HallOfSuffering()
+	private HallOfSuffering()
 	{
-		super(HallOfSuffering.class.getSimpleName(), "gracia/instances/SeedOfInfinity");
+		super(HallOfSuffering.class.getSimpleName(), "ai/zones/Gracia/instances/SeedOfInfinity");
 		addStartNpc(MOUTHOFEKIMUS, TEPIOS);
 		addTalkId(MOUTHOFEKIMUS, TEPIOS);
 		addFirstTalkId(TEPIOS);
@@ -689,4 +689,9 @@ public final class HallOfSuffering extends AbstractNpcAI
 		}
 		return super.onTalk(npc, talker);
 	}
+	
+	public static void main(String[] args)
+	{
+		new HallOfSuffering();
+	}
 }

trunk/dist/game/data/scripts/ai/zones/Gracia/npcs/FortuneTelling/FortuneTelling.java

@@ -14,7 +14,7 @@
  * 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 gracia.AI.NPC.FortuneTelling;
+package ai.zones.Gracia.npcs.FortuneTelling;
 
 import com.l2jmobius.gameserver.model.actor.L2Npc;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
@@ -34,9 +34,9 @@ public class FortuneTelling extends AbstractNpcAI
 	// Misc
 	private static final int COST = 1000;
 	
-	public FortuneTelling()
+	private FortuneTelling()
 	{
-		super(FortuneTelling.class.getSimpleName(), "gracia/AI/NPC");
+		super(FortuneTelling.class.getSimpleName(), "ai/zones/Gracia/npcs");
 		addStartNpc(MINE);
 		addTalkId(MINE);
 	}
@@ -56,4 +56,9 @@ public class FortuneTelling extends AbstractNpcAI
 		}
 		return htmltext;
 	}
+	
+	public static void main(String[] args)
+	{
+		new FortuneTelling();
+	}
 }

trunk/dist/game/data/scripts/ai/zones/Gracia/npcs/GeneralDilios.java

@@ -14,7 +14,7 @@
  * 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 gracia.AI.NPC.GeneralDilios;
+package ai.zones.Gracia.npcs;
 
 import java.util.Collections;
 import java.util.Set;
@@ -53,9 +53,9 @@ public final class GeneralDilios extends AbstractNpcAI
 		// NpcStringId.MESSENGER_INFORM_THE_BROTHERS_IN_KUCEREUS_CLAN_OUTPOST_EKIMUS_IS_ABOUT_TO_BE_REVIVED_BY_THE_RESURRECTED_UNDEAD_IN_SEED_OF_INFINITY_SEND_ALL_REINFORCEMENTS_TO_THE_HEART_AND_THE_HALL_OF_SUFFERING
 	};
 	
-	public GeneralDilios()
+	private GeneralDilios()
 	{
-		super(GeneralDilios.class.getSimpleName(), "gracia/AI/NPC");
+		super(GeneralDilios.class.getSimpleName(), "ai/zones/Gracia/npcs");
 		
 		addSpawnId(GENERAL_ID, GUARD_ID);
 	}
@@ -107,4 +107,9 @@ public final class GeneralDilios extends AbstractNpcAI
 		}
 		return super.onSpawn(npc);
 	}
+	
+	public static void main(String[] args)
+	{
+		new GeneralDilios();
+	}
 }

trunk/dist/game/data/scripts/ai/zones/Gracia/npcs/Lekon/Lekon.java

@@ -14,7 +14,7 @@
  * 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 gracia.AI.NPC.Lekon;
+package ai.zones.Gracia.npcs.Lekon;
 
 import com.l2jmobius.gameserver.instancemanager.AirShipManager;
 import com.l2jmobius.gameserver.model.L2Clan;
@@ -39,9 +39,9 @@ public final class Lekon extends AbstractNpcAI
 	private static final int MIN_CLAN_LV = 5;
 	private static final int STONE_COUNT = 10;
 	
-	public Lekon()
+	private Lekon()
 	{
-		super(Lekon.class.getSimpleName(), "gracia/AI/NPC");
+		super(Lekon.class.getSimpleName(), "ai/zones/Gracia/npcs");
 		addFirstTalkId(LEKON);
 		addTalkId(LEKON);
 		addStartNpc(LEKON);
@@ -87,4 +87,9 @@ public final class Lekon extends AbstractNpcAI
 		}
 		return htmltext;
 	}
+	
+	public static void main(String[] args)
+	{
+		new Lekon();
+	}
 }

trunk/dist/game/data/scripts/ai/zones/Gracia/npcs/Lindvior.java

@@ -14,7 +14,7 @@
  * 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 gracia.AI;
+package ai.zones.Gracia.npcs;
 
 import java.util.Calendar;
 import java.util.GregorianCalendar;
@@ -51,9 +51,9 @@ public class Lindvior extends AbstractNpcAI
 	private L2Npc _tomaris = null;
 	private L2Npc _artius = null;
 	
-	public Lindvior()
+	private Lindvior()
 	{
-		super(Lindvior.class.getSimpleName(), "gracia/AI");
+		super(Lindvior.class.getSimpleName(), "ai/zones/Gracia/npcs");
 		scheduleNextLindviorVisit();
 	}
 	
@@ -138,4 +138,9 @@ public class Lindvior extends AbstractNpcAI
 		}
 		return date.getTimeInMillis() - System.currentTimeMillis();
 	}
+	
+	public static void main(String[] args)
+	{
+		new Lindvior();
+	}
 }

trunk/dist/game/data/scripts/ai/zones/Gracia/npcs/Maguen.java

@@ -14,7 +14,7 @@
  * 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 gracia.AI;
+package ai.zones.Gracia.npcs;
 
 import com.l2jmobius.gameserver.ai.CtrlIntention;
 import com.l2jmobius.gameserver.instancemanager.QuestManager;
@@ -28,7 +28,7 @@ import com.l2jmobius.gameserver.model.skills.Skill;
 import com.l2jmobius.gameserver.network.NpcStringId;
 
 import ai.AbstractNpcAI;
-import gracia.AI.NPC.Nemo.Nemo;
+import ai.zones.Gracia.npcs.Nemo.Nemo;
 
 /**
  * Maguen AI.
@@ -72,9 +72,9 @@ public final class Maguen extends AbstractNpcAI
 	private static final SkillHolder R_PLASMA2 = new SkillHolder(6369, 2); // Maguen Plasma - Reptilikon
 	private static final SkillHolder R_PLASMA3 = new SkillHolder(6369, 3); // Maguen Plasma - Reptilikon
 	
-	public Maguen()
+	private Maguen()
 	{
-		super(Maguen.class.getSimpleName(), "gracia/AI");
+		super(Maguen.class.getSimpleName(), "ai/zones/Gracia/npcs");
 		addKillId(ELITES);
 		addSkillSeeId(MAGUEN);
 		addSpellFinishedId(MAGUEN);
@@ -393,4 +393,9 @@ public final class Maguen extends AbstractNpcAI
 	{
 		return QuestManager.getInstance().getQuest(Nemo.class.getSimpleName());
 	}
+	
+	public static void main(String[] args)
+	{
+		new Maguen();
+	}
 }

trunk/dist/game/data/scripts/ai/zones/Gracia/npcs/Nemo/Nemo.java

@@ -14,7 +14,7 @@
  * 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 gracia.AI.NPC.Nemo;
+package ai.zones.Gracia.npcs.Nemo;
 
 import com.l2jmobius.gameserver.ai.CtrlIntention;
 import com.l2jmobius.gameserver.instancemanager.QuestManager;
@@ -24,7 +24,7 @@ import com.l2jmobius.gameserver.model.quest.Quest;
 import com.l2jmobius.gameserver.network.NpcStringId;
 
 import ai.AbstractNpcAI;
-import gracia.AI.Maguen;
+import ai.zones.Gracia.npcs.Maguen;
 
 /**
  * Nemo AI.
@@ -40,9 +40,9 @@ public final class Nemo extends AbstractNpcAI
 	// Misc
 	private static final int MAXIMUM_MAGUEN = 18; // Maximum maguens in one time
 	
-	public Nemo()
+	private Nemo()
 	{
-		super(Nemo.class.getSimpleName(), "gracia/AI/NPC");
+		super(Nemo.class.getSimpleName(), "ai/zones/Gracia/npcs");
 		addStartNpc(NEMO);
 		addFirstTalkId(NEMO);
 		addTalkId(NEMO);
@@ -117,4 +117,9 @@ public final class Nemo extends AbstractNpcAI
 	{
 		return QuestManager.getInstance().getQuest(Maguen.class.getSimpleName());
 	}
+	
+	public static void main(String[] args)
+	{
+		new Nemo();
+	}
 }

trunk/dist/game/data/scripts/ai/zones/Gracia/npcs/Nottingale/Nottingale.java

@@ -14,7 +14,7 @@
  * 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 gracia.AI.NPC.Nottingale;
+package ai.zones.Gracia.npcs.Nottingale;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -50,9 +50,9 @@ public final class Nottingale extends AbstractNpcAI
 		RADARS.put(10, new RadarControl(0, -246899, 251918, 4352, 1));
 	}
 	
-	public Nottingale()
+	private Nottingale()
 	{
-		super(Nottingale.class.getSimpleName(), "gracia/AI/NPC");
+		super(Nottingale.class.getSimpleName(), "ai/zones/Gracia/npcs");
 		addStartNpc(NOTTINGALE);
 		addTalkId(NOTTINGALE);
 		addFirstTalkId(NOTTINGALE);
@@ -117,4 +117,9 @@ public final class Nottingale extends AbstractNpcAI
 		}
 		return htmltext;
 	}
+	
+	public static void main(String[] args)
+	{
+		new Nottingale();
+	}
 }

trunk/dist/game/data/scripts/ai/zones/Gracia/npcs/Seyo/Seyo.java

@@ -14,7 +14,7 @@
  * 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 gracia.AI.NPC.Seyo;
+package ai.zones.Gracia.npcs.Seyo;
 
 import com.l2jmobius.gameserver.enums.ChatType;
 import com.l2jmobius.gameserver.model.actor.L2Npc;
@@ -43,9 +43,9 @@ public final class Seyo extends AbstractNpcAI
 		NpcStringId.THERE_WAS_SOMEONE_WHO_WON_10_000_FROM_ME_A_WARRIOR_SHOULDN_T_JUST_BE_GOOD_AT_FIGHTING_RIGHT_YOU_VE_GOTTA_BE_GOOD_IN_EVERYTHING
 	};
 	
-	public Seyo()
+	private Seyo()
 	{
-		super(Seyo.class.getSimpleName(), "gracia/AI/NPC");
+		super(Seyo.class.getSimpleName(), "ai/zones/Gracia/npcs");
 		addStartNpc(SEYO);
 		addTalkId(SEYO);
 		addFirstTalkId(SEYO);
@@ -168,4 +168,9 @@ public final class Seyo extends AbstractNpcAI
 		}
 		return htmltext;
 	}
+	
+	public static void main(String[] args)
+	{
+		new Seyo();
+	}
 }

trunk/dist/game/data/scripts/ai/zones/Gracia/npcs/Survivor/Survivor.java

@@ -14,7 +14,7 @@
  * 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 ai.npc.Teleports.Survivor;
+package ai.zones.Gracia.npcs.Survivor;
 
 import com.l2jmobius.gameserver.model.Location;
 import com.l2jmobius.gameserver.model.actor.L2Npc;
@@ -39,7 +39,7 @@ final class Survivor extends AbstractNpcAI
 	
 	private Survivor()
 	{
-		super(Survivor.class.getSimpleName(), "ai/npc/Teleports");
+		super(Survivor.class.getSimpleName(), "ai/zones/Gracia/npcs");
 		addStartNpc(SURVIVOR);
 		addTalkId(SURVIVOR);
 	}

trunk/dist/game/data/scripts/ai/zones/Gracia/npcs/ZealotOfShilen/ZealotOfShilen.java

@@ -14,7 +14,7 @@
  * 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 gracia.AI.NPC.ZealotOfShilen;
+package ai.zones.Gracia.npcs.ZealotOfShilen;
 
 import com.l2jmobius.gameserver.model.actor.L2Attackable;
 import com.l2jmobius.gameserver.model.actor.L2Character;
@@ -37,9 +37,9 @@ public final class ZealotOfShilen extends AbstractNpcAI
 		32629
 	};
 	
-	public ZealotOfShilen()
+	private ZealotOfShilen()
 	{
-		super(ZealotOfShilen.class.getSimpleName(), "gracia/AI/NPC");
+		super(ZealotOfShilen.class.getSimpleName(), "ai/zones/Gracia/npcs");
 		addSpawnId(ZEALOT);
 		addSpawnId(GUARDS);
 		addFirstTalkId(GUARDS);
@@ -88,4 +88,9 @@ public final class ZealotOfShilen extends AbstractNpcAI
 		}
 		return super.onSpawn(npc);
 	}
+	
+	public static void main(String[] args)
+	{
+		new ZealotOfShilen();
+	}
 }

trunk/dist/game/data/scripts/ai/zones/Gracia/vehicles/AirShipController.java

@@ -14,7 +14,7 @@
  * 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 gracia.vehicles;
+package ai.zones.Gracia.vehicles;
 
 import java.util.concurrent.Future;
 import java.util.logging.Level;

trunk/dist/game/data/scripts/ai/zones/Gracia/vehicles/AirShipGludioGracia/AirShipGludioGracia.java

@@ -14,7 +14,7 @@
  * 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 gracia.vehicles.AirShipGludioGracia;
+package ai.zones.Gracia.vehicles.AirShipGludioGracia;
 
 import com.l2jmobius.gameserver.ThreadPoolManager;
 import com.l2jmobius.gameserver.enums.ChatType;
@@ -107,9 +107,9 @@ public final class AirShipGludioGracia extends Quest implements Runnable
 	private boolean _foundAtcGracia = false;
 	private L2Npc _atcGracia = null;
 	
-	public AirShipGludioGracia()
+	private AirShipGludioGracia()
 	{
-		super(-1, AirShipGludioGracia.class.getSimpleName(), "gracia/vehicles");
+		super(-1, AirShipGludioGracia.class.getSimpleName(), "ai/zones/Gracia/vehicles");
 		addStartNpc(CONTROLLERS);
 		addFirstTalkId(CONTROLLERS);
 		addTalkId(CONTROLLERS);
@@ -321,4 +321,9 @@ public final class AirShipGludioGracia extends Quest implements Runnable
 		}
 		return super.unload(removeFromList);
 	}
+	
+	public static void main(String[] args)
+	{
+		new AirShipGludioGracia();
+	}
 }

trunk/dist/game/data/scripts/ai/zones/Gracia/vehicles/KeucereusNorthController/KeucereusNorthController.java

@@ -14,12 +14,12 @@
  * 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 gracia.vehicles.KeucereusNorthController;
+package ai.zones.Gracia.vehicles.KeucereusNorthController;
 
 import com.l2jmobius.gameserver.model.Location;
 import com.l2jmobius.gameserver.model.VehiclePathPoint;
 
-import gracia.vehicles.AirShipController;
+import ai.zones.Gracia.vehicles.AirShipController;
 
 public final class KeucereusNorthController extends AirShipController
 {
@@ -65,9 +65,9 @@ public final class KeucereusNorthController extends AirShipController
 		100
 	};
 	
-	public KeucereusNorthController()
+	private KeucereusNorthController()
 	{
-		super(-1, KeucereusNorthController.class.getSimpleName(), "gracia/vehicles");
+		super(-1, KeucereusNorthController.class.getSimpleName(), "ai/zones/Gracia/vehicles");
 		addStartNpc(CONTROLLER_ID);
 		addFirstTalkId(CONTROLLER_ID);
 		addTalkId(CONTROLLER_ID);
@@ -92,4 +92,9 @@ public final class KeucereusNorthController extends AirShipController
 		
 		validityCheck();
 	}
+	
+	public static void main(String[] args)
+	{
+		new KeucereusNorthController();
+	}
 }

trunk/dist/game/data/scripts/ai/zones/Gracia/vehicles/KeucereusSouthController/KeucereusSouthController.java

@@ -14,12 +14,12 @@
  * 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 gracia.vehicles.KeucereusSouthController;
+package ai.zones.Gracia.vehicles.KeucereusSouthController;
 
 import com.l2jmobius.gameserver.model.Location;
 import com.l2jmobius.gameserver.model.VehiclePathPoint;
 
-import gracia.vehicles.AirShipController;
+import ai.zones.Gracia.vehicles.AirShipController;
 
 public final class KeucereusSouthController extends AirShipController
 {
@@ -65,9 +65,9 @@ public final class KeucereusSouthController extends AirShipController
 		100
 	};
 	
-	public KeucereusSouthController()
+	private KeucereusSouthController()
 	{
-		super(-1, KeucereusSouthController.class.getSimpleName(), "gracia/vehicles");
+		super(-1, KeucereusSouthController.class.getSimpleName(), "ai/zones/Gracia/vehicles");
 		addStartNpc(CONTROLLER_ID);
 		addFirstTalkId(CONTROLLER_ID);
 		addTalkId(CONTROLLER_ID);
@@ -92,4 +92,9 @@ public final class KeucereusSouthController extends AirShipController
 		
 		validityCheck();
 	}
+	
+	public static void main(String[] args)
+	{
+		new KeucereusSouthController();
+	}
 }

trunk/dist/game/data/scripts/ai/zones/Gracia/vehicles/SoDController/SoDController.java

@@ -14,12 +14,12 @@
  * 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 gracia.vehicles.SoDController;
+package ai.zones.Gracia.vehicles.SoDController;
 
 import com.l2jmobius.gameserver.model.Location;
 import com.l2jmobius.gameserver.model.VehiclePathPoint;
 
-import gracia.vehicles.AirShipController;
+import ai.zones.Gracia.vehicles.AirShipController;
 
 public final class SoDController extends AirShipController
 {
@@ -55,9 +55,9 @@ public final class SoDController extends AirShipController
 		100
 	};
 	
-	public SoDController()
+	private SoDController()
 	{
-		super(-1, SoDController.class.getSimpleName(), "gracia/vehicles");
+		super(-1, SoDController.class.getSimpleName(), "ai/zones/Gracia/vehicles");
 		addStartNpc(CONTROLLER_ID);
 		addFirstTalkId(CONTROLLER_ID);
 		addTalkId(CONTROLLER_ID);
@@ -82,4 +82,9 @@ public final class SoDController extends AirShipController
 		
 		validityCheck();
 	}
+	
+	public static void main(String[] args)
+	{
+		new SoDController();
+	}
 }

trunk/dist/game/data/scripts/ai/zones/Gracia/vehicles/SoIController/SoIController.java

@@ -14,12 +14,12 @@
  * 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 gracia.vehicles.SoIController;
+package ai.zones.Gracia.vehicles.SoIController;
 
 import com.l2jmobius.gameserver.model.Location;
 import com.l2jmobius.gameserver.model.VehiclePathPoint;
 
-import gracia.vehicles.AirShipController;
+import ai.zones.Gracia.vehicles.AirShipController;
 
 public final class SoIController extends AirShipController
 {
@@ -59,9 +59,9 @@ public final class SoIController extends AirShipController
 		50
 	};
 	
-	public SoIController()
+	private SoIController()
 	{
-		super(-1, SoIController.class.getSimpleName(), "gracia/vehicles");
+		super(-1, SoIController.class.getSimpleName(), "ai/zones/Gracia/vehicles");
 		addStartNpc(CONTROLLER_ID);
 		addFirstTalkId(CONTROLLER_ID);
 		addTalkId(CONTROLLER_ID);
@@ -86,4 +86,9 @@ public final class SoIController extends AirShipController
 		
 		validityCheck();
 	}
+	
+	public static void main(String[] args)
+	{
+		new SoIController();
+	}
 }

trunk/dist/game/data/scripts/gracia/GraciaLoader.java

@@ -1,95 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program 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.
- * 
- * This program 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 gracia;
-
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import gracia.AI.EnergySeeds;
-import gracia.AI.Lindvior;
-import gracia.AI.Maguen;
-import gracia.AI.StarStones;
-import gracia.AI.NPC.FortuneTelling.FortuneTelling;
-import gracia.AI.NPC.GeneralDilios.GeneralDilios;
-import gracia.AI.NPC.Lekon.Lekon;
-import gracia.AI.NPC.Nemo.Nemo;
-import gracia.AI.NPC.Nottingale.Nottingale;
-import gracia.AI.NPC.Seyo.Seyo;
-import gracia.AI.NPC.ZealotOfShilen.ZealotOfShilen;
-import gracia.AI.SeedOfAnnihilation.SeedOfAnnihilation;
-import gracia.instances.SecretArea.SecretArea;
-import gracia.instances.SeedOfDestruction.Stage1;
-import gracia.instances.SeedOfInfinity.HallOfSuffering.HallOfSuffering;
-import gracia.vehicles.AirShipGludioGracia.AirShipGludioGracia;
-import gracia.vehicles.KeucereusNorthController.KeucereusNorthController;
-import gracia.vehicles.KeucereusSouthController.KeucereusSouthController;
-import gracia.vehicles.SoDController.SoDController;
-import gracia.vehicles.SoIController.SoIController;
-
-/**
- * Gracia class-loader.
- * @author Pandragon
- */
-final class GraciaLoader
-{
-	private static final Logger _log = Logger.getLogger(GraciaLoader.class.getName());
-	
-	private static final Class<?>[] SCRIPTS =
-	{
-		// AIs
-		EnergySeeds.class,
-		Lindvior.class,
-		Maguen.class,
-		StarStones.class,
-		// NPCs
-		FortuneTelling.class,
-		GeneralDilios.class,
-		Lekon.class,
-		Nemo.class,
-		Nottingale.class,
-		Seyo.class,
-		ZealotOfShilen.class,
-		// Seed of Annihilation
-		SeedOfAnnihilation.class,
-		// Instances
-		SecretArea.class,
-		Stage1.class, // Seed of Destruction
-		HallOfSuffering.class, // Seed of Infinity
-		// Vehicles
-		AirShipGludioGracia.class,
-		KeucereusNorthController.class,
-		KeucereusSouthController.class,
-		SoIController.class,
-		SoDController.class,
-	};
-	
-	public static void main(String[] args)
-	{
-		_log.info(GraciaLoader.class.getSimpleName() + ": Loading Gracia related scripts.");
-		for (Class<?> script : SCRIPTS)
-		{
-			try
-			{
-				script.newInstance();
-			}
-			catch (Exception e)
-			{
-				_log.log(Level.SEVERE, GraciaLoader.class.getSimpleName() + ": Failed loading " + script.getSimpleName() + ":", e);
-			}
-		}
-	}
-}