Browse Source

BETA: (Code Style) final static to static final declaration (unified).

Zoey76 13 năm trước cách đây
mục cha
commit
a94ed1750b
38 tập tin đã thay đổi với 140 bổ sung145 xóa
  1. 1 1
      L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/NpcWalkerRoutesTable.java
  2. 1 1
      L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/InstanceManager.java
  3. 1 1
      L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/ItemAuctionManager.java
  4. 1 1
      L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/RaidBossPointsManager.java
  5. 5 5
      L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/TownManager.java
  6. 12 12
      L2J_Server_BETA/java/com/l2jserver/gameserver/model/Elementals.java
  7. 3 3
      L2J_Server_BETA/java/com/l2jserver/gameserver/model/L2Macro.java
  8. 6 6
      L2J_Server_BETA/java/com/l2jserver/gameserver/model/L2ShortCut.java
  9. 1 1
      L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2FortSupportCaptainInstance.java
  10. 2 2
      L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2RaceManagerInstance.java
  11. 2 2
      L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2SepulcherNpcInstance.java
  12. 8 8
      L2J_Server_BETA/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerGrade.java
  13. 9 9
      L2J_Server_BETA/java/com/l2jserver/gameserver/model/conditions/ConditionSiegeZone.java
  14. 0 2
      L2J_Server_BETA/java/com/l2jserver/gameserver/model/entity/DimensionalRift.java
  15. 1 3
      L2J_Server_BETA/java/com/l2jserver/gameserver/model/entity/Instance.java
  16. 1 1
      L2J_Server_BETA/java/com/l2jserver/gameserver/model/quest/Quest.java
  17. 3 3
      L2J_Server_BETA/java/com/l2jserver/gameserver/model/quest/State.java
  18. 9 9
      L2J_Server_BETA/java/com/l2jserver/gameserver/model/skills/L2Skill.java
  19. 1 1
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/NpcStringId.java
  20. 1 1
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/SystemMessageId.java
  21. 5 5
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestBlock.java
  22. 23 24
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/Say2.java
  23. 2 2
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/SendBypassBuildCmd.java
  24. 3 3
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/ExBasicActionList.java
  25. 1 1
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/ExCaptureOrc.java
  26. 1 1
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/ExShowDominionRegistry.java
  27. 1 1
      L2J_Server_BETA/java/com/l2jserver/gameserver/scripting/L2ScriptEngineManager.java
  28. 1 1
      L2J_Server_BETA/java/com/l2jserver/gameserver/taskmanager/KnownListUpdateTaskManager.java
  29. 1 1
      L2J_Server_BETA/java/com/l2jserver/gameserver/util/L2ObjectHashMap.java
  30. 1 1
      L2J_Server_BETA/java/com/l2jserver/gameserver/util/L2ObjectHashSet.java
  31. 6 6
      L2J_Server_BETA/java/com/l2jserver/gameserver/util/Util.java
  32. 1 1
      L2J_Server_BETA/java/com/l2jserver/loginserver/LoginController.java
  33. 1 1
      L2J_Server_BETA/java/com/l2jserver/loginserver/mail/BaseMail.java
  34. 1 1
      L2J_Server_BETA/java/com/l2jserver/loginserver/mail/MailSystem.java
  35. 1 1
      L2J_Server_BETA/java/com/l2jserver/tools/ngl/LocalizationParser.java
  36. 15 15
      L2J_Server_BETA/java/com/l2jserver/util/Base64.java
  37. 3 3
      L2J_Server_BETA/java/com/l2jserver/util/Rnd.java
  38. 5 5
      L2J_Server_BETA/java/com/l2jserver/util/crypt/BlowfishEngine.java

+ 1 - 1
L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/NpcWalkerRoutesTable.java

@@ -38,7 +38,7 @@ import com.l2jserver.gameserver.network.NpcStringId;
  */
 public class NpcWalkerRoutesTable
 {
-	private final static Logger _log = Logger.getLogger(NpcWalkerRoutesTable.class.getName());
+	private static final Logger _log = Logger.getLogger(NpcWalkerRoutesTable.class.getName());
 	
 	private final TIntObjectHashMap<List<L2NpcWalkerNode>> _routes = new TIntObjectHashMap<List<L2NpcWalkerNode>>();
 	

+ 1 - 1
L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/InstanceManager.java

@@ -41,7 +41,7 @@ public class InstanceManager extends DocumentParser
 	private int _dynamic = 300000;
 	
 	// InstanceId Names
-	private final static Map<Integer, String> _instanceIdNames = new HashMap<>();
+	private static final Map<Integer, String> _instanceIdNames = new HashMap<>();
 	private final Map<Integer, Map<Integer, Long>> _playerInstanceTimes = new FastMap<>();
 	
 	private static final String ADD_INSTANCE_TIME = "INSERT INTO character_instance_time (charId,instanceId,time) values (?,?,?) ON DUPLICATE KEY UPDATE time=?";

+ 1 - 1
L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/ItemAuctionManager.java

@@ -144,7 +144,7 @@ public final class ItemAuctionManager
 		return _auctionIds.getAndIncrement();
 	}
 	
-	public final static void deleteAuction(final int auctionId)
+	public static final void deleteAuction(final int auctionId)
 	{
 		Connection con = null;
 		try

+ 1 - 1
L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/RaidBossPointsManager.java

@@ -37,7 +37,7 @@ import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
  */
 public class RaidBossPointsManager
 {
-	private final static Logger _log = Logger.getLogger(RaidBossPointsManager.class.getName());
+	private static final Logger _log = Logger.getLogger(RaidBossPointsManager.class.getName());
 	
 	private FastMap<Integer, Map<Integer, Integer>> _list;
 	

+ 5 - 5
L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/TownManager.java

@@ -22,7 +22,7 @@ public class TownManager
 {
 	// private static final Logger _log = Logger.getLogger(TownManager.class.getName());
 	
-	public final static int getTownCastle(int townId)
+	public static final int getTownCastle(int townId)
 	{
 		switch (townId)
 		{
@@ -49,7 +49,7 @@ public class TownManager
 		}
 	}
 	
-	public final static boolean townHasCastleInSiege(int townId)
+	public static final boolean townHasCastleInSiege(int townId)
 	{
 		int castleIndex = getTownCastle(townId);
 		
@@ -64,12 +64,12 @@ public class TownManager
 		return false;
 	}
 	
-	public final static boolean townHasCastleInSiege(int x, int y)
+	public static final boolean townHasCastleInSiege(int x, int y)
 	{
 		return townHasCastleInSiege(MapRegionManager.getInstance().getMapRegionLocId(x, y));
 	}
 	
-	public final static L2TownZone getTown(int townId)
+	public static final L2TownZone getTown(int townId)
 	{
 		for (L2TownZone temp : ZoneManager.getInstance().getAllZones(L2TownZone.class))
 		{
@@ -88,7 +88,7 @@ public class TownManager
 	 * @param z
 	 * @return
 	 */
-	public final static L2TownZone getTown(int x, int y, int z)
+	public static final L2TownZone getTown(int x, int y, int z)
 	{
 		for (L2ZoneType temp : ZoneManager.getInstance().getZones(x, y, z))
 		{

+ 12 - 12
L2J_Server_BETA/java/com/l2jserver/gameserver/model/Elementals.java

@@ -32,19 +32,19 @@ public final class Elementals
 			TABLE.put(item._itemId, item);
 	}
 	
-	public final static byte NONE = -1;
-	public final static byte FIRE = 0;
-	public final static byte WATER = 1;
-	public final static byte WIND = 2;
-	public final static byte EARTH = 3;
-	public final static byte HOLY = 4;
-	public final static byte DARK = 5;
+	public static final byte NONE = -1;
+	public static final byte FIRE = 0;
+	public static final byte WATER = 1;
+	public static final byte WIND = 2;
+	public static final byte EARTH = 3;
+	public static final byte HOLY = 4;
+	public static final byte DARK = 5;
 	
-	public final static int FIRST_WEAPON_BONUS = 20;
-	public final static int NEXT_WEAPON_BONUS = 5;
-	public final static int ARMOR_BONUS = 6;
+	public static final int FIRST_WEAPON_BONUS = 20;
+	public static final int NEXT_WEAPON_BONUS = 5;
+	public static final int ARMOR_BONUS = 6;
 	
-	public final static int[] WEAPON_VALUES =
+	public static final int[] WEAPON_VALUES =
 	{
 		0,   // Level 1
 		25,  // Level 2
@@ -62,7 +62,7 @@ public final class Elementals
 		Integer.MAX_VALUE  // TODO: Higher stones
 	};
 	
-	public final static int[] ARMOR_VALUES =
+	public static final int[] ARMOR_VALUES =
 	{
 		0,  // Level 1
 		12, // Level 2

+ 3 - 3
L2J_Server_BETA/java/com/l2jserver/gameserver/model/L2Macro.java

@@ -21,9 +21,9 @@ package com.l2jserver.gameserver.model;
  */
 public class L2Macro
 {
-	public final static int CMD_TYPE_SKILL = 1;
-	public final static int CMD_TYPE_ACTION = 3;
-	public final static int CMD_TYPE_SHORTCUT = 4;
+	public static final int CMD_TYPE_SKILL = 1;
+	public static final int CMD_TYPE_ACTION = 3;
+	public static final int CMD_TYPE_SHORTCUT = 4;
 	
 	public int id;
 	public final int icon;

+ 6 - 6
L2J_Server_BETA/java/com/l2jserver/gameserver/model/L2ShortCut.java

@@ -21,12 +21,12 @@ package com.l2jserver.gameserver.model;
  */
 public class L2ShortCut
 {
-	public final static int TYPE_ITEM = 1;
-	public final static int TYPE_SKILL = 2;
-	public final static int TYPE_ACTION = 3;
-	public final static int TYPE_MACRO = 4;
-	public final static int TYPE_RECIPE = 5;
-	public final static int TYPE_TPBOOKMARK = 6;
+	public static final int TYPE_ITEM = 1;
+	public static final int TYPE_SKILL = 2;
+	public static final int TYPE_ACTION = 3;
+	public static final int TYPE_MACRO = 4;
+	public static final int TYPE_RECIPE = 5;
+	public static final int TYPE_TPBOOKMARK = 6;
 	
 	private final int _slot;
 	private final int _page;

+ 1 - 1
L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2FortSupportCaptainInstance.java

@@ -39,7 +39,7 @@ public class L2FortSupportCaptainInstance extends L2MerchantInstance implements
 		setInstanceType(InstanceType.L2FortSupportCaptainInstance);
 	}
 	
-	private final static int[] TalismanIds = { 9914, 9915, 9917, 9918, 9919, 9920, 9921, 9922, 9923, 9924, 9926, 9927, 9928, 9930, 9931, 9932, 9933, 9934, 9935, 9936, 9937, 9938, 9939, 9940, 9941, 9942, 9943, 9944, 9945, 9946, 9947, 9948, 9949, 9950, 9951, 9952, 9953, 9954, 9955, 9956, 9957, 9958, 9959, 9960, 9961, 9962, 9963, 9964, 9965, 9966, 10141, 10142, 10158 };
+	private static final int[] TalismanIds = { 9914, 9915, 9917, 9918, 9919, 9920, 9921, 9922, 9923, 9924, 9926, 9927, 9928, 9930, 9931, 9932, 9933, 9934, 9935, 9936, 9937, 9938, 9939, 9940, 9941, 9942, 9943, 9944, 9945, 9946, 9947, 9948, 9949, 9950, 9951, 9952, 9953, 9954, 9955, 9956, 9957, 9958, 9959, 9960, 9961, 9962, 9963, 9964, 9965, 9966, 10141, 10142, 10158 };
 	
 	@Override
 	public void onBypassFeedback(L2PcInstance player, String command)

+ 2 - 2
L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2RaceManagerInstance.java

@@ -48,8 +48,8 @@ public class L2RaceManagerInstance extends L2Npc
 	protected static int _raceNumber = 4;
 	
 	//Time Constants
-	private final static long SECOND = 1000;
-	private final static long MINUTE = 60 * SECOND;
+	private static final long SECOND = 1000;
+	private static final long MINUTE = 60 * SECOND;
 	
 	private static int _minutes = 5;
 	

+ 2 - 2
L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2SepulcherNpcInstance.java

@@ -51,8 +51,8 @@ public class L2SepulcherNpcInstance extends L2Npc
 	protected Future<?> _spawnNextMysteriousBoxTask = null;
 	protected Future<?> _spawnMonsterTask = null;
 	
-	private final static String HTML_FILE_PATH = "data/html/SepulcherNpc/";
-	private final static int HALLS_KEY = 7260;
+	private static final String HTML_FILE_PATH = "data/html/SepulcherNpc/";
+	private static final int HALLS_KEY = 7260;
 	
 	public L2SepulcherNpcInstance(int objectID, L2NpcTemplate template)
 	{

+ 8 - 8
L2J_Server_BETA/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerGrade.java

@@ -26,14 +26,14 @@ public final class ConditionPlayerGrade extends Condition
 {
 	protected static final Logger _log = Logger.getLogger(ConditionPlayerGrade.class.getName());
 	// conditional values
-	public final static int COND_NO_GRADE = 0x0001;
-	public final static int COND_D_GRADE = 0x0002;
-	public final static int COND_C_GRADE = 0x0004;
-	public final static int COND_B_GRADE = 0x0008;
-	public final static int COND_A_GRADE = 0x0010;
-	public final static int COND_S_GRADE = 0x0020;
-	public final static int COND_S80_GRADE = 0x0040;
-	public final static int COND_S84_GRADE = 0x0080;
+	public static final int COND_NO_GRADE = 0x0001;
+	public static final int COND_D_GRADE = 0x0002;
+	public static final int COND_C_GRADE = 0x0004;
+	public static final int COND_B_GRADE = 0x0008;
+	public static final int COND_A_GRADE = 0x0010;
+	public static final int COND_S_GRADE = 0x0020;
+	public static final int COND_S80_GRADE = 0x0040;
+	public static final int COND_S84_GRADE = 0x0080;
 	
 	private final int _value;
 	

+ 9 - 9
L2J_Server_BETA/java/com/l2jserver/gameserver/model/conditions/ConditionSiegeZone.java

@@ -30,15 +30,15 @@ import com.l2jserver.gameserver.model.stats.Env;
 public final class ConditionSiegeZone extends Condition
 {
 	// conditional values
-	public final static int COND_NOT_ZONE = 0x0001;
-	public final static int COND_CAST_ATTACK = 0x0002;
-	public final static int COND_CAST_DEFEND = 0x0004;
-	public final static int COND_CAST_NEUTRAL = 0x0008;
-	public final static int COND_FORT_ATTACK = 0x0010;
-	public final static int COND_FORT_DEFEND = 0x0020;
-	public final static int COND_FORT_NEUTRAL = 0x0040;
-	public final static int COND_TW_CHANNEL = 0x0080;
-	public final static int COND_TW_PROGRESS = 0x0100;
+	public static final int COND_NOT_ZONE = 0x0001;
+	public static final int COND_CAST_ATTACK = 0x0002;
+	public static final int COND_CAST_DEFEND = 0x0004;
+	public static final int COND_CAST_NEUTRAL = 0x0008;
+	public static final int COND_FORT_ATTACK = 0x0010;
+	public static final int COND_FORT_DEFEND = 0x0020;
+	public static final int COND_FORT_NEUTRAL = 0x0040;
+	public static final int COND_TW_CHANNEL = 0x0080;
+	public static final int COND_TW_PROGRESS = 0x0100;
 	
 	private final int _value;
 	private final boolean _self;

+ 0 - 2
L2J_Server_BETA/java/com/l2jserver/gameserver/model/entity/DimensionalRift.java

@@ -57,8 +57,6 @@ public class DimensionalRift
 	protected FastList<L2PcInstance> revivedInWaitingRoom = new FastList<L2PcInstance>();
 	private boolean isBossRoom = false;
 	
-	//private final static Log _log = LogFactory.getLog(DimensionalRift.class.getName());
-	
 	public DimensionalRift(L2Party party, byte type, byte room)
 	{
 		DimensionalRiftManager.getInstance().getRoom(type, room).setPartyInside(true);

+ 1 - 3
L2J_Server_BETA/java/com/l2jserver/gameserver/model/entity/Instance.java

@@ -39,14 +39,12 @@ import com.l2jserver.gameserver.network.serverpackets.CreatureSay;
 import com.l2jserver.gameserver.network.serverpackets.L2GameServerPacket;
 import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
 
-
 /**
  * @author evill33t, GodKratos
- * 
  */
 public class Instance
 {
-	private final static Logger _log = Logger.getLogger(Instance.class.getName());
+	private static final Logger _log = Logger.getLogger(Instance.class.getName());
 	
 	private int _id;
 	private String _name;

+ 1 - 1
L2J_Server_BETA/java/com/l2jserver/gameserver/model/quest/Quest.java

@@ -1334,7 +1334,7 @@ public class Quest extends ManagedScript
 	 * Loads all quest states and variables for the specified player.
 	 * @param player the player who is entering the world
 	 */
-	public final static void playerEnter(L2PcInstance player)
+	public static final void playerEnter(L2PcInstance player)
 	{
 		Connection con = null;
 		try

+ 3 - 3
L2J_Server_BETA/java/com/l2jserver/gameserver/model/quest/State.java

@@ -28,9 +28,9 @@ package com.l2jserver.gameserver.model.quest;
  */
 public class State
 {
-	public final static byte CREATED = 0;
-	public final static byte STARTED = 1;
-	public final static byte COMPLETED = 2;
+	public static final byte CREATED = 0;
+	public static final byte STARTED = 1;
+	public static final byte COMPLETED = 2;
 	
 	/**
 	 * Get the quest state's string representation from its byte value.

+ 9 - 9
L2J_Server_BETA/java/com/l2jserver/gameserver/model/skills/L2Skill.java

@@ -85,15 +85,15 @@ public abstract class L2Skill implements IChanceSkillTrigger
 	public static final boolean geoEnabled = Config.GEODATA > 0;
 	
 	//conditional values
-	public final static int COND_RUNNING = 0x0001;
-	public final static int COND_WALKING = 0x0002;
-	public final static int COND_SIT = 0x0004;
-	public final static int COND_BEHIND = 0x0008;
-	public final static int COND_CRIT = 0x0010;
-	public final static int COND_LOWHP = 0x0020;
-	public final static int COND_ROBES = 0x0040;
-	public final static int COND_CHARGES = 0x0080;
-	public final static int COND_SHIELD = 0x0100;
+	public static final int COND_RUNNING = 0x0001;
+	public static final int COND_WALKING = 0x0002;
+	public static final int COND_SIT = 0x0004;
+	public static final int COND_BEHIND = 0x0008;
+	public static final int COND_CRIT = 0x0010;
+	public static final int COND_LOWHP = 0x0020;
+	public static final int COND_ROBES = 0x0040;
+	public static final int COND_CHARGES = 0x0080;
+	public static final int COND_SHIELD = 0x0100;
 	
 	private static final Func[] _emptyFunctionSet = new Func[0];
 	private static final L2Effect[] _emptyEffectSet = new L2Effect[0];

+ 1 - 1
L2J_Server_BETA/java/com/l2jserver/gameserver/network/NpcStringId.java

@@ -25207,7 +25207,7 @@ public final class NpcStringId
 		buildFastLookupTable();
 	}
 	
-	private final static void buildFastLookupTable()
+	private static final void buildFastLookupTable()
 	{
 		final Field[] fields = NpcStringId.class.getDeclaredFields();
 		final ArrayList<NpcStringId> nsIds = new ArrayList<NpcStringId>(fields.length);

+ 1 - 1
L2J_Server_BETA/java/com/l2jserver/gameserver/network/SystemMessageId.java

@@ -17337,7 +17337,7 @@ public final class SystemMessageId
 		buildFastLookupTable();
 	}
 	
-	private final static void buildFastLookupTable()
+	private static final void buildFastLookupTable()
 	{
 		final Field[] fields = SystemMessageId.class.getDeclaredFields();
 		final ArrayList<SystemMessageId> smIds = new ArrayList<SystemMessageId>(fields.length);

+ 5 - 5
L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestBlock.java

@@ -23,11 +23,11 @@ public final class RequestBlock extends L2GameClientPacket
 {
 	private static final String _C__A9_REQUESTBLOCK = "[C] A9 RequestBlock";
 	
-	private final static int BLOCK = 0;
-	private final static int UNBLOCK = 1;
-	private final static int BLOCKLIST = 2;
-	private final static int ALLBLOCK = 3;
-	private final static int ALLUNBLOCK = 4;
+	private static final int BLOCK = 0;
+	private static final int UNBLOCK = 1;
+	private static final int BLOCKLIST = 2;
+	private static final int ALLBLOCK = 3;
+	private static final int ALLUNBLOCK = 4;
 	
 	private String _name;
 	private Integer _type;

+ 23 - 24
L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/Say2.java

@@ -34,7 +34,6 @@ import com.l2jserver.gameserver.scripting.scriptengine.listeners.talk.ChatFilter
 import com.l2jserver.gameserver.scripting.scriptengine.listeners.talk.ChatListener;
 import com.l2jserver.gameserver.util.Util;
 
-
 /**
  * This class ...
  *
@@ -48,30 +47,30 @@ public final class Say2 extends L2GameClientPacket
 	private static FastList<ChatListener> chatListeners = new FastList<ChatListener>().shared();
 	private static FastList<ChatFilterListener> chatFilterListeners = new FastList<ChatFilterListener>().shared();
 	
-	public final static int ALL = 0;
-	public final static int SHOUT = 1; //!
-	public final static int TELL = 2;
-	public final static int PARTY = 3; //#
-	public final static int CLAN = 4;  //@
-	public final static int GM = 5;
-	public final static int PETITION_PLAYER = 6; // used for petition
-	public final static int PETITION_GM = 7; //* used for petition
-	public final static int TRADE = 8; //+
-	public final static int ALLIANCE = 9; //$
-	public final static int ANNOUNCEMENT = 10;
-	public final static int BOAT = 11;
-	public final static int L2FRIEND = 12;
-	public final static int MSNCHAT = 13;
-	public final static int PARTYMATCH_ROOM = 14;
-	public final static int PARTYROOM_COMMANDER = 15; //(Yellow)
-	public final static int PARTYROOM_ALL = 16; //(Red)
-	public final static int HERO_VOICE = 17;
-	public final static int CRITICAL_ANNOUNCE = 18;
-	public final static int SCREEN_ANNOUNCE = 19;
-	public final static int BATTLEFIELD = 20;
-	public final static int MPCC_ROOM = 21;
+	public static final int ALL = 0;
+	public static final int SHOUT = 1; //!
+	public static final int TELL = 2;
+	public static final int PARTY = 3; //#
+	public static final int CLAN = 4;  //@
+	public static final int GM = 5;
+	public static final int PETITION_PLAYER = 6; // used for petition
+	public static final int PETITION_GM = 7; //* used for petition
+	public static final int TRADE = 8; //+
+	public static final int ALLIANCE = 9; //$
+	public static final int ANNOUNCEMENT = 10;
+	public static final int BOAT = 11;
+	public static final int L2FRIEND = 12;
+	public static final int MSNCHAT = 13;
+	public static final int PARTYMATCH_ROOM = 14;
+	public static final int PARTYROOM_COMMANDER = 15; //(Yellow)
+	public static final int PARTYROOM_ALL = 16; //(Red)
+	public static final int HERO_VOICE = 17;
+	public static final int CRITICAL_ANNOUNCE = 18;
+	public static final int SCREEN_ANNOUNCE = 19;
+	public static final int BATTLEFIELD = 20;
+	public static final int MPCC_ROOM = 21;
 	
-	private final static String[] CHAT_NAMES =
+	private static final String[] CHAT_NAMES =
 	{
 		"ALL",
 		"SHOUT",

+ 2 - 2
L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/SendBypassBuildCmd.java

@@ -30,8 +30,8 @@ public final class SendBypassBuildCmd extends L2GameClientPacket
 {
 	private static final String _C__74_SENDBYPASSBUILDCMD = "[C] 74 SendBypassBuildCmd";
 
-	public final static int GM_MESSAGE = 9;
-	public final static int ANNOUNCEMENT = 10;
+	public static final int GM_MESSAGE = 9;
+	public static final int ANNOUNCEMENT = 10;
 	
 	private String _command;
 	

+ 3 - 3
L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/ExBasicActionList.java

@@ -45,10 +45,10 @@ public final class ExBasicActionList extends L2GameServerPacket
 			_defaultActionList[count1 + count2 + i] = 5000 + i;
 	}
 	
-	private final static ExBasicActionList STATIC_PACKET_TRANSFORMED = new ExBasicActionList(_actionsOnTransform);
-	private final static ExBasicActionList STATIC_PACKET = new ExBasicActionList(_defaultActionList);
+	private static final ExBasicActionList STATIC_PACKET_TRANSFORMED = new ExBasicActionList(_actionsOnTransform);
+	private static final ExBasicActionList STATIC_PACKET = new ExBasicActionList(_defaultActionList);
 	
-	public final static ExBasicActionList getStaticPacket(final L2PcInstance player)
+	public static final ExBasicActionList getStaticPacket(final L2PcInstance player)
 	{
 		return player.isTransformed() ? STATIC_PACKET_TRANSFORMED : STATIC_PACKET;
 	}

+ 1 - 1
L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/ExCaptureOrc.java

@@ -22,7 +22,7 @@ public class ExCaptureOrc extends L2GameServerPacket
 {
 	private static final String _S__FE_44_EXCAPTUREORC = "[S] FE:45 ExSearchOrc";
 	
-	private final static byte[] _test;
+	private static final byte[] _test;
 	static
 	{
 		_test = new byte[]

+ 1 - 1
L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/ExShowDominionRegistry.java

@@ -29,7 +29,7 @@ import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
  */
 public class ExShowDominionRegistry extends L2GameServerPacket
 {
-	private final static int MINID = 80;
+	private static final int MINID = 80;
 	private final int _castleId;
 	private int _clanReq = 0x00;
 	private int _mercReq = 0x00;

+ 1 - 1
L2J_Server_BETA/java/com/l2jserver/gameserver/scripting/L2ScriptEngineManager.java

@@ -50,7 +50,7 @@ public final class L2ScriptEngineManager
 {
 	private static final Logger _log = Logger.getLogger(L2ScriptEngineManager.class.getName());
 	
-	public final static File SCRIPT_FOLDER = new File(Config.DATAPACK_ROOT.getAbsolutePath(), "data/scripts");
+	public static final File SCRIPT_FOLDER = new File(Config.DATAPACK_ROOT.getAbsolutePath(), "data/scripts");
 	
 	public static L2ScriptEngineManager getInstance()
 	{

+ 1 - 1
L2J_Server_BETA/java/com/l2jserver/gameserver/taskmanager/KnownListUpdateTaskManager.java

@@ -34,7 +34,7 @@ public class KnownListUpdateTaskManager
 {
 	protected static final Logger _log = Logger.getLogger(KnownListUpdateTaskManager.class.getName());
 	
-	private final static int FULL_UPDATE_TIMER = 100;
+	private static final int FULL_UPDATE_TIMER = 100;
 	public static boolean updatePass = true;
 	
 	// Do full update every FULL_UPDATE_TIMER * KNOWNLIST_UPDATE_INTERVAL

+ 1 - 1
L2J_Server_BETA/java/com/l2jserver/gameserver/util/L2ObjectHashMap.java

@@ -34,7 +34,7 @@ public final class L2ObjectHashMap<T extends L2Object> extends L2ObjectMap<T>
 	private static final boolean TRACE = false;
 	private static final boolean DEBUG = false;
 	
-	private final static int[] PRIMES = {
+	private static final int[] PRIMES = {
 		5, 7, 11, 17, 23, 29, 37, 47, 59, 71, 89, 107, 131, 163, 197, 239, 293,
 		353, 431, 521, 631, 761, 919, 1103, 1327, 1597, 1931, 2333, 2801,
 		3371, 4049, 4861, 5839, 7013, 8419, 10103, 12143, 14591, 17519,

+ 1 - 1
L2J_Server_BETA/java/com/l2jserver/gameserver/util/L2ObjectHashSet.java

@@ -34,7 +34,7 @@ public final class L2ObjectHashSet<T extends L2Object> extends L2ObjectSet<T>
 	private static final boolean TRACE = false;
 	private static final boolean DEBUG = false;
 	
-	private final static int[] PRIMES =
+	private static final int[] PRIMES =
 	{
 		5,
 		7,

+ 6 - 6
L2J_Server_BETA/java/com/l2jserver/gameserver/util/Util.java

@@ -60,7 +60,7 @@ public final class Util
 	 * @param obj2Y
 	 * @return degree value of object 2 to the horizontal line with object 1 being the origin
 	 */
-	public final static double calculateAngleFrom(int obj1X, int obj1Y, int obj2X, int obj2Y)
+	public static final double calculateAngleFrom(int obj1X, int obj1Y, int obj2X, int obj2Y)
 	{
 		double angleTarget = Math.toDegrees(Math.atan2(obj2Y - obj1Y, obj2X - obj1X));
 		if (angleTarget < 0)
@@ -70,13 +70,13 @@ public final class Util
 		return angleTarget;
 	}
 	
-	public final static double convertHeadingToDegree(int clientHeading)
+	public static final double convertHeadingToDegree(int clientHeading)
 	{
 		double degree = clientHeading / 182.044444444;
 		return degree;
 	}
 	
-	public final static int convertDegreeToClientHeading(double degree)
+	public static final int convertDegreeToClientHeading(double degree)
 	{
 		if (degree < 0)
 		{
@@ -85,12 +85,12 @@ public final class Util
 		return (int) (degree * 182.044444444);
 	}
 	
-	public final static int calculateHeadingFrom(L2Object obj1, L2Object obj2)
+	public static final int calculateHeadingFrom(L2Object obj1, L2Object obj2)
 	{
 		return calculateHeadingFrom(obj1.getX(), obj1.getY(), obj2.getX(), obj2.getY());
 	}
 	
-	public final static int calculateHeadingFrom(int obj1X, int obj1Y, int obj2X, int obj2Y)
+	public static final int calculateHeadingFrom(int obj1X, int obj1Y, int obj2X, int obj2Y)
 	{
 		double angleTarget = Math.toDegrees(Math.atan2(obj2Y - obj1Y, obj2X - obj1X));
 		if (angleTarget < 0)
@@ -100,7 +100,7 @@ public final class Util
 		return (int) (angleTarget * 182.044444444);
 	}
 	
-	public final static int calculateHeadingFrom(double dx, double dy)
+	public static final int calculateHeadingFrom(double dx, double dy)
 	{
 		double angleTarget = Math.toDegrees(Math.atan2(dy, dx));
 		if (angleTarget < 0)

+ 1 - 1
L2J_Server_BETA/java/com/l2jserver/loginserver/LoginController.java

@@ -55,7 +55,7 @@ public class LoginController
 	private static LoginController _instance;
 	
 	/** Time before kicking the client if he didn't logged yet */
-	public final static int LOGIN_TIMEOUT = 60 * 1000;
+	public static final int LOGIN_TIMEOUT = 60 * 1000;
 	
 	/** Authed Clients on LoginServer */
 	protected FastMap<String, L2LoginClient> _loginServerClients = new FastMap<String, L2LoginClient>().shared();

+ 1 - 1
L2J_Server_BETA/java/com/l2jserver/loginserver/mail/BaseMail.java

@@ -39,7 +39,7 @@ import com.l2jserver.loginserver.mail.MailSystem.MailContent;
  */
 public class BaseMail implements Runnable
 {
-	private final static Logger _log = Logger.getLogger(BaseMail.class.getName());
+	private static final Logger _log = Logger.getLogger(BaseMail.class.getName());
 	
 	private final Properties _mailProp = new Properties();
 	private final SmtpAuthenticator _authenticator;

+ 1 - 1
L2J_Server_BETA/java/com/l2jserver/loginserver/mail/MailSystem.java

@@ -36,7 +36,7 @@ import com.l2jserver.Config;
  */
 public class MailSystem
 {
-	private final static Logger _log = Logger.getLogger(MailSystem.class.getName());
+	private static final Logger _log = Logger.getLogger(MailSystem.class.getName());
 	private final Map<String, MailContent> _mailData = new FastMap<String, MailContent>();
 	
 	public static MailSystem getInstance()

+ 1 - 1
L2J_Server_BETA/java/com/l2jserver/tools/ngl/LocalizationParser.java

@@ -34,7 +34,7 @@ public class LocalizationParser
 {
 	private String LANGUAGES_DIRECTORY = "../languages/";
 	private final Map<String, String> _msgMap = new HashMap<String, String>();
-	private final static Logger _log = Logger.getLogger(LocalizationParser.class.getName());
+	private static final Logger _log = Logger.getLogger(LocalizationParser.class.getName());
 	private final String _baseName;
 	
 	public LocalizationParser(String dir, String baseName, Locale locale)

+ 15 - 15
L2J_Server_BETA/java/com/l2jserver/util/Base64.java

@@ -49,37 +49,37 @@ public class Base64
 	/*  P U B L I C F I E L D S */
 	
 	/** No options specified. Value is zero. */
-	public final static int NO_OPTIONS = 0;
+	public static final int NO_OPTIONS = 0;
 	
 	/** Specify encoding. */
-	public final static int ENCODE = 1;
+	public static final int ENCODE = 1;
 	
 	/** Specify decoding. */
-	public final static int DECODE = 0;
+	public static final int DECODE = 0;
 	
 	/** Specify that data should be gzip-compressed. */
-	public final static int GZIP = 2;
+	public static final int GZIP = 2;
 	
 	/** Don't break lines when encoding (violates strict Base64 specification) */
-	public final static int DONT_BREAK_LINES = 8;
+	public static final int DONT_BREAK_LINES = 8;
 	
 	/*  P R I V A T E F I E L D S */
 	
 	/** Maximum line length (76) of Base64 output. */
-	private final static int MAX_LINE_LENGTH = 76;
+	private static final int MAX_LINE_LENGTH = 76;
 	
 	/** The equals sign (=) as a byte. */
-	private final static byte EQUALS_SIGN = (byte) '=';
+	private static final byte EQUALS_SIGN = (byte) '=';
 	
 	/** The new line character (\n) as a byte. */
-	private final static byte NEW_LINE = (byte) '\n';
+	private static final byte NEW_LINE = (byte) '\n';
 	
 	/** Preferred encoding. */
-	private final static String PREFERRED_ENCODING = "UTF-8";
+	private static final String PREFERRED_ENCODING = "UTF-8";
 	
 	/** The 64 valid Base64 values. */
-	private final static byte[] ALPHABET;
-	private final static byte[] _NATIVE_ALPHABET = /* May be something funny like EBCDIC */
+	private static final byte[] ALPHABET;
+	private static final byte[] _NATIVE_ALPHABET = /* May be something funny like EBCDIC */
 	{ (byte) 'A', (byte) 'B', (byte) 'C', (byte) 'D', (byte) 'E', (byte) 'F', (byte) 'G',
 		(byte) 'H', (byte) 'I', (byte) 'J', (byte) 'K', (byte) 'L', (byte) 'M', (byte) 'N',
 		(byte) 'O', (byte) 'P', (byte) 'Q', (byte) 'R', (byte) 'S', (byte) 'T', (byte) 'U',
@@ -121,7 +121,7 @@ public class Base64
 	 * Translates a Base64 value to either its 6-bit reconstruction value or a
 	 * negative number indicating some other meaning.
 	 **/
-	final static byte[] DECODABET = { -9, -9, -9, -9, -9, -9, -9, -9, -9, // Decimal 0 - 8
+	static final byte[] DECODABET = { -9, -9, -9, -9, -9, -9, -9, -9, -9, // Decimal 0 - 8
 		-5, -5, // Whitespace: Tab and Linefeed
 		-9, -9, // Decimal 11 - 12
 		-5, // Whitespace: Carriage Return
@@ -156,9 +156,9 @@ public class Base64
 		 */
 	};
 	
-	// private final static byte BAD_ENCODING = -9; // Indicates error in encoding
-	private final static byte WHITE_SPACE_ENC = -5; // Indicates white space in encoding
-	private final static byte EQUALS_SIGN_ENC = -1; // Indicates equals sign in encoding
+	// private static final byte BAD_ENCODING = -9; // Indicates error in encoding
+	private static final byte WHITE_SPACE_ENC = -5; // Indicates white space in encoding
+	private static final byte EQUALS_SIGN_ENC = -1; // Indicates equals sign in encoding
 	
 	/** Defeats instantiation. */
 	private Base64()

+ 3 - 3
L2J_Server_BETA/java/com/l2jserver/util/Rnd.java

@@ -292,11 +292,11 @@ public final class Rnd
 		}
 	}
 	
-	private final static long ADDEND = 0xBL;
+	private static final long ADDEND = 0xBL;
 	
-	private final static long MASK = (1L << 48) - 1;
+	private static final long MASK = (1L << 48) - 1;
 	
-	private final static long MULTIPLIER = 0x5DEECE66DL;
+	private static final long MULTIPLIER = 0x5DEECE66DL;
 	
 	private static final RandomContainer rnd = newInstance(RandomType.UNSECURE_THREAD_LOCAL);
 	

+ 5 - 5
L2J_Server_BETA/java/com/l2jserver/util/crypt/BlowfishEngine.java

@@ -35,7 +35,7 @@ import java.io.IOException;
  */
 public class BlowfishEngine
 {
-	private final static int[] KP =
+	private static final int[] KP =
 	{
 		0x243F6A88,
 		0x85A308D3,
@@ -56,7 +56,7 @@ public class BlowfishEngine
 		0x9216D5D9,
 		0x8979FB1B
 	};
-	private final static int[] KS0 =
+	private static final int[] KS0 =
 	{
 		0xD1310BA6,
 		0x98DFB5AC,
@@ -315,7 +315,7 @@ public class BlowfishEngine
 		0x08BA4799,
 		0x6E85076A
 	};
-	private final static int[] KS1 =
+	private static final int[] KS1 =
 	{
 		0x4B7A70E9,
 		0xB5B32944,
@@ -574,7 +574,7 @@ public class BlowfishEngine
 		0xE6E39F2B,
 		0xDB83ADF7
 	};
-	private final static int[] KS2 =
+	private static final int[] KS2 =
 	{
 		0xE93D5A68,
 		0x948140F7,
@@ -833,7 +833,7 @@ public class BlowfishEngine
 		0x670EFA8E,
 		0x406000E0
 	};
-	private final static int[] KS3 =
+	private static final int[] KS3 =
 	{
 		0x3A39CE37,
 		0xD3FAF5CF,