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();
-	}
 }
\ No newline at end of file

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();
-	}
 }
\ No newline at end of file

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();
-	}
 }
\ No newline at end of file

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();
-	}
 }
\ No newline at end of file

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();
-	}
 }
\ No newline at end of file