Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
ziqian zhang
Grasscutter
Commits
eaed1aa0
Commit
eaed1aa0
authored
Apr 29, 2022
by
xtaodada
Browse files
Change NickName to ServerNickname
parent
62f0be49
Changes
2
Show whitespace changes
Inline
Side-by-side
src/main/java/emu/grasscutter/Config.java
View file @
eaed1aa0
...
@@ -51,7 +51,6 @@ public final class Config {
...
@@ -51,7 +51,6 @@ public final class Config {
public
static
class
GameServerOptions
{
public
static
class
GameServerOptions
{
public
String
Name
=
"Test"
;
public
String
Name
=
"Test"
;
public
String
NickName
=
"Server"
;
public
String
Ip
=
"0.0.0.0"
;
public
String
Ip
=
"0.0.0.0"
;
public
String
PublicIp
=
"127.0.0.1"
;
public
String
PublicIp
=
"127.0.0.1"
;
public
int
Port
=
22102
;
public
int
Port
=
22102
;
...
@@ -71,6 +70,7 @@ public final class Config {
...
@@ -71,6 +70,7 @@ public final class Config {
public
int
MaxAvatarsInTeamMultiplayer
=
4
;
public
int
MaxAvatarsInTeamMultiplayer
=
4
;
public
int
MaxEntityLimit
=
1000
;
// Max entity limit per world. // TODO: Enforce later.
public
int
MaxEntityLimit
=
1000
;
// Max entity limit per world. // TODO: Enforce later.
public
boolean
WatchGacha
=
false
;
public
boolean
WatchGacha
=
false
;
public
String
ServerNickname
=
"Server"
;
public
int
ServerAvatarId
=
10000007
;
public
int
ServerAvatarId
=
10000007
;
public
int
[]
WelcomeEmotes
=
{
2007
,
1002
,
4010
};
public
int
[]
WelcomeEmotes
=
{
2007
,
1002
,
4010
};
public
String
WelcomeMotd
=
"Welcome to Grasscutter emu"
;
public
String
WelcomeMotd
=
"Welcome to Grasscutter emu"
;
...
...
src/main/java/emu/grasscutter/GameConstants.java
View file @
eaed1aa0
...
@@ -11,8 +11,8 @@ public final class GameConstants {
...
@@ -11,8 +11,8 @@ public final class GameConstants {
public
static
final
int
MAX_TEAMS
=
4
;
public
static
final
int
MAX_TEAMS
=
4
;
public
static
final
int
MAIN_CHARACTER_MALE
=
10000005
;
public
static
final
int
MAIN_CHARACTER_MALE
=
10000005
;
public
static
final
int
MAIN_CHARACTER_FEMALE
=
10000007
;
public
static
final
int
MAIN_CHARACTER_FEMALE
=
10000007
;
public
static
final
String
SERVER_AVATAR_NAME
=
Grasscutter
.
getConfig
().
getGameServerOptions
().
ServerNickname
;
public
static
final
int
SERVER_AVATAR_ID
=
Grasscutter
.
getConfig
().
getGameServerOptions
().
ServerAvatarId
;
public
static
final
int
SERVER_AVATAR_ID
=
Grasscutter
.
getConfig
().
getGameServerOptions
().
ServerAvatarId
;
public
static
final
String
SERVER_AVATAR_NAME
=
Grasscutter
.
getConfig
().
getGameServerOptions
().
NickName
;
public
static
final
Position
START_POSITION
=
new
Position
(
2747
,
194
,
-
1719
);
public
static
final
Position
START_POSITION
=
new
Position
(
2747
,
194
,
-
1719
);
public
static
final
int
MAX_FRIENDS
=
45
;
public
static
final
int
MAX_FRIENDS
=
45
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment