Cleanup by Nbd

L2_GameServer_It/java/net/sf/l2j/gameserver/ai/L2NpcWalkerAI.java

@@ -25,12 +25,9 @@ import net.sf.l2j.gameserver.model.L2CharPosition;
 import net.sf.l2j.gameserver.model.L2Character;
 import net.sf.l2j.gameserver.model.L2NpcWalkerNode;
 import net.sf.l2j.gameserver.model.actor.instance.L2NpcWalkerInstance;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 
 public class L2NpcWalkerAI extends L2CharacterAI implements Runnable
 {
-	private static final Log _log = LogFactory.getLog(L2NpcWalkerAI.class);
 	private static final int DEFAULT_MOVE_DELAY = 0;
 
 	private long _nextMoveTime;
@@ -92,7 +89,7 @@ public class L2NpcWalkerAI extends L2CharacterAI implements Runnable
 	 */
 	protected void onEvtArrivedBlocked(L2CharPosition blocked_at_pos)
 	{
-		_log.error("NpcWalker ID: " + getActor().getNpcId() + ": Blocked at rote position [" + _currentPos + "], coords: " + blocked_at_pos.x + ", " + blocked_at_pos.y + ", " + blocked_at_pos.z + ". Teleporting to next point");
+		_log.warning("NpcWalker ID: " + getActor().getNpcId() + ": Blocked at rote position [" + _currentPos + "], coords: " + blocked_at_pos.x + ", " + blocked_at_pos.y + ", " + blocked_at_pos.z + ". Teleporting to next point");
 
 		int destinationX = _route.get(_currentPos).getMoveX();
 		int destinationY = _route.get(_currentPos).getMoveY();
@@ -131,7 +128,7 @@ public class L2NpcWalkerAI extends L2CharacterAI implements Runnable
 			{
 				delay = DEFAULT_MOVE_DELAY;
 				if(Config.DEVELOPER)
-					_log.warn("Wrong Delay Set in Npc Walker Functions = " + delay + " secs, using default delay: " + DEFAULT_MOVE_DELAY + " secs instead.");
+					_log.warning("Wrong Delay Set in Npc Walker Functions = " + delay + " secs, using default delay: " + DEFAULT_MOVE_DELAY + " secs instead.");
 			}
 
 			_nextMoveTime = System.currentTimeMillis() + delay;

L2_GameServer_It/java/net/sf/l2j/gameserver/ai2/AiManager.java

@@ -71,6 +71,7 @@ public class AiManager
 		try
 		{
 			//TODO redo all the SpecificAiManger loading it's completely messed up:
+			@SuppressWarnings("unused")
 			JarFile jar = new JarFile("./l2jserver.jar");
 			URL url = Class.class.getResource("/net/sf/l2j/gameserver/ai/managers");
 			//jar.getJarEntry("/net/sf/l2j/gameserver/ai/managers").get;

L2_GameServer_It/java/net/sf/l2j/gameserver/clientpackets/RequestPartyMatchList.java

@@ -74,6 +74,7 @@ public class RequestPartyMatchList extends L2GameClientPacket
 			//Collection<L2PcInstance> players = L2World.getInstance().getAllPlayers();
 			//L2PcInstance[] allPlayers = players.toArray(new L2PcInstance[players.size()]);
 			L2PcInstance[] empty = new L2PcInstance[] { };
+			@SuppressWarnings("unused")
 			PartyMatchList matchList = new PartyMatchList(empty);
 			//sendPacket(matchList);
 		}

L2_GameServer_It/java/net/sf/l2j/gameserver/clientpackets/RequestPledgeWarList.java

@@ -29,6 +29,7 @@ import net.sf.l2j.gameserver.serverpackets.PledgeReceiveWarList;
 public final class RequestPledgeWarList extends L2GameClientPacket
 {
     private static final String _C__D0_1E_REQUESTPLEDGEWARLIST = "[C] D0:1E RequestPledgeWarList";
+    @SuppressWarnings("unused")
     private int _unk1;
     private int _tab;
 

L2_GameServer_It/java/net/sf/l2j/gameserver/datatables/NpcWalkerRoutesTable.java

@@ -22,7 +22,6 @@ import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 
 import javolution.util.FastList;
-import javolution.util.FastMap;
 import net.sf.l2j.L2DatabaseFactory;
 import net.sf.l2j.gameserver.model.L2NpcWalkerNode;
 

L2_GameServer_It/java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminEditNpc.java

@@ -45,7 +45,6 @@ import net.sf.l2j.gameserver.serverpackets.NpcHtmlMessage;
 import net.sf.l2j.gameserver.templates.L2Item;
 import net.sf.l2j.gameserver.templates.L2NpcTemplate;
 import net.sf.l2j.gameserver.templates.StatsSet;
-import net.sf.l2j.gameserver.util.Util;
 
 /**
  * @author terry

L2_GameServer_It/java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminGeodata.java

@@ -43,6 +43,7 @@ public class AdminGeodata implements IAdminCommandHandler
 		};
 	private static final int REQUIRED_LEVEL = Config.GM_MIN;
 
+	@SuppressWarnings("deprecation")
 	public boolean useAdminCommand(String command, L2PcInstance activeChar)
 	{
         if (!Config.ALT_PRIVILEGES_ADMIN)
@@ -107,6 +108,7 @@ public class AdminGeodata implements IAdminCommandHandler
         		{
         			byte rx = Byte.parseByte(v[0]);
         			byte ry = Byte.parseByte(v[1]);
+        			
         			boolean result = GeoData.loadGeodataFile(rx, ry);
 
         			if(result)

L2_GameServer_It/java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminMammon.java

@@ -45,6 +45,7 @@ public class AdminMammon implements IAdminCommandHandler
 
 	private boolean _isSealValidation = SevenSigns.getInstance().isSealValidationPeriod();
 
+	@SuppressWarnings("deprecation")
 	public boolean useAdminCommand(String command, L2PcInstance activeChar)
 	{
 		if (!Config.ALT_PRIVILEGES_ADMIN)

L2_GameServer_It/java/net/sf/l2j/gameserver/handler/skillhandlers/Spoil.java

@@ -19,7 +19,6 @@
 package net.sf.l2j.gameserver.handler.skillhandlers;
 
 import net.sf.l2j.gameserver.ai.CtrlEvent;
-import net.sf.l2j.gameserver.ai.CtrlIntention;
 import net.sf.l2j.gameserver.handler.ISkillHandler;
 import net.sf.l2j.gameserver.model.L2Character;
 import net.sf.l2j.gameserver.model.L2Object;

L2_GameServer_It/java/net/sf/l2j/gameserver/instancemanager/DimensionalRiftManager.java

@@ -38,7 +38,6 @@ import net.sf.l2j.gameserver.model.L2ItemInstance;
 import net.sf.l2j.gameserver.model.L2Spawn;
 import net.sf.l2j.gameserver.model.actor.instance.L2NpcInstance;
 import net.sf.l2j.gameserver.model.actor.instance.L2PcInstance;
-import net.sf.l2j.gameserver.model.actor.instance.L2RiftInvaderInstance;
 import net.sf.l2j.gameserver.model.entity.DimensionalRift;
 import net.sf.l2j.gameserver.serverpackets.NpcHtmlMessage;
 import net.sf.l2j.gameserver.templates.L2NpcTemplate;
@@ -362,8 +361,8 @@ public class DimensionalRiftManager
 
     public class DimensionalRiftRoom
     {
-        private final byte _type;
-        private final byte _room;
+        protected final byte _type;
+        protected final byte _room;
         private final int _xMin;
         private final int _xMax;
         private final int _yMin;
@@ -374,7 +373,7 @@ public class DimensionalRiftManager
         private final Shape _s;
         private final boolean _isBossRoom;
         private final FastList<L2Spawn> _roomSpawns;
-        private final FastList<L2NpcInstance> _roomMobs;
+        protected final FastList<L2NpcInstance> _roomMobs;
 
         public DimensionalRiftRoom(byte type, byte room, int xMin, int xMax, int yMin, int yMax, int zMin, int zMax, int xT, int yT, int zT, boolean isBossRoom)
         {

L2_GameServer_It/java/net/sf/l2j/gameserver/model/L2Potion.java

@@ -36,6 +36,7 @@ public class L2Potion extends L2Object
     protected static final Logger _log = Logger.getLogger(L2Character.class.getName());
 
 
+    @SuppressWarnings("unused")
 	private L2Character _target;
 
 	private Future _potionhpRegTask;

L2_GameServer_It/java/net/sf/l2j/gameserver/model/actor/instance/L2CastleTeleporterInstance.java

@@ -31,7 +31,6 @@ import net.sf.l2j.gameserver.datatables.TeleportLocationTable;
 import net.sf.l2j.gameserver.model.L2CharPosition;
 import net.sf.l2j.gameserver.model.L2TeleportLocation;
 import net.sf.l2j.gameserver.serverpackets.ActionFailed;
-import net.sf.l2j.gameserver.serverpackets.MyTargetSelected;
 import net.sf.l2j.gameserver.serverpackets.NpcHtmlMessage;
 import net.sf.l2j.gameserver.templates.L2NpcTemplate;
 

L2_GameServer_It/java/net/sf/l2j/gameserver/model/actor/instance/L2CastleWarehouseInstance.java

@@ -1,7 +1,5 @@
 package net.sf.l2j.gameserver.model.actor.instance;
 
-import java.util.logging.Logger;
-
 import net.sf.l2j.gameserver.model.L2Clan;
 import net.sf.l2j.gameserver.network.SystemMessageId;
 import net.sf.l2j.gameserver.serverpackets.ActionFailed;
@@ -14,9 +12,8 @@ import net.sf.l2j.gameserver.templates.L2NpcTemplate;
 /**
  * @author  l3x
  */
-public class L2CastleWarehouseInstance extends L2FolkInstance{
-	private static Logger _log = Logger.getLogger(L2WarehouseInstance.class.getName());
-
+public class L2CastleWarehouseInstance extends L2FolkInstance
+{
 	protected static final int COND_ALL_FALSE = 0;
 	protected static final int COND_BUSY_BECAUSE_OF_SIEGE = 1;
 	protected static final int COND_OWNER = 2;

L2_GameServer_It/java/net/sf/l2j/gameserver/model/actor/instance/L2ClanHallManagerInstance.java

@@ -23,7 +23,6 @@ import java.util.StringTokenizer;
 
 import net.sf.l2j.Config;
 import net.sf.l2j.gameserver.TradeController;
-import net.sf.l2j.gameserver.ai.CtrlIntention;
 import net.sf.l2j.gameserver.datatables.SkillTable;
 import net.sf.l2j.gameserver.datatables.TeleportLocationTable;
 import net.sf.l2j.gameserver.instancemanager.ClanHallManager;

L2_GameServer_It/java/net/sf/l2j/gameserver/model/actor/instance/L2FestivalGuideInstance.java

@@ -25,14 +25,12 @@ import javolution.text.TextBuilder;
 import net.sf.l2j.Config;
 import net.sf.l2j.gameserver.SevenSigns;
 import net.sf.l2j.gameserver.SevenSignsFestival;
-import net.sf.l2j.gameserver.ai.CtrlIntention;
 import net.sf.l2j.gameserver.model.L2ItemInstance;
 import net.sf.l2j.gameserver.model.L2Party;
 import net.sf.l2j.gameserver.network.SystemMessageId;
 import net.sf.l2j.gameserver.serverpackets.ActionFailed;
 import net.sf.l2j.gameserver.serverpackets.NpcHtmlMessage;
 import net.sf.l2j.gameserver.serverpackets.SystemMessage;
-import net.sf.l2j.gameserver.serverpackets.ValidateLocation;
 import net.sf.l2j.gameserver.templates.L2NpcTemplate;
 import net.sf.l2j.gameserver.templates.StatsSet;
 

L2_GameServer_It/java/net/sf/l2j/gameserver/model/actor/instance/L2FolkInstance.java

@@ -33,11 +33,8 @@ import net.sf.l2j.gameserver.serverpackets.NpcHtmlMessage;
 import net.sf.l2j.gameserver.serverpackets.SystemMessage;
 import net.sf.l2j.gameserver.templates.L2NpcTemplate;
 
-import java.util.logging.Logger;
-
 public class L2FolkInstance extends L2NpcInstance
 {
-	protected static Logger _log = Logger.getLogger(L2FolkInstance.class.getName());
 	private final ClassId[] _classesToTeach;
 
 	public L2FolkInstance(int objectId, L2NpcTemplate template)

L2_GameServer_It/java/net/sf/l2j/gameserver/model/actor/instance/L2NpcWalkerInstance.java

@@ -23,8 +23,6 @@ import net.sf.l2j.gameserver.ai.L2CharacterAI;
 import net.sf.l2j.gameserver.serverpackets.CreatureSay;
 import net.sf.l2j.gameserver.templates.L2NpcTemplate;
 import net.sf.l2j.gameserver.model.L2Character;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 
 import java.util.Map;
 
@@ -37,8 +35,6 @@ import java.util.Map;
  */
 public class L2NpcWalkerInstance extends L2NpcInstance
 {
-	private static Log _log = LogFactory.getLog(L2NpcWalkerInstance.class.getName());
-
 	/**
 	 * Constructor of L2NpcWalkerInstance (use L2Character and L2NpcInstance constructor).<BR><BR>
 	 */
@@ -118,7 +114,7 @@ public class L2NpcWalkerInstance extends L2NpcInstance
 		return  super.getAI();
 	}
 
-	private class L2NpcWalkerAIAccessor extends L2Character.AIAccessor
+	protected class L2NpcWalkerAIAccessor extends L2Character.AIAccessor
 	{
 		/**
 		 * AI can't be deattached.

L2_GameServer_It/java/net/sf/l2j/gameserver/model/actor/instance/L2ObservationInstance.java

@@ -20,7 +20,6 @@ package net.sf.l2j.gameserver.model.actor.instance;
 
 import java.util.StringTokenizer;
 
-import net.sf.l2j.Config;
 import net.sf.l2j.gameserver.instancemanager.SiegeManager;
 import net.sf.l2j.gameserver.network.SystemMessageId;
 import net.sf.l2j.gameserver.serverpackets.ActionFailed;

L2_GameServer_It/java/net/sf/l2j/gameserver/model/actor/instance/L2SiegeGuardInstance.java

@@ -30,7 +30,6 @@ import net.sf.l2j.gameserver.model.L2Character;
 import net.sf.l2j.gameserver.model.actor.knownlist.SiegeGuardKnownList;
 import net.sf.l2j.gameserver.serverpackets.ActionFailed;
 import net.sf.l2j.gameserver.serverpackets.MyTargetSelected;
-import net.sf.l2j.gameserver.serverpackets.NpcInfo;
 import net.sf.l2j.gameserver.serverpackets.SocialAction;
 import net.sf.l2j.gameserver.serverpackets.StatusUpdate;
 import net.sf.l2j.gameserver.serverpackets.ValidateLocation;

L2_GameServer_It/java/net/sf/l2j/gameserver/model/actor/instance/L2TrainerInstance.java

@@ -18,7 +18,6 @@
  */
 package net.sf.l2j.gameserver.model.actor.instance;
 
-import net.sf.l2j.Config;
 import net.sf.l2j.gameserver.templates.L2NpcTemplate;
 
 /**

L2_GameServer_It/java/net/sf/l2j/gameserver/model/actor/stat/CharStat.java

@@ -20,7 +20,6 @@ package net.sf.l2j.gameserver.model.actor.stat;
 import net.sf.l2j.Config;
 import net.sf.l2j.gameserver.model.L2Character;
 import net.sf.l2j.gameserver.model.L2Skill;
-import net.sf.l2j.gameserver.model.actor.instance.L2NpcWalkerInstance;
 import net.sf.l2j.gameserver.model.actor.instance.L2PcInstance;
 import net.sf.l2j.gameserver.skills.Calculator;
 import net.sf.l2j.gameserver.skills.Env;

L2_GameServer_It/java/net/sf/l2j/gameserver/model/zone/type/L2ArenaZone.java

@@ -30,6 +30,7 @@ import net.sf.l2j.gameserver.serverpackets.SystemMessage;
  */
 public class L2ArenaZone extends L2ZoneType
 {
+	@SuppressWarnings("unused")
 	private String _arenaName;
 	private int[] _spawnLoc;
 

L2_GameServer_It/java/net/sf/l2j/gameserver/serverpackets/ExOlympiadUserInfo.java

@@ -32,6 +32,7 @@ public class ExOlympiadUserInfo extends L2GameServerPacket
 {
 	// chcdSddddd
 	private static final String _S__FE_29_OLYMPIADUSERINFO = "[S] FE:2C OlympiadUserInfo";
+	@SuppressWarnings("unused")
 	private static L2PcInstance _activeChar;
 
 

L2_GameServer_It/java/net/sf/l2j/gameserver/skills/effects/EffectGrow.java

@@ -3,7 +3,6 @@ package net.sf.l2j.gameserver.skills.effects;
 import net.sf.l2j.gameserver.model.L2Character;
 import net.sf.l2j.gameserver.model.L2Effect;
 import net.sf.l2j.gameserver.model.actor.instance.L2NpcInstance;
-import net.sf.l2j.gameserver.serverpackets.NpcInfo;
 import net.sf.l2j.gameserver.skills.Env;
 
 public class EffectGrow extends L2Effect {