From a5b69096dddc063382a82974608828a61ab27160 Mon Sep 17 00:00:00 2001 From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com> Date: Tue, 19 Jun 2018 02:02:54 +0000 Subject: [PATCH] Proper modifier order and removal if implied by their context. --- .../l2jmobius/listeners/FormatListener.java | 4 ++-- .../SelMahumTrainingGrounds/SelMahumDrill.java | 2 +- .../scripts/ai/bosses/Lindvior/Lindvior.java | 2 +- .../ai/bosses/Lindvior/LindviorBoss.java | 18 +++++++++--------- .../scripts/ai/bosses/Sailren/Sailren.java | 2 +- .../scripts/custom/events/Elpies/Elpies.java | 2 +- .../Q00350_EnhanceYourWeapon.java | 2 +- .../java/com/l2jmobius/commons/util/Rnd.java | 2 +- .../geoengine/geodata/BlockComplexDynamic.java | 4 ++-- .../geodata/BlockMultilayerDynamic.java | 4 ++-- .../instancemanager/DBSpawnManager.java | 2 +- .../instancemanager/PlayerCountManager.java | 6 +++--- .../model/actor/instance/L2PcInstance.java | 4 ++-- .../model/cubic/conditions/HpCondition.java | 2 +- .../model/holders/LuckyGameDataHolder.java | 10 +++++----- .../java/com/l2jmobius/gameserver/ui/Gui.java | 8 ++++---- .../l2jmobius/gameserver/ui/SystemPanel.java | 2 +- .../com/l2jmobius/gameserver/ui/frmAbout.java | 2 +- .../com/l2jmobius/gameserver/util/Util.java | 4 ++-- .../util/cron4j/SchedulingPattern.java | 2 +- .../java/com/l2jmobius/loginserver/ui/Gui.java | 4 ++-- .../com/l2jmobius/loginserver/ui/frmAbout.java | 2 +- .../SelMahumTrainingGrounds/SelMahumDrill.java | 2 +- .../scripts/ai/bosses/Lindvior/Lindvior.java | 2 +- .../ai/bosses/Lindvior/LindviorBoss.java | 18 +++++++++--------- .../scripts/ai/bosses/Sailren/Sailren.java | 2 +- .../scripts/custom/events/Elpies/Elpies.java | 2 +- .../java/com/l2jmobius/commons/util/Rnd.java | 2 +- .../geoengine/geodata/BlockComplexDynamic.java | 4 ++-- .../geodata/BlockMultilayerDynamic.java | 4 ++-- .../instancemanager/DBSpawnManager.java | 2 +- .../instancemanager/PlayerCountManager.java | 6 +++--- .../model/actor/instance/L2PcInstance.java | 8 ++++---- .../model/cubic/conditions/HpCondition.java | 2 +- .../model/holders/LuckyGameDataHolder.java | 10 +++++----- .../java/com/l2jmobius/gameserver/ui/Gui.java | 8 ++++---- .../l2jmobius/gameserver/ui/SystemPanel.java | 2 +- .../com/l2jmobius/gameserver/ui/frmAbout.java | 2 +- .../com/l2jmobius/gameserver/util/Util.java | 4 ++-- .../util/cron4j/SchedulingPattern.java | 2 +- .../java/com/l2jmobius/loginserver/ui/Gui.java | 4 ++-- .../com/l2jmobius/loginserver/ui/frmAbout.java | 2 +- .../SelMahumTrainingGrounds/SelMahumDrill.java | 2 +- .../data/scripts/ai/bosses/Helios/Helios.java | 2 +- .../scripts/ai/bosses/Lindvior/Lindvior.java | 2 +- .../ai/bosses/Lindvior/LindviorBoss.java | 18 +++++++++--------- .../scripts/ai/bosses/Sailren/Sailren.java | 2 +- .../scripts/custom/events/Elpies/Elpies.java | 2 +- .../java/com/l2jmobius/commons/util/Rnd.java | 2 +- .../geoengine/geodata/BlockComplexDynamic.java | 4 ++-- .../geodata/BlockMultilayerDynamic.java | 4 ++-- .../instancemanager/DBSpawnManager.java | 2 +- .../instancemanager/PlayerCountManager.java | 6 +++--- .../model/actor/instance/L2PcInstance.java | 8 ++++---- .../model/cubic/conditions/HpCondition.java | 2 +- .../model/holders/LuckyGameDataHolder.java | 10 +++++----- .../java/com/l2jmobius/gameserver/ui/Gui.java | 8 ++++---- .../l2jmobius/gameserver/ui/SystemPanel.java | 2 +- .../com/l2jmobius/gameserver/ui/frmAbout.java | 2 +- .../com/l2jmobius/gameserver/util/Util.java | 4 ++-- .../util/cron4j/SchedulingPattern.java | 2 +- .../java/com/l2jmobius/loginserver/ui/Gui.java | 4 ++-- .../com/l2jmobius/loginserver/ui/frmAbout.java | 2 +- .../SelMahumTrainingGrounds/SelMahumDrill.java | 2 +- .../data/scripts/ai/bosses/Helios/Helios.java | 2 +- .../scripts/ai/bosses/Lindvior/Lindvior.java | 2 +- .../ai/bosses/Lindvior/LindviorBoss.java | 18 +++++++++--------- .../scripts/ai/bosses/Sailren/Sailren.java | 2 +- .../scripts/custom/events/Elpies/Elpies.java | 2 +- .../java/com/l2jmobius/commons/util/Rnd.java | 2 +- .../geoengine/geodata/BlockComplexDynamic.java | 4 ++-- .../geodata/BlockMultilayerDynamic.java | 4 ++-- .../instancemanager/DBSpawnManager.java | 2 +- .../instancemanager/PlayerCountManager.java | 6 +++--- .../model/actor/instance/L2PcInstance.java | 12 ++++++------ .../model/cubic/conditions/HpCondition.java | 2 +- .../model/holders/LuckyGameDataHolder.java | 10 +++++----- .../ExOneDayReceiveRewardList.java | 2 +- .../java/com/l2jmobius/gameserver/ui/Gui.java | 8 ++++---- .../l2jmobius/gameserver/ui/SystemPanel.java | 2 +- .../com/l2jmobius/gameserver/ui/frmAbout.java | 2 +- .../com/l2jmobius/gameserver/util/Util.java | 4 ++-- .../util/cron4j/SchedulingPattern.java | 2 +- .../java/com/l2jmobius/loginserver/ui/Gui.java | 4 ++-- .../com/l2jmobius/loginserver/ui/frmAbout.java | 2 +- .../KetraOrcSupport/KetraOrcSupport.java | 2 +- .../VarkaSilenosSupport.java | 2 +- .../instancemanager/PlayerCountManager.java | 6 +++--- .../gameserver/model/quest/State.java | 6 +++--- .../java/com/l2jmobius/gameserver/ui/Gui.java | 8 ++++---- .../l2jmobius/gameserver/ui/SystemPanel.java | 2 +- .../com/l2jmobius/gameserver/ui/frmAbout.java | 2 +- .../java/com/l2jmobius/loginserver/ui/Gui.java | 4 ++-- .../com/l2jmobius/loginserver/ui/frmAbout.java | 2 +- .../SelMahumTrainingGrounds/SelMahumDrill.java | 2 +- .../scripts/ai/bosses/Sailren/Sailren.java | 2 +- .../scripts/custom/events/Elpies/Elpies.java | 2 +- .../Q00350_EnhanceYourWeapon.java | 2 +- .../java/com/l2jmobius/commons/util/Rnd.java | 2 +- .../geoengine/geodata/BlockComplexDynamic.java | 4 ++-- .../geodata/BlockMultilayerDynamic.java | 4 ++-- .../instancemanager/PlayerCountManager.java | 6 +++--- .../instancemanager/RaidBossSpawnManager.java | 2 +- .../l2jmobius/gameserver/model/Elementals.java | 4 ++-- .../model/actor/instance/L2PcInstance.java | 2 +- .../model/olympiad/OlympiadGameTask.java | 2 +- .../serverpackets/IClientOutgoingPacket.java | 2 +- .../SortedWareHouseWithdrawalList.java | 2 +- .../java/com/l2jmobius/gameserver/ui/Gui.java | 8 ++++---- .../l2jmobius/gameserver/ui/SystemPanel.java | 2 +- .../com/l2jmobius/gameserver/ui/frmAbout.java | 2 +- .../java/com/l2jmobius/loginserver/ui/Gui.java | 4 ++-- .../com/l2jmobius/loginserver/ui/frmAbout.java | 2 +- .../scripts/custom/events/Elpies/Elpies.java | 2 +- .../java/com/l2jmobius/commons/util/Rnd.java | 2 +- .../geoengine/geodata/BlockComplexDynamic.java | 4 ++-- .../geodata/BlockMultilayerDynamic.java | 4 ++-- .../instancemanager/DBSpawnManager.java | 2 +- .../instancemanager/PlayerCountManager.java | 6 +++--- .../model/actor/instance/L2PcInstance.java | 8 ++++---- .../model/cubic/conditions/HpCondition.java | 2 +- .../model/holders/LuckyGameDataHolder.java | 10 +++++----- .../java/com/l2jmobius/gameserver/ui/Gui.java | 8 ++++---- .../l2jmobius/gameserver/ui/SystemPanel.java | 2 +- .../com/l2jmobius/gameserver/ui/frmAbout.java | 2 +- .../com/l2jmobius/gameserver/util/Util.java | 4 ++-- .../util/cron4j/SchedulingPattern.java | 2 +- .../java/com/l2jmobius/loginserver/ui/Gui.java | 4 ++-- .../com/l2jmobius/loginserver/ui/frmAbout.java | 2 +- .../scripts/custom/events/Elpies/Elpies.java | 2 +- .../java/com/l2jmobius/commons/util/Rnd.java | 2 +- .../geoengine/geodata/BlockComplexDynamic.java | 4 ++-- .../geodata/BlockMultilayerDynamic.java | 4 ++-- .../instancemanager/DBSpawnManager.java | 2 +- .../instancemanager/PlayerCountManager.java | 6 +++--- .../model/actor/instance/L2PcInstance.java | 8 ++++---- .../model/cubic/conditions/HpCondition.java | 2 +- .../model/holders/LuckyGameDataHolder.java | 10 +++++----- .../ExOneDayReceiveRewardList.java | 2 +- .../java/com/l2jmobius/gameserver/ui/Gui.java | 8 ++++---- .../l2jmobius/gameserver/ui/SystemPanel.java | 2 +- .../com/l2jmobius/gameserver/ui/frmAbout.java | 2 +- .../com/l2jmobius/gameserver/util/Util.java | 4 ++-- .../util/cron4j/SchedulingPattern.java | 2 +- .../java/com/l2jmobius/loginserver/ui/Gui.java | 4 ++-- .../com/l2jmobius/loginserver/ui/frmAbout.java | 2 +- .../scripts/custom/events/Elpies/Elpies.java | 2 +- .../java/com/l2jmobius/commons/util/Rnd.java | 2 +- .../geoengine/geodata/BlockComplexDynamic.java | 4 ++-- .../geodata/BlockMultilayerDynamic.java | 4 ++-- .../instancemanager/DBSpawnManager.java | 2 +- .../instancemanager/PlayerCountManager.java | 6 +++--- .../model/actor/instance/L2PcInstance.java | 8 ++++---- .../model/cubic/conditions/HpCondition.java | 2 +- .../model/holders/LuckyGameDataHolder.java | 10 +++++----- .../ExOneDayReceiveRewardList.java | 2 +- .../java/com/l2jmobius/gameserver/ui/Gui.java | 8 ++++---- .../l2jmobius/gameserver/ui/SystemPanel.java | 2 +- .../com/l2jmobius/gameserver/ui/frmAbout.java | 2 +- .../com/l2jmobius/gameserver/util/Util.java | 4 ++-- .../util/cron4j/SchedulingPattern.java | 2 +- .../java/com/l2jmobius/loginserver/ui/Gui.java | 4 ++-- .../com/l2jmobius/loginserver/ui/frmAbout.java | 2 +- 163 files changed, 325 insertions(+), 325 deletions(-) diff --git a/L2ClientDat/java/com/l2jmobius/listeners/FormatListener.java b/L2ClientDat/java/com/l2jmobius/listeners/FormatListener.java index 7fad0d1991..ec6043e147 100644 --- a/L2ClientDat/java/com/l2jmobius/listeners/FormatListener.java +++ b/L2ClientDat/java/com/l2jmobius/listeners/FormatListener.java @@ -18,7 +18,7 @@ package com.l2jmobius.listeners; public interface FormatListener { - public String decode(String var1); + String decode(String var1); - public String encode(String var1); + String encode(String var1); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumDrill.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumDrill.java index 70ca241552..b799752ad1 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumDrill.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumDrill.java @@ -77,7 +77,7 @@ public final class SelMahumDrill extends AbstractNpcAI // Chiefs event broadcast range private static final int TRAINING_RANGE = 1000; - private static enum Actions + private enum Actions { SCE_TRAINING_ACTION_A(4, -1, 2, 2333), SCE_TRAINING_ACTION_B(1, -1, 2, 4333), diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java index 4e0aa0800f..6dffe541ca 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java @@ -85,7 +85,7 @@ public class Lindvior extends AbstractNpcAI private static final int LIONEL_HUNTER = 33886; private static final int LINDVIOR_CAMERA = 19428; // Zone - private final static int ZONE_ID = 12107; + private static final int ZONE_ID = 12107; static final Location CENTER_LOCATION = new Location(46424, -26200, -1400); // Skills private static final SkillHolder SKILL_RECHARGE_POSIBLE = new SkillHolder(15605, 1); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Lindvior/LindviorBoss.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Lindvior/LindviorBoss.java index d60c088f9f..fb71c0287f 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Lindvior/LindviorBoss.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Lindvior/LindviorBoss.java @@ -48,15 +48,15 @@ public class LindviorBoss extends AbstractNpcAI private static final SkillHolder TORNADO = new SkillHolder(15275, 1); private static final SkillHolder LINDVIORS_ATTACK = new SkillHolder(15600, 1); // Chances - private final static int CHANCE_MIGHTY_WIND_STRIKE = 9; - private final static int CHANCE_WIND_PULL = 4; - private final static int CHANCE_LINDVIORS_JUMP = 7; - private final static int CHANCE_BODY_SLAM = 2; - private final static int CHANCE_SOAR = 8; - private final static int CHANCE_WIND_BREAT = 3; - private final static int CHANCE_TAIL_SWIPE = 5; - private final static int CHANCE_TORNADO = 6; - private final static int CHANCE_LINDVIORS_ATTACK = 1; + private static final int CHANCE_MIGHTY_WIND_STRIKE = 9; + private static final int CHANCE_WIND_PULL = 4; + private static final int CHANCE_LINDVIORS_JUMP = 7; + private static final int CHANCE_BODY_SLAM = 2; + private static final int CHANCE_SOAR = 8; + private static final int CHANCE_WIND_BREAT = 3; + private static final int CHANCE_TAIL_SWIPE = 5; + private static final int CHANCE_TORNADO = 6; + private static final int CHANCE_LINDVIORS_ATTACK = 1; public LindviorBoss() { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java index ff6ffbd3a9..d7251740de 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java @@ -56,7 +56,7 @@ public final class Sailren extends AbstractNpcAI private static int _killCount = 0; private static long _lastAttack = 0; - private static enum Status + private enum Status { ALIVE, IN_FIGHT, diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/custom/events/Elpies/Elpies.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/custom/events/Elpies/Elpies.java index 813358bd0c..83bc3c2fb1 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/custom/events/Elpies/Elpies.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/custom/events/Elpies/Elpies.java @@ -177,7 +177,7 @@ public final class Elpies extends Event return super.onSpawn(npc); } - private static enum EventLocation + private enum EventLocation { ADEN("Aden", 146558, 148341, 26622, 28560, -2200), DION("Dion", 18564, 19200, 144377, 145782, -3081), diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00350_EnhanceYourWeapon/Q00350_EnhanceYourWeapon.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00350_EnhanceYourWeapon/Q00350_EnhanceYourWeapon.java index edd8db852d..ffb7134fcc 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00350_EnhanceYourWeapon/Q00350_EnhanceYourWeapon.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00350_EnhanceYourWeapon/Q00350_EnhanceYourWeapon.java @@ -51,7 +51,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class Q00350_EnhanceYourWeapon extends Quest { - private static enum AbsorbCrystalType + private enum AbsorbCrystalType { LAST_HIT, FULL_PARTY, diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/commons/util/Rnd.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/commons/util/Rnd.java index 8570d4598a..728eb5f9fc 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/commons/util/Rnd.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/commons/util/Rnd.java @@ -191,7 +191,7 @@ public final class Rnd /** * @author Forsaiken */ - public static enum RandomType + public enum RandomType { /** * For best random quality. diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/geoengine/geodata/BlockComplexDynamic.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/geoengine/geodata/BlockComplexDynamic.java index b4e14313ce..7bcb2c7d2d 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/geoengine/geodata/BlockComplexDynamic.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/geoengine/geodata/BlockComplexDynamic.java @@ -151,7 +151,7 @@ public final class BlockComplexDynamic extends BlockComplex implements IBlockDyn } @Override - final synchronized public void addGeoObject(IGeoObject object) + public final synchronized void addGeoObject(IGeoObject object) { // add geo object, update block geodata when added if (_objects.add(object)) @@ -161,7 +161,7 @@ public final class BlockComplexDynamic extends BlockComplex implements IBlockDyn } @Override - final synchronized public void removeGeoObject(IGeoObject object) + public final synchronized void removeGeoObject(IGeoObject object) { // remove geo object, update block geodata when removed if (_objects.remove(object)) diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/geoengine/geodata/BlockMultilayerDynamic.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/geoengine/geodata/BlockMultilayerDynamic.java index edd1844526..70d46cb451 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/geoengine/geodata/BlockMultilayerDynamic.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/geoengine/geodata/BlockMultilayerDynamic.java @@ -196,7 +196,7 @@ public final class BlockMultilayerDynamic extends BlockMultilayer implements IBl } @Override - final synchronized public void addGeoObject(IGeoObject object) + public final synchronized void addGeoObject(IGeoObject object) { // add geo object, update block geodata when added if (_objects.add(object)) @@ -206,7 +206,7 @@ public final class BlockMultilayerDynamic extends BlockMultilayer implements IBl } @Override - final synchronized public void removeGeoObject(IGeoObject object) + public final synchronized void removeGeoObject(IGeoObject object) { // remove geo object, update block geodata when removed if (_objects.remove(object)) diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/DBSpawnManager.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/DBSpawnManager.java index af7835fe63..d476f984d5 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/DBSpawnManager.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/DBSpawnManager.java @@ -55,7 +55,7 @@ public class DBSpawnManager protected final Map _storedInfo = new ConcurrentHashMap<>(); protected final Map> _schedules = new ConcurrentHashMap<>(); - public static enum DBStatusType + public enum DBStatusType { ALIVE, DEAD, diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/PlayerCountManager.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/PlayerCountManager.java index cb2fab84ed..75688ba0fb 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/PlayerCountManager.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/PlayerCountManager.java @@ -21,9 +21,9 @@ package com.l2jmobius.gameserver.instancemanager; */ public class PlayerCountManager { - private volatile static int connectedCount = 0; - private volatile static int maxConnectedCount = 0; - private volatile static int offlineTradeCount = 0; + private static volatile int connectedCount = 0; + private static volatile int maxConnectedCount = 0; + private static volatile int offlineTradeCount = 0; protected PlayerCountManager() { diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java index 38d3910ce4..9dc0fe5e3f 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java @@ -831,8 +831,8 @@ public final class L2PcInstance extends L2Playable } // Training Camp - private final static String TRAINING_CAMP_VAR = "TRAINING_CAMP"; - private final static String TRAINING_CAMP_DURATION = "TRAINING_CAMP_DURATION"; + private static final String TRAINING_CAMP_VAR = "TRAINING_CAMP"; + private static final String TRAINING_CAMP_DURATION = "TRAINING_CAMP_DURATION"; // Save responder name for log it private String _lastPetitionGmName = null; diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/cubic/conditions/HpCondition.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/cubic/conditions/HpCondition.java index eb2388a69b..872ab338c3 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/cubic/conditions/HpCondition.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/cubic/conditions/HpCondition.java @@ -62,7 +62,7 @@ public class HpCondition implements ICubicCondition return getClass().getSimpleName() + " chance: " + _hpPer; } - public static enum HpConditionType + public enum HpConditionType { GREATER, LESSER; diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/holders/LuckyGameDataHolder.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/holders/LuckyGameDataHolder.java index 43e93e30c5..8b6f6cc80c 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/holders/LuckyGameDataHolder.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/holders/LuckyGameDataHolder.java @@ -26,11 +26,11 @@ import com.l2jmobius.gameserver.model.StatsSet; */ public class LuckyGameDataHolder { - final private int _index; - final private int _turningPoints; - final private List _commonRewards = new ArrayList<>(); - final private List _uniqueRewards = new ArrayList<>(); - final private List _modifyRewards = new ArrayList<>(); + private final int _index; + private final int _turningPoints; + private final List _commonRewards = new ArrayList<>(); + private final List _uniqueRewards = new ArrayList<>(); + private final List _modifyRewards = new ArrayList<>(); private int _minModifyRewardGame; private int _maxModifyRewardGame; diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/ui/Gui.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/ui/Gui.java index 107d38451f..c174cdaff4 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/ui/Gui.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/ui/Gui.java @@ -62,22 +62,22 @@ public class Gui { JTextArea txtrConsole; - final static String[] shutdownOptions = + static final String[] shutdownOptions = { "Shutdown", "Cancel" }; - final static String[] restartOptions = + static final String[] restartOptions = { "Restart", "Cancel" }; - final static String[] abortOptions = + static final String[] abortOptions = { "Abort", "Cancel" }; - final static String[] confirmOptions = + static final String[] confirmOptions = { "Confirm", "Cancel" diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/ui/SystemPanel.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/ui/SystemPanel.java index da71d74f2a..763252ab7d 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/ui/SystemPanel.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/ui/SystemPanel.java @@ -39,7 +39,7 @@ import com.l2jmobius.gameserver.util.Locator; */ public class SystemPanel extends JPanel { - final static long startTime = System.currentTimeMillis(); + static final long startTime = System.currentTimeMillis(); public SystemPanel() { diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/ui/frmAbout.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/ui/frmAbout.java index e8a4f9a47c..2a2c99186d 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/ui/frmAbout.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/ui/frmAbout.java @@ -39,7 +39,7 @@ import com.l2jmobius.Config; public class frmAbout { private JFrame frmAbout; - final static String URL = "www.l2jmobius.com"; + static final String URL = "www.l2jmobius.com"; URI uri; public frmAbout() diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/util/Util.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/util/Util.java index b075bfc1d2..a0292b85fd 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/util/Util.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/util/Util.java @@ -695,8 +695,8 @@ public final class Util { final StringBuilder sb = new StringBuilder(); try (InputStream in = new FileInputStream(file); - final InputStreamReader reader = new InputStreamReader(in, cs); - final BufferedReader buffer = new BufferedReader(reader)) + InputStreamReader reader = new InputStreamReader(in, cs); + BufferedReader buffer = new BufferedReader(reader)) { String line; while ((line = buffer.readLine()) != null) diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/util/cron4j/SchedulingPattern.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/util/cron4j/SchedulingPattern.java index c4c80a789e..ba6b9f679f 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/util/cron4j/SchedulingPattern.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/util/cron4j/SchedulingPattern.java @@ -511,7 +511,7 @@ public class SchedulingPattern /** * Definition for a value parser. */ - private static interface ValueParser + private interface ValueParser { /** * Attempts to parse a value. diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/ui/Gui.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/ui/Gui.java index 01d4e71dc1..22a5aab723 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/ui/Gui.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/ui/Gui.java @@ -61,12 +61,12 @@ public class Gui JCheckBoxMenuItem chckbxmntmDisabled; JCheckBoxMenuItem chckbxmntmGmOnly; - final static String[] shutdownOptions = + static final String[] shutdownOptions = { "Shutdown", "Cancel" }; - final static String[] restartOptions = + static final String[] restartOptions = { "Restart", "Cancel" diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/ui/frmAbout.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/ui/frmAbout.java index b535d860b6..7650598616 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/ui/frmAbout.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/ui/frmAbout.java @@ -37,7 +37,7 @@ import javax.swing.WindowConstants; public class frmAbout { private JFrame frmAbout; - final static String URL = "www.l2jmobius.com"; + static final String URL = "www.l2jmobius.com"; URI uri; public frmAbout() diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumDrill.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumDrill.java index 70ca241552..b799752ad1 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumDrill.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumDrill.java @@ -77,7 +77,7 @@ public final class SelMahumDrill extends AbstractNpcAI // Chiefs event broadcast range private static final int TRAINING_RANGE = 1000; - private static enum Actions + private enum Actions { SCE_TRAINING_ACTION_A(4, -1, 2, 2333), SCE_TRAINING_ACTION_B(1, -1, 2, 4333), diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java index 4e0aa0800f..6dffe541ca 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java @@ -85,7 +85,7 @@ public class Lindvior extends AbstractNpcAI private static final int LIONEL_HUNTER = 33886; private static final int LINDVIOR_CAMERA = 19428; // Zone - private final static int ZONE_ID = 12107; + private static final int ZONE_ID = 12107; static final Location CENTER_LOCATION = new Location(46424, -26200, -1400); // Skills private static final SkillHolder SKILL_RECHARGE_POSIBLE = new SkillHolder(15605, 1); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Lindvior/LindviorBoss.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Lindvior/LindviorBoss.java index d60c088f9f..fb71c0287f 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Lindvior/LindviorBoss.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Lindvior/LindviorBoss.java @@ -48,15 +48,15 @@ public class LindviorBoss extends AbstractNpcAI private static final SkillHolder TORNADO = new SkillHolder(15275, 1); private static final SkillHolder LINDVIORS_ATTACK = new SkillHolder(15600, 1); // Chances - private final static int CHANCE_MIGHTY_WIND_STRIKE = 9; - private final static int CHANCE_WIND_PULL = 4; - private final static int CHANCE_LINDVIORS_JUMP = 7; - private final static int CHANCE_BODY_SLAM = 2; - private final static int CHANCE_SOAR = 8; - private final static int CHANCE_WIND_BREAT = 3; - private final static int CHANCE_TAIL_SWIPE = 5; - private final static int CHANCE_TORNADO = 6; - private final static int CHANCE_LINDVIORS_ATTACK = 1; + private static final int CHANCE_MIGHTY_WIND_STRIKE = 9; + private static final int CHANCE_WIND_PULL = 4; + private static final int CHANCE_LINDVIORS_JUMP = 7; + private static final int CHANCE_BODY_SLAM = 2; + private static final int CHANCE_SOAR = 8; + private static final int CHANCE_WIND_BREAT = 3; + private static final int CHANCE_TAIL_SWIPE = 5; + private static final int CHANCE_TORNADO = 6; + private static final int CHANCE_LINDVIORS_ATTACK = 1; public LindviorBoss() { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java index ff6ffbd3a9..d7251740de 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java @@ -56,7 +56,7 @@ public final class Sailren extends AbstractNpcAI private static int _killCount = 0; private static long _lastAttack = 0; - private static enum Status + private enum Status { ALIVE, IN_FIGHT, diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/custom/events/Elpies/Elpies.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/custom/events/Elpies/Elpies.java index 813358bd0c..83bc3c2fb1 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/custom/events/Elpies/Elpies.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/custom/events/Elpies/Elpies.java @@ -177,7 +177,7 @@ public final class Elpies extends Event return super.onSpawn(npc); } - private static enum EventLocation + private enum EventLocation { ADEN("Aden", 146558, 148341, 26622, 28560, -2200), DION("Dion", 18564, 19200, 144377, 145782, -3081), diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/commons/util/Rnd.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/commons/util/Rnd.java index 8570d4598a..728eb5f9fc 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/commons/util/Rnd.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/commons/util/Rnd.java @@ -191,7 +191,7 @@ public final class Rnd /** * @author Forsaiken */ - public static enum RandomType + public enum RandomType { /** * For best random quality. diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/geoengine/geodata/BlockComplexDynamic.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/geoengine/geodata/BlockComplexDynamic.java index b4e14313ce..7bcb2c7d2d 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/geoengine/geodata/BlockComplexDynamic.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/geoengine/geodata/BlockComplexDynamic.java @@ -151,7 +151,7 @@ public final class BlockComplexDynamic extends BlockComplex implements IBlockDyn } @Override - final synchronized public void addGeoObject(IGeoObject object) + public final synchronized void addGeoObject(IGeoObject object) { // add geo object, update block geodata when added if (_objects.add(object)) @@ -161,7 +161,7 @@ public final class BlockComplexDynamic extends BlockComplex implements IBlockDyn } @Override - final synchronized public void removeGeoObject(IGeoObject object) + public final synchronized void removeGeoObject(IGeoObject object) { // remove geo object, update block geodata when removed if (_objects.remove(object)) diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/geoengine/geodata/BlockMultilayerDynamic.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/geoengine/geodata/BlockMultilayerDynamic.java index edd1844526..70d46cb451 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/geoengine/geodata/BlockMultilayerDynamic.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/geoengine/geodata/BlockMultilayerDynamic.java @@ -196,7 +196,7 @@ public final class BlockMultilayerDynamic extends BlockMultilayer implements IBl } @Override - final synchronized public void addGeoObject(IGeoObject object) + public final synchronized void addGeoObject(IGeoObject object) { // add geo object, update block geodata when added if (_objects.add(object)) @@ -206,7 +206,7 @@ public final class BlockMultilayerDynamic extends BlockMultilayer implements IBl } @Override - final synchronized public void removeGeoObject(IGeoObject object) + public final synchronized void removeGeoObject(IGeoObject object) { // remove geo object, update block geodata when removed if (_objects.remove(object)) diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/DBSpawnManager.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/DBSpawnManager.java index af7835fe63..d476f984d5 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/DBSpawnManager.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/DBSpawnManager.java @@ -55,7 +55,7 @@ public class DBSpawnManager protected final Map _storedInfo = new ConcurrentHashMap<>(); protected final Map> _schedules = new ConcurrentHashMap<>(); - public static enum DBStatusType + public enum DBStatusType { ALIVE, DEAD, diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/PlayerCountManager.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/PlayerCountManager.java index cb2fab84ed..75688ba0fb 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/PlayerCountManager.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/PlayerCountManager.java @@ -21,9 +21,9 @@ package com.l2jmobius.gameserver.instancemanager; */ public class PlayerCountManager { - private volatile static int connectedCount = 0; - private volatile static int maxConnectedCount = 0; - private volatile static int offlineTradeCount = 0; + private static volatile int connectedCount = 0; + private static volatile int maxConnectedCount = 0; + private static volatile int offlineTradeCount = 0; protected PlayerCountManager() { diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java index a840bc7002..30422dd3a5 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java @@ -833,12 +833,12 @@ public final class L2PcInstance extends L2Playable } // Training Camp - private final static String TRAINING_CAMP_VAR = "TRAINING_CAMP"; - private final static String TRAINING_CAMP_DURATION = "TRAINING_CAMP_DURATION"; + private static final String TRAINING_CAMP_VAR = "TRAINING_CAMP"; + private static final String TRAINING_CAMP_DURATION = "TRAINING_CAMP_DURATION"; // Attendance Reward system - private final static String ATTENDANCE_DATE_VAR = "ATTENDANCE_DATE"; - private final static String ATTENDANCE_INDEX_VAR = "ATTENDANCE_INDEX"; + private static final String ATTENDANCE_DATE_VAR = "ATTENDANCE_DATE"; + private static final String ATTENDANCE_INDEX_VAR = "ATTENDANCE_INDEX"; // Save responder name for log it private String _lastPetitionGmName = null; diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/cubic/conditions/HpCondition.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/cubic/conditions/HpCondition.java index eb2388a69b..872ab338c3 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/cubic/conditions/HpCondition.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/cubic/conditions/HpCondition.java @@ -62,7 +62,7 @@ public class HpCondition implements ICubicCondition return getClass().getSimpleName() + " chance: " + _hpPer; } - public static enum HpConditionType + public enum HpConditionType { GREATER, LESSER; diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/holders/LuckyGameDataHolder.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/holders/LuckyGameDataHolder.java index 43e93e30c5..8b6f6cc80c 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/holders/LuckyGameDataHolder.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/holders/LuckyGameDataHolder.java @@ -26,11 +26,11 @@ import com.l2jmobius.gameserver.model.StatsSet; */ public class LuckyGameDataHolder { - final private int _index; - final private int _turningPoints; - final private List _commonRewards = new ArrayList<>(); - final private List _uniqueRewards = new ArrayList<>(); - final private List _modifyRewards = new ArrayList<>(); + private final int _index; + private final int _turningPoints; + private final List _commonRewards = new ArrayList<>(); + private final List _uniqueRewards = new ArrayList<>(); + private final List _modifyRewards = new ArrayList<>(); private int _minModifyRewardGame; private int _maxModifyRewardGame; diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/ui/Gui.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/ui/Gui.java index 107d38451f..c174cdaff4 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/ui/Gui.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/ui/Gui.java @@ -62,22 +62,22 @@ public class Gui { JTextArea txtrConsole; - final static String[] shutdownOptions = + static final String[] shutdownOptions = { "Shutdown", "Cancel" }; - final static String[] restartOptions = + static final String[] restartOptions = { "Restart", "Cancel" }; - final static String[] abortOptions = + static final String[] abortOptions = { "Abort", "Cancel" }; - final static String[] confirmOptions = + static final String[] confirmOptions = { "Confirm", "Cancel" diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/ui/SystemPanel.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/ui/SystemPanel.java index da71d74f2a..763252ab7d 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/ui/SystemPanel.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/ui/SystemPanel.java @@ -39,7 +39,7 @@ import com.l2jmobius.gameserver.util.Locator; */ public class SystemPanel extends JPanel { - final static long startTime = System.currentTimeMillis(); + static final long startTime = System.currentTimeMillis(); public SystemPanel() { diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/ui/frmAbout.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/ui/frmAbout.java index e8a4f9a47c..2a2c99186d 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/ui/frmAbout.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/ui/frmAbout.java @@ -39,7 +39,7 @@ import com.l2jmobius.Config; public class frmAbout { private JFrame frmAbout; - final static String URL = "www.l2jmobius.com"; + static final String URL = "www.l2jmobius.com"; URI uri; public frmAbout() diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/util/Util.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/util/Util.java index b075bfc1d2..a0292b85fd 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/util/Util.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/util/Util.java @@ -695,8 +695,8 @@ public final class Util { final StringBuilder sb = new StringBuilder(); try (InputStream in = new FileInputStream(file); - final InputStreamReader reader = new InputStreamReader(in, cs); - final BufferedReader buffer = new BufferedReader(reader)) + InputStreamReader reader = new InputStreamReader(in, cs); + BufferedReader buffer = new BufferedReader(reader)) { String line; while ((line = buffer.readLine()) != null) diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/util/cron4j/SchedulingPattern.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/util/cron4j/SchedulingPattern.java index c4c80a789e..ba6b9f679f 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/util/cron4j/SchedulingPattern.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/util/cron4j/SchedulingPattern.java @@ -511,7 +511,7 @@ public class SchedulingPattern /** * Definition for a value parser. */ - private static interface ValueParser + private interface ValueParser { /** * Attempts to parse a value. diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/ui/Gui.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/ui/Gui.java index 01d4e71dc1..22a5aab723 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/ui/Gui.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/ui/Gui.java @@ -61,12 +61,12 @@ public class Gui JCheckBoxMenuItem chckbxmntmDisabled; JCheckBoxMenuItem chckbxmntmGmOnly; - final static String[] shutdownOptions = + static final String[] shutdownOptions = { "Shutdown", "Cancel" }; - final static String[] restartOptions = + static final String[] restartOptions = { "Restart", "Cancel" diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/ui/frmAbout.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/ui/frmAbout.java index b535d860b6..7650598616 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/ui/frmAbout.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/ui/frmAbout.java @@ -37,7 +37,7 @@ import javax.swing.WindowConstants; public class frmAbout { private JFrame frmAbout; - final static String URL = "www.l2jmobius.com"; + static final String URL = "www.l2jmobius.com"; URI uri; public frmAbout() diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumDrill.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumDrill.java index 70ca241552..b799752ad1 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumDrill.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumDrill.java @@ -77,7 +77,7 @@ public final class SelMahumDrill extends AbstractNpcAI // Chiefs event broadcast range private static final int TRAINING_RANGE = 1000; - private static enum Actions + private enum Actions { SCE_TRAINING_ACTION_A(4, -1, 2, 2333), SCE_TRAINING_ACTION_B(1, -1, 2, 4333), diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Helios/Helios.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Helios/Helios.java index f77a0853e4..26bed21dfa 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Helios/Helios.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Helios/Helios.java @@ -41,7 +41,7 @@ public class Helios extends AbstractNpcAI // Location private static final Location HELIOS_SPAWN_LOC = new Location(92771, 161909, 3494, 38329); // Zone - private final static int ZONE_ID = 210109; + private static final int ZONE_ID = 210109; // Status private static final int ALIVE = 0; private static final int WAITING = 1; diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java index 4e0aa0800f..6dffe541ca 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java @@ -85,7 +85,7 @@ public class Lindvior extends AbstractNpcAI private static final int LIONEL_HUNTER = 33886; private static final int LINDVIOR_CAMERA = 19428; // Zone - private final static int ZONE_ID = 12107; + private static final int ZONE_ID = 12107; static final Location CENTER_LOCATION = new Location(46424, -26200, -1400); // Skills private static final SkillHolder SKILL_RECHARGE_POSIBLE = new SkillHolder(15605, 1); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Lindvior/LindviorBoss.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Lindvior/LindviorBoss.java index d60c088f9f..fb71c0287f 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Lindvior/LindviorBoss.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Lindvior/LindviorBoss.java @@ -48,15 +48,15 @@ public class LindviorBoss extends AbstractNpcAI private static final SkillHolder TORNADO = new SkillHolder(15275, 1); private static final SkillHolder LINDVIORS_ATTACK = new SkillHolder(15600, 1); // Chances - private final static int CHANCE_MIGHTY_WIND_STRIKE = 9; - private final static int CHANCE_WIND_PULL = 4; - private final static int CHANCE_LINDVIORS_JUMP = 7; - private final static int CHANCE_BODY_SLAM = 2; - private final static int CHANCE_SOAR = 8; - private final static int CHANCE_WIND_BREAT = 3; - private final static int CHANCE_TAIL_SWIPE = 5; - private final static int CHANCE_TORNADO = 6; - private final static int CHANCE_LINDVIORS_ATTACK = 1; + private static final int CHANCE_MIGHTY_WIND_STRIKE = 9; + private static final int CHANCE_WIND_PULL = 4; + private static final int CHANCE_LINDVIORS_JUMP = 7; + private static final int CHANCE_BODY_SLAM = 2; + private static final int CHANCE_SOAR = 8; + private static final int CHANCE_WIND_BREAT = 3; + private static final int CHANCE_TAIL_SWIPE = 5; + private static final int CHANCE_TORNADO = 6; + private static final int CHANCE_LINDVIORS_ATTACK = 1; public LindviorBoss() { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java index ff6ffbd3a9..d7251740de 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java @@ -56,7 +56,7 @@ public final class Sailren extends AbstractNpcAI private static int _killCount = 0; private static long _lastAttack = 0; - private static enum Status + private enum Status { ALIVE, IN_FIGHT, diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/custom/events/Elpies/Elpies.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/custom/events/Elpies/Elpies.java index 813358bd0c..83bc3c2fb1 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/custom/events/Elpies/Elpies.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/custom/events/Elpies/Elpies.java @@ -177,7 +177,7 @@ public final class Elpies extends Event return super.onSpawn(npc); } - private static enum EventLocation + private enum EventLocation { ADEN("Aden", 146558, 148341, 26622, 28560, -2200), DION("Dion", 18564, 19200, 144377, 145782, -3081), diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/commons/util/Rnd.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/commons/util/Rnd.java index 8570d4598a..728eb5f9fc 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/commons/util/Rnd.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/commons/util/Rnd.java @@ -191,7 +191,7 @@ public final class Rnd /** * @author Forsaiken */ - public static enum RandomType + public enum RandomType { /** * For best random quality. diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/geoengine/geodata/BlockComplexDynamic.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/geoengine/geodata/BlockComplexDynamic.java index b4e14313ce..7bcb2c7d2d 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/geoengine/geodata/BlockComplexDynamic.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/geoengine/geodata/BlockComplexDynamic.java @@ -151,7 +151,7 @@ public final class BlockComplexDynamic extends BlockComplex implements IBlockDyn } @Override - final synchronized public void addGeoObject(IGeoObject object) + public final synchronized void addGeoObject(IGeoObject object) { // add geo object, update block geodata when added if (_objects.add(object)) @@ -161,7 +161,7 @@ public final class BlockComplexDynamic extends BlockComplex implements IBlockDyn } @Override - final synchronized public void removeGeoObject(IGeoObject object) + public final synchronized void removeGeoObject(IGeoObject object) { // remove geo object, update block geodata when removed if (_objects.remove(object)) diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/geoengine/geodata/BlockMultilayerDynamic.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/geoengine/geodata/BlockMultilayerDynamic.java index edd1844526..70d46cb451 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/geoengine/geodata/BlockMultilayerDynamic.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/geoengine/geodata/BlockMultilayerDynamic.java @@ -196,7 +196,7 @@ public final class BlockMultilayerDynamic extends BlockMultilayer implements IBl } @Override - final synchronized public void addGeoObject(IGeoObject object) + public final synchronized void addGeoObject(IGeoObject object) { // add geo object, update block geodata when added if (_objects.add(object)) @@ -206,7 +206,7 @@ public final class BlockMultilayerDynamic extends BlockMultilayer implements IBl } @Override - final synchronized public void removeGeoObject(IGeoObject object) + public final synchronized void removeGeoObject(IGeoObject object) { // remove geo object, update block geodata when removed if (_objects.remove(object)) diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/DBSpawnManager.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/DBSpawnManager.java index af7835fe63..d476f984d5 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/DBSpawnManager.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/DBSpawnManager.java @@ -55,7 +55,7 @@ public class DBSpawnManager protected final Map _storedInfo = new ConcurrentHashMap<>(); protected final Map> _schedules = new ConcurrentHashMap<>(); - public static enum DBStatusType + public enum DBStatusType { ALIVE, DEAD, diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/PlayerCountManager.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/PlayerCountManager.java index cb2fab84ed..75688ba0fb 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/PlayerCountManager.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/PlayerCountManager.java @@ -21,9 +21,9 @@ package com.l2jmobius.gameserver.instancemanager; */ public class PlayerCountManager { - private volatile static int connectedCount = 0; - private volatile static int maxConnectedCount = 0; - private volatile static int offlineTradeCount = 0; + private static volatile int connectedCount = 0; + private static volatile int maxConnectedCount = 0; + private static volatile int offlineTradeCount = 0; protected PlayerCountManager() { diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java index d61d87ff84..f8fbdcaf3d 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java @@ -835,12 +835,12 @@ public final class L2PcInstance extends L2Playable } // Training Camp - private final static String TRAINING_CAMP_VAR = "TRAINING_CAMP"; - private final static String TRAINING_CAMP_DURATION = "TRAINING_CAMP_DURATION"; + private static final String TRAINING_CAMP_VAR = "TRAINING_CAMP"; + private static final String TRAINING_CAMP_DURATION = "TRAINING_CAMP_DURATION"; // Attendance Reward system - private final static String ATTENDANCE_DATE_VAR = "ATTENDANCE_DATE"; - private final static String ATTENDANCE_INDEX_VAR = "ATTENDANCE_INDEX"; + private static final String ATTENDANCE_DATE_VAR = "ATTENDANCE_DATE"; + private static final String ATTENDANCE_INDEX_VAR = "ATTENDANCE_INDEX"; // Save responder name for log it private String _lastPetitionGmName = null; diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/cubic/conditions/HpCondition.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/cubic/conditions/HpCondition.java index eb2388a69b..872ab338c3 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/cubic/conditions/HpCondition.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/cubic/conditions/HpCondition.java @@ -62,7 +62,7 @@ public class HpCondition implements ICubicCondition return getClass().getSimpleName() + " chance: " + _hpPer; } - public static enum HpConditionType + public enum HpConditionType { GREATER, LESSER; diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/holders/LuckyGameDataHolder.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/holders/LuckyGameDataHolder.java index 43e93e30c5..8b6f6cc80c 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/holders/LuckyGameDataHolder.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/holders/LuckyGameDataHolder.java @@ -26,11 +26,11 @@ import com.l2jmobius.gameserver.model.StatsSet; */ public class LuckyGameDataHolder { - final private int _index; - final private int _turningPoints; - final private List _commonRewards = new ArrayList<>(); - final private List _uniqueRewards = new ArrayList<>(); - final private List _modifyRewards = new ArrayList<>(); + private final int _index; + private final int _turningPoints; + private final List _commonRewards = new ArrayList<>(); + private final List _uniqueRewards = new ArrayList<>(); + private final List _modifyRewards = new ArrayList<>(); private int _minModifyRewardGame; private int _maxModifyRewardGame; diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/ui/Gui.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/ui/Gui.java index 107d38451f..c174cdaff4 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/ui/Gui.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/ui/Gui.java @@ -62,22 +62,22 @@ public class Gui { JTextArea txtrConsole; - final static String[] shutdownOptions = + static final String[] shutdownOptions = { "Shutdown", "Cancel" }; - final static String[] restartOptions = + static final String[] restartOptions = { "Restart", "Cancel" }; - final static String[] abortOptions = + static final String[] abortOptions = { "Abort", "Cancel" }; - final static String[] confirmOptions = + static final String[] confirmOptions = { "Confirm", "Cancel" diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/ui/SystemPanel.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/ui/SystemPanel.java index da71d74f2a..763252ab7d 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/ui/SystemPanel.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/ui/SystemPanel.java @@ -39,7 +39,7 @@ import com.l2jmobius.gameserver.util.Locator; */ public class SystemPanel extends JPanel { - final static long startTime = System.currentTimeMillis(); + static final long startTime = System.currentTimeMillis(); public SystemPanel() { diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/ui/frmAbout.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/ui/frmAbout.java index e8a4f9a47c..2a2c99186d 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/ui/frmAbout.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/ui/frmAbout.java @@ -39,7 +39,7 @@ import com.l2jmobius.Config; public class frmAbout { private JFrame frmAbout; - final static String URL = "www.l2jmobius.com"; + static final String URL = "www.l2jmobius.com"; URI uri; public frmAbout() diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/util/Util.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/util/Util.java index b075bfc1d2..a0292b85fd 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/util/Util.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/util/Util.java @@ -695,8 +695,8 @@ public final class Util { final StringBuilder sb = new StringBuilder(); try (InputStream in = new FileInputStream(file); - final InputStreamReader reader = new InputStreamReader(in, cs); - final BufferedReader buffer = new BufferedReader(reader)) + InputStreamReader reader = new InputStreamReader(in, cs); + BufferedReader buffer = new BufferedReader(reader)) { String line; while ((line = buffer.readLine()) != null) diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/util/cron4j/SchedulingPattern.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/util/cron4j/SchedulingPattern.java index c4c80a789e..ba6b9f679f 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/util/cron4j/SchedulingPattern.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/util/cron4j/SchedulingPattern.java @@ -511,7 +511,7 @@ public class SchedulingPattern /** * Definition for a value parser. */ - private static interface ValueParser + private interface ValueParser { /** * Attempts to parse a value. diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/ui/Gui.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/ui/Gui.java index 01d4e71dc1..22a5aab723 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/ui/Gui.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/ui/Gui.java @@ -61,12 +61,12 @@ public class Gui JCheckBoxMenuItem chckbxmntmDisabled; JCheckBoxMenuItem chckbxmntmGmOnly; - final static String[] shutdownOptions = + static final String[] shutdownOptions = { "Shutdown", "Cancel" }; - final static String[] restartOptions = + static final String[] restartOptions = { "Restart", "Cancel" diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/ui/frmAbout.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/ui/frmAbout.java index b535d860b6..7650598616 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/ui/frmAbout.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/ui/frmAbout.java @@ -37,7 +37,7 @@ import javax.swing.WindowConstants; public class frmAbout { private JFrame frmAbout; - final static String URL = "www.l2jmobius.com"; + static final String URL = "www.l2jmobius.com"; URI uri; public frmAbout() diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumDrill.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumDrill.java index 70ca241552..b799752ad1 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumDrill.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumDrill.java @@ -77,7 +77,7 @@ public final class SelMahumDrill extends AbstractNpcAI // Chiefs event broadcast range private static final int TRAINING_RANGE = 1000; - private static enum Actions + private enum Actions { SCE_TRAINING_ACTION_A(4, -1, 2, 2333), SCE_TRAINING_ACTION_B(1, -1, 2, 4333), diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Helios/Helios.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Helios/Helios.java index f77a0853e4..26bed21dfa 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Helios/Helios.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Helios/Helios.java @@ -41,7 +41,7 @@ public class Helios extends AbstractNpcAI // Location private static final Location HELIOS_SPAWN_LOC = new Location(92771, 161909, 3494, 38329); // Zone - private final static int ZONE_ID = 210109; + private static final int ZONE_ID = 210109; // Status private static final int ALIVE = 0; private static final int WAITING = 1; diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java index 4e0aa0800f..6dffe541ca 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java @@ -85,7 +85,7 @@ public class Lindvior extends AbstractNpcAI private static final int LIONEL_HUNTER = 33886; private static final int LINDVIOR_CAMERA = 19428; // Zone - private final static int ZONE_ID = 12107; + private static final int ZONE_ID = 12107; static final Location CENTER_LOCATION = new Location(46424, -26200, -1400); // Skills private static final SkillHolder SKILL_RECHARGE_POSIBLE = new SkillHolder(15605, 1); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Lindvior/LindviorBoss.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Lindvior/LindviorBoss.java index d60c088f9f..fb71c0287f 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Lindvior/LindviorBoss.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Lindvior/LindviorBoss.java @@ -48,15 +48,15 @@ public class LindviorBoss extends AbstractNpcAI private static final SkillHolder TORNADO = new SkillHolder(15275, 1); private static final SkillHolder LINDVIORS_ATTACK = new SkillHolder(15600, 1); // Chances - private final static int CHANCE_MIGHTY_WIND_STRIKE = 9; - private final static int CHANCE_WIND_PULL = 4; - private final static int CHANCE_LINDVIORS_JUMP = 7; - private final static int CHANCE_BODY_SLAM = 2; - private final static int CHANCE_SOAR = 8; - private final static int CHANCE_WIND_BREAT = 3; - private final static int CHANCE_TAIL_SWIPE = 5; - private final static int CHANCE_TORNADO = 6; - private final static int CHANCE_LINDVIORS_ATTACK = 1; + private static final int CHANCE_MIGHTY_WIND_STRIKE = 9; + private static final int CHANCE_WIND_PULL = 4; + private static final int CHANCE_LINDVIORS_JUMP = 7; + private static final int CHANCE_BODY_SLAM = 2; + private static final int CHANCE_SOAR = 8; + private static final int CHANCE_WIND_BREAT = 3; + private static final int CHANCE_TAIL_SWIPE = 5; + private static final int CHANCE_TORNADO = 6; + private static final int CHANCE_LINDVIORS_ATTACK = 1; public LindviorBoss() { diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java index ff6ffbd3a9..d7251740de 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java @@ -56,7 +56,7 @@ public final class Sailren extends AbstractNpcAI private static int _killCount = 0; private static long _lastAttack = 0; - private static enum Status + private enum Status { ALIVE, IN_FIGHT, diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/custom/events/Elpies/Elpies.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/custom/events/Elpies/Elpies.java index 813358bd0c..83bc3c2fb1 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/custom/events/Elpies/Elpies.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/custom/events/Elpies/Elpies.java @@ -177,7 +177,7 @@ public final class Elpies extends Event return super.onSpawn(npc); } - private static enum EventLocation + private enum EventLocation { ADEN("Aden", 146558, 148341, 26622, 28560, -2200), DION("Dion", 18564, 19200, 144377, 145782, -3081), diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/commons/util/Rnd.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/commons/util/Rnd.java index 8570d4598a..728eb5f9fc 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/commons/util/Rnd.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/commons/util/Rnd.java @@ -191,7 +191,7 @@ public final class Rnd /** * @author Forsaiken */ - public static enum RandomType + public enum RandomType { /** * For best random quality. diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/geoengine/geodata/BlockComplexDynamic.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/geoengine/geodata/BlockComplexDynamic.java index b4e14313ce..7bcb2c7d2d 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/geoengine/geodata/BlockComplexDynamic.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/geoengine/geodata/BlockComplexDynamic.java @@ -151,7 +151,7 @@ public final class BlockComplexDynamic extends BlockComplex implements IBlockDyn } @Override - final synchronized public void addGeoObject(IGeoObject object) + public final synchronized void addGeoObject(IGeoObject object) { // add geo object, update block geodata when added if (_objects.add(object)) @@ -161,7 +161,7 @@ public final class BlockComplexDynamic extends BlockComplex implements IBlockDyn } @Override - final synchronized public void removeGeoObject(IGeoObject object) + public final synchronized void removeGeoObject(IGeoObject object) { // remove geo object, update block geodata when removed if (_objects.remove(object)) diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/geoengine/geodata/BlockMultilayerDynamic.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/geoengine/geodata/BlockMultilayerDynamic.java index edd1844526..70d46cb451 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/geoengine/geodata/BlockMultilayerDynamic.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/geoengine/geodata/BlockMultilayerDynamic.java @@ -196,7 +196,7 @@ public final class BlockMultilayerDynamic extends BlockMultilayer implements IBl } @Override - final synchronized public void addGeoObject(IGeoObject object) + public final synchronized void addGeoObject(IGeoObject object) { // add geo object, update block geodata when added if (_objects.add(object)) @@ -206,7 +206,7 @@ public final class BlockMultilayerDynamic extends BlockMultilayer implements IBl } @Override - final synchronized public void removeGeoObject(IGeoObject object) + public final synchronized void removeGeoObject(IGeoObject object) { // remove geo object, update block geodata when removed if (_objects.remove(object)) diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/DBSpawnManager.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/DBSpawnManager.java index af7835fe63..d476f984d5 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/DBSpawnManager.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/DBSpawnManager.java @@ -55,7 +55,7 @@ public class DBSpawnManager protected final Map _storedInfo = new ConcurrentHashMap<>(); protected final Map> _schedules = new ConcurrentHashMap<>(); - public static enum DBStatusType + public enum DBStatusType { ALIVE, DEAD, diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/PlayerCountManager.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/PlayerCountManager.java index cb2fab84ed..75688ba0fb 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/PlayerCountManager.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/PlayerCountManager.java @@ -21,9 +21,9 @@ package com.l2jmobius.gameserver.instancemanager; */ public class PlayerCountManager { - private volatile static int connectedCount = 0; - private volatile static int maxConnectedCount = 0; - private volatile static int offlineTradeCount = 0; + private static volatile int connectedCount = 0; + private static volatile int maxConnectedCount = 0; + private static volatile int offlineTradeCount = 0; protected PlayerCountManager() { diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java index 9320aca953..8758e0b826 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java @@ -842,16 +842,16 @@ public final class L2PcInstance extends L2Playable } // Monster Book variables - private final static String MONSTER_BOOK_KILLS_VAR = "MONSTER_BOOK_KILLS_"; - private final static String MONSTER_BOOK_LEVEL_VAR = "MONSTER_BOOK_LEVEL_"; + private static final String MONSTER_BOOK_KILLS_VAR = "MONSTER_BOOK_KILLS_"; + private static final String MONSTER_BOOK_LEVEL_VAR = "MONSTER_BOOK_LEVEL_"; // Training Camp - private final static String TRAINING_CAMP_VAR = "TRAINING_CAMP"; - private final static String TRAINING_CAMP_DURATION = "TRAINING_CAMP_DURATION"; + private static final String TRAINING_CAMP_VAR = "TRAINING_CAMP"; + private static final String TRAINING_CAMP_DURATION = "TRAINING_CAMP_DURATION"; // Attendance Reward system - private final static String ATTENDANCE_DATE_VAR = "ATTENDANCE_DATE"; - private final static String ATTENDANCE_INDEX_VAR = "ATTENDANCE_INDEX"; + private static final String ATTENDANCE_DATE_VAR = "ATTENDANCE_DATE"; + private static final String ATTENDANCE_INDEX_VAR = "ATTENDANCE_INDEX"; // Save responder name for log it private String _lastPetitionGmName = null; diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/cubic/conditions/HpCondition.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/cubic/conditions/HpCondition.java index eb2388a69b..872ab338c3 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/cubic/conditions/HpCondition.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/cubic/conditions/HpCondition.java @@ -62,7 +62,7 @@ public class HpCondition implements ICubicCondition return getClass().getSimpleName() + " chance: " + _hpPer; } - public static enum HpConditionType + public enum HpConditionType { GREATER, LESSER; diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/holders/LuckyGameDataHolder.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/holders/LuckyGameDataHolder.java index 87cd0b1cb5..c44d7269dd 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/holders/LuckyGameDataHolder.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/holders/LuckyGameDataHolder.java @@ -26,11 +26,11 @@ import com.l2jmobius.gameserver.model.StatsSet; */ public class LuckyGameDataHolder { - final private int _index; - final private int _turningPoints; - final private List _commonRewards = new ArrayList<>(); - final private List _uniqueRewards = new ArrayList<>(); - final private List _modifyRewards = new ArrayList<>(); + private final int _index; + private final int _turningPoints; + private final List _commonRewards = new ArrayList<>(); + private final List _uniqueRewards = new ArrayList<>(); + private final List _modifyRewards = new ArrayList<>(); private int _minModifyRewardGame; private int _maxModifyRewardGame; diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/serverpackets/dailymission/ExOneDayReceiveRewardList.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/serverpackets/dailymission/ExOneDayReceiveRewardList.java index 4a65398244..63eb64acf5 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/serverpackets/dailymission/ExOneDayReceiveRewardList.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/serverpackets/dailymission/ExOneDayReceiveRewardList.java @@ -36,7 +36,7 @@ public class ExOneDayReceiveRewardList implements IClientOutgoingPacket { final L2PcInstance _player; private final Collection _rewards; - private final static Function _remainTime = pattern -> (new Predictor(pattern).nextMatchingTime() - System.currentTimeMillis()) / 1000L; + private static final Function _remainTime = pattern -> (new Predictor(pattern).nextMatchingTime() - System.currentTimeMillis()) / 1000L; private final long _dayRemainTime; private final long _weekRemainTime; diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/ui/Gui.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/ui/Gui.java index 107d38451f..c174cdaff4 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/ui/Gui.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/ui/Gui.java @@ -62,22 +62,22 @@ public class Gui { JTextArea txtrConsole; - final static String[] shutdownOptions = + static final String[] shutdownOptions = { "Shutdown", "Cancel" }; - final static String[] restartOptions = + static final String[] restartOptions = { "Restart", "Cancel" }; - final static String[] abortOptions = + static final String[] abortOptions = { "Abort", "Cancel" }; - final static String[] confirmOptions = + static final String[] confirmOptions = { "Confirm", "Cancel" diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/ui/SystemPanel.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/ui/SystemPanel.java index da71d74f2a..763252ab7d 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/ui/SystemPanel.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/ui/SystemPanel.java @@ -39,7 +39,7 @@ import com.l2jmobius.gameserver.util.Locator; */ public class SystemPanel extends JPanel { - final static long startTime = System.currentTimeMillis(); + static final long startTime = System.currentTimeMillis(); public SystemPanel() { diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/ui/frmAbout.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/ui/frmAbout.java index e8a4f9a47c..2a2c99186d 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/ui/frmAbout.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/ui/frmAbout.java @@ -39,7 +39,7 @@ import com.l2jmobius.Config; public class frmAbout { private JFrame frmAbout; - final static String URL = "www.l2jmobius.com"; + static final String URL = "www.l2jmobius.com"; URI uri; public frmAbout() diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/util/Util.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/util/Util.java index b075bfc1d2..a0292b85fd 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/util/Util.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/util/Util.java @@ -695,8 +695,8 @@ public final class Util { final StringBuilder sb = new StringBuilder(); try (InputStream in = new FileInputStream(file); - final InputStreamReader reader = new InputStreamReader(in, cs); - final BufferedReader buffer = new BufferedReader(reader)) + InputStreamReader reader = new InputStreamReader(in, cs); + BufferedReader buffer = new BufferedReader(reader)) { String line; while ((line = buffer.readLine()) != null) diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/util/cron4j/SchedulingPattern.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/util/cron4j/SchedulingPattern.java index c4c80a789e..ba6b9f679f 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/util/cron4j/SchedulingPattern.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/util/cron4j/SchedulingPattern.java @@ -511,7 +511,7 @@ public class SchedulingPattern /** * Definition for a value parser. */ - private static interface ValueParser + private interface ValueParser { /** * Attempts to parse a value. diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/ui/Gui.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/ui/Gui.java index 01d4e71dc1..22a5aab723 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/ui/Gui.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/ui/Gui.java @@ -61,12 +61,12 @@ public class Gui JCheckBoxMenuItem chckbxmntmDisabled; JCheckBoxMenuItem chckbxmntmGmOnly; - final static String[] shutdownOptions = + static final String[] shutdownOptions = { "Shutdown", "Cancel" }; - final static String[] restartOptions = + static final String[] restartOptions = { "Restart", "Cancel" diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/ui/frmAbout.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/ui/frmAbout.java index b535d860b6..7650598616 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/ui/frmAbout.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/ui/frmAbout.java @@ -37,7 +37,7 @@ import javax.swing.WindowConstants; public class frmAbout { private JFrame frmAbout; - final static String URL = "www.l2jmobius.com"; + static final String URL = "www.l2jmobius.com"; URI uri; public frmAbout() diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/custom/KetraOrcSupport/KetraOrcSupport.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/custom/KetraOrcSupport/KetraOrcSupport.java index 0c8e5b1b4d..6c740e83f8 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/custom/KetraOrcSupport/KetraOrcSupport.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/custom/KetraOrcSupport/KetraOrcSupport.java @@ -117,7 +117,7 @@ public class KetraOrcSupport extends Quest // Haste: Requires 6 Buffalo Horns }; - private final static L2Skill VARKA_KETRA_PETRIFICATION = SkillTable.getInstance().getInfo(4578, 1); + private static final L2Skill VARKA_KETRA_PETRIFICATION = SkillTable.getInstance().getInfo(4578, 1); /** * Names of missions which will be automatically dropped if the alliance is broken. diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/custom/VarkaSilenosSupport/VarkaSilenosSupport.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/custom/VarkaSilenosSupport/VarkaSilenosSupport.java index b98d10e4eb..61113993fd 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/custom/VarkaSilenosSupport/VarkaSilenosSupport.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/custom/VarkaSilenosSupport/VarkaSilenosSupport.java @@ -116,7 +116,7 @@ public class VarkaSilenosSupport extends Quest // Haste: Requires 6 Nepenthese Seeds }; - private final static L2Skill VARKA_KETRA_PETRIFICATION = SkillTable.getInstance().getInfo(4578, 1); + private static final L2Skill VARKA_KETRA_PETRIFICATION = SkillTable.getInstance().getInfo(4578, 1); /** * Names of missions which will be automatically dropped if the alliance is broken. diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/instancemanager/PlayerCountManager.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/instancemanager/PlayerCountManager.java index cb2fab84ed..75688ba0fb 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/instancemanager/PlayerCountManager.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/instancemanager/PlayerCountManager.java @@ -21,9 +21,9 @@ package com.l2jmobius.gameserver.instancemanager; */ public class PlayerCountManager { - private volatile static int connectedCount = 0; - private volatile static int maxConnectedCount = 0; - private volatile static int offlineTradeCount = 0; + private static volatile int connectedCount = 0; + private static volatile int maxConnectedCount = 0; + private static volatile int offlineTradeCount = 0; protected PlayerCountManager() { diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/quest/State.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/quest/State.java index c2d8d4c1e1..22bba75ca6 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/quest/State.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/quest/State.java @@ -21,9 +21,9 @@ package com.l2jmobius.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; // discover the string representation of the state, for readable DB storage public static String getStateName(byte state) diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/ui/Gui.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/ui/Gui.java index 435e6ca456..7c2480d533 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/ui/Gui.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/ui/Gui.java @@ -61,22 +61,22 @@ public class Gui { JTextArea txtrConsole; - final static String[] shutdownOptions = + static final String[] shutdownOptions = { "Shutdown", "Cancel" }; - final static String[] restartOptions = + static final String[] restartOptions = { "Restart", "Cancel" }; - final static String[] abortOptions = + static final String[] abortOptions = { "Abort", "Cancel" }; - final static String[] confirmOptions = + static final String[] confirmOptions = { "Confirm", "Cancel" diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/ui/SystemPanel.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/ui/SystemPanel.java index a20cc6f18c..3127555422 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/ui/SystemPanel.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/ui/SystemPanel.java @@ -39,7 +39,7 @@ import com.l2jmobius.gameserver.util.Locator; */ public class SystemPanel extends JPanel { - final static long startTime = System.currentTimeMillis(); + static final long startTime = System.currentTimeMillis(); public SystemPanel() { diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/ui/frmAbout.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/ui/frmAbout.java index 0ab78d6140..0f5502129a 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/ui/frmAbout.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/ui/frmAbout.java @@ -39,7 +39,7 @@ import com.l2jmobius.Config; public class frmAbout { private JFrame frmAbout; - final static String URL = "www.l2jmobius.com"; + static final String URL = "www.l2jmobius.com"; URI uri; public frmAbout() diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/loginserver/ui/Gui.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/loginserver/ui/Gui.java index 72bfce20bc..30704f429d 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/loginserver/ui/Gui.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/loginserver/ui/Gui.java @@ -62,12 +62,12 @@ public class Gui JCheckBoxMenuItem chckbxmntmDisabled; JCheckBoxMenuItem chckbxmntmGmOnly; - final static String[] shutdownOptions = + static final String[] shutdownOptions = { "Shutdown", "Cancel" }; - final static String[] restartOptions = + static final String[] restartOptions = { "Restart", "Cancel" diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/loginserver/ui/frmAbout.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/loginserver/ui/frmAbout.java index b535d860b6..7650598616 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/loginserver/ui/frmAbout.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/loginserver/ui/frmAbout.java @@ -37,7 +37,7 @@ import javax.swing.WindowConstants; public class frmAbout { private JFrame frmAbout; - final static String URL = "www.l2jmobius.com"; + static final String URL = "www.l2jmobius.com"; URI uri; public frmAbout() diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumDrill.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumDrill.java index 70ca241552..b799752ad1 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumDrill.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumDrill.java @@ -77,7 +77,7 @@ public final class SelMahumDrill extends AbstractNpcAI // Chiefs event broadcast range private static final int TRAINING_RANGE = 1000; - private static enum Actions + private enum Actions { SCE_TRAINING_ACTION_A(4, -1, 2, 2333), SCE_TRAINING_ACTION_B(1, -1, 2, 4333), diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java index bdf63f29d8..b3f75a69dc 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java @@ -56,7 +56,7 @@ public final class Sailren extends AbstractNpcAI private static int _killCount = 0; private static long _lastAttack = 0; - private static enum Status + private enum Status { ALIVE, IN_FIGHT, diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/events/Elpies/Elpies.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/events/Elpies/Elpies.java index 856a47f845..2b9d6d6266 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/events/Elpies/Elpies.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/events/Elpies/Elpies.java @@ -173,7 +173,7 @@ public final class Elpies extends Event return super.onSpawn(npc); } - private static enum EventLocation + private enum EventLocation { ADEN("Aden", 146558, 148341, 26622, 28560, -2200), DION("Dion", 18564, 19200, 144377, 145782, -3081), diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00350_EnhanceYourWeapon/Q00350_EnhanceYourWeapon.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00350_EnhanceYourWeapon/Q00350_EnhanceYourWeapon.java index 531f90380a..f7794b7733 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00350_EnhanceYourWeapon/Q00350_EnhanceYourWeapon.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00350_EnhanceYourWeapon/Q00350_EnhanceYourWeapon.java @@ -51,7 +51,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class Q00350_EnhanceYourWeapon extends Quest { - private static enum AbsorbCrystalType + private enum AbsorbCrystalType { LAST_HIT, FULL_PARTY, diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/commons/util/Rnd.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/commons/util/Rnd.java index f9925572bb..dc1a10296e 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/commons/util/Rnd.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/commons/util/Rnd.java @@ -191,7 +191,7 @@ public final class Rnd /** * @author Forsaiken */ - public static enum RandomType + public enum RandomType { /** * For best random quality. diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/geoengine/geodata/BlockComplexDynamic.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/geoengine/geodata/BlockComplexDynamic.java index b4e14313ce..7bcb2c7d2d 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/geoengine/geodata/BlockComplexDynamic.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/geoengine/geodata/BlockComplexDynamic.java @@ -151,7 +151,7 @@ public final class BlockComplexDynamic extends BlockComplex implements IBlockDyn } @Override - final synchronized public void addGeoObject(IGeoObject object) + public final synchronized void addGeoObject(IGeoObject object) { // add geo object, update block geodata when added if (_objects.add(object)) @@ -161,7 +161,7 @@ public final class BlockComplexDynamic extends BlockComplex implements IBlockDyn } @Override - final synchronized public void removeGeoObject(IGeoObject object) + public final synchronized void removeGeoObject(IGeoObject object) { // remove geo object, update block geodata when removed if (_objects.remove(object)) diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/geoengine/geodata/BlockMultilayerDynamic.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/geoengine/geodata/BlockMultilayerDynamic.java index edd1844526..70d46cb451 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/geoengine/geodata/BlockMultilayerDynamic.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/geoengine/geodata/BlockMultilayerDynamic.java @@ -196,7 +196,7 @@ public final class BlockMultilayerDynamic extends BlockMultilayer implements IBl } @Override - final synchronized public void addGeoObject(IGeoObject object) + public final synchronized void addGeoObject(IGeoObject object) { // add geo object, update block geodata when added if (_objects.add(object)) @@ -206,7 +206,7 @@ public final class BlockMultilayerDynamic extends BlockMultilayer implements IBl } @Override - final synchronized public void removeGeoObject(IGeoObject object) + public final synchronized void removeGeoObject(IGeoObject object) { // remove geo object, update block geodata when removed if (_objects.remove(object)) diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/PlayerCountManager.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/PlayerCountManager.java index cb2fab84ed..75688ba0fb 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/PlayerCountManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/PlayerCountManager.java @@ -21,9 +21,9 @@ package com.l2jmobius.gameserver.instancemanager; */ public class PlayerCountManager { - private volatile static int connectedCount = 0; - private volatile static int maxConnectedCount = 0; - private volatile static int offlineTradeCount = 0; + private static volatile int connectedCount = 0; + private static volatile int maxConnectedCount = 0; + private static volatile int offlineTradeCount = 0; protected PlayerCountManager() { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/RaidBossSpawnManager.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/RaidBossSpawnManager.java index 37b0b0a743..82154df9c9 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/RaidBossSpawnManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/RaidBossSpawnManager.java @@ -50,7 +50,7 @@ public class RaidBossSpawnManager protected static final Map _storedInfo = new ConcurrentHashMap<>(); protected static final Map> _schedules = new ConcurrentHashMap<>(); - public static enum StatusEnum + public enum StatusEnum { ALIVE, DEAD, diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/Elementals.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/Elementals.java index 0f40e82cd2..8d9219dbde 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/Elementals.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/Elementals.java @@ -84,7 +84,7 @@ public final class Elementals // TODO: Higher stones }; - public static enum ElementalItemType + public enum ElementalItemType { Stone(3), Roughore(3), @@ -100,7 +100,7 @@ public final class Elementals } } - public static enum ElementalItems + public enum ElementalItems { fireStone(FIRE, 9546, ElementalItemType.Stone), waterStone(WATER, 9547, ElementalItemType.Stone), diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java index f4f8a9bfac..86dd9f1e10 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java @@ -914,7 +914,7 @@ public final class L2PcInstance extends L2Playable private boolean _marryaccepted = false; // Item Mall - private final static String GAME_POINTS_VAR = "PRIME_POINTS"; // Keep compatibility with later clients. + private static final String GAME_POINTS_VAR = "PRIME_POINTS"; // Keep compatibility with later clients. // Save responder name for log it private String _lastPetitionGmName = null; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/olympiad/OlympiadGameTask.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/olympiad/OlympiadGameTask.java index ce2b98257e..1269dafb7a 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/olympiad/OlympiadGameTask.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/olympiad/OlympiadGameTask.java @@ -87,7 +87,7 @@ public final class OlympiadGameTask implements Runnable private boolean _needAnnounce = false; private int _countDown = 0; - private static enum GameState + private enum GameState { BEGIN, TELEPORT_TO_ARENA, diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java index 9cec395027..52759bc3b0 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java @@ -30,7 +30,7 @@ public interface IClientOutgoingPacket extends IOutgoingPacket { Logger LOGGER = Logger.getLogger(IClientOutgoingPacket.class.getName()); - static final int[] PAPERDOLL_ORDER = new int[] + int[] PAPERDOLL_ORDER = new int[] { Inventory.PAPERDOLL_UNDER, Inventory.PAPERDOLL_REAR, diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/SortedWareHouseWithdrawalList.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/SortedWareHouseWithdrawalList.java index 67dd91c8f1..bad2d2489a 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/SortedWareHouseWithdrawalList.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/SortedWareHouseWithdrawalList.java @@ -44,7 +44,7 @@ public class SortedWareHouseWithdrawalList implements IClientOutgoingPacket private List _objects = new ArrayList<>(); private int _whType; - public static enum WarehouseListType + public enum WarehouseListType { WEAPON, ARMOR, diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/ui/Gui.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/ui/Gui.java index 107d38451f..c174cdaff4 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/ui/Gui.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/ui/Gui.java @@ -62,22 +62,22 @@ public class Gui { JTextArea txtrConsole; - final static String[] shutdownOptions = + static final String[] shutdownOptions = { "Shutdown", "Cancel" }; - final static String[] restartOptions = + static final String[] restartOptions = { "Restart", "Cancel" }; - final static String[] abortOptions = + static final String[] abortOptions = { "Abort", "Cancel" }; - final static String[] confirmOptions = + static final String[] confirmOptions = { "Confirm", "Cancel" diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/ui/SystemPanel.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/ui/SystemPanel.java index da71d74f2a..763252ab7d 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/ui/SystemPanel.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/ui/SystemPanel.java @@ -39,7 +39,7 @@ import com.l2jmobius.gameserver.util.Locator; */ public class SystemPanel extends JPanel { - final static long startTime = System.currentTimeMillis(); + static final long startTime = System.currentTimeMillis(); public SystemPanel() { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/ui/frmAbout.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/ui/frmAbout.java index e8a4f9a47c..2a2c99186d 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/ui/frmAbout.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/ui/frmAbout.java @@ -39,7 +39,7 @@ import com.l2jmobius.Config; public class frmAbout { private JFrame frmAbout; - final static String URL = "www.l2jmobius.com"; + static final String URL = "www.l2jmobius.com"; URI uri; public frmAbout() diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/ui/Gui.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/ui/Gui.java index 01d4e71dc1..22a5aab723 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/ui/Gui.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/ui/Gui.java @@ -61,12 +61,12 @@ public class Gui JCheckBoxMenuItem chckbxmntmDisabled; JCheckBoxMenuItem chckbxmntmGmOnly; - final static String[] shutdownOptions = + static final String[] shutdownOptions = { "Shutdown", "Cancel" }; - final static String[] restartOptions = + static final String[] restartOptions = { "Restart", "Cancel" diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/ui/frmAbout.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/ui/frmAbout.java index b535d860b6..7650598616 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/ui/frmAbout.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/ui/frmAbout.java @@ -37,7 +37,7 @@ import javax.swing.WindowConstants; public class frmAbout { private JFrame frmAbout; - final static String URL = "www.l2jmobius.com"; + static final String URL = "www.l2jmobius.com"; URI uri; public frmAbout() diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/custom/events/Elpies/Elpies.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/custom/events/Elpies/Elpies.java index 813358bd0c..83bc3c2fb1 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/custom/events/Elpies/Elpies.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/custom/events/Elpies/Elpies.java @@ -177,7 +177,7 @@ public final class Elpies extends Event return super.onSpawn(npc); } - private static enum EventLocation + private enum EventLocation { ADEN("Aden", 146558, 148341, 26622, 28560, -2200), DION("Dion", 18564, 19200, 144377, 145782, -3081), diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/commons/util/Rnd.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/commons/util/Rnd.java index 8570d4598a..728eb5f9fc 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/commons/util/Rnd.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/commons/util/Rnd.java @@ -191,7 +191,7 @@ public final class Rnd /** * @author Forsaiken */ - public static enum RandomType + public enum RandomType { /** * For best random quality. diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/geoengine/geodata/BlockComplexDynamic.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/geoengine/geodata/BlockComplexDynamic.java index b4e14313ce..7bcb2c7d2d 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/geoengine/geodata/BlockComplexDynamic.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/geoengine/geodata/BlockComplexDynamic.java @@ -151,7 +151,7 @@ public final class BlockComplexDynamic extends BlockComplex implements IBlockDyn } @Override - final synchronized public void addGeoObject(IGeoObject object) + public final synchronized void addGeoObject(IGeoObject object) { // add geo object, update block geodata when added if (_objects.add(object)) @@ -161,7 +161,7 @@ public final class BlockComplexDynamic extends BlockComplex implements IBlockDyn } @Override - final synchronized public void removeGeoObject(IGeoObject object) + public final synchronized void removeGeoObject(IGeoObject object) { // remove geo object, update block geodata when removed if (_objects.remove(object)) diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/geoengine/geodata/BlockMultilayerDynamic.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/geoengine/geodata/BlockMultilayerDynamic.java index edd1844526..70d46cb451 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/geoengine/geodata/BlockMultilayerDynamic.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/geoengine/geodata/BlockMultilayerDynamic.java @@ -196,7 +196,7 @@ public final class BlockMultilayerDynamic extends BlockMultilayer implements IBl } @Override - final synchronized public void addGeoObject(IGeoObject object) + public final synchronized void addGeoObject(IGeoObject object) { // add geo object, update block geodata when added if (_objects.add(object)) @@ -206,7 +206,7 @@ public final class BlockMultilayerDynamic extends BlockMultilayer implements IBl } @Override - final synchronized public void removeGeoObject(IGeoObject object) + public final synchronized void removeGeoObject(IGeoObject object) { // remove geo object, update block geodata when removed if (_objects.remove(object)) diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/DBSpawnManager.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/DBSpawnManager.java index af7835fe63..d476f984d5 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/DBSpawnManager.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/DBSpawnManager.java @@ -55,7 +55,7 @@ public class DBSpawnManager protected final Map _storedInfo = new ConcurrentHashMap<>(); protected final Map> _schedules = new ConcurrentHashMap<>(); - public static enum DBStatusType + public enum DBStatusType { ALIVE, DEAD, diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/PlayerCountManager.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/PlayerCountManager.java index cb2fab84ed..75688ba0fb 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/PlayerCountManager.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/PlayerCountManager.java @@ -21,9 +21,9 @@ package com.l2jmobius.gameserver.instancemanager; */ public class PlayerCountManager { - private volatile static int connectedCount = 0; - private volatile static int maxConnectedCount = 0; - private volatile static int offlineTradeCount = 0; + private static volatile int connectedCount = 0; + private static volatile int maxConnectedCount = 0; + private static volatile int offlineTradeCount = 0; protected PlayerCountManager() { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java index 247aa12b1d..ef9ec924ae 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java @@ -829,12 +829,12 @@ public final class L2PcInstance extends L2Playable } // Training Camp - private final static String TRAINING_CAMP_VAR = "TRAINING_CAMP"; - private final static String TRAINING_CAMP_DURATION = "TRAINING_CAMP_DURATION"; + private static final String TRAINING_CAMP_VAR = "TRAINING_CAMP"; + private static final String TRAINING_CAMP_DURATION = "TRAINING_CAMP_DURATION"; // Attendance Reward system - private final static String ATTENDANCE_DATE_VAR = "ATTENDANCE_DATE"; - private final static String ATTENDANCE_INDEX_VAR = "ATTENDANCE_INDEX"; + private static final String ATTENDANCE_DATE_VAR = "ATTENDANCE_DATE"; + private static final String ATTENDANCE_INDEX_VAR = "ATTENDANCE_INDEX"; // Save responder name for log it private String _lastPetitionGmName = null; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/cubic/conditions/HpCondition.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/cubic/conditions/HpCondition.java index eb2388a69b..872ab338c3 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/cubic/conditions/HpCondition.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/cubic/conditions/HpCondition.java @@ -62,7 +62,7 @@ public class HpCondition implements ICubicCondition return getClass().getSimpleName() + " chance: " + _hpPer; } - public static enum HpConditionType + public enum HpConditionType { GREATER, LESSER; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/holders/LuckyGameDataHolder.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/holders/LuckyGameDataHolder.java index 43e93e30c5..8b6f6cc80c 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/holders/LuckyGameDataHolder.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/holders/LuckyGameDataHolder.java @@ -26,11 +26,11 @@ import com.l2jmobius.gameserver.model.StatsSet; */ public class LuckyGameDataHolder { - final private int _index; - final private int _turningPoints; - final private List _commonRewards = new ArrayList<>(); - final private List _uniqueRewards = new ArrayList<>(); - final private List _modifyRewards = new ArrayList<>(); + private final int _index; + private final int _turningPoints; + private final List _commonRewards = new ArrayList<>(); + private final List _uniqueRewards = new ArrayList<>(); + private final List _modifyRewards = new ArrayList<>(); private int _minModifyRewardGame; private int _maxModifyRewardGame; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/ui/Gui.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/ui/Gui.java index 068c02be75..b1ba2aa6d4 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/ui/Gui.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/ui/Gui.java @@ -61,22 +61,22 @@ public class Gui { JTextArea txtrConsole; - final static String[] shutdownOptions = + static final String[] shutdownOptions = { "Shutdown", "Cancel" }; - final static String[] restartOptions = + static final String[] restartOptions = { "Restart", "Cancel" }; - final static String[] abortOptions = + static final String[] abortOptions = { "Abort", "Cancel" }; - final static String[] confirmOptions = + static final String[] confirmOptions = { "Confirm", "Cancel" diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/ui/SystemPanel.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/ui/SystemPanel.java index da71d74f2a..763252ab7d 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/ui/SystemPanel.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/ui/SystemPanel.java @@ -39,7 +39,7 @@ import com.l2jmobius.gameserver.util.Locator; */ public class SystemPanel extends JPanel { - final static long startTime = System.currentTimeMillis(); + static final long startTime = System.currentTimeMillis(); public SystemPanel() { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/ui/frmAbout.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/ui/frmAbout.java index e8a4f9a47c..2a2c99186d 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/ui/frmAbout.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/ui/frmAbout.java @@ -39,7 +39,7 @@ import com.l2jmobius.Config; public class frmAbout { private JFrame frmAbout; - final static String URL = "www.l2jmobius.com"; + static final String URL = "www.l2jmobius.com"; URI uri; public frmAbout() diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/util/Util.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/util/Util.java index b075bfc1d2..a0292b85fd 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/util/Util.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/util/Util.java @@ -695,8 +695,8 @@ public final class Util { final StringBuilder sb = new StringBuilder(); try (InputStream in = new FileInputStream(file); - final InputStreamReader reader = new InputStreamReader(in, cs); - final BufferedReader buffer = new BufferedReader(reader)) + InputStreamReader reader = new InputStreamReader(in, cs); + BufferedReader buffer = new BufferedReader(reader)) { String line; while ((line = buffer.readLine()) != null) diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/util/cron4j/SchedulingPattern.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/util/cron4j/SchedulingPattern.java index c4c80a789e..ba6b9f679f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/util/cron4j/SchedulingPattern.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/util/cron4j/SchedulingPattern.java @@ -511,7 +511,7 @@ public class SchedulingPattern /** * Definition for a value parser. */ - private static interface ValueParser + private interface ValueParser { /** * Attempts to parse a value. diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/ui/Gui.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/ui/Gui.java index 01d4e71dc1..22a5aab723 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/ui/Gui.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/ui/Gui.java @@ -61,12 +61,12 @@ public class Gui JCheckBoxMenuItem chckbxmntmDisabled; JCheckBoxMenuItem chckbxmntmGmOnly; - final static String[] shutdownOptions = + static final String[] shutdownOptions = { "Shutdown", "Cancel" }; - final static String[] restartOptions = + static final String[] restartOptions = { "Restart", "Cancel" diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/ui/frmAbout.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/ui/frmAbout.java index b535d860b6..7650598616 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/ui/frmAbout.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/ui/frmAbout.java @@ -37,7 +37,7 @@ import javax.swing.WindowConstants; public class frmAbout { private JFrame frmAbout; - final static String URL = "www.l2jmobius.com"; + static final String URL = "www.l2jmobius.com"; URI uri; public frmAbout() diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/custom/events/Elpies/Elpies.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/custom/events/Elpies/Elpies.java index 813358bd0c..83bc3c2fb1 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/custom/events/Elpies/Elpies.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/custom/events/Elpies/Elpies.java @@ -177,7 +177,7 @@ public final class Elpies extends Event return super.onSpawn(npc); } - private static enum EventLocation + private enum EventLocation { ADEN("Aden", 146558, 148341, 26622, 28560, -2200), DION("Dion", 18564, 19200, 144377, 145782, -3081), diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/commons/util/Rnd.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/commons/util/Rnd.java index 8570d4598a..728eb5f9fc 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/commons/util/Rnd.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/commons/util/Rnd.java @@ -191,7 +191,7 @@ public final class Rnd /** * @author Forsaiken */ - public static enum RandomType + public enum RandomType { /** * For best random quality. diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/geoengine/geodata/BlockComplexDynamic.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/geoengine/geodata/BlockComplexDynamic.java index b4e14313ce..7bcb2c7d2d 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/geoengine/geodata/BlockComplexDynamic.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/geoengine/geodata/BlockComplexDynamic.java @@ -151,7 +151,7 @@ public final class BlockComplexDynamic extends BlockComplex implements IBlockDyn } @Override - final synchronized public void addGeoObject(IGeoObject object) + public final synchronized void addGeoObject(IGeoObject object) { // add geo object, update block geodata when added if (_objects.add(object)) @@ -161,7 +161,7 @@ public final class BlockComplexDynamic extends BlockComplex implements IBlockDyn } @Override - final synchronized public void removeGeoObject(IGeoObject object) + public final synchronized void removeGeoObject(IGeoObject object) { // remove geo object, update block geodata when removed if (_objects.remove(object)) diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/geoengine/geodata/BlockMultilayerDynamic.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/geoengine/geodata/BlockMultilayerDynamic.java index edd1844526..70d46cb451 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/geoengine/geodata/BlockMultilayerDynamic.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/geoengine/geodata/BlockMultilayerDynamic.java @@ -196,7 +196,7 @@ public final class BlockMultilayerDynamic extends BlockMultilayer implements IBl } @Override - final synchronized public void addGeoObject(IGeoObject object) + public final synchronized void addGeoObject(IGeoObject object) { // add geo object, update block geodata when added if (_objects.add(object)) @@ -206,7 +206,7 @@ public final class BlockMultilayerDynamic extends BlockMultilayer implements IBl } @Override - final synchronized public void removeGeoObject(IGeoObject object) + public final synchronized void removeGeoObject(IGeoObject object) { // remove geo object, update block geodata when removed if (_objects.remove(object)) diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/instancemanager/DBSpawnManager.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/instancemanager/DBSpawnManager.java index af7835fe63..d476f984d5 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/instancemanager/DBSpawnManager.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/instancemanager/DBSpawnManager.java @@ -55,7 +55,7 @@ public class DBSpawnManager protected final Map _storedInfo = new ConcurrentHashMap<>(); protected final Map> _schedules = new ConcurrentHashMap<>(); - public static enum DBStatusType + public enum DBStatusType { ALIVE, DEAD, diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/instancemanager/PlayerCountManager.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/instancemanager/PlayerCountManager.java index cb2fab84ed..75688ba0fb 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/instancemanager/PlayerCountManager.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/instancemanager/PlayerCountManager.java @@ -21,9 +21,9 @@ package com.l2jmobius.gameserver.instancemanager; */ public class PlayerCountManager { - private volatile static int connectedCount = 0; - private volatile static int maxConnectedCount = 0; - private volatile static int offlineTradeCount = 0; + private static volatile int connectedCount = 0; + private static volatile int maxConnectedCount = 0; + private static volatile int offlineTradeCount = 0; protected PlayerCountManager() { diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java index f2c4a12440..88154f0dcd 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java @@ -829,12 +829,12 @@ public final class L2PcInstance extends L2Playable } // Training Camp - private final static String TRAINING_CAMP_VAR = "TRAINING_CAMP"; - private final static String TRAINING_CAMP_DURATION = "TRAINING_CAMP_DURATION"; + private static final String TRAINING_CAMP_VAR = "TRAINING_CAMP"; + private static final String TRAINING_CAMP_DURATION = "TRAINING_CAMP_DURATION"; // Attendance Reward system - private final static String ATTENDANCE_DATE_VAR = "ATTENDANCE_DATE"; - private final static String ATTENDANCE_INDEX_VAR = "ATTENDANCE_INDEX"; + private static final String ATTENDANCE_DATE_VAR = "ATTENDANCE_DATE"; + private static final String ATTENDANCE_INDEX_VAR = "ATTENDANCE_INDEX"; // Save responder name for log it private String _lastPetitionGmName = null; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/cubic/conditions/HpCondition.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/cubic/conditions/HpCondition.java index eb2388a69b..872ab338c3 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/cubic/conditions/HpCondition.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/cubic/conditions/HpCondition.java @@ -62,7 +62,7 @@ public class HpCondition implements ICubicCondition return getClass().getSimpleName() + " chance: " + _hpPer; } - public static enum HpConditionType + public enum HpConditionType { GREATER, LESSER; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/holders/LuckyGameDataHolder.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/holders/LuckyGameDataHolder.java index 43e93e30c5..8b6f6cc80c 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/holders/LuckyGameDataHolder.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/holders/LuckyGameDataHolder.java @@ -26,11 +26,11 @@ import com.l2jmobius.gameserver.model.StatsSet; */ public class LuckyGameDataHolder { - final private int _index; - final private int _turningPoints; - final private List _commonRewards = new ArrayList<>(); - final private List _uniqueRewards = new ArrayList<>(); - final private List _modifyRewards = new ArrayList<>(); + private final int _index; + private final int _turningPoints; + private final List _commonRewards = new ArrayList<>(); + private final List _uniqueRewards = new ArrayList<>(); + private final List _modifyRewards = new ArrayList<>(); private int _minModifyRewardGame; private int _maxModifyRewardGame; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/network/serverpackets/dailymission/ExOneDayReceiveRewardList.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/network/serverpackets/dailymission/ExOneDayReceiveRewardList.java index 4a65398244..63eb64acf5 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/network/serverpackets/dailymission/ExOneDayReceiveRewardList.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/network/serverpackets/dailymission/ExOneDayReceiveRewardList.java @@ -36,7 +36,7 @@ public class ExOneDayReceiveRewardList implements IClientOutgoingPacket { final L2PcInstance _player; private final Collection _rewards; - private final static Function _remainTime = pattern -> (new Predictor(pattern).nextMatchingTime() - System.currentTimeMillis()) / 1000L; + private static final Function _remainTime = pattern -> (new Predictor(pattern).nextMatchingTime() - System.currentTimeMillis()) / 1000L; private final long _dayRemainTime; private final long _weekRemainTime; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/ui/Gui.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/ui/Gui.java index 068c02be75..b1ba2aa6d4 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/ui/Gui.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/ui/Gui.java @@ -61,22 +61,22 @@ public class Gui { JTextArea txtrConsole; - final static String[] shutdownOptions = + static final String[] shutdownOptions = { "Shutdown", "Cancel" }; - final static String[] restartOptions = + static final String[] restartOptions = { "Restart", "Cancel" }; - final static String[] abortOptions = + static final String[] abortOptions = { "Abort", "Cancel" }; - final static String[] confirmOptions = + static final String[] confirmOptions = { "Confirm", "Cancel" diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/ui/SystemPanel.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/ui/SystemPanel.java index da71d74f2a..763252ab7d 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/ui/SystemPanel.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/ui/SystemPanel.java @@ -39,7 +39,7 @@ import com.l2jmobius.gameserver.util.Locator; */ public class SystemPanel extends JPanel { - final static long startTime = System.currentTimeMillis(); + static final long startTime = System.currentTimeMillis(); public SystemPanel() { diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/ui/frmAbout.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/ui/frmAbout.java index e8a4f9a47c..2a2c99186d 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/ui/frmAbout.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/ui/frmAbout.java @@ -39,7 +39,7 @@ import com.l2jmobius.Config; public class frmAbout { private JFrame frmAbout; - final static String URL = "www.l2jmobius.com"; + static final String URL = "www.l2jmobius.com"; URI uri; public frmAbout() diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/util/Util.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/util/Util.java index b075bfc1d2..a0292b85fd 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/util/Util.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/util/Util.java @@ -695,8 +695,8 @@ public final class Util { final StringBuilder sb = new StringBuilder(); try (InputStream in = new FileInputStream(file); - final InputStreamReader reader = new InputStreamReader(in, cs); - final BufferedReader buffer = new BufferedReader(reader)) + InputStreamReader reader = new InputStreamReader(in, cs); + BufferedReader buffer = new BufferedReader(reader)) { String line; while ((line = buffer.readLine()) != null) diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/util/cron4j/SchedulingPattern.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/util/cron4j/SchedulingPattern.java index c4c80a789e..ba6b9f679f 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/util/cron4j/SchedulingPattern.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/util/cron4j/SchedulingPattern.java @@ -511,7 +511,7 @@ public class SchedulingPattern /** * Definition for a value parser. */ - private static interface ValueParser + private interface ValueParser { /** * Attempts to parse a value. diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/loginserver/ui/Gui.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/loginserver/ui/Gui.java index 01d4e71dc1..22a5aab723 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/loginserver/ui/Gui.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/loginserver/ui/Gui.java @@ -61,12 +61,12 @@ public class Gui JCheckBoxMenuItem chckbxmntmDisabled; JCheckBoxMenuItem chckbxmntmGmOnly; - final static String[] shutdownOptions = + static final String[] shutdownOptions = { "Shutdown", "Cancel" }; - final static String[] restartOptions = + static final String[] restartOptions = { "Restart", "Cancel" diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/loginserver/ui/frmAbout.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/loginserver/ui/frmAbout.java index b535d860b6..7650598616 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/loginserver/ui/frmAbout.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/loginserver/ui/frmAbout.java @@ -37,7 +37,7 @@ import javax.swing.WindowConstants; public class frmAbout { private JFrame frmAbout; - final static String URL = "www.l2jmobius.com"; + static final String URL = "www.l2jmobius.com"; URI uri; public frmAbout() diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/custom/events/Elpies/Elpies.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/custom/events/Elpies/Elpies.java index 813358bd0c..83bc3c2fb1 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/custom/events/Elpies/Elpies.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/custom/events/Elpies/Elpies.java @@ -177,7 +177,7 @@ public final class Elpies extends Event return super.onSpawn(npc); } - private static enum EventLocation + private enum EventLocation { ADEN("Aden", 146558, 148341, 26622, 28560, -2200), DION("Dion", 18564, 19200, 144377, 145782, -3081), diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/commons/util/Rnd.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/commons/util/Rnd.java index 8570d4598a..728eb5f9fc 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/commons/util/Rnd.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/commons/util/Rnd.java @@ -191,7 +191,7 @@ public final class Rnd /** * @author Forsaiken */ - public static enum RandomType + public enum RandomType { /** * For best random quality. diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/geoengine/geodata/BlockComplexDynamic.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/geoengine/geodata/BlockComplexDynamic.java index b4e14313ce..7bcb2c7d2d 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/geoengine/geodata/BlockComplexDynamic.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/geoengine/geodata/BlockComplexDynamic.java @@ -151,7 +151,7 @@ public final class BlockComplexDynamic extends BlockComplex implements IBlockDyn } @Override - final synchronized public void addGeoObject(IGeoObject object) + public final synchronized void addGeoObject(IGeoObject object) { // add geo object, update block geodata when added if (_objects.add(object)) @@ -161,7 +161,7 @@ public final class BlockComplexDynamic extends BlockComplex implements IBlockDyn } @Override - final synchronized public void removeGeoObject(IGeoObject object) + public final synchronized void removeGeoObject(IGeoObject object) { // remove geo object, update block geodata when removed if (_objects.remove(object)) diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/geoengine/geodata/BlockMultilayerDynamic.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/geoengine/geodata/BlockMultilayerDynamic.java index edd1844526..70d46cb451 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/geoengine/geodata/BlockMultilayerDynamic.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/geoengine/geodata/BlockMultilayerDynamic.java @@ -196,7 +196,7 @@ public final class BlockMultilayerDynamic extends BlockMultilayer implements IBl } @Override - final synchronized public void addGeoObject(IGeoObject object) + public final synchronized void addGeoObject(IGeoObject object) { // add geo object, update block geodata when added if (_objects.add(object)) @@ -206,7 +206,7 @@ public final class BlockMultilayerDynamic extends BlockMultilayer implements IBl } @Override - final synchronized public void removeGeoObject(IGeoObject object) + public final synchronized void removeGeoObject(IGeoObject object) { // remove geo object, update block geodata when removed if (_objects.remove(object)) diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/instancemanager/DBSpawnManager.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/instancemanager/DBSpawnManager.java index af7835fe63..d476f984d5 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/instancemanager/DBSpawnManager.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/instancemanager/DBSpawnManager.java @@ -55,7 +55,7 @@ public class DBSpawnManager protected final Map _storedInfo = new ConcurrentHashMap<>(); protected final Map> _schedules = new ConcurrentHashMap<>(); - public static enum DBStatusType + public enum DBStatusType { ALIVE, DEAD, diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/instancemanager/PlayerCountManager.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/instancemanager/PlayerCountManager.java index cb2fab84ed..75688ba0fb 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/instancemanager/PlayerCountManager.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/instancemanager/PlayerCountManager.java @@ -21,9 +21,9 @@ package com.l2jmobius.gameserver.instancemanager; */ public class PlayerCountManager { - private volatile static int connectedCount = 0; - private volatile static int maxConnectedCount = 0; - private volatile static int offlineTradeCount = 0; + private static volatile int connectedCount = 0; + private static volatile int maxConnectedCount = 0; + private static volatile int offlineTradeCount = 0; protected PlayerCountManager() { diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java index 3f485439d9..91447ca65a 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java @@ -829,12 +829,12 @@ public final class L2PcInstance extends L2Playable } // Training Camp - private final static String TRAINING_CAMP_VAR = "TRAINING_CAMP"; - private final static String TRAINING_CAMP_DURATION = "TRAINING_CAMP_DURATION"; + private static final String TRAINING_CAMP_VAR = "TRAINING_CAMP"; + private static final String TRAINING_CAMP_DURATION = "TRAINING_CAMP_DURATION"; // Attendance Reward system - private final static String ATTENDANCE_DATE_VAR = "ATTENDANCE_DATE"; - private final static String ATTENDANCE_INDEX_VAR = "ATTENDANCE_INDEX"; + private static final String ATTENDANCE_DATE_VAR = "ATTENDANCE_DATE"; + private static final String ATTENDANCE_INDEX_VAR = "ATTENDANCE_INDEX"; // Save responder name for log it private String _lastPetitionGmName = null; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/cubic/conditions/HpCondition.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/cubic/conditions/HpCondition.java index eb2388a69b..872ab338c3 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/cubic/conditions/HpCondition.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/cubic/conditions/HpCondition.java @@ -62,7 +62,7 @@ public class HpCondition implements ICubicCondition return getClass().getSimpleName() + " chance: " + _hpPer; } - public static enum HpConditionType + public enum HpConditionType { GREATER, LESSER; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/holders/LuckyGameDataHolder.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/holders/LuckyGameDataHolder.java index 43e93e30c5..8b6f6cc80c 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/holders/LuckyGameDataHolder.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/holders/LuckyGameDataHolder.java @@ -26,11 +26,11 @@ import com.l2jmobius.gameserver.model.StatsSet; */ public class LuckyGameDataHolder { - final private int _index; - final private int _turningPoints; - final private List _commonRewards = new ArrayList<>(); - final private List _uniqueRewards = new ArrayList<>(); - final private List _modifyRewards = new ArrayList<>(); + private final int _index; + private final int _turningPoints; + private final List _commonRewards = new ArrayList<>(); + private final List _uniqueRewards = new ArrayList<>(); + private final List _modifyRewards = new ArrayList<>(); private int _minModifyRewardGame; private int _maxModifyRewardGame; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/serverpackets/dailymission/ExOneDayReceiveRewardList.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/serverpackets/dailymission/ExOneDayReceiveRewardList.java index 4a65398244..63eb64acf5 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/serverpackets/dailymission/ExOneDayReceiveRewardList.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/serverpackets/dailymission/ExOneDayReceiveRewardList.java @@ -36,7 +36,7 @@ public class ExOneDayReceiveRewardList implements IClientOutgoingPacket { final L2PcInstance _player; private final Collection _rewards; - private final static Function _remainTime = pattern -> (new Predictor(pattern).nextMatchingTime() - System.currentTimeMillis()) / 1000L; + private static final Function _remainTime = pattern -> (new Predictor(pattern).nextMatchingTime() - System.currentTimeMillis()) / 1000L; private final long _dayRemainTime; private final long _weekRemainTime; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/ui/Gui.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/ui/Gui.java index 068c02be75..b1ba2aa6d4 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/ui/Gui.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/ui/Gui.java @@ -61,22 +61,22 @@ public class Gui { JTextArea txtrConsole; - final static String[] shutdownOptions = + static final String[] shutdownOptions = { "Shutdown", "Cancel" }; - final static String[] restartOptions = + static final String[] restartOptions = { "Restart", "Cancel" }; - final static String[] abortOptions = + static final String[] abortOptions = { "Abort", "Cancel" }; - final static String[] confirmOptions = + static final String[] confirmOptions = { "Confirm", "Cancel" diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/ui/SystemPanel.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/ui/SystemPanel.java index da71d74f2a..763252ab7d 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/ui/SystemPanel.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/ui/SystemPanel.java @@ -39,7 +39,7 @@ import com.l2jmobius.gameserver.util.Locator; */ public class SystemPanel extends JPanel { - final static long startTime = System.currentTimeMillis(); + static final long startTime = System.currentTimeMillis(); public SystemPanel() { diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/ui/frmAbout.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/ui/frmAbout.java index e8a4f9a47c..2a2c99186d 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/ui/frmAbout.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/ui/frmAbout.java @@ -39,7 +39,7 @@ import com.l2jmobius.Config; public class frmAbout { private JFrame frmAbout; - final static String URL = "www.l2jmobius.com"; + static final String URL = "www.l2jmobius.com"; URI uri; public frmAbout() diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/util/Util.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/util/Util.java index b075bfc1d2..a0292b85fd 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/util/Util.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/util/Util.java @@ -695,8 +695,8 @@ public final class Util { final StringBuilder sb = new StringBuilder(); try (InputStream in = new FileInputStream(file); - final InputStreamReader reader = new InputStreamReader(in, cs); - final BufferedReader buffer = new BufferedReader(reader)) + InputStreamReader reader = new InputStreamReader(in, cs); + BufferedReader buffer = new BufferedReader(reader)) { String line; while ((line = buffer.readLine()) != null) diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/util/cron4j/SchedulingPattern.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/util/cron4j/SchedulingPattern.java index c4c80a789e..ba6b9f679f 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/util/cron4j/SchedulingPattern.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/util/cron4j/SchedulingPattern.java @@ -511,7 +511,7 @@ public class SchedulingPattern /** * Definition for a value parser. */ - private static interface ValueParser + private interface ValueParser { /** * Attempts to parse a value. diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/loginserver/ui/Gui.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/loginserver/ui/Gui.java index 01d4e71dc1..22a5aab723 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/loginserver/ui/Gui.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/loginserver/ui/Gui.java @@ -61,12 +61,12 @@ public class Gui JCheckBoxMenuItem chckbxmntmDisabled; JCheckBoxMenuItem chckbxmntmGmOnly; - final static String[] shutdownOptions = + static final String[] shutdownOptions = { "Shutdown", "Cancel" }; - final static String[] restartOptions = + static final String[] restartOptions = { "Restart", "Cancel" diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/loginserver/ui/frmAbout.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/loginserver/ui/frmAbout.java index b535d860b6..7650598616 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/loginserver/ui/frmAbout.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/loginserver/ui/frmAbout.java @@ -37,7 +37,7 @@ import javax.swing.WindowConstants; public class frmAbout { private JFrame frmAbout; - final static String URL = "www.l2jmobius.com"; + static final String URL = "www.l2jmobius.com"; URI uri; public frmAbout()