Refactored scripts to match newer branches.

L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/AbstractNpcAI.java

@@ -28,9 +28,9 @@ import com.l2jmobius.gameserver.model.quest.Quest;
  */
 public abstract class AbstractNpcAI extends Quest
 {
-	public AbstractNpcAI(String name, String descr)
+	public AbstractNpcAI()
 	{
-		super(-1, name, descr);
+		super(-1);
 	}
 	
 	/**

L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/BeastFarm/BeastFarm.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.group_template;
+package ai.areas.BeastFarm;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -109,7 +109,6 @@ public final class BeastFarm extends AbstractNpcAI
 	
 	private BeastFarm()
 	{
-		super(BeastFarm.class.getSimpleName(), "ai/group_template");
 		addSkillSeeId(FEEDABLE_BEASTS);
 		addKillId(FEEDABLE_BEASTS);
 		

L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/BeastFarm/FeedableBeasts.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.group_template;
+package ai.areas.BeastFarm;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -180,7 +180,6 @@ public final class FeedableBeasts extends AbstractNpcAI
 	
 	private FeedableBeasts()
 	{
-		super(FeedableBeasts.class.getSimpleName(), "ai/group_template");
 		addKillId(FEEDABLE_BEASTS);
 		addSkillSeeId(FEEDABLE_BEASTS);
 		

L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/BeastFarm/Tunatun/Tunatun.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.Tunatun;
+package ai.areas.BeastFarm.Tunatun;
 
 import com.l2jmobius.gameserver.model.actor.L2Npc;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
@@ -38,7 +38,6 @@ public final class Tunatun extends AbstractNpcAI
 	
 	private Tunatun()
 	{
-		super(Tunatun.class.getSimpleName(), "ai/npc");
 		addStartNpc(TUNATUN);
 		addFirstTalkId(TUNATUN);
 		addTalkId(TUNATUN);

L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/CrumaTower/Alarm/Alarm.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.Alarm;
+package ai.areas.CrumaTower.Alarm;
 
 import com.l2jmobius.gameserver.enums.ChatType;
 import com.l2jmobius.gameserver.enums.QuestSound;
@@ -41,7 +41,6 @@ public final class Alarm extends AbstractNpcAI
 	
 	private Alarm()
 	{
-		super(Alarm.class.getSimpleName(), "ai/npc");
 		addStartNpc(ALARM);
 		addTalkId(ALARM);
 		addFirstTalkId(ALARM);

L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/CrumaTower/CrumaTower.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.CrumaTower;
+package ai.areas.CrumaTower;
 
 import com.l2jmobius.gameserver.model.Location;
 import com.l2jmobius.gameserver.model.actor.L2Npc;
@@ -38,7 +38,6 @@ public final class CrumaTower extends AbstractNpcAI
 	
 	private CrumaTower()
 	{
-		super(CrumaTower.class.getSimpleName(), "ai/npc/Teleports");
 		addFirstTalkId(MOZELLA);
 		addStartNpc(MOZELLA);
 		addTalkId(MOZELLA);

L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/CrumaTower/SummonPc.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.group_template;
+package ai.areas.CrumaTower;
 
 import com.l2jmobius.gameserver.model.actor.L2Attackable;
 import com.l2jmobius.gameserver.model.actor.L2Npc;
@@ -39,7 +39,6 @@ public final class SummonPc extends AbstractNpcAI
 	
 	private SummonPc()
 	{
-		super(SummonPc.class.getSimpleName(), "ai/group_template");
 		addAttackId(PORTA, PERUM);
 		addSpellFinishedId(PORTA, PERUM);
 	}

L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/DenOfEvil/DenOfEvil.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.group_template;
+package ai.areas.DenOfEvil;
 
 import com.l2jmobius.commons.concurrent.ThreadPool;
 import com.l2jmobius.gameserver.datatables.SkillData;
@@ -96,7 +96,6 @@ public final class DenOfEvil extends AbstractNpcAI
 	
 	private DenOfEvil()
 	{
-		super(DenOfEvil.class.getSimpleName(), "ai/group_template");
 		addKillId(EYE_IDS);
 		addSpawnId(EYE_IDS);
 		for (Location loc : EYE_SPAWNS)

L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/DenOfEvil/FrightenedRagnaOrc.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.individual;
+package ai.areas.DenOfEvil;
 
 import com.l2jmobius.gameserver.ai.CtrlIntention;
 import com.l2jmobius.gameserver.enums.ChatType;
@@ -46,7 +46,6 @@ public final class FrightenedRagnaOrc extends AbstractNpcAI
 	
 	private FrightenedRagnaOrc()
 	{
-		super(FrightenedRagnaOrc.class.getSimpleName(), "ai/individual");
 		addAttackId(MOB_ID);
 		addKillId(MOB_ID);
 	}

L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/DenOfEvil/RagnaOrcCommander.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.individual;
+package ai.areas.DenOfEvil;
 
 import com.l2jmobius.gameserver.model.actor.L2Npc;
 
@@ -30,7 +30,6 @@ public final class RagnaOrcCommander extends AbstractNpcAI
 	
 	private RagnaOrcCommander()
 	{
-		super(RagnaOrcCommander.class.getSimpleName(), "ai/individual");
 		addSpawnId(RAGNA_ORC_COMMANDER);
 	}
 	

L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/DenOfEvil/RagnaOrcHero.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.individual;
+package ai.areas.DenOfEvil;
 
 import com.l2jmobius.gameserver.model.actor.L2Npc;
 
@@ -30,7 +30,6 @@ public final class RagnaOrcHero extends AbstractNpcAI
 	
 	private RagnaOrcHero()
 	{
-		super(RagnaOrcHero.class.getSimpleName(), "ai/individual");
 		addSpawnId(RAGNA_ORC_HERO);
 	}
 	

L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/DenOfEvil/RagnaOrcSeer.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.individual;
+package ai.areas.DenOfEvil;
 
 import com.l2jmobius.gameserver.model.actor.L2Npc;
 
@@ -30,7 +30,6 @@ public final class RagnaOrcSeer extends AbstractNpcAI
 	
 	private RagnaOrcSeer()
 	{
-		super(RagnaOrcSeer.class.getSimpleName(), "ai/individual");
 		addSpawnId(RAGNA_ORC_SEER);
 	}
 	

L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/DragonValley/DragonValley.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.group_template;
+package ai.areas.DragonValley;
 
 import java.util.EnumMap;
 
@@ -127,7 +127,6 @@ public final class DragonValley extends AbstractNpcAI
 	
 	private DragonValley()
 	{
-		super(DragonValley.class.getSimpleName(), "ai/group_template");
 		addAttackId(NECROMANCER_OF_THE_VALLEY);
 		addAttackId(SUMMON_NPC);
 		addKillId(NECROMANCER_OF_THE_VALLEY);

L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/DragonValley/DragonVortex/DragonVortex.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.DragonVortex;
+package ai.areas.DragonValley.DragonVortex;
 
 import com.l2jmobius.gameserver.model.Location;
 import com.l2jmobius.gameserver.model.actor.L2Npc;
@@ -51,7 +51,6 @@ public final class DragonVortex extends AbstractNpcAI
 	
 	private DragonVortex()
 	{
-		super(DragonVortex.class.getSimpleName(), "ai/npc");
 		addStartNpc(DRAGON_VORTEX);
 		addFirstTalkId(DRAGON_VORTEX);
 		addTalkId(DRAGON_VORTEX);

L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/DragonValley/LairOfAntharas.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.group_template;
+package ai.areas.DragonValley;
 
 import com.l2jmobius.gameserver.enums.ChatType;
 import com.l2jmobius.gameserver.model.actor.L2Attackable;
@@ -46,7 +46,6 @@ public final class LairOfAntharas extends AbstractNpcAI
 	
 	private LairOfAntharas()
 	{
-		super(LairOfAntharas.class.getSimpleName(), "ai/group_template");
 		addKillId(DRAGON_KNIGHT, DRAGON_KNIGHT2, DRAGON_GUARD, DRAGON_MAGE);
 		addSpawnId(DRAGON_KNIGHT, DRAGON_KNIGHT2, DRAGON_GUARD, DRAGON_MAGE);
 		addMoveFinishedId(DRAGON_GUARD, DRAGON_MAGE);

L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/DragonValley/SeparatedSoul/SeparatedSoul.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.SeparatedSoul;
+package ai.areas.DragonValley.SeparatedSoul;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -66,7 +66,6 @@ public final class SeparatedSoul extends AbstractNpcAI
 	
 	private SeparatedSoul()
 	{
-		super(SeparatedSoul.class.getSimpleName(), "ai/npc/Teleports");
 		addStartNpc(SEPARATED_SOULS);
 		addTalkId(SEPARATED_SOULS);
 	}

L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/FantasyIsle/HandysBlockCheckerEvent.java

@@ -14,24 +14,25 @@
  * 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.fantasy_isle;
+package ai.areas.FantasyIsle;
 
 import com.l2jmobius.Config;
 import com.l2jmobius.gameserver.instancemanager.HandysBlockCheckerManager;
 import com.l2jmobius.gameserver.model.ArenaParticipantsHolder;
 import com.l2jmobius.gameserver.model.actor.L2Npc;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.model.quest.Quest;
 import com.l2jmobius.gameserver.network.SystemMessageId;
 import com.l2jmobius.gameserver.network.serverpackets.ExCubeGameChangeTimeToStart;
 import com.l2jmobius.gameserver.network.serverpackets.ExCubeGameRequestReady;
 import com.l2jmobius.gameserver.network.serverpackets.ExCubeGameTeamList;
 
+import ai.AbstractNpcAI;
+
 /**
  * Handys Block Checker Event AI.
  * @authors BiggBoss, Gigiikun
  */
-public final class HandysBlockCheckerEvent extends Quest
+public class HandysBlockCheckerEvent extends AbstractNpcAI
 {
 	// Arena Managers
 	private static final int A_MANAGER_1 = 32521;
@@ -41,7 +42,6 @@ public final class HandysBlockCheckerEvent extends Quest
 	
 	public HandysBlockCheckerEvent()
 	{
-		super(-1, HandysBlockCheckerEvent.class.getSimpleName(), "Handy's Block Checker Event");
 		addFirstTalkId(A_MANAGER_1, A_MANAGER_2, A_MANAGER_3, A_MANAGER_4);
 		HandysBlockCheckerManager.getInstance().startUpParticipantsQueue();
 	}

L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/FantasyIsle/KrateisCube/KrateisCube.java

@@ -35,7 +35,6 @@ public final class KrateisCube extends AbstractNpcAI
 	
 	public KrateisCube()
 	{
-		super(KrateisCube.class.getSimpleName(), "Krateis Cube");
 		addStartNpc(MANAGER);
 		addFirstTalkId(MANAGER);
 		addTalkId(MANAGER);

L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/FantasyIsle/Parade.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.fantasy_isle;
+package ai.areas.FantasyIsle;
 
 import java.text.SimpleDateFormat;
 import java.util.concurrent.CopyOnWriteArrayList;
@@ -127,8 +127,6 @@ public final class Parade extends AbstractNpcAI
 	
 	public Parade()
 	{
-		super(Parade.class.getSimpleName(), "ai/fantasy_isle");
-		
 		// Starts at 8:00 and repeats every 6 hours.
 		final long diff = timeLeftMilli(8, 0, 0), cycle = 3600000L;
 		ThreadPool.scheduleAtFixedRate(new Start(), diff, cycle);

L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.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.fantasy_isle;
+package ai.areas.FantasyIsle;
 
 import java.text.SimpleDateFormat;
 import java.util.HashMap;
@@ -166,7 +166,6 @@ public final class TalentShow extends AbstractNpcAI
 	
 	private TalentShow()
 	{
-		super(TalentShow.class.getSimpleName(), "ai/fantasy_isle");
 		addSpawnId(32433, 32431, 32432, 32442, 32443, 32444, 32445, 32446, 32424, 32425, 32426, 32427, 32428);
 		load();
 		scheduleTimer();

L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/ForgeOfTheGods/ForgeOfTheGods.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.ForgeOfTheGods;
+package ai.areas.ForgeOfTheGods;
 
 import com.l2jmobius.gameserver.ai.CtrlIntention;
 import com.l2jmobius.gameserver.model.actor.L2Attackable;
@@ -82,7 +82,6 @@ public final class ForgeOfTheGods extends AbstractNpcAI
 	
 	private ForgeOfTheGods()
 	{
-		super(ForgeOfTheGods.class.getSimpleName(), "ai/npc");
 		addKillId(FOG_MOBS);
 		addSpawnId(LAVASAURUSES);
 		startQuestTimer("refresh", REFRESH * 1000, null, null, true);

L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/ForgeOfTheGods/Rooney.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.ForgeOfTheGods;
+package ai.areas.ForgeOfTheGods;
 
 import com.l2jmobius.gameserver.enums.ChatType;
 import com.l2jmobius.gameserver.model.Location;
@@ -79,7 +79,6 @@ public final class Rooney extends AbstractNpcAI
 	
 	private Rooney()
 	{
-		super(Rooney.class.getSimpleName(), "ai/npc");
 		addSeeCreatureId(ROONEY);
 		addSpawn(ROONEY, LOCATIONS[getRandom(LOCATIONS.length)], false, 0);
 	}

L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/ForgeOfTheGods/TarBeetle.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.ForgeOfTheGods;
+package ai.areas.ForgeOfTheGods;
 
 import com.l2jmobius.gameserver.model.actor.L2Npc;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
@@ -45,7 +45,6 @@ public final class TarBeetle extends AbstractNpcAI
 	
 	private TarBeetle()
 	{
-		super(TarBeetle.class.getSimpleName(), "ai/npc");
 		addAggroRangeEnterId(TAR_BEETLE);
 		addSpellFinishedId(TAR_BEETLE);
 	}

L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/ForgeOfTheGods/TarBeetleSpawn.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.ForgeOfTheGods;
+package ai.areas.ForgeOfTheGods;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -53,7 +53,7 @@ public class TarBeetleSpawn implements IGameXmlReader
 	@Override
 	public void load()
 	{
-		parseDatapackFile("data/scripts/ai/npc/ForgeOfTheGods/tar_beetle.xml");
+		parseDatapackFile("data/scripts/ai/areas/ForgeOfTheGods/tar_beetle.xml");
 		if (!zones.isEmpty())
 		{
 			spawnTask = ThreadPool.scheduleAtFixedRate(() -> zones.forEach(SpawnZone::refreshSpawn), 1000, 60000);

L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/FrozenLabyrinth/FreyasSteward/FreyasSteward.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.FreyasSteward;
+package ai.areas.FrozenLabyrinth.FreyasSteward;
 
 import com.l2jmobius.gameserver.model.Location;
 import com.l2jmobius.gameserver.model.actor.L2Npc;
@@ -37,7 +37,6 @@ public final class FreyasSteward extends AbstractNpcAI
 	
 	private FreyasSteward()
 	{
-		super(FreyasSteward.class.getSimpleName(), "ai/npc");
 		addStartNpc(FREYAS_STEWARD);
 		addFirstTalkId(FREYAS_STEWARD);
 		addTalkId(FREYAS_STEWARD);

L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/FrozenLabyrinth/FrozenLabyrinth.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.group_template;
+package ai.areas.FrozenLabyrinth;
 
 import com.l2jmobius.gameserver.model.actor.L2Npc;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
@@ -36,7 +36,6 @@ public final class FrozenLabyrinth extends AbstractNpcAI
 	
 	private FrozenLabyrinth()
 	{
-		super(FrozenLabyrinth.class.getSimpleName(), "ai/group_template");
 		addAttackId(PRONGHORN, FROST_BUFFALO);
 	}
 	

L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/FrozenLabyrinth/Jinia/Jinia.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.Jinia;
+package ai.areas.FrozenLabyrinth.Jinia;
 
 import com.l2jmobius.gameserver.model.actor.L2Npc;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
@@ -39,7 +39,6 @@ public final class Jinia extends AbstractNpcAI
 	
 	private Jinia()
 	{
-		super(Jinia.class.getSimpleName(), "ai/npc");
 		addStartNpc(JINIA);
 		addFirstTalkId(JINIA);
 		addTalkId(JINIA);

L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/FrozenLabyrinth/Rafforty/Rafforty.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.Rafforty;
+package ai.areas.FrozenLabyrinth.Rafforty;
 
 import com.l2jmobius.gameserver.model.actor.L2Npc;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
@@ -73,7 +73,6 @@ public final class Rafforty extends AbstractNpcAI
 	
 	private Rafforty()
 	{
-		super(Rafforty.class.getSimpleName(), "ai/npc");
 		addStartNpc(RAFFORTY);
 		addFirstTalkId(RAFFORTY);
 		addTalkId(RAFFORTY);

L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/FrozenLabyrinth/Sirra/Sirra.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.Sirra;
+package ai.areas.FrozenLabyrinth.Sirra;
 
 import com.l2jmobius.gameserver.instancemanager.InstanceManager;
 import com.l2jmobius.gameserver.model.actor.L2Npc;
@@ -37,7 +37,6 @@ public final class Sirra extends AbstractNpcAI
 	
 	private Sirra()
 	{
-		super(Sirra.class.getSimpleName(), "ai/npc");
 		addFirstTalkId(SIRRA);
 	}
 	

L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/GiantsCave/GiantsCave.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.group_template;
+package ai.areas.GiantsCave;
 
 import com.l2jmobius.gameserver.enums.ChatType;
 import com.l2jmobius.gameserver.model.actor.L2Character;
@@ -39,7 +39,6 @@ public final class GiantsCave extends AbstractNpcAI
 	
 	private GiantsCave()
 	{
-		super(GiantsCave.class.getSimpleName(), "ai/group_template");
 		addAttackId(SCOUTS);
 		addAggroRangeEnterId(SCOUTS);
 	}

L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Giran/Alexandria/Alexandria.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.Alexandria;
+package ai.areas.Giran.Alexandria;
 
 import java.util.Arrays;
 import java.util.HashMap;
@@ -75,7 +75,6 @@ public final class Alexandria extends AbstractNpcAI
 	
 	private Alexandria()
 	{
-		super(Alexandria.class.getSimpleName(), "ai/npc");
 		addStartNpc(ALEXANDRIA);
 		addTalkId(ALEXANDRIA);
 		addFirstTalkId(ALEXANDRIA);

L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/AI/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.areas.Gracia.AI;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -277,7 +277,6 @@ public class EnergySeeds extends AbstractNpcAI
 	
 	public EnergySeeds()
 	{
-		super(EnergySeeds.class.getSimpleName(), "gracia/AI");
 		registerMobs(SEED_IDS);
 		addFirstTalkId(SEED_IDS);
 		addFirstTalkId(TEMPORARY_TELEPORTER);

L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/AI/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.areas.Gracia.AI;
 
 import java.util.Calendar;
 import java.util.GregorianCalendar;
@@ -53,7 +53,6 @@ public class Lindvior extends AbstractNpcAI
 	
 	public Lindvior()
 	{
-		super(Lindvior.class.getSimpleName(), "gracia/AI");
 		scheduleNextLindviorVisit();
 	}
 	

L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/AI/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.areas.Gracia.AI;
 
 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.areas.Gracia.AI.NPC.Nemo.Nemo;
 
 /**
  * Maguen AI.
@@ -74,7 +74,6 @@ public final class Maguen extends AbstractNpcAI
 	
 	public Maguen()
 	{
-		super(Maguen.class.getSimpleName(), "gracia/AI");
 		addKillId(ELITES);
 		addSkillSeeId(MAGUEN);
 		addSpellFinishedId(MAGUEN);

L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/AI/NPC/AbyssGaze/AbyssGaze.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.AbyssGaze;
+package ai.areas.Gracia.AI.NPC.AbyssGaze;
 
 import com.l2jmobius.gameserver.instancemanager.SoIManager;
 import com.l2jmobius.gameserver.model.actor.L2Npc;
@@ -30,8 +30,6 @@ public class AbyssGaze extends AbstractNpcAI
 	
 	public AbyssGaze()
 	{
-		super(AbyssGaze.class.getSimpleName(), "gracia/AI/NPC");
-		
 		addStartNpc(ABYSS_GATEKEEPER);
 		addFirstTalkId(ABYSS_GATEKEEPER);
 		addTalkId(ABYSS_GATEKEEPER);