Separated interface configuration.

This commit is contained in:
MobiusDevelopment
2021-05-02 23:30:32 +00:00
parent 0a86b20c17
commit 8d263dc0b4
165 changed files with 991 additions and 1164 deletions

View File

@@ -0,0 +1,15 @@
# ---------------------------------------------------------------------------
# Interface Settings
# ---------------------------------------------------------------------------
# Enable L2jMobius GUI when OS supports it.
# Provides access to admin commands without the need to be online.
# Warning! Do not disable if you use Gameserver.exe
# because server will run in the background!
# Default: True
EnableGUI = True
# Dark theme.
# Use a dark version of the Nimbus theme.
# Default: True
DarkTheme = True

View File

@@ -134,23 +134,6 @@ InstantThreadPoolCount = 120
UrgentPacketThreadCoreSize = 40
# ---------------------------------------------------------------------------
# Look and feel
# ---------------------------------------------------------------------------
# Enable L2jMobius GUI when OS supports it.
# Provides access to admin commands without the need to be online.
# Warning! Do not disable if you use Gameserver.exe
# because server will run in the background!
# Default: True
EnableGUI = True
# Dark theme.
# Use a dark version of the Nimbus theme.
# Default: True
DarkTheme = True
# ---------------------------------------------------------------------------
# Misc Player Settings
# ---------------------------------------------------------------------------

View File

@@ -0,0 +1,15 @@
# ---------------------------------------------------------------------------
# Interface Settings
# ---------------------------------------------------------------------------
# Enable L2jMobius GUI when OS supports it.
# Provides access to admin commands without the need to be online.
# Warning! Do not disable if you use Gameserver.exe
# because server will run in the background!
# Default: True
EnableGUI = True
# Dark theme.
# Use a dark version of the Nimbus theme.
# Default: True
DarkTheme = True

View File

@@ -60,23 +60,6 @@ Password =
MaximumDbConnections = 10
# ---------------------------------------------------------------------------
# Look and feel
# ---------------------------------------------------------------------------
# Enable L2jMobius GUI when OS supports it.
# Provides access to admin commands without the need to be online.
# Warning! Do not disable if you use Gameserver.exe
# because server will run in the background!
# Default: True
EnableGUI = True
# Dark theme.
# Use a dark version of the Nimbus theme.
# Default: True
DarkTheme = True
# ---------------------------------------------------------------------------
# Automatic Database Backup Settings
# ---------------------------------------------------------------------------

View File

@@ -1,128 +0,0 @@
#=========================================#
# MMOCore Connection Settings #
#=========================================#
# ---------------------------- #
# Debug and Develop logging #
# ---------------------------- #
EnableMMOCoreDebug = False
EnableMMOCoreDevelop = False
EnableMMOCoreExceptions = False
PacketHandlerDebug = False
# ----------------------------
# Config BackLog
# ----------------------------
# Maximum length of request.
# The maximum length for incoming requests (connection request).
# Maximum number of requests, after which the requests
# Will not be accepted.
# The default is 50
# Must be equal to the estimated number of players.
# Example: Players in the game 1000 +, NetworkBackLog = 1000
# NetworkBackLog = 50
# ----------------
# Set TOS
# ----------------
# Set the traffic going to a particular socket.
# Can be ignored JAVA-machine.
# Range: 0 <= tc <= 255 or a ban happens.
# Note:
# To TCP4 should be set high priority and should be RFC 1349.
# You can also create a type priorities bit, example:
# IPTOS_LOWCOST (0x02)
# IPTOS_RELIABILITY (0x04)
# IPTOS_THROUGHPUT (0x08)
# IPTOS_LOWDELAY (0x10)
# The lowest bit is ignored (0).
# Set bits in the priority may cause the collapse of the server.
# depends on the service and platform.
# Note:
# Applications can not change GameServer after connecting.
# To TCP6 value can be found in the header sin6_flowinfo.
# NetworkIpTOS = 0
# ---------------------------------------
# Setting TCP_NODELAY
# ---------------------------------------
# On / Off TCP_NODELAY
#NetworkTcpNoDelay = False
# -------------------------------
# Setting KeepAlive
# -------------------------------
# On / Off SO_KEEPALIVE
#NetworkKeepAlive = False
# ------------------------
# Set a timeout
# ------------------------
# Set a timeout in milliseconds.
# If set to 0, the timeout will be standard.
# Timeout must be greater than 0.
# Zero timeout is defined as an infinite timeout.
#NetworkSoTimeOut = 0
# ---------------------------------------------------
# Configure repetitions Adresses
# ---------------------------------------------------
# On / Off option.
# If the connection is closed, then turn timeout.
#NetworkSoReuseAddr = True
# --------------------------------------
# Set buffer compounds
# --------------------------------------
# Buffer size in kbit (kilobits)
# By default (Windows) - 64KBits
# Default (* nix) - 128KBits
#NetworkReadBufferSize = 64
#NetworkWriteBufferSize = 64
#NetworkHelperBufferSize = 64
# The size of the auxiliary buffer
#NetworkHelperBufferCount = 20
# --------------------------
# Client Queue Configuration
# --------------------------
# Queue size, do not set it too low !
# Default: 14
ClientPacketQueueSize = 14
# Maximum number of packets in burst.
# Execution will be aborted and thread released if more packets executed in raw.
# Default: 50
ClientPacketQueueMaxBurstSize = 50
# Maximum number of packets per second.
# Flood detector will be triggered if more packets received.
# After triggering all incoming packets will be dropped until flooding stopped.
# Default: 80
ClientPacketQueueMaxPacketsPerSecond = 80
# Average number of packets per second calculated during this interval.
# Using larger value decrease number of false kicks, but slower reaction to flood.
# Avoid using too low or too high values, recommended between 3 and 10.
# Default: 5
ClientPacketQueueMeasureInterval = 5
# Maximum average number of packets per second during measure interval.
# Flood detector will be triggered if more packets received.
# After triggering all incoming packets will be dropped until flooding stopped.
# Default: 40
ClientPacketQueueMaxAveragePacketsPerSecond = 40
# Maximum number of flood triggers per minute.
# Client will be kicked if more floods detected.
# Default: 2
ClientPacketQueueMaxFloodPerMin = 6
# Maximum number of queue overflows per minute.
# After overflow all incoming packets from client are dropped until queue is flushed.
# Client will be kicked if more queue overflows detected.
# Default: 50
ClientPacketQueueOverflowsPerMin = 50
# Maximum number of buffer underflows per minute.
# Client will be kicked if more underflow exceptions detected.
# Default: 1
ClientPacketQueueUnderflowsPerMin = 1
# Maximum number of unknown packets per minute.
# Client will be kicked if more unknown packets received.
# Default: 5
ClientPacketQueueUnknownPerMin = 5

View File

@@ -58,6 +58,8 @@ public class Config
// standard
private static final String FILTER_FILE = "./config/chatfilter.txt";
private static final String HEXID_FILE = "./config/hexid.txt";
// interface
public static final String INTERFACE_CONFIG_FILE = "./config/Interface.ini";
// main
private static final String ACCESS_CONFIG_FILE = "./config/main/Access.ini";
private static final String CHARACTER_CONFIG_FILE = "./config/main/Character.ini";
@@ -74,7 +76,7 @@ public class Config
private static final String PVP_CONFIG_FILE = "./config/main/PvP.ini";
private static final String RAIDBOSS_CONFIG_FILE = "./config/main/RaidBoss.ini";
private static final String RATES_CONFIG_FILE = "./config/main/Rates.ini";
public static final String SERVER_CONFIG_FILE = "./config/main/Server.ini";
private static final String SERVER_CONFIG_FILE = "./config/main/Server.ini";
private static final String SEVENSIGNS_CONFIG_FILE = "./config/main/SevenSigns.ini";
public static final String SIEGE_CONFIG_FILE = "./config/main/Siege.ini";
// protected
@@ -1128,8 +1130,6 @@ public class Config
public static int SCHEDULED_THREAD_POOL_COUNT;
public static int INSTANT_THREAD_POOL_COUNT;
public static int IO_PACKET_THREAD_CORE_SIZE;
public static boolean ENABLE_GUI;
public static boolean DARK_THEME;
public static String CNAME_TEMPLATE;
public static String PET_NAME_TEMPLATE;
public static String CLAN_NAME_TEMPLATE;
@@ -1160,6 +1160,9 @@ public class Config
public static long SESSION_TTL;
public static int MAX_LOGINSESSIONS;
public static boolean ENABLE_GUI;
public static boolean DARK_THEME;
public static void loadAccessConfig()
{
final PropertiesParser accessConfig = new PropertiesParser(ACCESS_CONFIG_FILE);

View File

@@ -148,11 +148,11 @@ public class GameServer
final long serverLoadStart = Chronos.currentTimeMillis();
// GUI
final PropertiesParser serverSettings = new PropertiesParser(Config.SERVER_CONFIG_FILE);
Config.ENABLE_GUI = serverSettings.getBoolean("EnableGUI", true);
final PropertiesParser interfaceSettings = new PropertiesParser(Config.INTERFACE_CONFIG_FILE);
Config.ENABLE_GUI = interfaceSettings.getBoolean("EnableGUI", true);
if (Config.ENABLE_GUI && !GraphicsEnvironment.isHeadless())
{
Config.DARK_THEME = serverSettings.getBoolean("DarkTheme", true);
Config.DARK_THEME = interfaceSettings.getBoolean("DarkTheme", true);
System.out.println("GameServer: Running in GUI mode.");
new Gui();
}