BETA: Organizing Gracia Scripts:

  * Gracia related AIs moved to new gracia folder.
  * Now using a classloader to load them (instead of scripts.cfg).
  
 Patch by: Pandragon

L2J_DataPack_BETA/dist/game/data/scripts.cfg

@@ -33,22 +33,17 @@ ai/npc/ForgeOfTheGods/Rooney.java
 ai/npc/ForgeOfTheGods/TarBeetle.java
 ai/npc/FortressArcherCaptain/FortressArcherCaptain.java
 ai/npc/FortressSiegeManager/FortressSiegeManager.java
-ai/npc/FortuneTelling/FortuneTelling.java
 ai/npc/FreyasSteward/FreyasSteward.java
 ai/npc/Jinia/Jinia.java
 ai/npc/KetraOrcSupport/KetraOrcSupport.java
-ai/npc/Lekon/Lekon.java
 ai/npc/MercenaryCaptain/MercenaryCaptain.java
 ai/npc/Minigame/Minigame.java
 ai/npc/MonumentOfHeroes/MonumentOfHeroes.java
-ai/npc/Nemo/Nemo.java
-ai/npc/Nottingale/Nottingale.java
 ai/npc/NpcBuffers/NpcBuffers.java
 ai/npc/NpcBuffers/impl/CabaleBuffer.java
 ai/npc/PriestOfBlessing/PriestOfBlessing.java
 ai/npc/Rignos/Rignos.java
 ai/npc/Rafforty/Rafforty.java
-ai/npc/Seyo/Seyo.java
 ai/npc/Sirra/Sirra.java
 ai/npc/SubclassCertification/SubclassCertification.java
 ai/npc/Summons/MerchantGolem/GolemTrader.java
@@ -84,7 +79,6 @@ ai/npc/VarkaSilenosSupport/VarkaSilenosSupport.java
 ai/npc/VillageMasters/FirstClassTransferTalk/FirstClassTransferTalk.java
 ai/npc/WeaverOlf/WeaverOlf.java
 ai/npc/WyvernManager/WyvernManager.java
-ai/npc/ZealotOfShilen/ZealotOfShilen.java
 
 # Fantasy Isle
 ai/fantasy_isle/MC_Show.java
@@ -95,7 +89,6 @@ ai/group_template/AltarsOfSacrifice.java
 ai/group_template/BeastFarm.java
 ai/group_template/DenOfEvil.java
 ai/group_template/DragonValley.java
-ai/group_template/EnergySeeds.java
 ai/group_template/FairyTrees.java
 ai/group_template/FeedableBeasts.java
 ai/group_template/FleeMonsters.java
@@ -119,13 +112,11 @@ ai/group_template/RandomSpawn.java
 ai/group_template/RangeGuard.java
 ai/group_template/Remnants.java
 ai/group_template/Sandstorms.java
-ai/group_template/SeedOfAnnihilation.java
 ai/group_template/SeeThroughSilentMove.java
 ai/group_template/SelMahumDrill.java
 ai/group_template/SelMahumSquad.java
 ai/group_template/SilentValley.java
 ai/group_template/StakatoNest.java
-ai/group_template/StarStones.java
 ai/group_template/SummonMinions.java
 ai/group_template/SummonPc.java
 ai/group_template/TurekOrcs.java
@@ -149,10 +140,7 @@ ai/individual/DrChaos.java
 ai/individual/Epidos.java
 ai/individual/EvasGiftBox.java
 ai/individual/FrightenedRagnaOrc.java
-ai/individual/GeneralDilios.java
 ai/individual/Gordon.java
-ai/individual/Lindvior.java
-ai/individual/Maguen.java
 ai/individual/Orfen.java
 ai/individual/QueenAnt.java
 ai/individual/QueenShyeed.java
@@ -204,9 +192,9 @@ instances/NornilsGarden/NornilsGarden.java
 instances/PailakaDevilsLegacy/PailakaDevilsLegacy.java
 instances/PailakaSongOfIceAndFire/PailakaSongOfIceAndFire.java
 instances/SanctumOftheLordsOfDawn/SanctumOftheLordsOfDawn.java
-instances/SecretArea/SecretArea.java
-instances/SeedOfDestruction/Stage1.java
-instances/SeedOfInfinity/HallOfSuffering.java
+
+# Gracia Section
+gracia/GraciaLoader.java
 
 # Hellbound Section
 hellbound/HellboundLoader.java
@@ -323,13 +311,6 @@ vehicles/BoatGiranTalking.java
 vehicles/BoatInnadrilTour.java
 vehicles/BoatGludinRune.java
 vehicles/BoatRunePrimeval.java
-vehicles/AirShipGludioGracia/AirShipGludioGracia.java
-
-# AirShip Controllers
-vehicles/KeucereusNorthController/KeucereusNorthController.java
-vehicles/KeucereusSouthController/KeucereusSouthController.java
-vehicles/SoIController/SoIController.java
-vehicles/SoDController/SoDController.java
 
 # Conquerable Clan Halls
 conquerablehalls/flagwar/BanditStronghold/BanditStronghold.java

L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/EnergySeeds.java → L2J_DataPack_BETA/dist/game/data/scripts/gracia/AI/EnergySeeds.java

@@ -16,7 +16,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.group_template;
+package gracia.AI;
 
 import java.util.Map;
 
@@ -96,9 +96,9 @@ public class EnergySeeds extends AbstractNpcAI
 		ANNIHILATION_COKRAKON
 	}
 	
-	private EnergySeeds()
+	public EnergySeeds()
 	{
-		super(EnergySeeds.class.getSimpleName(), "instances"); // ai/group_template?
+		super(EnergySeeds.class.getSimpleName(), "gracia/AI");
 		registerMobs(SEED_IDS);
 		addFirstTalkId(SEED_IDS);
 		addFirstTalkId(TEMPORARY_TELEPORTER);
@@ -757,25 +757,16 @@ public class EnergySeeds extends AbstractNpcAI
 		
 		public void scheduleRespawn(long waitTime)
 		{
-			ThreadPoolManager.getInstance().scheduleGeneral(new Runnable()
+			ThreadPoolManager.getInstance().scheduleGeneral(() ->
 			{
-				@Override
-				public void run()
+				// if the AI is inactive, do not spawn the NPC
+				if (isSeedActive(_seedId))
 				{
-					// if the AI is inactive, do not spawn the NPC
-					if (isSeedActive(_seedId))
-					{
-						// get a random NPC that should spawn at this location
-						Integer spawnId = _spawnId; // the map uses "Integer", not "int"
-						_spawnedNpcs.put(addSpawn(_npcIds[getRandom(_npcIds.length)], _loc, false, 0), spawnId);
-					}
+					// get a random NPC that should spawn at this location
+					Integer spawnId = _spawnId; // the map uses "Integer", not "int"
+					_spawnedNpcs.put(addSpawn(_npcIds[getRandom(_npcIds.length)], _loc, false, 0), spawnId);
 				}
 			}, waitTime);
 		}
 	}
-	
-	public static void main(String[] args)
-	{
-		new EnergySeeds();
-	}
 }

L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Lindvior.java → L2J_DataPack_BETA/dist/game/data/scripts/gracia/AI/Lindvior.java

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

L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Maguen.java → L2J_DataPack_BETA/dist/game/data/scripts/gracia/AI/Maguen.java

@@ -16,10 +16,9 @@
  * 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.individual;
+package gracia.AI;
 
 import ai.npc.AbstractNpcAI;
-import ai.npc.Nemo.Nemo;
 
 import com.l2jserver.gameserver.ai.CtrlIntention;
 import com.l2jserver.gameserver.instancemanager.QuestManager;
@@ -32,6 +31,8 @@ import com.l2jserver.gameserver.model.skills.BuffInfo;
 import com.l2jserver.gameserver.model.skills.Skill;
 import com.l2jserver.gameserver.network.NpcStringId;
 
+import gracia.AI.NPC.Nemo.Nemo;
+
 /**
  * Maguen AI.
  * @author St3eT
@@ -74,9 +75,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
 	
-	private Maguen()
+	public Maguen()
 	{
-		super(Maguen.class.getSimpleName(), "ai/invidual");
+		super(Maguen.class.getSimpleName(), "gracia/AI");
 		addKillId(ELITES);
 		addSkillSeeId(MAGUEN);
 		addSpellFinishedId(MAGUEN);
@@ -376,9 +377,4 @@ public final class Maguen extends AbstractNpcAI
 	{
 		return QuestManager.getInstance().getQuest(Nemo.class.getSimpleName());
 	}
-	
-	public static void main(String[] args)
-	{
-		new Maguen();
-	}
 }

L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/FortuneTelling/FortuneTelling.java → L2J_DataPack_BETA/dist/game/data/scripts/gracia/AI/NPC/FortuneTelling/FortuneTelling.java

@@ -16,7 +16,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.FortuneTelling;
+package gracia.AI.NPC.FortuneTelling;
 
 import ai.npc.AbstractNpcAI;
 
@@ -38,7 +38,7 @@ public class FortuneTelling extends AbstractNpcAI
 	
 	public FortuneTelling()
 	{
-		super(FortuneTelling.class.getSimpleName(), "ai/npc");
+		super(FortuneTelling.class.getSimpleName(), "gracia/AI/NPC");
 		addStartNpc(MINE);
 		addTalkId(MINE);
 	}
@@ -58,9 +58,4 @@ public class FortuneTelling extends AbstractNpcAI
 		}
 		return htmltext;
 	}
-	
-	public static void main(String args[])
-	{
-		new FortuneTelling();
-	}
 }

L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/GeneralDilios.java → L2J_DataPack_BETA/dist/game/data/scripts/gracia/AI/NPC/GeneralDilios/GeneralDilios.java

@@ -16,7 +16,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.individual;
+package gracia.AI.NPC.GeneralDilios;
 
 import java.util.Set;
 
@@ -54,9 +54,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
 	};
 	
-	private GeneralDilios()
+	public GeneralDilios()
 	{
-		super(GeneralDilios.class.getSimpleName(), "ai/individual");
+		super(GeneralDilios.class.getSimpleName(), "gracia/AI/NPC");
 		_general = SpawnTable.getInstance().getFirstSpawn(GENERAL_ID).getLastSpawn();
 		_guards = SpawnTable.getInstance().getSpawns(GUARD_ID);
 		if ((_general == null) || _guards.isEmpty())
@@ -99,9 +99,4 @@ public final class GeneralDilios extends AbstractNpcAI
 		}
 		return super.onAdvEvent(event, npc, player);
 	}
-	
-	public static void main(String[] args)
-	{
-		new GeneralDilios();
-	}
 }

L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/Lekon/Lekon.java → L2J_DataPack_BETA/dist/game/data/scripts/gracia/AI/NPC/Lekon/Lekon.java

@@ -16,7 +16,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.Lekon;
+package gracia.AI.NPC.Lekon;
 
 import ai.npc.AbstractNpcAI;
 
@@ -41,9 +41,9 @@ public final class Lekon extends AbstractNpcAI
 	private static final int MIN_CLAN_LV = 5;
 	private static final int STONE_COUNT = 10;
 	
-	private Lekon()
+	public Lekon()
 	{
-		super(Lekon.class.getSimpleName(), "ai/npc");
+		super(Lekon.class.getSimpleName(), "gracia/AI/NPC");
 		addFirstTalkId(LEKON);
 		addTalkId(LEKON);
 		addStartNpc(LEKON);
@@ -89,9 +89,4 @@ public final class Lekon extends AbstractNpcAI
 		}
 		return htmltext;
 	}
-	
-	public static void main(String args[])
-	{
-		new Lekon();
-	}
 }

L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/Nemo/Nemo.java → L2J_DataPack_BETA/dist/game/data/scripts/gracia/AI/NPC/Nemo/Nemo.java

@@ -16,9 +16,8 @@
  * 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.Nemo;
+package gracia.AI.NPC.Nemo;
 
-import ai.individual.Maguen;
 import ai.npc.AbstractNpcAI;
 
 import com.l2jserver.gameserver.ai.CtrlIntention;
@@ -28,6 +27,8 @@ import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.quest.Quest;
 import com.l2jserver.gameserver.network.NpcStringId;
 
+import gracia.AI.Maguen;
+
 /**
  * Nemo AI.
  * @author St3eT
@@ -42,9 +43,9 @@ public final class Nemo extends AbstractNpcAI
 	// Misc
 	private static final int MAXIMUM_MAGUEN = 18; // Maximum maguens in one time
 	
-	private Nemo()
+	public Nemo()
 	{
-		super(Nemo.class.getSimpleName(), "ai/npc");
+		super(Nemo.class.getSimpleName(), "gracia/AI/NPC");
 		addStartNpc(NEMO);
 		addFirstTalkId(NEMO);
 		addTalkId(NEMO);
@@ -119,9 +120,4 @@ public final class Nemo extends AbstractNpcAI
 	{
 		return QuestManager.getInstance().getQuest(Maguen.class.getSimpleName());
 	}
-	
-	public static void main(String[] args)
-	{
-		new Nemo();
-	}
 }

L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/Nottingale/Nottingale.java → L2J_DataPack_BETA/dist/game/data/scripts/gracia/AI/NPC/Nottingale/Nottingale.java

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

L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/Seyo/Seyo.java → L2J_DataPack_BETA/dist/game/data/scripts/gracia/AI/NPC/Seyo/Seyo.java

@@ -16,7 +16,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.Seyo;
+package gracia.AI.NPC.Seyo;
 
 import ai.npc.AbstractNpcAI;
 
@@ -45,9 +45,9 @@ public final class Seyo extends AbstractNpcAI
 		NpcStringId.THERE_WAS_SOMEONE_WHO_WON_10000_FROM_ME_A_WARRIOR_SHOULDNT_JUST_BE_GOOD_AT_FIGHTING_RIGHT_YOUVE_GOTTA_BE_GOOD_IN_EVERYTHING
 	};
 	
-	private Seyo()
+	public Seyo()
 	{
-		super(Seyo.class.getSimpleName(), "ai/npc");
+		super(Seyo.class.getSimpleName(), "gracia/AI/NPC");
 		addStartNpc(SEYO);
 		addTalkId(SEYO);
 		addFirstTalkId(SEYO);
@@ -170,9 +170,4 @@ public final class Seyo extends AbstractNpcAI
 		}
 		return htmltext;
 	}
-	
-	public static void main(String[] args)
-	{
-		new Seyo();
-	}
 }

L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/ZealotOfShilen/ZealotOfShilen.java → L2J_DataPack_BETA/dist/game/data/scripts/gracia/AI/NPC/ZealotOfShilen/ZealotOfShilen.java

@@ -16,7 +16,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.ZealotOfShilen;
+package gracia.AI.NPC.ZealotOfShilen;
 
 import ai.npc.AbstractNpcAI;
 
@@ -42,9 +42,9 @@ public final class ZealotOfShilen extends AbstractNpcAI
 		32629
 	};
 	
-	private ZealotOfShilen()
+	public ZealotOfShilen()
 	{
-		super(ZealotOfShilen.class.getSimpleName(), "ai/npc");
+		super(ZealotOfShilen.class.getSimpleName(), "gracia/AI/NPC");
 		addSpawnId(ZEALOT);
 		addFirstTalkId(GUARDS);
 		
@@ -94,9 +94,4 @@ public final class ZealotOfShilen extends AbstractNpcAI
 		npc.setIsNoRndWalk(true);
 		return super.onSpawn(npc);
 	}
-	
-	public static void main(String[] args)
-	{
-		new ZealotOfShilen();
-	}
 }

L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/SeedOfAnnihilation.java → L2J_DataPack_BETA/dist/game/data/scripts/gracia/AI/SeedOfAnnihilation/SeedOfAnnihilation.java

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

L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/StarStones.java → L2J_DataPack_BETA/dist/game/data/scripts/gracia/AI/StarStones.java

@@ -16,7 +16,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.group_template;
+package gracia.AI;
 
 import ai.npc.AbstractNpcAI;
 
@@ -41,9 +41,9 @@ public class StarStones extends AbstractNpcAI
 	
 	private static final int COLLECTION_RATE = 1;
 	
-	private StarStones()
+	public StarStones()
 	{
-		super(StarStones.class.getSimpleName(), "ai/group_template");
+		super(StarStones.class.getSimpleName(), "gracia/AI");
 		addSkillSeeId(MOBS);
 	}
 	
@@ -96,9 +96,4 @@ public class StarStones extends AbstractNpcAI
 		}
 		return super.onSkillSee(npc, caster, skill, targets, isSummon);
 	}
-	
-	public static void main(String[] args)
-	{
-		new StarStones();
-	}
 }

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

@@ -0,0 +1,97 @@
+/*
+ * Copyright (C) 2004-2014 L2J DataPack
+ * 
+ * This file is part of L2J DataPack.
+ * 
+ * L2J DataPack 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 DataPack 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;
+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
+ */
+public 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);
+			}
+		}
+	}
+}

L2J_DataPack_BETA/dist/game/data/scripts/instances/SecretArea/SecretArea.java → L2J_DataPack_BETA/dist/game/data/scripts/gracia/instances/SecretArea/SecretArea.java

@@ -16,7 +16,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 instances.SecretArea;
+package gracia.instances.SecretArea;
 
 import com.l2jserver.gameserver.instancemanager.InstanceManager;
 import com.l2jserver.gameserver.model.Location;
@@ -48,9 +48,9 @@ public final class SecretArea extends Quest
 		new Location(-185057, 242821, 1576)
 	};
 	
-	private SecretArea()
+	public SecretArea()
 	{
-		super(-1, SecretArea.class.getSimpleName(), "instances");
+		super(-1, SecretArea.class.getSimpleName(), "gracia/instances");
 		addStartNpc(GINBY);
 		addTalkId(GINBY);
 		addTalkId(LELRIKIA);
@@ -96,9 +96,4 @@ public final class SecretArea extends Quest
 		}
 		return htmltext;
 	}
-	
-	public static void main(String[] args)
-	{
-		new SecretArea();
-	}
 }

L2J_DataPack_BETA/dist/game/data/scripts/instances/SeedOfDestruction/Stage1.java → L2J_DataPack_BETA/dist/game/data/scripts/gracia/instances/SeedOfDestruction/Stage1.java

@@ -16,7 +16,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 instances.SeedOfDestruction;
+package gracia.instances.SeedOfDestruction;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -215,10 +215,10 @@ public final class Stage1 extends Quest
 	private static final int RESET_DAY_1 = 4;
 	private static final int RESET_DAY_2 = 7;
 	
-	private Stage1()
+	public Stage1()
 	{
 		// TODO change name to use actual class name
-		super(-1, "SoDStage1", "instances");
+		super(-1, "SoDStage1", "gracia/instances");
 		load();
 		addStartNpc(ALENOS);
 		addTalkId(ALENOS);
@@ -1070,10 +1070,4 @@ public final class Stage1 extends Quest
 		}
 		return null;
 	}
-	
-	public static void main(String[] args)
-	{
-		// now call the constructor (starts up the)
-		new Stage1();
-	}
 }

L2J_DataPack_BETA/dist/game/data/scripts/instances/SeedOfInfinity/HallOfSuffering.java → L2J_DataPack_BETA/dist/game/data/scripts/gracia/instances/SeedOfInfinity/HallOfSuffering.java

@@ -16,7 +16,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 instances.SeedOfInfinity;
+package gracia.instances.SeedOfInfinity;
 
 import java.util.Calendar;
 import java.util.HashMap;
@@ -403,10 +403,10 @@ public final class HallOfSuffering extends Quest
 	// default: 24h
 	private static final int INSTANCEPENALTY = 24;
 	
-	private HallOfSuffering()
+	public HallOfSuffering()
 	{
 		// TODO change name to use actual class name
-		super(-1, "SeedOfInfinity", "instances");
+		super(-1, "SeedOfInfinity", "gracia/instances");
 		addStartNpc(MOUTHOFEKIMUS, TEPIOS);
 		addTalkId(MOUTHOFEKIMUS, TEPIOS);
 		addFirstTalkId(TEPIOS);
@@ -924,9 +924,4 @@ public final class HallOfSuffering extends Quest
 		}
 		return "";
 	}
-	
-	public static void main(String[] args)
-	{
-		new HallOfSuffering();
-	}
 }

L2J_DataPack_BETA/dist/game/data/scripts/vehicles/AirShipController.java → L2J_DataPack_BETA/dist/game/data/scripts/gracia/vehicles/AirShipController.java

@@ -16,7 +16,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 vehicles;
+package gracia.vehicles;
 
 import java.util.concurrent.Future;
 import java.util.logging.Level;

L2J_DataPack_BETA/dist/game/data/scripts/vehicles/AirShipGludioGracia/AirShipGludioGracia.java → L2J_DataPack_BETA/dist/game/data/scripts/gracia/vehicles/AirShipGludioGracia/AirShipGludioGracia.java

@@ -16,7 +16,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 vehicles.AirShipGludioGracia;
+package gracia.vehicles.AirShipGludioGracia;
 
 import com.l2jserver.gameserver.ThreadPoolManager;
 import com.l2jserver.gameserver.instancemanager.AirShipManager;
@@ -109,9 +109,9 @@ public final class AirShipGludioGracia extends Quest implements Runnable
 	private boolean _foundAtcGracia = false;
 	private L2Npc _atcGracia = null;
 	
-	private AirShipGludioGracia()
+	public AirShipGludioGracia()
 	{
-		super(-1, AirShipGludioGracia.class.getSimpleName(), "vehicles");
+		super(-1, AirShipGludioGracia.class.getSimpleName(), "gracia/vehicles");
 		addStartNpc(CONTROLLERS);
 		addFirstTalkId(CONTROLLERS);
 		addTalkId(CONTROLLERS);
@@ -307,9 +307,4 @@ public final class AirShipGludioGracia extends Quest implements Runnable
 		}
 		return super.unload(removeFromList);
 	}
-	
-	public static void main(String[] args)
-	{
-		new AirShipGludioGracia();
-	}
 }

L2J_DataPack_BETA/dist/game/data/scripts/vehicles/KeucereusNorthController/KeucereusNorthController.java → L2J_DataPack_BETA/dist/game/data/scripts/gracia/vehicles/KeucereusNorthController/KeucereusNorthController.java

@@ -16,13 +16,13 @@
  * 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 vehicles.KeucereusNorthController;
-
-import vehicles.AirShipController;
+package gracia.vehicles.KeucereusNorthController;
 
 import com.l2jserver.gameserver.model.Location;
 import com.l2jserver.gameserver.model.VehiclePathPoint;
 
+import gracia.vehicles.AirShipController;
+
 public final class KeucereusNorthController extends AirShipController
 {
 	private static final int DOCK_ZONE = 50602;
@@ -67,9 +67,9 @@ public final class KeucereusNorthController extends AirShipController
 		100
 	};
 	
-	private KeucereusNorthController()
+	public KeucereusNorthController()
 	{
-		super(-1, KeucereusNorthController.class.getSimpleName(), "vehicles");
+		super(-1, KeucereusNorthController.class.getSimpleName(), "gracia/vehicles");
 		addStartNpc(CONTROLLER_ID);
 		addFirstTalkId(CONTROLLER_ID);
 		addTalkId(CONTROLLER_ID);
@@ -94,9 +94,4 @@ public final class KeucereusNorthController extends AirShipController
 		
 		validityCheck();
 	}
-	
-	public static void main(String[] args)
-	{
-		new KeucereusNorthController();
-	}
 }

L2J_DataPack_BETA/dist/game/data/scripts/vehicles/KeucereusSouthController/KeucereusSouthController.java → L2J_DataPack_BETA/dist/game/data/scripts/gracia/vehicles/KeucereusSouthController/KeucereusSouthController.java

@@ -16,13 +16,13 @@
  * 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 vehicles.KeucereusSouthController;
-
-import vehicles.AirShipController;
+package gracia.vehicles.KeucereusSouthController;
 
 import com.l2jserver.gameserver.model.Location;
 import com.l2jserver.gameserver.model.VehiclePathPoint;
 
+import gracia.vehicles.AirShipController;
+
 public final class KeucereusSouthController extends AirShipController
 {
 	private static final int DOCK_ZONE = 50603;
@@ -67,9 +67,9 @@ public final class KeucereusSouthController extends AirShipController
 		100
 	};
 	
-	private KeucereusSouthController()
+	public KeucereusSouthController()
 	{
-		super(-1, KeucereusSouthController.class.getSimpleName(), "vehicles");
+		super(-1, KeucereusSouthController.class.getSimpleName(), "gracia/vehicles");
 		addStartNpc(CONTROLLER_ID);
 		addFirstTalkId(CONTROLLER_ID);
 		addTalkId(CONTROLLER_ID);
@@ -94,9 +94,4 @@ public final class KeucereusSouthController extends AirShipController
 		
 		validityCheck();
 	}
-	
-	public static void main(String[] args)
-	{
-		new KeucereusSouthController();
-	}
 }

L2J_DataPack_BETA/dist/game/data/scripts/vehicles/SoDController/SoDController.java → L2J_DataPack_BETA/dist/game/data/scripts/gracia/vehicles/SoDController/SoDController.java

@@ -16,13 +16,13 @@
  * 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 vehicles.SoDController;
-
-import vehicles.AirShipController;
+package gracia.vehicles.SoDController;
 
 import com.l2jserver.gameserver.model.Location;
 import com.l2jserver.gameserver.model.VehiclePathPoint;
 
+import gracia.vehicles.AirShipController;
+
 public final class SoDController extends AirShipController
 {
 	private static final int DOCK_ZONE = 50601;
@@ -57,9 +57,9 @@ public final class SoDController extends AirShipController
 		100
 	};
 	
-	private SoDController()
+	public SoDController()
 	{
-		super(-1, SoDController.class.getSimpleName(), "vehicles");
+		super(-1, SoDController.class.getSimpleName(), "gracia/vehicles");
 		addStartNpc(CONTROLLER_ID);
 		addFirstTalkId(CONTROLLER_ID);
 		addTalkId(CONTROLLER_ID);
@@ -84,9 +84,4 @@ public final class SoDController extends AirShipController
 		
 		validityCheck();
 	}
-	
-	public static void main(String[] args)
-	{
-		new SoDController();
-	}
 }

L2J_DataPack_BETA/dist/game/data/scripts/vehicles/SoIController/SoIController.java → L2J_DataPack_BETA/dist/game/data/scripts/gracia/vehicles/SoIController/SoIController.java

@@ -16,13 +16,13 @@
  * 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 vehicles.SoIController;
-
-import vehicles.AirShipController;
+package gracia.vehicles.SoIController;
 
 import com.l2jserver.gameserver.model.Location;
 import com.l2jserver.gameserver.model.VehiclePathPoint;
 
+import gracia.vehicles.AirShipController;
+
 public final class SoIController extends AirShipController
 {
 	private static final int DOCK_ZONE = 50600;
@@ -61,9 +61,9 @@ public final class SoIController extends AirShipController
 		50
 	};
 	
-	private SoIController()
+	public SoIController()
 	{
-		super(-1, SoIController.class.getSimpleName(), "vehicles");
+		super(-1, SoIController.class.getSimpleName(), "gracia/vehicles");
 		addStartNpc(CONTROLLER_ID);
 		addFirstTalkId(CONTROLLER_ID);
 		addTalkId(CONTROLLER_ID);
@@ -88,9 +88,4 @@ public final class SoIController extends AirShipController
 		
 		validityCheck();
 	}
-	
-	public static void main(String[] args)
-	{
-		new SoIController();
-	}
 }