Grasscutters/Grasscutter
3
0
Fork 0
mirror of https://github.com/Melledy/Grasscutter.git synced 2024-11-30 18:42:12 +00:00
Code Issues Projects Releases Wiki Activity
698 Commits 7 Branches 22 Tags 136 MiB
0e55a0ce0a
Commit Graph

475 Commits

Author SHA1 Message Date
BaiSugar
65cd5a0f67 remove useless items 2022-04-29 14:13:09 +08:00
Melledy
eee80fc5a7 Fix compile error caused by merge 2022-04-28 23:09:07 -07:00
Melledy
6673876abf Merge branch 'development' into dungeon-scripts 2022-04-28 22:21:26 -07:00
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
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