BETA: DP-Part for [L4957]

L2J_DataPack_BETA/dist/game/data/scripts/handlers/MasterHandler.java

@@ -230,6 +230,40 @@ import handlers.skillhandlers.TakeFort;
 import handlers.skillhandlers.TransformDispel;
 import handlers.skillhandlers.Trap;
 import handlers.skillhandlers.Unlock;
+import handlers.targethandlers.TargetAlly;
+import handlers.targethandlers.TargetArea;
+import handlers.targethandlers.TargetAreaCorpseMob;
+import handlers.targethandlers.TargetAreaSummon;
+import handlers.targethandlers.TargetAreaUndead;
+import handlers.targethandlers.TargetAura;
+import handlers.targethandlers.TargetAuraCorpseMob;
+import handlers.targethandlers.TargetBehindArea;
+import handlers.targethandlers.TargetBehindAura;
+import handlers.targethandlers.TargetClan;
+import handlers.targethandlers.TargetClanMember;
+import handlers.targethandlers.TargetCorpseAlly;
+import handlers.targethandlers.TargetCorpseClan;
+import handlers.targethandlers.TargetCorpseMob;
+import handlers.targethandlers.TargetCorpsePet;
+import handlers.targethandlers.TargetCorpsePlayer;
+import handlers.targethandlers.TargetEnemySummon;
+import handlers.targethandlers.TargetFlagPole;
+import handlers.targethandlers.TargetFrontArea;
+import handlers.targethandlers.TargetFrontAura;
+import handlers.targethandlers.TargetGround;
+import handlers.targethandlers.TargetHoly;
+import handlers.targethandlers.TargetOne;
+import handlers.targethandlers.TargetOwnerPet;
+import handlers.targethandlers.TargetParty;
+import handlers.targethandlers.TargetPartyClan;
+import handlers.targethandlers.TargetPartyMember;
+import handlers.targethandlers.TargetPartyNotMe;
+import handlers.targethandlers.TargetPartyOther;
+import handlers.targethandlers.TargetPet;
+import handlers.targethandlers.TargetSelf;
+import handlers.targethandlers.TargetSummon;
+import handlers.targethandlers.TargetUndead;
+import handlers.targethandlers.TargetUnlockable;
 import handlers.usercommandhandlers.Birthday;
 import handlers.usercommandhandlers.ChannelDelete;
 import handlers.usercommandhandlers.ChannelLeave;
@@ -253,6 +287,7 @@ import handlers.voicedcommandhandlers.TvTVoicedInfo;
 import handlers.voicedcommandhandlers.Wedding;
 import handlers.voicedcommandhandlers.stats;
 
+import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import com.l2jserver.Config;
@@ -262,6 +297,7 @@ import com.l2jserver.gameserver.handler.BypassHandler;
 import com.l2jserver.gameserver.handler.ChatHandler;
 import com.l2jserver.gameserver.handler.ItemHandler;
 import com.l2jserver.gameserver.handler.SkillHandler;
+import com.l2jserver.gameserver.handler.TargetHandler;
 import com.l2jserver.gameserver.handler.UserCommandHandler;
 import com.l2jserver.gameserver.handler.VoicedCommandHandler;
 
@@ -272,14 +308,15 @@ public class MasterHandler
 {
 	private static Logger _log = Logger.getLogger(MasterHandler.class.getName());
 	
-	private static ActionHandler ACTION = ActionHandler.getInstance();
-	private static AdminCommandHandler ADMIN = AdminCommandHandler.getInstance();
-	private static BypassHandler BYPASS = BypassHandler.getInstance();
-	private static ChatHandler CHAT = ChatHandler.getInstance();
-	private static ItemHandler ITEM = ItemHandler.getInstance();
-	private static SkillHandler SKILL = SkillHandler.getInstance();
-	private static UserCommandHandler USER = UserCommandHandler.getInstance();
-	private static VoicedCommandHandler VOICE = VoicedCommandHandler.getInstance();
+	private static final ActionHandler ACTION = ActionHandler.getInstance();
+	private static final AdminCommandHandler ADMIN = AdminCommandHandler.getInstance();
+	private static final BypassHandler BYPASS = BypassHandler.getInstance();
+	private static final ChatHandler CHAT = ChatHandler.getInstance();
+	private static final ItemHandler ITEM = ItemHandler.getInstance();
+	private static final SkillHandler SKILL = SkillHandler.getInstance();
+	private static final UserCommandHandler USER = UserCommandHandler.getInstance();
+	private static final VoicedCommandHandler VOICE = VoicedCommandHandler.getInstance();
+	private static final TargetHandler TARGET = TargetHandler.getInstance();
 	
 	private static void loadActionHandlers()
 	{
@@ -293,7 +330,7 @@ public class MasterHandler
 		ACTION.registerActionHandler(new L2StaticObjectInstanceAction());
 		ACTION.registerActionHandler(new L2SummonAction());
 		ACTION.registerActionHandler(new L2TrapAction());
-		_log.config("Loaded " + ACTION.size() + "  ActionHandlers");
+		_log.log(Level.INFO, "Loaded " + ACTION.size() + " ActionHandlers");
 	}
 	
 	private static void loadActionShiftHandlers()
@@ -304,7 +341,7 @@ public class MasterHandler
 		ACTION.registerActionShiftHandler(new L2PcInstanceActionShift());
 		ACTION.registerActionShiftHandler(new L2StaticObjectInstanceActionShift());
 		ACTION.registerActionShiftHandler(new L2SummonActionShift());
-		_log.config("Loaded " + ACTION.sizeShift() + " ActionShiftHandlers");
+		_log.log(Level.INFO, "Loaded " + ACTION.sizeShift() + " ActionShiftHandlers");
 	}
 	
 	private static void loadAdminHandlers()
@@ -379,7 +416,7 @@ public class MasterHandler
 		ADMIN.registerAdminCommandHandler(new AdminUnblockIp());
 		ADMIN.registerAdminCommandHandler(new AdminVitality());
 		ADMIN.registerAdminCommandHandler(new AdminZone());
-		_log.config("Loaded " + ADMIN.size() + "  AdminCommandHandlers");
+		_log.log(Level.INFO, "Loaded " + ADMIN.size() + " AdminCommandHandlers");
 	}
 	
 	private static void loadBypassHandlers()
@@ -422,7 +459,7 @@ public class MasterHandler
 		BYPASS.registerBypassHandler(new TerritoryWar());
 		BYPASS.registerBypassHandler(new VoiceCommand());
 		BYPASS.registerBypassHandler(new Wear());
-		_log.config("Loaded " + BYPASS.size() + "  BypassHandlers");
+		_log.log(Level.INFO, "Loaded " + BYPASS.size() + " BypassHandlers");
 	}
 	
 	private static void loadChatHandlers()
@@ -440,7 +477,7 @@ public class MasterHandler
 		CHAT.registerChatHandler(new ChatShout());
 		CHAT.registerChatHandler(new ChatTell());
 		CHAT.registerChatHandler(new ChatTrade());
-		_log.config("Loaded " + CHAT.size() + "  ChatHandlers");
+		_log.log(Level.INFO, "Loaded " + CHAT.size() + " ChatHandlers");
 	}
 	
 	private static void loadItemHandlers()
@@ -477,7 +514,7 @@ public class MasterHandler
 		ITEM.registerItemHandler(new ManaPotion());
 		ITEM.registerItemHandler(new EnergyStarStone());
 		ITEM.registerItemHandler(new EventItem());
-		_log.config("Loaded " + ITEM.size() + " ItemHandlers");
+		_log.log(Level.INFO, "Loaded " + ITEM.size() + " ItemHandlers");
 	}
 	
 	private static void loadSkillHandlers()
@@ -529,7 +566,7 @@ public class MasterHandler
 		SKILL.registerSkillHandler(new Extractable());
 		SKILL.registerSkillHandler(new RefuelAirShip());
 		SKILL.registerSkillHandler(new NornilsPower());
-		_log.config("Loaded " + SKILL.size() + " SkillHandlers");
+		_log.log(Level.INFO, "Loaded " + SKILL.size() + " SkillHandlers");
 	}
 	
 	private static void loadUserHandlers()
@@ -548,7 +585,7 @@ public class MasterHandler
 		USER.registerUserCommandHandler(new ChannelDelete());
 		USER.registerUserCommandHandler(new ChannelListUpdate());
 		USER.registerUserCommandHandler(new Birthday());
-		_log.config("Loaded " + USER.size() + " UserHandlers");
+		_log.log(Level.INFO, "Loaded " + USER.size() + " UserHandlers");
 	}
 	
 	private static void loadVoicedHandlers()
@@ -568,7 +605,46 @@ public class MasterHandler
 			VOICE.registerVoicedCommandHandler(new Debug());
 		if (Config.L2JMOD_ALLOW_CHANGE_PASSWORD)
 			VOICE.registerVoicedCommandHandler(new ChangePassword());
-		_log.config("Loaded " + VOICE.size() + " VoicedHandlers");
+		_log.log(Level.INFO, "Loaded " + VOICE.size() + " VoicedHandlers");
+	}
+	
+	private static void loadTargetHandlers()
+	{
+		TARGET.registerSkillTargetType(new TargetAlly());
+		TARGET.registerSkillTargetType(new TargetArea());
+		TARGET.registerSkillTargetType(new TargetAreaCorpseMob());
+		TARGET.registerSkillTargetType(new TargetAreaSummon());
+		TARGET.registerSkillTargetType(new TargetAreaUndead());
+		TARGET.registerSkillTargetType(new TargetAura());
+		TARGET.registerSkillTargetType(new TargetAuraCorpseMob());
+		TARGET.registerSkillTargetType(new TargetBehindArea());
+		TARGET.registerSkillTargetType(new TargetBehindAura());
+		TARGET.registerSkillTargetType(new TargetClan());
+		TARGET.registerSkillTargetType(new TargetClanMember());
+		TARGET.registerSkillTargetType(new TargetCorpseAlly());
+		TARGET.registerSkillTargetType(new TargetCorpseClan());
+		TARGET.registerSkillTargetType(new TargetCorpseMob());
+		TARGET.registerSkillTargetType(new TargetCorpsePet());
+		TARGET.registerSkillTargetType(new TargetCorpsePlayer());
+		TARGET.registerSkillTargetType(new TargetEnemySummon());
+		TARGET.registerSkillTargetType(new TargetFlagPole());
+		TARGET.registerSkillTargetType(new TargetFrontArea());
+		TARGET.registerSkillTargetType(new TargetFrontAura());
+		TARGET.registerSkillTargetType(new TargetGround());
+		TARGET.registerSkillTargetType(new TargetHoly());
+		TARGET.registerSkillTargetType(new TargetOne());
+		TARGET.registerSkillTargetType(new TargetOwnerPet());
+		TARGET.registerSkillTargetType(new TargetParty());
+		TARGET.registerSkillTargetType(new TargetPartyClan());
+		TARGET.registerSkillTargetType(new TargetPartyMember());
+		TARGET.registerSkillTargetType(new TargetPartyNotMe());
+		TARGET.registerSkillTargetType(new TargetPartyOther());
+		TARGET.registerSkillTargetType(new TargetPet());
+		TARGET.registerSkillTargetType(new TargetSelf());
+		TARGET.registerSkillTargetType(new TargetSummon());
+		TARGET.registerSkillTargetType(new TargetUndead());
+		TARGET.registerSkillTargetType(new TargetUnlockable());
+		_log.log(Level.INFO, "Loaded " + TARGET.size() + " Target Handlers");
 	}
 	
 	/**
@@ -576,7 +652,7 @@ public class MasterHandler
 	 */
 	public static void main(String[] args)
 	{
-		_log.config("Loading Handlers...");
+		_log.log(Level.INFO, "Loading Handlers...");
 		loadActionHandlers();
 		loadActionShiftHandlers();
 		loadAdminHandlers();
@@ -586,6 +662,7 @@ public class MasterHandler
 		loadSkillHandlers();
 		loadUserHandlers();
 		loadVoicedHandlers();
-		_log.config("Handlers Loaded...");
+		loadTargetHandlers();
+		_log.log(Level.INFO, "Handlers Loaded...");
 	}
 }

L2J_DataPack_BETA/dist/game/data/scripts/handlers/TargetMasterHandler.java

@@ -1,106 +0,0 @@
-/*
- * 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 handlers;
-
-import handlers.targethandlers.TargetAlly;
-import handlers.targethandlers.TargetArea;
-import handlers.targethandlers.TargetAreaCorpseMob;
-import handlers.targethandlers.TargetAreaSummon;
-import handlers.targethandlers.TargetAreaUndead;
-import handlers.targethandlers.TargetAura;
-import handlers.targethandlers.TargetAuraCorpseMob;
-import handlers.targethandlers.TargetBehindArea;
-import handlers.targethandlers.TargetBehindAura;
-import handlers.targethandlers.TargetClan;
-import handlers.targethandlers.TargetClanMember;
-import handlers.targethandlers.TargetCorpseAlly;
-import handlers.targethandlers.TargetCorpseClan;
-import handlers.targethandlers.TargetCorpseMob;
-import handlers.targethandlers.TargetCorpsePet;
-import handlers.targethandlers.TargetCorpsePlayer;
-import handlers.targethandlers.TargetEnemySummon;
-import handlers.targethandlers.TargetFlagPole;
-import handlers.targethandlers.TargetFrontArea;
-import handlers.targethandlers.TargetFrontAura;
-import handlers.targethandlers.TargetGround;
-import handlers.targethandlers.TargetHoly;
-import handlers.targethandlers.TargetOne;
-import handlers.targethandlers.TargetOwnerPet;
-import handlers.targethandlers.TargetParty;
-import handlers.targethandlers.TargetPartyClan;
-import handlers.targethandlers.TargetPartyMember;
-import handlers.targethandlers.TargetPartyNotMe;
-import handlers.targethandlers.TargetPartyOther;
-import handlers.targethandlers.TargetPet;
-import handlers.targethandlers.TargetSelf;
-import handlers.targethandlers.TargetSummon;
-import handlers.targethandlers.TargetUndead;
-import handlers.targethandlers.TargetUnlockable;
-
-import java.util.logging.Logger;
-
-import com.l2jserver.gameserver.handler.TargetHandler;
-
-/**
- * @author UnAfraid
- */
-public class TargetMasterHandler
-{
-	private static Logger _log = Logger.getLogger(TargetMasterHandler.class.getName());
-	
-	public static void loadTargetHandlers()
-	{
-		TargetHandler.getInstance().registerSkillTargetType(new TargetAlly());
-		TargetHandler.getInstance().registerSkillTargetType(new TargetArea());
-		TargetHandler.getInstance().registerSkillTargetType(new TargetAreaCorpseMob());
-		TargetHandler.getInstance().registerSkillTargetType(new TargetAreaSummon());
-		TargetHandler.getInstance().registerSkillTargetType(new TargetAreaUndead());
-		TargetHandler.getInstance().registerSkillTargetType(new TargetAura());
-		TargetHandler.getInstance().registerSkillTargetType(new TargetAuraCorpseMob());
-		TargetHandler.getInstance().registerSkillTargetType(new TargetBehindArea());
-		TargetHandler.getInstance().registerSkillTargetType(new TargetBehindAura());
-		TargetHandler.getInstance().registerSkillTargetType(new TargetClan());
-		TargetHandler.getInstance().registerSkillTargetType(new TargetClanMember());
-		TargetHandler.getInstance().registerSkillTargetType(new TargetCorpseAlly());
-		TargetHandler.getInstance().registerSkillTargetType(new TargetCorpseClan());
-		TargetHandler.getInstance().registerSkillTargetType(new TargetCorpseMob());
-		TargetHandler.getInstance().registerSkillTargetType(new TargetCorpsePet());
-		TargetHandler.getInstance().registerSkillTargetType(new TargetCorpsePlayer());
-		TargetHandler.getInstance().registerSkillTargetType(new TargetEnemySummon());
-		TargetHandler.getInstance().registerSkillTargetType(new TargetFlagPole());
-		TargetHandler.getInstance().registerSkillTargetType(new TargetFrontArea());
-		TargetHandler.getInstance().registerSkillTargetType(new TargetFrontAura());
-		TargetHandler.getInstance().registerSkillTargetType(new TargetGround());
-		TargetHandler.getInstance().registerSkillTargetType(new TargetHoly());
-		TargetHandler.getInstance().registerSkillTargetType(new TargetOne());
-		TargetHandler.getInstance().registerSkillTargetType(new TargetOwnerPet());
-		TargetHandler.getInstance().registerSkillTargetType(new TargetParty());
-		TargetHandler.getInstance().registerSkillTargetType(new TargetPartyClan());
-		TargetHandler.getInstance().registerSkillTargetType(new TargetPartyMember());
-		TargetHandler.getInstance().registerSkillTargetType(new TargetPartyNotMe());
-		TargetHandler.getInstance().registerSkillTargetType(new TargetPartyOther());
-		TargetHandler.getInstance().registerSkillTargetType(new TargetPet());
-		TargetHandler.getInstance().registerSkillTargetType(new TargetSelf());
-		TargetHandler.getInstance().registerSkillTargetType(new TargetSummon());
-		TargetHandler.getInstance().registerSkillTargetType(new TargetUndead());
-		TargetHandler.getInstance().registerSkillTargetType(new TargetUnlockable());
-	}
-	
-	public static void main(String[] args)
-	{
-		loadTargetHandlers();
-		_log.config("Loaded " + TargetHandler.getInstance().size() + " Target handlers");
-	}
-}