Commit Graph

2022 Commits

Author SHA1 Message Date
AnimeGitB
4a5a7bd6bd Accept resource enums of form "1" 2022-10-15 22:18:54 +10:30
TotalyNotOndre
130a01faa4
Update ru-RU.json (#1855) 2022-10-14 03:08:05 +10:30
github-actions
06fe05bcf7 Version 1.4.1-dev [skip actions] 2022-10-13 13:32:11 +00:00
github-actions
23f1298d6c Version 1.4.0
Fix whitespace [skip actions]
[BREAKING] Item Usage Overhaul
Updated MAX_FRIENDS (#1852)
Refactor GameData, remove deprecated getGsonFactory - Fix day-of-week dungeons - AvatarSkill max level enforcement from excels - Partial fix to bonus levels (need packet on talent update)
Lombokify and sort GameData
Extend talent command "all" (#1850)
fix: Solar Isotoma Elevator doesn't work in multiplayer mode (#1848)
fix: ConcurrentModificationError by removing gadget (#1849)
Add DynamicFloat class
fix: albedo elevator doesn't work (#1845)
Update GM Handbook with Spincrystal names and Monster strings
feat: unlock homeworld bgm and set homeworld bgm. (#1844)
Flatten language translation keys in-memory
feat: set namecards in profile editing. (#1843)
fix costumes are unable to be unlocked. (#1842)
Fix food decreasing (#1834)
Fix showing ban message box (#1826)
Don't need full Java stacktrace on Lua errors
Move Data, Plugin, Script, Packet access from Strings to Paths (#1839)
Add `shutdown` alias to StopCommand
Update Banners.json (#1813)
[BREAKING] Deobfuscate codex field, slight refactor (#1809)
3.1 Support (#1808)
refactor HandlerWidgetDoBagReq
Update README.md
Fixed a tons of errors to make the drop system to accord with that in the actual game
Allow loading Resources from zip files Move Resources loading from String filenames to Paths Add zip support
Add `-game` and `-dispatch` startup arguments that override the run mode in the config
Use reflection to map database classes and add missing mapped classes to the dispatch datastore
Version 1.3.2-dev [skip actions]
2022-10-13 13:32:11 +00:00
github-actions
025e5d3c1c Fix whitespace [skip actions] 2022-10-13 13:32:10 +00:00
AnimeGitB
d1d39db56c [BREAKING] Item Usage Overhaul
-De-hardcode elemental orb values
-De-hardcode exp items
-Change ShopChest format (temporary, drop system overhaul will replace it entirely)
-Food healing actually uses Ability data for real HP amounts
2022-10-14 00:00:40 +10:30
atArtyom
5bb43ac074
Updated MAX_FRIENDS (#1852) 2022-10-13 18:32:58 +10:30
AnimeGitB
4e75361ad4 Refactor GameData, remove deprecated getGsonFactory
- Fix day-of-week dungeons
- AvatarSkill max level enforcement from excels
- Partial fix to bonus levels (need packet on talent update)
2022-10-13 18:31:34 +10:30
AnimeGitB
bb342f9114 Lombokify and sort GameData 2022-10-13 14:58:49 +10:30
natsu
953272489d
Extend talent command "all" (#1850)
* Extend talent command "all":
Added talent option to set all talents (n, e, q) at once
Modified error message to cover edge cases when player entered talent level lower than 1

* Update src/main/java/emu/grasscutter/command/commands/TalentCommand.java

some suggested changes

Co-authored-by: Luke H-W <Birdulon@users.noreply.github.com>
2022-10-13 12:46:59 +10:30
hamusuke
ec3cdc040f
fix: Solar Isotoma Elevator doesn't work in multiplayer mode (#1848) 2022-10-12 22:14:25 +10:30
hamusuke
ef55e5515c
fix: ConcurrentModificationError by removing gadget (#1849) 2022-10-12 22:07:53 +10:30
AnimeGitB
558471237a Add DynamicFloat class 2022-10-12 21:58:39 +10:30
hamusuke
bf8ee32382
fix: albedo elevator doesn't work (#1845)
* Packet preparation

* elevator creation

* Make elevator work, scene time, entity removed event.

* Avoid referencing certain character name.
2022-10-12 17:26:45 +10:30
AnimeGitB
f801fe0305 Update GM Handbook with Spincrystal names and Monster strings 2022-10-12 16:01:22 +10:30
hamusuke
4da4c03ecc
feat: unlock homeworld bgm and set homeworld bgm. (#1844)
* will be able to change home bgm.

* feat: unlock homeworld bgm and set homeworld bgm.

* Update src/main/java/emu/grasscutter/game/home/GameHome.java

* Update GameHome.java

* Get default unlocked home bgms from HomeWorldBgmData

* fix: duplicate home items by sending packet
2022-10-11 22:29:43 +10:30
AnimeGitB
98ac42a6c6 Flatten language translation keys in-memory 2022-10-09 12:21:05 +10:30
hamusuke
a4f10208de
feat: set namecards in profile editing. (#1843)
* add: can set name cards in profile editing.

* some changes

* Update src/main/java/emu/grasscutter/game/player/Player.java

* Update src/main/java/emu/grasscutter/server/packet/recv/HandlerGetFriendShowNameCardInfoReq.java

* Update src/main/java/emu/grasscutter/server/packet/recv/HandlerUpdatePlayerShowNameCardListReq.java

* Update src/main/java/emu/grasscutter/server/packet/send/PacketGetFriendShowNameCardInfoRsp.java

* Update src/main/java/emu/grasscutter/server/packet/send/PacketUpdatePlayerShowNameCardListRsp.java

* Update src/main/java/emu/grasscutter/game/player/Player.java
2022-10-09 11:40:10 +10:30
hamusuke
e23536e7ba
fix costumes are unable to be unlocked. (#1842)
* fix: costumes are able to be unlocked.

* Update AvatarCostumeData
2022-10-09 11:10:42 +10:30
atArtyom
004a765e5b
Fix food decreasing (#1834)
* Update InventorySystem.java

Fix some food didn't reduce after use.

* Update InventorySystem.java
2022-10-08 01:44:29 +10:30
Dang Hoang Phuc
a520bc9416
Fix showing ban message box (#1826)
* fix: getplayertoken ban message popup

* feat: insure no packet handle when banned

* feat: using session state instead of account
2022-10-08 01:37:20 +10:30
AnimeGitB
0b9cab5ad5 Don't need full Java stacktrace on Lua errors 2022-10-07 23:06:26 +10:30
Luke H-W
dd6e1bb8a3
Move Data, Plugin, Script, Packet access from Strings to Paths (#1839)
* Move Data, Plugin, Script, Packet access from Strings to Paths
- No longer dump default Data files to folder on launch
- Allow Scripts to be loaded from Resources zip
- Lay groundwork for Plugins to be loaded from zip
2022-10-07 23:01:08 +10:30
Luke H-W
f6ce7e349d
Add shutdown alias to StopCommand 2022-10-04 01:33:01 +10:30
TomyJan
960318651c
Update Banners.json (#1813)
* Update Banners.json

* Update Banners.json
2022-09-28 21:08:13 +09:30
Luke H-W
c2e620bf7c
[BREAKING] Deobfuscate codex field, slight refactor (#1809)
* Deobfuscate codex field, slight refactor

* Fix relic sets in codex
2022-09-28 16:28:15 +09:30
GanyusLeftHorn
5ffc07cf59
3.1 Support (#1808)
* Update 3.0 protos

* Update classes to match protos

* Fix RegionHandler versions

* 3.0 Opcodes

* Fixed Gadget Spawning

Original Commit Message: fixed gadget spawning ty MJDerp
Gitea Author: yh0Nathan

Co-authored-by: yh0Nathan <yhonathancaleb@gmail.com>

* Make PointData compatible with alternative PointData

Original Commit Message: Make PointData compatible with windied scene points.
Gitea Author: GanyusLeftHorn

Co-authored-by: GanyusLeftHorn <1244229+GanyusLeftHorn@users.noreply.github.com>

* Add scene tag for Vanarana.

Original Commit Message: Add scene tag for Vanarana.
Gitea Author: GanyusLeftHorn

Co-authored-by: GanyusLeftHorn <1244229+GanyusLeftHorn@users.noreply.github.com>

* Add Sumeru expeditions.

Original Commit Message: Add Sumeru expeditions.
Gitea Author: GanyusLeftHorn

Co-authored-by: GanyusLeftHorn <1244229+GanyusLeftHorn@users.noreply.github.com>

* Update game version to 3.0.0

* versionFix must be >= 50 not == 50 in RegionHandler

* Add new 3.0 Reliquary and SkillParticleGeneration data

Original Commit Message: Repair 3.0 added Reliquary 3-in-1 on the crafting table. Add skill particle generation info for Tighnari,Collei and Dori
Gitea Author: Roly

* Actually fix RegionHandler

* Remove asset names from json and comments

* Add scene areas for Sumeru desert to /prop um

* Added New MaterialType

* Change version to 3.1.0

* funny welcome message back

* Fix pyramid skill issue.

* Fix pyramid and event scene tags without ugly bruteforce.

* Remove backrooms chat welcome message.

* Incorporate suggestions.

* RoomSceneId and empty list checking.

Co-authored-by: Benj <benjamin7006@gmail.com>
Co-authored-by: yh0Nathan <yhonathancaleb@gmail.com>
Co-authored-by: Kokoboy <anushkumar222001@gmail.com>
Co-authored-by: nitro <31241699+nitrog0d@users.noreply.github.com>
Co-authored-by: Vexeone <vexeone@gmail.com>
2022-09-28 04:53:19 +02:00
AnimeGitB
4154229722 refactor HandlerWidgetDoBagReq 2022-09-26 18:41:05 +09:30
Moon Light「つかり」
badda3626f Update README.md 2022-09-24 00:51:10 +09:30
Fish and Chip
2f2eb1dba0 Fixed a tons of errors to make the drop system to accord with that in the actual game 2022-09-23 22:48:06 +09:30
AnimeGitB
fbc0219cba Allow loading Resources from zip files
Move Resources loading from String filenames to Paths
Add zip support
2022-09-23 22:25:17 +09:30
Melledy
a90455a7a4
Add -game and -dispatch startup arguments that override the run mode in the config 2022-09-18 20:52:30 -07:00
Melledy
0d64e2e810
Use reflection to map database classes and add missing mapped classes to the dispatch datastore 2022-09-18 20:46:28 -07:00
github-actions
794350aa63 Version 1.3.2-dev [skip actions] 2022-09-16 17:04:45 +00:00
github-actions
ad64d71165 Version 1.3.1
Fix whitespace [skip actions]
Extend spawn command (#1777)
character and companionship exp gain to party not active character fixes #1787
fixed gadget hp properties and invincibility handling (#1773)
Add support for propperly showing activity shops (#1774)
Improve team respawn (#1752)
Update README.md (the origin) (#1736)
Update banners (closes #1760)
Update zh-CN.json (#1762)
Calculate Banner.previewPrefabPath
Forbid PRs from modifying certain files
Added a directive to fix some minor bugs (#1744)
remove accidentally committed symlink
Version 1.3.1-dev [skip actions]
2022-09-16 17:04:45 +00:00
github-actions
e9f5d98466 Fix whitespace [skip actions] 2022-09-16 17:04:44 +00:00
Alexander Hartmann
08f361954a
Extend spawn command (#1777)
* add missing EntityTypes

* small command refactorings and improvements
* move common command patterns and methods to CommandHelpers
* let the spawn command detect the entityType instead of spawning every entity as EntityVehicle
* add extra options for spawning gadgets for better debuging and testing

* More spawn command additions and cleanups+EntityVehicle changes
* Moved remaining patterns from GiveCommand and ClearCommand to CommandHelpers
* Added patterns for hp, maxhp, atk, def and (monster)ai for the spawn command
* Moved intParam parsing via regex to the CommandHelpers
* Read most of EntityVehicle stats from the ConfigGadget instead of hardcoding them

Co-authored-by: hartie95 <mail@hartie95.de>
2022-09-17 02:34:20 +09:30
AnimeGitB
9671a76af2 character and companionship exp gain to party not active character
fixes #1787
2022-09-17 01:33:48 +09:30
Alexander Hartmann
08fdcf6ed4
fixed gadget hp properties and invincibility handling (#1773)
* fixed gadget hp properties and invincibility handling

* Allow killing of hp locked entities, if the damage is higher then the hp

Co-authored-by: hartie95 <mail@hartie95.de>
2022-09-15 11:56:20 +09:30
Alexander Hartmann
21ff749dca
Add support for propperly showing activity shops (#1774)
* Add support for propperly showing activity shops

* Update src/main/java/emu/grasscutter/data/excels/ActivityShopData.java

Co-authored-by: hartie95 <mail@hartie95.de>
2022-09-14 19:57:16 +09:30
Kawaa
070edd263a
Improve team respawn (#1752)
* Pull request made after merging the latest version

* Update src/main/resources/languages/ja-JP.json

* first commit

* TeamRespawn_BigWorld

* Improving scene Loading

* Final commit

* optimize import

* optimize

* Update TeamManager.java

* Update src/main/java/emu/grasscutter/game/player/TeamManager.java
2022-09-12 23:25:10 +09:30
AwayJob
72c16d7ecb
Update README.md (the origin) (#1736)
* made it more  c l e a r e r

* add .

* Update README.md

* Capitalised HTTPS

* update actions to build

* fixed typo

Fixed the bullet point spacing, removed http://mitm.it as the download page don't exist anymore, added `mitmproxy-ca-cert.cer` and save script into the instruction.

* added additional info about mitmproxy
2022-09-11 11:19:01 -04:00
AnimeGitB
767e598bea Update banners (closes #1760) 2022-09-11 21:05:16 +09:30
2y8e9h22
57bb747118
Update zh-CN.json (#1762)
* Update zh-CN.json

Translate Chinese briefly.

* bring into correspondence with

Same indentation
2022-09-09 22:32:38 +09:30
AnimeGitB
d3bf5b585f Calculate Banner.previewPrefabPath 2022-09-08 22:36:43 +09:30
AnimeGitB
a9ca80e490 Forbid PRs from modifying certain files 2022-09-07 15:38:27 +09:30
Kawaa
210e9e9732 Added a directive to fix some minor bugs (#1744)
* Pull request made after merging the latest version

* Update src/main/resources/languages/ja-JP.json
2022-09-05 23:53:40 +09:30
AnimeGitB
2ed4506074 remove accidentally committed symlink 2022-09-03 22:15:23 +09:30
github-actions
6cf83b30ee Version 1.3.1-dev [skip actions] 2022-09-03 03:36:52 +00:00
github-actions
155501058f Version 1.3.0
Update languages [skip actions]
Fix whitespace [skip actions]
Add version increments to lint branch
Plugin Manager localisation
Update ru-RU.json
fix serenitea pot main building
Add command targeting by account username
Fix elementless Traveler depotValue
[BREAKING] dummy commit for Express -> Javalin
Update contributing guidelines
Move the remaining `HttpUtils` function over to `Router`
Clean up http server content types
Replace express with javalin in logger
Update HttpServer & AuthenticationSystem to use Javalin
Remove ``java-express``. Add javalin as dependency
Custom Teams (#1731)
Console output player command (#1722)
Clean up adding extra embryo logic in Avatar::recalcStats
Clean up OpenStateData onLoad logic
Update default Banners.json (#1719)
fix serenitea pot (#1726)
fix: avatar energy transform in proudskill
Update README.md Sequel (#1717)
Add permission clear and list commands (#1715)
Fix offline account deletion (fixes #1716)
maybe drop my dev domain and use `grasscutter.io`
Fix up some japanese references
add dendro resonance
Update README_NL.md
Update readme interlinks
Jp support (#1712)
Update translation (#1711)
Merge pull request #1710 from pfyy/development
fix dungeon
Dutch language updates For README (#1709)
Fix weird conditional in `EquipAffixData`
partial fix of dungeon
Update `AvatarCostumeData` naming
Fix `ReliquarySetData` naming
Update README_zh-CN.md
Show accessAddress in bold yellow on startup This should make it easier to help people troubleshoot networked setups. Consider telling people to try connecting to the address with a web browser on the client's machine.
Update SetPropCommand strings, send cmd usage on target fail
refactor some itemdepot lookups for later
Fix account deletion
Fix HelpCommand missing aliases
Prevent material type from being null
Move vehicle fightprop hacks
Consolidate random point offsets
De-hardcode ChestBatchUse
Remove asset names from json and comments
Actually fix RegionHandler
Add new 3.0 Reliquary and SkillParticleGeneration data
versionFix must be >= 50 not == 50 in RegionHandler
Update game version to 3.0.0
Add Sumeru expeditions.
Add scene tag for Vanarana.
Make PointData compatible with alternative PointData
Fixed Gadget Spawning
3.0 Opcodes
Fix RegionHandler versions
Update classes to match protos
Update 3.0 protos
Fix QuestEncryptionKeys Path (#1696)
Update README.md (#1695)
More literate README_ru-RU.md
Avoid potential NPE on WL0 (#1693)
Make lint workflows ignore generated folder But run them on linter and workflow changes
Clean up some Position usage to avoid unneccessary unpacks
Fix healing skills being able to heal dead characters
Fix null pointer in `Avatar` if skill level map didnt already contain skill id
Delete quests from the player if there are errors loading them from the db
update zh-CN.json (#1684)
Update ru-RU.json
Rename lint_commit's job, don't fail on no changes
Fix lint commit reference
Allow adding constellations to playerless avatars Fixes #1682
Fix whitespace [skip actions]
Don't lint src/generated
Make TalentCommand show off new Translate function
Improve translate function Make commands pass ints and floats instead of manually casting them to string first
Hide resin from map when disabled
Replace protos with generated protos
small quest fixes (#1677)
Blossom Implement (#1606)
Merge pull request #1680 from 4Benj/development
Remove uncompiled protos from compiled jar
Remove crazy high AEXP drops from default chest rewards
Fix talentcommand message key
Refactor avatar skilldepot and constellation/talent changing Ensures Traveler retains talent levels and constellations on inactive elements when switching elements. Relevant for any other skillDepot-changing activities like Windtrace too, though keeping those in the db might not be as useful.
Add README_fil-PH.md (#1675)
Avoid allocations on Map::putIfAbsent usage Map::computeIfAbsent only runs the passed constructors when it needs to
Add iterable payItems methods Shame they could never be fully generic, but oh well
Change unlocked scenes from lists to sets
Handbooks: use some sorted maps
Stop vendoring fastutil
Lombokify some more getters
Remove erroneous references to excel skilldata instead of avatar skilldata Refactor team resonances and correct login behaviour and less-than-full-party behaviour
Add README_ko-KR.md (#1673)
Don't use UIDs as initial capacity for chat history
ChatSystem nitpick
Fix chat welcome messages and some slight refactoring.
Fix deprecated chat references
update zh-CN.json (#1662)
Refactoring (#1660)
chore: typo fix
Bump config version.
Update ConfigContainer.java (#1646)
make fishhook_tp configurable
Refactor Json helper functions to JsonUtils
Funnel all gson calls into helper functions
Remove beta message
Fix TalentCommand for Traveler
fix:command player said to server won't be shown at chat history (#1643)
Update install_without_dependencies.sh
Fixed install_without_dependencies.sh script
Handle Unlocking of Waypoints and Statues (#1608)
Stop language linter from fighting the main linter on \n
Fix an edge case that breaks embryos if resources are loaded early
Introduce a new arguments parser (#1629)
Fix Claiming BP Reward Chests (#1634)
Make missing languages not throw warnings
Unify gacha mappings generation
Remove vestigial references to gacha_mappings
Remove language hack from handbook generation
Generate handbooks on every launch, fix html docs
Refactor handbook generation, remove singular handbook
Cache used strings from TextMaps
Load in all the textmaps!
Implement working* burst/ultimate invincibility
Added Indonesian README
Added install_without_dependencies.sh file
Add invoke-level invulnerability for bursts.
Invoke `AbilityManager#onSkillStart` and `AbilityManager#onSkillEnd`
Add a method to be invoked on skill perform and end
Update README_pl-PL.md
Update README_ru-RU.md
Update README_es-ES.md
Update README_fr-FR.md
Update README_zh-TW.md
Update README_zh-CN.md
Update README.md
fix typo
Added Indonesian language
Added install_without_dependencies.sh file
Improve some documentation and JSON (#1618)
Add `EntityDamageEvent` and implementations
Add more events
Update HandlerSceneTransToPointReq.java
Update src/main/java/emu/grasscutter/server/packet/recv/HandlerSceneTransToPointReq.java
Update src/main/java/emu/grasscutter/game/managers/mapmark/MapMarksManager.java
Update src/main/java/emu/grasscutter/server/packet/recv/HandlerTryEnterHomeReq.java
Polish README and setConst translation (#1614)
Update ru-RU.json
Create ko-KR.json
Add `PlayerUseFoodEvent` and implementations
Move `PlayerTeleportEvent` occurrences into `World`
Merge branch 'development' into more-events
Clean-up the energy manager
Explicitly declare the charset of a `FileReader` in `ConfigContainer`
Update zh-CN.json
Changed charset of FileReader in ConfigContainer from default to utf-8.
Add files via upload
Auto language lint
Add explicit encoding on manage_languages.py for windows users
Add lock function to SetStatsCommand
Improve message formatting to clients Replaces tab indents with an extra linebreak. Also adds / to the start of command usage. Neither of these changes affect messages to the server console log.
Update zh-CN.json
Update zh-CN.json
Merge pull request #1586 from Birdulon/development
Suppress stacktrace on missing questkeys file
Change loading quest keys from `info` to `debug`.
Update zh-CN.json
Fix an NPE in `EntityGadget` when `draft_id` isn't set
SceneScriptManager fix nullPointer error
Move `QuestEncryptionKeys` to `resources/`
Traditional Chinese | Translation Patches
fix nullPointer error
small nullpointer fix in EntityGadget, in case meta gadget is not set
Update ru-RU.json
Add spanish translation for constellation commands
Merge pull request #1553 from akatatsu27/questing
token fix
Merge branch 'development' into questing
Update ru-RU.json
[Bug] New avatars always created with C0 constellation Fixes #1552
2.7+ prerendered cutscene support
two small activity/event fixes * fixed GetAcitivityInfoReq proto * added draft to gadget Scene gatget, to let the client know the propper minigame for some entities
Set Constellation Command (#1565)
Update French translation
Fix remaining traces of `Player#getPos`
Attempt to fix the `teleport` command.
Add `PlayerTeamDeathEvent` and implementations
Add `EntityDeathEvent` and implementations
Add a `Location` class (Scene + Position)
Remove deprecated class
Merge branch 'development' into more-events
call deregisterRegion appropriately
Merge branch 'development' into questing
Read Open States from Excels (#1557)
and misc bug fixes
Major questing improvements
Merge branch 'development' into more-events
Translated new changes in languages files to Spanish
Fix taking battle pass rewards
Add `unlockall` command to unlock all openstates
Fix battle pass manager saving with 0 id
Set `setChooseAvatarGuid` properly
Implement food buffs
Use sorted containers for commands & aliases
Change commands to use new usage message method.
Refactor Command usage and description strings
Updated Russian localization (#1543)
Refactor excel datas (Mainly item data)
Add `kcpInterval` to the config
Rename `hasSentAvatarDataNotify()` to `hasSentLoginPackets()`
Fix host team size not changing when a player joins their world for the first time
Lower kcp interval to 20
Bump project version
Add `PlayerTeleportEvent`
Update to support `PlayerMoveEvent`
Remove `Cancellable` from `PlayerMoveEvent`
Implement `PlayerMoveEvent`
2022-09-03 03:36:52 +00:00