Commit Graph

2101 Commits

Author SHA1 Message Date
github-actions
22e953b636 Format code [skip actions] 2023-06-04 19:56:38 +00:00
KingRainbow44
6080297be9
Fix dropType de-serialization 2023-06-04 15:55:06 -04:00
github-actions
6d6e6a041d Format code [skip actions] 2023-06-04 05:01:54 +00:00
KingRainbow44
b09c0d48bf
Fix ActionGenerateElemBall 2023-06-04 01:00:27 -04:00
github-actions
b050337216 Format code [skip actions] 2023-06-04 04:29:25 +00:00
StartForKiller
ac3ccf93f3
Little fix 2023-06-04 00:27:15 -04:00
StartForKiller
0167709070
Implement GenerateElemBall action 2023-06-04 00:27:01 -04:00
KingRainbow44
63ccff8755
Shut down the game server when Grasscutter is about to shut down 2023-06-04 00:26:06 -04:00
github-actions
494cd3b28c Format code [skip actions] 2023-06-03 19:37:54 +00:00
KingRainbow44
f9dffba27a
Merge remote-tracking branch 'origin/development' into development 2023-06-03 15:36:05 -04:00
KingRainbow44
f85070abdc
Make subfield & drop classes final 2023-06-03 15:36:00 -04:00
KingRainbow44
4de21d4a40
Remove redundant script event calling when changing the time 2023-06-03 15:35:04 -04:00
StartForKiller
56f09e87a1
Fix ore dropping and implement subfields 2023-06-03 15:29:45 -04:00
StartForKiller
9dae3cbcc7
Added localid missing actions (needs testing) 2023-06-03 15:27:02 -04:00
KingRainbow44
d18a8c31a6
Add SystemHintType enum 2023-06-03 15:23:27 -04:00
KingRainbow44
f977679c1c
Fix handbook generation being performed when all conditions weren't met 2023-06-03 15:23:05 -04:00
github-actions
8fc17ede99 Format code [skip actions] 2023-06-03 16:43:21 +00:00
KingRainbow44
73e181df9b
Merge remote-tracking branch 'origin/development' into development 2023-06-03 12:41:51 -04:00
KingRainbow44
5441094e47
Fix NullPointerException when trying to find gadgets in a group suite 2023-06-03 12:41:20 -04:00
github-actions
7fc7b5087c Format code [skip actions] 2023-06-03 14:55:55 +00:00
Nazrin
e28575c80f
Fix battle in front of glowy stag god (#2188)
* Fix battle in front of glowy stag god

* Don't do a rollback when starting a quest. We're better than that.
2023-06-03 10:54:46 -04:00
github-actions
853a67d48e Format code [skip actions] 2023-06-03 01:43:44 +00:00
KingRainbow44
e8bfdc3c01
Send system hint when a player joins/leaves a world in multiplayer 2023-06-02 21:41:47 -04:00
KingRainbow44
8870675dcd
Remove dead entities on scene tick 2023-06-02 21:41:10 -04:00
github-actions
43fa6efec9 Format code [skip actions] 2023-06-02 18:26:45 +00:00
KingRainbow44
d9e8810a5c
Fix invalid JSON exception when querying gacha records 2023-06-02 14:15:39 -04:00
KingRainbow44
82189e03ed
Add debug command for checking triggers on a group 2023-06-01 21:28:46 -04:00
KingRainbow44
cef8b53dd6
Fix quest chests not having drop data 2023-06-01 21:28:12 -04:00
KingRainbow44
43f3494073
Check for an invalid avatar in a team 2023-06-01 20:00:17 -04:00
KingRainbow44
20f0cda3e0
Fix chasing shadows (mostly) 2023-06-01 19:59:36 -04:00
KingRainbow44
8692405363
Wait for thread executors to shut down 2023-06-01 18:17:48 -04:00
KingRainbow44
9dd514a73b
Catch exception when unable to write to KCP client 2023-06-01 18:17:15 -04:00
KingRainbow44
1940b22dc5
Fix statue unlocks, and probably other quests involving talks 2023-06-01 18:13:41 -04:00
KingRainbow44
bb1729c227
Bump version to 1.6.1 2023-06-01 14:35:01 -04:00
KingRainbow44
4870871b2c
Move rewind data logger call to debug 2023-06-01 14:27:38 -04:00
KingRainbow44
2c7c8bf4fd
Add option for enabling costumes on trial avatars 2023-06-01 14:23:12 -04:00
KingRainbow44
deaa13c2af
Add check for legacy API method calls on plugins 2023-06-01 14:19:05 -04:00
KingRainbow44
fd40575cb4
Fix issue with time when a player reconnects without a world 2023-06-01 14:18:34 -04:00
KingRainbow44
3c0e834348
Fix FieldFetch not getting fields from superclasses 2023-06-01 14:18:12 -04:00
Nazrin
27be6c31e6
Fix a typo I left in Player.java (#2180)
ENTER_REGION_ ->LEAVE_REGION_
Took the opportunity to refactor it so that we only calculate the string once.
2023-06-01 12:30:19 -04:00
DiXiao
87269e9ded
README.md (#2181)
Remove mention of unstable branch in README.md
2023-06-01 12:29:42 -04:00
KingRainbow44
46fee38217
Fix ability modifiers NullPointerException 2023-06-01 03:30:00 -04:00
KingRainbow44
6e5971df62
Fix stamina casting exception 2023-06-01 03:27:48 -04:00
KingRainbow44
98375deac9
Downgrade development version to 1.6.0 2023-06-01 02:37:01 -04:00
Nazrin
97c70f7877
Fix issues with regions (#2179)
Luckily, SceneRegion and TriggerExcelConfigData both have group numbers, so we can use those to differentiate regions!
2023-06-01 02:04:18 -04:00
Magix
9e5b57a043
Merge unstable into development (#2173)
* Remove more scene synchronized

* Fix worktop options not appearing

* Format code [skip actions]

* Fix delay with server tasks

* Format code [skip actions]

* Fully fix fairy clock (#2146)

* Fix scene transition

* fully fix fairy clock

* Re-add call to `Player#updatePlayerGameTime`

* Format code [skip actions]

* Initialize the script loader in `ResourceLoader#loadAll`

* Fix region removal checking

* Format code [skip actions]

* Use Lombok's `EqualsAndHashCode` for comparing scene regions

* Format code [skip actions]

* Move 'invalid gather object' to `trace`

* Add more information to the 'unknown condition handler' message

* Move invalid ability action to trace

* Make `KcpTunnel` public

* Validate the NPC being talked to

* Format code [skip actions]

* NPCs are not spawned server side; change logic to handle it

* Format code [skip actions]

* unload scene when there are no players (#2147)

* unload scene when there are no players

* Update src/main/java/emu/grasscutter/game/world/Scene.java

Co-authored-by: Magix <27646710+KingRainbow44@users.noreply.github.com>

---------

Co-authored-by: Magix <27646710+KingRainbow44@users.noreply.github.com>

* Check if a command should be copied or HTTP should be used

* Lint Code [skip actions]

* Fix character names rendering incorrectly

* Add basic troubleshooting command

* Implement handbook teleporting

also a few formatting changes and sort data by logical sense

* Fix listener `ConcurrentModificationException` issue

* Add color change to `Join the Community!`

* Lint Code [skip actions]

* Make clickable buttons appear clickable

* Remove 'Mechanicus' entities from the list of entities

* Format code [skip actions]

* Fix going back returning a blank screen

* Implement entity spawning

* Add setting level to entity card

* Add support for 'plain text' mode

* Make descriptions of objects scrollable

* Lint Code [skip actions]

* Format code [skip actions]

* Change the way existing hooks work

* Format code [skip actions]

* Upgrade Javalin to 5.5.0 & Fix project warnings

* Upgrade logging libraries

* Fix gacha mappings static file issue

* Add temporary backwards compatability for `ServerHelper`

* Format code [skip actions]

* Remove artifact signatures from VCS

* Fix forge queue data protocol definition

* Run `spotlessApply`

* Format code [skip actions]

* Download data required for building artifacts

* Add call for Facebook logins

* Add the wiki page as a submodule

* Format code [skip actions]

* Update translation (#2150)

* Update translation

* Update translation

* Separate the dispatch and game servers (pt. 1)

gacha is still broken, handbook still needs to be done

* Format code [skip actions]

* Separate the dispatch and game servers (pt. 2)

this commit fixes the gacha page

* Add description for '/troubleshoot'

* Set default avatar talent level to 10

* Separate the dispatch and game servers (pt. 3)

implement handbook across servers!

* Format code [skip actions]

* Update GitHub Actions to use 'download-file' over 'wget'

* Gm handbook lmao (#2149)

* Fix font issue

* Fix avatars

* Fix text overflow in commands

* Fix virtualized lists and items page 😭😭

* magix why 💀

* use hover style in all minicards

* button

* remove console.log

* lint

* Add icons

* magix asked

* Fix overflow padding issue

* Fix achievement text overflow

* remove icons from repo

* Change command icon

* Add the wiki page as a submodule

* total magix moment

* fix text overflow in commands

* Fix discord button

* Make text scale on Minicard

* import icons and font from another source

* Add hover effects to siebar buttons

* move font and readme to submodule repo

* Make data folder a submodule

* import icons and font from data submodule

* Update README.md

* total magix moment

* magix moment v2

* submodule change

* Import `.webp` files

* Resize `HomeButton`

* Fix 'Copy Command' reappearing after changing pages

---------

Co-authored-by: KingRainbow44 <kobedo11@gmail.com>

* Lint Code [skip actions]

* Download data for the build, not for the lint

* format imports

this is really just to see if build handbook works kek

* Implement proper handbook authentication (pt. 1)

* Implement proper handbook authentication (pt. 2)

* Format code [skip actions]

* Add quest data dumping for the handbook

* Change colors to fit _something suitable_

* Format code [skip actions]

* Fix force pushing to branches after linting

* Fix logic of `SetPlayerPropReq`

* Move more group loading to `trace`

* Add handbook IP authentication in hybrid mode

* Fix player level up not displaying on the client properly

* Format code [skip actions]

* Fix game time locking

* Format code [skip actions]

* Update player properties

* Format code [skip actions]

* Move `warn`s for groups to `debug`

* Fix player pausing

* Move more logs to `trace`

* Use `removeItemById` for deleting items via quests

* Clean up logger more

* Pause in-game time when the world is paused

* Format code [skip actions]

* More player property documentation

* Multi-threaded resource loading

* Format code [skip actions]

* Add quest widgets

* Add quests page (basic impl.)

* Add/fix colors

also fix tailwind

* Remove banned packets

client modifications already perform the job of blocking malicious packets from being executed, no point in having this if self-windy is wanted

* Re-add `BeginCameraSceneLookNotify`

* Fix being unable to attack (#2157)

* Add `PlayerOpenChestEvent`

* Add methods to get players from the server

* Add static methods to register an event handler

* Add `PlayerEnterDungeonEvent`

* Remove legacy documentation from `PlayerMoveEvent`

* Add `PlayerChatEvent`

* Add defaults to `Position`

* Clean up `.utils`

* Revert `Multi-threaded resource loading`

* Fix changing target UID when talking to the server

* Lint Code [skip actions]

* Format code [skip actions]

* fix NPC talk triggering main quest in 46101 (#2158)

Make it so that only talks where the param matches the talkId are checked.

* Format code [skip actions]

* Partially fix Chasing Shadows (#2159)

* Partially fix Chasing Shadows

* Go ahead and move it before the return before Magix tells me to.

* Format code [skip actions]

* Bring back period lol (#2160)

* Disable SNI for the HTTPS server

* Add `EntityCreationEvent`

* Add initial startup message

this is so the server appears like its preparing to start

* Format code [skip actions]

* Enable debug mode for plugin loggers if enabled for the primary logger

* Add documentation about `WorldAreaConfigData`

* Make more fields in excels accessible

* Remove deprecated fields from `GetShopRsp`

* Run `spotlessApply` on definitions

* Add `PlayerEnterAreaEvent`

* Optimize event calls

* Fix event invokes

* Format code [skip actions]

* Remove manual autofinish for main quests. (#2162)

* Add world areas to the textmap cache

* Format code [skip actions]

* Don't overdefine variables in extended classes (#2163)

* Add dumper for world areas

* Format code [skip actions]

* instantiate personalLineList (#2165)

* Fix protocol definitions

thank you Nazrin! (+ hiro for raw definitions)

* Fix the background color leaking from the character widget

* Change HTML spacing to 2 spaces

* Implement hiding widgets

* Change scrollbar to a vibrant color

* Add _some_ scaling to the home buttons and its text

* Build the handbook with Gradle

* Fix the 'finer details' with the handbook UI

* Lint Code [skip actions]

* Fix target destination for the Gradle-built handbook

* Implement fetching a player across servers & Add a chainable JsonObject

useful for plugins! might be used in grasscutter eventually

* Fix GitHub actions

* Fix event calling & canceling

* Run `spotlessApply`

* Rename fields (might be wrong)

* Add/update all/more protocol definitions

* Add/update all/more protocol definitions

* Remove outdated packet

* Fix protocol definitions

* Format code [skip actions]

* Implement some lua variables for less console spam (#2172)

* Implement some lua variables for less console spam

* Add GetHostQuestState

This fixes some chapter 3 stuff.

* Format code [skip actions]

* Fix merge import

* Format code [skip actions]

* Fully fix fairy clock for real this time (#2167)

* Fully fix fairy clock For real this time

* Make it so relogging keeps the time lock state.

* Refactor out questLockTime

* Per Hartie, the client packet needs to be changed too

* Update src/main/java/emu/grasscutter/game/world/World.java

Co-authored-by: Magix <27646710+KingRainbow44@users.noreply.github.com>

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

* Remove all code not needed to get clock working

---------

Co-authored-by: Magix <27646710+KingRainbow44@users.noreply.github.com>

* Implement a proper ability system (#2166)

* Apply fix `21dec2fe`

* Apply fix `89d01d5f`

* Apply fix `d900f154`

this one was already implemented; updated to use call from previous commit

* Ability changing commit

TODO: change info to debug

* Remove use of deprecated methods/fields

* Temp commit v2
(Adding LoseHP and some fixes)

* Oopsie

* Probably fix monster battle

* Fix issue with reflecting into fields

* Fix some things

* Fix ability names for 3.6 resources

* Improve logging

---------

Co-authored-by: StartForKiller <jesussanz2003@gmail.com>

* Format code [skip actions]

* Add system for sending messages between servers

* Format some code

* Remove protocol definitions from Spotless

* Default debug to false; enable with `-debug`

* Implement completely useless global value copying

* HACK: Return the avatar which holds the weapon when the weapon is referred to by ID

* Add properties to `AbilityModifier`

* Change the way HTML is served after authentication

* Use thread executors to speed up the database loading process

* Format code [skip actions]

* Add system for setting handbook address and port

* Lint Code [skip actions]

* Format code [skip actions]

* Fix game-related data not saving

* Format code [skip actions]

* Fix handbook server details

* Lint Code [skip actions]

* Format code [skip actions]

* Use the headers provided by a context to get the IP address

should acknowledge #1975

* Format code [skip actions]

* Move more logs to `trace`

* Format code [skip actions]

* more trace

* Fix something and implement weapon entities

* Format code [skip actions]

* Fix `EntityWeapon`

* Remove deprecated API & Fix resource checking

* Fix unnecessary warning for first-time setup

* Implement handbook request limiting

* Format code [skip actions]

* Fix new avatar weapons being null

* Format code [skip actions]

* Fix issue with 35303 being un-completable & Try to fix fulfilled quest conditions being met

* Load activity config on server startup

* Require plugins to specify an API version and match with the server

* Add default open state ignore list

* Format code [skip actions]

* Quick fix for questing, needs more investigation
This would make the questing work again

* Remove existing hack for 35303

* Fix ignored open states from being set

* Format code [skip actions]

* fix the stupidest bug ive ever seen

* Optimize player kicking on server close

* Format code [skip actions]

* Re-add hack to fix 35303

* Update GitHub actions

* Format code [skip actions]

* Potentially fix issues with regions

* Download additional handbook data

* Revert "Potentially fix issues with regions"

This reverts commit 84e3823695.

---------

Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: scooterboo <lewasite@yahoo.com>
Co-authored-by: Tesutarin <105267106+Tesutarin@users.noreply.github.com>
Co-authored-by: Scald <104459145+Arikatsu@users.noreply.github.com>
Co-authored-by: StartForKiller <jesussanz2003@gmail.com>
2023-05-31 23:48:16 -04:00
Magix
f46fd372d2
Remove re-open condition from 'protect_files' 2023-05-30 03:18:51 -04:00
Moistcrafter
7f4fb20773
Fix boss names in boss bar (#2169)
* Boss bar fix

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

Co-authored-by: Magix <27646710+KingRainbow44@users.noreply.github.com>

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

Co-authored-by: Magix <27646710+KingRainbow44@users.noreply.github.com>

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

---------

Co-authored-by: Magix <27646710+KingRainbow44@users.noreply.github.com>
2023-05-27 16:23:52 -04:00
Magix
71f6198361
Upgrade to REL3.7 (#2164)
* Remove hardcoded quest data

* Remove deprecated fields

* Try to fix packet

* Apply fix for token exchange

* Upgrade to REL3.7

* Add obfuscated protocol definitions

* Add missing enum (other protos too maybe)

* Re-add field setters and add note on removal
2023-05-27 00:29:02 -04:00
KingRainbow44
19bf2dfc69
Fix cooking packet definitions
thanks nick!
2023-05-17 23:19:56 -04:00