Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
G
Grasscutter
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
ziqian zhang
Grasscutter
Commits
a90455a7
Unverified
Commit
a90455a7
authored
2 years ago
by
Melledy
Browse files
Options
Downloads
Patches
Plain Diff
Add `-game` and `-dispatch` startup arguments that override the run mode in the config
parent
0d64e2e8
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/main/java/emu/grasscutter/Grasscutter.java
+6
-1
6 additions, 1 deletion
src/main/java/emu/grasscutter/Grasscutter.java
src/main/java/emu/grasscutter/utils/StartupArguments.java
+5
-0
5 additions, 0 deletions
src/main/java/emu/grasscutter/utils/StartupArguments.java
with
11 additions
and
1 deletion
src/main/java/emu/grasscutter/Grasscutter.java
+
6
−
1
View file @
a90455a7
...
...
@@ -56,6 +56,7 @@ public final class Grasscutter {
private
static
Language
language
;
public
static
final
File
configFile
=
new
File
(
"./config.json"
);
@Setter
private
static
ServerRunMode
runModeOverride
=
null
;
// Config override for run mode
private
static
int
day
;
// Current day of week.
@Getter
@Setter
private
static
String
preferredLanguage
;
...
...
@@ -141,7 +142,7 @@ public final class Grasscutter {
httpServer
.
addRouter
(
DocumentationServerHandler
.
class
);
// Start servers.
var
runMode
=
SERVER
.
r
unMode
;
var
runMode
=
Grasscutter
.
getR
unMode
()
;
if
(
runMode
==
ServerRunMode
.
HYBRID
)
{
httpServer
.
start
();
gameServer
.
start
();
...
...
@@ -245,6 +246,10 @@ public final class Grasscutter {
public
static
Language
getLanguage
(
String
langCode
)
{
return
Language
.
getLanguage
(
langCode
);
}
public
static
ServerRunMode
getRunMode
()
{
return
Grasscutter
.
runModeOverride
!=
null
?
Grasscutter
.
runModeOverride
:
SERVER
.
runMode
;
}
public
static
Logger
getLogger
()
{
return
log
;
...
...
This diff is collapsed.
Click to expand it.
src/main/java/emu/grasscutter/utils/StartupArguments.java
+
5
−
0
View file @
a90455a7
...
...
@@ -4,6 +4,7 @@ import ch.qos.logback.classic.Level;
import
ch.qos.logback.classic.Logger
;
import
emu.grasscutter.BuildConfig
;
import
emu.grasscutter.Grasscutter
;
import
emu.grasscutter.Grasscutter.ServerRunMode
;
import
emu.grasscutter.net.packet.PacketOpcodesUtils
;
import
io.javalin.core.util.JavalinLogger
;
import
org.slf4j.LoggerFactory
;
...
...
@@ -28,6 +29,10 @@ public final class StartupArguments {
"-debug"
,
StartupArguments:
:
enableDebug
,
"-lang"
,
parameter
->
{
Grasscutter
.
setPreferredLanguage
(
parameter
);
return
false
;
},
"-game"
,
parameter
->
{
Grasscutter
.
setRunModeOverride
(
ServerRunMode
.
GAME_ONLY
);
return
false
;
},
"-dispatch"
,
parameter
->
{
Grasscutter
.
setRunModeOverride
(
ServerRunMode
.
DISPATCH_ONLY
);
return
false
;
},
// Aliases.
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment