Grasscutters/Grasscutter
3
0
Fork 0
mirror of https://github.com/Melledy/Grasscutter.git synced 2024-12-05 01:45:29 +00:00
Code Issues Projects Releases Wiki Activity
1,558 Commits 7 Branches 22 Tags 136 MiB
2cfbe78184
Commit Graph

1118 Commits

Author SHA1 Message Date
lhhxxxxx
0690e23116 Handle with undetermined locale language config (#611) 
* Update GiveAllCommand.java

giveall command nomore give arts

* Update Grasscutter.java

* Update Grasscutter.java
 2022-05-06 21:20:44 -07:00
Melledy
af39613d4f Move server profile away from GameConstants 2022-05-06 19:16:36 -07:00
Melledy
759cd6ae37 Merge branch 'development' of https://github.com/Grasscutters/Grasscutter into development 2022-05-06 19:12:58 -07:00
Melledy
f894b96edf Fix crash on login if the player didnt have a TowerManager 2022-05-06 19:12:54 -07:00
KingRainbow44
32d2a21153 Merge remote-tracking branch 'origin/development' into development 2022-05-06 21:53:03 -04:00
KingRainbow44
043c731575 Fix for translation errors 2022-05-06 21:52:10 -04:00
Magix
e29c2dc122 Merge branch 'stable' into development 2022-05-06 21:39:30 -04:00
Magix
1ed0511cd7 Update Tools.java 2022-05-06 18:25:35 -07:00
mingjun97
1ee9cc80bb Auto fill name of the event from TextMap 2022-05-06 18:25:35 -07:00
mingjun97
1d6fd52552 Prompt for user language option for the Tools 
* GM Handbook
* Gacha Map
 2022-05-06 18:25:35 -07:00
Magix
711ae2f554 Merge branch 'development' into development 2022-05-06 21:08:19 -04:00
Magix
38fd7bb76a Merge pull request #567 from Grasscutters/localization 
Implement a proper language system
 2022-05-06 21:05:29 -04:00
KingRainbow44
c11e83c48f Bug fixes 2022-05-06 21:04:39 -04:00
Bwly999
79babcc53e roll back to timer 2022-05-07 08:00:31 +08:00
KingRainbow44
aa292b1fef Update Utils.java 2022-05-06 19:47:30 -04:00
KingRainbow44
0d7f58fc25 Merge development into localization 2022-05-06 19:40:32 -04:00
gentlespoon
6d678557ff fix/runningAndDashingStamina 2022-05-06 16:11:51 -07:00
KingRainbow44
362cfe1e7b Ensure we have a fallback for localization 2022-05-06 18:57:49 -04:00
KingRainbow44
b3a917007b Convert to the superior language system. (pt. 3) 2022-05-06 18:50:18 -04:00
gentlespoon
58cb60299c Fix #593: Accidental death of character 2022-05-06 15:22:00 -07:00
gentlespoon
3f91fdcb71 Allow walking away from the statue within 2.5s to stop auto heal. 2022-05-06 14:49:33 -07:00
wulf
542a3cfc9b fix scence block loading bug 2022-05-06 13:43:42 -07:00
Scald
afa3747fad Add config option to change console server's signature, namecard, level and world level (#586) 
* Add files via upload

* Add files via upload

* Update GameConstants.java

* Update Config.java

* Update PacketGetPlayerFriendListRsp.java
 2022-05-06 13:41:29 -07:00
cfuncode
0152b146c5 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
ad84635540 Merge pull request #594 from Akka0/tower 
Tower Dungeons Handoff between levels
 2022-05-06 13:37:30 -07:00
Kinesis
8abd3ace6c Implement Avatar Expedition System 
Co-Authored-By: ShigemoriHakura <62388797+ShigemoriHakura@users.noreply.github.com>
Co-Authored-By: KanyeWestc <104547412+KanyeWestc@users.noreply.github.com>
Co-Authored-By: QAQ 天小络 <72185326+XTL676@users.noreply.github.com>
Co-Authored-By: nkxingxh <25559053+nkxingxh@users.noreply.github.com>
Co-Authored-By: Yazawazi <47273265+Yazawazi@users.noreply.github.com>
Co-Authored-By: wuwuwu223 <81224214+wuwuwu223@users.noreply.github.com>
Co-Authored-By: omg-xtao <100690902+omg-xtao@users.noreply.github.com>
Co-Authored-By: Sakura <104815797+Sakura@users.noreply.github.com>
Co-Authored-By: NewNeko-2022 <104819344+NewNeko-2022@users.noreply.github.com>
Co-Authored-By: JimWails <30657653+JimWails@users.noreply.github.com>
Co-Authored-By: buttercookies <19878609+ButterCookies@users.noreply.github.com>
 2022-05-06 13:28:26 -07:00
Muhammad Eko Prasetyo
deee32a0a1 add config option to enable cors for dispatchserver (#579) 2022-05-06 13:23:26 -07:00
Akka
f2231349bd a little fix 2022-05-07 00:31:48 +08:00
Akka
c2d2a37fc5 Merge branch 'tower' into development 2022-05-07 00:19:51 +08:00
Akka
17242a24ed Add some lua functions 2022-05-07 00:15:23 +08:00
Akka
b58bcda0c8 Tower Dungeons Handoff between level and floor 2022-05-07 00:11:54 +08:00
Bwly999
6149c6f0e3 Merge branch 'development' of github.com:Grasscutters/Grasscutter into development 2022-05-06 22:38:04 +08:00
4Benj_
3ede7523b0 Stop WindSeedClientNotify and PlayerLuaShellNotify from being sent (#582) 2022-05-06 15:48:16 +02:00
gentlespoon
2e68578525 The statues will now automatically regen their HP volume over time. 
Max is currently set to 85000 for everyone. Will update after implementing statue levels.
 2022-05-06 03:26:38 -07:00
Bwly999
2d325e1847 fix the problem that the reference of serverHook in Plugin object is null 2022-05-06 18:16:07 +08:00
Melledy
b760fb1b26 Fix morphia error when saving player to db 2022-05-06 01:19:39 -07:00
Melledy
000b10983b Merge branch 'development' of https://github.com/Grasscutters/Grasscutter into development 2022-05-06 01:17:19 -07:00
Melledy
796201e8b7 Remove the red exclamation mark from achievements 2022-05-06 01:17:16 -07:00
gentlespoon
221668570e fix: lower logging level in SotSManager 2022-05-06 00:49:08 -07:00
gentlespoon
198214ec53 Implementes auto HP recovery at the statues. 
- Respects player setting.
- SP + MP.
- Statue has unlimited HP volume (to be updated)
 2022-05-06 00:17:18 -07:00
Akka
2ad6f5934b Add @Transient for temporary team 2022-05-06 00:12:33 -07:00
Akka
c912b8d857 Choose Avatar & Enter Tower 2022-05-06 00:12:33 -07:00
Akka
f683b222fc Add @Transient for temporary team 2022-05-06 14:46:10 +08:00
gentlespoon
93b3265d72 Add drowning. Better movement ticking. 2022-05-05 23:42:34 -07:00
Akka
833ea1b791 Merge pull request #1 from Akka0/development 
Updated
 2022-05-06 14:16:44 +08:00
Akka
3d3f36cf56 Choose Avatar & Enter Tower 2022-05-06 14:10:23 +08:00
KingRainbow44
c0b1ec1b9e Convert to the superior language system. (pt. 2) 2022-05-06 00:57:45 -04:00
KingRainbow44
7a084100c6 Convert to the superior language system. (pt. 1) 2022-05-05 23:57:55 -04:00
memetrollsXD
81998b9cf9 Customise sender and title too. Add statement of use 2022-05-05 19:49:28 -07:00
Melledy
a045142a41 Kick player if they use an invalid resources folder 2022-05-05 17:17:27 -07:00
gentlespoon
bafde8693d Fixes #529: fixed stamina abnormal. added fall to death. 
Stamina is still WIP.
- Currently stamina consumption is not affected by the use of foods, talents, or the environment.
- Charged attacks do no require stamina yet.
- Will be fixed tomorrow.
 2022-05-05 15:37:15 -07:00
Scirese
128f767002 Update CNLanguage to match with the latest EN version 2022-05-05 09:03:23 -07:00
Akka
3f34aa0460 Support of Enter Room Scene 2022-05-05 09:02:54 -07:00
Benjamin Elsdon
782c9bfb6b No misleading 404 error 2022-05-05 09:02:10 -07:00
Benjamin Elsdon
db1ddd0630 I honestly don't know what happened.... 2022-05-05 09:02:10 -07:00
Benjamin Elsdon
3395c76dbc Removed GCStatic. Cleaned up GachaRecordHandler. 2022-05-05 09:02:10 -07:00
Akka
a21fc116ee Support of Enter Room Scene 2022-05-05 22:00:11 +08:00
Luke H-W
15dca5a04d GiveCommand: fix edge case with unspaced multiple args (#539) 
Co-authored-by: AnimeGitB <AnimeGitB@bigblueball.in>
 2022-05-05 15:23:48 +02:00
Melledy
e693612ed1 Fix clear command causing a concurrency error 2022-05-05 02:29:43 -07:00
AnimeGitB
3a28e741d0 Add R# LVL# X# arg syntax to GiveCommand 2022-05-05 00:14:17 -07:00
gentlespoon
7d85c53e68 Restrict to MP prop only. 2022-05-05 00:03:42 -07:00
gentlespoon
5c275c2e3c SetPlayerPropReq Handler and player.setProperty() sanity check. 2022-05-05 00:03:42 -07:00
AnimeGitB
37c2ee5e2c Command Targeting overhaul fixes 2022-05-05 00:03:10 -07:00
AnimeGitB
d8b2e787e5 Commands Targeting rework 2022-05-05 00:03:10 -07:00
AnimeGitB
5aba7da7ef Move command prefix stripping to ChatManager 2022-05-05 00:03:10 -07:00
AnimeGitB
82ec63c4e4 [WIP] Command Targeting overhaul 2022-05-05 00:03:10 -07:00
hanbao233xD
4e0ebe56a6 Update CNLanguage.java 2022-05-04 22:57:33 -07:00
hanbao233xD
3f02afb46b Update CNLanguage.java 2022-05-04 22:57:33 -07:00
hanbao233xD
fb05a3711d Update CNLanguage.java 2022-05-04 22:57:33 -07:00
Secretboy
a7b9b1f923 Update Config.java 2022-05-04 22:57:06 -07:00
Secretboy
08c01ab15d Update Grasscutter.java 2022-05-04 22:57:06 -07:00
gentlespoon
6fc4065fa0 Add missing PacketOpcodes. 2022-05-04 22:54:52 -07:00
Angda Song
5a2d25e4eb Update teleport docs and allow overriding Y coord when teleporting 2022-05-04 14:50:49 -07:00
BaiSugar
2074933e96 Add the god statue's blood return display and stamina system (#520) 
* Fix announcement display

* Approaching StatuesOfTheSeven will restore all health of the current team

* Added god statue's blood return display and stamina system

* fix error

fix error

* fix file
 2022-05-04 11:45:20 -07:00
ShigemoriHakura
aa06583a45 fix achievement proto (#507) 
* fix achievement proto

TakeAchievementRewardReq tells client the achievements achieved or not and it's progress.

* add import
 2022-05-04 10:06:33 -07:00
Akka
48d1e026ef Add Support of Item Combine (#513) 
* Add Support of Item Combine

* Add Support of Item Combine

Co-authored-by: Melledy <52122272+Melledy@users.noreply.github.com>
 2022-05-04 10:06:13 -07:00
Angda Song
06983e9e84 Implement map marking features 
Teleport still exists on fish hook mark.
Added mapMark-related protos.
Map marking data is stored in players collection.
 2022-05-04 10:01:46 -07:00
Scirese
4220b6b88d Fix CNLanguage.java (#505) 
* Fix CNLanguage.java

@Melledy 
Keep an eye on the file encodeing next time,please.

* Update CNLanguage.java

* Fix a little bug
 2022-05-04 16:56:50 +02:00
EtherealAO
5e0e65123e Dungeon challenge success/fail notify should only be triggered once (when server spawned mob more than score) 2022-05-04 01:48:56 -07:00
Melledy
3d52964112 Fix equip swapping 2022-05-04 01:45:41 -07:00
Melledy
787f3fd45e Fix damage number not showing up if it was the killing blow 2022-05-04 01:21:34 -07:00
Melledy
57285885dc Move languages to languages package 2022-05-04 00:44:33 -07:00
Melledy
1b97b4afa0 Fixed dungeon challenge scoreboard and implement dungeon drops 
Also fixed a few dungeon script handlers
 2022-05-03 23:24:43 -07:00
Melledy
ae31e4fd98 Weapons/artifacts should not have a count of more than 1 2022-05-03 23:24:18 -07:00
Melledy
de75b56d6c Fix jline in eclipse 2022-05-03 23:24:02 -07:00
Scirese
09125f8e91 Optimize Chinese Translations (#498) 
* Add Chinese Translation

* Optimize Chinese Translations

* Fix a dumb error
 2022-05-03 23:15:04 -07:00
方块君
09b306f6a0 Modify Chinese language files 2022-05-03 22:17:41 -07:00
方块君
e297a29adb Add some text to language file 2022-05-03 22:17:41 -07:00
方块君
b8f5299995 Optimize multilingualism (using variables) 
Optimize multilingualism (using variables)
 2022-05-03 22:17:41 -07:00
DancingSnow
f6d5fb1945 fix giveart command when times about 200, account will crash 2022-05-03 10:45:11 -07:00
AnimeGitB
29eedb5075 Refactor SetStatsCommand, add target UID and all FightProperty stats 2022-05-03 10:37:32 -07:00
BaiSugar
1288273c12 Approaching StatuesOfTheSeven will restore all health of the current team 2022-05-03 10:24:10 -07:00
mzfqy
c0acf8b1ba fix path 2022-05-03 10:23:29 -07:00
mzfqy
70507c34c9 add zh_cn translate. 2022-05-03 10:23:29 -07:00
Presiareen
050784dfab 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
Melledy
c930c637e4 Add languages folder to config as well 2022-05-03 03:19:43 -07:00
方块君
0eab44f51f Add multilingual support 
Add multilingual support
 2022-05-03 02:38:37 -07:00
xtaodada
86e6eef4e2 Support giftPackage BatchUse 
Co-authored-by: pris <lilch1022@hotmail.com>
 2022-05-03 02:29:04 -07:00
Melledy
a93d7c579f Fix extra skill charges being removed if you teleport 
Close #404
 2022-05-03 02:27:18 -07:00
Melledy
7395a268ef Fix mail not sending to offline players 2022-05-03 02:27:18 -07:00
mingjun97
509f62e7cd Carry to new line for messages in MessageHandler 2022-05-03 02:16:44 -07:00
mingjun97
0421d912fd 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
krrr
5b6da38160 avoid compile error caused by encoding 2022-05-02 22:05:21 -07:00
xtaodada
b253e779a2 Implement food heal function 
Co-authored-by: pris <lilch1022@hotmail.com>
 2022-05-02 22:02:11 -07:00
KingRainbow44
765f569e55 Initialize ServerHook 2022-05-02 21:20:24 -04:00
dogdie233
16f77ee520 Add EnterDungeonCmd, fix error when enter dungeon by changescene, import spawn cmd 2022-05-02 10:50:08 -07:00
LDA
1d36fd8f2a load photo mode pose and expression fetters 2022-05-02 10:47:27 -07:00
4Benj_
f7b8d9b45f Removed debug message and fixed NullPtrException (#434) 
* Removed a debug message from Auth Handler changes

Kill me

* Also forgot to use the getter :/
 2022-05-02 12:47:29 +02:00
mingjun97
a102613313 Utils for gacha history record subsystem 
* Auto generate mapping files with command `java -jar grasscutter.jar -gachamap`

* Static file provider
  * For gacha record webpage
  * All static files should be stored at `GRASSCUTTER_RESOURCE/gcstatic/`
  * Can benefit other subsystem in future when webpages involved
 2022-05-02 02:53:28 -07:00
BaiSugar
6a20e383f7 Fix announcement display 2022-05-02 02:50:32 -07:00
xtaodada
7b591a2da0 implement shopMail giftPackage function 
Co-authored-by: Kinesis <CCasusensa@users.noreply.github.com>
 2022-05-02 02:50:24 -07:00
Benjamin Elsdon
73fc9fe4cc Custom Authentication Handler 2022-05-02 02:50:14 -07:00
DancingSnow
186c6bcf89 fix World level not in 0-8 2022-05-02 02:26:11 -07:00
Melledy
fba26d2da9 Fix gacha rate for weapons 2022-05-02 02:01:24 -07:00
Melledy
19396a63c7 Move player mail to MailHandler class 
This is so we dont have to save the entire player to the db every time we send mail
 2022-05-02 02:01:01 -07:00
KingRainbow44
afa8fb7a51 Merge remote-tracking branch 'origin/development' into development 2022-05-01 20:15:27 -04:00
mingjun97
98122f3c55 Implement gacha history record subsystem 
* Frontend is not very beautiful yet
* Didn't include too much `some anime game` data in the page to avoid being DMCA'd
 2022-05-01 13:47:17 -07:00
xtaodada
eb703f9f72 Fix goods limit bug 2022-05-01 13:42:01 -07:00
xtaodada
bd560785ba Show shopmall 2022-05-01 13:42:01 -07:00
筱傑
3cc1139aa1 Add /setstats mhp to set Max HP (#407) 
* Fixed `/setstats hp` without changing the max hp.

The Max HP should be modified.

* Add `/setstats mhp` to set Max HP
 2022-05-01 20:22:29 +02:00
JimWails
4adc983832 Fixed can set avatar level more than 90 and cause game to freeze 
Limit the avatar level given by "/givechar" command.
If avatar level >90, the game will freeze if open the character interface.
 2022-05-01 10:05:28 -07:00
coooookies
a8b808ba2e Improve registration methods. 2022-05-01 10:02:57 -07:00
coooookies
dde5a609fb GameServerPacketHandler need to be added a registration interface for plugin developers 2022-05-01 10:02:57 -07:00
Kinesis
677aa2d2c4 fix McoinExchangeHcoinRsp packet structure 2022-05-01 10:02:47 -07:00
筱傑
b9e27828b8 Fixed can set talent level to 16 bug (#408) 
Level should be **lower than 16**
 2022-05-01 16:42:02 +02:00
4Benj_
0d262e2d07 Cleaned up dispatch iOS fixes (#396) 
* Attempting to fix crashing on iOS devices

plus I forgot a thing in string.format

* Removed unnecessary things
 2022-04-30 23:31:39 -07:00
KingRainbow44
72b5ec210c Merge remote-tracking branch 'origin/development' into development 2022-05-01 02:14:35 -04:00
mingjun97
049086b21a Should fix all crashes when login for iOS client 2022-04-30 23:03:47 -07:00
mingjun97
d3ac090daa Fix crash and revise route 
* Fix another point which will trigger iOS client to crash
* Revise `compareProtocolVersion` route to handle all method
 2022-04-30 23:03:47 -07:00
Melledy
10bfb6976d Change RunMode and DebugMode to enums 2022-04-30 22:52:09 -07:00
Melledy
eac82f3c01 Fix possible exploit with mcoin exchange 2022-04-30 22:51:21 -07:00
Kinesis
da3eb3d26c implement McoinExchange packet Handler 2022-04-30 22:03:44 -07:00
mingjun97
fb547c17ca Revert changes for debugging purpose 2022-04-30 21:43:46 -07:00
mingjun97
8b8777e932 Fix crash when login 
* Prevent email to be `null` to avoid crash in certain client setup.
 2022-04-30 21:43:46 -07:00
Melledy
3169e87c60 Fix constellations that give an extra charge to skills 
Fix #228
 2022-04-30 19:34:50 -07:00
KingRainbow44
e898384532 QoL changes 2022-04-30 21:52:30 -04:00
KingRainbow44
a044448af7 Implement a handler for logging routes 2022-04-30 20:38:18 -04:00
muhammadeko
80659f27a8 Add getter for innerclass RegionData 2022-04-30 16:41:19 -07:00
Muhammad Eko Prasetyo
55793867d3 Fix DispatchHttpJson handler and add setHttpServer because Express doesn't support removing defined route. (#388) 2022-05-01 00:43:50 +02:00
Magix
be507310a5 Merge branch 'development' into api 2022-04-30 16:22:00 -04:00
Magix
a62520f922 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
8ce79ed3ca Forgot to add to null execution 2022-04-30 16:15:39 -04:00
Magix
f4de4a6aeb Change to () and add space 2022-04-30 16:14:40 -04:00
KingRainbow44
86b8f4549f Merge remote-tracking branch 'origin/api' into api 2022-04-30 16:11:12 -04:00
KingRainbow44
b5c277234c Move join & quit to player event 2022-04-30 16:11:00 -04:00
Magix
63d41fd79e Merge branch 'development' into api 2022-04-30 16:07:54 -04:00
KingRainbow44
f73a713fac Create player creation event & move join event to player 2022-04-30 16:07:12 -04:00
coooookies
ba97dfe7d9 Uids will not be showed until the parameter <uid> is added, 
like this: /list uid
 2022-05-01 03:43:41 +08:00
LDA
d133e55666 Implement viewing character details in character showcase 2022-04-30 10:49:45 -07:00
Benjamin Elsdon
28025a8198 Small fix 2022-05-01 00:51:09 +08:00
Benjamin Elsdon
947d3e5745 Complete rework of Dispatch, Added DebugMode 2022-05-01 00:30:56 +08:00
coooookies
c0b7859f93 List command should show player uid 2022-05-01 00:17:08 +08:00
赤座あかり
eac9c04e4e 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
d6fa05915f 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
筱傑
7b991d7b4e Update Welcome Mail Items Type (#369) 2022-04-30 11:46:23 +02:00
Scirese
fb991d845e Add Android Client fix by @BaiSugar (#105) 2022-04-30 11:45:24 +02:00
omg-xtao
23800745e2 Merge branch 'development' into tp 2022-04-30 16:48:24 +08:00
lhhxxxxx
eef216aea8 Update Account.hasPermission() 
Add wildcard characters to permission nodes under the same namespace. (simple implementation)
 2022-04-30 01:30:38 -07:00
Melledy
286ab545e9 Monsters should not drop items inside dungeons 2022-04-30 01:20:44 -07:00
Melledy
7e377dff59 Implement script region check 2022-04-30 01:20:44 -07:00
Melledy
1ed46df6e8 Move script constants to globals 2022-04-30 01:20:44 -07:00
Melledy
3f76ac4cac Temporary fix for scripts that call require 2022-04-30 01:20:44 -07:00
Melledy
f8f4d89cd0 Optimize GetOnlinePlayerListRsp 2022-04-30 01:20:44 -07:00
Melledy
66c2743d6e Update how scene/dungeon map points are handled 2022-04-30 01:20:44 -07:00
lhhxxxxx
c2b8a20e03 Update GiveAllCommand.java 
giveall command nomore give arts
 2022-04-30 01:04:10 -07:00
筱傑
d8e458cd33 Fix Give Command Promote Level Bug 
Should be <=40, just change the order
 2022-04-30 01:02:39 -07:00
muhammadeko
8a9dab7d74 Give Artifact: Clear random props first before adding all picked props 2022-04-29 17:11:12 -07:00
KingRainbow44
4db1724d06 Merge branch 'development' into api 
# Conflicts:
#	src/main/java/emu/grasscutter/Grasscutter.java
 2022-04-29 19:31:33 -04:00
lilmayofuksu
59ff79e23a Limit the amount of vehicles that a player can spawn (#340) 2022-04-29 21:01:07 +02:00
BaiSugar
7e6b20de1a Added interface display for multiplayer games (#360) 2022-04-29 18:20:46 +02:00
赤座あかり
79165aa402 Add command to get reliquary with specific props (#300) 2022-04-29 16:31:22 +02:00
omg-xtao
7fdf74986c Merge branch 'development' into tp 2022-04-29 21:38:45 +08:00
真心
48aea3f5e4 Add 'refinement' option to 'give' command 2022-04-29 15:20:28 +02:00
真心
d0ccc48642 Add 'refinement' option to 'give' command 2022-04-29 15:20:28 +02:00
真心
9892cd8480 Delete GiveWeaponCommand.java 2022-04-29 15:20:28 +02:00
真心
2d04758f1c Add GiveWeaponCommand 2022-04-29 15:20:28 +02:00
xtaodada
eaed1aa038 Change NickName to ServerNickname 2022-04-29 19:37:51 +08:00
yangjiahao
e1c0b4a955 改进了clear命令的逻辑，使他在不输入uid时默认为当前玩家。 2022-04-29 13:07:30 +02:00
memetrollsXD
352801b8a3 Merge pull request #344 from BaiSugar/development 
Command giveall to remove useless items
 2022-04-29 13:04:25 +02:00
LDA
c67e324a2e Fix sitting in chairs 2022-04-29 12:59:50 +02:00
xtaodada
62f0be4966 Support custom server in-game nickname 2022-04-29 18:59:24 +08:00
memetrollsXD
2f39aff4a6 Merge pull request #355 from Grasscutters/dungeon-scripts 
Implemented Dungeon Support
 2022-04-29 12:58:01 +02:00
Melledy
6d98743025 Prevent console error spam when attacking gadgets 2022-04-29 03:33:14 -07:00
Melledy
d877d7eebc Remove player from challenge if they are leaving the scene 2022-04-29 03:24:36 -07:00
Melledy
cb15a5dec9 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
ffc1f801e6 Implement spawning monsters by suite 2022-04-29 03:06:33 -07:00
xtaodada
0136425628 Support custom server avatar 2022-04-29 18:04:20 +08:00
xtaodada
74ad63573a Support Teleport from console 2022-04-29 17:53:42 +08:00
Melledy
ae3d9a4dc1 Add a few more functions for the script engine to call 2022-04-29 02:38:25 -07:00
muhammadeko
789e5f57b8 skip loading module-info.class 2022-04-29 02:32:35 -07:00
Melledy
1a5d4cf466 Implement lazy loading of scripts when they enter a new block 2022-04-29 02:07:25 -07:00
Melledy
3af5d20473 Prevent weird crashing if there was an error loading scripts 2022-04-29 01:15:40 -07:00
Melledy
14b6d3ce55 Fix monster levels in dungeons 2022-04-29 01:03:16 -07:00
Melledy
d690590ecf Implement AddExtraGroupSuite 2022-04-29 00:52:40 -07:00
Melledy
72e9a21ce3 Allow the player to finish dungeons 2022-04-29 00:49:05 -07:00
Melledy
8ab2b446cd Clean script events 2022-04-29 00:00:23 -07:00
BaiSugar
1bd8d871bb remove useless items 2022-04-29 14:18:32 +08:00
BaiSugar
76098cdb71 remove useless items 2022-04-29 14:13:09 +08:00
Melledy
30886da0ad Fix compile error caused by merge 2022-04-28 23:09:07 -07:00
Melledy
60cfa40d7f Merge branch 'development' into dungeon-scripts 2022-04-28 22:21:26 -07:00
Melledy
d71b7abfc3 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
d359e5111a Player events + mail receive event 2022-04-28 22:21:55 -04:00
KingRainbow44
d701613831 Formatting changes 2022-04-28 22:21:30 -04:00
KingRainbow44
e666dede7e Move events (imports) 2022-04-28 22:13:19 -04:00
KingRainbow44
68cc386baa Move events 2022-04-28 22:12:57 -04:00
KingRainbow44
9d9c6566ed Player join & quit event 2022-04-28 22:12:41 -04:00
KingRainbow44
dc26f9e232 Add plugin data folders 2022-04-28 22:01:40 -04:00
KingRainbow44
91a2a55ed9 Bug fixes & class updates 2022-04-28 21:54:51 -04:00
KingRainbow44
694b5c1548 Merge branch 'development' into api 2022-04-28 21:53:58 -04:00
memetrollsXD
31764fe5d9 Merge branch 'development' into startMail 2022-04-28 22:45:23 +02:00
memetrollsXD
5c02fee7e2 Customisable welcome mail 2022-04-28 22:42:59 +02:00
Kengxxiao
fcb4894387 fix shop config issue 2022-04-28 13:30:50 -07:00
Kengxxiao
275fcc7dd6 shop improvement 2022-04-28 13:30:50 -07:00
Kengxxiao
0559cc4e0b official shop support 2022-04-28 13:30:50 -07:00
Kengxxiao
027bd28afb Add command /coop and /tpall 2022-04-28 21:23:20 +02:00
ayy lmao
0c02ce9f63 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
31b0dd30e2 Ignore item not found error 2022-04-28 08:43:17 -07:00
Melledy
53cc1822f6 Implement dungeon entry 2022-04-28 08:20:37 -07:00
Kengxxiao
9133742eb0 fix companionship exp 
my IDEA lint is not happy on my change
 2022-04-28 06:50:37 -07:00
Kengxxiao
7bacd8ab70 do not save virtual item 2022-04-28 06:50:37 -07:00
Kengxxiao
ed98ab152d fix exp drop issue 2022-04-28 06:50:37 -07:00
BaiSugar
a5601e8409 Update the command format of the usage (including source code) 2022-04-28 13:47:32 +02:00
Melledy
9d75c25085 Fix missing player tick function 2022-04-27 19:37:25 -07:00
Melledy
d3925e8c6e Merge pull request #318 from Yazawazi/development 
Implementing the `Player Show Avatars`
 2022-04-27 15:50:53 -07:00
memetrollsXD
96dbc2fbfd God damn forgot I was in java for a sec 2022-04-27 15:42:25 -07:00
memetrollsXD
b80b8aedd9 Remove default permissions from account command 2022-04-27 15:42:25 -07:00
memetrollsXD
eaf2982ebc Apply to account command 2022-04-27 15:42:25 -07:00
memetrollsXD
0c665d940e Add default permissions 2022-04-27 15:42:25 -07:00
Yazawazi
0cbfcddae4 Should be OK 2022-04-28 06:40:25 +08:00
memetrollsXD
28a0844860 God damn forgot I was in java for a sec 2022-04-28 00:30:04 +02:00
memetrollsXD
8d332614b7 Remove default permissions from account command 2022-04-28 00:28:16 +02:00
memetrollsXD
90df06edd7 Apply to account command 2022-04-28 00:18:59 +02:00
memetrollsXD
5e9f497614 Add default permissions 2022-04-28 00:10:46 +02:00
Yazawazi
02ce62422f kill me plz 2022-04-28 03:46:24 +08:00
Yazawazi
982cbbe5d2 no headimage okay 2022-04-28 03:45:17 +08:00
Yazawazi
e55160dad6 Headimage 2022-04-28 03:40:32 +08:00
Yazawazi
363dae9fa6 Next time I'll never use github.dev again 2022-04-28 03:37:09 +08:00
Yazawazi
9092c9b3f9 import 2022-04-28 03:31:36 +08:00
Yazawazi
f16d33b413 Player show avatar list 2022-04-28 03:21:51 +08:00
Melledy
f6db39926d Fix co-op requests not showing up 2022-04-27 11:23:33 -07:00
Melledy
10e5851a59 Add message about the server being free 2022-04-27 11:23:33 -07:00
Melledy
555937d2aa Fixed concurrency issue in killall 2022-04-27 11:23:33 -07:00
Melledy
8bf17a8bdc Fixed genesis crystals not being given to player 2022-04-27 11:23:33 -07:00
Melledy
1586bab5d7 Gacha banner tweaks 
Removed min/maxItemType
Added configurable base weight values for banners
 2022-04-27 11:23:33 -07:00
Melledy
1130138a4f Fix internal server error when changing characters 2022-04-27 11:23:33 -07:00
KingRainbow44
d32f706cf3 Merge branch 'development' into api 
# Conflicts:
#	src/main/java/emu/grasscutter/plugin/api/ServerHook.java
 2022-04-27 14:05:34 -04:00
Yazawazi
2ba16cf8b2 comment & mooncard 2022-04-27 08:42:48 -07:00
Yazawazi
32d322b0be onEnable & onDisable 2022-04-27 08:42:48 -07:00
Yazawazi
5b6ecc7219 Task Improvement 2022-04-27 08:42:48 -07:00
Kengxxiao
669e58d9f3 Merge branch 'development' into dev-feature-drop 2022-04-27 22:54:59 +08:00
Kengxxiao
ee3a0c32fc use better shop config structure 2022-04-27 07:35:31 -07:00
Kengxxiao
3e0ccbbbde implement npc shop 2022-04-27 07:35:31 -07:00
ayy lmao
0e3a80407e Added missing isGiftMail section to GetAllMailRsp 2022-04-27 15:11:57 +02:00
Kengxxiao
57e408012b reset drop table in reload command 2022-04-27 17:44:12 +08:00
Kengxxiao
8b614d8df8 implement simple drop system 2022-04-27 17:42:02 +08:00
Magix
d19bc12761 Update Grasscutter.java 
why do i have to fix stable
 2022-04-27 11:33:36 +02:00
Melledy
d1fc8c1faa Moved some files around 2022-04-26 21:27:35 -07:00
Melledy
1c36f0785b Renamed all references to a certain game 2022-04-26 21:27:35 -07:00
Melledy
6b8902bee2 Deprecate getServer() in DispatchServer, use getHttpServer() instead 2022-04-26 21:27:35 -07:00
Melledy
9afa32928a Cleanup https server creation in dispatch server 2022-04-26 21:27:35 -07:00
Melledy
cdb08195ee Fix cherry pick issues from drown packets 2022-04-26 21:27:35 -07:00
TheLostTree
a0ed13182c git doesnt like me 2022-04-26 21:27:35 -07:00
TheLostTree
687bc7ce87 drowning added 2022-04-26 21:27:35 -07:00
Melledy
d81895543f Call PacketItemAddHintNotify from addItem 2022-04-26 21:27:35 -07:00
Melledy
4420918f9c Rename handler 2022-04-26 21:27:35 -07:00
Melledy
7cf0e448cd World level updates without needing to restart 2022-04-26 21:27:35 -07:00
Melledy
9b7293272b Fix white screen after logging in 2022-04-26 21:27:35 -07:00
KingRainbow44
47d8fd3c43 Add get methods to the server hook 2022-04-26 21:24:37 -04:00
KingRainbow44
d4f9820e44 Added getting resources from the JAR 2022-04-26 21:24:09 -04:00
Benjamin Elsdon
cebc140228 GenshinPlayer fix (for two issues) and updated sendmail with Magix's suggestions 2022-04-27 09:03:26 +08:00
KingRainbow44
f3061a366e gave up, Pass class as argument to constructor 2022-04-26 20:54:56 -04:00
KingRainbow44
ae6a6abcd1 woo back to generics 2022-04-26 20:47:45 -04:00
KingRainbow44
749293350d Add dispatch to server hook & create instance 2022-04-26 20:47:28 -04:00
Benjamin Elsdon
0917f516ea Merge remote-tracking branch 'upstream/development' into dev-mail 2022-04-27 08:41:10 +08:00
Benjamin Elsdon
ed3f88f013 Removed debug messages, readded protos, fixed gradle 2022-04-27 08:36:13 +08:00
KingRainbow44
88bdaf155f Use a custom consumer instead of the built-in one 2022-04-26 20:28:13 -04:00
KingRainbow44
993255235e Fix handler invocation 2022-04-26 19:58:03 -04:00
KingRainbow44
0e514b9002 Fix handler creation 2022-04-26 19:57:32 -04:00
Melledy
2935f0a6d3 Merge pull request #270 from Yazawazi/development 
Add `bless of moon` feature
 2022-04-26 16:39:57 -07:00
Benjamin Elsdon
b9f7c657ac Merge remote-tracking branch 'upstream/development' into dev-mail 2022-04-27 07:37:05 +08:00
Yazawazi
aa4b88d762 cron expression comments 2022-04-27 07:19:30 +08:00
Yazawazi
e8b34b6179 comments del 2022-04-27 07:14:02 +08:00
Yazawazi
ac796675f2 comments 2022-04-27 07:08:33 +08:00
Yazawazi
420f544d68 DateHelper 2022-04-27 07:01:05 +08:00
Magix
71524b0b66 Merge pull request #178 from BaiSugar/development 
Added command to get all items
 2022-04-26 18:45:08 -04:00
Yazawazi
aab6627203 del outerclass 2022-04-27 06:25:00 +08:00
Yazawazi
49854e4514 utils 2022-04-27 06:15:59 +08:00
Yazawazi
43470a384d date helper 2022-04-27 06:12:35 +08:00
Yazawazi
748e64a60c Moon Card 2022-04-27 06:04:21 +08:00
WetABQ
addfb5eb5d [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
46d897ac92 Fix handlers 2022-04-26 14:09:00 -04:00
KingRainbow44
35ff35039b Fix Javadoc & Update version 2022-04-26 14:08:48 -04:00
KingRainbow44
82bca7a612 Overhaul event handling (designed by WetABQ#3417) 2022-04-26 13:52:10 -04:00
Magix
627a2f1ee8 Merge branch 'api' into development 2022-04-26 11:17:02 -04:00
Magix
fe055af5e0 Merge pull request #262 from exzork/plugin-system 
load all classes from plugin
 2022-04-26 10:27:36 -04:00
muhammadeko
9fb5b69ddd load all classes from plugin 2022-04-26 19:45:23 +07:00
BaiSugar
3c5f3d4157 remove test avatar 2022-04-26 16:35:06 +08:00
Benjamin Elsdon
3db1a86609 Merge remote-tracking branch 'upstream/development' into dev-mail 2022-04-26 15:45:58 +08:00
KingRainbow44
e27bdd9bb6 Add more events 2022-04-26 02:07:00 -04:00
KingRainbow44
502fe7ed13 Reimplement the region list event 2022-04-26 00:45:42 -04:00
KingRainbow44
e681453a15 Begin on plugin API 2022-04-26 00:39:43 -04:00
KingRainbow44
d23050ffa5 Bug fix & Cleanup 2022-04-26 00:39:30 -04:00
KingRainbow44
2369f92cb4 Fix command issue 2022-04-26 00:39:05 -04:00
KingRainbow44
03988414ce Refactor classes 2022-04-26 00:04:03 -04:00
Benjamin Elsdon
a2069c0084 Merge remote-tracking branch 'upstream/development' into dev-mail 2022-04-26 11:59:16 +08:00
Benjamin Elsdon
a5677a8e34 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
b2f1142116 Add getter for DispatchServer's HttpServer 2022-04-25 14:34:37 -07:00
Melledy
614477181f Fix concurrency related error while spawning monsters 2022-04-25 14:28:45 -07:00
Melledy
2228332f9d Call checkSpawns from World instead of from Player 2022-04-25 14:28:45 -07:00
Melledy
c3f9fd3ce3 Synchronize scene entity map 2022-04-25 14:28:45 -07:00
Melledy
1c691748f5 Make monsters scale off world level 2022-04-25 14:28:45 -07:00
Melledy
f28f21b061 Dont deregister scenes if the player is going to tp back into them 2022-04-25 14:28:44 -07:00
Melledy
711e6eabd0 Natural spawn test 
(without luas)
 2022-04-25 14:28:44 -07:00
Magix
dce13cf6af Merge branch 'development' into plugin-system 2022-04-25 17:08:18 -04:00
xtaodada
b6fedcf262 Support kill from console 2022-04-25 11:01:18 -07:00
xtaodada
dc6702eb5c Add a new alias to the command killcharacter 2022-04-25 11:01:18 -07:00
xtaodada
00a40a84bb Add killcharacter command 2022-04-25 11:01:18 -07:00
alt3ri
5dd5f70903 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
56eb711055 Delete ClearArtifactsCommand.java 2022-04-25 11:00:10 -07:00
alt3ri
c1ef679e30 Delete ClearWeaponsCommand.java 2022-04-25 11:00:10 -07:00
Benjamin Elsdon
c68c75e8ce Send Mail Command! 
Almost done! Wooooo!
 2022-04-25 21:53:10 +08:00
Benjamin Elsdon
e30352a667 Forgot to implement levels into GetMailItemRsp 
Also added promoteLevels
 2022-04-25 16:42:56 +08:00
Benjamin Elsdon
3f11cc41b2 More weird git stuff 2022-04-25 16:32:26 +08:00
Benjamin Elsdon
b29bcb553a Weird git stuff 2022-04-25 16:25:33 +08:00
Benjamin Elsdon
c4de030496 Added ChangeMailStarNotify (change importance level) 2022-04-25 16:23:23 +08:00
Benjamin Elsdon
8d427f2317 Mail read notify 2022-04-25 16:23:23 +08:00
Benjamin Elsdon
67b4c274ec Deleting mail + a bit of cleanup 2022-04-25 16:23:22 +08:00
Benjamin Elsdon
9bf94f9539 Receiving items in mail 2022-04-25 16:22:13 +08:00
Benjamin Elsdon
a548fe6c52 THE MAILBOX ACTUALLY WORKS CORRECTLY NOW 2022-04-25 16:22:12 +08:00
Benjamin Elsdon
29a3e64db0 Java-16 compatiable mail system (whoops) 2022-04-25 16:22:12 +08:00
Benjamin Elsdon
69779a0321 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
e24de95d29 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
346652cf5b Initial work on mail 2022-04-25 16:18:23 +08:00
Benjamin Elsdon
3787cfad59 Added ChangeMailStarNotify (change importance level) 2022-04-25 16:11:57 +08:00
Melledy
d9e1ed5083 Merge branch 'stable' into development 2022-04-25 00:58:53 -07:00
Asnxthaony
480374fb39 fix indent by using smart tabs 2022-04-25 00:54:11 -07:00
Asnxthaony
4e5d72a99a sanity check 2022-04-25 00:54:11 -07:00
Asnxthaony
122568ad27 fix SetPlayerBirthdayRsp 2022-04-25 00:54:11 -07:00
Benjamin Elsdon
4c7bd69eb0 Mail read notify 2022-04-25 15:41:18 +08:00
BaiSugar
c6bd1fa5d4 remove test avatar 2022-04-25 15:17:55 +08:00
Benjamin Elsdon
721d8b7223 Deleting mail + a bit of cleanup 2022-04-25 14:30:56 +08:00
Benjamin Elsdon
785effe8da Receiving items in mail 2022-04-25 13:51:19 +08:00
Yan
2238a7c3aa fix setting electro dmg stat 2022-04-24 17:57:42 -07:00
alangy98
21b3ac103a Revert "bugfix: portbind error when falling back to http server" 
This reverts commit 4817ed9c52.
the bugfix is inappropriate
 2022-04-24 17:57:18 -07:00
alt3ri
4837ccb983 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
5010b8ac75 add setfriendship aliases 2022-04-24 10:32:47 -07:00
Alangy
4817ed9c52 bugfix: portbind error when falling back to http server 2022-04-24 23:05:08 +08:00
BaiSugar
1c15dd3c32 fix 2022-04-24 22:49:33 +08:00
BaiSugar
5eeea84f8e Corrected format 2022-04-24 22:46:43 +08:00
BaiSugar
885e2d078c Corrected format 2022-04-24 22:45:30 +08:00
BaiSugar
f3d561cd06 Revert "Corrected format" 
This reverts commit 60319ee9eb.
 2022-04-24 22:42:44 +08:00
BaiSugar
60319ee9eb Corrected format 2022-04-24 22:38:53 +08:00
Melledy
929bb38f2e Merge pull request #180 from Yazawazi/development 
Fix the property prompt issue in fetter system
 2022-04-24 07:21:34 -07:00
Melledy
edd0bccf5a 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
0796957751 Added command to get all items 2022-04-24 21:52:50 +08:00
Benjamin Elsdon
94a75cf903 THE MAILBOX ACTUALLY WORKS CORRECTLY NOW 2022-04-24 19:06:52 +08:00
memetrollsXD
8066b16417 Add .vscode to gitignore and use @fumbling644o's implementation 2022-04-24 12:24:41 +02:00
Benjamin Elsdon
f556bff333 Java-16 compatiable mail system (whoops) 2022-04-24 18:17:08 +08:00
Benjamin Elsdon
c25e809f5c Merge remote-tracking branch 'upstream/development' into dev-mail 2022-04-24 18:01:32 +08:00
Yazawazi
23f0406b57 command fix too 2022-04-24 15:10:25 +08:00
Yazawazi
5c0c4fe67e Merge branch 'Grasscutters:development' into development 2022-04-24 15:03:58 +08:00
Melledy
b6d8dd0db4 Merge pull request #175 from omg-xtao/suicide 
GodMode command supports playerId
 2022-04-24 00:03:21 -07:00
Yazawazi
8d8866aa63 Fix fetter system 2022-04-24 15:02:31 +08:00
BaiSugar
02ef9d84c7 Added command to get all items 2022-04-24 14:01:03 +08:00
Yazawazi
56a1ab64ab Player Level Reward Update Notify Support! 2022-04-24 13:22:26 +08:00
xtaodada
2f5ae6c784 GodMode command supports playerId 2022-04-24 11:40:10 +08:00
Yazawazi
b2840b1740 Player level reward 2022-04-24 11:25:13 +08:00
memetrollsXD
79d646d358 Remove last catch and init another variable as placeholder 2022-04-24 04:50:22 +02:00
memetrollsXD
bed3181252 Forgot the toCharArray 2022-04-24 04:41:06 +02:00
memetrollsXD
2045dd2832 Notify user that new pw was used 2022-04-24 04:36:11 +02:00
memetrollsXD
8f81195336 Try to fix "No SSL cert found bind exception" 2022-04-24 04:34:17 +02:00
Melledy
81ee9a00a2 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
7a4de2f0d6 Merge pull request #128 from memetrollsXD/development 
Use count for level for equips (dev branch)
 2022-04-23 15:15:22 -07:00
Miyucchi
7792c5c73f Fix counter 2022-04-24 00:10:26 +02:00
Yazawazi
9e523da18e tp with relative coordinates 2022-04-24 05:20:59 +08:00
Yazawazi
0c4d975409 Merge branch 'Grasscutters:development' into development 2022-04-24 05:03:55 +08:00
memetrollsXD
fd1890b072 Merge branch 'Grasscutters:development' into development 2022-04-23 22:37:48 +02:00
xtaodada
2dd8932144 Add Teleport command 2022-04-24 03:10:07 +08:00
Yazawazi
3baef42aac Name Card Done!!!!!!!!!!! 2022-04-23 23:48:06 +08:00
Benjamin Elsdon
9e7c9f4670 Merge remote-tracking branch 'upstream/development' into dev-mail 2022-04-23 23:07:38 +08:00
Benjamin Elsdon
cb03b654bc 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
ad1c3f9a3b Will 2022-04-23 22:16:59 +08:00
Yazawazi
aa4489497e Merge branch 'Grasscutters:development' into development 2022-04-23 22:16:21 +08:00
memetrollsXD
57e3637251 Add promoteLevel and count 2022-04-23 16:11:45 +02:00
xtaodada
301d0a174c Add another way to set talent level 2022-04-23 21:13:45 +08:00
Yazawazi
3bc249f042 Try to give name card 2022-04-23 21:03:29 +08:00
Yazawazi
042bdc2ff2 Merge branch 'Grasscutters:development' into development 2022-04-23 19:58:17 +08:00
Melledy
9fab2682ee Merge pull request #153 from TheLostTree/main 
Handle drowning
 2022-04-23 04:39:02 -07:00
Melledy
16a7c9dd67 Revert "Drowning packets handled" 2022-04-23 04:36:34 -07:00
TheLostTree
3d9b71dc4d git doesnt like me 2022-04-23 03:32:08 -07:00
TheLostTree
91894380cb drowning added 2022-04-23 03:19:33 -07:00
Jaida Wu
3eabd40345 Make some control panel happy 
Signed-off-by: Jaida Wu <mlgmxyysd@meowcat.org>
 2022-04-23 16:47:13 +08:00
Melledy
df1dca8d87 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
cd08c52b35 Fix PlayerBirthday exception 
Signed-off-by: Jaida Wu <mlgmxyysd@meowcat.org>
 2022-04-23 15:39:56 +08:00
KingRainbow44
8afcc0b89a Add message for bind failure (HTTP) 2022-04-23 02:20:18 -04:00
KingRainbow44
832c460a83 Implement packet send/receive events 2022-04-23 02:08:31 -04:00
KingRainbow44
600decbc09 Implement region events 2022-04-23 01:59:06 -04:00
KingRainbow44
6056e962d6 Implement an event handler 2022-04-23 01:58:37 -04:00
KingRainbow44
7a3fbcdcf7 Plugin enabling & disabling 2022-04-23 01:17:35 -04:00
KingRainbow44
3ba8c42b42 Merge origin/development into plugin-system 2022-04-23 00:55:31 -04:00
KingRainbow44
15da839503 Update Grasscutter for Java 16 & Plugins 2022-04-23 00:53:11 -04:00
Melledy
a957379afb Merge pull request #131 from Raeliana/patch-1 
Create ClearWeaponsCommand.java
 2022-04-22 21:36:52 -07:00
Melledy
02c852716a Merge pull request #136 from miyucchi/development 
Save birthday date
 2022-04-22 21:35:58 -07:00
Melledy
3ed6a99445 Merge pull request #127 from yarik0chka/development 
Implemented sitting
 2022-04-22 21:34:36 -07:00
Magix
0992fc11b4 Add keystore password 2022-04-22 23:53:37 -04:00
Yazawazi
5ea5ea238c OpenCond for unlocking judgment 2022-04-23 10:51:22 +08:00
Yazawazi
b11009f724 Merge branch 'Grasscutters:development' into development 2022-04-23 10:43:27 +08:00
Melledy
716380a078 Merge branch 'development' into java-16 2022-04-22 19:23:32 -07:00
KingRainbow44
e3d6b86dd9 Basic plugin manager 2022-04-22 21:45:44 -04:00
Miyucchi
539970fd50 Feature: SetBirthdayDate 2022-04-23 03:29:08 +02:00
Miyucchi
7fd0b371d0 Profile set birthday feature 2022-04-23 03:22:32 +02:00
KingRainbow44
1a056d2d13 Move manifest to resources 2022-04-22 20:42:55 -04:00
Raeliana
cdf6c697f1 Create ClearWeaponsCommand.java 
A command to clear unlocked and unequipped artifacts
 2022-04-23 02:48:04 +03:00
Melledy
dffffc8d49 Merge branch 'stable' into development 2022-04-22 16:34:41 -07:00
Yazawazi
7ccecda07c AvatarFetterLevelReward 2022-04-23 06:08:37 +08:00
memetrollsXD
a52eaf9bbc Use count for level for equips 2022-04-22 23:19:58 +02:00
PasserbyAlpha
6cc0fdaeed use OutputStreamWriter to ensure the charset of output is utf8 [from fumbling644o] 2022-04-23 02:28:34 +08:00
yarik0chka
3ca181e76d Implemented sitting 2022-04-22 23:24:51 +05:00
xtaodada
4605c6506e Add PublicPort field to server 2022-04-23 01:42:04 +08:00
Yazawazi
48db644692 command fix 2022-04-23 01:36:48 +08:00
xtaodada
104d10352b Add PublicPort field to Dispatch server 2022-04-23 01:16:55 +08:00
Yazawazi
eb70904660 setfetterlevel command 2022-04-22 23:46:24 +08:00
PasserbyAlpha
68218cbb49 fixed encoding problem when generating gm handbook 2022-04-22 23:11:29 +08:00
Yazawazi
159b10af72 AvatarFetterLevel 2022-04-22 22:27:40 +08:00
Jaida Wu
e02917a527 Add FrontHTTPS field to Dispatch server 
Signed-off-by: Jaida Wu <mlgmxyysd@meowcat.org>
 2022-04-22 21:25:58 +08:00
Melledy
9b23bfa556 Revert "Explicitly load and save UTF-8 for the handbook" 
This reverts commit 215ee2a3b2.
 2022-04-22 05:20:02 -07:00
Melledy
f4f8a86a8c Merge pull request #113 from 01101sam/patch-1 
[typo] Fix resources folder tips
 2022-04-22 04:38:04 -07:00
Melledy
acd59d1788 Merge pull request #114 from alt3ri/development 
Added /talent command
 2022-04-22 04:35:10 -07:00
Melledy
95c6b9486d 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
a326581efd 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
63898a18df Deleted 2 lines 2022-04-22 17:38:58 +07:00
alt3ri
370483fae2 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
2aaf70c031 [typo-upd] Add missing folder 2022-04-22 17:43:06 +08:00
Sam
b629e8c652 [typo] Fix resources folder tips 2022-04-22 17:36:24 +08:00
Benjamin Elsdon
04a85d1ebb Initial work on mail 2022-04-22 15:52:31 +08:00
fumbling
215ee2a3b2 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
Magix
1cf1a951dd Merge pull request #94 from Yazawazi/development 
Try to show characters' stories and voices
 2022-04-21 23:12:02 -04:00
Yazawazi
123fc263ba cache fetters 2022-04-22 10:39:25 +08:00
fumbling
06101f1b9c 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
b31dab04eb change fhp to heal 2022-04-22 08:45:46 +08:00
Yazawazi
376c668dd9 no more NullPointerException pls 2022-04-22 08:30:02 +08:00
fengyuecanzhu
ff778914cb remove revive command 2022-04-22 08:26:48 +08:00
fengyuecanzhu
28db79876b add fullfp command 2022-04-22 08:08:47 +08:00
Yazawazi
2350f0ebe2 ee, forget to change variables when copying from local 2022-04-22 07:49:35 +08:00
Yazawazi
044c2a3086 typo 2022-04-22 07:42:17 +08:00
Yazawazi
eedab79253 fetter try 2022-04-22 07:37:25 +08:00
Melledy
16318b3793 Merge pull request #74 from 4Benj/development 
Server run modes and multi-server dispatch support
 2022-04-21 15:06:57 -07:00
Melledy
04791b68be 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
e884970ac4 Merge branch 'development' into account-fix 2022-04-21 14:46:07 -07:00
Melledy
58535dd1ce Save config everytime you load so the new options show up 2022-04-21 14:44:55 -07:00
Melledy
db1c4cd462 Merge pull request #88 from alt3ri/development 
Added /revive command
 2022-04-21 14:05:09 -07:00
Melledy
e10bad5b17 Fix account dupe key error after selecting starting character 2022-04-21 14:02:17 -07:00
alt3ri
abe05a9b5d Added /revive command 
Now it's more convenient to revive character without food :>
 2022-04-22 02:28:52 +07:00
Melledy
c8100394d9 Merge pull request #86 from alt3ri/patch-7 
Fix typo
 2022-04-21 11:47:30 -07:00
Melledy
4431469334 Merge pull request #84 from yarik0chka/development 
Add a changing weather id
 2022-04-21 11:47:13 -07:00
Yazawazi
069cb1c6d3 Teleport Small Fix 2022-04-22 02:23:02 +08:00
alt3ri
452e89b4db 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 0e7976f906/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
0480f10a1a Add a changing weather id 2022-04-21 22:21:24 +05:00
Benjamin Elsdon
23caf994c7 Forgot a dispatch prefix on error while merging 2022-04-22 01:15:05 +08:00
Benjamin Elsdon
9eca5123a5 Merge remote-tracking branch 'upstream/development' into development 2022-04-22 01:04:03 +08:00
Melledy
0e7976f906 Merge pull request #78 from MlgmXyysd/dispatch-refactor 
Refact dispatch server
 2022-04-21 09:03:53 -07:00
Jaida Wu
54856147ef Listens to all addresses by default 
Signed-off-by: Jaida Wu <mlgmxyysd@meowcat.org>
 2022-04-22 00:02:03 +08:00
Jaida Wu
d11413c017 Add dispatch server log prefix 
Signed-off-by: Jaida Wu <mlgmxyysd@meowcat.org>
 2022-04-22 00:02:02 +08:00
Jaida Wu
1143886b09 Add some log to dispatch server 
Signed-off-by: Jaida Wu <mlgmxyysd@meowcat.org>
 2022-04-22 00:02:00 +08:00
Jaida Wu
12674f6cec 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
23226ad464 Refact code 
Signed-off-by: Jaida Wu <mlgmxyysd@meowcat.org>
 2022-04-22 00:01:54 +08:00
Melledy
dccee2dfde 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
bf61d6fb10 Merge pull request #79 from zamlty/development 
Fix artifact & weapon generation by give command
 2022-04-21 09:00:30 -07:00
Benjamin Elsdon
beb8675190 Should probably remove this as well... 2022-04-21 23:04:02 +08:00
Benjamin Elsdon
2c509237a5 Removed class left over from testing 2022-04-21 23:00:36 +08:00
Jaida Wu
9867ce7369 Add list command 
Signed-off-by: Jaida Wu <mlgmxyysd@meowcat.org>
 2022-04-21 22:55:32 +08:00
Benjamin Elsdon
1969d38e06 DatabaseManager clean up 2022-04-21 22:50:06 +08:00
Benjamin Elsdon
77fcce6510 Fixed null pointer exception in game only mode 
PacketPlayerLoginRsp now creates the required QuerryCurrRegionHttpRsp itself.
 2022-04-21 22:38:01 +08:00
zamlty
bce3e256cf Fix artifact & weapon generation by give command 2022-04-21 22:21:39 +08:00
xmplay
77b33377d8 bring back the jade chamber and other old scene tags 2022-04-21 15:04:47 +01:00
Jaida Wu
e242e72b2d Drop independent log server 
Signed-off-by: Jaida Wu <mlgmxyysd@meowcat.org>
 2022-04-21 21:41:30 +08:00
Benjamin Elsdon
1275592747 Fixed null pointer exception in hybrid mode. 2022-04-21 19:20:49 +08:00
Benjamin Elsdon
1500d2e885 Merge branch 'development' of https://github.com/Melledy/Grasscutter into development 2022-04-21 18:11:51 +08:00
Benjamin Elsdon
9ce436022d Multi-server dispatch support and server run modes 2022-04-21 18:04:00 +08:00
Melledy
4c1dc34c1f Merge pull request #70 from Grasscutters/dev-fixes 
Dev fixes
 2022-04-21 00:31:01 -07:00
Melledy
bc07fa77b2 Make sure SetEntityClientDataNotify is a valid proto before replaying it to the other players 2022-04-21 00:29:06 -07:00
Melledy
29f6d77e2f Add config entry for OverseaLogPort (default: 8888) 2022-04-21 00:28:28 -07:00
Melledy
9cebd7be9a Merge pull request #69 from Grasscutters/dev-fixes 
Dev fixes
 2022-04-21 00:09:12 -07:00
KingRainbow44
0a96012f2c why is Account#onLoad THE DAMN REASON FOR HOURS OF TESTING 2022-04-21 02:07:05 -04:00
Benjamin Elsdon
83fe5818dc Restructured the config file in preperation for server run modes 2022-04-21 13:53:50 +08:00
Melledy
74bce2fe18 Merge pull request #66 from labalityowo/development 
Remove stella constellation appeareance in gacha pull
 2022-04-20 22:09:56 -07:00
Melledy
24b1fd2045 Merge pull request #65 from fengyuecanzhu/development 
args check for setstats command
 2022-04-20 22:05:58 -07:00
Melledy
af1ecca963 More refactoring (player id -> player uid) 2022-04-20 21:50:33 -07:00
fengyuecanzhu
7fcaa97a6a add args check 2022-04-21 12:49:23 +08:00
labalityowo
2b0831b7de Remove the stella appearance 2022-04-21 11:42:21 +07:00
Melledy
b99ca4e02f Refactor PacketSceneTransToPointRsp and add a null check when getting ScenePointEntries 2022-04-20 21:33:58 -07:00
Melledy
1250194480 Fix weapon skills (and artifact sets) not working when you equip them 2022-04-20 21:03:18 -07:00
KingRainbow44
b902fa6f48 Fix command detection 2022-04-20 23:56:27 -04:00
fengyuecanzhu
f3ede17d4d change description 2022-04-21 11:52:53 +08:00
fengyuecanzhu
4ab12f418e add description and permission to setstats command 2022-04-21 11:43:31 +08:00
Yazawazi
f6df468e47 folder check 2022-04-21 10:37:24 +08:00
Melledy
8a8906098e Fix not being able to join friend's world 2022-04-20 18:48:26 -07:00
Melledy
7f2de4fab8 Fix player location updates in co-op 2022-04-20 18:44:02 -07:00
Melledy
b9876fc056 Fix water and the visual map in archipelago 2022-04-20 18:37:07 -07:00
KingRainbow44
d7328dda50 Update Morphia to 2.x 2022-04-20 21:11:57 -04:00
KingRainbow44
415f22d956 Fix merge conflict 2022-04-20 18:55:01 -04:00
KingRainbow44
652a2154ce Magix sanity. 2022-04-20 18:48:24 -04:00
Melledy
a506117053 Merge pull request #60 from Yazawazi/development 
Adding a `Teleport to Waypoint` Function
 2022-04-20 14:31:14 -07:00
Yazawazi
ec438dc16e session send sorry 2022-04-21 04:59:42 +08:00
alt3ri
d33ab09e5f Added Elemental Bonus 
Usage: /stats <epyro | ecryo | ehydro | egeo | edend | eelec | ephys> <amount> for elemental bonus
 2022-04-21 03:47:17 +07:00
Yazawazi
6f43c0765f teleports 2022-04-21 04:45:38 +08:00
alt3ri
d0529641b3 Adding Elemental DMG Bonus 
Added Elemental DMG Bonus command. 
> /stats <epyro | ecryo | ehydro | egeo | edend | eelec | ephys> <amount>
 2022-04-21 03:43:57 +07:00
Melledy
19572f46e3 Merge pull request #55 from memetrollsXD/development 
Custom Y position on MarkMapReq
 2022-04-20 12:36:42 -07:00
Benjamin Elsdon
482c174ee7 Reload command now reloads gacha config (again) 2022-04-21 00:28:14 +08:00
Benjamin Elsdon
41b4965aef Merge remote-tracking branch 'upstream/development' 2022-04-21 00:25:47 +08:00
KingRainbow44
69aa6130e9 Fix command map 2022-04-20 12:17:56 -04:00
memetrollsXD
d5d9056452 Custom Y position on MarkMapReq 2022-04-20 17:55:33 +02:00
Benjamin Elsdon
cb104ac79a Merge branch 'development' of https://github.com/Melledy/Grasscutter 2022-04-20 21:38:59 +08:00
Jaida Wu
4d8a16ece8 Add setstats command 
Signed-off-by: Jaida Wu <mlgmxyysd@meowcat.org>
 2022-04-20 21:15:37 +08:00
iTruth
de0a14a589 Fix playerOpt is always throw an exception when it's null 2022-04-20 21:14:18 +08:00
Jaida Wu
54faab8f0d Add restart command 
Signed-off-by: Jaida Wu <mlgmxyysd@meowcat.org>
 2022-04-20 21:06:59 +08:00
Jaida Wu
00a746be3c Correct pos usage 
Signed-off-by: Jaida Wu <mlgmxyysd@meowcat.org>
 2022-04-20 21:04:09 +08:00
Jaida Wu
e8a3059907 Add weather command 
Signed-off-by: Jaida Wu <mlgmxyysd@meowcat.org>
 2022-04-20 21:03:30 +08:00
Jaida Wu
c42fa4ee5d Add pos command 
Signed-off-by: Jaida Wu <mlgmxyysd@meowcat.org>
 2022-04-20 20:58:57 +08:00
Jaida Wu
b44df66c94 Save account to database 
Signed-off-by: Jaida Wu <mlgmxyysd@meowcat.org>
 2022-04-20 20:56:22 +08:00
Jaida Wu
63cb0a8174 Rewrite commands 
Signed-off-by: Jaida Wu <mlgmxyysd@meowcat.org>
 2022-04-20 20:21:38 +08:00
Melledy
7fc587e7d6 Merge pull request #49 from Grasscutters/dev-abilities 
Fix character abilities not showing for others in co-op/lasting too long
 2022-04-20 05:15:32 -07:00
Melledy
b3db933a16 Merge pull request #41 from w4123/npctalk_patch 
Try to implement NpcTalk packets
 2022-04-20 04:51:42 -07:00
Melledy
105efe1d81 Merge pull request #44 from Yazawazi/main 
Add /weather Command
 2022-04-20 04:50:48 -07:00
alt3ri
c603093d47 Replace SetHealth -> SetStats 
Now you can set basic stats of your current character, but I left a little notice: Input and In-game output (character stats) are not really accurate. So to get an accurate stat:

For HP, ATK , DEF, Elemental Mastery (EM): input less than 10 digits. Example: /stats atk 81923 (81293 ATK)
For Energy Recharge (ER), Crit Rate, Crit DMG: input less than 6 digits(0-99999) to get the game current format. Example: /stats cdmg 14236 (142.4% Crit DMG)
(!) The modified stats will be set to default after you logged out.

Press F to pay respect to SetHealth (2022 - 2022)
 2022-04-20 18:24:32 +07:00
Yazawazi
7e6bcca2c3 Merge branch 'development' into main 2022-04-20 19:09:48 +08:00
Melledy
5a09c22aa1 Fix character abilities not showing for others in co-op/lasting too long 2022-04-20 03:42:59 -07:00
alt3ri
aeb335c843 Adding /pos 
Some people want to get the coordinate, here you go!
 2022-04-20 17:40:26 +07:00
Melledy
fda205015b Fix account not found issue when logging in 2022-04-20 03:28:54 -07:00
Benjamin Elsdon
e8601de5d5 Added OnGameServerStartFinish EventBus 
Removed those temporary warning messages as I figured out how to disable them
 2022-04-20 17:44:44 +08:00
Benjamin Elsdon
b7f5cc9748 Added OnGameServerStop EventBus 
There is a temporary warning message telling users to ignore the 'No subscribers registered' error. This can be removed once things actually subscribe to it
 2022-04-20 17:31:41 +08:00
Benjamin Elsdon
22781ac6e7 Merge branch 'development' of https://github.com/Melledy/Grasscutter 2022-04-20 17:18:51 +08:00
Benjamin Elsdon
1c2560736f /reload now reloads the gacha as well 2022-04-20 17:17:59 +08:00
Melledy
88e608adba Merge pull request #40 from Grasscutters/auto-account 
Create the account if it doesn't exist on the login screen
 2022-04-20 02:17:21 -07:00
Yazawazi
500580f368 Add /weather Command 2022-04-20 17:16:21 +08:00
Benjamin Elsdon
26e1341ce9 Out of my madness and suffering I have achieved the impossible. I almost lost all hope and was about to end it all. However, it worked out in the end and now we have gacha reloading. 2022-04-20 17:14:07 +08:00
Benjamin Elsdon
28a070f19a Forgot config check 2022-04-20 16:07:18 +08:00
Benjamin Elsdon
d59799ce55 Update gradle + Work gacha reload (gs broken atm) 2022-04-20 16:05:53 +08:00
memetrollsXD
77076a766b Merge branch 'development' into restart-command 2022-04-20 09:03:18 +02:00
memetrollsXD
2632ae373c Fix merge conflict 2022-04-20 09:00:50 +02:00
memetrollsXD
ad1e9400e3 It won't get better than this for now.. 2022-04-20 08:52:47 +02:00
w4123
716b6df2ec Implement stub NpcTalk packets 2022-04-20 12:25:38 +08:00
KingRainbow44
7137f5b715 totally not me forgetting how this works 2022-04-20 00:15:37 -04:00
KingRainbow44
107f6b9a44 Change to String#equals 2022-04-20 00:10:43 -04:00
KingRainbow44
f58c590aa3 Add config option 2022-04-20 00:10:32 -04:00
KingRainbow44
dd826abb55 Automatically create account on login screen 2022-04-20 00:03:01 -04:00
KingRainbow44
866941589b Small updates to server commands 2022-04-19 14:11:48 -04:00
Magix
71cdd2c8e9 Merge branch 'main' into main 2022-04-19 14:07:39 -04:00
memetrollsXD
d603681355 Try PlayerTokenRsp instead of LoginRsp 2022-04-19 19:45:39 +02:00
memetrollsXD
657ac2e529 WIP Restart command - For now disconnects session, preferrably just send PlayerLoginRsp so it does the login sequence all over again 2022-04-19 19:39:54 +02:00