Commit Graph

673 Commits

Author SHA1 Message Date
Melledy
c1e69ce343 Implement script support needed for dungeons
Only a few are supported right now
You will need certain script files in ./resources/Scripts
2022-04-28 22:19:14 -07:00
KingRainbow44
7e4021889c
Player events + mail receive event 2022-04-28 22:21:55 -04:00
KingRainbow44
2e119efb86
Formatting changes 2022-04-28 22:21:30 -04:00
KingRainbow44
b811300742
Move events (imports) 2022-04-28 22:13:19 -04:00
KingRainbow44
3ef052d7b1
Move events 2022-04-28 22:12:57 -04:00
KingRainbow44
f37ab46139
Player join & quit event 2022-04-28 22:12:41 -04:00
KingRainbow44
d1ec5b3553
Add plugin data folders 2022-04-28 22:01:40 -04:00
KingRainbow44
e2d6e695dc
Bug fixes & class updates 2022-04-28 21:54:51 -04:00
KingRainbow44
ffe215a739
Merge branch 'development' into api 2022-04-28 21:53:58 -04:00
memetrollsXD
a7190ea69d
Merge branch 'development' into startMail 2022-04-28 22:45:23 +02:00
memetrollsXD
808d59732d Customisable welcome mail 2022-04-28 22:42:59 +02:00
Kengxxiao
0dd4bb6082 fix shop config issue 2022-04-28 13:30:50 -07:00
Kengxxiao
e85252fb14 shop improvement 2022-04-28 13:30:50 -07:00
Kengxxiao
39d2380754 official shop support 2022-04-28 13:30:50 -07:00
Kengxxiao
cf5e4ef186 Add command /coop and /tpall 2022-04-28 21:23:20 +02:00
ayy lmao
47b0ee2883 Implement HandlerVehicleInteractReq & Rsp and HandlerVehicleSpawnReq & Rsp
Also added opcodes related to vehicles, added LODPatternName to GadgetData and added EntityVehicle class
2022-04-28 21:21:08 +02:00
omg-xtao
f9cf8f4895 Ignore item not found error 2022-04-28 08:43:17 -07:00
Melledy
17addc1522 Implement dungeon entry 2022-04-28 08:20:37 -07:00
Kengxxiao
f0df78a81a fix companionship exp
my IDEA lint is not happy on my change
2022-04-28 06:50:37 -07:00
Kengxxiao
b37c5d89eb do not save virtual item 2022-04-28 06:50:37 -07:00
Kengxxiao
bb645671f2 fix exp drop issue 2022-04-28 06:50:37 -07:00
BaiSugar
5a422ef5ff Update the command format of the usage (including source code) 2022-04-28 13:47:32 +02:00
Melledy
28d9c68bc4 Fix missing player tick function 2022-04-27 19:37:25 -07:00
Melledy
be15193bb4
Merge pull request #318 from Yazawazi/development
Implementing the `Player Show Avatars`
2022-04-27 15:50:53 -07:00
memetrollsXD
d6229f6d15 God damn forgot I was in java for a sec 2022-04-27 15:42:25 -07:00
memetrollsXD
c352889442 Remove default permissions from account command 2022-04-27 15:42:25 -07:00
memetrollsXD
3414f28a81 Apply to account command 2022-04-27 15:42:25 -07:00
memetrollsXD
59044743a4 Add default permissions 2022-04-27 15:42:25 -07:00
Yazawazi
c2a159be13
Should be OK 2022-04-28 06:40:25 +08:00
memetrollsXD
4116b0e89c God damn forgot I was in java for a sec 2022-04-28 00:30:04 +02:00
memetrollsXD
471f5f053b Remove default permissions from account command 2022-04-28 00:28:16 +02:00
memetrollsXD
65913fcfe7 Apply to account command 2022-04-28 00:18:59 +02:00
memetrollsXD
fd333733ef Add default permissions 2022-04-28 00:10:46 +02:00
Yazawazi
ba95637dd3
kill me plz 2022-04-28 03:46:24 +08:00
Yazawazi
a4cbf1a58e
no headimage okay 2022-04-28 03:45:17 +08:00
Yazawazi
97086d7baa
Headimage 2022-04-28 03:40:32 +08:00
Yazawazi
6e73d4221d
Next time I'll never use github.dev again 2022-04-28 03:37:09 +08:00
Yazawazi
80aaa0d856
import 2022-04-28 03:31:36 +08:00
Yazawazi
3c3c884fc1
Player show avatar list 2022-04-28 03:21:51 +08:00
Melledy
fef0f2aff7 Fix co-op requests not showing up 2022-04-27 11:23:33 -07:00
Melledy
bec30c24c9 Add message about the server being free 2022-04-27 11:23:33 -07:00
Melledy
fcb50414f0 Fixed concurrency issue in killall 2022-04-27 11:23:33 -07:00
Melledy
e34ab885a3 Fixed genesis crystals not being given to player 2022-04-27 11:23:33 -07:00
Melledy
99fe453658 Gacha banner tweaks
Removed min/maxItemType
Added configurable base weight values for banners
2022-04-27 11:23:33 -07:00
Melledy
17d2c6cc74 Fix internal server error when changing characters 2022-04-27 11:23:33 -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
Yazawazi
411a6c0715 comment & mooncard 2022-04-27 08:42:48 -07:00
Yazawazi
63b70497f0 onEnable & onDisable 2022-04-27 08:42:48 -07:00
Yazawazi
707147ba78 Task Improvement 2022-04-27 08:42:48 -07:00
Kengxxiao
27ac32a42b
Merge branch 'development' into dev-feature-drop 2022-04-27 22:54:59 +08:00
Kengxxiao
60a36282c4 use better shop config structure 2022-04-27 07:35:31 -07:00
Kengxxiao
842acabe5a implement npc shop 2022-04-27 07:35:31 -07:00
ayy lmao
ca7c335c94 Added missing isGiftMail section to GetAllMailRsp 2022-04-27 15:11:57 +02:00
Kengxxiao
c0b6193220 reset drop table in reload command 2022-04-27 17:44:12 +08:00
Kengxxiao
08062b6da9 implement simple drop system 2022-04-27 17:42:02 +08:00
Magix
317bf5c78b Update Grasscutter.java
why do i have to fix stable
2022-04-27 11:33:36 +02:00
Melledy
4480ce14a7 Moved some files around 2022-04-26 21:27:35 -07:00
Melledy
556018d9a9 Renamed all references to a certain game 2022-04-26 21:27:35 -07:00
Melledy
07b4dc95ea Deprecate getServer() in DispatchServer, use getHttpServer() instead 2022-04-26 21:27:35 -07:00
Melledy
691324c9e7 Cleanup https server creation in dispatch server 2022-04-26 21:27:35 -07:00
Melledy
931894aacf Fix cherry pick issues from drown packets 2022-04-26 21:27:35 -07:00
TheLostTree
51ab19d418 git doesnt like me 2022-04-26 21:27:35 -07:00
TheLostTree
a179caa44e drowning added 2022-04-26 21:27:35 -07:00
Melledy
8105d2a7a9 Call PacketItemAddHintNotify from addItem 2022-04-26 21:27:35 -07:00
Melledy
6fbe2f13d3 Rename handler 2022-04-26 21:27:35 -07:00
Melledy
2b69978327 World level updates without needing to restart 2022-04-26 21:27:35 -07:00
Melledy
be307fe5f0 Fix white screen after logging in 2022-04-26 21:27:35 -07:00
KingRainbow44
5b351b955c
Add get methods to the server hook 2022-04-26 21:24:37 -04:00
KingRainbow44
34c358669b
Added getting resources from the JAR 2022-04-26 21:24:09 -04:00
Benjamin Elsdon
e4899034b2 GenshinPlayer fix (for two issues) and updated sendmail with Magix's suggestions 2022-04-27 09:03:26 +08:00
KingRainbow44
54658afe68
gave up, Pass class as argument to constructor 2022-04-26 20:54:56 -04:00
KingRainbow44
cf7fae8d06
woo back to generics 2022-04-26 20:47:45 -04:00
KingRainbow44
7ac31d9991
Add dispatch to server hook & create instance 2022-04-26 20:47:28 -04:00
Benjamin Elsdon
63d0db376a Merge remote-tracking branch 'upstream/development' into dev-mail 2022-04-27 08:41:10 +08:00
Benjamin Elsdon
98bb7e9bc4 Removed debug messages, readded protos, fixed gradle 2022-04-27 08:36:13 +08:00
KingRainbow44
f1623e9eab
Use a custom consumer instead of the built-in one 2022-04-26 20:28:13 -04:00
KingRainbow44
7f5cd1065d
Fix handler invocation 2022-04-26 19:58:03 -04:00
KingRainbow44
9c28ceb8bf
Fix handler creation 2022-04-26 19:57:32 -04:00
Melledy
34da64b462
Merge pull request #270 from Yazawazi/development
Add `bless of moon` feature
2022-04-26 16:39:57 -07:00
Benjamin Elsdon
2ed6fbc1da Merge remote-tracking branch 'upstream/development' into dev-mail 2022-04-27 07:37:05 +08:00
Yazawazi
8afdc90f58 cron expression comments 2022-04-27 07:19:30 +08:00
Yazawazi
00e88be464 comments del 2022-04-27 07:14:02 +08:00
Yazawazi
4d23d90252 comments 2022-04-27 07:08:33 +08:00
Yazawazi
619b84027f DateHelper 2022-04-27 07:01:05 +08:00
Magix
9f7c52c45e
Merge pull request #178 from BaiSugar/development
Added command to get all items
2022-04-26 18:45:08 -04:00
Yazawazi
f28926c645
del outerclass 2022-04-27 06:25:00 +08:00
Yazawazi
c3f25edff3
utils 2022-04-27 06:15:59 +08:00
Yazawazi
3ed20338ed
date helper 2022-04-27 06:12:35 +08:00
Yazawazi
383356deb0
Moon Card 2022-04-27 06:04:21 +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
KingRainbow44
60c93932ad
Fix handlers 2022-04-26 14:09:00 -04:00
KingRainbow44
26db170a1e
Fix Javadoc & Update version 2022-04-26 14:08:48 -04:00
KingRainbow44
727fa8a67d
Overhaul event handling (designed by WetABQ#3417) 2022-04-26 13:52:10 -04:00
Magix
30d4fec9d4
Merge branch 'api' into development 2022-04-26 11:17:02 -04:00
Magix
7739fc1aeb
Merge pull request #262 from exzork/plugin-system
load all classes from plugin
2022-04-26 10:27:36 -04:00
muhammadeko
2bd470c574
load all classes from plugin 2022-04-26 19:45:23 +07:00
BaiSugar
0132ad66ab remove test avatar 2022-04-26 16:35:06 +08:00
Benjamin Elsdon
a2b6633797 Merge remote-tracking branch 'upstream/development' into dev-mail 2022-04-26 15:45:58 +08:00
KingRainbow44
9fd5aef687
Add more events 2022-04-26 02:07:00 -04:00
KingRainbow44
3f8e1ea9d2
Reimplement the region list event 2022-04-26 00:45:42 -04:00
KingRainbow44
9ee8974fea
Begin on plugin API 2022-04-26 00:39:43 -04:00
KingRainbow44
f176408d41
Bug fix & Cleanup 2022-04-26 00:39:30 -04:00
KingRainbow44
779ea8cdb1
Fix command issue 2022-04-26 00:39:05 -04:00
KingRainbow44
9af4cc2446
Refactor classes 2022-04-26 00:04:03 -04:00
Benjamin Elsdon
028c7e5604 Merge remote-tracking branch 'upstream/development' into dev-mail 2022-04-26 11:59:16 +08:00
Benjamin Elsdon
7015905991 Improvements and send all mail fix
Mail ID no longer exists and is handled by it's position in the mail array
2022-04-26 11:57:55 +08:00
Melledy
459d3c2699 Add getter for DispatchServer's HttpServer 2022-04-25 14:34:37 -07:00
Melledy
f0ae673091 Fix concurrency related error while spawning monsters 2022-04-25 14:28:45 -07:00
Melledy
2b75cda6df Call checkSpawns from World instead of from Player 2022-04-25 14:28:45 -07:00
Melledy
080fdeeef6 Synchronize scene entity map 2022-04-25 14:28:45 -07:00
Melledy
a9b7a5a5f6 Make monsters scale off world level 2022-04-25 14:28:45 -07:00
Melledy
b0322fa3e5 Dont deregister scenes if the player is going to tp back into them 2022-04-25 14:28:44 -07:00
Melledy
3b414cda38 Natural spawn test
(without luas)
2022-04-25 14:28:44 -07:00
Magix
b857601b78
Merge branch 'development' into plugin-system 2022-04-25 17:08:18 -04:00
dbb7350f6f Support kill from console 2022-04-25 11:01:18 -07:00
76e2fa59d8 Add a new alias to the command killcharacter 2022-04-25 11:01:18 -07:00
f3240fc53f Add killcharacter command 2022-04-25 11:01:18 -07:00
alt3ri
37b875717f Merged /clearartifacts and /clearweapons
I merged ClearArtifactsCommand and ClearWeaponsCommand to ClearCommand with UID parameter. Still no send from console cuz I forgor 💀
Usage: /clear <wp | art | mat | all> [uid]
2022-04-25 11:00:10 -07:00
alt3ri
dbca694a78 Delete ClearArtifactsCommand.java 2022-04-25 11:00:10 -07:00
alt3ri
0ecde3d82f Delete ClearWeaponsCommand.java 2022-04-25 11:00:10 -07:00
Benjamin Elsdon
ae190f3fa0 Send Mail Command!
Almost done! Wooooo!
2022-04-25 21:53:10 +08:00
Benjamin Elsdon
254a779bf7 Forgot to implement levels into GetMailItemRsp
Also added promoteLevels
2022-04-25 16:42:56 +08:00
Benjamin Elsdon
f18068bc16 More weird git stuff 2022-04-25 16:32:26 +08:00
Benjamin Elsdon
43ef6ff9c5 Weird git stuff 2022-04-25 16:25:33 +08:00
Benjamin Elsdon
6861a56a7b Added ChangeMailStarNotify (change importance level) 2022-04-25 16:23:23 +08:00
Benjamin Elsdon
c0d4ca5e09 Mail read notify 2022-04-25 16:23:23 +08:00
Benjamin Elsdon
15d1159509 Deleting mail + a bit of cleanup 2022-04-25 16:23:22 +08:00
Benjamin Elsdon
ced5fc38be Receiving items in mail 2022-04-25 16:22:13 +08:00
Benjamin Elsdon
4e3a1c769f THE MAILBOX ACTUALLY WORKS CORRECTLY NOW 2022-04-25 16:22:12 +08:00
Benjamin Elsdon
30bc3a8ad1 Java-16 compatiable mail system (whoops) 2022-04-25 16:22:12 +08:00
Benjamin Elsdon
b1f34f4fbe Added database support for mail
Send mail command now works from console (to use it from console change the uuid in the 'SendMailCommand' file
2022-04-25 16:22:12 +08:00
Benjamin Elsdon
d0538f7aee Added GetMailItemReq/Rsp & PacketMailChangeNotify
Mail still doesn't work for whatever reason. I also added a temporary SendMailCommand just to receive PacketMailChangeNotify.
I feel like I'm about to lose my mind.
2022-04-25 16:18:23 +08:00
Benjamin Elsdon
dd42d3b027 Initial work on mail 2022-04-25 16:18:23 +08:00
Benjamin Elsdon
1e4c4f96ae Update protos 2022-04-25 16:18:23 +08:00
Benjamin Elsdon
2e26e16d4d Added ChangeMailStarNotify (change importance level) 2022-04-25 16:11:57 +08:00
Melledy
70ca853e5e Merge branch 'stable' into development 2022-04-25 00:58:53 -07:00
Asnxthaony
bc3fa67408 fix indent by using smart tabs 2022-04-25 00:54:11 -07:00
Asnxthaony
25111ed907 sanity check 2022-04-25 00:54:11 -07:00
Asnxthaony
6350d83ad0 fix SetPlayerBirthdayRsp 2022-04-25 00:54:11 -07:00
Benjamin Elsdon
3a677ff6d2 Mail read notify 2022-04-25 15:41:18 +08:00
BaiSugar
1567e480e1 remove test avatar 2022-04-25 15:17:55 +08:00
Benjamin Elsdon
ffe96fe93a Deleting mail + a bit of cleanup 2022-04-25 14:30:56 +08:00
Benjamin Elsdon
850b3d20ff Receiving items in mail 2022-04-25 13:51:19 +08:00
Yan
0cdc6115d4 fix setting electro dmg stat 2022-04-24 17:57:42 -07:00
alangy98
dce63b0760 Revert "bugfix: portbind error when falling back to http server"
This reverts commit c14eb2204b.
the bugfix is inappropriate
2022-04-24 17:57:18 -07:00
alt3ri
5d637ed559 Added UID parameter
Now you can delete other player's weapons with UID
Usage: /clearwp [uid]
2022-04-24 17:56:49 -07:00
Yazawazi
f46650c983 add setfriendship aliases 2022-04-24 10:32:47 -07:00
Alangy
c14eb2204b bugfix: portbind error when falling back to http server 2022-04-24 23:05:08 +08:00
BaiSugar
05c6b29831 fix 2022-04-24 22:49:33 +08:00
BaiSugar
1132c2c753 Corrected format 2022-04-24 22:46:43 +08:00
BaiSugar
5eccbc8565 Corrected format 2022-04-24 22:45:30 +08:00
BaiSugar
271f9b9ec5 Revert "Corrected format"
This reverts commit 153593b64c.
2022-04-24 22:42:44 +08:00
BaiSugar
153593b64c Corrected format 2022-04-24 22:38:53 +08:00
Melledy
d04a4856df
Merge pull request #180 from Yazawazi/development
Fix the property prompt issue in fetter system
2022-04-24 07:21:34 -07:00
Melledy
146b1ebb6f
Merge pull request #167 from memetrollsXD/development
Try to fix "No SSL cert found bind exception"
2022-04-24 07:16:05 -07:00
BaiSugar
95871abb5b Added command to get all items 2022-04-24 21:52:50 +08:00
Benjamin Elsdon
c7096f9e49 THE MAILBOX ACTUALLY WORKS CORRECTLY NOW 2022-04-24 19:06:52 +08:00
memetrollsXD
824e2f8f55 Add .vscode to gitignore and use @fumbling644o's implementation 2022-04-24 12:24:41 +02:00
Benjamin Elsdon
b10a889d76 Java-16 compatiable mail system (whoops) 2022-04-24 18:17:08 +08:00
Benjamin Elsdon
9e81e10e64 Merge remote-tracking branch 'upstream/development' into dev-mail 2022-04-24 18:01:32 +08:00
Yazawazi
a743155039
command fix too 2022-04-24 15:10:25 +08:00
Yazawazi
5ed49a27e0
Merge branch 'Grasscutters:development' into development 2022-04-24 15:03:58 +08:00
Melledy
3c9a2ba846
Merge pull request #175 from omg-xtao/suicide
GodMode command supports playerId
2022-04-24 00:03:21 -07:00
Yazawazi
fb9f6c0bf4
Fix fetter system 2022-04-24 15:02:31 +08:00
BaiSugar
d761b50656 Added command to get all items 2022-04-24 14:01:03 +08:00
Yazawazi
232e9a470d
Player Level Reward Update Notify Support! 2022-04-24 13:22:26 +08:00
95411a6df3
GodMode command supports playerId 2022-04-24 11:40:10 +08:00
Yazawazi
1517c567c1
Player level reward 2022-04-24 11:25:13 +08:00
memetrollsXD
40cf40ce00 Remove last catch and init another variable as placeholder 2022-04-24 04:50:22 +02:00
memetrollsXD
47d34ebcd1 Forgot the toCharArray 2022-04-24 04:41:06 +02:00
memetrollsXD
b76dec2441 Notify user that new pw was used 2022-04-24 04:36:11 +02:00
memetrollsXD
e29b6744d4 Try to fix "No SSL cert found bind exception" 2022-04-24 04:34:17 +02:00
Melledy
bae34b8072
Merge pull request #164 from miyucchi/development
Fix counter (Create a new account if exists issue)
2022-04-23 15:26:14 -07:00
Melledy
54ad583c67
Merge pull request #128 from memetrollsXD/development
Use count for level for equips (dev branch)
2022-04-23 15:15:22 -07:00
Miyucchi
c4cdc97d7b Fix counter 2022-04-24 00:10:26 +02:00
Yazawazi
523d0260d0
tp with relative coordinates 2022-04-24 05:20:59 +08:00
Yazawazi
80cb967c86
Merge branch 'Grasscutters:development' into development 2022-04-24 05:03:55 +08:00
memetrollsXD
b1508183f8
Merge branch 'Grasscutters:development' into development 2022-04-23 22:37:48 +02:00
00f2da10df
Add Teleport command 2022-04-24 03:10:07 +08:00
Yazawazi
9c920b139a
Name Card Done!!!!!!!!!!! 2022-04-23 23:48:06 +08:00
Benjamin Elsdon
7fd1e4dacb Merge remote-tracking branch 'upstream/development' into dev-mail 2022-04-23 23:07:38 +08:00
Benjamin Elsdon
903e02c538 Added database support for mail
Send mail command now works from console (to use it from console change the uuid in the 'SendMailCommand' file
2022-04-23 23:07:18 +08:00
Yazawazi
88e1a0c555
Will 2022-04-23 22:16:59 +08:00
Yazawazi
984ee9d7ea
Merge branch 'Grasscutters:development' into development 2022-04-23 22:16:21 +08:00
memetrollsXD
5d145fb1d6 Add promoteLevel and count 2022-04-23 16:11:45 +02:00
d1d2be9b16
Add another way to set talent level 2022-04-23 21:13:45 +08:00
Yazawazi
45281695fe
Try to give name card 2022-04-23 21:03:29 +08:00
Yazawazi
e970fdb60a
Merge branch 'Grasscutters:development' into development 2022-04-23 19:58:17 +08:00
Melledy
690abd647e
Merge pull request #153 from TheLostTree/main
Handle drowning
2022-04-23 04:39:02 -07:00
Melledy
f29cdd753a
Revert "Drowning packets handled" 2022-04-23 04:36:34 -07:00
TheLostTree
46aded281d git doesnt like me 2022-04-23 03:32:08 -07:00
TheLostTree
d64044f931 drowning added 2022-04-23 03:19:33 -07:00
Jaida Wu
46f40a9012
Make some control panel happy
Signed-off-by: Jaida Wu <mlgmxyysd@meowcat.org>
2022-04-23 16:47:13 +08:00
Melledy
ea9cda21e2
Merge pull request #141 from Grasscutters/bind-failure
Push a helpful error message to the console on bind failure
2022-04-23 01:14:51 -07:00
Jaida Wu
e38f5ca97b
Fix PlayerBirthday exception
Signed-off-by: Jaida Wu <mlgmxyysd@meowcat.org>
2022-04-23 15:39:56 +08:00
KingRainbow44
bba4a00508
Add message for bind failure (HTTP) 2022-04-23 02:20:18 -04:00
KingRainbow44
c31312416a
Implement packet send/receive events 2022-04-23 02:08:31 -04:00
KingRainbow44
c676bb9f08
Implement region events 2022-04-23 01:59:06 -04:00
KingRainbow44
8b34222ceb
Implement an event handler 2022-04-23 01:58:37 -04:00
KingRainbow44
2a6984229e
Plugin enabling & disabling 2022-04-23 01:17:35 -04:00
KingRainbow44
ec6a54ebd7
Merge origin/development into plugin-system 2022-04-23 00:55:31 -04:00
KingRainbow44
9b2e4e3fa9
Update Grasscutter for Java 16 & Plugins 2022-04-23 00:53:11 -04:00
Melledy
90c9af7257
Merge pull request #131 from Raeliana/patch-1
Create ClearWeaponsCommand.java
2022-04-22 21:36:52 -07:00
Melledy
473a90432f
Merge pull request #136 from miyucchi/development
Save birthday date
2022-04-22 21:35:58 -07:00
Melledy
bdfd92e7a3
Merge pull request #127 from yarik0chka/development
Implemented sitting
2022-04-22 21:34:36 -07:00
Magix
1933bfc95a
Add keystore password 2022-04-22 23:53:37 -04:00
Yazawazi
23481cfe0c
OpenCond for unlocking judgment 2022-04-23 10:51:22 +08:00
Yazawazi
eb57534a2a
Merge branch 'Grasscutters:development' into development 2022-04-23 10:43:27 +08:00
Melledy
17abf321a2 Merge branch 'development' into java-16 2022-04-22 19:23:32 -07:00
KingRainbow44
6243c4e6e8
Basic plugin manager 2022-04-22 21:45:44 -04:00
Miyucchi
6d53f2d6ac Feature: SetBirthdayDate 2022-04-23 03:29:08 +02:00
Miyucchi
e2543483ff Profile set birthday feature 2022-04-23 03:22:32 +02:00
KingRainbow44
d6653f03a7
Move manifest to resources 2022-04-22 20:42:55 -04:00
Raeliana
f04f1ec5ce
Create ClearWeaponsCommand.java
A command to clear unlocked and unequipped artifacts
2022-04-23 02:48:04 +03:00
Melledy
5c1f48a5aa Merge branch 'stable' into development 2022-04-22 16:34:41 -07:00
Yazawazi
53659d2586
AvatarFetterLevelReward 2022-04-23 06:08:37 +08:00
memetrollsXD
d341e4f245 Use count for level for equips 2022-04-22 23:19:58 +02:00
PasserbyAlpha
2750d5da2d use OutputStreamWriter to ensure the charset of output is utf8 [from fumbling644o] 2022-04-23 02:28:34 +08:00
yarik0chka
266443b321 Implemented sitting 2022-04-22 23:24:51 +05:00
04c0e968ed
Add PublicPort field to server 2022-04-23 01:42:04 +08:00
Yazawazi
f9b5c8a9ee
command fix 2022-04-23 01:36:48 +08:00
26c3651cc8
Add PublicPort field to Dispatch server 2022-04-23 01:16:55 +08:00
Yazawazi
34c0c6b01b
setfetterlevel command 2022-04-22 23:46:24 +08:00
PasserbyAlpha
1b39f67032 fixed encoding problem when generating gm handbook 2022-04-22 23:11:29 +08:00
Yazawazi
9edb70d6cf
AvatarFetterLevel 2022-04-22 22:27:40 +08:00
Jaida Wu
746e16a25a
Add FrontHTTPS field to Dispatch server
Signed-off-by: Jaida Wu <mlgmxyysd@meowcat.org>
2022-04-22 21:25:58 +08:00
Melledy
e86932606a Revert "Explicitly load and save UTF-8 for the handbook"
This reverts commit fe6e9967db.
2022-04-22 05:20:02 -07:00
Melledy
db0e39bd72
Merge pull request #113 from 01101sam/patch-1
[typo] Fix resources folder tips
2022-04-22 04:38:04 -07:00
Melledy
08e3d7e4fb
Merge pull request #114 from alt3ri/development
Added /talent command
2022-04-22 04:35:10 -07:00
Melledy
e4681ba5be
Merge pull request #108 from fumbling644o/development
GM handbook: Explicitly load and save UTF-8
2022-04-22 04:33:05 -07:00
Benjamin Elsdon
0baeb32b41 Added GetMailItemReq/Rsp & PacketMailChangeNotify
Mail still doesn't work for whatever reason. I also added a temporary SendMailCommand just to receive PacketMailChangeNotify.
I feel like I'm about to lose my mind.
2022-04-22 19:02:05 +08:00
alt3ri
f8c31cfd96
Deleted 2 lines 2022-04-22 17:38:58 +07:00
alt3ri
1548c2a8d7
Added /talent command
Set current character talent level by using /talent command.
> /talent getid - Gets current character talent ID
> /talent set <talent ID> <level> - Sets current character's talent level
2022-04-22 17:28:52 +07: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
Benjamin Elsdon
1c6a5d4835 Initial work on mail 2022-04-22 15:52:31 +08:00
Benjamin Elsdon
af4086b4d9 Update protos 2022-04-22 15:24:23 +08:00
fumbling
fe6e9967db Explicitly load and save UTF-8 for the handbook
This fixes potential output issues for non-Latin scripts when exporting the handbook by changing the filename in the code.
2022-04-22 02:32:27 -04:00
Benjamin Elsdon
c638359302 Log files 2022-04-22 13:05:06 +08:00
Magix
e76b60d7c7
Merge pull request #94 from Yazawazi/development
Try to show characters' stories and voices
2022-04-21 23:12:02 -04:00
Yazawazi
d37543beaf
cache fetters 2022-04-22 10:39:25 +08:00
fumbling
91b685586e Morphia call fixes; add @Entity to more classes
1. During the conversion of Morphia calls to the new API, some of the `Filter.eq()` calls had their `field` set to `playerId` due to a copy/paste typo.

2. Morphia 2 switches to the codec system, so anything that will be serialized in the pipeline requires the `@Entity` annotation.
2022-04-21 22:19:47 -04:00
fengyuecanzhu
fd42dd558f change fhp to heal 2022-04-22 08:45:46 +08:00
Yazawazi
cb043e0644
no more NullPointerException pls 2022-04-22 08:30:02 +08:00
fengyuecanzhu
85fd060561 remove revive command 2022-04-22 08:26:48 +08:00
fengyuecanzhu
a47655db7a add fullfp command 2022-04-22 08:08:47 +08:00
Yazawazi
1c6aa32cea
ee, forget to change variables when copying from local 2022-04-22 07:49:35 +08:00
Yazawazi
a3f528ede0
typo 2022-04-22 07:42:17 +08:00
Yazawazi
6b8b6b4899
fetter try 2022-04-22 07:37:25 +08:00
Melledy
a05f8270ab
Merge pull request #74 from 4Benj/development
Server run modes and multi-server dispatch support
2022-04-21 15:06:57 -07:00
Melledy
eb44fc88c4 Refactor Revive Command + fix syntax error
No idea how I missed the syntax error while reviewing
2022-04-21 14:47:04 -07:00
Melledy
18707f9309 Merge branch 'development' into account-fix 2022-04-21 14:46:07 -07:00
Melledy
d19d80fa4e Save config everytime you load so the new options show up 2022-04-21 14:44:55 -07:00
Melledy
860e28e56a
Merge pull request #88 from alt3ri/development
Added /revive command
2022-04-21 14:05:09 -07:00
Melledy
dca137a93e Fix account dupe key error after selecting starting character 2022-04-21 14:02:17 -07:00
alt3ri
96a252f9dd
Added /revive command
Now it's more convenient to revive character without food :>
2022-04-22 02:28:52 +07:00
Melledy
a93398a18b
Merge pull request #86 from alt3ri/patch-7
Fix typo
2022-04-21 11:47:30 -07:00
Melledy
29fe983f67
Merge pull request #84 from yarik0chka/development
Add a changing weather id
2022-04-21 11:47:13 -07:00
Yazawazi
a01783ef3c
Teleport Small Fix 2022-04-22 02:23:02 +08:00
alt3ri
2cc8d48fde
Fix typo
"When you create a new account via auto register or console server then during scene select a character and write a name on it press it it will get stuck and make the server disconnected. Some can get through and some can't passed it, so currently I'm still on the stable version . even how many times have I deleted the datebase and tried it on some linux and directly on windows too :/ btw 6863600865/src/main/java/emu/grasscutter/data/ResourceLoader.java (L131) in scene folder there is a typo name "BinOutPut" it should be "BinOutput" so scene file can't be found." - [Yuki#4985](https://discord.com/channels/965284035985305680/965284036333424722/966756877100789760)
Thanks [Yuki#4985](https://discord.com/channels/965284035985305680/965284036333424722/966756877100789760)
2022-04-22 00:54:06 +07:00
yarik0chka
38c0c9eb7c Add a changing weather id 2022-04-21 22:21:24 +05:00
Benjamin Elsdon
ff6958ed1f Forgot a dispatch prefix on error while merging 2022-04-22 01:15:05 +08:00
Benjamin Elsdon
96da53b5fb Merge remote-tracking branch 'upstream/development' into development 2022-04-22 01:04:03 +08:00
Melledy
6863600865
Merge pull request #78 from MlgmXyysd/dispatch-refactor
Refact dispatch server
2022-04-21 09:03:53 -07:00
Jaida Wu
68deff0c95
Listens to all addresses by default
Signed-off-by: Jaida Wu <mlgmxyysd@meowcat.org>
2022-04-22 00:02:03 +08:00
Jaida Wu
aacd261206
Add dispatch server log prefix
Signed-off-by: Jaida Wu <mlgmxyysd@meowcat.org>
2022-04-22 00:02:02 +08:00
Jaida Wu
b0d2d29b1c
Add some log to dispatch server
Signed-off-by: Jaida Wu <mlgmxyysd@meowcat.org>
2022-04-22 00:02:00 +08:00
Jaida Wu
2df8625b24
Fallback to HTTP if no SSL cert
Signed-off-by: Jaida Wu <mlgmxyysd@meowcat.org>
2022-04-22 00:01:59 +08:00
Jaida Wu
a1567895fa
Refact code
Signed-off-by: Jaida Wu <mlgmxyysd@meowcat.org>
2022-04-22 00:01:54 +08:00
Melledy
686aed2cd4
Merge pull request #77 from xmplay/patch-1
bring back the jade chamber and other old scene tags
2022-04-21 09:01:43 -07:00
Melledy
781448518d
Merge pull request #79 from zamlty/development
Fix artifact & weapon generation by give command
2022-04-21 09:00:30 -07:00
Benjamin Elsdon
66b5ed8a83 Should probably remove this as well... 2022-04-21 23:04:02 +08:00
Benjamin Elsdon
72355dd3c5 Removed class left over from testing 2022-04-21 23:00:36 +08:00
Jaida Wu
dee3105763
Add list command
Signed-off-by: Jaida Wu <mlgmxyysd@meowcat.org>
2022-04-21 22:55:32 +08:00
Benjamin Elsdon
63e008cbcf DatabaseManager clean up 2022-04-21 22:50:06 +08:00
Benjamin Elsdon
a36f29cdf1 Fixed null pointer exception in game only mode
PacketPlayerLoginRsp now creates the required QuerryCurrRegionHttpRsp itself.
2022-04-21 22:38:01 +08:00
zamlty
1d54084317 Fix artifact & weapon generation by give command 2022-04-21 22:21:39 +08:00
xmplay
66c956d10e
bring back the jade chamber and other old scene tags 2022-04-21 15:04:47 +01:00
Jaida Wu
65e0799e79
Drop independent log server
Signed-off-by: Jaida Wu <mlgmxyysd@meowcat.org>
2022-04-21 21:41:30 +08:00
Benjamin Elsdon
585187bebe Fixed null pointer exception in hybrid mode. 2022-04-21 19:20:49 +08:00
Benjamin Elsdon
e97e124460 Merge branch 'development' of https://github.com/Melledy/Grasscutter into development 2022-04-21 18:11:51 +08:00
Benjamin Elsdon
6a091b254c Multi-server dispatch support and server run modes 2022-04-21 18:04:00 +08:00
Melledy
56415b7fbc
Merge pull request #70 from Grasscutters/dev-fixes
Dev fixes
2022-04-21 00:31:01 -07:00
Melledy
3a0997bb5a Make sure SetEntityClientDataNotify is a valid proto before replaying it to the other players 2022-04-21 00:29:06 -07:00
Melledy
c0e859b17c Add config entry for OverseaLogPort (default: 8888) 2022-04-21 00:28:28 -07:00
Melledy
e10d554db8
Merge pull request #69 from Grasscutters/dev-fixes
Dev fixes
2022-04-21 00:09:12 -07:00
KingRainbow44
cc231b812d
why is Account#onLoad THE DAMN REASON FOR HOURS OF TESTING 2022-04-21 02:07:05 -04:00
Benjamin Elsdon
75719c5b3b Restructured the config file in preperation for server run modes 2022-04-21 13:53:50 +08:00
Melledy
ea91276736
Merge pull request #66 from labalityowo/development
Remove stella constellation appeareance in gacha pull
2022-04-20 22:09:56 -07:00
Melledy
262ca08679
Merge pull request #65 from fengyuecanzhu/development
args check for setstats command
2022-04-20 22:05:58 -07:00
Melledy
75cea5bc48 More refactoring (player id -> player uid) 2022-04-20 21:50:33 -07:00
fengyuecanzhu
9c136859eb add args check 2022-04-21 12:49:23 +08:00
labalityowo
7b43e9a6d8
Remove the stella appearance 2022-04-21 11:42:21 +07:00
Melledy
35925903a1 Refactor PacketSceneTransToPointRsp and add a null check when getting ScenePointEntries 2022-04-20 21:33:58 -07:00
Melledy
252fa6b958 Fix weapon skills (and artifact sets) not working when you equip them 2022-04-20 21:03:18 -07:00
KingRainbow44
c3da897e01
Fix command detection 2022-04-20 23:56:27 -04:00
fengyuecanzhu
56ee7b719a change description 2022-04-21 11:52:53 +08:00
fengyuecanzhu
636d9ff206 add description and permission to setstats command 2022-04-21 11:43:31 +08:00
Yazawazi
639eba528f
folder check 2022-04-21 10:37:24 +08:00
Melledy
434573115c Fix not being able to join friend's world 2022-04-20 18:48:26 -07:00