Grasscutters/Grasscutter
3
0
Fork 0
mirror of https://github.com/Melledy/Grasscutter.git synced 2024-11-27 23:24:39 +00:00
Code Issues Projects Releases Wiki Activity
898 Commits 7 Branches 22 Tags 133 MiB
8a52a041bd
Commit Graph

638 Commits

Author SHA1 Message Date
KingRainbow44
b703a32544
QoL changes 2022-04-30 21:52:30 -04:00
KingRainbow44
6fb0b5494f
Implement a handler for logging routes 2022-04-30 20:38:18 -04:00
muhammadeko
d47c9e1f98 Add getter for innerclass RegionData 2022-04-30 16:41:19 -07:00
Muhammad Eko Prasetyo
14c4673d48
Fix DispatchHttpJson handler and add setHttpServer because Express doesn't support removing defined route. (#388) 2022-05-01 00:43:50 +02:00
Magix
eb5b8fa966
Merge branch 'development' into api 2022-04-30 16:22:00 -04:00
Magix
0b0e8991b1
Merge pull request #381 from Coooookies/development 
Show the player's UID with the `/list` command
 2022-04-30 16:16:18 -04:00
Magix
78f6e6b7cf
Forgot to add to null execution 2022-04-30 16:15:39 -04:00
Magix
3a45a5b5c4
Change to () and add space 2022-04-30 16:14:40 -04:00
KingRainbow44
9902f39306
Merge remote-tracking branch 'origin/api' into api 2022-04-30 16:11:12 -04:00
KingRainbow44
e8d60c6edf
Move join & quit to player event 2022-04-30 16:11:00 -04:00
Magix
a1a36dc7a7
Merge branch 'development' into api 2022-04-30 16:07:54 -04:00
KingRainbow44
a3e22dd7e1
Create player creation event & move join event to player 2022-04-30 16:07:12 -04:00
coooookies
1d6916bca1 Uids will not be showed until the parameter <uid> is added, 
like this: /list uid
 2022-05-01 03:43:41 +08:00
LDA
64930b9ba9 Implement viewing character details in character showcase 2022-04-30 10:49:45 -07:00
Benjamin Elsdon
ee9b84149d Small fix 2022-05-01 00:51:09 +08:00
Benjamin Elsdon
f8248ff74b Complete rework of Dispatch, Added DebugMode 2022-05-01 00:30:56 +08:00
coooookies
caffe859b8 List command should show player uid 2022-05-01 00:17:08 +08:00
赤座あかり
2fd73e043a
Give Artifact: Fix error & Rename alias (#370) 
* Give Artifact: Fix error & Rename alias

* Update README.md
 2022-04-30 13:19:22 +02:00
Aru
dd38814209
Monsters should drop items in world (#373) 
* Monsters should drop items in world

fix the typo introduced in f1934c3a47

* Determine whether in dungeon scene
 2022-04-30 13:18:09 +02:00
筱傑
86f72a5f7a
Update Welcome Mail Items Type (#369) 2022-04-30 11:46:23 +02:00
Scirese
13aaebd9e8
Add Android Client fix by @BaiSugar (#105) 2022-04-30 11:45:24 +02:00
omg-xtao
a7b0880d02
Merge branch 'development' into tp 2022-04-30 16:48:24 +08:00
lhhxxxxx
f31fda2e16 Update Account.hasPermission() 
Add wildcard characters to permission nodes under the same namespace. (simple implementation)
 2022-04-30 01:30:38 -07:00
Melledy
3bdf93f503 Monsters should not drop items inside dungeons 2022-04-30 01:20:44 -07:00
Melledy
b140c7f5bf Implement script region check 2022-04-30 01:20:44 -07:00
Melledy
202361f2bf Move script constants to globals 2022-04-30 01:20:44 -07:00
Melledy
a61e1916a0 Temporary fix for scripts that call require 2022-04-30 01:20:44 -07:00
Melledy
bea9a76895 Optimize GetOnlinePlayerListRsp 2022-04-30 01:20:44 -07:00
Melledy
d64c26d4f5 Update how scene/dungeon map points are handled 2022-04-30 01:20:44 -07:00
lhhxxxxx
c2b45a7a0d Update GiveAllCommand.java 
giveall command nomore give arts
 2022-04-30 01:04:10 -07:00
筱傑
b5582099f9 Fix Give Command Promote Level Bug 
Should be <=40, just change the order
 2022-04-30 01:02:39 -07:00
muhammadeko
d37a326e9a Give Artifact: Clear random props first before adding all picked props 2022-04-29 17:11:12 -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
lilmayofuksu
69381f393d
Limit the amount of vehicles that a player can spawn (#340) 2022-04-29 21:01:07 +02:00
BaiSugar
cacba61b79
Added interface display for multiplayer games (#360) 2022-04-29 18:20:46 +02:00
赤座あかり
d99493149a
Add command to get reliquary with specific props (#300) 2022-04-29 16:31:22 +02:00
omg-xtao
6d77cd8952
Merge branch 'development' into tp 2022-04-29 21:38:45 +08:00
真心
0a6c98d134 Add 'refinement' option to 'give' command 2022-04-29 15:20:28 +02:00
真心
b1439819fa Add 'refinement' option to 'give' command 2022-04-29 15:20:28 +02:00
真心
9e1f356a0c Delete GiveWeaponCommand.java 2022-04-29 15:20:28 +02:00
真心
122aa8e7c1 Add GiveWeaponCommand 2022-04-29 15:20:28 +02:00
xtaodada
8c3333dbea
Change NickName to ServerNickname 2022-04-29 19:37:51 +08:00
yangjiahao
f03c3e94a9 改进了clear命令的逻辑，使他在不输入uid时默认为当前玩家。 2022-04-29 13:07:30 +02:00
memetrollsXD
fa7ce68d0b
Merge pull request #344 from BaiSugar/development 
Command giveall to remove useless items
 2022-04-29 13:04:25 +02:00
LDA
90dfe30caf Fix sitting in chairs 2022-04-29 12:59:50 +02:00
xtaodada
c4bdfc26eb
Support custom server in-game nickname 2022-04-29 18:59:24 +08:00
memetrollsXD
edda944ae5
Merge pull request #355 from Grasscutters/dungeon-scripts 
Implemented Dungeon Support
 2022-04-29 12:58:01 +02:00
Melledy
fd09676bf5 Prevent console error spam when attacking gadgets 2022-04-29 03:33:14 -07:00
Melledy
34f5cfec1c Remove player from challenge if they are leaving the scene 2022-04-29 03:24:36 -07:00
Melledy
331c02020c Deregister scenes if no one is in them instead of deregistering when no entities are in them 2022-04-29 03:09:17 -07:00
Melledy
c22c7ecb44 Implement spawning monsters by suite 2022-04-29 03:06:33 -07:00
xtaodada
2487e2af75
Support custom server avatar 2022-04-29 18:04:20 +08:00
xtaodada
4339810ca3
Support Teleport from console 2022-04-29 17:53:42 +08:00
Melledy
d77fbadab7 Add a few more functions for the script engine to call 2022-04-29 02:38:25 -07:00
muhammadeko
590ea7d920 skip loading module-info.class 2022-04-29 02:32:35 -07:00
Melledy
d0b1f445fd Implement lazy loading of scripts when they enter a new block 2022-04-29 02:07:25 -07:00
Melledy
3d0970746e Prevent weird crashing if there was an error loading scripts 2022-04-29 01:15:40 -07:00
Melledy
95d979626d Fix monster levels in dungeons 2022-04-29 01:03:16 -07:00
Melledy
f605ef51b6 Implement AddExtraGroupSuite 2022-04-29 00:52:40 -07:00
Melledy
c3c170def9 Allow the player to finish dungeons 2022-04-29 00:49:05 -07:00
Melledy
069ae5fbb8 Clean script events 2022-04-29 00:00:23 -07:00
BaiSugar
d16c809b0d remove useless items 2022-04-29 14:18:32 +08:00
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
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
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