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 <[email protected]>

---------

Co-authored-by: Magix <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>

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

* Remove all code not needed to get clock working

---------

Co-authored-by: Magix <[email protected]>

* 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 <[email protected]>

* 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 84e3823.

---------

Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: scooterboo <[email protected]>
Co-authored-by: Tesutarin <[email protected]>
Co-authored-by: Scald <[email protected]>
Co-authored-by: StartForKiller <[email protected]>

Author: 6 people

.editorconfig

@@ -10,5 +10,5 @@ max_line_length = 120
 tab_width = 4
 trim_trailing_whitespace = true
 
-[{*.json,*.xml}]
+[{*.json,*.xml,*.yml,*.html}]
 indent_size = 2

.gitattributes

@@ -1,6 +1 @@
-*.java text=auto
-*.json text=auto
-*.md text=auto
-*.properties text=auto
-*.py text=auto
-*.sh text=auto
+* text=auto

.github/workflows/build.yml

@@ -7,6 +7,7 @@ on:
     branches:
       - "stable"
       - "development"
+      - "unstable"
   pull_request:
     paths:
       - "**.java"
@@ -35,8 +36,13 @@ jobs:
           key: ${{ runner.os }}-gradle-${{ hashFiles('*.gradle', 'gradle.properties', '**/*.accesswidener') }}
           restore-keys: |
             ${{ runner.os }}-gradle-
+      - name: Download Handbook
+        uses: suisei-cn/[email protected]
+        with:
+          url: https://api.grasscutter.io/static/handbook.html
+          target: src/main/resources/html/
       - name: Run Gradle
-        run: ./gradlew && ./gradlew jar
+        run: ./gradlew -PskipHandbook=1 && ./gradlew jar -PskipHandbook=1
       - name: Upload build
         uses: actions/upload-artifact@v3
         with:

.github/workflows/check_code.yml

@@ -0,0 +1,78 @@
+name: "Lint & Format Code"
+
+on:
+  workflow_dispatch: ~
+  push:
+    paths:
+      - "src/main/**.java"
+      - "**.json"
+    branches:
+      - "development"
+      - "unstable"
+
+jobs:
+  Format-Code:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+      - name: Extract branch name
+        shell: bash
+        run: echo "branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" >> $GITHUB_OUTPUT
+        id: extract_branch
+      - name: Setup Java
+        uses: actions/setup-java@v3
+        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: Format Code
+        run: ./gradlew -PskipHandbook=1 && ./gradlew spotlessApply -PskipHandbook=1
+
+      - run: git config --global user.name "github-actions"
+      - run: git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"
+      - run: git stash
+      - run: git checkout ${{ steps.extract_branch.outputs.branch }} && git pull
+      - run: git stash pop || true
+
+      - name: Commit Code Changes
+        run: git add -u && git commit -m 'Format code [skip actions]' || true
+      - name: Push Code Changes
+        run: git push --set-upstream --force origin ${{ steps.extract_branch.outputs.branch }}
+
+  Update-Languages:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+      - name: Extract branch name
+        shell: bash
+        run: echo "branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" >> $GITHUB_OUTPUT
+        id: extract_branch
+
+      - name: Update Languages
+        run: python scripts/manage_languages.py -u
+
+      - run: git config --global user.name "github-actions"
+      - run: git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"
+      - run: git stash
+      - run: git checkout ${{ steps.extract_branch.outputs.branch }} && git pull
+      - run: git stash pop || true
+
+      - name: Commit any language changes
+        run: git add -u && git commit -m 'Update languages [skip actions]' || true
+      - name: Push language changes
+        run: git push --set-upstream --force origin ${{ steps.extract_branch.outputs.branch }}

.github/workflows/handbook.yml

@@ -0,0 +1,126 @@
+name: "Handbook"
+
+on:
+  workflow_dispatch: ~
+  push:
+    paths:
+      - "src/handbook/**.tsx"
+    branches:
+      - "development"
+      - "unstable"
+  pull_request:
+    paths:
+      - "src/handbook/**.tsx"
+    types:
+      - opened
+      - synchronize
+      - reopened
+
+jobs:
+  Lint-Code:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Extract branch name
+        shell: bash
+        run: echo "branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" >> $GITHUB_OUTPUT
+        id: extract_branch
+      - name: Setup Node
+        uses: actions/setup-node@v2
+        with:
+          node-version: '17'
+      - name: Cache node modules
+        uses: actions/cache@v2
+        with:
+          path: |
+            ~/.npm
+            ~/.cache
+          key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
+          restore-keys: |
+            ${{ runner.os }}-node-
+      - name: Install dependencies
+        working-directory: src/handbook
+        run: npm install --force
+      - name: Run linter
+        working-directory: src/handbook
+        run: npm run lint
+
+      - run: git config --global user.name "github-actions"
+      - run: git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"
+      - run: git stash
+      - run: git checkout ${{ steps.extract_branch.outputs.branch }} && git pull
+      - run: git stash pop || true
+      - name: Commit changes
+        if: ${{ github.event_name == 'push' }}
+        run: git add -u && git commit -m "Lint Code [skip actions]" || true
+      - name: Push changes
+        if: ${{ github.event_name == 'push' }}
+        run: git push --set-upstream --force origin ${{ steps.extract_branch.outputs.branch }}
+
+  Build-Handbook:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Setup Node
+        uses: actions/setup-node@v2
+        with:
+          node-version: '17'
+      - name: Cache node modules
+        uses: actions/cache@v2
+        with:
+          path: |
+            ~/.npm
+            ~/.cache
+          key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
+          restore-keys: |
+            ${{ runner.os }}-node-
+      - name: Install dependencies
+        working-directory: src/handbook
+        run: npm install --force
+
+      - name: Download Avatar Data
+        uses: suisei-cn/[email protected]
+        with:
+          url: https://api.grasscutter.io/static/avatars.csv
+          target: src/handbook/data/
+      - name: Download Command Data
+        uses: suisei-cn/[email protected]
+        with:
+          url: https://api.grasscutter.io/static/commands.json
+          target: src/handbook/data/
+      - name: Download Entity Data
+        uses: suisei-cn/[email protected]
+        with:
+          url: https://api.grasscutter.io/static/entities.csv
+          target: src/handbook/data/
+      - name: Download Item Data
+        uses: suisei-cn/[email protected]
+        with:
+          url: https://api.grasscutter.io/static/items.csv
+          target: src/handbook/data/
+      - name: Download Scene Data
+        uses: suisei-cn/[email protected]
+        with:
+          url: https://api.grasscutter.io/static/scenes.csv
+          target: src/handbook/data/
+      - name: Download Quest Data
+        uses: suisei-cn/[email protected]
+        with:
+          url: https://api.grasscutter.io/static/quests.csv
+          target: src/handbook/data/
+      - name: Download Main Quest Data
+        uses: suisei-cn/[email protected]
+        with:
+          url: https://api.grasscutter.io/static/mainquests.csv
+          target: src/handbook/data/
+
+      - name: Build handbook
+        working-directory: src/handbook
+        run: npm run build
+      - name: Upload build
+        uses: actions/upload-artifact@v3
+        with:
+          name: Handbook
+          path: src/handbook/dist/*.html

.github/workflows/language_lint.yml

@@ -6,16 +6,17 @@ on:
       - ".github/workflows/**"
       - "src/main/**.java"
       - "**.json"
-      - "manage_languages.py"
+      - "scripts/manage_languages.py"
     branches:
       - "stable"
       - "development"
+      - "unstable"
   pull_request:
     paths:
       - ".github/workflows/**"
       - "src/main/**.java"
       - "**.json"
-      - "manage_languages.py"
+      - "scripts/manage_languages.py"
     types:
       - opened
       - synchronize
@@ -28,4 +29,4 @@ jobs:
       - uses: actions/setup-python@v4
         with:
           python-version: '3.10' # Version range or exact version of a Python version to use, using SemVer's version range syntax
-      - run: python3 manage_languages.py -l
+      - run: python3 scripts/manage_languages.py -l

.github/workflows/lint_commit.yml

@@ -66,18 +66,29 @@ tmp/
 /*.sh
 
 GM Handbook*.txt
+handbook.html
+
 config.json
 mitmdump.exe
 mongod.exe
 
 gacha-mapping.js
 mappings.js
 BuildConfig.java
+data/hk4e/announcement/
 
 # lombok
 /.apt_generated/
 
 # macOS
 .DS_Store
 .directory
-data/hk4e/announcement/
+
+# Hotswap Agent
+hotswap-agent.properties
+
+# Debug patches
+patches/*.patch
+
+# Artifact Signatures
+*.asc

.gitignore

@@ -0,0 +1,6 @@
+[submodule "docs/wiki"]
+	path = docs/wiki
+	url = https://github.com/Grasscutters/Grasscutter.wiki.git
+[submodule "src/handbook/data/assets"]
+	path = src/handbook/data/assets
+	url = https://github.com/genshitters/gm-handbook-assets.git

.gitmodules

@@ -80,7 +80,7 @@ Grasscutter uses Gradle to handle dependencies & building.
 ##### Windows
 
 ```shell
-git clone https://github.com/Grasscutters/Grasscutter.git
+git clone --recurse-submodules -b unstable https://github.com/Grasscutters/Grasscutter.git
 cd Grasscutter
 .\gradlew.bat # Setting up environments
 .\gradlew jar # Compile
@@ -89,7 +89,7 @@ cd Grasscutter
 ##### Linux (GNU)
 
 ```bash
-git clone https://github.com/Grasscutters/Grasscutter.git
+git clone --recurse-submodules -b unstable https://github.com/Grasscutters/Grasscutter.git
 cd Grasscutter
 chmod +x gradlew
 ./gradlew jar # Compile