Commit Graph

27 Commits

Author SHA1 Message Date
cfuncode
2b58d69534 Improved fault tolerance for json file deserialization (#595)
* 修复一个Gson发序列化json文件的空值问题

* Improved fault tolerance for json file deserialization
2022-05-06 13:39:37 -07:00
Melledy
1ea24be087 Fix jline in eclipse 2022-05-03 23:24:02 -07:00
方块君
085ebf61cc Add some text to language file 2022-05-03 22:17:41 -07:00
Presiareen
3cc67a849d improve server side command line input (#415)
* improve server side command line input

* prevent multiline logs from covering typed commands

* reduce text in console

* resolve conflicts caused by multilanguage

Co-authored-by: Magix <kobedo11@gmail.com>
2022-05-03 14:44:52 +02:00
mingjun97
1c8f272fee Carry to new line for messages in MessageHandler 2022-05-03 02:16:44 -07:00
mingjun97
0adafd6076 Enable plugins to hook server message response
* Add message handler so that the plugin can hook inside the `dropMessage` method for `Player` instance.
2022-05-03 02:16:44 -07:00
KingRainbow44
47cf1e5898 Merge branch 'development' into api
# Conflicts:
#	src/main/java/emu/grasscutter/Grasscutter.java
2022-04-29 19:31:33 -04:00
Melledy
6673876abf Merge branch 'development' into dungeon-scripts 2022-04-28 22:21:26 -07:00
KingRainbow44
ffe215a739 Merge branch 'development' into api 2022-04-28 21:53:58 -04:00
Kengxxiao
e85252fb14 shop improvement 2022-04-28 13:30:50 -07:00
Melledy
17addc1522 Implement dungeon entry 2022-04-28 08:20:37 -07:00
KingRainbow44
38b782e5c3 Merge branch 'development' into api
# Conflicts:
#	src/main/java/emu/grasscutter/plugin/api/ServerHook.java
2022-04-27 14:05:34 -04:00
Melledy
556018d9a9 Renamed all references to a certain game 2022-04-26 21:27:35 -07:00
KingRainbow44
cf7fae8d06 woo back to generics 2022-04-26 20:47:45 -04:00
KingRainbow44
f1623e9eab Use a custom consumer instead of the built-in one 2022-04-26 20:28:13 -04:00
Yazawazi
619b84027f DateHelper 2022-04-27 07:01:05 +08:00
Yazawazi
3ed20338ed date helper 2022-04-27 06:12:35 +08:00
WetABQ
b392849577 [BREAKING CHANGE] proto auto compiled by gradle (#226)
* [BREAK] proto auto compiled by gradle

* [BREAK] move proto to submodule

* update gitmodules

* [BREAK] move proto to submodule

* move proto to submodule

* fix merge conflict

* fix github action after merging

* fix merge conflicts and del submodule

* upload the proto
2022-04-26 14:44:30 -07:00
Melledy
3b414cda38 Natural spawn test
(without luas)
2022-04-25 14:28:44 -07:00
KingRainbow44
ec6a54ebd7 Merge origin/development into plugin-system 2022-04-23 00:55:31 -04:00
KingRainbow44
6243c4e6e8 Basic plugin manager 2022-04-22 21:45:44 -04:00
Sam
21f82519cf [typo-upd] Add missing folder 2022-04-22 17:43:06 +08:00
Sam
9715c1d646 [typo] Fix resources folder tips 2022-04-22 17:36:24 +08:00
Melledy
c4ccb298f9 Refactor some commands and move inventory/team limits to the config 2022-04-19 02:22:21 -07:00
Melledy
cd81494b8f Merge branch 'main' into dev-scene 2022-04-18 21:35:01 -07:00
KingRainbow44
54854e5c17 Refactor existing code 2022-04-18 01:11:27 -04:00
Melledy
3b45ff7d46 Initial commit 2022-04-17 05:43:07 -07:00