Compare commits

...

482 Commits

Author SHA1 Message Date
Melledy
baff0d8fec Merge branch 'development' into 2.7 2022-05-27 11:07:11 -07:00
Melledy
141b1913cb Refactor accounts to not use a player uid 2022-05-27 00:22:55 -07:00
ProxyismGH
fc687a3bde TeamManager avatar add refactor. 2022-05-26 22:54:36 -07:00
logictc
e152728ddc fix no melee attach and adjust skill particle amount 2022-05-26 15:26:47 -07:00
ImmuState
cb2d6da2c5 Some refactoring. 2022-05-26 03:41:19 -07:00
ImmuState
35ad284c42 Introduce a simpler way to get the original owner of an EntityClientGadget 2022-05-26 03:41:19 -07:00
logictc
24dc2c47a6 remove debug msg 2022-05-25 21:10:10 -07:00
logictc
bdbdbd53b9 change indentation to tab 2022-05-25 21:10:10 -07:00
logictc
a5ab979418 fix indentation 2022-05-25 21:10:10 -07:00
logictc
eb5ff22464 implement skill particle generation 2022-05-25 21:10:10 -07:00
ImmuState
ef20177a6b
Energy: Particle/Orb Drops from Monsters (#1054)
* Generate energy drops for monsters + make sure picking up particles honors their count.

* Use drop info from excels instead.

* Remove double newline.

* Remove commented code.
2022-05-24 21:43:04 -07:00
logictc
c45dd92ba5 don't take effect if energyUsage is false 2022-05-24 14:43:02 -07:00
logictc
40129ab346 clear energy on death 2022-05-24 14:43:02 -07:00
logictc
8f6f30c813 implement persist energy 2022-05-24 14:43:02 -07:00
tester233
8c45c25da5 Update zh-CN.json 2022-05-24 14:19:24 -07:00
tester233
920891e2bb Fix usage & update zh-CN.json 2022-05-24 14:19:24 -07:00
Apexo01
4fd02081bb Update README.md 2022-05-24 05:34:04 -07:00
Apexo01
4704f4cc41 fix java search in start.cmd 2022-05-24 05:34:04 -07:00
ShiroSaki
74649f28f6 Fix new account can't load codex datas 2022-05-23 23:55:46 -07:00
ShigemoriHakura
ec7a6aec50 remove unused import 2022-05-23 15:46:21 -07:00
ShiroSaki
0d5dc5ec31 Fix the bug that can't kill command-generated monsters
Command-generated monsters do not have spawnentry so we have to get data from getMonsterData
2022-05-23 15:46:21 -07:00
TurtleIdiot
f1211eca09 Added support for arch linux
Added support for arch linux and the pacman package manager used by arch
Please note that mongodb has to be fetched from the Arch User Repository and built due to licensing issues
2022-05-23 15:46:12 -07:00
TurtleIdiot
444463cab2 Removed broken/WIP elif 2022-05-23 15:46:12 -07:00
TurtleIdiot
1bf13d17f8 Added choice between stable and dev branch
Added a prompt to choose between downloading stable and development after the package manager validation and before the final confirmation prompt
2022-05-23 15:46:12 -07:00
ShiroSaki
3a39545e34 Refactor support for codex(aka archive) animal, weapon, reliquary 2022-05-23 02:46:50 -07:00
Luke H-W
e433b46ef5
Fix team command (#1035)
* Fix logic error in team command

* Sugar team command messages

Co-authored-by: AnimeGitB <AnimeGitB@bigblueball.in>
2022-05-23 02:45:03 -07:00
CCasusensa
0e2fc3850e Traditional Chinese | Translation Patch 2022-05-23 02:44:34 -07:00
Magix
d73c7f7233
Move commands & teleportation to the wiki. 2022-05-23 00:27:23 -04:00
Melledy
8b114cf964 Fix disconnection when udp client port changed
See #1033
2022-05-22 13:38:32 -07:00
ImmuState
4cd6b799d2 Fix EnergyManager indentation. 2022-05-22 12:55:55 -07:00
ImmuState
c9cb13ac3a Make sure offFieldPenalty does not go below 0.1 2022-05-22 12:55:55 -07:00
ImmuState
419b3505e6 Remove debug stuff 2022-05-22 12:55:55 -07:00
ImmuState
bc3021fb20 Fix traveller not being able to gain energy. 2022-05-22 12:55:55 -07:00
ImmuState
42f5a66df7 Move energy-related logic to a new EnergyManager. 2022-05-22 12:55:55 -07:00
ImmuState
8aa0fde1cd Make energy usage configurable, and preserve current behavior as the default. 2022-05-22 12:55:55 -07:00
ImmuState
76880a5bf7 Make sure to use absolute energy to deplete burst. 2022-05-22 12:55:55 -07:00
ImmuState
542f37d0fb Give correct amount of energy for collecting particles/orbs, and consume energy on burst cast. 2022-05-22 12:55:55 -07:00
ImmuState
2f6beda8ff Generate energy particle of the correct element for abilities. 2022-05-22 12:55:55 -07:00
tester233
a254291245 Update translation keys 2022-05-22 12:55:45 -07:00
Luke H-W
afbeaf300c
Allow commands to target offline players (#1022)
* Add targetRequirement annotation for Command

* Added MTL lines for other langs

* Fix TargetRequirement enum scoping

* Adjust commands to targetRequirement system

* Add translation message sugar to prevent future messages from being translated for wrong player

* Temporarily disable offline targeting on /permission and /clear

* Preliminary README cleanup

* Readme commands cleanup

* Clean up command table in README, including column shuffle

Co-authored-by: AnimeGitB <AnimeGitB@bigblueball.in>
2022-05-22 01:02:11 -07:00
Kimi
33a6826a3f Traditional Chinese | Translation Patches 2022-05-22 01:01:56 -07:00
Benjamin Elsdon
f7c941d4ff More Web Static Languages 2022-05-20 19:33:29 -07:00
xtaodada
0766ec3805 Fix dataloader not getting path correctly 2022-05-20 19:32:27 -07:00
Benjamin Elsdon
d59e14e383 Attempt to fix untranslated login window 2022-05-20 05:52:15 -07:00
Няшик Няшный
c683effead Added banner start and end time checks 2022-05-20 05:51:44 -07:00
Няшик Няшный
b9eef26d8b Changing how banners work 2022-05-20 05:51:44 -07:00
zrll_
b60596f41f Update FileUtils.java
fix: Error when checking files & always checking "/default/data" instead of folder
2022-05-20 05:49:28 -07:00
4Benj_
e2cb56ee28
Server Log Events (#996)
* Server Log Event

* LogEventAppender Encoder
2022-05-20 05:48:20 -07:00
ButterCookies
b2a07044e2
Set the maximum number of player on the server through the config.json (#1001)
* Show server status to three-party game launcher

* Set the maximum number of player on the server through the config.json

* modify the logical order and show the number of maxplayer to API /status/server

* Now even players who have token already cannot bypass the maxPlayer check
2022-05-20 05:47:47 -07:00
zhaodice
8819cca3e2
Fix connection bugs without removing binding address (#993)
* Fix connection bugs according to #921

Fix this for connect to game by local device or remote devices according to #921

* Fix connection bugs according to #921

same

* Update GameServer.java

* fix build

* Update GameServer.java
2022-05-19 08:35:14 -07:00
tester233
0dcf28141d Remove outdated text & update zh-CN.json 2022-05-19 08:34:58 -07:00
Melledy
c2bf663554 Add error message in case data files in resources could not be found 2022-05-19 03:06:07 -07:00
Melledy
d418d4e3e6 Fix dataloader not getting path correctly 2022-05-19 03:01:21 -07:00
Melledy
5e56b49320 Fix dataloader with eclipse 2022-05-19 01:06:20 -07:00
TurtleIdiot
a72d10e63a Impoved clarity of instructions 2022-05-18 23:52:32 -07:00
TurtleIdiot
bead145ffc Create installer script for Debian/Ubuntu
I might add support for other distros/package managers later
2022-05-18 23:52:32 -07:00
xtaodada
6a1c19ae13 Autogenerate document files 2022-05-18 23:19:13 -07:00
2bllw8
a2d5b934df Add web documentation
- '/documentation': home page with all links
- '/documentation/handbook': html version of the gm handbook
- '/documentation/gachamapping': json document with the gacha mappings
2022-05-18 15:41:19 -07:00
linebear
5042db45d7 Fix this does not look like a tar archive error when extract log file 2022-05-18 15:38:26 -07:00
tester233
f4f8104156
Fix punctuation & update zh-CN.json (#976)
* Fix punctuation & update zh-CN.json

* Fix error
2022-05-18 13:46:47 -07:00
tester233
bd6bf0e3f9 Improve text & update zh-CN.json 2022-05-18 05:48:17 -07:00
AZthemute
a306912d7b General housekeeping and clarification of en-us.json file 2022-05-17 21:11:10 -07:00
YukariChiba
138c436982 Add OAuth in AuthenticationSystem 2022-05-17 12:25:59 -07:00
muhammadeko
e54cd086f4 add CommandResponseEvent 2022-05-17 12:21:17 -07:00
Benjamin Elsdon
b0aa294c26 AuthenticationSystem::verifyUser now returns the user's Account instead of a boolean 2022-05-17 05:30:22 -07:00
YukariChiba
fb93f1517c Do not add default region if there are already regions 2022-05-17 04:30:28 -07:00
tester233
9abe656a46 Add translation key 2022-05-17 04:24:18 -07:00
tester233
3c2b4f355b Modify usage 2022-05-17 04:24:18 -07:00
tester233
f87e459c3f Fix usage & remove outdated text 2022-05-17 04:24:18 -07:00
Benjamin Elsdon
aca3795425 Change BANNED_PACKETS to HashSet instaed of List 2022-05-17 04:24:01 -07:00
Benjamin Elsdon
a1e095bba7 Fix "Attempt to get java.util.List field 'PacketOpcodes.BANNED_PACKETS' with illegal data type conversion to int" 2022-05-17 04:24:01 -07:00
DancingSnow
6180d15c17 Cache gradle files 2022-05-17 04:23:49 -07:00
Benjamin Elsdon
c33ac713d8 Permanent fix for version.json stuff (causes 4206) 2022-05-17 04:11:50 -07:00
4Benj_
ead0df336e
"Autogenerate" data files with data fallbacks and moved keys folder into jar resources (#927)
* Autogenerate keys and data files

* Update gacha html files

Accidentally pushed with old html files

* Keys no longer copied. No more manually retrieving listing files. Recursive directory creation

Removed unused code from old GC as well.

* Moved somethings and better errors

* Fixed resources from loading twice

* Data files fallback
2022-05-17 03:00:52 -07:00
xtaodada
003e28e3f8 Enhance the default permissions logic 2022-05-16 21:55:47 -07:00
RDsatan
67380d6f14 fixed 2022-05-16 21:53:16 -07:00
RDsatan
8aaf3c795d Optimize the join and remove commands to team 2022-05-16 21:53:16 -07:00
muhammadeko
eeb7c47cb2 add config to enable/disable console 2022-05-16 17:57:14 -07:00
Magix
7fba6fefc3
Merge pull request #928 from 6ixfalls/dispatch-fix
Fix "/" Route
2022-05-16 12:56:13 -04:00
Elapse
7abe30c33b update opcodes, correct op names, and update relative codes 2022-05-16 06:20:34 -07:00
line-bear
58df221c6d
Remove the extra slash while loading resources. (#893)
* Remove the extra slash

* Update src/main/java/emu/grasscutter/Configuration.java

Co-authored-by: HotaruYS <105128850+HotaruYS@users.noreply.github.com>

* Update src/main/java/emu/grasscutter/Configuration.java

Co-authored-by: HotaruYS <105128850+HotaruYS@users.noreply.github.com>

* Update src/main/java/emu/grasscutter/Configuration.java

Co-authored-by: HotaruYS <105128850+HotaruYS@users.noreply.github.com>

* Import java.nio.file.Paths to use Paths.get

* Mark fields as private to prevent use *FOLDER directly

* Remove unnecessary slash

Co-authored-by: HotaruYS <105128850+HotaruYS@users.noreply.github.com>
2022-05-15 23:32:03 -07:00
6ixfalls
f08891a73c
Fix "/" Route 2022-05-15 09:41:10 -07:00
Melledy
82775b4ff9 Implement quest rewards 2022-05-15 03:48:47 -07:00
Melledy
dd63b29003 Add new gacha mappings and lombok generated files to gitignore 2022-05-15 03:48:31 -07:00
AnimeGitB
2564fefe02 Fix logic error in remove command 2022-05-15 01:17:26 -07:00
AnimeGitB
9380e9cda4 Fix targeting on Join and Remove commands 2022-05-15 01:17:26 -07:00
muhammadeko
f1af23e8d6 Modify chat manager to give plugin ability to change it 2022-05-14 23:27:36 -07:00
lsCoding666
722d53c9c2
fix join command and remove command bug and update docs (#904)
* feat:new command "join" and "remove" to force join or remove avatar in your current team

* fix:change MaxAvatarsInTeam from 9 to 4

* feat:update & merge branch.Translate fix

* fix(command):fix remove command a stupid bug.Loop delete element bug.

* fix(command):fix join command. When adding avatars, repeat avatars skip and non repeat avatars join.

* fix(language):fix join command remove command translate

* fix(ReadMe):update README.md join and remove command.
2022-05-14 23:27:23 -07:00
muhammadeko
d39de7eaf4 update readme 2022-05-14 21:06:57 -07:00
muhammadeko
cde76e10b6 fix permission command 2022-05-14 21:06:57 -07:00
Hotaru
213d2883a9 Move gacha files to separate directory and refactor file serving 2022-05-14 20:07:08 -07:00
HotaruYS
0231f26be0
Properly handle static assets for announcements (#891) 2022-05-14 20:05:19 -07:00
tiantian520
f1b12ccf63
Add a new command "nostamina" (#877)
* Add a new command " nostamina\

* Fix

* Fix 2

* Renamed some names.

* Update zh-CN.json

Fix an existing language expression error.
2022-05-14 16:06:48 -07:00
Melledy
155a72061e
Merge pull request #868 from Grasscutters/plugin-auth
Refactor 'dispatch' server/Update plugin authentication API
2022-05-14 16:06:13 -07:00
KingRainbow44
b04b8eef8e
Update routes 2022-05-14 12:41:49 -04:00
KingRainbow44
6c419f2d20
External authentication 2022-05-14 12:39:21 -04:00
KingRainbow44
457d00211c
Implement PR #657 2022-05-14 12:21:55 -04:00
KingRainbow44
0405cb6718
JavaDoc Fix 2022-05-14 12:13:41 -04:00
KingRainbow44
c8c823b515
Fix errors 2022-05-14 12:10:43 -04:00
KingRainbow44
5c6fe7bb04
Merge development into plugin-auth 2022-05-14 12:08:33 -04:00
Melledy
46f16c6759 Merge branch 'development' of https://github.com/Grasscutters/Grasscutter into development 2022-05-14 06:35:37 -07:00
lsCoding666
afc2c8bbf2
new command join and remove to force join or remove avatars into your current team (#549)
* feat:new command "join" and "remove" to force join or remove avatar in your current team

* fix:change MaxAvatarsInTeam from 9 to 4

* feat:update & merge branch.Translate fix
2022-05-14 06:28:02 -07:00
zrll_
c3ff2b81ec Fix connot execute quest command in console 2022-05-14 05:28:57 -07:00
luluxiaoyu
383dfda131 Update zh-TW.json 2022-05-13 22:12:14 -07:00
muhammadeko
f2e9845421 remove log 2022-05-13 22:12:07 -07:00
muhammadeko
c0d79aa75b fix logic and some cleaning 2022-05-13 22:12:07 -07:00
muhammadeko
c7849c0462 add negative permission check 2022-05-13 22:12:07 -07:00
KingRainbow44
87bfc25ab8
Refactor dispatch (now called HTTP) server (pt. 2) 2022-05-13 23:22:30 -04:00
ShiroSaki
57a9cae1a4 add support for announcement page 2022-05-13 16:48:37 -07:00
Melledy
ab5e4fcdb4 Use scene types instead of hardcoding scene ids for checking enter reason 2022-05-13 16:35:03 -07:00
tester233
b78e397056 Improve text 2022-05-13 16:33:18 -07:00
ShigemoriHakura
44456e2868
Add support for codexQuests (#870) 2022-05-13 16:33:07 -07:00
Yazawazi
4f3112133c fix(serenitea pot): teleport & read born pos from lua 2022-05-13 16:32:52 -07:00
Yazawazi
295f15eece feature(serenitea pot): Implementation of enter
Ugly hard code
2022-05-13 16:32:52 -07:00
Yazawazi
27e817a6ce feature(serenitea pot): Implementation of the entry function
It's being perfected, so don't worry. (probably)
2022-05-13 16:32:52 -07:00
KingRainbow44
e08a9c0d70
Refactor dispatch (now called HTTP) server (pt. 1) 2022-05-13 11:39:40 -04:00
KingRainbow44
3425e0f1fc
Add JSON-related methods to Utils.java 2022-05-13 11:38:54 -04:00
KingRainbow44
f16c3fb8bc
Add new authentication system 2022-05-13 11:38:17 -04:00
KingRainbow44
5d557e6525
Update project to 1.1.2-dev 2022-05-13 11:37:49 -04:00
KingRainbow44
f1a64d07cf
Add lombok 2022-05-13 11:37:17 -04:00
Melledy
0ffaba44ea Implement QUEST_CONTENT_FINISH_PLOT 2022-05-13 06:33:12 -07:00
Melledy
00ffbea451 Fixed quests not finishing their questline 2022-05-13 06:24:50 -07:00
Melledy
c35b2b965a
Merge pull request #816 from Grasscutters/dev-quests
Implement quests
2022-05-13 05:36:30 -07:00
Kimi
f00c5d9f29 Traditional Chinese | Translation Patches 2022-05-13 05:35:21 -07:00
kyoko12
5b9548c63a Don't silently delete config.json if there is an error. 2022-05-13 05:34:59 -07:00
AnimeGitB
23d1553aca Fix gachadetails 2022-05-13 05:34:14 -07:00
AnimeGitB
a89377d558 Updated cost logic and default weights 2022-05-13 05:34:14 -07:00
AnimeGitB
5f9ac00017 Remove debug log from gacha 2022-05-13 05:34:14 -07:00
AnimeGitB
cda841dd62 Custom costs for different gacha pulls 2022-05-13 05:34:14 -07:00
AnimeGitB
3f3ab11ef6 Gacha rework
Add fallback stripping and C6 stripping
Converting banner definitions from pity vars to lerp arrays
Properly implement rates and pool smoothing
Also move reusable functions to Utils
2022-05-13 05:34:14 -07:00
Melledy
f53b533dfb Add one more quest trigger 2022-05-13 05:33:43 -07:00
Melledy
608c379afe Switch to using quest excels 2022-05-13 03:12:25 -07:00
Akka
6c6e206a88 fix: LEAK: ByteBuf.release() was not called 2022-05-13 00:21:26 -07:00
Hotaru
e0b84e2751 Fix broken time formatting on gacha records 2022-05-12 18:46:21 -07:00
Hotaru
32a899ded3 Fix UTF-8 encoding in announcements 2022-05-12 17:54:50 -07:00
tester233
91d36395fb Improve text 2022-05-12 14:54:53 -07:00
tester233
f850c3f6f0 Improve text 2022-05-12 14:54:53 -07:00
tester233
70d6e3b9dc Improve text 2022-05-12 14:54:53 -07:00
Akka
4f373e4016 add docs for tower 2022-05-12 14:54:44 -07:00
Hotaru
430e3d6d8b Build region_list and cur_region dynamically 2022-05-12 14:54:33 -07:00
Hotaru
c1749ae093 Allow to override final jar filename using project property 2022-05-12 14:54:27 -07:00
gentlespoon
0f8b2cb192 Slowly recover HP near statue 2022-05-12 02:32:39 -07:00
gentlespoon
b14affd6ee Clean up map mark related code
1. Remove unnecessary manager from player collection.
2. Clean up MarkMapReq handler.
3. Remove redundant checks.
2022-05-12 02:32:11 -07:00
Melledy
0df4a076d7 Merge branch 'development' into dev-quests 2022-05-12 02:31:28 -07:00
Melledy
d8c30d5680 Implement basic quest condition handling
Quests that require talking to npcs now work.
2022-05-12 02:30:34 -07:00
Yazawazi
401b80060e feature(widget): simple implementation of widget
Simple implementation of a part of the gadget support, very rough, hard code variables, I am very sorry for that. It can now handle part of the gadget rig. More features and better support await PRs from others. if no one else does, I'll give it a try.
2022-05-12 01:23:16 -07:00
AnimeGitB
e2817c696a Fix immutable lists 2022-05-11 21:56:53 -07:00
AnimeGitB
74783cfecd More usage of payItems 2022-05-11 21:56:53 -07:00
AnimeGitB
c7d5d8640c Add some usage of Inventory.payItems()
And add quantity to it
2022-05-11 21:56:53 -07:00
AnimeGitB
010455548f Add Inventory.payItems() method 2022-05-11 21:56:53 -07:00
gentlespoon
53797dfd3b Fix logging level 2022-05-11 17:39:45 -07:00
gentlespoon
00a248725e Feature: vehicle stamina
1. Remove references.
2. Handle vehicle stamina.
2022-05-11 17:39:45 -07:00
gentlespoon
2fa2746246 Update StaminaManager
1. Update function signatures to prepare for vehicle stamina.
3. Remove hard-coded skills.
2. Wind resonance -15% stamina cost.
4. Climb talent cost reduction.
5. Swim talent cost reduction.
6. Diluc will now consume stamina at full price if talent not activated.
7. Sayu's windwheel no longer consumes stamina.
2022-05-11 17:39:45 -07:00
Melledy
8d56b15a17 Add quest ids to handbook 2022-05-11 12:47:16 -07:00
Melledy
364dc3bab9 Merge branch 'development' into dev-quests 2022-05-11 12:39:28 -07:00
ImmuState
5ff8a4514e Insert language setting based on the player's account. 2022-05-11 12:02:45 -07:00
ImmuState
1d4e0e09d0 Add gacha details page. 2022-05-11 12:02:45 -07:00
mingjun97
f16edfd58e Fix building error 2022-05-11 11:52:56 -07:00
mingjun97
48b5873fee Make injectGitHash as a task 2022-05-11 11:52:56 -07:00
mingjun97
6921ea77a9 Revise version format 2022-05-11 11:52:56 -07:00
mingjun97
edc75b2632 Display version info at console starting 2022-05-11 11:52:56 -07:00
mingjun97
c00a6dbadd Fix github action build issue
* Move `BuildConfig.java` from `/src/generated`to `/src/main` to accomplish the building pipeline

* Add BuildConfig.java to the .gitignore
2022-05-11 11:52:56 -07:00
mingjun97
9bdb1c762c Introduce -version argument to display version 2022-05-11 11:52:56 -07:00
tester233
07ad24262e Improve text 2022-05-11 11:51:24 -07:00
tester233
39796099c8 Improve text & remove extra punctuation 2022-05-11 11:51:24 -07:00
Benjamin Elsdon
1da384091a Add verifyUser to AuthenticationHandler 2022-05-11 11:51:11 -07:00
Secretboy-SMR
1f7f13ffe1 It will use the english as default rather than tell you the value is not exist if there's no translation for currently language 2022-05-11 11:50:53 -07:00
KingRainbow44
68e6de8ebb
Add plugin loggers 2022-05-11 11:46:36 -04:00
KingRainbow44
89bd4b9aeb
Refactor config database settings 2022-05-11 11:38:30 -04:00
Magix
4daec68f0a
Merge pull request #826 from lilmayofuksu/patch-sslfix
Fix InRouting on dispatch server
2022-05-11 11:19:14 -04:00
ayy lmao
3f1128356e Fix InRouting on dispatch server 2022-05-11 17:35:52 +03:00
Melledy
26575561d6 Fix build error from merge 2022-05-11 04:01:38 -07:00
Melledy
9351127fe1 Merge branch 'development' into dev-quests 2022-05-11 03:56:59 -07:00
Melledy
285405cee4 Implement quests 2022-05-11 03:56:40 -07:00
Secretboy-SMR
98066f5015 Removed invalid code in getLanguageFileDescription,When the language is not discovered, it will use the built-in language fallback mechanism to fall back,At the same time, we also fix the issue that using language in the server does not save the settings of the server side locale 2022-05-11 03:11:10 -07:00
coooookies
ffd0212f94 Show server status to three-party game launcher 2022-05-11 02:45:21 -07:00
Secretboy-SMR
6be39eafd2 fixed language not found prompt 2022-05-11 01:18:10 -07:00
mingjun97
2cd1d32fbe Bug fixes.
* Fix default port for the game server
* Fix the returning region info
2022-05-11 01:17:51 -07:00
gentlespoon
d575b79a0c Fix incorrect ascension level in givechar command 2022-05-11 01:17:10 -07:00
Magix
b646e38bd6
Merge pull request #802 from Grasscutters/better-config
Implement a better config structure
2022-05-11 01:23:43 -04:00
KingRainbow44
5c0e193a0a
Fix ClassDefNotFound & NullPointerException errors 2022-05-11 01:23:18 -04:00
KingRainbow44
145546c26c
Remove config file 2022-05-11 00:48:40 -04:00
KingRainbow44
d5cc615948
Remove old config & migrate legacy configs 2022-05-11 00:46:49 -04:00
KingRainbow44
6894ab8aae
Convert to the far superior config system 2022-05-11 00:30:07 -04:00
KingRainbow44
5ad58a4566
Create new config class 2022-05-10 22:49:25 -04:00
gentlespoon
ef9d63f1dd Claymore charged attack stamina cost 2022-05-10 17:25:18 -07:00
Magix
69984d79d6
Merge pull request #688 from HotaruYS/patch-3
Improve logging pattern by including caller class name
2022-05-10 20:17:13 -04:00
KingRainbow44
a25eb631c4
my poor, poor, language system (Formatting refactor) 2022-05-10 20:00:47 -04:00
Secretboy-SMR
2969abc20e Fix language switching prompt and save 2022-05-10 13:36:57 -07:00
tester233
4efdc767ae Improve text 2022-05-10 06:36:19 -07:00
Secretboy
0a95b7fe2e
fixed pr780, uploaded LanguageCommand.java (#782)
* Fix the following issues:
1. HashMap non-thread-safe issus
2. Fix the same problem in pr621, but use a better implementation

Add the following functions:
1. There is now a language cache inside getLanguage to prepare for different languages corresponding to different time zones where the accounts in the server are located

* add /language command,each account has their own Locate

* I forgot to git add...sorry,,this pr is to fix pr780, uploaded LanguageCommand.java
2022-05-10 06:35:37 -07:00
Secretboy
b133825dd4
add /language command (#780)
* Fix the following issues:
1. HashMap non-thread-safe issus
2. Fix the same problem in pr621, but use a better implementation

Add the following functions:
1. There is now a language cache inside getLanguage to prepare for different languages corresponding to different time zones where the accounts in the server are located

* add /language command,each account has their own Locate
2022-05-10 05:33:45 -07:00
gentlespoon
fbffb8d277 Reset first tick on new skill 2022-05-10 05:21:29 -07:00
gentlespoon
af5b7c6eb6 Add AbilityMixinStaminaCost proto 2022-05-10 05:21:29 -07:00
gentlespoon
812435b333 Talent moving stamina cost 2022-05-10 05:21:29 -07:00
gentlespoon
f1aa930ef5 Add UTF8 charset in dispatch server HTML template. 2022-05-10 05:21:21 -07:00
Kinesis
55b91ad150 fixed KillCharacter help command description typo case 2022-05-10 05:21:13 -07:00
tester233
c4078a505a Update zh-CN.json 2022-05-10 03:10:08 -07:00
tester233
bd5e7c68fd Update zh-CN.json 2022-05-10 03:10:08 -07:00
tester233
d7b3ee10ba Update zh-CN.json & fix typo 2022-05-10 03:10:08 -07:00
Bi Jiakai
bf3d6b3c64 Fixed account delete can not delete all related data (#767) 2022-05-10 03:09:47 -07:00
gentlespoon
32154c2a55 Temporarily set statue auto use to 1 and 100%. 2022-05-10 02:14:09 -07:00
gentlespoon
8074f47c6a Stamina will be set to full if Stamina is disabled. 2022-05-10 02:13:49 -07:00
Melledy
fd3e59f332 Remove previous fix for falling to death in godmode
This fix is more efficient
2022-05-10 01:50:04 -07:00
gentlespoon
5a6512c5cf No more fallen to death in god mode 2022-05-10 01:50:04 -07:00
Secretboy-SMR
cba16f2868 Fix the following issues:
1. HashMap non-thread-safe issus
2. Fix the same problem in pr621, but use a better implementation

Add the following functions:
1. There is now a language cache inside getLanguage to prepare for different languages corresponding to different time zones where the accounts in the server are located
2022-05-09 23:15:58 -07:00
FpguDhk
06be99fa15
Fix the decision statement of adding map marker. (#763)
* Fix the Chinese messy code problem.

* Fix the decision statement of adding map marker.
2022-05-09 23:15:17 -07:00
真心
e4df2813f1 Update build.gradle 2022-05-09 23:15:01 -07:00
hatsune-miku
f4f2cf6a96 Disable falling damage for godmode 2022-05-09 13:44:16 -07:00
Kinesis
e3daf684a5 fixed error KillCharacter description in the help command 2022-05-09 12:51:08 -07:00
ImmuState
5bf22ce8a2 Remove commented method and unused import. 2022-05-09 12:50:47 -07:00
ImmuState
b7ed76c79b Change ccount delete to delete all referenced items in the database. 2022-05-09 12:50:47 -07:00
Melledy
ba180d8bf5
Merge pull request #746 from Akka0/tower
fix the Monster spawn between stage challenges
2022-05-09 12:50:33 -07:00
筱傑
32232ff6f9 Fixed MissingFormatArgumentException (#727)
Format string is `"given_level": "Given %s with level %s %s times to %s"`
2022-05-09 12:50:23 -07:00
Akka
0764b6c2fa little fix 2022-05-10 00:14:50 +08:00
Akka
3e65ce63f5 Merge remote-tracking branch 'origin/development' into tower 2022-05-10 00:07:10 +08:00
Akka
a2e31a24dd
Merge pull request #9 from Grasscutters/development
Development
2022-05-10 00:06:08 +08:00
Akka
5a62a69c73 fix the Monster spawn between stage challenges 2022-05-10 00:05:01 +08:00
Mateoust
a63d87b0bc Update translation keys to fix issues 648 677
fix issues 648 677
2022-05-09 04:18:12 -07:00
Mateoust
e6cf27056f Updating language files fixed the issue 648 677
fix issue 648 677
2022-05-09 04:18:12 -07:00
AnimeGitB
c2d41ca0cf Fix /talent saving to level instead of id 2022-05-09 04:18:04 -07:00
gentlespoon
56635f2ecc Move "if Grasscutter.getConfig().OpenStamina" to the correct place. 2022-05-09 03:46:18 -07:00
Akka
ec7a66861a Fix #719 2022-05-09 02:28:41 -07:00
gentlespoon
1430ccb995 Exclude macOS junk in case anyone develops on mac. 2022-05-09 02:28:23 -07:00
gentlespoon
d332e77b76 Only handle motion notify for current entity. 2022-05-09 02:28:13 -07:00
Akka
3cf062c98c Merge remote-tracking branch 'fork/tower' into tower 2022-05-09 17:01:26 +08:00
Akka
bf8f4fba52 Fix #719 2022-05-09 17:01:08 +08:00
Melledy
e28d6a1441
Merge pull request #718 from Akka0/tower
Support Team Toggle in Tower & Refactor MonsterTide
2022-05-09 01:15:02 -07:00
AnimeGitB
993fe3131e Fix perm field order consistency on GiveCommand 2022-05-09 01:12:47 -07:00
AnimeGitB
d03f1ca5d1 Account permission wildcards 2022-05-09 01:12:47 -07:00
AnimeGitB
e23b72f298 Add permissionTargeted to applicable commands
Change target perm from target.perm to x.perm.others
2022-05-09 01:12:47 -07:00
Akka
e24ad0c732 Merge remote-tracking branch 'origin/development' into tower 2022-05-09 15:43:52 +08:00
Akka
1dd3c6d2e8
Merge pull request #8 from Grasscutters/development
Development
2022-05-09 15:42:12 +08:00
Akka
d00465125d Support Team Toggle in Tower & Refactor MonsterTide 2022-05-09 15:39:49 +08:00
Shirakami Ling
f0ff323b7b Change the license type in zh-CN.json. 2022-05-08 16:02:09 -07:00
ImmuState
8c7a46e8ef -Make the _tier suffix optional. 2022-05-08 15:59:09 -07:00
ImmuState
2a12ed5694 Fix incorrect @Command annotation. 2022-05-08 15:59:09 -07:00
ImmuState
e8e48600ae Fix invalid translation key. 2022-05-08 15:59:09 -07:00
ImmuState
14bf96e907 Added to ability to specify main and substats for /giveart via names instead of IDs. 2022-05-08 15:59:09 -07:00
Melledy
63eed41dd5 Merge branch 'stable' into development 2022-05-08 15:52:16 -07:00
KingRainbow44
392ce26e32 Add warning for language fallback 2022-05-08 13:19:23 -07:00
KingRainbow44
1234a88c67 Fallback to the fallback fallback 2022-05-08 13:19:23 -07:00
memetrollsXD
e56cd8385a Update com.google.code.gson 2.8.8 -> 2.9.0 2022-05-08 13:11:34 -07:00
memetrollsXD
bcd8d39084 Change LICENSE to GNU Affero
With these changes, commercial use is still allowed, but are required to disclose the source, changes, and copyright. Meaning that people won't be unknowingly ripped off, and would be paying knowing that it is an open-source project with possible changes.

tl;drLegal link: https://tldrlegal.com/license/gnu-affero-general-public-license-v3-(agpl-3.0)
2022-05-08 13:09:22 -07:00
Akka
bb864bd28b Merge branch 'tower' of https://github.com/Akka0/Grasscutter into tower 2022-05-08 22:55:37 +08:00
HotaruYS
85821eb16b
Merge branch 'development' into patch-3 2022-05-08 15:34:17 +02:00
Yazawazi
6ce96d1c26 feature(task): Implement pause, resume and cancel
Use as `pauseTask(taskName)`. They return boolean values to tell the developer if a timed task can be paused/resumed/cancelled properly.
A little bit of testing shows that pausing and then resuming may execute the task multiple times.
2022-05-08 06:28:13 -07:00
Akka
916b7412fd Persist Tower Data && Set The Tower Schedule 2022-05-08 06:06:32 -07:00
Akka
e95431d3e7 Monsters tide turn by turn && Ban User Skill && Lua functions 2022-05-08 06:06:32 -07:00
Melledy
b9fbc4975d Optimize invoke packet handling 2022-05-08 06:05:50 -07:00
Melledy
1f86e7bb17 Implement energy balls (orbs) 2022-05-08 06:05:50 -07:00
Melledy
6d1ef0d841 Implement AbilityManager 2022-05-08 06:05:50 -07:00
Akka
727d92a6bc Merge remote-tracking branch 'origin/development' into tower 2022-05-08 20:56:50 +08:00
Akka
bc7c78044b
Merge pull request #7 from Grasscutters/development
Development
2022-05-08 20:54:42 +08:00
Michaellan
342cf33661 fill description 2022-05-08 05:51:13 -07:00
HotaruYS
55b692561f
Improve logging pattern by including caller class name 2022-05-08 14:30:48 +02:00
gentlespoon
ccdfd15bb8 Update StaminaManager 2022-05-08 04:39:25 -07:00
gentlespoon
eab964de5c Fix: timer is already cancelled. 2022-05-08 04:39:25 -07:00
HotaruYS
9020ee5b2a
Override server logging level with environment variable (#653)
Use `LOG_LEVEL` environment variable to override logging level for `emu.grasscutter` (which also contains all loggers under it). This might help with debugging various issues reported by users. Previously, the only way to override these levels would be to use `-Dlogback.configurationFile`
2022-05-08 03:48:06 -07:00
Akka
6a8cc01dc1 merge 2022-05-08 17:19:17 +08:00
Akka
8a52a041bd Persist Tower Data && Set The Tower Schedule 2022-05-08 17:11:02 +08:00
方块君
b3317bd6d7 Using annotation key translation 2022-05-08 01:47:26 -07:00
方块君
f49862145c add Command description 2022-05-08 01:47:26 -07:00
方块君
05e1e5502c Add command description multilingual 2022-05-08 01:47:26 -07:00
Magix
b69c58cab1 Update build.yml 2022-05-08 01:45:39 -07:00
芊枫
3dcf8bf46a Update zh-CN.json 2022-05-07 23:14:56 -07:00
芊枫
57236f2197 Update zh-CN.json 2022-05-07 23:14:56 -07:00
芊枫
401cb609ae Fix typo && update zh-CN.json 2022-05-07 23:14:56 -07:00
Mateoust
8b198d6dbe fix issues 646 2022-05-07 23:13:45 -07:00
gentlespoon
8ddd7b125d Fix null reference on stamina timer when paused player disconnects. 2022-05-07 23:13:35 -07:00
KingRainbow44
04a58d43d5 Add a plugin schema 2022-05-07 23:12:19 -07:00
Magix
e99875ea4d Update build.yml 2022-05-07 23:10:27 -07:00
KingRainbow44
2416dd66e5
Fix language fallback'ing 2022-05-07 23:44:35 -04:00
Zakhil
a269ff9563
Added polish locale (#655) 2022-05-07 18:19:24 -07:00
Akka
8739277970 Monsters tide turn by turn && Ban User Skill && Lua functions 2022-05-07 18:18:27 -07:00
gentlespoon
a7c1f85579 Make stamina consumption classes public so others can use. 2022-05-07 18:18:20 -07:00
gentlespoon
032db81e07 Stop stamina consumption on game pause 2022-05-07 18:18:20 -07:00
gentlespoon
090b00556b More reliable stamina calculation
by separately handling immediate one-time cost and cost over time.
2022-05-07 18:18:20 -07:00
Kimi
eb4dabe162 Update zh-TW.json 2022-05-07 15:49:22 -07:00
Kimi
fbaeaee4b5 another translation patches because i fucked it up
i hate myself
2022-05-07 15:49:22 -07:00
Magix
658ee3b547
UPGRADE TO 1.1.0 POG
Merge `development` into `stable`
2022-05-07 18:18:18 -04:00
Magix
426f3701e8
Update build.gradle (in prep for 1.1.0) 2022-05-07 18:17:32 -04:00
KingRainbow44
330427f5a5
Simplify the language fallback system 2022-05-07 18:12:53 -04:00
Magix
d70df776b1
Merge pull request #628 from exzork/development
PluginManager: Use the same class loader and add getPlugin method
2022-05-07 17:58:42 -04:00
Magix
f133a8b123
Update PluginManager.java 2022-05-07 17:58:18 -04:00
HotaruYS
75032b4aa2 Respect FrontHTTPS when creating URI for gacha record 2022-05-07 14:54:15 -07:00
Piotr Blecharski
55d47a014f Deleted .DS_Store 2022-05-07 14:45:42 -07:00
Piotr Blecharski
1445fe9ce5 Command list with descriptions in handbook 2022-05-07 14:45:42 -07:00
zhaodice
fadda64699 fix issue 635
fix #635
2022-05-07 14:42:25 -07:00
zhaodice
03544acb3d fix issues 629
fix #629
2022-05-07 14:39:34 -07:00
Kimi
8618c7de9e Traditional Chinese | Translation Patches
yeah i fucked up that one line of translation oops
also added two lines of translation too
2022-05-07 14:37:48 -07:00
Akka
2c50d2268b
Merge pull request #5 from Grasscutters/development
Development
2022-05-07 21:49:22 +08:00
Akka
d20cffb905 Monsters tide turn by turn && Ban User Skill && Lua functions 2022-05-07 21:47:13 +08:00
muhammadeko
5cc9ecfd91
PluginManager: Use the same class loader and add getPlugin method 2022-05-07 19:48:51 +07:00
kaitl
d8477fbcc4 Update zh-CN.json 2022-05-07 00:47:38 -07:00
gentlespoon
34af72ec9e Kamisato Ayaka and Mona talent moving costs stamina 2022-05-07 00:47:19 -07:00
gentlespoon
29c5551450 Prepare MovementManager.updateStamina() for external calls. 2022-05-07 00:47:19 -07:00
mingjun97
f1f3badd16 Fix gacha mapping generation login
* Fix `System#out` usage pointed by magix at https://github.com/Grasscutters/Grasscutter/pull/568#pullrequestreview-965271278
* Fix typos for interchange `-` and `_`.
* Fix gacha mapping autogeneration path
2022-05-06 23:28:07 -07:00
gentlespoon
39816f8eeb Flight stamina cost -20% when Amber or Venti in team
- Reduced stamina not tested in MP.
- Stop MovementManager ticker when player goes offline.
2022-05-06 23:27:07 -07:00
真心
9109e4ee44 Create zh-CN.json 2022-05-06 23:24:47 -07:00
Akka
ea75508a46
Merge pull request #4 from Grasscutters/development
Development
2022-05-07 13:45:16 +08:00
Secretboy
22ebf35e69 Update Language.java 2022-05-06 21:54:07 -07:00
Secretboy
9a611a4c06 Update Config.java 2022-05-06 21:54:07 -07:00
FpguDhk
0347d877ea Fix the Chinese messy code problem. 2022-05-06 21:23:03 -07:00
lhhxxxxx
cc104a6a1f
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
5a33720e4f Fix missing comma in expedition reward's json 2022-05-06 20:04:25 -07:00
ShigemoriHakura
84f8023396
Add all expedition rewards (#607)
* fix achievement proto

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

* add import

* Add all AvatarExpedition protos

Expedition system has almost done but still has some bug so it will be uploaded later

* Add all expedition rewards
2022-05-06 19:50:13 -07:00
Melledy
4cf4d37738 Move server profile away from GameConstants 2022-05-06 19:16:36 -07:00
Melledy
7b77f3eb9e Add to gacha mappings to gitignore 2022-05-06 19:14:01 -07:00
Melledy
9f69fdcfd5 Merge branch 'development' of https://github.com/Grasscutters/Grasscutter into development 2022-05-06 19:12:58 -07:00
Melledy
bd7fb76b1d Fix crash on login if the player didnt have a TowerManager 2022-05-06 19:12:54 -07:00
KingRainbow44
6ab1a4f43e
Merge remote-tracking branch 'origin/development' into development 2022-05-06 21:53:03 -04:00
KingRainbow44
a93371a0d0
Fix for translation errors 2022-05-06 21:52:10 -04:00
Magix
5744fc60d4
Merge branch 'stable' into development 2022-05-06 21:39:30 -04:00
Magix
c8779fec3c Update Tools.java 2022-05-06 18:25:35 -07:00
mingjun97
6c7b94c127 Auto fill name of the event from TextMap 2022-05-06 18:25:35 -07:00
mingjun97
eb391b3833 Prompt for user language option for the Tools
* GM Handbook
* Gacha Map
2022-05-06 18:25:35 -07:00
KingRainbow44
fca5248ce1
Merge remote-tracking branch 'origin/development' into development 2022-05-06 21:20:59 -04:00
KingRainbow44
32b9e8f9d2
Rename & refactor 2022-05-06 21:20:41 -04:00
Magix
6ad0a1f625
Merge pull request #580 from Bwly999/development
Fix the problem that the reference of serverHook in Plugin object is null
2022-05-06 21:10:50 -04:00
Magix
217166822b
Merge branch 'development' into development 2022-05-06 21:08:19 -04:00
Magix
4455072db1
Merge pull request #567 from Grasscutters/localization
Implement a proper language system
2022-05-06 21:05:29 -04:00
KingRainbow44
e6cb97a437
Bug fixes 2022-05-06 21:04:39 -04:00
KingRainbow44
59b24aa481
Rename en-US locale 2022-05-06 20:18:50 -04:00
Bwly999
c5bf5ecd69 roll back to timer 2022-05-07 08:00:31 +08:00
KingRainbow44
4264ca0485
Update Utils.java 2022-05-06 19:47:30 -04:00
KingRainbow44
80c9119ca2
Merge development into localization 2022-05-06 19:40:32 -04:00
gentlespoon
82a88c8573 fix/runningAndDashingStamina 2022-05-06 16:11:51 -07:00
KingRainbow44
d8719ecc52
Update .gitignore & remove files 2022-05-06 18:59:26 -04:00
KingRainbow44
686df18b74
Ensure we have a fallback for localization 2022-05-06 18:57:49 -04:00
KingRainbow44
57a3d535a7
Add the zh-TW language. 2022-05-06 18:56:19 -04:00
KingRainbow44
7899a6069b
Add the en-US language. 2022-05-06 18:50:43 -04:00
KingRainbow44
438f845e3a
Convert to the superior language system. (pt. 3) 2022-05-06 18:50:18 -04:00
gentlespoon
c582814bc1 Fix #593: Accidental death of character 2022-05-06 15:22:00 -07:00
gentlespoon
1d4a41fd61 Allow walking away from the statue within 2.5s to stop auto heal. 2022-05-06 14:49:33 -07:00
wulf
71095786b8 fix scence block loading bug 2022-05-06 13:43:42 -07:00
Scald
c4e11088da
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
2b58d69534
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
6d89477120
Merge pull request #594 from Akka0/tower
Tower Dungeons Handoff between levels
2022-05-06 13:37:30 -07:00
Kinesis
19a2c9b7ea 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
63a37acc1b
add config option to enable cors for dispatchserver (#579) 2022-05-06 13:23:26 -07:00
Akka
22df34606c a little fix 2022-05-07 00:31:48 +08:00
Akka
6b82a5360c
Merge pull request #3 from Akka0/development
Development
2022-05-07 00:19:59 +08:00
Akka
321a2a3537
Merge branch 'tower' into development 2022-05-07 00:19:51 +08:00
Akka
7279842659
Merge pull request #2 from Grasscutters/development
Development
2022-05-07 00:17:08 +08:00
Akka
81ca86092c Add some lua functions 2022-05-07 00:15:23 +08:00
Akka
6144f47127 Tower Dungeons Handoff between level and floor 2022-05-07 00:11:54 +08:00
Bwly999
613366516d Merge branch 'development' of github.com:Grasscutters/Grasscutter into development 2022-05-06 22:38:04 +08:00
4Benj_
da99140d20
Stop WindSeedClientNotify and PlayerLuaShellNotify from being sent (#582) 2022-05-06 15:48:16 +02:00
gentlespoon
0102a3ce1e 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
98e1189deb fix the problem that the reference of serverHook in Plugin object is null 2022-05-06 18:16:07 +08:00
Melledy
098cf372c9 Fix morphia error when saving player to db 2022-05-06 01:19:39 -07:00
Melledy
092dee8e2b Merge branch 'development' of https://github.com/Grasscutters/Grasscutter into development 2022-05-06 01:17:19 -07:00
Melledy
5968ed3a71 Remove the red exclamation mark from achievements 2022-05-06 01:17:16 -07:00
gentlespoon
e319fd751b fix: lower logging level in SotSManager 2022-05-06 00:49:08 -07:00
gentlespoon
39c932b041 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
39a49ae964 Add @Transient for temporary team 2022-05-06 00:12:33 -07:00
Akka
696f629080 Choose Avatar & Enter Tower 2022-05-06 00:12:33 -07:00
Akka
a79e00896c Add @Transient for temporary team 2022-05-06 14:46:10 +08:00
gentlespoon
744aa478a9 Add drowning. Better movement ticking. 2022-05-05 23:42:34 -07:00
Akka
7d51e0deb5
Merge pull request #1 from Akka0/development
Updated
2022-05-06 14:16:44 +08:00
Akka
d32d4014cd Choose Avatar & Enter Tower 2022-05-06 14:10:23 +08:00
KingRainbow44
f7311968d6
Convert to the superior language system. (pt. 2) 2022-05-06 00:57:45 -04:00
KingRainbow44
023c5baffe
Convert to the superior language system. (pt. 1) 2022-05-05 23:57:55 -04:00
memetrollsXD
2dc6a48403 Customise sender and title too. Add statement of use 2022-05-05 19:49:28 -07:00
Melledy
414fad9079 Kick player if they use an invalid resources folder 2022-05-05 17:17:27 -07:00
ShiroSaki
eaf0dd0b3b Add all AvatarExpedition protos
Expedition system has almost done but still has some bug so it will be uploaded later
2022-05-05 16:52:48 -07:00
gentlespoon
18b1c50d0a 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
Ljzd-PRO
57b5e6f3d9
Change the usage of command permission in README.md (#557)
* Change the command `permission` usage

* Change the command `permission` usage
2022-05-05 22:32:09 +02:00
Scirese
e01c270a52 Update CNLanguage to match with the latest EN version 2022-05-05 09:03:23 -07:00
Akka
9ee9d7e686 Support of Enter Room Scene 2022-05-05 09:02:54 -07:00
Benjamin Elsdon
243db37fd6 No misleading 404 error 2022-05-05 09:02:10 -07:00
Benjamin Elsdon
a7273fd84a I honestly don't know what happened.... 2022-05-05 09:02:10 -07:00
Benjamin Elsdon
b313d8567a Removed GCStatic. Cleaned up GachaRecordHandler. 2022-05-05 09:02:10 -07:00
Akka
32c70cc83f Support of Enter Room Scene 2022-05-05 22:00:11 +08:00
Luke H-W
775f4cb7c1
GiveCommand: fix edge case with unspaced multiple args (#539)
Co-authored-by: AnimeGitB <AnimeGitB@bigblueball.in>
2022-05-05 15:23:48 +02:00
66Leo66
3f46100d80
Allow overriding config with ENV (#506)
Allow overriding config with ENV (handy when running with docker or debugging without modifying script)
Also log proxy config for easier debugging (when sharing screenshots)
2022-05-05 15:22:29 +02:00
Melledy
b61672e046 Fix clear command causing a concurrency error 2022-05-05 02:29:43 -07:00
Melledy
199c97f241
Remove link to personal site 2022-05-05 00:16:39 -07:00
AnimeGitB
bc19f2da93 Add R# LVL# X# arg syntax to GiveCommand 2022-05-05 00:14:17 -07:00
gentlespoon
080ba33cc9 Restrict to MP prop only. 2022-05-05 00:03:42 -07:00
gentlespoon
94c1de66b9 SetPlayerPropReq Handler and player.setProperty() sanity check. 2022-05-05 00:03:42 -07:00
AnimeGitB
2cfaeac6bc Command Targeting overhaul fixes 2022-05-05 00:03:10 -07:00
AnimeGitB
0c715f0856 Commands Targeting rework 2022-05-05 00:03:10 -07:00
AnimeGitB
e198907143 Move command prefix stripping to ChatManager 2022-05-05 00:03:10 -07:00
AnimeGitB
bf654ced36 [WIP] Command Targeting overhaul 2022-05-05 00:03:10 -07:00
hanbao233xD
821969fdd2 Update CNLanguage.java 2022-05-04 22:57:33 -07:00
hanbao233xD
dabd700252 Update CNLanguage.java 2022-05-04 22:57:33 -07:00
hanbao233xD
8218b1c162 Update CNLanguage.java 2022-05-04 22:57:33 -07:00
Secretboy
c3eafa0255 Update Config.java 2022-05-04 22:57:06 -07:00
Secretboy
c63f2cfd3c Update Grasscutter.java 2022-05-04 22:57:06 -07:00
gentlespoon
491ad5b4d9 Add missing PacketOpcodes. 2022-05-04 22:54:52 -07:00
Angda Song
3edbed463b Update teleport docs and allow overriding Y coord when teleporting 2022-05-04 14:50:49 -07:00
BaiSugar
d62be2d1d7
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
022dcf60ad
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
823040be56
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
6943360f4a 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
d52fa0a989
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
be4f178b8e 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
f08b8b1e09 Fix equip swapping 2022-05-04 01:45:41 -07:00
Melledy
50a8db213d Fix damage number not showing up if it was the killing blow 2022-05-04 01:21:34 -07:00
Melledy
b6fa6fe2d7 Move languages to languages package 2022-05-04 00:44:33 -07:00
Melledy
e7276a75d3 Fixed dungeon challenge scoreboard and implement dungeon drops
Also fixed a few dungeon script handlers
2022-05-03 23:24:43 -07:00
Melledy
bf3e5566c8 Weapons/artifacts should not have a count of more than 1 2022-05-03 23:24:18 -07:00
Melledy
1ea24be087 Fix jline in eclipse 2022-05-03 23:24:02 -07:00
Scirese
590c111c96
Optimize Chinese Translations (#498)
* Add Chinese Translation

* Optimize Chinese Translations

* Fix a dumb error
2022-05-03 23:15:04 -07:00
真心
5d54136969 fix .gitignore 2022-05-03 22:17:51 -07:00
方块君
bddc46f172 Modify Chinese language files 2022-05-03 22:17:41 -07:00
方块君
085ebf61cc Add some text to language file 2022-05-03 22:17:41 -07:00
方块君
8451f960d4 Optimize multilingualism (using variables)
Optimize multilingualism (using variables)
2022-05-03 22:17:41 -07:00
memetrollsXD
ded4c76e68
Update .gitignore for languages (#488)
* improve server side command line input

* prevent multiline logs from covering typed commands

* reduce text in console

* resolve conflicts caused by multilanguage

* Update .gitignore for languages
2022-05-03 23:31:30 +02:00
DancingSnow
1452c0565b fix giveart command when times about 200, account will crash 2022-05-03 10:45:11 -07:00
AnimeGitB
f456460185 Refactor SetStatsCommand, add target UID and all FightProperty stats 2022-05-03 10:37:32 -07:00
BaiSugar
ec27c47db4 Approaching StatuesOfTheSeven will restore all health of the current team 2022-05-03 10:24:10 -07:00
mzfqy
8485ba5789 fix path 2022-05-03 10:23:29 -07:00
mzfqy
58962ba212 add zh_cn translate. 2022-05-03 10:23:29 -07:00
dogdie233
87fd388be9
Update README about #439 (#473) 2022-05-03 14:47:45 +02:00
Presiareen
3cc67a849d
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
145feb62d1 Add languages folder to config as well 2022-05-03 03:19:43 -07:00
方块君
9407e6374b Add multilingual support
Add multilingual support
2022-05-03 02:38:37 -07:00
xtaodada
51a6152afc Support giftPackage BatchUse
Co-authored-by: pris <lilch1022@hotmail.com>
2022-05-03 02:29:04 -07:00
Melledy
98af9b2433 Update spawns, also removed the monster spawns that were too close to newly created players 2022-05-03 02:27:18 -07:00
Melledy
90787c659b Fix extra skill charges being removed if you teleport
Close #404
2022-05-03 02:27:18 -07:00
Melledy
5af7b8d2e8 Fix mail not sending to offline players 2022-05-03 02:27:18 -07:00
mingjun97
1c8f272fee Carry to new line for messages in MessageHandler 2022-05-03 02:16:44 -07:00
mingjun97
0adafd6076 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
dab34fcd0d avoid compile error caused by encoding 2022-05-02 22:05:21 -07:00
xtaodada
70b5124ecf Implement food heal function
Co-authored-by: pris <lilch1022@hotmail.com>
2022-05-02 22:02:11 -07:00
KingRainbow44
b778b97788
Initialize ServerHook 2022-05-02 21:20:24 -04:00
Melledy
f4e8baf187 Update kcp netty
See https://github.com/Melledy/kcp-netty
2022-05-02 15:24:09 -07:00
dogdie233
9c358744e7 Add EnterDungeonCmd, fix error when enter dungeon by changescene, import spawn cmd 2022-05-02 10:50:08 -07:00
蓝云Reyes
e83e985bbc Fix 2022-05-02 10:49:53 -07:00
蓝云Reyes
216c899ec2 Update gacha_records.html
Change the colour scheme to make it look more comfortable.
2022-05-02 10:49:53 -07:00
蓝云Reyes
dae442872c Update gacha_records.html
Fix a problem where the switch page button was difficult to reach
2022-05-02 10:49:53 -07:00
蓝云Reyes
ee0a246471 Update gacha_records.html 2022-05-02 10:49:53 -07:00
蓝云Reyes
db3af8e3ee Update gacha_records.html 2022-05-02 10:49:53 -07:00
LDA
05de77fd70 load photo mode pose and expression fetters 2022-05-02 10:47:27 -07:00
4Benj_
1df5574b2e
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
d912b59d93 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
2661cc5ef3 Fix announcement display 2022-05-02 02:50:32 -07:00
xtaodada
e8aaee6515 implement shopMail giftPackage function
Co-authored-by: Kinesis <CCasusensa@users.noreply.github.com>
2022-05-02 02:50:24 -07:00
Benjamin Elsdon
29b5157d42 Custom Authentication Handler 2022-05-02 02:50:14 -07:00
DancingSnow
50740b3560 fix World level not in 0-8 2022-05-02 02:26:11 -07:00
Melledy
89bd8a10ef Fix gacha rate for weapons 2022-05-02 02:01:24 -07:00
Melledy
63c7f8d62d 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
e60cf79309
Merge remote-tracking branch 'origin/development' into development 2022-05-01 20:15:27 -04:00
KingRainbow44
3215b6961a
Change to xyz.grasscutters from tech.xigam as publish group id 2022-05-01 20:14:47 -04:00
mingjun97
8cf4ef59ec 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
22a651b4aa Fix goods limit bug 2022-05-01 13:42:01 -07:00
xtaodada
6d96906484 Show shopmall 2022-05-01 13:42:01 -07:00
筱傑
29c95cb1b6
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
2c0576f697 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
1e166960d2 Improve registration methods. 2022-05-01 10:02:57 -07:00
coooookies
59d5f4feec GameServerPacketHandler need to be added a registration interface for plugin developers 2022-05-01 10:02:57 -07:00
Kinesis
d4e1b265e3 fix McoinExchangeHcoinRsp packet structure 2022-05-01 10:02:47 -07:00
筱傑
ec09bc28f2
Fixed can set talent level to 16 bug (#408)
Level should be **lower than 16**
2022-05-01 16:42:02 +02:00
4Benj_
d484ba7ed6
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
mikuyourworld
d050407421 Update readme because the commad /clearartifacts and /clearweapons have been merged in this PR https://github.com/Grasscutters/Grasscutter/pull/245 2022-04-30 23:20:16 -07:00
KingRainbow44
d31695b033
Merge remote-tracking branch 'origin/development' into development 2022-05-01 02:14:35 -04:00
mingjun97
15d2795686 Should fix all crashes when login for iOS client 2022-04-30 23:03:47 -07:00
mingjun97
8a655c16eb 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
65c63ac34a Change RunMode and DebugMode to enums 2022-04-30 22:52:09 -07:00
Melledy
66ccd30416 Fix possible exploit with mcoin exchange 2022-04-30 22:51:21 -07:00
Kinesis
7b22b575b7 implement McoinExchange packet Handler 2022-04-30 22:03:44 -07:00
mingjun97
1ac5aeb286 Revert changes for debugging purpose 2022-04-30 21:43:46 -07:00
mingjun97
582d91227c 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
dd0f8f8d49 Fix constellations that give an extra charge to skills
Fix #228
2022-04-30 19:34:50 -07:00
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
KingRainbow44
8830da8bc1
Fix SLF4j issue 2022-04-30 20:37:43 -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
KingRainbow44
2e4dcbcfbe
Update to 1.0.3-dev 2022-04-30 18:02:19 -04:00
Magix
a263f12546
Delete feature_request.md 2022-04-30 17:40:04 -04:00
Magix
777c0e5cb4
Delete bug_report.md 2022-04-30 17:40:02 -04:00
Magix
207eba1af5
Merge pull request #386 from Grasscutters/memetrollsXD-patch-1
Delete bug_report.md
2022-04-30 17:38:28 -04:00
Magix
370f086d2c
Merge pull request #387 from Grasscutters/memetrollsXD-patch-2
Delete feature_request.md
2022-04-30 17:38:14 -04:00
NostalgiaCyan
85c7f5b54b
Update README_zh-CN.md (#382) 2022-04-30 23:04:30 +02:00
memetrollsXD
6e007a4be0
Delete feature_request.md 2022-04-30 23:01:35 +02:00
memetrollsXD
1ee3d284c8
Delete bug_report.md 2022-04-30 23:01:28 +02:00
Magix
317bf5c78b Update Grasscutter.java
why do i have to fix stable
2022-04-27 11:33:36 +02:00
类C语言是一家
cc093be67b update org.reflections
0.9.12->0.10.2
to avoid `[INFO] Unknown command` (#148)
2022-04-27 01:24:19 +02:00
515 changed files with 27315 additions and 4095 deletions

View File

@ -1,38 +0,0 @@
---
name: Bug report
about: Create a report to help us improve
title: ''
labels: ''
assignees: ''
---
**Describe the bug**
A clear and concise description of what the bug is.
**To Reproduce**
Steps to reproduce the behavior:
1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
4. See error
**Expected behavior**
A clear and concise description of what you expected to happen.
**Screenshots**
If applicable, add screenshots to help explain your problem.
**Desktop (please complete the following information):**
- OS: [e.g. iOS]
- Browser [e.g. chrome, safari]
- Version [e.g. 22]
**Smartphone (please complete the following information):**
- Device: [e.g. iPhone6]
- OS: [e.g. iOS8.1]
- Browser [e.g. stock browser, safari]
- Version [e.g. 22]
**Additional context**
Add any other context about the problem here.

View File

@ -1,20 +0,0 @@
---
name: Feature request
about: Suggest an idea for this project
title: ''
labels: ''
assignees: ''
---
**Is your feature request related to a problem? Please describe.**
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
**Describe the solution you'd like**
A clear and concise description of what you want to happen.
**Describe alternatives you've considered**
A clear and concise description of any alternative solutions or features you've considered.
**Additional context**
Add any other context or screenshots about the feature request here.

View File

@ -25,10 +25,20 @@ jobs:
with:
distribution: temurin
java-version: '17'
- name: Cache gradle files
uses: actions/cache@v2
with:
path: |
~/.gradle/caches
~/.gradle/wrapper
./.gradle/loom-cache
key: ${{ runner.os }}-gradle-${{ hashFiles('*.gradle', 'gradle.properties', '**/*.accesswidener') }}
restore-keys: |
${{ runner.os }}-gradle-
- name: Run Gradle
run: ./gradlew && ./gradlew jar
- name: Upload build
uses: actions/upload-artifact@v3
with:
name: Grasscutter
path: grasscutter-*-dev.jar
path: grasscutter-*.jar

34
.gitignore vendored
View File

@ -17,7 +17,7 @@
*.nar
*.ear
*.zip
*.tar.gz
*.gz
*.rar
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
@ -52,16 +52,30 @@ tmp/
.vscode
# Grasscutter
resources/*
logs/*
plugins/*
data/AbilityEmbryos.json
data/OpenConfig.json
/resources
/logs
/plugins
/data
/keys
/language
/languages
/src/generated
/*.jar
/*.sh
GM Handbook.txt
config.json
mitmdump.exe
*.jar
!lib/*.jar
mongod.exe
/src/generated/
/*.sh
gacha-mapping.js
mappings.js
BuildConfig.java
# lombok
/.apt_generated/
# macOS
.DS_Store
data/hk4e/announcement/

798
LICENSE
View File

@ -1,201 +1,661 @@
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
GNU AFFERO GENERAL PUBLIC LICENSE
Version 3, 19 November 2007
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
1. Definitions.
Preamble
"License" shall mean the terms and conditions for use, reproduction,
and distribution as defined by Sections 1 through 9 of this document.
The GNU Affero General Public License is a free, copyleft license for
software and other kinds of works, specifically designed to ensure
cooperation with the community in the case of network server software.
"Licensor" shall mean the copyright owner or entity authorized by
the copyright owner that is granting the License.
The licenses for most software and other practical works are designed
to take away your freedom to share and change the works. By contrast,
our General Public Licenses are intended to guarantee your freedom to
share and change all versions of a program--to make sure it remains free
software for all its users.
"Legal Entity" shall mean the union of the acting entity and all
other entities that control, are controlled by, or are under common
control with that entity. For the purposes of this definition,
"control" means (i) the power, direct or indirect, to cause the
direction or management of such entity, whether by contract or
otherwise, or (ii) ownership of fifty percent (50%) or more of the
outstanding shares, or (iii) beneficial ownership of such entity.
When we speak of free software, we are referring to freedom, not
price. Our General Public Licenses are designed to make sure that you
have the freedom to distribute copies of free software (and charge for
them if you wish), that you receive source code or can get it if you
want it, that you can change the software or use pieces of it in new
free programs, and that you know you can do these things.
"You" (or "Your") shall mean an individual or Legal Entity
exercising permissions granted by this License.
Developers that use our General Public Licenses protect your rights
with two steps: (1) assert copyright on the software, and (2) offer
you this License which gives you legal permission to copy, distribute
and/or modify the software.
"Source" form shall mean the preferred form for making modifications,
including but not limited to software source code, documentation
source, and configuration files.
A secondary benefit of defending all users' freedom is that
improvements made in alternate versions of the program, if they
receive widespread use, become available for other developers to
incorporate. Many developers of free software are heartened and
encouraged by the resulting cooperation. However, in the case of
software used on network servers, this result may fail to come about.
The GNU General Public License permits making a modified version and
letting the public access it on a server without ever releasing its
source code to the public.
"Object" form shall mean any form resulting from mechanical
transformation or translation of a Source form, including but
not limited to compiled object code, generated documentation,
and conversions to other media types.
The GNU Affero General Public License is designed specifically to
ensure that, in such cases, the modified source code becomes available
to the community. It requires the operator of a network server to
provide the source code of the modified version running there to the
users of that server. Therefore, public use of a modified version, on
a publicly accessible server, gives the public access to the source
code of the modified version.
"Work" shall mean the work of authorship, whether in Source or
Object form, made available under the License, as indicated by a
copyright notice that is included in or attached to the work
(an example is provided in the Appendix below).
An older license, called the Affero General Public License and
published by Affero, was designed to accomplish similar goals. This is
a different license, not a version of the Affero GPL, but Affero has
released a new version of the Affero GPL which permits relicensing under
this license.
"Derivative Works" shall mean any work, whether in Source or Object
form, that is based on (or derived from) the Work and for which the
editorial revisions, annotations, elaborations, or other modifications
represent, as a whole, an original work of authorship. For the purposes
of this License, Derivative Works shall not include works that remain
separable from, or merely link (or bind by name) to the interfaces of,
the Work and Derivative Works thereof.
The precise terms and conditions for copying, distribution and
modification follow.
"Contribution" shall mean any work of authorship, including
the original version of the Work and any modifications or additions
to that Work or Derivative Works thereof, that is intentionally
submitted to Licensor for inclusion in the Work by the copyright owner
or by an individual or Legal Entity authorized to submit on behalf of
the copyright owner. For the purposes of this definition, "submitted"
means any form of electronic, verbal, or written communication sent
to the Licensor or its representatives, including but not limited to
communication on electronic mailing lists, source code control systems,
and issue tracking systems that are managed by, or on behalf of, the
Licensor for the purpose of discussing and improving the Work, but
excluding communication that is conspicuously marked or otherwise
designated in writing by the copyright owner as "Not a Contribution."
TERMS AND CONDITIONS
"Contributor" shall mean Licensor and any individual or Legal Entity
on behalf of whom a Contribution has been received by Licensor and
subsequently incorporated within the Work.
0. Definitions.
2. Grant of Copyright License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
copyright license to reproduce, prepare Derivative Works of,
publicly display, publicly perform, sublicense, and distribute the
Work and such Derivative Works in Source or Object form.
"This License" refers to version 3 of the GNU Affero General Public License.
3. Grant of Patent License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
(except as stated in this section) patent license to make, have made,
use, offer to sell, sell, import, and otherwise transfer the Work,
where such license applies only to those patent claims licensable
by such Contributor that are necessarily infringed by their
Contribution(s) alone or by combination of their Contribution(s)
with the Work to which such Contribution(s) was submitted. If You
institute patent litigation against any entity (including a
cross-claim or counterclaim in a lawsuit) alleging that the Work
or a Contribution incorporated within the Work constitutes direct
or contributory patent infringement, then any patent licenses
granted to You under this License for that Work shall terminate
as of the date such litigation is filed.
"Copyright" also means copyright-like laws that apply to other kinds of
works, such as semiconductor masks.
4. Redistribution. You may reproduce and distribute copies of the
Work or Derivative Works thereof in any medium, with or without
modifications, and in Source or Object form, provided that You
meet the following conditions:
"The Program" refers to any copyrightable work licensed under this
License. Each licensee is addressed as "you". "Licensees" and
"recipients" may be individuals or organizations.
(a) You must give any other recipients of the Work or
Derivative Works a copy of this License; and
To "modify" a work means to copy from or adapt all or part of the work
in a fashion requiring copyright permission, other than the making of an
exact copy. The resulting work is called a "modified version" of the
earlier work or a work "based on" the earlier work.
(b) You must cause any modified files to carry prominent notices
stating that You changed the files; and
A "covered work" means either the unmodified Program or a work based
on the Program.
(c) You must retain, in the Source form of any Derivative Works
that You distribute, all copyright, patent, trademark, and
attribution notices from the Source form of the Work,
excluding those notices that do not pertain to any part of
the Derivative Works; and
To "propagate" a work means to do anything with it that, without
permission, would make you directly or secondarily liable for
infringement under applicable copyright law, except executing it on a
computer or modifying a private copy. Propagation includes copying,
distribution (with or without modification), making available to the
public, and in some countries other activities as well.
(d) If the Work includes a "NOTICE" text file as part of its
distribution, then any Derivative Works that You distribute must
include a readable copy of the attribution notices contained
within such NOTICE file, excluding those notices that do not
pertain to any part of the Derivative Works, in at least one
of the following places: within a NOTICE text file distributed
as part of the Derivative Works; within the Source form or
documentation, if provided along with the Derivative Works; or,
within a display generated by the Derivative Works, if and
wherever such third-party notices normally appear. The contents
of the NOTICE file are for informational purposes only and
do not modify the License. You may add Your own attribution
notices within Derivative Works that You distribute, alongside
or as an addendum to the NOTICE text from the Work, provided
that such additional attribution notices cannot be construed
as modifying the License.
To "convey" a work means any kind of propagation that enables other
parties to make or receive copies. Mere interaction with a user through
a computer network, with no transfer of a copy, is not conveying.
You may add Your own copyright statement to Your modifications and
may provide additional or different license terms and conditions
for use, reproduction, or distribution of Your modifications, or
for any such Derivative Works as a whole, provided Your use,
reproduction, and distribution of the Work otherwise complies with
the conditions stated in this License.
An interactive user interface displays "Appropriate Legal Notices"
to the extent that it includes a convenient and prominently visible
feature that (1) displays an appropriate copyright notice, and (2)
tells the user that there is no warranty for the work (except to the
extent that warranties are provided), that licensees may convey the
work under this License, and how to view a copy of this License. If
the interface presents a list of user commands or options, such as a
menu, a prominent item in the list meets this criterion.
5. Submission of Contributions. Unless You explicitly state otherwise,
any Contribution intentionally submitted for inclusion in the Work
by You to the Licensor shall be under the terms and conditions of
this License, without any additional terms or conditions.
Notwithstanding the above, nothing herein shall supersede or modify
the terms of any separate license agreement you may have executed
with Licensor regarding such Contributions.
1. Source Code.
6. Trademarks. This License does not grant permission to use the trade
names, trademarks, service marks, or product names of the Licensor,
except as required for reasonable and customary use in describing the
origin of the Work and reproducing the content of the NOTICE file.
The "source code" for a work means the preferred form of the work
for making modifications to it. "Object code" means any non-source
form of a work.
7. Disclaimer of Warranty. Unless required by applicable law or
agreed to in writing, Licensor provides the Work (and each
Contributor provides its Contributions) on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied, including, without limitation, any warranties or conditions
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
PARTICULAR PURPOSE. You are solely responsible for determining the
appropriateness of using or redistributing the Work and assume any
risks associated with Your exercise of permissions under this License.
A "Standard Interface" means an interface that either is an official
standard defined by a recognized standards body, or, in the case of
interfaces specified for a particular programming language, one that
is widely used among developers working in that language.
8. Limitation of Liability. In no event and under no legal theory,
whether in tort (including negligence), contract, or otherwise,
unless required by applicable law (such as deliberate and grossly
negligent acts) or agreed to in writing, shall any Contributor be
liable to You for damages, including any direct, indirect, special,
incidental, or consequential damages of any character arising as a
result of this License or out of the use or inability to use the
Work (including but not limited to damages for loss of goodwill,
work stoppage, computer failure or malfunction, or any and all
other commercial damages or losses), even if such Contributor
has been advised of the possibility of such damages.
The "System Libraries" of an executable work include anything, other
than the work as a whole, that (a) is included in the normal form of
packaging a Major Component, but which is not part of that Major
Component, and (b) serves only to enable use of the work with that
Major Component, or to implement a Standard Interface for which an
implementation is available to the public in source code form. A
"Major Component", in this context, means a major essential component
(kernel, window system, and so on) of the specific operating system
(if any) on which the executable work runs, or a compiler used to
produce the work, or an object code interpreter used to run it.
9. Accepting Warranty or Additional Liability. While redistributing
the Work or Derivative Works thereof, You may choose to offer,
and charge a fee for, acceptance of support, warranty, indemnity,
or other liability obligations and/or rights consistent with this
License. However, in accepting such obligations, You may act only
on Your own behalf and on Your sole responsibility, not on behalf
of any other Contributor, and only if You agree to indemnify,
defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.
The "Corresponding Source" for a work in object code form means all
the source code needed to generate, install, and (for an executable
work) run the object code and to modify the work, including scripts to
control those activities. However, it does not include the work's
System Libraries, or general-purpose tools or generally available free
programs which are used unmodified in performing those activities but
which are not part of the work. For example, Corresponding Source
includes interface definition files associated with source files for
the work, and the source code for shared libraries and dynamically
linked subprograms that the work is specifically designed to require,
such as by intimate data communication or control flow between those
subprograms and other parts of the work.
END OF TERMS AND CONDITIONS
The Corresponding Source need not include anything that users
can regenerate automatically from other parts of the Corresponding
Source.
APPENDIX: How to apply the Apache License to your work.
The Corresponding Source for a work in source code form is that
same work.
To apply the Apache License to your work, attach the following
boilerplate notice, with the fields enclosed by brackets "[]"
replaced with your own identifying information. (Don't include
the brackets!) The text should be enclosed in the appropriate
comment syntax for the file format. We also recommend that a
file or class name and description of purpose be included on the
same "printed page" as the copyright notice for easier
identification within third-party archives.
2. Basic Permissions.
Copyright [yyyy] [name of copyright owner]
All rights granted under this License are granted for the term of
copyright on the Program, and are irrevocable provided the stated
conditions are met. This License explicitly affirms your unlimited
permission to run the unmodified Program. The output from running a
covered work is covered by this License only if the output, given its
content, constitutes a covered work. This License acknowledges your
rights of fair use or other equivalent, as provided by copyright law.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
You may make, run and propagate covered works that you do not
convey, without conditions so long as your license otherwise remains
in force. You may convey covered works to others for the sole purpose
of having them make modifications exclusively for you, or provide you
with facilities for running those works, provided that you comply with
the terms of this License in conveying all material for which you do
not control copyright. Those thus making or running the covered works
for you must do so exclusively on your behalf, under your direction
and control, on terms that prohibit them from making any copies of
your copyrighted material outside their relationship with you.
http://www.apache.org/licenses/LICENSE-2.0
Conveying under any other circumstances is permitted solely under
the conditions stated below. Sublicensing is not allowed; section 10
makes it unnecessary.
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
3. Protecting Users' Legal Rights From Anti-Circumvention Law.
No covered work shall be deemed part of an effective technological
measure under any applicable law fulfilling obligations under article
11 of the WIPO copyright treaty adopted on 20 December 1996, or
similar laws prohibiting or restricting circumvention of such
measures.
When you convey a covered work, you waive any legal power to forbid
circumvention of technological measures to the extent such circumvention
is effected by exercising rights under this License with respect to
the covered work, and you disclaim any intention to limit operation or
modification of the work as a means of enforcing, against the work's
users, your or third parties' legal rights to forbid circumvention of
technological measures.
4. Conveying Verbatim Copies.
You may convey verbatim copies of the Program's source code as you
receive it, in any medium, provided that you conspicuously and
appropriately publish on each copy an appropriate copyright notice;
keep intact all notices stating that this License and any
non-permissive terms added in accord with section 7 apply to the code;
keep intact all notices of the absence of any warranty; and give all
recipients a copy of this License along with the Program.
You may charge any price or no price for each copy that you convey,
and you may offer support or warranty protection for a fee.
5. Conveying Modified Source Versions.
You may convey a work based on the Program, or the modifications to
produce it from the Program, in the form of source code under the
terms of section 4, provided that you also meet all of these conditions:
a) The work must carry prominent notices stating that you modified
it, and giving a relevant date.
b) The work must carry prominent notices stating that it is
released under this License and any conditions added under section
7. This requirement modifies the requirement in section 4 to
"keep intact all notices".
c) You must license the entire work, as a whole, under this
License to anyone who comes into possession of a copy. This
License will therefore apply, along with any applicable section 7
additional terms, to the whole of the work, and all its parts,
regardless of how they are packaged. This License gives no
permission to license the work in any other way, but it does not
invalidate such permission if you have separately received it.
d) If the work has interactive user interfaces, each must display
Appropriate Legal Notices; however, if the Program has interactive
interfaces that do not display Appropriate Legal Notices, your
work need not make them do so.
A compilation of a covered work with other separate and independent
works, which are not by their nature extensions of the covered work,
and which are not combined with it such as to form a larger program,
in or on a volume of a storage or distribution medium, is called an
"aggregate" if the compilation and its resulting copyright are not
used to limit the access or legal rights of the compilation's users
beyond what the individual works permit. Inclusion of a covered work
in an aggregate does not cause this License to apply to the other
parts of the aggregate.
6. Conveying Non-Source Forms.
You may convey a covered work in object code form under the terms
of sections 4 and 5, provided that you also convey the
machine-readable Corresponding Source under the terms of this License,
in one of these ways:
a) Convey the object code in, or embodied in, a physical product
(including a physical distribution medium), accompanied by the
Corresponding Source fixed on a durable physical medium
customarily used for software interchange.
b) Convey the object code in, or embodied in, a physical product
(including a physical distribution medium), accompanied by a
written offer, valid for at least three years and valid for as
long as you offer spare parts or customer support for that product
model, to give anyone who possesses the object code either (1) a
copy of the Corresponding Source for all the software in the
product that is covered by this License, on a durable physical
medium customarily used for software interchange, for a price no
more than your reasonable cost of physically performing this
conveying of source, or (2) access to copy the
Corresponding Source from a network server at no charge.
c) Convey individual copies of the object code with a copy of the
written offer to provide the Corresponding Source. This
alternative is allowed only occasionally and noncommercially, and
only if you received the object code with such an offer, in accord
with subsection 6b.
d) Convey the object code by offering access from a designated
place (gratis or for a charge), and offer equivalent access to the
Corresponding Source in the same way through the same place at no
further charge. You need not require recipients to copy the
Corresponding Source along with the object code. If the place to
copy the object code is a network server, the Corresponding Source
may be on a different server (operated by you or a third party)
that supports equivalent copying facilities, provided you maintain
clear directions next to the object code saying where to find the
Corresponding Source. Regardless of what server hosts the
Corresponding Source, you remain obligated to ensure that it is
available for as long as needed to satisfy these requirements.
e) Convey the object code using peer-to-peer transmission, provided
you inform other peers where the object code and Corresponding
Source of the work are being offered to the general public at no
charge under subsection 6d.
A separable portion of the object code, whose source code is excluded
from the Corresponding Source as a System Library, need not be
included in conveying the object code work.
A "User Product" is either (1) a "consumer product", which means any
tangible personal property which is normally used for personal, family,
or household purposes, or (2) anything designed or sold for incorporation
into a dwelling. In determining whether a product is a consumer product,
doubtful cases shall be resolved in favor of coverage. For a particular
product received by a particular user, "normally used" refers to a
typical or common use of that class of product, regardless of the status
of the particular user or of the way in which the particular user
actually uses, or expects or is expected to use, the product. A product
is a consumer product regardless of whether the product has substantial
commercial, industrial or non-consumer uses, unless such uses represent
the only significant mode of use of the product.
"Installation Information" for a User Product means any methods,
procedures, authorization keys, or other information required to install
and execute modified versions of a covered work in that User Product from
a modified version of its Corresponding Source. The information must
suffice to ensure that the continued functioning of the modified object
code is in no case prevented or interfered with solely because
modification has been made.
If you convey an object code work under this section in, or with, or
specifically for use in, a User Product, and the conveying occurs as
part of a transaction in which the right of possession and use of the
User Product is transferred to the recipient in perpetuity or for a
fixed term (regardless of how the transaction is characterized), the
Corresponding Source conveyed under this section must be accompanied
by the Installation Information. But this requirement does not apply
if neither you nor any third party retains the ability to install
modified object code on the User Product (for example, the work has
been installed in ROM).
The requirement to provide Installation Information does not include a
requirement to continue to provide support service, warranty, or updates
for a work that has been modified or installed by the recipient, or for
the User Product in which it has been modified or installed. Access to a
network may be denied when the modification itself materially and
adversely affects the operation of the network or violates the rules and
protocols for communication across the network.
Corresponding Source conveyed, and Installation Information provided,
in accord with this section must be in a format that is publicly
documented (and with an implementation available to the public in
source code form), and must require no special password or key for
unpacking, reading or copying.
7. Additional Terms.
"Additional permissions" are terms that supplement the terms of this
License by making exceptions from one or more of its conditions.
Additional permissions that are applicable to the entire Program shall
be treated as though they were included in this License, to the extent
that they are valid under applicable law. If additional permissions
apply only to part of the Program, that part may be used separately
under those permissions, but the entire Program remains governed by
this License without regard to the additional permissions.
When you convey a copy of a covered work, you may at your option
remove any additional permissions from that copy, or from any part of
it. (Additional permissions may be written to require their own
removal in certain cases when you modify the work.) You may place
additional permissions on material, added by you to a covered work,
for which you have or can give appropriate copyright permission.
Notwithstanding any other provision of this License, for material you
add to a covered work, you may (if authorized by the copyright holders of
that material) supplement the terms of this License with terms:
a) Disclaiming warranty or limiting liability differently from the
terms of sections 15 and 16 of this License; or
b) Requiring preservation of specified reasonable legal notices or
author attributions in that material or in the Appropriate Legal
Notices displayed by works containing it; or
c) Prohibiting misrepresentation of the origin of that material, or
requiring that modified versions of such material be marked in
reasonable ways as different from the original version; or
d) Limiting the use for publicity purposes of names of licensors or
authors of the material; or
e) Declining to grant rights under trademark law for use of some
trade names, trademarks, or service marks; or
f) Requiring indemnification of licensors and authors of that
material by anyone who conveys the material (or modified versions of
it) with contractual assumptions of liability to the recipient, for
any liability that these contractual assumptions directly impose on
those licensors and authors.
All other non-permissive additional terms are considered "further
restrictions" within the meaning of section 10. If the Program as you
received it, or any part of it, contains a notice stating that it is
governed by this License along with a term that is a further
restriction, you may remove that term. If a license document contains
a further restriction but permits relicensing or conveying under this
License, you may add to a covered work material governed by the terms
of that license document, provided that the further restriction does
not survive such relicensing or conveying.
If you add terms to a covered work in accord with this section, you
must place, in the relevant source files, a statement of the
additional terms that apply to those files, or a notice indicating
where to find the applicable terms.
Additional terms, permissive or non-permissive, may be stated in the
form of a separately written license, or stated as exceptions;
the above requirements apply either way.
8. Termination.
You may not propagate or modify a covered work except as expressly
provided under this License. Any attempt otherwise to propagate or
modify it is void, and will automatically terminate your rights under
this License (including any patent licenses granted under the third
paragraph of section 11).
However, if you cease all violation of this License, then your
license from a particular copyright holder is reinstated (a)
provisionally, unless and until the copyright holder explicitly and
finally terminates your license, and (b) permanently, if the copyright
holder fails to notify you of the violation by some reasonable means
prior to 60 days after the cessation.
Moreover, your license from a particular copyright holder is
reinstated permanently if the copyright holder notifies you of the
violation by some reasonable means, this is the first time you have
received notice of violation of this License (for any work) from that
copyright holder, and you cure the violation prior to 30 days after
your receipt of the notice.
Termination of your rights under this section does not terminate the
licenses of parties who have received copies or rights from you under
this License. If your rights have been terminated and not permanently
reinstated, you do not qualify to receive new licenses for the same
material under section 10.
9. Acceptance Not Required for Having Copies.
You are not required to accept this License in order to receive or
run a copy of the Program. Ancillary propagation of a covered work
occurring solely as a consequence of using peer-to-peer transmission
to receive a copy likewise does not require acceptance. However,
nothing other than this License grants you permission to propagate or
modify any covered work. These actions infringe copyright if you do
not accept this License. Therefore, by modifying or propagating a
covered work, you indicate your acceptance of this License to do so.
10. Automatic Licensing of Downstream Recipients.
Each time you convey a covered work, the recipient automatically
receives a license from the original licensors, to run, modify and
propagate that work, subject to this License. You are not responsible
for enforcing compliance by third parties with this License.
An "entity transaction" is a transaction transferring control of an
organization, or substantially all assets of one, or subdividing an
organization, or merging organizations. If propagation of a covered
work results from an entity transaction, each party to that
transaction who receives a copy of the work also receives whatever
licenses to the work the party's predecessor in interest had or could
give under the previous paragraph, plus a right to possession of the
Corresponding Source of the work from the predecessor in interest, if
the predecessor has it or can get it with reasonable efforts.
You may not impose any further restrictions on the exercise of the
rights granted or affirmed under this License. For example, you may
not impose a license fee, royalty, or other charge for exercise of
rights granted under this License, and you may not initiate litigation
(including a cross-claim or counterclaim in a lawsuit) alleging that
any patent claim is infringed by making, using, selling, offering for
sale, or importing the Program or any portion of it.
11. Patents.
A "contributor" is a copyright holder who authorizes use under this
License of the Program or a work on which the Program is based. The
work thus licensed is called the contributor's "contributor version".
A contributor's "essential patent claims" are all patent claims
owned or controlled by the contributor, whether already acquired or
hereafter acquired, that would be infringed by some manner, permitted
by this License, of making, using, or selling its contributor version,
but do not include claims that would be infringed only as a
consequence of further modification of the contributor version. For
purposes of this definition, "control" includes the right to grant
patent sublicenses in a manner consistent with the requirements of
this License.
Each contributor grants you a non-exclusive, worldwide, royalty-free
patent license under the contributor's essential patent claims, to
make, use, sell, offer for sale, import and otherwise run, modify and
propagate the contents of its contributor version.
In the following three paragraphs, a "patent license" is any express
agreement or commitment, however denominated, not to enforce a patent
(such as an express permission to practice a patent or covenant not to
sue for patent infringement). To "grant" such a patent license to a
party means to make such an agreement or commitment not to enforce a
patent against the party.
If you convey a covered work, knowingly relying on a patent license,
and the Corresponding Source of the work is not available for anyone
to copy, free of charge and under the terms of this License, through a
publicly available network server or other readily accessible means,
then you must either (1) cause the Corresponding Source to be so
available, or (2) arrange to deprive yourself of the benefit of the
patent license for this particular work, or (3) arrange, in a manner
consistent with the requirements of this License, to extend the patent
license to downstream recipients. "Knowingly relying" means you have
actual knowledge that, but for the patent license, your conveying the
covered work in a country, or your recipient's use of the covered work
in a country, would infringe one or more identifiable patents in that
country that you have reason to believe are valid.
If, pursuant to or in connection with a single transaction or
arrangement, you convey, or propagate by procuring conveyance of, a
covered work, and grant a patent license to some of the parties
receiving the covered work authorizing them to use, propagate, modify
or convey a specific copy of the covered work, then the patent license
you grant is automatically extended to all recipients of the covered
work and works based on it.
A patent license is "discriminatory" if it does not include within
the scope of its coverage, prohibits the exercise of, or is
conditioned on the non-exercise of one or more of the rights that are
specifically granted under this License. You may not convey a covered
work if you are a party to an arrangement with a third party that is
in the business of distributing software, under which you make payment
to the third party based on the extent of your activity of conveying
the work, and under which the third party grants, to any of the
parties who would receive the covered work from you, a discriminatory
patent license (a) in connection with copies of the covered work
conveyed by you (or copies made from those copies), or (b) primarily
for and in connection with specific products or compilations that
contain the covered work, unless you entered into that arrangement,
or that patent license was granted, prior to 28 March 2007.
Nothing in this License shall be construed as excluding or limiting
any implied license or other defenses to infringement that may
otherwise be available to you under applicable patent law.
12. No Surrender of Others' Freedom.
If conditions are imposed on you (whether by court order, agreement or
otherwise) that contradict the conditions of this License, they do not
excuse you from the conditions of this License. If you cannot convey a
covered work so as to satisfy simultaneously your obligations under this
License and any other pertinent obligations, then as a consequence you may
not convey it at all. For example, if you agree to terms that obligate you
to collect a royalty for further conveying from those to whom you convey
the Program, the only way you could satisfy both those terms and this
License would be to refrain entirely from conveying the Program.
13. Remote Network Interaction; Use with the GNU General Public License.
Notwithstanding any other provision of this License, if you modify the
Program, your modified version must prominently offer all users
interacting with it remotely through a computer network (if your version
supports such interaction) an opportunity to receive the Corresponding
Source of your version by providing access to the Corresponding Source
from a network server at no charge, through some standard or customary
means of facilitating copying of software. This Corresponding Source
shall include the Corresponding Source for any work covered by version 3
of the GNU General Public License that is incorporated pursuant to the
following paragraph.
Notwithstanding any other provision of this License, you have
permission to link or combine any covered work with a work licensed
under version 3 of the GNU General Public License into a single
combined work, and to convey the resulting work. The terms of this
License will continue to apply to the part which is the covered work,
but the work with which it is combined will remain governed by version
3 of the GNU General Public License.
14. Revised Versions of this License.
The Free Software Foundation may publish revised and/or new versions of
the GNU Affero General Public License from time to time. Such new versions
will be similar in spirit to the present version, but may differ in detail to
address new problems or concerns.
Each version is given a distinguishing version number. If the
Program specifies that a certain numbered version of the GNU Affero General
Public License "or any later version" applies to it, you have the
option of following the terms and conditions either of that numbered
version or of any later version published by the Free Software
Foundation. If the Program does not specify a version number of the
GNU Affero General Public License, you may choose any version ever published
by the Free Software Foundation.
If the Program specifies that a proxy can decide which future
versions of the GNU Affero General Public License can be used, that proxy's
public statement of acceptance of a version permanently authorizes you
to choose that version for the Program.
Later license versions may give you additional or different
permissions. However, no additional obligations are imposed on any
author or copyright holder as a result of your choosing to follow a
later version.
15. Disclaimer of Warranty.
THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
16. Limitation of Liability.
IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
SUCH DAMAGES.
17. Interpretation of Sections 15 and 16.
If the disclaimer of warranty and limitation of liability provided
above cannot be given local legal effect according to their terms,
reviewing courts shall apply local law that most closely approximates
an absolute waiver of all civil liability in connection with the
Program, unless a warranty or assumption of liability accompanies a
copy of the Program in return for a fee.
END OF TERMS AND CONDITIONS
How to Apply These Terms to Your New Programs
If you develop a new program, and you want it to be of the greatest
possible use to the public, the best way to achieve this is to make it
free software which everyone can redistribute and change under these terms.
To do so, attach the following notices to the program. It is safest
to attach them to the start of each source file to most effectively
state the exclusion of warranty; and each file should have at least
the "copyright" line and a pointer to where the full notice is found.
<one line to give the program's name and a brief idea of what it does.>
Copyright (C) <year> <name of author>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published
by the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Affero General Public License for more details.
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
Also add information on how to contact you by electronic and paper mail.
If your software can interact with users remotely through a computer
network, you should also make sure that it provides a way for users to
get its source. For example, if your program is a web application, its
interface could display a "Source" link that leads users to an archive
of the code. There are many ways you could offer source, and different
solutions will be better for different programs; see section 13 for the
specific requirements.
You should also get your employer (if you work as a programmer) or school,
if any, to sign a "copyright disclaimer" for the program, if necessary.
For more information on this, and how to apply and follow the GNU AGPL, see
<https://www.gnu.org/licenses/>.

263
README.md
View File

@ -1,155 +1,108 @@
![Grasscutter](https://socialify.git.ci/Grasscutters/Grasscutter/image?description=1&forks=1&issues=1&language=1&logo=https%3A%2F%2Fs2.loli.net%2F2022%2F04%2F25%2FxOiJn7lCdcT5Mw1.png&name=1&owner=1&pulls=1&stargazers=1&theme=Light)
<div align="center"><img alt="Documention" src="https://img.shields.io/badge/Wiki-Grasscutter-blue?style=for-the-badge&link=https://github.com/Grasscutters/Grasscutter/wiki&link=https://github.com/Grasscutters/Grasscutter/wiki"> <img alt="GitHub release (latest by date)" src="https://img.shields.io/github/v/release/Grasscutters/Grasscutter?logo=java&style=for-the-badge"> <img alt="GitHub" src="https://img.shields.io/github/license/Grasscutters/Grasscutter?style=for-the-badge"> <img alt="GitHub last commit" src="https://img.shields.io/github/last-commit/Grasscutters/Grasscutter?style=for-the-badge"> <img alt="GitHub Workflow Status" src="https://img.shields.io/github/workflow/status/Grasscutters/Grasscutter/Build?logo=github&style=for-the-badge"></div>
<div align="center"><a href="https://discord.gg/T5vZU6UyeG"><img alt="Discord - Grasscutter" src="https://img.shields.io/discord/965284035985305680?label=Discord&logo=discord&style=for-the-badge"></a></div>
EN | [中文](README_zh-CN.md)
**Attention:** We always welcome contributors to the project. Before adding your contribution, please carefully read our [Code of Conduct](https://github.com/Grasscutters/Grasscutter/blob/stable/CONTRIBUTING.md).
## Current features
* Logging in
* Combat
* Friends list
* Teleportation
* Gacha system
* Co-op *partially* works
* Spawning monsters via console
* Inventory features (recieving items/characters, upgrading items/characters, etc)
## Quick setup guide
**Note:** For support please join our [Discord](https://discord.gg/T5vZU6UyeG).
### Requirements
* Java SE - 17 ([link](https://www.oracle.com/java/technologies/javase/jdk17-archive-downloads.html))
**Note:** If you just want to **run it**, then **jre** only is fine.
* MongoDB (recommended 4.0+)
* Proxy daemon: mitmproxy (mitmdump, recommended), Fiddler Classic, etc.
### Running
**Note:** If you updated from an older version, delete `config.json` to regenerate it.
1. Get `grasscutter.jar`
- Download from [actions](https://nightly.link/Grasscutters/Grasscutter/workflows/build/stable/Grasscutter.zip)
- [Build by yourself](#Building)
2. Create a `resources` folder in the directory where grasscutter.jar is located and move your `BinOutput` and `ExcelBinOutput` folders there *(Check the [wiki](https://github.com/Grasscutters/Grasscutter/wiki) for more details how to get those.)*
3. Run Grasscutter with `java -jar grasscutter.jar`. **Make sure mongodb service is running as well.**
### Connecting with the client
½. Create an account using [server console command](#Commands).
1. Redirect traffic: (choose one)
- mitmdump: `mitmdump -s proxy.py -k`
Trust CA certificate:
**Note:**The CA certificate is usually stored in `% USERPROFILE%\ .mitmproxy`, or you can download it from `http://mitm.it`
Double click for [install](https://docs.microsoft.com/en-us/skype-sdk/sdn/articles/installing-the-trusted-root-certificate#installing-a-trusted-root-certificate) or ...
- Via command line
```shell
certutil -addstore root %USERPROFILE%\.mitmproxy\mitmproxy-ca-cert.cer
```
- Fiddler Classic: Run Fiddler Classic, turn on `Decrypt https traffic` in setting and change the default port there (Tools -> Options -> Connections) to anything other than `8888`, and load [this script](https://github.lunatic.moe/fiddlerscript).
- [Hosts file](https://github.com/Melledy/Grasscutter/wiki/Running#traffic-route-map)
2. Set network proxy to `127.0.0.1:8080` or the proxy port you specified.
**you can also use `start.cmd` to start servers and proxy daemons automatically**
### Building
Grasscutter uses Gradle to handle dependencies & building.
**Requirements:**
- Java SE Development Kits - 17
- Git
##### Windows
```shell
git clone https://github.com/Grasscutters/Grasscutter.git
cd Grasscutter
.\gradlew.bat # Setting up environments
.\gradlew jar # Compile
```
##### Linux
```bash
git clone https://github.com/Grasscutters/Grasscutter.git
cd Grasscutter
chmod +x gradlew
./gradlew jar # Compile
```
You can find the output jar in the root of the project folder.
## Commands
You might want to use this command (`java -jar grasscutter.jar -handbook`) in a cmd that is in the grasscutter folder. It will create a handbook file (GM Handbook.txt) where you can find the item IDs for stuff you want
There is a dummy user named "Server" in every player's friends list that you can message to use commands. Commands also work in other chat rooms, such as private/team chats. to run commands ingame, you need to add prefix `/` or `!` such as `/pos`
| Commands | Usage | Permission node | Availability | description | Alias |
| -------------- | ------------------------------------------------- | ------------------------- | ------------ | ------------------------------------------------------------ | ----------------------------------------------- |
| account | account <create\|delete> \<username> [UID] | | Server only | Creates an account with the specified username and the in-game UID for that account. The UID will be auto generated if not set. | |
| broadcast | broadcast \<message> | server.broadcast | Both side | Sends a message to all the players. | b |
| coop | coop \<playerId> \<target playerId> | server.coop | Both side | Forces someone to join the world of others. | |
| changescene | changescene \<scene id> | player.changescene | Client only | Switch scenes by scene ID. | scene |
| clearartifacts | clearartifacts | player.clearartifacts | Client only | Deletes all unequipped and unlocked level 0 artifacts, including 5-star rarity ones from your inventory. | clearart |
| clearweapons | clearweapons | player.clearweapons | Client only | Deletes all unequipped and unlocked weapons, including 5-star rarity ones from your inventory. | clearwpns |
| drop | drop <itemID\|itemName> [amount] | server.drop | Client only | Drops an item around you. | `d` `dropitem` |
| give | give [player] <itemId\|itemName> [amount] [level] [finement] | player.give | Both side | Gives item(s) to you or the specified player. (finement option only weapon.) | `g` `item` `giveitem` |
| givechar | givechar \<uid> \<avatarId> | player.givechar | Both side | Gives the player a specified character. | givec |
| giveart | giveart [player] \<artifactId> \<mainPropId> [\<appendPropId>[,\<times>]]... [level] | player.giveart | Both side | Gives the player a specified artifact. | gart |
| giveall | giveall [uid] [amount] | player.giveall | Both side | Gives all items. | givea |
| godmode | godmode [uid] | player.godmode | Client only | Prevents you from taking damage. | |
| heal | heal | player.heal | Client only | Heals all characters in your current team. | h |
| help | help [command] | | Both side | Sends the help message or shows information about a specified command. | |
| kick | kick \<player> | server.kick | Both side | Kicks the specified player from the server. (WIP) | k |
| killall | killall [playerUid] [sceneId] | server.killall | Both side | Kills all entities in the current scene or specified scene of the corresponding player. | |
| list | list | | Both side | Lists online players. | |
| permission | permission <add\|remove> \<username> \<permission> | * | Both side | Grants or removes a permission for a user. | |
| position | position | | Client only | Sends your current coordinates. | pos |
| reload | reload | server.reload | Both side | Reloads the server config | |
| resetconst | resetconst [all] | player.resetconstellation | Client only | Resets the constellation level on your currently selected character, will need to relog after using the command to see any changes. | resetconstellation |
| restart | | | Both side | Restarts the current session | |
| say | say \<player> \<message> | server.sendmessage | Both side | Sends a message to a player as the server | `sendservmsg` `sendservermessage` `sendmessage` |
| setfetterlevel | setfetterlevel \<level> | player.setfetterlevel | Client only | Sets the friendship level for your currently selected character | setfetterlvl |
| setstats | setstats \<stat> \<value> | player.setstats | Client only | Sets a stat for your currently selected character | stats |
| setworldlevel | setworldlevel \<level> | player.setworldlevel | Client only | Sets your world level (Relog to see proper effects) | setworldlvl |
| spawn | spanw <entityID\|entityName> [level] [amount] | server.spawn | Client only | Spawns an entity near you | |
| stop | stop | server.stop | Both side | Stops the server | |
| talent | talent \<talentID> \<value> | player.settalent | Client only | Sets talent level for your currently selected character | |
| teleport | teleport [@playerUid] \<x> \<y> \<z> [sceneId] | player.teleport | Both side | Change the player's position. | tp |
| tpall | | player.tpall | Client only | Teleports all players in your world to your position | |
| weather | weather \<weatherID> \<climateID> | player.weather | Client only | Changes the weather | w |
### Bonus
When you want to teleport to somewhere, use the ingame marking function on Map, click Confirm. You will see your
character falling from a very high destination, exact location that you marked.
You can also specify a set Y coordinate by renaming the map marker.
# Quick Troubleshooting
* If compiling wasn't successful, please check your JDK installation (JDK 17 and validated JDK's bin PATH variable)
* My client doesn't connect, doesn't login, 4206, etc... - Mostly your proxy daemon setup is *the issue*, if using
Fiddler make sure it running on another port except 8888
* Startup sequence: Mongodb > Grasscutter > Proxy daemon (mitmdump, fiddler, etc.) > Game
![Grasscutter](https://socialify.git.ci/Grasscutters/Grasscutter/image?description=1&forks=1&issues=1&language=1&logo=https%3A%2F%2Fs2.loli.net%2F2022%2F04%2F25%2FxOiJn7lCdcT5Mw1.png&name=1&owner=1&pulls=1&stargazers=1&theme=Light)
<div align="center"><img alt="Documention" src="https://img.shields.io/badge/Wiki-Grasscutter-blue?style=for-the-badge&link=https://github.com/Grasscutters/Grasscutter/wiki&link=https://github.com/Grasscutters/Grasscutter/wiki"> <img alt="GitHub release (latest by date)" src="https://img.shields.io/github/v/release/Grasscutters/Grasscutter?logo=java&style=for-the-badge"> <img alt="GitHub" src="https://img.shields.io/github/license/Grasscutters/Grasscutter?style=for-the-badge"> <img alt="GitHub last commit" src="https://img.shields.io/github/last-commit/Grasscutters/Grasscutter?style=for-the-badge"> <img alt="GitHub Workflow Status" src="https://img.shields.io/github/workflow/status/Grasscutters/Grasscutter/Build?logo=github&style=for-the-badge"></div>
<div align="center"><a href="https://discord.gg/T5vZU6UyeG"><img alt="Discord - Grasscutter" src="https://img.shields.io/discord/965284035985305680?label=Discord&logo=discord&style=for-the-badge"></a></div>
EN | [中文](README_zh-CN.md)
**Attention:** We always welcome contributors to the project. Before adding your contribution, please carefully read our [Code of Conduct](https://github.com/Grasscutters/Grasscutter/blob/stable/CONTRIBUTING.md).
## Current features
* Logging in
* Combat
* Friends list
* Teleportation
* Gacha system
* Co-op *partially* works
* Spawning monsters via console
* Inventory features (recieving items/characters, upgrading items/characters, etc)
## Quick setup guide
**Note:** For support please join our [Discord](https://discord.gg/T5vZU6UyeG).
### Requirements
* Java SE - 17 ([link](https://www.oracle.com/java/technologies/javase/jdk17-archive-downloads.html))
**Note:** If you just want to **run it**, then **jre** only is fine.
* MongoDB (recommended 4.0+)
* Proxy daemon: mitmproxy (mitmdump, recommended), Fiddler Classic, etc.
### Running
**Note:** If you updated from an older version, delete `config.json` to regenerate it.
1. Get `grasscutter.jar`
- Download from [actions](https://nightly.link/Grasscutters/Grasscutter/workflows/build/stable/Grasscutter.zip)
- [Build by yourself](#Building)
2. Create a `resources` folder in the directory where grasscutter.jar is located and move your `BinOutput` and `ExcelBinOutput` folders there *(Check the [wiki](https://github.com/Grasscutters/Grasscutter/wiki) for more details how to get those.)*
3. Run Grasscutter with `java -jar grasscutter.jar`. **Make sure mongodb service is running as well.**
### Connecting with the client
½. Create an account using [server console command](#Commands).
1. Redirect traffic: (choose one)
- mitmdump: `mitmdump -s proxy.py -k`
Trust CA certificate:
**Note:**The CA certificate is usually stored in `% USERPROFILE%\ .mitmproxy`, or you can download it from `http://mitm.it`
Double click for [install](https://docs.microsoft.com/en-us/skype-sdk/sdn/articles/installing-the-trusted-root-certificate#installing-a-trusted-root-certificate) or ...
- Via command line
```shell
certutil -addstore root %USERPROFILE%\.mitmproxy\mitmproxy-ca-cert.cer
```
- Fiddler Classic: Run Fiddler Classic, turn on `Decrypt https traffic` in setting and change the default port there (Tools -> Options -> Connections) to anything other than `8888`, and load [this script](https://github.lunatic.moe/fiddlerscript).
- [Hosts file](https://github.com/Melledy/Grasscutter/wiki/Running#traffic-route-map)
2. Set network proxy to `127.0.0.1:8080` or the proxy port you specified.
**you can also use `start.cmd` to start servers and proxy daemons automatically, but you have to set up JAVA_HOME enviroment**
### Building
Grasscutter uses Gradle to handle dependencies & building.
**Requirements:**
- Java SE Development Kits - 17
- Git
##### Windows
```shell
git clone https://github.com/Grasscutters/Grasscutter.git
cd Grasscutter
.\gradlew.bat # Setting up environments
.\gradlew jar # Compile
```
##### Linux
```bash
git clone https://github.com/Grasscutters/Grasscutter.git
cd Grasscutter
chmod +x gradlew
./gradlew jar # Compile
```
You can find the output jar in the root of the project folder.
### Commands have moved to the [wiki](https://github.com/Grasscutters/Grasscutter/wiki/Commands)!
# Quick Troubleshooting
* If compiling wasn't successful, please check your JDK installation (JDK 17 and validated JDK's bin PATH variable)
* My client doesn't connect, doesn't login, 4206, etc... - Mostly your proxy daemon setup is *the issue*, if using
Fiddler make sure it running on another port except 8888
* Startup sequence: MongoDB > Grasscutter > Proxy daemon (mitmdump, fiddler, etc.) > Game

View File

@ -102,7 +102,9 @@ chmod +x gradlew
你可能需要在终端中运行 `java -jar grasscutter.jar -handbook` 它将会创建一个 `GM Handbook.txt` 以方便您查阅物品ID等
在每个玩家的朋友列表中都有一个名为“服务器”的虚拟用户,你可以通过发送消息来使用命令。命令也适用于其他聊天室,例如私人/团队聊天。
你可能需要在终端中运行 `java -jar grasscutter.jar -gachamap` 来使得祈愿历史记录系统正常显示物品信息。 这个命令生成一个配置文件到如下文件夹:`GRASSCUTTER_RESOURCE/gcstatic`。 不执行此命令您的祈愿历史记录中将只会显示数字ID而非物品名称。目前仅支持自动生成英文记录信息
在每个玩家的朋友列表中都有一个名为“Server”的虚拟用户你可以通过发送消息来使用命令。命令也适用于其他聊天室例如私人/团队聊天。
要在游戏中使用命令,需要添加 `/``!` 前缀,如 `/pos`
| 命令 | 用法 | 权限节点 | 可用性 | 注释 | 别名 |
@ -111,38 +113,47 @@ chmod +x gradlew
| broadcast | broadcast <消息内容> | server.broadcast | 均可使用 | 给所有玩家发送公告 | b |
| coop | coop \<uid> <目标uid> | server.coop | 均可使用 | 强制某位玩家进入指定玩家的多人世界 | |
| changescene | changescene <场景ID> | player.changescene | 仅客户端 | 切换到指定场景 | scene |
| clearartifacts | clearartifacts | player.clearartifacts | 仅客户端 | 删除所有未装备及未解锁的圣遗物,包括五星 | clearart |
| clearweapons | clearweapons | player.clearweapons | 仅客户端 | 删除所有未装备及未解锁的武器,包括五星 | clearwp |
| clear | clear <all\|wp\|art\|mat> [UID] | player.clearinv | 仅客户端 | 删除所有未装备及未解锁的圣遗物(art)或武器(wp)或材料(mat)或者所有(all),包括五星 | clear |
| drop | drop <物品ID\|物品名称> [数量] | server.drop | 仅客户端 | 在指定玩家周围掉落指定物品 | `d` `dropitem` |
| give | give [uid] <物品ID\|物品名称> [数量] [等级] [精炼等级] | | | 给予指定玩家一定数量及等级的物品 (精炼等级仅适用于武器) | `g` `item` `giveitem` |
| enterdungeon | enterdungeon <地牢ID> | player.enterdungeon | 仅客户端 | 进入某个地牢 | |
| give | give [uid] <物品ID\|物品名称> [数量] [等级] [精炼等级] | player.give | 均可使用 | 给予指定玩家一定数量及等级的物品 (精炼等级仅适用于武器) | `g` `item` `giveitem` |
| givechar | givechar \<uid> <角色ID> [等级] | player.givechar | 均可使用 | 给予指定玩家对应角色 | givec |
| giveart | giveart [uid] \<圣遗物ID> \<主属性ID> [\<副属性ID>[,<次数>]]... [等级] | player.giveart | 均可使用 | 给予玩家指定属性的圣遗物 | gart |
| giveall | giveall [uid] [数量] | player.giveall | 均可使用 | 给予指定玩家全部物品 | givea |
| godmode | godmode [uid] | player.godmode | 仅客户端 | 保护你不受到任何伤害(依然会被击退) | |
| heal | heal | player.heal | 仅客户端 | 治疗队伍中所有角色 | h |
| help | help [命令] | | 均可使用 | 显示帮助或展示指定命令的帮助 | |
| join | join [多个角色id] | player.join | 仅客户端 | 强制入队角色跟config.json中的avatarLimits有关跟队内角色数量上限有关。用法`join 10000021 10000022` | |
| kick | kick \<uid> | server.kick | 均可使用 | 从服务器中踢出指定玩家 (WIP) | k |
| killall | killall [uid] [场景ID] | server.killall | 均可使用 | 杀死指定玩家世界中所在或指定场景的全部生物 | |
| list | list | | 均可使用 | 列出在线玩家 | |
| permission | permission <add\|remove> <用户名> <权限节点> | * | 均可使用 | 添加或移除玩家的权限 | |
| permission | permission <add\|remove> <UID> <权限节点> | * | 均可使用 | 添加或移除玩家的权限 | |
| position | position | | 仅客户端 | 获取当前坐标 | pos |
| remove | remove [多个角色在队伍中的序号] | player.remove | 仅客户端 | 强制将某个角色从当前队伍中移除。例如`remove 1 2`表示将1号和2号角色移除 | |
| reload | reload | server.reload | 均可使用 | 重载服务器配置 | |
| resetconst | resetconst [all] | player.resetconstellation | 仅客户端 | 重置当前角色的命座,重新登录即可生效 | resetconstellation |
| restart | restart | | 均可使用 | 重启服务端 | |
| say | say \<uid> <消息> | server.sendmessage | 均可使用 | 作为服务器发送消息给玩家 | `sendservmsg` `sendservermessage` `sendmessage` |
| setfetterlevel | setfetterlevel <好感等级> | player.setfetterlevel | 仅客户端 | 设置当前角色的好感等级 | `setfetterlvl` `setfriendship` |
| setstats | setstats <属性> <数值> | player.setstats | 仅客户端 | 直接修改当前角色的面板 | stats |
| setworldlevel | setworldlevel <世界等级> | player.setworldlevel | 仅客户端 | 设置世界等级(重新登即可生效) | setworldlvl |
| spawn | spanw <实体ID\|实体名称> [等级] [数量] | server.spawn | 仅客户端 | 在你周围生成实体 | |
| setworldlevel | setworldlevel <世界等级> | player.setworldlevel | 仅客户端 | 设置世界等级(重新登即可生效) | setworldlvl |
| spawn | spawn <实体ID> [数量] [等级] | server.spawn | 仅客户端 | 在你周围生成实体 | |
| stop | stop | server.stop | 均可使用 | 停止服务器 | |
| talent | talent <天赋ID> <等级> | player.settalent | 仅客户端 | 设置当前角色的天赋等级 | |
| teleport | teleport [@playerUid] \<x> \<y> \<z> [sceneId] | player.teleport | 均可使用 | 传送玩家到指定坐标 | tp |
| tpall | | player.tpall | 仅客户端 | 传送多人世界中所有的玩家到自身地点 | |
| unlocktower | | player.tower | 仅客户端 | 解锁深渊全部层 | ut |
| weather | weather <天气ID> <气候ID> | player.weather | 仅客户端 | 改变天气 | w |
### 额外功能
当你想传送到某个地点, 只需要在地图中创建标记, 关闭地图后即可到达目标地点上空
- 传送
- 当你想传送到某个地点时,可以使用游戏里的地图标记功能。
- 用鱼钩(最后一个图标)在地图上标记一个点位。
- (可选) 将标记名称改为数字即可修改传送位置的Y坐标高度缺省值是300
- 确认添加标记,并关闭地图。
- 你会看到你的角色从你选定点位的正上方高空落下。
# 快速排除问题

View File

@ -28,7 +28,7 @@ plugins {
// Eclipse Support
id 'eclipse'
// Intelij Support
// IntelliJ Support
id 'idea'
// Maven
@ -36,12 +36,15 @@ plugins {
id 'signing'
}
compileJava.options.encoding = "UTF-8"
compileTestJava.options.encoding = "UTF-8"
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
group = 'tech.xigam'
version = '1.0.2-dev'
group = 'xyz.grasscutters'
version = '1.1.2-dev'
sourceCompatibility = 17
targetCompatibility = 17
@ -58,27 +61,39 @@ repositories {
dependencies {
implementation fileTree(dir: 'lib', include: ['*.jar'])
implementation group: 'org.slf4j', name: 'slf4j-api', version: '1.7.32'
implementation group: 'ch.qos.logback', name: 'logback-core', version: '1.2.9'
implementation group: 'org.slf4j', name: 'slf4j-api', version: '1.7.32'
implementation group: 'ch.qos.logback', name: 'logback-core', version: '1.2.9'
implementation group: 'ch.qos.logback', name: 'logback-classic', version: '1.2.9'
implementation group: 'io.netty', name: 'netty-all', version: '4.1.71.Final'
implementation group: 'com.google.code.gson', name: 'gson', version: '2.8.8'
implementation group: 'com.google.protobuf', name: 'protobuf-java', version: '3.18.2'
implementation group: 'org.reflections', name: 'reflections', version: '0.10.2'
implementation group: 'dev.morphia.morphia', name: 'morphia-core', version: '2.2.6'
implementation group: 'org.jline', name: 'jline', version: '3.21.0'
implementation group: 'org.jline', name: 'jline-terminal-jna', version: '3.21.0'
implementation group: 'net.java.dev.jna', name: 'jna', version: '5.10.0'
implementation group: 'io.netty', name: 'netty-all', version: '4.1.71.Final'
implementation group: 'com.google.code.gson', name: 'gson', version: '2.9.0'
implementation group: 'com.google.protobuf', name: 'protobuf-java', version: '3.18.2'
implementation group: 'org.reflections', name: 'reflections', version: '0.10.2'
implementation group: 'dev.morphia.morphia', name: 'morphia-core', version: '2.2.6'
implementation group: 'org.greenrobot', name: 'eventbus-java', version: '3.3.1'
implementation group: 'org.danilopianini', name: 'java-quadtree', version: '0.1.9'
implementation group: 'org.quartz-scheduler', name: 'quartz', version: '2.3.2'
implementation group: 'org.quartz-scheduler', name: 'quartz-jobs', version: '2.3.2'
implementation group: 'org.luaj', name: 'luaj-jse', version: '3.0.1'
protobuf files('proto/')
compileOnly 'org.projectlombok:lombok:1.18.24'
annotationProcessor 'org.projectlombok:lombok:1.18.24'
}
configurations.all {
exclude group: 'org.slf4j', module: 'slf4j'
}
application {
@ -86,12 +101,14 @@ application {
mainClassName = 'emu.grasscutter.Grasscutter'
}
jar {
manifest {
attributes 'Main-Class': 'emu.grasscutter.Grasscutter'
}
jar.baseName = 'grasscutter'
jar.archiveName = project.hasProperty('jarFilename') ? "${jarFilename}.${extension}" : archiveName
from {
configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) }
@ -100,8 +117,8 @@ jar {
duplicatesStrategy = DuplicatesStrategy.INCLUDE
from('src/main/java') {
include '*.xml'
}
include '*.xml'
}
destinationDir = file(".")
}
@ -131,9 +148,9 @@ publishing {
}
developers {
developer {
id = 'melledy'
name = 'Melledy'
email = 'melledy@xigam.tech' // not a real email kek
id = 'meledy'
name = 'Meledy'
email = 'meledy@xigam.tech' // not a real email kek
}
developer {
id = 'magix'
@ -209,11 +226,29 @@ signing {
}
javadoc {
options.encoding = 'UTF-8'
if(JavaVersion.current().isJava9Compatible()) {
options.addBooleanOption('html5', true)
}
}
task injectGitHash {
def gitCommitHash = {
try {
return 'git rev-parse --verify --short HEAD'.execute().text.trim()
} catch (e) {
return "GIT_NOT_FOUND"
}
}
new File(projectDir, "src/main/java/emu/grasscutter/BuildConfig.java").text = """
package emu.grasscutter;
public class BuildConfig {
public static final String VERSION = \"${version}\";
public static final String GIT_HASH = \"${gitCommitHash()}\";
}
"""
}
processResources {
dependsOn "generateProto"
}
}

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -1 +0,0 @@
ElIKBm9zX3VzYRIHQW1lcmljYRoKREVWX1BVQkxJQyIzaHR0cHM6Ly9vc3VzYWRpc3BhdGNoLnl1YW5zaGVuLmNvbS9xdWVyeV9jdXJfcmVnaW9uElMKB29zX2V1cm8SBkV1cm9wZRoKREVWX1BVQkxJQyI0aHR0cHM6Ly9vc2V1cm9kaXNwYXRjaC55dWFuc2hlbi5jb20vcXVlcnlfY3VyX3JlZ2lvbhJRCgdvc19hc2lhEgRBc2lhGgpERVZfUFVCTElDIjRodHRwczovL29zYXNpYWRpc3BhdGNoLnl1YW5zaGVuLmNvbS9xdWVyeV9jdXJfcmVnaW9uElUKBm9zX2NodBIKVFcsIEhLLCBNTxoKREVWX1BVQkxJQyIzaHR0cHM6Ly9vc2NodGRpc3BhdGNoLnl1YW5zaGVuLmNvbS9xdWVyeV9jdXJfcmVnaW9uKpwQRWMyYhAAAABbrAvbhfIRHfaSCN24qQyVAAgAAMs68ZiMdPfEj41O2wBCYqGiC/WdovvJvaw4t3/m1zIYDrt3/ftK9GKFb7C+2E8FmaHqOnwjJYBg2wI1sXpGmuSxkeWw8Avr36wlNtQjhXNV9zoNKstuZYuheyLlpbPRbYZ3UA6/BzTVsjIhjR1lcqFrigQnpV6MgRR9KqxakCaffK6qIzMlodx4ZPKlqseQhCiyVAvLWQSRqCRcZipzotXsmgLQbpDFtRzhgukXPjfW5dAlzMwswPuu7ZQsf1AKipI34dVQLu6gtXthGgbjn89h/79VR5AokLCPGqIV7/2s+gHfykrjDtyp5rwCcmGQqwV3gHy5LGrHl8Zm12jNd7Qcng51ydqtX4xzet6J2iMF6Dw5nPd/hTyxn+i3Ttk6fop9rbCq3iNgEw3+0cSDal1I1ThYdVnMgPhZgQkZc5/SpTaR+8vfDzRIKbSSrrPSEgLnQvWZOOugXhNdyuiaBc8rJveno7vvktmnhDUF3xWi6osj75j2KghRrdHfDR3Zuh4COrGZDRBSKHft2AvfrxaMT9O8hPzzzYk0U2iicVCDlNP/8wqaT9Vqt1kHmruLxqh377iyp0mxKfNt0+SNRzLyRoyvOar/z3AT6TU9LRoCFrkcJpVsUN+2MVeT52PfMbv5O/Nw9sqsFDlofCJJ/EknY0wDc+tNarYOhDM67/ojn/p6W3ZPBJxb2wcF1TOh9dpAeZdCGJusqhMIj5lpoW8nENTFhkEgMUv2Lh5Z6WpeOAKAu9eDpBMhlRNCccDaNYUgo6TdVDtWxtPrS3NRYqtkvb2I2SEFP0apht954oKdG3ncxyOgHRUkwgtxbCMAngzWo9+VWV3H3OlqeEOv7DdO2o0y95EvlHYb/qtosXPI2jC+6FPa+yl4xmLqcENRTUrU23dsmX3SyBEmZvML4dNeyC53B+mh7DUFtPFJFndxj2tGO9mTSDgy8eCmKG90AiJOMoxaLB2HpnDXN1sTiIcd3WraiE6ZCt4E54hKXvXHPyN52CHkxq1y/TeXHEq4X4MyHyDSRLHmzVs9pnwHM0ZLthKFNyvGfTvjiYokAWtNEuh74syt+m6Wietb6JvgibnnDj6uFKI3BbH4GUT9blsnMgug323bJ6bFvV4iESvz1fNnnUSokWQy5+fWzxPDohULgFzhDCpwov78Bp0E3t6DXSWnrUdNqpLbYKmXO1Hdbn+QH4B90p85UB1V5eSZgxPpUvZbIO4GPScil8K+dkDLdsFa1zypWNmlUN0Ns5H/iuzMuJql2QFYz+SnV1R1T+qywwqCNP9oswcLiAR3XnSacs52vd3PI9+0PZuoF6tVMWlvutsQ34IFZaAwIkdKigZcHumLBt/0KyFASBfN674n8FnHrHOQHU6oCeXkQA9kC8MtkvMb7fOLdzbTsD6SVojzZ64i9mDXxF+iLR9o52OxjIFzwLGRy/ivT/aAnHLZ3AsbnvslDjlQl2ADBFvf7xjmvFu0xlfK58TUpfVEkScFFapWJyKVybB4CRz1wKKz6n/a9581LpCVOWRsJa5p+j0zYcS2PfhmRf3RzwsDHeBjEVlIARbhxNKvmjdZyIidSdMMcsJHDRLE3bvo9kKfag0vRVKmuPLPc9FrACsz3vlkApcVQvzieHWoiP+foEvfj9+7Ti2tLfKdzVkMUmugZiZ46+7PKvIciiiuBPlyld0CCPTtTFHUOMO5dUfrUblX8K3awWiaNQFBS0J3iK08t1bgWfLhsKzsS32fRWugaqecwO9Rji9oHn+UuN8Nz9SgNxodroq9q7y/KHFxbqjCl62g25HN9zUa/s5wnIRwVAiWgTuOe3qGqjwp5m/GR8YVSSK/8mV9EL4AaF8d1uifdVA6wWSH1e/1UB8vcdU83P8ne3u1ho+Y/57WB7KnQaGaiD/108+wiAxNqMb2ex8on01VxdLKV1makXV3gzsvWaRevW8t/K11ZwYfo9g+guWADsA0JO0jWooiaupq1kNWrEheBdSRXBO7Jnb+56cTjPGwLpp7ZOHe/bSCJ4MGzPF3lK66LXhVo+rxvNjhoKVRjhGYxN4T8+AiRo3r+1KwdIGSrtODp3ri3JWAy6Eajp1Ukp9GaCbHSJFnYml84nKew7zLLe//ExQpjd4QAjMTvnbm+Ff6a1jf69QEVo0I33gI7/buwqgjiuvjeL6EYaMolKrKlHZHf/HwWbFbdID8T9aoyZJuCUd6YHaMPRAS6n5nvTwkRLlJ/f6wgyypUGZ22Bb1qGIb9SoPgSgIJkifUoewQW2EexqfoAsHXJVABLy+jp/SC4xzHZOSh42zU1k80HIgrnSOmu6T56F6gqy4Y2cZuZU8LXbO/01u8ifEz8yaXfEFSFdxE0TWl92OLKFtJZr9nNOBQQQr5FDGf6zB1/0CziG/5+PrUDgG3irzho6+7wXkc2CpxlBKOLWdjs3V/Lab6cURz1QZY4HYgUkJtm4U5OKUeO2+murlhC7SrnwyUtGrsD8NbCmI4SRHKPoeLBJQO/m3dRze5Ltr8N9IS7/ukPeOYe1O2agrmhH/JjYfz/l8Gmq8PGY+oavYp8I+2yKvGLD9kCxEgKcTeRh9AW/xPTLGsacrGKQCY+M76DfyLKxCZDiDY9xkBIKchxsMsn7FqZvRMMyJBHbqa3AKQyAN73NCSuFF5f1qDjARU/xqJFhOaKoR64c78oqh1GqOqEFbfNQIRw6WeFCGyW6v6p10uLdR7KXnR7+wub9aG992MpIBk0+gru74yO/WcA0vLdDEQIBwc+M0lmLB53ylsPtde3nliaC5ROHR1IS4LO8Q+3o0BHMr0my0bqFwwCAvZVXOFBHxXyUgrrmUTnZYVSQXNV6+MALBmmRU5yOzhhyHoEdj9YHZeyPpZkYc6DkJWCRYbFfmczNIs133KB9rlfug40w/hHa8pXyRyLaKQUMIUYEvt3Y4AQ==

295
install.sh Normal file
View File

@ -0,0 +1,295 @@
#!/usr/bin/env bash
# Grasscutter install script for linux
# Made by TurtleIdiot
# Stops the installer if any command has a non-zero exit status
set -e
# Checks for root
if [ $EUID != 0 ]; then
echo "Please run the installer as root!"
exit
fi
is_command() {
# Checks if a given command is available
local check_command="$1"
command -v "${check_command}" > /dev/null 2>&1
}
# IP validation
valid_ip() {
local ip=$1
local stat=1
if [[ $ip =~ ^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$ ]]; then
OIFS=$IFS
IFS="."
ip=($ip)
IFS=$OIFS
[[ ${ip[0]} -le 255 && ${ip[1]} -le 255 \
&& ${ip[2]} -le 255 && ${ip[3]} -le 255 ]]
stat=$?
fi
return $stat
}
# Checks for supported installer(s) (only apt-get and pacman right now, might add more in the future)
if is_command apt-get ; then
echo -e "Supported package manager found (apt-get)\n"
GC_DEPS="mongodb openjdk-17-jre"
INSTALLER_DEPS="wget openssl unzip git"
SYSTEM="deb" # Debian-based (debian, ubuntu)
elif is_command pacman ; then
echo -e "supported package manager found (pacman)\n"
GC_DEPS="jre17-openjdk"
INSTALLER_DEPS="curl wget openssl unzip git base-devel" # curl is still a dependency here in order to successfully build mongodb
SYSTEM="arch" # Arch for the elitists :P
else
echo "No supported package manager found"
exit
fi
BRANCH="stable" # Stable by default
# Allows choice between stable and dev branch
echo "Please select the branch you wish to install"
echo -e "!!NOTE!!: stable is the recommended branch.\nDo *NOT* use development unless you have a reason to and know what you're doing"
select branch in "stable" "development" ; do
case $branch in
stable )
BRANCH="stable"
break;;
development )
BRANCH="development"
break;;
esac
done
echo "The following packages will have to be installed in order to INSTALL grasscutter:"
echo -e "$INSTALLER_DEPS \n"
echo "The following packages will have to be installed to RUN grasscutter:"
echo -e "$GC_DEPS \n"
echo "Do you wish to proceed and install grasscutter?"
select yn in "Yes" "No" ; do
case $yn in
Yes ) break;;
No ) exit;;
esac
done
echo "Updating package cache..."
case $SYSTEM in # More concise than if
deb ) apt-get update -qq;;
arch ) pacman -Syy;;
esac
# Starts installing dependencies
echo "Installing setup dependencies..."
case $SYSTEM in # These are one-liners anyways
deb ) apt-get -qq install $INSTALLER_DEPS -y;;
arch ) pacman -Sq --noconfirm --needed $INSTALLER_DEPS > /dev/null;;
esac
echo "Done"
echo "Installing grasscutter dependencies..."
case $SYSTEM in
deb) apt-get -qq install $GC_DEPS -y > /dev/null;;
arch ) pacman -Sq --noconfirm --needed $GC_DEPS > /dev/null;;
esac
# *sighs* here we go...
INST_ARCH_MONGO="no"
if [ $SYSTEM = "arch" ]; then
echo -e "-=-=-=-=-=--- !! IMPORTANT !! ---=-=-=-=-=-\n"
echo -e " Due to licensing issues with mongodb,\n it is no longer available on the official arch repositiries."
echo -e " In order to install mongodb,\n it needs to be fetched from the Arch User Repository.\n"
echo -e " As this script is running as root,\n a temporary user will need to be created to run makepkg."
echo -e " The temporary user will be deleted once\n makepkg has finished.\n"
echo -e " This will be handled automatically.\n"
echo -e "-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-\n"
echo -e "!!NOTE!!: Only select \"Skip\" if mongodb is already installed on this system"
echo "Do you want to continue?"
select yn in "Yes" "Skip" "No" ; do
case $yn in
Yes )
INST_ARCH_MONGO="yes"
break;;
No ) exit;;
Skip )
INST_ARCH_MONGO="no"
break;;
esac
done
fi
if [ $INST_ARCH_MONGO = "yes" ]; then
DIR=$(pwd)
# Make temp user
echo "Creating temporary user..."
TEMPUSER="gctempuser"
TEMPHOME="/home/$TEMPUSER"
useradd -m $TEMPUSER
cd $TEMPHOME
# Do the actual makepkg shenanigans
echo "Building mongodb... (this will take a moment)"
su $TEMPUSER<<EOF
mkdir temp
cd temp
git clone https://aur.archlinux.org/mongodb-bin.git -q
cd mongodb-bin
makepkg -s > /dev/null
exit
EOF
mv "$(find -name "mongodb-bin*.pkg.tar.zst" -type f)" ./mongodb-bin.pkg.tar.zst
cd $DIR
# Snatch the file to current working directory
mv "$TEMPHOME/mongodb-bin.pkg.tar.zst" ./mongodb-bin.pkg.tar.zst
chown root ./mongodb-bin.pkg.tar.zst
chgrp root ./mongodb-bin.pkg.tar.zst
chmod 775 ./mongodb-bin.pkg.tar.zst
echo "Installing mongodb..."
pacman -U mongodb-bin.pkg.tar.zst --noconfirm > /dev/null
rm mongodb-bin.pkg.tar.zst
echo "Starting mongodb..."
systemctl enable mongodb
systemctl start mongodb
echo "Removing temporary account..."
userdel -r $TEMPUSER
fi
echo "Done"
echo "Getting grasscutter..."
# Download and rename jar
wget -q --show-progress "https://nightly.link/Grasscutters/Grasscutter/workflows/build/$BRANCH/Grasscutter.zip"
echo "unzipping"
unzip -qq Grasscutter.zip
mv $(find -name "grasscutter*.jar" -type f) grasscutter.jar
# Download resources
echo "Downloading resources... (this will take a moment)"
wget -q --show-progress https://github.com/Koko-boya/Grasscutter_Resources/archive/refs/heads/main.zip -O resources.zip
echo "Extracting..."
unzip -qq resources.zip
mv ./Grasscutter_Resources-main/Resources ./resources
# Here we do a sparse checkout to only pull /data and /keys
echo "Downloading keys and data..."
mkdir repo
cd repo
git init -q
git remote add origin https://github.com/Grasscutters/Grasscutter.git
git fetch -q
git config core.sparseCheckout true
echo "data/" >> .git/info/sparse-checkout
echo "keys/" >> .git/info/sparse-checkout
git pull origin stable -q
cd ../
mv ./repo/data ./data
mv ./repo/keys ./keys
# Generate handbook/config
echo "Please enter language when *NEXT* prompted (press enter/return to continue to language select)"
read
java -jar grasscutter.jar -handbook
# Prompt IP address for config.json and for generating new keystore.p12 file
echo "Please enter the IP address that will be used to connect to the server"
echo "This can be a local or a public IP address"
echo "This IP address will be used to generate SSL certificates so it is important it is correct"
while : ; do
read -p "Enter IP: " SERVER_IP
if valid_ip $SERVER_IP; then
break;
else
echo "Invalid IP address. Try again."
fi
done
# Replaces "127.0.0.1" with given IP
sed -i "s/127.0.0.1/$SERVER_IP/g" config.json
# Generates new keystore.p12 with the server's IP address
# This is done to prevent a "Connection Timed Out" error from appearing
# after clicking to enter the door in the main menu/title screen
# This issue only exists when connecting to a server *other* than localhost
# since the default keystore.p12 has only been made for localhost
mkdir certs
cd certs
echo "Generating CA key and certificate pair..."
openssl req -x509 -nodes -days 25202 -newkey rsa:2048 -subj "/C=GB/ST=Essex/L=London/O=Grasscutters/OU=Grasscutters/CN=$SERVER_IP" -keyout CAkey.key -out CAcert.crt
echo "Generating SSL key and certificate pair..."
openssl genpkey -out ssl.key -algorithm rsa
# Creates a conf file in order to generate a csr
cat > csr.conf <<EOF
[ req ]
default_bits = 2048
prompt = no
default_md = sha256
req_extensions = req_ext
distinguished_name = dn
[ dn ]
C = GB
ST = Essex
L = London
O = Grasscutters
OU = Grasscutters
CN = $SERVER_IP
[ req_ext ]
subjectAltName = @alt_names
[ alt_names ]
IP.1 = $SERVER_IP
EOF
# Creates csr using key and conf
openssl req -new -key ssl.key -out ssl.csr -config csr.conf
# Creates conf to finalise creation of certificate
cat > cert.conf <<EOF
authorityKeyIdentifier=keyid,issuer
basicConstraints=CA:FALSE
keyUsage = digitalSignature, nonRepudiation, keyEncipherment, keyAgreement, dataEncipherment
subjectAltName = @alt_names
[alt_names]
IP.1 = $SERVER_IP
EOF
# Creates ssl cert
openssl x509 -req -in ssl.csr -CA CAcert.crt -CAkey CAkey.key -CAcreateserial -out ssl.crt -days 25202 -sha256 -extfile cert.conf
echo "Generating keystore.p12 from key and certificate..."
openssl pkcs12 -export -out keystore.p12 -inkey ssl.key -in ssl.crt -certfile CAcert.crt -passout pass:123456
cd ../
mv ./certs/keystore.p12 ./keystore.p12
echo "Done"
echo -e "Asking Noelle to clean up...\n"
rm -rf Grasscutter.zip resources.zip ./certs ./Grasscutter_Resources-main ./repo
echo -e "All done!\n"
echo -e "You can now uninstall the following packages if you wish:\n$INSTALLER_DEPS"
echo -e "-=-=-=-=-=--- !! IMPORTANT !! ---=-=-=-=-=-\n"
echo "Please make sure that ports 443 and 22102 are OPEN (both tcp and udp)"
echo -e "In order to run the server, run the following command:\nsudo java -jar grasscutter.jar"
echo "You must run it using sudo as port 443 is a privileged port"
echo "To play, use the IP you provided earlier ($SERVER_IP) via GrassClipper or Fiddler"
exit

BIN
lib/kcp-netty-1.5.0.jar Normal file

Binary file not shown.

Binary file not shown.

49
plugin-schema.json Normal file
View File

@ -0,0 +1,49 @@
{
"$schema": "http://json-schema.org/draft-07/schema#",
"title": "JSON schema for a Grasscutter Plugin",
"type": "object",
"additionalProperties": true,
"definitions": {
"plugin-name": {
"type": "string",
"pattern": "^[A-Za-z\\d_.-]+$"
}
},
"required": [ "name", "description", "mainClass" ],
"properties": {
"name": {
"description": "The unique name of plugin.",
"$ref": "#/definitions/plugin-name"
},
"mainClass": {
"description": "The plugin's initial class file.",
"type": "string",
"pattern": "^(?!org\\.bukkit\\.)([a-zA-Z_$][a-zA-Z\\d_$]*\\.)*[a-zA-Z_$][a-zA-Z\\d_$]*$"
},
"version": {
"description": "A plugin revision identifier.",
"type": [ "string", "number" ]
},
"description": {
"description": "Human readable plugin summary.",
"type": "string"
},
"author": {
"description": "The plugin author.",
"type": "string"
},
"authors": {
"description": "The plugin contributors.",
"type": "array",
"items": {
"type": "string"
}
},
"website": {
"title": "Website",
"description": "The URL to the plugin's site",
"type": "string",
"format": "uri"
}
}
}

View File

@ -0,0 +1,11 @@
syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
import "Vector.proto";
message AbilityActionGenerateElemBall {
Vector pos = 1;
Vector rot = 2;
uint32 room_id = 3;
}

View File

@ -0,0 +1,21 @@
syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
import "ModifierAction.proto";
import "AbilityString.proto";
import "AbilityAttachedModifier.proto";
import "ModifierProperty.proto";
message AbilityMetaModifierChange {
ModifierAction action = 1;
AbilityString parent_ability_name = 2;
AbilityString parent_ability_override = 3;
AbilityAttachedModifier attached_instanced_modifier = 4;
repeated ModifierProperty properties = 5;
int32 modifier_local_id = 6;
bool is_mute_remote = 7;
uint32 apply_entity_id = 8;
bool is_attached_parent_ability = 9;
uint32 server_buff_uid = 10;
}

View File

@ -0,0 +1,9 @@
syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
import "AbilityScalarValueEntry.proto";
message AbilityMetaReInitOverrideMap {
repeated AbilityScalarValueEntry override_map = 1;
}

View File

@ -0,0 +1,7 @@
syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
message AbilityMixinCostStamina {
bool is_swim = 1;
}

View File

@ -0,0 +1,8 @@
syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
message AbilityMixinWidgetMpSupport {
uint32 target_entity_id = 1;
}

View File

@ -0,0 +1,17 @@
syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
message AchievementInfo {
enum AchievementInfoStatus {
ACHIEVEMENT_INVALID = 0;
ACHIEVEMENT_UNFINISHED = 1;
ACHIEVEMENT_FINISHED = 2;
ACHIEVEMENT_POINT_TAKEN = 3;
}
uint32 id = 1;
AchievementInfoStatus status = 2;
uint32 current = 3;
uint32 goal = 4;
uint32 achievedate = 5;
}

View File

@ -0,0 +1,29 @@
syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
import "LunchBoxData.proto";
import "AnchorPointData.proto";
import "OneoffGatherPointDetectorData.proto";
import "ClientCollectorData.proto";
import "WidgetCoolDownData.proto";
import "WidgetSlotData.proto";
message AllWidgetDataNotify {
enum CmdId {
option allow_alias = true;
NONE = 0;
ENET_CHANNEL_ID = 0;
ENET_IS_RELIABLE = 1;
CMD_ID = 4260;
}
repeated AnchorPointData anchor_point_list = 2;
uint32 next_anchor_point_usable_time = 3;
LunchBoxData lunch_box_data = 5;
repeated OneoffGatherPointDetectorData oneoff_gather_point_detector_data_list = 6;
repeated ClientCollectorData client_collector_data_list = 7;
repeated WidgetCoolDownData cool_down_group_data_list = 8;
repeated WidgetCoolDownData normal_cool_down_data_list = 9;
repeated WidgetSlotData slot_list = 11;
}

View File

@ -0,0 +1,12 @@
syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
import "Vector.proto";
message AnchorPointData {
uint32 anchor_point_id = 1;
Vector pos = 2;
Vector rot = 3;
uint32 end_time = 4;
}

View File

@ -0,0 +1,18 @@
syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
import "AnchorPointData.proto";
message AnchorPointDataNotify {
enum CmdId {
option allow_alias = true;
NONE = 0;
ENET_CHANNEL_ID = 0;
ENET_IS_RELIABLE = 1;
CMD_ID = 4253;
}
repeated AnchorPointData anchor_point_list = 1;
uint32 next_usable_time = 2;
}

View File

@ -0,0 +1,24 @@
syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
message AnchorPointOpReq {
enum CmdId {
option allow_alias = true;
ENET_CHANNEL_ID = 0;
NONE = 0;
ENET_IS_RELIABLE = 1;
IS_ALLOW_CLIENT = 1;
CMD_ID = 4255;
}
enum AnchorPointOpType {
ANCHOR_POINT_OP_NONE = 0;
ANCHOR_POINT_OP_TELEPORT = 1;
ANCHOR_POINT_OP_REMOVE = 2;
}
uint32 anchor_point_op_type = 1;
uint32 anchor_point_id = 2;
}

View File

@ -0,0 +1,18 @@
syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
message AnchorPointOpRsp {
enum CmdId {
option allow_alias = true;
NONE = 0;
ENET_CHANNEL_ID = 0;
ENET_IS_RELIABLE = 1;
CMD_ID = 4274;
}
int32 retcode = 1;
uint32 anchor_point_op_type = 2;
uint32 anchor_point_id = 3;
}

View File

@ -0,0 +1,19 @@
syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
import "AvatarExpeditionInfo.proto";
message AvatarExpeditionAllDataRsp {
enum CmdId {
option allow_alias = true;
NONE = 0;
ENET_CHANNEL_ID = 0;
ENET_IS_RELIABLE = 1;
CMD_ID = 1783;
}
int32 retcode = 1;
map<uint64, AvatarExpeditionInfo> expedition_info_map = 2;
repeated uint32 open_expedition_list = 3;
uint32 expedition_count_limit = 4;
}

View File

@ -0,0 +1,16 @@
syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
message AvatarExpeditionCallBackReq {
enum CmdId {
option allow_alias = true;
ENET_CHANNEL_ID = 0;
NONE = 0;
ENET_IS_RELIABLE = 1;
IS_ALLOW_CLIENT = 1;
CMD_ID = 1618;
}
repeated uint64 avatar_guid = 1;
}

View File

@ -0,0 +1,17 @@
syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
import "AvatarExpeditionInfo.proto";
message AvatarExpeditionCallBackRsp {
enum CmdId {
option allow_alias = true;
NONE = 0;
ENET_CHANNEL_ID = 0;
ENET_IS_RELIABLE = 1;
CMD_ID = 1633;
}
int32 retcode = 1;
map<uint64, AvatarExpeditionInfo> expedition_info_map = 2;
}

View File

@ -0,0 +1,16 @@
syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
import "AvatarExpeditionInfo.proto";
message AvatarExpeditionDataNotify {
enum CmdId {
option allow_alias = true;
NONE = 0;
ENET_CHANNEL_ID = 0;
ENET_IS_RELIABLE = 1;
CMD_ID = 1621;
}
map<uint64, AvatarExpeditionInfo> expedition_info_map = 1;
}

View File

@ -0,0 +1,16 @@
syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
message AvatarExpeditionGetRewardReq {
enum CmdId {
option allow_alias = true;
ENET_CHANNEL_ID = 0;
NONE = 0;
ENET_IS_RELIABLE = 1;
IS_ALLOW_CLIENT = 1;
CMD_ID = 1610;
}
uint64 avatar_guid = 1;
}

View File

@ -0,0 +1,19 @@
syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
import "AvatarExpeditionInfo.proto";
import "ItemParam.proto";
message AvatarExpeditionGetRewardRsp {
enum CmdId {
option allow_alias = true;
NONE = 0;
ENET_CHANNEL_ID = 0;
ENET_IS_RELIABLE = 1;
CMD_ID = 1670;
}
int32 retcode = 1;
map<uint64, AvatarExpeditionInfo> expedition_info_map = 2;
repeated ItemParam item_list = 3;
}

View File

@ -0,0 +1,12 @@
syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
import "AvatarExpeditionState.proto";
message AvatarExpeditionInfo {
AvatarExpeditionState state = 1;
uint32 exp_id = 2;
uint32 hour_time = 3;
uint32 start_time = 4;
float shorten_ratio = 5;
}

View File

@ -0,0 +1,18 @@
syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
message AvatarExpeditionStartReq {
enum CmdId {
option allow_alias = true;
ENET_CHANNEL_ID = 0;
NONE = 0;
ENET_IS_RELIABLE = 1;
IS_ALLOW_CLIENT = 1;
CMD_ID = 1609;
}
uint64 avatar_guid = 1;
uint32 exp_id = 2;
uint32 hour_time = 3;
}

View File

@ -0,0 +1,17 @@
syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
import "AvatarExpeditionInfo.proto";
message AvatarExpeditionStartRsp {
enum CmdId {
option allow_alias = true;
NONE = 0;
ENET_CHANNEL_ID = 0;
ENET_IS_RELIABLE = 1;
CMD_ID = 1646;
}
int32 retcode = 1;
map<uint64, AvatarExpeditionInfo> expedition_info_map = 2;
}

View File

@ -0,0 +1,10 @@
syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
import "AvatarSkillInfo.proto";
message AvatarSkillInfoNotify {
uint64 guid = 1;
map<uint32, AvatarSkillInfo> skill_map = 2;
}

View File

@ -0,0 +1,9 @@
syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
message AvatarSkillMaxChargeCountNotify {
uint64 avatar_guid = 1;
uint32 skill_id = 2;
uint32 max_charge_count = 3;
}

View File

@ -0,0 +1,15 @@
syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
message CanUseSkillNotify {
enum CmdId {
option allow_alias = true;
NONE = 0;
ENET_CHANNEL_ID = 0;
ENET_IS_RELIABLE = 1;
CMD_ID = 1019;
}
bool is_can_use_skill = 1;
}

View File

@ -2,7 +2,7 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
message ItemExceedLimitNotify {
message CheckAddItemExceedLimitNotify {
bool isMaterialExceedLimit = 1;
bool isWeaponExceedLimit = 2;
bool isReliquaryExceedLimit = 3;

9
proto/ChildQuest.proto Normal file
View File

@ -0,0 +1,9 @@
syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
message ChildQuest {
uint32 quest_id = 1;
uint32 state = 2;
uint32 quest_config_id = 3;
}

View File

@ -0,0 +1,10 @@
syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
message ClientCollectorData {
uint32 material_id = 1;
uint32 max_points = 2;
uint32 curr_points = 3;
}

View File

@ -0,0 +1,17 @@
syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
import "ClientCollectorData.proto";
message ClientCollectorDataNotify {
enum CmdId {
option allow_alias = true;
NONE = 0;
ENET_CHANNEL_ID = 0;
ENET_IS_RELIABLE = 1;
CMD_ID = 4280;
}
repeated ClientCollectorData client_collector_data_list = 1;
}

View File

@ -0,0 +1,16 @@
syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
import "CodexTypeData.proto";
message CodexDataFullNotify {
enum CmdId {
option allow_alias = true;
NONE = 0;
ENET_CHANNEL_ID = 0;
ENET_IS_RELIABLE = 1;
CMD_ID = 4208;
}
repeated CodexTypeData type_data_list = 1;
}

View File

@ -0,0 +1,18 @@
syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
import "CodexType.proto";
message CodexDataUpdateNotify {
enum CmdId {
option allow_alias = true;
NONE = 0;
ENET_CHANNEL_ID = 0;
ENET_IS_RELIABLE = 1;
CMD_ID = 4205;
}
CodexType type = 1;
uint32 id = 2;
uint32 weapon_max_promote_level = 3;
}

15
proto/CodexType.proto Normal file
View File

@ -0,0 +1,15 @@
syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
enum CodexType {
CODEX_NONE = 0;
CODEX_QUEST = 1;
CODEX_WEAPON = 2;
CODEX_ANIMAL = 3;
CODEX_MATERIAL = 4;
CODEX_BOOKS = 5;
CODEX_PUSHTIPS = 6;
CODEX_VIEW = 7;
CODEX_RELIQUARY = 8;
}

View File

@ -0,0 +1,6 @@
syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
message CodexTypeComparer {
}

11
proto/CodexTypeData.proto Normal file
View File

@ -0,0 +1,11 @@
syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
import "CodexType.proto";
message CodexTypeData {
CodexType type = 1;
repeated uint32 codex_id_list = 2;
repeated bool have_viewed_list = 3;
map<uint32, uint32> weapon_max_promote_level_map = 4;
}

View File

@ -4,7 +4,7 @@ option java_package = "emu.grasscutter.net.proto";
import "Vector.proto";
message VehicleSpawnReq {
message CreateVehicleReq {
uint32 vehicleId = 1;
uint32 pointId = 2;
Vector pos = 3;

View File

@ -2,7 +2,7 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
message VehicleSpawnRsp {
message CreateVehicleRsp {
uint32 vehicleId = 2;
uint32 entityId = 3;
}

View File

@ -0,0 +1,8 @@
syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
message CutSceneBeginNotify {
uint32 cutscene_id = 1;
bool is_wait_others = 2;
}

View File

@ -0,0 +1,8 @@
syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
message CutSceneEndNotify {
int32 retcode = 1;
uint32 cutscene_id = 2;
}

View File

@ -0,0 +1,7 @@
syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
message CutSceneFinishNotify {
uint32 cutscene_id = 1;
}

View File

@ -0,0 +1,7 @@
syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
message DungeonDataNotify {
map<uint32, uint32> dungeon_data_map = 1;
}

View File

@ -0,0 +1,7 @@
syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
message DungeonGetStatueDropRsp {
int32 retcode = 1;
}

View File

@ -4,8 +4,13 @@ option java_package = "emu.grasscutter.net.proto";
import "ParamList.proto";
import "StrengthenPointData.proto";
import "TowerLevelEndNotify.proto";
message DungeonSettleNotify {
oneof Detail {
TowerLevelEndNotify tower_level_end_notify = 101;
// it has more!
}
uint32 dungeon_id = 1;
bool is_success = 2;
repeated uint32 fail_cond_list = 3;

View File

@ -0,0 +1,7 @@
syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
message EnterTransPointRegionNotify {
uint32 scene_id = 1;
uint32 point_id = 2;
}

View File

@ -0,0 +1,9 @@
syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
import "ParentQuest.proto";
message FinishedParentQuestNotify {
repeated ParentQuest parent_quest_list = 1;
}

View File

@ -0,0 +1,9 @@
syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
import "ParentQuest.proto";
message FinishedParentQuestUpdateNotify {
repeated ParentQuest parent_quest_list = 1;
}

View File

@ -0,0 +1,9 @@
syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
import "Item.proto";
message GadgetAutoPickDropInfoNotify {
repeated Item item_list = 1;
}

View File

@ -0,0 +1,16 @@
syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
message GetWidgetSlotReq {
enum CmdId {
option allow_alias = true;
ENET_CHANNEL_ID = 0;
NONE = 0;
ENET_IS_RELIABLE = 1;
IS_ALLOW_CLIENT = 1;
CMD_ID = 4285;
}
}

View File

@ -0,0 +1,18 @@
syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
import "WidgetSlotData.proto";
message GetWidgetSlotRsp {
enum CmdId {
option allow_alias = true;
NONE = 0;
ENET_CHANNEL_ID = 0;
ENET_IS_RELIABLE = 1;
CMD_ID = 4291;
}
int32 retcode = 1;
repeated WidgetSlotData slot_list = 2;
}

View File

@ -0,0 +1,17 @@
syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
message HomeChooseModuleReq {
enum CmdId {
option allow_alias = true;
ENET_CHANNEL_ID = 0;
NONE = 0;
ENET_IS_RELIABLE = 1;
IS_ALLOW_CLIENT = 1;
CMD_ID = 4530;
}
uint32 module_id = 1;
}

View File

@ -0,0 +1,17 @@
syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
message HomeChooseModuleRsp {
enum CmdId {
option allow_alias = true;
NONE = 0;
ENET_CHANNEL_ID = 0;
ENET_IS_RELIABLE = 1;
CMD_ID = 4653;
}
int32 retcode = 1;
uint32 module_id = 2;
}

View File

@ -0,0 +1,17 @@
syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
import "HomeModuleComfortInfo.proto";
message HomeComfortInfoNotify {
enum CmdId {
option allow_alias = true;
NONE = 0;
ENET_CHANNEL_ID = 0;
ENET_IS_RELIABLE = 1;
CMD_ID = 4557;
}
repeated HomeModuleComfortInfo module_info_list = 1;
}

View File

@ -0,0 +1,10 @@
syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
message HomeModuleComfortInfo {
uint32 module_id = 1;
repeated uint32 world_scene_block_comfort_value_list = 2;
uint32 room_scene_comfort_value = 3;
}

8
proto/LunchBoxData.proto Normal file
View File

@ -0,0 +1,8 @@
syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
message LunchBoxData {
map<uint32, uint32> slot_material_map = 1;
}

View File

@ -0,0 +1,9 @@
syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
enum LunchBoxSlotType {
LUNCH_BOX_SLOT_NONE = 0;
LUNCH_BOX_SLOT_REVIVE = 1;
LUNCH_BOX_SLOT_HEAL = 2;
}

View File

@ -0,0 +1,10 @@
syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
import "MapMarkTipsType.proto";
message MapMarkTipsInfo {
MapMarkTipsType tips_type = 1;
repeated uint32 point_id_list = 2;
}

View File

@ -0,0 +1,7 @@
syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
enum MapMarkTipsType {
MARK_TIPS_DUNGEON_ELEMENT_TRIAL = 0;
}

View File

@ -0,0 +1,19 @@
syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
import "Vector.proto";
message MarkEntityInMinMapNotify {
enum CmdId {
option allow_alias = true;
NONE = 0;
ENET_CHANNEL_ID = 0;
ENET_IS_RELIABLE = 1;
CMD_ID = 249;
}
uint32 entity_id = 1;
Vector position = 2;
uint32 monster_id = 3;
}

18
proto/MarkMapRsp.proto Normal file
View File

@ -0,0 +1,18 @@
syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
import "MapMarkPoint.proto";
message MarkMapRsp {
enum CmdId {
option allow_alias = true;
NONE = 0;
ENET_CHANNEL_ID = 0;
ENET_IS_RELIABLE = 1;
CMD_ID = 3011;
}
int32 retcode = 1;
repeated MapMarkPoint mark_list = 2;
}

17
proto/MarkNewNotify.proto Normal file
View File

@ -0,0 +1,17 @@
syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
message MarkNewNotify {
enum CmdId {
option allow_alias = true;
NONE = 0;
ENET_CHANNEL_ID = 0;
ENET_IS_RELIABLE = 1;
CMD_ID = 1212;
}
uint32 mark_new_type = 1;
repeated uint32 id_list = 2;
}

9
proto/MarkNewType.proto Normal file
View File

@ -0,0 +1,9 @@
syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
enum MarkNewType {
_NONE = 0;
COMBINE = 1;
FORGE = 2;
}

View File

@ -0,0 +1,8 @@
syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
message McoinExchangeHcoinReq {
uint32 mCoinNum = 1;
uint32 hCoinNum = 2;
}

View File

@ -0,0 +1,7 @@
syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
message McoinExchangeHcoinRsp {
int32 retcode = 1;
}

View File

@ -0,0 +1,8 @@
syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
enum ModifierAction {
ADDED = 0;
REMOVED = 1;
}

View File

@ -0,0 +1,10 @@
syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
import "AbilityString.proto";
message ModifierProperty {
AbilityString key = 1;
float value = 2;
}

View File

@ -0,0 +1,15 @@
syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
import "Vector.proto";
message OneoffGatherPointDetectorData {
uint32 material_id = 1;
bool is_all_collected = 2;
bool is_hint_valid = 3;
Vector hint_center_pos = 4;
uint32 hint_radius = 5;
uint32 group_id = 6;
uint32 config_id = 7;
}

View File

@ -0,0 +1,17 @@
syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
import "OneoffGatherPointDetectorData.proto";
message OneoffGatherPointDetectorDataNotify {
enum CmdId {
option allow_alias = true;
NONE = 0;
ENET_CHANNEL_ID = 0;
ENET_IS_RELIABLE = 1;
CMD_ID = 4288;
}
repeated OneoffGatherPointDetectorData oneoff_gather_point_detector_data_list = 1;
}

18
proto/ParentQuest.proto Normal file
View File

@ -0,0 +1,18 @@
syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
import "ParentQuestRandomInfo.proto";
import "ChildQuest.proto";
message ParentQuest {
uint32 parent_quest_id = 1;
repeated ChildQuest child_quest_list = 2;
bool is_finished = 3;
bool is_random = 4;
ParentQuestRandomInfo random_info = 5;
repeated int32 quest_var = 6;
uint32 parent_quest_state = 7;
uint32 quest_var_seq = 8;
map<uint32, uint32> time_var_map = 9;
}

View File

@ -0,0 +1,9 @@
syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
message ParentQuestRandomInfo {
uint32 entrance_id = 1;
uint32 template_id = 2;
repeated uint32 factor_list = 3;
}

View File

@ -0,0 +1,16 @@
syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
message PersonalSceneJumpReq {
enum CmdId {
option allow_alias = true;
ENET_CHANNEL_ID = 0;
NONE = 0;
ENET_IS_RELIABLE = 1;
IS_ALLOW_CLIENT = 1;
CMD_ID = 260;
}
uint32 point_id = 1;
}

View File

@ -0,0 +1,19 @@
syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
import "Vector.proto";
message PersonalSceneJumpRsp {
enum CmdId {
option allow_alias = true;
NONE = 0;
ENET_CHANNEL_ID = 0;
ENET_IS_RELIABLE = 1;
CMD_ID = 228;
}
int32 retcode = 1;
uint32 dest_scene_id = 2;
Vector dest_pos = 3;
}

View File

@ -0,0 +1,12 @@
syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
import "FriendEnterHomeOption.proto";
message PlayerHomeCompInfo {
FriendEnterHomeOption friend_enter_home_option = 1;
repeated uint32 unlocked_module_id_list = 2;
repeated uint32 levelup_reward_got_level_list = 3;
repeated uint32 seen_module_id_list = 4;
}

View File

@ -0,0 +1,17 @@
syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
import "PlayerHomeCompInfo.proto";
message PlayerHomeCompInfoNotify {
enum CmdId {
option allow_alias = true;
NONE = 0;
ENET_CHANNEL_ID = 0;
ENET_IS_RELIABLE = 1;
CMD_ID = 4628;
}
PlayerHomeCompInfo comp_info = 1;
}

View File

@ -4,6 +4,6 @@ option java_package = "emu.grasscutter.net.proto";
import "SceneUnlockInfo.proto";
message SceneUnlockInfoNotify {
message PlayerWorldSceneInfoListNotify {
repeated SceneUnlockInfo unlockInfos = 1;
}

View File

@ -0,0 +1,16 @@
syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
message QueryCodexMonsterBeKilledNumReq {
enum CmdId {
option allow_alias = true;
ENET_CHANNEL_ID = 0;
NONE = 0;
ENET_IS_RELIABLE = 1;
IS_ALLOW_CLIENT = 1;
CMD_ID = 4201;
}
repeated uint32 codex_id_list = 1;
}

View File

@ -0,0 +1,18 @@
syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
message QueryCodexMonsterBeKilledNumRsp {
enum CmdId {
option allow_alias = true;
NONE = 0;
ENET_CHANNEL_ID = 0;
ENET_IS_RELIABLE = 1;
CMD_ID = 4210;
}
int32 retcode = 1;
repeated uint32 codex_id_list = 2;
repeated uint32 be_killed_num_list = 3;
repeated uint32 be_killed_num_empty_list = 4;
}

20
proto/Quest.proto Normal file
View File

@ -0,0 +1,20 @@
syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
message Quest {
uint32 quest_id = 1;
uint32 state = 2;
uint32 start_time = 4;
bool is_random = 5;
uint32 parent_quest_id = 6;
uint32 quest_config_id = 7;
uint32 start_game_time = 8;
uint32 accept_time = 9;
repeated uint32 lacked_npc_list = 10;
repeated uint32 finish_progress_list = 11;
repeated uint32 fail_progress_list = 12;
map<uint32, uint32> lacked_npc_map = 13;
repeated uint32 lacked_place_list = 14;
map<uint32, uint32> lacked_place_map = 15;
}

View File

@ -0,0 +1,7 @@
syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
message QuestDelNotify {
uint32 quest_id = 1;
}

View File

@ -0,0 +1,8 @@
syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
message QuestGlobalVar {
uint32 key = 1;
int32 value = 2;
}

View File

@ -0,0 +1,9 @@
syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
import "QuestGlobalVar.proto";
message QuestGlobalVarNotify {
repeated QuestGlobalVar var_list = 1;
}

View File

@ -0,0 +1,9 @@
syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
import "Quest.proto";
message QuestListNotify {
repeated Quest quest_list = 1;
}

View File

@ -0,0 +1,9 @@
syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
import "Quest.proto";
message QuestListUpdateNotify {
repeated Quest quest_list = 1;
}

View File

@ -0,0 +1,9 @@
syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
message QuestProgressUpdateNotify {
uint32 quest_id = 1;
repeated uint32 finish_progress_list = 2;
repeated uint32 fail_progress_list = 3;
}

View File

@ -0,0 +1,9 @@
syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
message QuestUpdateQuestVarNotify {
uint32 parent_quest_id = 1;
repeated int32 quest_var = 2;
uint32 parent_quest_var_seq = 3;
}

View File

@ -0,0 +1,12 @@
syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
import "QuestVarOp.proto";
message QuestUpdateQuestVarReq {
uint32 quest_id = 1;
repeated QuestVarOp quest_var_op_list = 2;
uint32 parent_quest_id = 3;
uint32 parent_quest_var_seq = 4;
}

View File

@ -0,0 +1,10 @@
syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
message QuestUpdateQuestVarRsp {
int32 retcode = 1;
uint32 quest_id = 2;
uint32 parent_quest_id = 3;
uint32 parent_quest_var_seq = 4;
}

9
proto/QuestVarOp.proto Normal file
View File

@ -0,0 +1,9 @@
syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
message QuestVarOp {
uint32 index = 1;
int32 value = 2;
bool is_add = 3;
}

Some files were not shown because too many files have changed in this diff Show More