Grasscutters/Grasscutter
3
0
Fork 0
mirror of https://github.com/Melledy/Grasscutter.git synced 2024-11-24 09:18:14 +00:00
Code Issues Projects Releases Wiki Activity
725 Commits 7 Branches 22 Tags 133 MiB
d31695b033
Commit Graph

496 Commits

Author SHA1 Message Date
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
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
xtaodada
dbb7350f6f Support kill from console 2022-04-25 11:01:18 -07:00
xtaodada
76e2fa59d8 Add a new alias to the command killcharacter 2022-04-25 11:01:18 -07:00
xtaodada
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
xtaodada
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