lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Various unnecessary code changes.

Browse Source
This commit is contained in:
MobiusDev
2018-06-26 15:00:56 +00:00
parent c9b04d53f4
commit 315a4e773c
869 changed files with 2683 additions and 12904 deletions
Download Patch File Download Diff File Expand all files Collapse all files
L2J_Mobius_C6_Interlude/java/com/l2jmobius/Config.java
+41 -41
View File
@@ -56,59 +56,59 @@ public final class Config
// --------------------------------------------------
// standard
public static final String FILTER_FILE = "./config/chatfilter.txt";
public static final String HEXID_FILE = "./config/hexid.txt";
private static final String FILTER_FILE = "./config/chatfilter.txt";
private static final String HEXID_FILE = "./config/hexid.txt";
// head
public static final String ALT_SETTINGS_CONFIG_FILE = "./config/main/altsettings.ini";
public static final String CLANHALL_CONFIG_FILE = "./config/main/clanhall.ini";
public static final String ENCHANT_CONFIG_FILE = "./config/main/enchant.ini";
private static final String ALT_SETTINGS_CONFIG_FILE = "./config/main/altsettings.ini";
private static final String CLANHALL_CONFIG_FILE = "./config/main/clanhall.ini";
private static final String ENCHANT_CONFIG_FILE = "./config/main/enchant.ini";
public static final String FORTSIEGE_CONFIG_FILE = "./config/main/fort.ini";
public static final String GEODATA_CONFIG_FILE = "./config/main/geodata.ini";
public static final String OLYMP_CONFIG_FILE = "./config/main/olympiad.ini";
public static final String OPTIONS_CONFIG_FILE = "./config/main/options.ini";
public static final String OTHER_CONFIG_FILE = "./config/main/other.ini";
public static final String RATES_CONFIG_FILE = "./config/main/rates.ini";
public static final String SEVENSIGNS_CONFIG_FILE = "./config/main/sevensigns.ini";
private static final String GEODATA_CONFIG_FILE = "./config/main/geodata.ini";
private static final String OLYMP_CONFIG_FILE = "./config/main/olympiad.ini";
private static final String OPTIONS_CONFIG_FILE = "./config/main/options.ini";
private static final String OTHER_CONFIG_FILE = "./config/main/other.ini";
private static final String RATES_CONFIG_FILE = "./config/main/rates.ini";
private static final String SEVENSIGNS_CONFIG_FILE = "./config/main/sevensigns.ini";
public static final String SIEGE_CONFIG_FILE = "./config/main/siege.ini";
public static final String ELIT_CLANHALL_CONFIG_FILE = "./config/main/eliteclanhall.ini";
public static final String BOSS_CONFIG_FILE = "./config/main/boss.ini";
public static final String ACCESS_CONFIG_FILE = "./config/main/access.ini";
public static final String CRAFTING_CONFIG_FILE = "./config/main/crafting.ini";
public static final String DEVELOPER_CONFIG_FILE = "./config/main/developer.ini";
public static final String PHYSICS_CONFIG_FILE = "./config/main/physics.ini";
public static final String PVP_CONFIG_FILE = "./config/main/pvp.ini";
private static final String ELIT_CLANHALL_CONFIG_FILE = "./config/main/eliteclanhall.ini";
private static final String BOSS_CONFIG_FILE = "./config/main/boss.ini";
private static final String ACCESS_CONFIG_FILE = "./config/main/access.ini";
private static final String CRAFTING_CONFIG_FILE = "./config/main/crafting.ini";
private static final String DEVELOPER_CONFIG_FILE = "./config/main/developer.ini";
private static final String PHYSICS_CONFIG_FILE = "./config/main/physics.ini";
private static final String PVP_CONFIG_FILE = "./config/main/pvp.ini";
public static final String CLASS_DAMAGE_CONFIG_FILE = "./config/main/classDamage.ini";
// protected
public static final String PROTECT_FLOOD_CONFIG_FILE = "./config/protected/flood.ini";
public static final String PROTECT_OTHER_CONFIG_FILE = "./config/protected/other.ini";
public static final String ID_CONFIG_FILE = "./config/protected/idfactory.ini";
public static final String EXTENDER_CONFIG_FILE = "./config/protected/extender.ini";
public static final String SCRIPT_CONFIG_FILE = "./config/protected/script.ini";
public static final String DAEMONS_CONFIG_FILE = "./config/protected/daemons.ini";
private static final String PROTECT_FLOOD_CONFIG_FILE = "./config/protected/flood.ini";
private static final String PROTECT_OTHER_CONFIG_FILE = "./config/protected/other.ini";
private static final String ID_CONFIG_FILE = "./config/protected/idfactory.ini";
private static final String EXTENDER_CONFIG_FILE = "./config/protected/extender.ini";
private static final String SCRIPT_CONFIG_FILE = "./config/protected/script.ini";
private static final String DAEMONS_CONFIG_FILE = "./config/protected/daemons.ini";
public static final String TELNET_CONFIG_FILE = "./config/protected/telnet.ini";
// events
public static final String EVENT_CTF_CONFIG_FILE = "./config/events/ctf.ini";
public static final String EVENT_DM_CONFIG_FILE = "./config/events/dm.ini";
public static final String EVENT_TVT_CONFIG_FILE = "./config/events/tvt.ini";
public static final String EVENT_TW_CONFIG_FILE = "./config/events/tw.ini";
public static final String EVENT_PC_BANG_POINT_CONFIG_FILE = "./config/events/pcBang.ini";
private static final String EVENT_CTF_CONFIG_FILE = "./config/events/ctf.ini";
private static final String EVENT_DM_CONFIG_FILE = "./config/events/dm.ini";
private static final String EVENT_TVT_CONFIG_FILE = "./config/events/tvt.ini";
private static final String EVENT_TW_CONFIG_FILE = "./config/events/tw.ini";
private static final String EVENT_PC_BANG_POINT_CONFIG_FILE = "./config/events/pcBang.ini";
// custom
public static final String CUSTOM_SERVER_CONFIG_FILE = "./config/custom/customserver.ini";
public static final String AWAY_CONFIG_FILE = "./config/custom/away.ini";
public static final String BANK_CONFIG_FILE = "./config/custom/bank.ini";
public static final String BUFFER_CONFIG_FILE = "./config/custom/buffer.ini";
public static final String EVENT_CHAMPION_CONFIG_FILE = "./config/custom/champion.ini";
public static final String EVENT_REBIRTH_CONFIG_FILE = "./config/custom/rebirth.ini";
public static final String EVENT_WEDDING_CONFIG_FILE = "./config/custom/wedding.ini";
public static final String OFFLINE_CONFIG_FILE = "./config/custom/offline.ini";
private static final String CUSTOM_SERVER_CONFIG_FILE = "./config/custom/customserver.ini";
private static final String AWAY_CONFIG_FILE = "./config/custom/away.ini";
private static final String BANK_CONFIG_FILE = "./config/custom/bank.ini";
private static final String BUFFER_CONFIG_FILE = "./config/custom/buffer.ini";
private static final String EVENT_CHAMPION_CONFIG_FILE = "./config/custom/champion.ini";
private static final String EVENT_REBIRTH_CONFIG_FILE = "./config/custom/rebirth.ini";
private static final String EVENT_WEDDING_CONFIG_FILE = "./config/custom/wedding.ini";
private static final String OFFLINE_CONFIG_FILE = "./config/custom/offline.ini";
// network
public static final String SERVER_CONFIG_FILE = "./config/network/gameserver.ini";
public static final String LOGIN_CONFIG_FILE = "./config/network/loginserver.ini";
private static final String SERVER_CONFIG_FILE = "./config/network/gameserver.ini";
private static final String LOGIN_CONFIG_FILE = "./config/network/loginserver.ini";
// others
public static final String BANNED_IP_FILE = "./config/others/banned_ip.cfg";
private static final String BANNED_IP_FILE = "./config/others/banned_ip.cfg";
public static final String SERVER_NAME_FILE = "./config/others/servername.xml";
// legacy
public static final String LEGACY_BANNED_IP = "./config/banned_ip.cfg";
private static final String LEGACY_BANNED_IP = "./config/banned_ip.cfg";
// --------------------------------------------------
// Constants
L2J_Mobius_C6_Interlude/java/com/l2jmobius/commons/concurrent/ThreadPool.java
+3 -3
View File
@@ -37,10 +37,10 @@ import com.l2jmobius.Config;
*/
public final class ThreadPool
{
protected static final Logger LOGGER = Logger.getLogger(ThreadPool.class.getName());
private static final Logger LOGGER = Logger.getLogger(ThreadPool.class.getName());
protected static ScheduledThreadPoolExecutor[] SCHEDULED_POOLS;
protected static ThreadPoolExecutor[] INSTANT_POOLS;
private static ScheduledThreadPoolExecutor[] SCHEDULED_POOLS;
private static ThreadPoolExecutor[] INSTANT_POOLS;
private static int THREAD_POOL_RANDOMIZER;
/**
L2J_Mobius_C6_Interlude/java/com/l2jmobius/commons/util/IPSubnet.java
+4 -15
View File
@@ -21,9 +21,9 @@ import java.net.UnknownHostException;
public class IPSubnet
{
final byte[] _addr;
final byte[] _mask;
final boolean _isIPv4;
private final byte[] _addr;
private final byte[] _mask;
private final boolean _isIPv4;
public IPSubnet(String input) throws UnknownHostException, NumberFormatException, ArrayIndexOutOfBoundsException
{
@@ -47,23 +47,12 @@ public class IPSubnet
}
}
public IPSubnet(InetAddress addr, int mask) throws UnknownHostException
{
_addr = addr.getAddress();
_isIPv4 = _addr.length == 4;
_mask = getMask(mask, _addr.length);
if (!applyMask(_addr))
{
throw new UnknownHostException(addr + "/" + mask);
}
}
public byte[] getAddress()
{
return _addr;
}
public boolean applyMask(byte[] addr)
private boolean applyMask(byte[] addr)
{
// V4 vs V4 or V6 vs V6 checks
if (_isIPv4 == (addr.length == 4))
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/ui/frmAbout.java
+3 -3
View File
@@ -39,8 +39,8 @@ import com.l2jmobius.Config;
public class frmAbout
{
private JFrame frmAbout;
static final String URL = "www.l2jmobius.com";
URI uri;
private static final String URL = "www.l2jmobius.com";
final URI uri;
public frmAbout()
{
@@ -122,7 +122,7 @@ public class frmAbout
frmAbout.setLocationRelativeTo(null);
}
public static URI createURI(String str)
private static URI createURI(String str)
{
try
{
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/util/TimeAmountInterpreter.java
+2 -13
View File
@@ -13,7 +13,6 @@ package com.l2jmobius.gameserver.util;
import static java.util.concurrent.TimeUnit.DAYS;
import static java.util.concurrent.TimeUnit.MILLISECONDS;
import static java.util.concurrent.TimeUnit.NANOSECONDS;
import java.io.IOException;
import java.util.Locale;
@@ -32,16 +31,6 @@ public class TimeAmountInterpreter
// utility class
}
/**
* Calls {@link #consolidate(long, TimeUnit)} with {@link TimeUnit#NANOSECONDS}.
* @param timeAmountInNanos amount of time in nanoseconds
* @return an user-friendly description of the given time amount
*/
public static String consolidateNanos(long timeAmountInNanos)
{
return consolidate(timeAmountInNanos, NANOSECONDS);
}
/**
* Calls {@link #consolidate(long, TimeUnit)} with {@link TimeUnit#MILLISECONDS}.
* @param timeAmountInMillis amount of time in milliseconds
@@ -58,7 +47,7 @@ public class TimeAmountInterpreter
* @param timeUnit unit of the given amount
* @return an user-friendly description of the given time amount
*/
public static String consolidate(long timeAmount, TimeUnit timeUnit)
private static String consolidate(long timeAmount, TimeUnit timeUnit)
{
return consolidate(timeAmount, timeUnit, timeUnit, DAYS, "0 " + timeUnit.name().toLowerCase(Locale.ENGLISH));
}
@@ -92,7 +81,7 @@ public class TimeAmountInterpreter
* @throws RuntimeException if {@code textBuilder} throws an {@link IOException}
*/
@SuppressWarnings("unchecked")
public static <T extends Appendable & CharSequence> T appendConsolidated(T textBuilder, long timeAmount, TimeUnit timeUnit, TimeUnit minConsolidationUnit, TimeUnit maxConsolidationUnit, String noTimeUsedIndicator) throws RuntimeException
private static <T extends Appendable & CharSequence> T appendConsolidated(T textBuilder, long timeAmount, TimeUnit timeUnit, TimeUnit minConsolidationUnit, TimeUnit maxConsolidationUnit, String noTimeUsedIndicator) throws RuntimeException
{
try
{
L2J_Mobius_C6_Interlude/java/com/l2jmobius/loginserver/ui/frmAbout.java
+3 -3
View File
@@ -37,8 +37,8 @@ import javax.swing.WindowConstants;
public class frmAbout
{
private JFrame frmAbout;
static final String URL = "www.l2jmobius.com";
URI uri;
private static final String URL = "www.l2jmobius.com";
final URI uri;
public frmAbout()
{
@@ -101,7 +101,7 @@ public class frmAbout
frmAbout.setLocationRelativeTo(null);
}
public static URI createURI(String str)
private static URI createURI(String str)
{
try
{