Merge pull request #1704 from Grasscutters/development

Merge `development` into `stable`

.github/workflows/protect_files.yml

@@ -1,23 +0,0 @@
-name: Protect write-access files from being PR'd
-
-on:
-  pull_request_target:
-    types:
-      - opened
-      - reopened
-    branches:
-      - development
-    paths:
-      - '.github/'
-      - '.editorconfig'
-      - 'CODE_OF_CONDUCT.md'
-      - 'CONTRIBUTING.md'
-      - 'LICENSE'
-
-jobs:
-  run:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: superbrothers/close-pull-request@v3
-        with:
-          comment: "This PR has been closed for modifying protected files. See `CONTRIBUTING.md` for more information."

CONTRIBUTING.md

@@ -21,11 +21,3 @@ Your code should follow the standards set below:
     - Dependencies that use a separate language (ex. Kotlin) that can run on a JVM are acceptable.
     - Dependencies that require the use of native code (ex. JNI) are prohibited.
     - Directly adding foreign code (other languages, ex. Kotlin) into the main codebase is prohibited.
-- Certain files and folders are forbidden to modify in Pull Requests and may only be changed by Write-Access members. The current list for this can be found in `.github/workflows/protect_files.yml`.
-
-## Intellectual Property
-
-Please avoid adding any direct references to the following, whenever possible:
-- Game names
-- Character names
-- Notable weapon names

README.md

@@ -3,7 +3,7 @@
 
 <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.md) | [简中](docs/README_zh-CN.md) | [繁中](docs/README_zh-TW.md) | [FR](docs/README_fr-FR.md) | [ES](docs/README_es-ES.md) | [HE](docs/README_HE.md) | [RU](docs/README_ru-RU.md) | [PL](docs/README_pl-PL.md) | [ID](docs/README_id-ID.md) | [KR](docs/README_ko-KR.md) | [FIL/PH](docs/README_fil-PH.md) | [NL](docs/README_NL.md) | [JP](docs/README_ja-JP.md) | [IT](docs/README_it-IT.md) | [VI](docs/README_vi-VN.md)
+[EN](README.md) | [简中](README_zh-CN.md) | [繁中](README_zh-TW.md) | [FR](README_fr-FR.md) | [ES](README_es-ES.md) | [HE](README_HE.md) | [RU](README_ru-RU.md) | [PL](README_pl-PL.md) | [ID](README_id-ID.md) | [KR](README_ko-KR.md) | [FIL/PH](README_fil-PH.md) | [NL](README_NL.md) | [JP](README_ja-JP.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).
 
@@ -24,7 +24,7 @@
 
 ### Requirements
 
-* [Java SE - 17](https://www.oracle.com/java/technologies/javase/jdk17-archive-downloads.html) or higher
+* [Java SE - 17](https://www.oracle.com/java/technologies/javase/jdk17-archive-downloads.html)
 
   **Note:** If you just want to **run it**, then **jre** only is fine.
 
@@ -37,36 +37,36 @@
 **Note:** If you updated from an older version, delete `config.json` to regenerate it.
 
 1. Get `grasscutter.jar`
-   - Download from [releases](https://github.com/Grasscutters/Grasscutter/releases/latest) or [actions](https://github.com/Grasscutters/Grasscutter/actions/workflows/build.yml) or [build the server by yourself](#building).
+   - Download from [actions](https://github.com/Grasscutters/Grasscutter/actions/workflows/build.yml) or [build the server by yourself](#building).
 2. Create a `resources` folder in the directory where grasscutter.jar is located and move your `BinOutput, ExcelBinOutput, Readables, Scripts, Subtitle, TextMap` 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 in the server console using this [command](https://github.com/Grasscutters/Grasscutter/wiki/Commands#:~:text=account%20%3Ccreate|delete%3E%20%3Cusername%3E%20[UID]).
+½. Create an account using [server console command](https://github.com/Grasscutters/Grasscutter/wiki/Commands#targeting).
 
-1. Redirect traffic: (choose one only)
+1. Redirect traffic: (choose one)
     - mitmdump: `mitmdump -s proxy.py -k`
 
-        - Trust CA certificate:
+      Trust CA certificate:
 
-          - The CA certificate is usually stored in `%USERPROFILE%\.mitmproxy`, double click `mitmproxy-ca-cert.cer` to [install](https://docs.microsoft.com/en-us/skype-sdk/sdn/articles/installing-the-trusted-root-certificate#installing-a-trusted-root-certificate) or...
+      ​	**Note:** The CA certificate is usually stored in `%USERPROFILE%\.mitmproxy`, or you can download it from `http://mitm.it`
 
-          - Via command line *(needs administration privileges)*
+      ​	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 ...
 
-             ```shell
+      - Via command line (needs administration privileges)
-             certutil -addstore root %USERPROFILE%\.mitmproxy\mitmproxy-ca-cert.cer
-             ```
 
-    - Fiddler Classic: Run Fiddler Classic, turn on `Decrypt HTTPS traffic` in (Tools -> Options -> HTTPS) and change the default port in (Tools -> Options -> Connections) to anything other than `8888`, load [this script](https://github.com/Grasscutters/Grasscutter/wiki/Resources#fiddler-classic-jscript) (copy and paste the script in the `FiddlerScript` tab) and click the `Save Script` button.
+        ```shell
+        certutil -addstore root %USERPROFILE%\.mitmproxy\mitmproxy-ca-cert.cer
+        ```
+
+    - Fiddler Classic: Run Fiddler Classic, turn on `Decrypt HTTPS traffic` in (Tools -> Options -> HTTPS) and change the default port in (Tools -> Options -> Connections) to anything other than `8888`, and load [this script](https://github.com/Grasscutters/Grasscutter/wiki/Resources#fiddler-classic-jscript) (copy and paste the script in the `FiddlerScript` tab).
 
     - [Hosts file](https://github.com/Grasscutters/Grasscutter/wiki/Resources#hosts-file)
 
 2. Set network proxy to `127.0.0.1:8080` or the proxy port you specified.
 
-- For mitmproxy: After setting up the network proxy and installing the certificate, check http://mitm.it/ if traffic is passing through mitmproxy.
+**You can also use `start.cmd` to start servers and proxy daemons automatically, but you have to set up JAVA_HOME enviroment and configure the `start_config.cmd` file.**
-
-**You can also use `start.cmd` to start servers and proxy daemons automatically, but you have to set up `JAVA_HOME` environment and configure the `start_config.cmd` file.**
 
 ### Building
 
@@ -74,7 +74,7 @@ Grasscutter uses Gradle to handle dependencies & building.
 
 **Requirements:**
 
-- [Java SE Development Kits - 17](https://www.oracle.com/java/technologies/javase/jdk17-archive-downloads.html) or higher
+- [Java SE Development Kits - 17](https://www.oracle.com/java/technologies/javase/jdk17-archive-downloads.html)
 - [Git](https://git-scm.com/downloads)
 
 ##### Windows
@@ -101,6 +101,7 @@ You can find the output jar in the root of the project folder.
 
 # Quick Troubleshooting
 
-* If compiling wasn't successful, please check your JDK installation (Make sure its JDK 17 or higher and validated JDK's bin PATH variable).
+* 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 you're using Fiddler, change the default port to anything other than 8888.
+* My client doesn't connect, doesn't login, 4206, etc... - Mostly your proxy daemon setup is *the issue*, if using
-* Startup sequence: MongoDB > Grasscutter > Proxy Daemon (mitmdump, fiddler, etc.) > Game
+  Fiddler make sure it running on another port except 8888
+* Startup sequence: MongoDB > Grasscutter > Proxy daemon (mitmdump, fiddler, etc.) > Game

README_HE.md

@@ -3,7 +3,7 @@
 
 <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.md) | [简中](README_zh-CN.md) | [繁中](README_zh-TW.md) | [FR](README_fr-FR.md) | [ES](README_es-ES.md) | [HE](README_HE.md) | [RU](README_ru-RU.md) | [PL](README_pl-PL.md) | [ID](README_id-ID.md) | [KR](README_ko-KR.md) | [FIL/PH](README_fil-PH.md) | [NL](README_NL.md) | [JP](README_ja-JP.md) | [IT](README_it-IT.md) | [VI](README_vi-VN.md)
+[EN](README.md) | [简中](README_zh-CN.md) | [繁中](README_zh-TW.md) | [FR](README_fr-FR.md) | [ES](README_es-ES.md) | [HE](README_HE.md) | [RU](README_ru-RU.md) | [PL](README_pl-PL.md) | [ID](README_id-ID.md) | [KR](README_ko-KR.md) | [FIL/PH](README_fil-PH.md) | [NL](README_NL.md) | [JP](README_ja-JP.md)
 
 **תשומת לב בבקשה:** אנחנו מקבלים עזרה בפיתוח התוכנה. לפני שאתם תורמים לפרויקט בבקשה תקראו את [תנאי השימוש](https://github.com/Grasscutters/Grasscutter/blob/stable/CONTRIBUTING.md).
 
@@ -66,7 +66,7 @@ certutil -addstore root %USERPROFILE%\.mitmproxy\mitmproxy-ca-cert.cer
 
 
 
-   -עריכת [קובץ הHosts](https://github.com/Grasscutters/Grasscutter/wiki/Running#traffic-route-map)
+   -עריכת [קובץ הHosts](https://github.com/Melledy/Grasscutter/wiki/Running#traffic-route-map)
 
 2. תשנו את שרת בproxy שלכם ל`127.0.0.1:8080`
 

README_NL.md

@@ -3,7 +3,7 @@
 
 <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.md) | [简中](README_zh-CN.md) | [繁中](README_zh-TW.md) | [FR](README_fr-FR.md) | [ES](README_es-ES.md) | [HE](README_HE.md) | [RU](README_ru-RU.md) | [PL](README_pl-PL.md) | [ID](README_id-ID.md) | [KR](README_ko-KR.md) | [FIL/PH](README_fil-PH.md) | [NL](README_NL.md) | [JP](README_ja-JP.md) | [IT](README_it-IT.md) | [VI](README_vi-VN.md)
+[EN](README.md) | [简中](README_zh-CN.md) | [繁中](README_zh-TW.md) | [FR](README_fr-FR.md) | [ES](README_es-ES.md) | [HE](README_HE.md) | [RU](README_ru-RU.md) | [PL](README_pl-PL.md) | [ID](README_id-ID.md) | [KR](README_ko-KR.md) | [FIL/PH](README_fil-PH.md) | [NL](README_NL.md) | [JP](README_ja-JP.md)
 
 **Aantekening:** We verwelkomen altijd bijdragers aan het project. Lees onze [Gedragscode](https://github.com/Grasscutters/Grasscutter/blob/development/README_NL.md#bijdragen-aan-het-project) zorgvuldig door voordat u uw bijdrage toevoegt.
 
@@ -124,3 +124,4 @@ Let op: we hebben een gedragscode, volg deze alsjeblieft in al je interacties me
 1. Zorg ervoor dat alle installatie- of build-afhankelijkheden verwijderd zijn voor het einde van de laag wanneer u een build doet.
 2. 2. Werk de README.md en wiki bij met details van wijzigingen aan de interface, inclusief nieuwe omgevingsvariabelen, blootgestelde poorten, nuttige bestandslocaties en containerparameters.
 3. Schrijf met detail op je pull request beschrijving wat je hebt gecommit, om het makkelijker te maken voor de medewerkers om een changelog te maken.
+

README_es-ES.md

@@ -3,7 +3,7 @@
 
 <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.md) | [简中](README_zh-CN.md) | [繁中](README_zh-TW.md) | [FR](README_fr-FR.md) | [ES](README_es-ES.md) | [HE](README_HE.md) | [RU](README_ru-RU.md) | [PL](README_pl-PL.md) | [ID](README_id-ID.md) | [KR](README_ko-KR.md) | [FIL/PH](README_fil-PH.md) | [NL](README_NL.md) | [JP](README_ja-JP.md) | [IT](README_it-IT.md) | [VI](README_vi-VN.md)
+[EN](README.md) | [简中](README_zh-CN.md) | [繁中](README_zh-TW.md) | [FR](README_fr-FR.md) | [ES](README_es-ES.md) | [HE](README_HE.md) | [RU](README_ru-RU.md) | [PL](README_pl-PL.md) | [ID](README_id-ID.md) | [KR](README_ko-KR.md) | [FIL/PH](README_fil-PH.md) | [NL](README_NL.md) | [JP](README_ja-JP.md)
 
 **Atención:** Siempre damos la bienvenida a contribuidores del proyecto. Antes de añadir tu contribución, por favor lee cuidadosamente nuestro [Código de conducta](https://github.com/Grasscutters/Grasscutter/blob/stable/CONTRIBUTING.md).
 
@@ -63,11 +63,11 @@
 
     - Fiddler Classic: Ejecuta Fiddler Classic, activa `Decrypt https traffic` en las opciones y cambia el puerto por defecto ahí (Herramientas -> Opciones -> Conexiones) a alguno que no sea `8888`, y carga [este script](https://github.lunatic.moe/fiddlerscript).
 
-    - [Archivo Hosts](https://github.com/Grasscutters/Grasscutter/wiki/Running#traffic-route-map)
+    - [Archivo Hosts](https://github.com/Melledy/Grasscutter/wiki/Running#traffic-route-map)
 
 2. Establece el proxy de red a `127.0.0.1:8080` o el puerto de proxy que pusiste.
 
-**También puedes usar `start.cmd` para iniciar el servidor y el servicio de proxy automáticamente, pero tienes que configurar el entorno JAVA_HOME**
+**también puedes usar `start.cmd` para iniciar el servidor y el servicio de proxy automáticamente, pero tienes que configurar el entorno JAVA_HOME**
 
 ### Construcción
 
@@ -106,3 +106,4 @@ Podrás encontrar el jar generado en la carpeta raíz del proyecto.
 * Mi cliente no conecta, no inicia sesión, 4206, etc... - Probablemente, tu configuración del proxy es *el problema*, si usas
   Fiddler asegúrate de que está usando un puerto distinto al 8888
 * Secuencia de inicio: MongoDB > Grasscutter > Servicio de proxy (mitmdump, fiddler, etc.) > Juego
+

README_fil-PH.md

@@ -0,0 +1,114 @@
+![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="Documentation" 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.md) | [简中](README_zh-CN.md) | [繁中](README_zh-TW.md) | [FR](README_fr-FR.md) | [ES](README_es-ES.md) | [HE](README_HE.md) | [RU](README_ru-RU.md) | [PL](README_pl-PL.md) | [ID](README_id-ID.md) | [KR](README_ko-KR.md) | [FIL/PH](README_fil-PH.md) | [NL](README_NL.md) | [JP](README_ja-JP.md)
+
+**Atensyon:** Ang mga kontributor ay laging welcome sa proyektong ito. Bago mag-bigay ng kontribusyon, basahin muna ng mabuti ang [Code of Conduct](https://github.com/Grasscutters/Grasscutter/blob/stable/CONTRIBUTING.md). 
+
+<b>(Basahin ha, hindi titingin lang)</b>
+
+## Ang mga current features
+
+* Login system
+* Combat
+* Friends list
+* Teleportation
+* Gacha system
+* Co-op *partially* works
+* Spawning monsters via console
+* Inventory features (receiving items/characters, upgrading items/characters, etc)
+
+## Quick setup guide
+
+**Atensyon:** Kung di mo talaga kaya o hindi mo maintindihan ang wiki, maaari kang sumali sa aming server [Discord](https://discord.gg/T5vZU6UyeG).
+
+### Ang mga kailangan
+
+* Java SE - 17 ([link](https://www.oracle.com/java/technologies/javase/jdk17-archive-downloads.html))
+
+  **Atensyon:** Kung gusto mo lang **paganahin** ang server, then **jre** is pwede naman.
+
+* [MongoDB](https://www.mongodb.com/try/download/community) (recommended 4.0+)
+
+* Proxy daemon: mitmproxy (mitmdump, recommended), Fiddler Classic, etc.
+
+### Running
+
+**Atensyon:** Kung nag-update ka galing sa old version, paki-delete ang `config.json` para mag-regenerate ulit.
+
+1. Get `grasscutter.jar`
+   - Download ka from [actions](https://github.com/Grasscutters/Grasscutter/suites/6895963598/artifacts/267483297)
+   - [Build mo ung jar by yourself](#Building)
+2. Gawa ka ng `resources` folder sa directory kung nasaan ang grasscutter.jar at ilagay ang `BinOutput` at `ExcelBinOutput` sa loob ng resources folder *(Check mo ang [wiki](https://github.com/Grasscutters/Grasscutter/wiki) para malaman mo san mo makukuha yan)*
+3. Paandarin ang Grasscutter gamit ang command na `java -jar grasscutter.jar`. **Make sure na gumagana ang mongodb (Google mo nalang kung pano mo malalaman)** 
+
+### Connecting with the client
+
+½. Create ka ng account gamit ang [server console command](https://github.com/Grasscutters/Grasscutter/wiki/Commands#targeting).
+
+1. Redirect traffic: (choose one)
+    - mitmdump: `mitmdump -s proxy.py -k`
+
+      Trust CA certificate:
+
+      ​	**Note:** Usually ang CA certificate ay nakalagay sa `%USERPROFILE%\ .mitmproxy`, o pwede mo naman i-download from `http://mitm.it`
+
+      ​	Double click para ma-[install](https://docs.microsoft.com/en-us/skype-sdk/sdn/articles/installing-the-trusted-root-certificate#installing-a-trusted-root-certificate) or ...
+
+      - Gamit ang command line (cmd.exe)
+
+        ```shell
+        certutil -addstore root %USERPROFILE%\.mitmproxy\mitmproxy-ca-cert.cer
+        ```
+
+    - Fiddler Classic: Paadarin ang Fiddler Classic, tsaka turn on mo yung `Decrypt https traffic` sa settings at baguhin mo yung default port na nakalagay (Tools -> Options -> Connections) to anything other than `8888`, at saka mo i-load [itong script](https://github.lunatic.moe/fiddlerscript).
+
+    - [Hosts file](https://github.com/Melledy/Grasscutter/wiki/Running#traffic-route-map)
+
+2. Set mo ung proxy sa `127.0.0.1:8080` or dun sa proxy port na iyong inilagay.
+
+**pwede mo rin gamitin ang `start.cmd` to start the servers and proxy daemons automatically, pero kailagan mong i-setup ang JAVA_HOME enviroment**
+
+### Building
+
+Ang Grasscutter ay gumagamit ng gradle for depedencies at building.
+
+**Mga kailangan:**
+
+- [Java SE Development Kits - 17](https://www.oracle.com/java/technologies/javase/jdk17-archive-downloads.html)
+- [Git](https://git-scm.com/downloads)
+
+##### Windows
+
+```shell
+git clone https://github.com/Grasscutters/Grasscutter.git
+cd Grasscutter
+.\gradlew.bat # Setting up environments
+.\gradlew jar # Compile jar
+```
+
+##### Linux
+
+```bash
+git clone https://github.com/Grasscutters/Grasscutter.git
+cd Grasscutter
+chmod +x gradlew
+./gradlew jar # Compile jar
+```
+
+Pag-katapos mong i-compile, check mo yung [project](https://github.com/grasscutters/grasscutter) directory at saka makikita mo ung jar na kinompile mo. Usually pag-dev version, ang dapat nakalagay jan ay `grasscutter-<version>-dev.jar`. Bulag ka pag-hindi mo pa yan nakita.
+
+### Atensyon: ang mga server commands ay nasa [wiki](https://github.com/Grasscutters/Grasscutter/wiki/Commands)!
+
+# Quick Troubleshooting
+
+* Kung hindi nag-compile, paki-check ung JDK installation mo (JDK 17 at JDK's bin PATH variable). Pag-hindi mo pa rin na-compile o hindi mo ma-gets, isa lang masasabi ko sayo, may skill issue+reading issue ka. 
+* Hindi ako maka-connect, ayaw mag-login, 4206, etc... - `Usually proxy may kasalanan nyan`, ito ung pinaka-malalang skill issue na pwede mong makuha, sa lahat ng problems sa gc. Kung ayaw mo nyan, basahin mo ito. 
+
+Kung <b>Fiddler user</b> ka, paki-sigurado na naka-set ung port sa kahit ano except sa `8888`. (8888 port is for hoyoverse spider logs, in case na hindi mo alam)
+* Startup sequence: MongoDB > Grasscutter > Proxy daemon o Proxy service (mitmdump, fiddler, etc.) 
+
+<b> KUNG HINDI MO TALAGA MAINTINDIHAN, LUMAYAS KA NA DITO......... 
+PUTANG INA MO, TAGLISH NA NGA YAN. TAS HINDI MO PA MA-GETS LMAO</b>

README_fr-FR.md

@@ -3,7 +3,7 @@
 
 <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.md) | [简中](README_zh-CN.md) | [繁中](README_zh-TW.md) | [FR](README_fr-FR.md) | [ES](README_es-ES.md) | [HE](README_HE.md) | [RU](README_ru-RU.md) | [PL](README_pl-PL.md) | [ID](README_id-ID.md) | [KR](README_ko-KR.md) | [FIL/PH](README_fil-PH.md) | [NL](README_NL.md) | [JP](README_ja-JP.md) | [IT](README_it-IT.md) | [VI](README_vi-VN.md)
+[EN](README.md) | [简中](README_zh-CN.md) | [繁中](README_zh-TW.md) | [FR](README_fr-FR.md) | [ES](README_es-ES.md) | [HE](README_HE.md) | [RU](README_ru-RU.md) | [PL](README_pl-PL.md) | [ID](README_id-ID.md) | [KR](README_ko-KR.md) | [FIL/PH](README_fil-PH.md) | [NL](README_NL.md) | [JP](README_ja-JP.md)
 
 **Attention:** De nouveaux contributeurs sont toujours les bienvenus. Avant d'ajouter votre contribution, veuillez lire le [code de conduite](https://github.com/Grasscutters/Grasscutter/blob/stable/CONTRIBUTING.md).
 
@@ -63,7 +63,7 @@
 
     - Fiddler Classic: Exécutez Fiddler Classic, Activez `Decrypt https traffic` dans les paramètres et changez le port par défaut ici (Tools -> Options -> Connections) à autre chose que `8888`, et chargez [ce script](https://github.lunatic.moe/fiddlerscript).
 
-    - [Fichier hosts](https://github.com/Grasscutters/Grasscutter/wiki/Running#traffic-route-map)
+    - [Fichier hosts](https://github.com/Melledy/Grasscutter/wiki/Running#traffic-route-map)
 
 2. Définissez le proxy du réseau comme `127.0.0.1:8080` ou le port du proxy que vous avez spécifié.
 

README_id-ID.md

@@ -3,7 +3,7 @@
 
 <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.md) | [简中](README_zh-CN.md) | [繁中](README_zh-TW.md) | [FR](README_fr-FR.md) | [ES](README_es-ES.md) | [HE](README_HE.md) | [RU](README_ru-RU.md) | [PL](README_pl-PL.md) | [ID](README_id-ID.md) | [KR](README_ko-KR.md) | [FIL/PH](README_fil-PH.md) | [NL](README_NL.md) | [JP](README_ja-JP.md) | [IT](README_it-IT.md) | [VI](README_vi-VN.md)
+[EN](README.md) | [简中](README_zh-CN.md) | [繁中](README_zh-TW.md) | [FR](README_fr-FR.md) | [ES](README_es-ES.md) | [HE](README_HE.md) | [RU](README_ru-RU.md) | [PL](README_pl-PL.md) | [ID](README_id-ID.md) | [KR](README_ko-KR.md) | [FIL/PH](README_fil-PH.md) | [NL](README_NL.md) | [JP](README_ja-JP.md)
 
 **Perhatian:** Kami selalu menyambut kontributor untuk proyek ini. Sebelum menambahkan kontribusi Anda, harap baca [Kode Etik](https://github.com/Grasscutters/Grasscutter/blob/stable/CONTRIBUTING.md) kami.
 
@@ -14,7 +14,7 @@
 * Daftar teman
 * Teleportasi
 * Sistem gacha
-* Co-op *sebagian* berfungsi
+* Co-op *sebahagian* berfungsi
 * Memunculkan monster melalui konsol
 * Fitur inventaris (menerima item/karakter, meng-upgrade item/karakter, dll)
 
@@ -38,7 +38,7 @@
 
 1. Dapatkan `grasscutter.jar`
    - Download dari [actions](https://github.com/Grasscutters/Grasscutter/suites/6895963598/artifacts/267483297)
-   - [Bangun sendiri](#Membangun)
+   - [Bangun sendiri](#Building)
 2. Buat folder `resources` di direktori tempat grasscutter.jar berada dan pindahkan folder `BinOutput` dan `ExcelBinOutput` ke sana *(Periksa [wiki](https://github.com/Grasscutters/Grasscutter/wiki) untuk detail lebih lanjut tentang cara mendapatkannya.)*
 3. Jalankan Grasscutter dengan `java -jar grasscutter.jar`. **Pastikan layanan mongodb juga berjalan.**
 
@@ -53,9 +53,9 @@
 
       ​**Catatan:** Sertifikat CA biasanya disimpan di `%USERPROFILE%\ .mitmproxy`, atau anda dapat download dari  `http://mitm.it`
 
-      ​	klik dua kali untuk [menginstall](https://docs.microsoft.com/en-us/skype-sdk/sdn/articles/installing-the-trusted-root-certificate#installing-a-trusted-root-certificate) ataupun juga
+      ​	klik dua kali untuk [menginstall](https://docs.microsoft.com/en-us/skype-sdk/sdn/articles/installing-the-trusted-root-certificate#installing-a-trusted-root-certificate) or ...
 
-      - melalui command line
+      - Via command line
 
         ```shell
         certutil -addstore root %USERPROFILE%\.mitmproxy\mitmproxy-ca-cert.cer
@@ -63,7 +63,7 @@
 
     - Fiddler Classic: Jalankan Fiddler Classic, nyalakan `Decrypt https traffic` dalam setting dan ubah port default di sana (Tools -> Options -> Connections) ke apa pun selain `8888`, dan muat [skrip ini](https://github.lunatic.moe/fiddlerscript).
 
-    - [File host](https://github.com/Grasscutters/Grasscutter/wiki/Running#traffic-route-map)
+    - [File host](https://github.com/Melledy/Grasscutter/wiki/Running#traffic-route-map)
 
 2. Atur proxy jaringan ke `127.0.0.1:8080` atau port proxy yang anda tentukan.
 
@@ -103,6 +103,6 @@ Anda bisa menemukan output jar di root folder proyek.
 # Quick Troubleshooting
 
 * Jika kompilasi tidak berhasil, periksa instalasi JDK Anda (JDK 17 dan validasi variabel bin PATH JDK)
-* Klien saya tidak terhubung, tidak login, 4206, dan lain-lain - Sebagian besar pengaturan daemon proxy Anda adalah *masalahnya*, jika menggunakan
+* Klien saya tidak terhubung, tidak login, 4206, dll... - Sebagian besar pengaturan daemon proxy Anda adalah *masalahnya*, jika menggunakan
 Fiddler pastikan berjalan pada port lain kecuali 8888
 * Urutan startup: MongoDB > Grasscutter > Proxy daemon (mitmdump, fiddler, etc.) > Game

README_ja-JP.md

@@ -1,107 +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)
+![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="Documentation" 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"><img alt="Documentation" 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>
+<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.md) | [简中](README_zh-CN.md) | [繁中](README_zh-TW.md) | [FR](README_fr-FR.md) | [ES](README_es-ES.md) | [HE](README_HE.md) | [RU](README_ru-RU.md) | [PL](README_pl-PL.md) | [ID](README_id-ID.md) | [KR](README_ko-KR.md) | [FIL/PH](README_fil-PH.md) | [NL](README_NL.md) | [JP](README_ja-JP.md) | [IT](README_it-IT.md) | [VI](README_vi-VN.md)
+[EN](README.md) | [简中](README_zh-CN.md) | [繁中](README_zh-TW.md) | [FR](README_fr-FR.md) | [ES](README_es-ES.md) | [HE](README_HE.md) | [RU](README_ru-RU.md) | [PL](README_pl-PL.md) | [ID](README_id-ID.md) | [KR](README_ko-KR.md) | [FIL/PH](README_fil-PH.md) | [NL](README_NL.md) | [JP](README_ja-JP.md)
-
+
-
+
-**＊:** 私たちはプロジェクトへの貢献者をいつでも歓迎します。貢献を追加する前に、我々の [行動規範](https://github.com/Grasscutters/Grasscutter/blob/stable/CONTRIBUTING.md)をよくお読みください。
+**＊:** 私たちはプロジェクトへの貢献者をいつでも歓迎します。 貢献を追加する前に､我々の [行動規範](https://github.com/Grasscutters/Grasscutter/blob/stable/CONTRIBUTING.md)をよくお読みください.
-
+
-## 現在機能している物
+## 現在機能している物
-
+
-* ログイン
+* ログイン
-* 戦闘
+* 戦闘
-* フレンドリスト
+* フレンドリスト
-* テレポート
+* テレポート
-* 祈願(ガチャ)
+* 祈願(ガチャ)
-* マルチプレイは一部機能しています
+* マルチプレイは一部機能しています
-* コンソールを使用してモンスターをスポーンさせる
+* コンソールを使用してモンスターをスポーンさせる
-* インベントリ機能 (アイテム/キャラクターの受け取り､アイテム/キャラクターのアップグレードなど)
+* インベントリ機能 (アイテム/キャラクターの受け取り､アイテム/キャラクターのアップグレードなど)
-
+
-## クイックセットアップガイド
+## クイックセットアップガイド
-
+
-**＊:** サポートが必要な場合はGrasscutterの[Discord](https://discord.gg/T5vZU6UyeG)に参加してください。
+**＊:** サポートが必要な場合はGrasscutterの[Discord](https://discord.gg/T5vZU6UyeG)に参加してください.
-
+
-### 動作環境
+### 動作環境
-
+
-* [JAVAのバージョン17以降](https://www.oracle.com/java/technologies/javase/jdk17-archive-downloads.html)
+* [JAVAのバージョン17以降](https://www.oracle.com/java/technologies/javase/jdk17-archive-downloads.html)
-
+
-  **＊:** サーバーを動作させるだけならjreのみで十分です｡ 開発をしたい場合JDKが必要になるかもしれません。
+  **＊:** サーバーを動作させるだけならjreのみで十分です｡ 開発をしたい場合JDKが必要になるかもしれません｡
-
+
-* [MongoDB](https://www.mongodb.com/try/download/community) (バージョン4.0以降を推奨)
+* [MongoDB](https://www.mongodb.com/try/download/community) (バージョン4.0以降を推奨)
-
+
-* プロキシツール: [mitmproxy](https://mitmproxy.org/) (mitmdump, 推奨)、[Fiddler Classic](https://telerik-fiddler.s3.amazonaws.com/fiddler/FiddlerSetup.exe)、その他｡
+* プロキシツール: [mitmproxy](https://mitmproxy.org/) (mitmdump, 推奨)､ [Fiddler Classic](https://telerik-fiddler.s3.amazonaws.com/fiddler/FiddlerSetup.exe)､ その他｡
-
+
-### 起動方法
+### 起動方法
-
+
-**＊:** もしサーバーをアップデートしたい場合は`config.json`を削除してから再生成してください。
+**＊:** もしサーバーをアップデートしたい場合は`config.json`を削除してから再生成してください｡
-
+
-1. `grasscutter.jar`を入手する
+1. `grasscutter.jar`を入手する
-   - [releases](https://github.com/Grasscutters/Grasscutter/releases/latest) か [action](https://github.com/Grasscutters/Grasscutter/actions) からダウンロードするか、[自分でビルド](https://github.com/Grasscutters/Grasscutter#building)してください｡
+   - [action](https://github.com/Grasscutters/Grasscutter/actions) からダウンロードするか [自分でビルド](https://github.com/Grasscutters/Grasscutter#building)してください｡
-2. `grasscutter.jar` があるディレクトリに `resources` フォルダーを作成し、そこに `BinOutput, ExcelBinOutput, Readables, Scripts, Subtitle, TextMap` を移動してください *(`resources` フォルダの中身の入手方法については [wiki](https://github.com/Grasscutters/Grasscutter/wiki) を参照してください.)*
+2. `grasscutter.jar` があるディレクトリに `resources` フォルダーを作成しそこに `BinOutput, ExcelBinOutput, Readables, Scripts, Subtitle, TextMap` を移動してください *(`resources` フォルダの中身の入手方法については [wiki](https://github.com/Grasscutters/Grasscutter/wiki) を参照してください.)*
-3. コマンドプロンプトに`java -jar grasscutter.jar`を入力しGrasscutterを起動してください。**このときMongoDBも実行する必要があります。**
+3. コマンドプロンプトに`java -jar grasscutter.jar`を入力しGrasscutterを起動してください｡ **このときMongoDBも実行する必要があります｡**
-
+
-### クライアントとの接続
+### クライアントとの接続
-
+
-½. [このコマンド](https://github.com/Grasscutters/Grasscutter/wiki/Commands#commands-for-server-admins)をサーバーコンソールから使用してアカウントを作成してください｡
+½. [サーバーコンソールコマンド](https://github.com/Grasscutters/Grasscutter/wiki/Commands#targeting)を使用してアカウントを作成してください｡
-
+
-1. 通信内容をリダイレクトする: (どちらか一つを選択してください)
+1. 通信内容をリダイレクトする: (どちらか一つを選択してください)
-    - mitmdump: `mitmdump -s proxy.py -k`
+    - mitmdump: `mitmdump -s proxy.py -k`
-
+
-      - CA証明書を信頼する:
+    CA証明書を信頼する:
-
+
-        - **＊:** CA証明書は`%USERPROFILE%\.mitmproxy`に保存されています。ダブルクリックして[インストール](https://docs.microsoft.com/en-us/skype-sdk/sdn/articles/installing-the-trusted-root-certificate#installing-a-trusted-root-certificate)するか...
+      ​	**＊:** CA証明書は`%USERPROFILE%\.mitmproxy`に保存されているか､`http://mitm.it`からダウンロードできます｡
-
+
-        - コマンドライン経由でインストールします
+      ​	ダブルクリックして[インストール](https://docs.microsoft.com/en-us/skype-sdk/sdn/articles/installing-the-trusted-root-certificate#installing-a-trusted-root-certificate)するか...
-
+
-        ```shell
+      - コマンドライン経由でインストールします
-        certutil -addstore root %USERPROFILE%\.mitmproxy\mitmproxy-ca-cert.cer
+
-        ```
+        ```shell
-
+        certutil -addstore root %USERPROFILE%\.mitmproxy\mitmproxy-ca-cert.cer
-    - Fiddler Classic: Fiddler Classicを起動し(Tools -> Options -> HTTPS)から`Decrypt https traffic`をオンにしてください｡ (Tools -> Options -> Connections) に有るポート番号の設定を`8888`以外に設定してください。その後この[スクリプト](https://github.com/Grasscutters/Grasscutter/wiki/Resources#fiddler-classic-jscript)をFiddlerScriptタブにコピペしてロードします。
+        ```
-
+
-    - [ホストファイル](https://github.com/Grasscutters/Grasscutter/wiki/Resources#hosts-file)
+    - Fiddler Classic: Fiddler Classicを起動し設定から`Decrypt https traffic`をオンにしてください｡ (Tools -> Options -> Connections) に有るポート番号の設定を`8888`以外に設定してください､その後この[スクリプト](https://github.com/Grasscutters/Grasscutter/wiki/Resources#fiddler-classic-jscript)をロードします｡
-
+
-2. ネットワークプロキシを `127.0.0.1:(自分で設定したポート番号)` に設定してください｡
+    - [ホストファイル](https://github.com/Grasscutters/Grasscutter/wiki/Resources#hosts-file)
-- mitmproxyを使用した場合：プロキシの設定と証明書のインストールが終わった後、http://mitm.it/ でトラフィックがmitmproxyを通過しているか確認しましょう。
+
-
+2. ネットワークプロキシを `127.0.0.1:(自分で設定したポート番号)` に設定してください｡
-**`start.cmd`でmitmdumpとサーバーをまとめて起動することが出来ます。ただ、事前に`start_config.cmd`でJAVAのパスを指定している必要があります。**
+
-
+**`start_config.cmd`でJAVAのパスを指定している必要があります｡   `start.cmd`でmitmdumpとサーバーをまとめて起動することが出来ます｡**
-### ビルド
+
-
+### ビルド
-GrasscutterはGradleを使用して依存関係とビルドを処理しています。
+
-
+GrasscutterはGradleを使用して依存関係とビルドを処理しています。
-**要件:**
+
-
+**要件:**
-- [Java SE Development Kits - 17以降](https://www.oracle.com/java/technologies/javase/jdk17-archive-downloads.html)
+
-- [Git](https://git-scm.com/downloads)
+- [Java SE 開発キット - 17以降](https://www.oracle.com/java/technologies/javase/jdk17-archive-downloads.html)
-
+- [Git](https://git-scm.com/downloads)
-##### Windows
+
-
+##### Windows
-```shell
+
-git clone https://github.com/Grasscutters/Grasscutter.git
+```shell
-cd Grasscutter
+git clone https://github.com/Grasscutters/Grasscutter.git
-.\gradlew.bat # コンパイル環境の構築
+cd Grasscutter
-.\gradlew jar # コンパイル
+.\gradlew.bat # コンパイル環境の構築
-```
+.\gradlew jar # コンパイル
-
+```
-##### Linux
+
-
+##### Linux
-```bash
+
-git clone https://github.com/Grasscutters/Grasscutter.git
+```bash
-cd Grasscutter
+git clone https://github.com/Grasscutters/Grasscutter.git
-chmod +x gradlew
+cd Grasscutter
-./gradlew jar # コンパイル
+chmod +x gradlew
-```
+./gradlew jar # コンパイル
-
+```
-生成されたjarファイルはプロジェクトフォルダのルートに有ります。
+
-
+コンパイルされたjarファイルはプロゼクトフォルダーのルートに有ります｡
-### コマンドリストは[wiki](https://github.com/Grasscutters/Grasscutter/wiki/Commands)へ移動しました｡
+
-
+### コマンドリストは[wiki](https://github.com/Grasscutters/Grasscutter/wiki/Commands)へ移動しました｡
-# トラブルシューティング
+
-
+# トラブルシューティング
-* コンパイルが失敗した場合JDKがインストールされているか確認してください。(JDKのバージョンが17以降であることと、環境変数でJDKのパスが設定されている必要があります)
+
-* クライアントが接続できない・ログインできない・エラーコード4206・またその他場合、ほとんどは、プロキシデーモンの設定が問題です。Fiddlerを使っている場合はデフォルトポートを8888以外の別のポートに変更してみてください。
+* コンパイルが失敗した場合JDKがインストールされているか確認してください (JDKの17以降と環境変数でJAVAのパスが設定されている必要があります)
-  Fiddlerを使用している場合はポートが8888以外に設定されていることを確認してください。
+* クライアントが接続できない､ ログインできない､ エラーコード4206､ その他... - ほとんどの場合、プロキシ デーモンの設定が問題です。
-* 起動シーケンス(順番): MongoDB > Grasscutter > プロキシツール (mitmdumpかfiddler、その他) > ゲーム
+  Fiddlerを使用している場合はポートが8888以外に設定されていることを確認してください｡
+* 起動シーケンス(順番): MongoDB > Grasscutter > プロキシツール (mitmdumpかfiddler､その他) > ゲーム

README_ko-KR.md

@@ -3,7 +3,7 @@
 
 <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.md) | [简中](README_zh-CN.md) | [繁中](README_zh-TW.md) | [FR](README_fr-FR.md) | [ES](README_es-ES.md) | [HE](README_HE.md) | [RU](README_ru-RU.md) | [PL](README_pl-PL.md) | [ID](README_id-ID.md) | [KR](README_ko-KR.md) | [FIL/PH](README_fil-PH.md) | [NL](README_NL.md) | [JP](README_ja-JP.md) | [IT](README_it-IT.md) | [VI](README_vi-VN.md)
+[EN](README.md) | [简中](README_zh-CN.md) | [繁中](README_zh-TW.md) | [FR](README_fr-FR.md) | [ES](README_es-ES.md) | [HE](README_HE.md) | [RU](README_ru-RU.md) | [PL](README_pl-PL.md) | [ID](README_id-ID.md) | [KR](README_ko-KR.md) | [FIL/PH](README_fil-PH.md) | [NL](README_NL.md) | [JP](README_ja-JP.md)
 
 **주의 :** 우리는 항상 프로젝트에 기여하는 사람들을 환영합니다. 기여를 하기 전, [행동 지침](https://github.com/Grasscutters/Grasscutter/blob/stable/CONTRIBUTING.md)을 주의 깊게 읽어주세요.
 
@@ -63,7 +63,7 @@
 
     - Fiddler Classic : Fiddler Classic을 실행한 후, Setting에서 `Decrypt https traffic` 옵션을 켜고, Tools -> Options -> Connections에 있는 기본 포트를 `8888`을 제외한 다른 포트로 지정합니다. 그리고 [이 스크립트](https://github.lunatic.moe/fiddlerscript)를 불러옵니다.
 
-    - [호스트 파일](https://github.com/Grasscutters/Grasscutter/wiki/Running#traffic-route-map)
+    - [호스트 파일](https://github.com/Melledy/Grasscutter/wiki/Running#traffic-route-map)
 
 2. 네트워크 프록시를 `127.0.0.1:8080` 로 설정하거나 지정한 프록시 포트로 설정합니다.
 

README_pl-PL.md

@@ -3,7 +3,7 @@
 
 <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.md) | [简中](README_zh-CN.md) | [繁中](README_zh-TW.md) | [FR](README_fr-FR.md) | [ES](README_es-ES.md) | [HE](README_HE.md) | [RU](README_ru-RU.md) | [PL](README_pl-PL.md) | [ID](README_id-ID.md) | [KR](README_ko-KR.md) | [FIL/PH](README_fil-PH.md) | [NL](README_NL.md) | [JP](README_ja-JP.md) | [IT](README_it-IT.md) | [VI](README_vi-VN.md)
+[EN](README.md) | [简中](README_zh-CN.md) | [繁中](README_zh-TW.md) | [FR](README_fr-FR.md) | [ES](README_es-ES.md) | [HE](README_HE.md) | [RU](README_ru-RU.md) | [PL](README_pl-PL.md) | [ID](README_id-ID.md) | [KR](README_ko-KR.md) | [FIL/PH](README_fil-PH.md) | [NL](README_NL.md) | [JP](README_ja-JP.md)
 
 **Uwaga:** Zawsze jesteśmy otwarci na wasz wkład w projekt. Przed zaproponowaniem zmian przeczytaj [zasady postępowania (ENG)](https://github.com/Grasscutters/Grasscutter/blob/stable/CONTRIBUTING.md).
 
@@ -63,7 +63,7 @@
 
     - Fiddler Classic: Uruchom Fiddler Classic, włącz `Decrypt https traffic` w ustawieniach oraz zmień domyślny port (Tools -> Options -> Connections) na dowolny inny niż `8888`, i wczytaj [ten skrypt](https://github.lunatic.moe/fiddlerscript) (w polu FiddlerScript).
 
-    - [Plik hosts](https://github.com/Grasscutters/Grasscutter/wiki/Running#traffic-route-map)
+    - [Plik hosts](https://github.com/Melledy/Grasscutter/wiki/Running#traffic-route-map)
 
 2. Ustaw serwer proxy na `127.0.0.1:8080` albo inny wybrany przez ciebie port.
 

README_ru-RU.md

@@ -3,7 +3,7 @@
 
 <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.md) | [简中](README_zh-CN.md) | [繁中](README_zh-TW.md) | [FR](README_fr-FR.md) | [ES](README_es-ES.md) | [HE](README_HE.md) | [RU](README_ru-RU.md) | [PL](README_pl-PL.md) | [ID](README_id-ID.md) | [KR](README_ko-KR.md) | [FIL/PH](README_fil-PH.md) | [NL](README_NL.md) | [JP](README_ja-JP.md) | [IT](README_it-IT.md) | [VI](README_vi-VN.md)
+[EN](README.md) | [简中](README_zh-CN.md) | [繁中](README_zh-TW.md) | [FR](README_fr-FR.md) | [ES](README_es-ES.md) | [HE](README_HE.md) | [RU](README_ru-RU.md) | [PL](README_pl-PL.md) | [ID](README_id-ID.md) | [KR](README_ko-KR.md) | [FIL/PH](README_fil-PH.md) | [NL](README_NL.md) | [JP](README_ja-JP.md)
 
 **Внимание:** Мы всегда рады новому вкладу в проект. Однако, перед тем, как сделать свой вклад, пожалуйста, прочтите наш [кодекс делового поведения](https://github.com/Grasscutters/Grasscutter/blob/stable/CONTRIBUTING.md).
 
@@ -63,7 +63,7 @@
 
     - Fiddler Classic: Запустите Fiddler Classic, включите настройку `Decrypt https traffic` в опциях и измените порт по умолчанию (Меню -> Tools -> Options -> Connections) на что-то не равное `8888`, после чего запустите [этот скрипт](https://github.lunatic.moe/fiddlerscript) во вкладке FiddlerSrcipt.
 
-    - [Файл hosts](https://github.com/Grasscutters/Grasscutter/wiki/Running#traffic-route-map)
+    - [Файл hosts](https://github.com/Melledy/Grasscutter/wiki/Running#traffic-route-map)
 
 2. Установите прокси сети в `127.0.0.1:8080`, либо в тот порт прокси, который вы задали.
 

README_zh-CN.md

@@ -3,7 +3,7 @@
 
 <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.md) | [简中](README_zh-CN.md) | [繁中](README_zh-TW.md) | [FR](README_fr-FR.md) | [ES](README_es-ES.md) | [HE](README_HE.md) | [RU](README_ru-RU.md) | [PL](README_pl-PL.md) | [ID](README_id-ID.md) | [KR](README_ko-KR.md) | [FIL/PH](README_fil-PH.md) | [NL](README_NL.md) | [JP](README_ja-JP.md) | [IT](README_it-IT.md) | [VI](README_vi-VN.md)
+[EN](README.md) | [简中](README_zh-CN.md) | [繁中](README_zh-TW.md) | [FR](README_fr-FR.md) | [ES](README_es-ES.md) | [HE](README_HE.md) | [RU](README_ru-RU.md) | [PL](README_pl-PL.md) | [ID](README_id-ID.md) | [KR](README_ko-KR.md) | [FIL/PH](README_fil-PH.md) | [NL](README_NL.md) | [JP](README_ja-JP.md)
 
 **请注意:** 欢迎成为本项目的贡献者。但在提交 PR 之前, 请仔细阅读 [代码规范](https://github.com/Grasscutters/Grasscutter/blob/stable/CONTRIBUTING.md)。
 

README_zh-TW.md

@@ -3,7 +3,7 @@
 
 <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.md) | [简中](README_zh-CN.md) | [繁中](README_zh-TW.md) | [FR](README_fr-FR.md) | [ES](README_es-ES.md) | [HE](README_HE.md) | [RU](README_ru-RU.md) | [PL](README_pl-PL.md) | [ID](README_id-ID.md) | [KR](README_ko-KR.md) | [FIL/PH](README_fil-PH.md) | [NL](README_NL.md) | [JP](README_ja-JP.md) | [IT](README_it-IT.md) | [VI](README_vi-VN.md)
+[EN](README.md) | [简中](README_zh-CN.md) | [繁中](README_zh-TW.md) | [FR](README_fr-FR.md) | [ES](README_es-ES.md) | [HE](README_HE.md) | [RU](README_ru-RU.md) | [PL](README_pl-PL.md) | [ID](README_id-ID.md) | [KR](README_ko-KR.md) | [FIL/PH](README_fil-PH.md) | [NL](README_NL.md) | [JP](README_ja-JP.md)
 
 **請注意:** 歡迎成為本專案的貢獻者。在提交 PR 之前, 請仔細閱讀[程式碼規範](https://github.com/Grasscutters/Grasscutter/blob/stable/CONTRIBUTING.md)。
 

build.gradle

@@ -34,9 +34,6 @@ plugins {
     // Maven
     id 'maven-publish'
     id 'signing'
-
-    // Lombok for delombok'ification
-    id "io.freefair.lombok" version "6.6.1"
 }
 
 compileJava.options.encoding = "UTF-8"
@@ -46,7 +43,7 @@ sourceCompatibility = JavaVersion.VERSION_17
 targetCompatibility = JavaVersion.VERSION_17
 
 group = 'xyz.grasscutters'
-version = '1.4.7'
+version = '1.3.1-dev'
 
 sourceCompatibility = 17
 targetCompatibility = 17
@@ -93,8 +90,8 @@ dependencies {
 
     implementation group: 'org.luaj', name: 'luaj-jse', version: '3.0.1'
 
-    implementation group: 'com.esotericsoftware', name: 'reflectasm', version: '1.11.9'
+    implementation group:  'com.esotericsoftware', name : 'reflectasm', version: '1.11.9'
-    implementation group: 'com.github.davidmoten', name: 'rtree-multi', version: '0.1'
+    implementation group:  'com.github.davidmoten', name : 'rtree-multi', version: '0.1'
 
     implementation group: 'io.javalin', name: 'javalin', version: '4.6.4'
     implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.13.3'
@@ -116,6 +113,7 @@ application {
     getMainClass().set('emu.grasscutter.Grasscutter')
 }
 
+
 jar {
     exclude '*.proto'
 
@@ -125,7 +123,7 @@ jar {
 
     archiveBaseName = 'grasscutter'
     if (project.hasProperty('jarFilename')) {
-        archiveFileName = "${jarFilename}.${archiveExtension}"
+        archiveFileName = "${jarFilename}.${extension}"
     }
 
     from {
@@ -181,8 +179,8 @@ publishing {
     }
     repositories {
         maven {
-            if (version.endsWith('-dev')) {
+            if(version.endsWith('-dev')) {
-                println("Publishing to 4benj-maven")
+                println ("Publishing to 4benj-maven")
                 url 'https://repo.4benj.com/releases'
                 name '4benj-maven'
                 credentials {
@@ -190,7 +188,7 @@ publishing {
                     password System.getenv('benj_maven_token')
                 }
             } else {
-                println("Publishing to sonatype")
+                println ("Publishing to sonatype")
                 def releasesRepoUrl = 'https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/'
                 def snapshotsRepoUrl = 'https://s01.oss.sonatype.org/content/repositories/snapshots/'
                 url = version.endsWith('SNAPSHOT') ? snapshotsRepoUrl : releasesRepoUrl
@@ -211,7 +209,7 @@ protobuf {
         // The artifact spec for the Protobuf Compiler
         artifact = 'com.google.protobuf:protoc:3.18.1'
     }
-
+//    generatedFilesBaseDir = "$projectDir/src/main/java/emu/grasscutter/net/proto/"
     generatedFilesBaseDir = "$projectDir/src/generated/"
 }
 
@@ -222,7 +220,7 @@ sourceSets {
             srcDir 'src/generated'
         }
         java {
-            srcDir 'src/generated/main/java'
+            srcDir 'src/java'
         }
     }
 }
@@ -238,25 +236,23 @@ idea {
 
 eclipse {
     classpath {
-        file.whenMerged { cp -> cp.entries.add(new org.gradle.plugins.ide.eclipse.model.SourceFolder('src/generated/main/java', null))
+        file.whenMerged { cp ->
+            cp.entries.add( new org.gradle.plugins.ide.eclipse.model.SourceFolder('src/generated/main/java', null) )
         }
     }
 }
 
 signing {
-    if (!version.endsWith('-dev')) {
+    if(!version.endsWith('-dev')) {
         sign publishing.publications.mavenJava
     }
 }
 
 javadoc {
     options.encoding = 'UTF-8'
-    if (JavaVersion.current().isJava9Compatible()) {
+    if(JavaVersion.current().isJava9Compatible()) {
         options.addBooleanOption('html5', true)
     }
-    // Add this to avoid warning caused by lack of comments in proto generated java files
-    options.addStringOption('Xdoclint:none', '-quiet')
-    exclude '**/*.md'
 }
 
 task injectGitHash {
@@ -268,7 +264,8 @@ task injectGitHash {
         }
     }
 
-    new File(projectDir, "src/main/java/emu/grasscutter/BuildConfig.java").text = """package emu.grasscutter;
+    new File(projectDir, "src/main/java/emu/grasscutter/BuildConfig.java").text =
+        """package emu.grasscutter;
 
 public final class BuildConfig {
     public static final String VERSION = \"${version}\";
@@ -280,16 +277,3 @@ public final class BuildConfig {
 processResources {
     dependsOn "generateProto"
 }
-
-sourcesJar {
-    dependsOn "generateProto"
-}
-
-delombok {
-    dependsOn "generateProto"
-}
-
-// For terminal interacting in IDEA running
-run {
-    standardInput = System.in
-}

docs/README_fil-PH.md

@@ -1,106 +0,0 @@
-![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="Documentation" 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.md) | [简中](README_zh-CN.md) | [繁中](README_zh-TW.md) | [FR](README_fr-FR.md) | [ES](README_es-ES.md) | [HE](README_HE.md) | [RU](README_ru-RU.md) | [PL](README_pl-PL.md) | [ID](README_id-ID.md) | [KR](README_ko-KR.md) | [FIL/PH](README_fil-PH.md) | [NL](README_NL.md) | [JP](README_ja-JP.md) | [IT](README_it-IT.md) | [VI](README_vi-VN.md)
-
-**Atensyon:** Ang mga kontributor ay laging welcome sa proyektong ito. Bago mag-bigay ng kontribusyon, basahin muna ng mabuti ang [Code of Conduct](https://github.com/Grasscutters/Grasscutter/blob/stable/CONTRIBUTING.md).
-
-## Ang mga kasalukuyang features
-
-* Logging in
-* Combat
-* Friends list
-* Teleportation
-* Gacha system
-* Co-op *partially* works
-* Spawning monsters via console
-* Inventory features (receiving items/characters, upgrading items/characters, etc)
-
-## Quick setup guide
-
-**Atensyon:** Para sa mga nangangailangan ng suporta, maaari kang sumali sa aming server [Discord](https://discord.gg/T5vZU6UyeG).
-
-### Ang mga kailangan
-
-* [Java SE - 17](https://www.oracle.com/java/technologies/javase/jdk17-archive-downloads.html) or higher
-
-  **Atensyon:** Kung gusto mo lang **paganahin** ang server, pwede naman ang **jre**.
-
-* [MongoDB](https://www.mongodb.com/try/download/community) (recommended 4.0+)
-
-* Proxy Daemon: [mitmproxy](https://mitmproxy.org/) (mitmdump, recommended), [Fiddler Classic](https://telerik-fiddler.s3.amazonaws.com/fiddler/FiddlerSetup.exe), etc.
-
-### Running
-
-**Atensyon:** Kung nag-update ka galing sa lumang version, paki-delete ang `config.json` para mag-regenerate ulit.
-
-1. Get `grasscutter.jar`
-   - I-download mo sa [releases](https://github.com/Grasscutters/Grasscutter/releases/latest) o sa [actions](https://github.com/Grasscutters/Grasscutter/actions/workflows/build.yml) o [bumuo ng iyong sariling server](#building).
-2. Gawa ka ng `resources` folder sa directory kung nasaan ang grasscutter.jar at ilagay ang `BinOutput, ExcelBinOutput, Readables, Scripts, Subtitle, TextMap` folders sa loob ng resources folder *(Tingnan mo ang [wiki](https://github.com/Grasscutters/Grasscutter/wiki) para malaman mo kung saan mo makukuha yan)*
-3. Paandarin ang Grasscutter gamit ang command na `java -jar grasscutter.jar`. **Siguraduhin mo na ang mongodb service ay naka-open din.**
-
-### Connecting with the client
-
-½. Gumawa ng account sa server console gamit ang [command](https://github.com/Grasscutters/Grasscutter/wiki/Commands#:~:text=account%20%3Ccreate|delete%3E%20%3Cusername%3E%20[UID]) na ito.
-
-1. Redirect traffic: (pumili lang dapat ng isa)
-    - mitmdump: `mitmdump -s proxy.py -k`
-
-        - Trust CA certificate:
-
-          - Ang CA certificate ay nasa `%USERPROFILE%\.mitmproxy`, i-double click ang `mitmproxy-ca-cert.cer` para ma-[install](https://docs.microsoft.com/en-us/skype-sdk/sdn/articles/installing-the-trusted-root-certificate#installing-a-trusted-root-certificate) o...
-
-          - Via command line *(kailangan ng administration privileges)*
-
-             ```shell
-             certutil -addstore root %USERPROFILE%\.mitmproxy\mitmproxy-ca-cert.cer
-             ```
-
-    - Fiddler Classic: Paadarin ang Fiddler Classic, turn on mo yung `Decrypt https traffic` sa (Tools -> Options -> HTTPS) at baguhin mo ang default port na nakalagay (Tools -> Options -> Connections) sa anumang numero maliban sa `8888`, i-load ang [script](https://github.com/Grasscutters/Grasscutter/wiki/Resources#fiddler-classic-jscript) na ito (copy and paste ang script sa `FiddlerScript` tab) at i-click ang `Save Script` button.
-
-    - [Hosts file](https://github.com/Grasscutters/Grasscutter/wiki/Resources#hosts-file)
-
-2. Set mo ung proxy sa `127.0.0.1:8080` or dun sa proxy port na iyong inilagay.
-
-- Para sa mitmproxy: Pagkatapos mong i-setup ang network proxy at sa pag-install ng certificate, tingnan mo sa http://mitm.it/ kung ang traffic ay dumadaan sa mitmproxy.
-
-**Pwede mo rin gamitin ang `start.cmd` to start the servers and proxy daemons automatically, pero kailagan mong i-setup ang JAVA_HOME environment at i-configure ang `start_config.cmd` file.**
-
-### Building
-
-Ang Grasscutter ay gumagamit ng Gradle para sa depedencies at building.
-
-**Mga kailangan:**
-
-- [Java SE Development Kits - 17](https://www.oracle.com/java/technologies/javase/jdk17-archive-downloads.html) or higher
-- [Git](https://git-scm.com/downloads)
-
-##### Windows
-
-```shell
-git clone https://github.com/Grasscutters/Grasscutter.git
-cd Grasscutter
-.\gradlew.bat # Setting up environments
-.\gradlew jar # Compile jar
-```
-
-##### Linux
-
-```bash
-git clone https://github.com/Grasscutters/Grasscutter.git
-cd Grasscutter
-chmod +x gradlew
-./gradlew jar # Compile jar
-```
-
-Pag-katapos mong i-compile, check mo yung project directory at makikita mo yung jar na kinompile mo. Usually pag-dev version, ang dapat nakalagay diyan ay `grasscutter-<version>-dev.jar`.
-
-### Ang mga server commands ay nasa [wiki](https://github.com/Grasscutters/Grasscutter/wiki/Commands) na!
-
-# Quick Troubleshooting
-
-* Kung hindi nag-compile, paki-check ung JDK installation mo (JDK 17 at JDK's bin PATH variable).
-* Hindi ako maka-connect, ayaw mag-login, 4206, etc... - Mostly ang proxy setup mo ang may kasalanan niyan, kung gamit mo ay Fiddler, paki-sigurado na naka-set ung port sa kahit ano except sa 8888.
-* Ang pagkakasunud-sunod: MongoDB > Grasscutter > Proxy Daemon (mitmdump, fiddler, etc.) > Game

docs/README_it-IT.md

@@ -1,108 +0,0 @@
-![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="Documentation" 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.md) | [简中](README_zh-CN.md) | [繁中](README_zh-TW.md) | [FR](README_fr-FR.md) | [ES](README_es-ES.md) | [HE](README_HE.md) | [RU](README_ru-RU.md) | [PL](README_pl-PL.md) | [ID](README_id-ID.md) | [KR](README_ko-KR.md) | [FIL/PH](README_fil-PH.md) | [NL](README_NL.md) | [JP](README_ja-JP.md) | [IT](README_it-IT.md) | [VI](README_vi-VN.md)
-
-**Attenzione:** Diamo sempre il benvenuto ai contributori del progetto. Prima di aggiungere il tuo contributo, leggi attentamente il nostro [Codice di condotta](https://github.com/Grasscutters/Grasscutter/blob/stable/CONTRIBUTING.md).
-
-## Funzionalità attuali
-
-* Login
-* Combattimento
-* Lista di amici
-* Teletrasporto
-* Sistema Gacha
-* Cooperativa *parzialmente* funzionale
-* Evoca mostri dalla console
-* Funzionalità dell'inventario (ricevi oggetti/personaggi, aggiorna oggetti/personaggi, ecc.)
-
-## Guida rapida all'installazione
-
-**Nota:** Per il supporto, unisciti al nostro [Discord](https://discord.gg/T5vZU6UyeG).
-
-### Requisiti
-
-* Java SE - 17 ([link](https://www.oracle.com/java/technologies/javase/jdk17-archive-downloads.html))
-
-  **Nota:** se vuoi solo **eseguirlo**, **jre** è sufficiente.
-
-* [MongoDB](https://www.mongodb.com/try/download/community) (consigliato 4.0+)
-
-* Servizio proxy: mitmproxy (mitmdump, consigliato), Fiddler Classic, ecc.
-
-### Esecuzione
-
-**Nota:** Se hai eseguito l'aggiornamento da una versione precedente, rimuovi `config.json` in modo che venga generato di nuovo.
-
-1. Ottieni "grasscutter.jar".
-   - Scarica da [azioni](https://github.com/Grasscutters/Grasscutter/suites/6895963598/artifacts/267483297)
-   - [Compilalo tu stesso](#Compilazione)
-2. Crea una cartella `resources` nella directory in cui si trova grasscutter.jar e sposta lì le cartelle `BinOutput` ed `ExcelBinOutput` *(Vedi il [wiki](https://github.com/Grasscutters/Grasscutter/wiki ) per maggiori dettagli su come ottenerli.)*
-3. Eseguire Grasscutter con `java -jar grasscutter.jar`. **Assicurati che il servizio mongodb sia attivo.**
-
-### Connessione client
-
-½. Crea un account usando [il comando corrispondente nella console del server](https://github.com/Grasscutters/Grasscutter/wiki/Commands#targeting).
-
-1. Reindirizza il traffico: (scegli uno)
-    - mitmdump: `mitmdump -s proxy.py -k`
-
-      Autorizza il certificato CA:
-
-      ​ **Nota:**Il certificato CA si trova solitamente in `%USERPROFILE%\ .mitmproxy`, oppure puoi scaricarlo da `http://mitm.it`
-
-      Fare doppio clic su [installa](https://docs.microsoft.com/en-us/skype-sdk/sdn/articles/installing-the-trusted-root-certificate#installing-a-trusted-root-certificate) o ...
-
-      - Con riga di comando
-
-        ```shell
-        certutil -addstore root %USERPROFILE%\.mitmproxy\mitmproxy-ca-cert.cer
-        ```
-
-    - Fiddler Classic: esegui Fiddler Classic, abilita `Decrypt https traffic` nelle opzioni e cambia la porta predefinita in (Strumenti -> Opzioni -> Connessioni) in qualcosa di diverso da `8888`, e carica [questo script](https :/ /github.lunatic.moe/fiddlerscript).
-
-    - [File host](https://github.com/Grasscutters/Grasscutter/wiki/Running#traffic-route-map)
-
-2. Impostare il proxy di rete su `127.0.0.1:8080` o la porta proxy impostata.
-
-**Puoi anche usare `start.cmd` per avviare automaticamente il server e il servizio proxy, ma devi impostare l'ambiente JAVA_HOME**
-
-### Compilazione
-
-Grasscutter usa Gradle per gestire le dipendenze e le build.
-
-**Requisiti:**
-
-- [Kit di sviluppo Java SE - 17](https://www.oracle.com/java/technologies/javase/jdk17-archive-downloads.html)
-- [Git](https://git-scm.com/downloads)
-
-##### Windows
-
-```shell
-git clone https://github.com/Grasscutters/Grasscutter.git
-cd grasscutter
-.\gradlew.bat # Impostazioni dell'ambiente
-.\gradlew jar # Compila
-```
-
-##### Linux
-
-```bash
-git clone https://github.com/Grasscutters/Grasscutter.git
-cd grasscutter
-chmod +x gradlew
-./gradlew jar # Compila
-```
-
-Puoi trovare il jar generato nella cartella principale del progetto.
-
-### I comandi sono stati spostati nel [wiki](https://github.com/Grasscutters/Grasscutter/wiki/Commands)!
-
-# Soluzioni agli errori comuni
-
-* Se la compilazione non riesce, controlla l'installazione di JDK (JDK 17 e convalida la variabile JDK bin PATH)
-* Il mio client non si connette, non accede, 4206, ecc... - Probabilmente le tue impostazioni proxy sono *il problema*, se usi
-  Fiddler assicurati di utilizzare una porta diversa da 8888
-* Sequenza di avvio: MongoDB > Grasscutter > Servizio proxy (mitmdump, fiddler, ecc.) > Gioco

docs/README_vi-VN.md

@@ -1,106 +0,0 @@
-![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="Documentation" 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.md) | [简中](README_zh-CN.md) | [繁中](README_zh-TW.md) | [FR](README_fr-FR.md) | [ES](README_es-ES.md) | [HE](README_HE.md) | [RU](README_ru-RU.md) | [PL](README_pl-PL.md) | [ID](README_id-ID.md) | [KR](README_ko-KR.md) | [FIL/PH](README_fil-PH.md) | [NL](README_NL.md) | [JP](README_ja-JP.md) | [IT](README_it-IT.md) | [VI](README_vi-VN.md)
-
-**Chú ý:** Chúng tôi luôn chào đón những người đóng góp cho dự án. Trước khi đóng góp, xin vui lòng đọc kỹ ["các quy tắc" (Code of Conduct)](https://github.com/Grasscutters/Grasscutter/blob/stable/CONTRIBUTING.md) của chúng tôi .
-
-## Các tính năng hiện tại
-
-* Đăng nhập
-* Chiến đấu, giao tranh
-* Danh sách bạn bè
-* Dịch chuyển
-* Hệ thống gacha
-* *Một phần* của tính năng chơi chung (co-op)
-* Gọi ra quái vật từ bảng điều khiển (console)
-* Vật phẩm/Nhân vật (nhận vật phẩm/nhân vật, nâng cấp vật phẩm/nhân vật)
-
-## Hướng dẫn cài đặt nhanh
-
-**Ghi chú:** Để được hỗ trợ, vui lòng tham gia [Discord](https://discord.gg/T5vZU6UyeG).
-
-### Phần mềm cần thiết
-
-* [Java SE - 17](https://www.oracle.com/java/technologies/javase/jdk17-archive-downloads.html) hoặc cao hơn
-
-  **Ghi chú:** Nếu bạn chỉ cần **sử dụng**, thì cài **jre** là đủ.
-
-* [MongoDB](https://www.mongodb.com/try/download/community) (khuyến khích phiên bản từ 4.0 trở lên)
-
-* Proxy Daemon: [mitmproxy](https://mitmproxy.org/) (nên sử dụng mitmdump), [Fiddler Classic](https://telerik-fiddler.s3.amazonaws.com/fiddler/FiddlerSetup.exe), v.v.
-
-### Chạy chương trình (server)
-
-**Ghi chú:** Nếu bạn đã cập nhật từ phiên bản cũ hơn, hãy xóa `config.json` để tạo lại.
-
-1. Tải `grasscutter.jar`
-    - Tài về từ [releases (bản phát hành)](https://github.com/Grasscutters/Grasscutter/releases/latest) hoặc [actions (các hoạt động)](https://github.com/Grasscutters/Grasscutter/actions/workflows/build.yml) hoặc [tự tạo của chính bạn](#tự-tạo-server--building-).
-2. Tạo một thư mục `resources` trong cùng thư mục với Grasscutter.jar và chuyển các thư mục `BinOutput, ExcelBinOutput, Readables, Scripts, Subtitle, TextMap` của bạn đến `resources` _(Xem [wiki](https://github.com/Grasscutters/Grasscutter/wiki) để biết cách lấy các thư mục đó)_
-3. Chạy Grasscutter với câu lệnh `java -jar grasscutter.jar`. **Hãy chắc rằng mongodb của bạn đã được chạy**
-
-### Kết nối với game (client)
-
-½. Tạo một tài khoản từ bảng điều khiển máy chủ (server console), sử dụng [câu lệnh (command)](https://github.com/Grasscutters/Grasscutter/wiki/Commands#:~:text=account%20%3Ccreate|delete%3E%20%3Cusername%3E%20[UID]).
-
-1. Chương trình chuyển hướng lưu lượng truy cập: (chỉ sử dụng 1)
-    - mitmdump: `mitmdump -s proxy.py -k`
-
-        - Chứng chỉ CA tin cậy:
-
-          - Chứng chỉ CA thường được lưu trữ trong `%USERPROFILE%\.mitmproxy`, click đúp `mitmproxy-ca-cert.cer` để [cài đặt](https://docs.microsoft.com/en-us/skype-sdk/sdn/articles/installing-the-trusted-root-certificate#installing-a-trusted-root-certificate) hoặc...
-
-          - Sử dụng với command line (cmd) *(yêu cầu quyền quản trị viên)*
-
-             ```shell
-             certutil -addstore root %USERPROFILE%\.mitmproxy\mitmproxy-ca-cert.cer
-             ```
-
-    - Fiddler Classic: Mở Fiddler Classic, bật tùy chọn `Decrypt HTTPS traffic` trong (Tools -> Options -> HTTPS) và thay đổi cổng (port) mặc định (Tools -> Options -> Connections) khác `8888`, chạy [script này](https://github.com/Grasscutters/Grasscutter/wiki/Resources#fiddler-classic-jscript) (sao chép và dán script vào trong `FiddlerScript`) và bấm `Save Script`.
-
-    - [Hosts file](https://github.com/Grasscutters/Grasscutter/wiki/Resources#hosts-file)
-
-2. Cài đặt network proxy thành `127.0.0.1:8080` hoặc cổng proxy bạn đã chỉ định.
-
--   Với mitmproxy: Sau khi thiết lập proxy và cài đặt chứng chỉ, hãy kiểm tra http://mitm.it/ nếu lưu lượng truy cập đi qua mitmproxy.
-
-**You can also use `start.cmd` to start servers and proxy daemons automatically, but you have to set up `JAVA_HOME` environment and configure the `start_config.cmd` file.**
-
-### Tự tạo server (Building)
-
-Grasscutter sử dụng Gradle để xử lý các phần phụ thuộc và xây dựng.
-
-**Phần mềm cần thiết:**
-
-- [Java SE Development Kits - 17](https://www.oracle.com/java/technologies/javase/jdk17-archive-downloads.html) hoặc cao hơn
-- [Git](https://git-scm.com/downloads)
-
-##### Windows
-
-```shell
-git clone https://github.com/Grasscutters/Grasscutter.git
-cd Grasscutter
-.\gradlew.bat # Thiết lập môi trường (Setting up environments)
-.\gradlew jar # Biên dịch (Compile)
-```
-
-##### Linux
-
-```bash
-git clone https://github.com/Grasscutters/Grasscutter.git
-cd Grasscutter
-chmod +x gradlew
-./gradlew jar # Biên dịch (Compile)
-```
-
-Bạn có thể tìm thấy tệp jar đã được biên dịch tại thư mục gốc của dự án.
-
-### Các câu lệnh (commands) đã được chuyển đến [wiki](https://github.com/Grasscutters/Grasscutter/wiki/Commands)!
-
-# Khắc phục nhanh các sụ cố
-
--   Nếu quá trình biên dịch (compile) không thành công, vui lòng kiểm tra cài đặt JDK của bạn (Đảm bảo rằng JDK phải từ phiên bản 17 trở lên và PATH của JDK đã được cài đặt).
--   Không thể kết nối, không thể đăng nhập, 4206, v.v... - Cài đặt proxy (proxy daemon) của bạn thường là *vấn đề*. Nếu bạn đang sử dụng Fiddler, hãy đổi port (cổng) mặc định khác 8888.
--   Thứ tự cài đặt: MongoDB > Grasscutter > Proxy Daemon (mitmdump, fiddler, v.v.) > Game

gradle.properties

@@ -1 +0,0 @@
-org.gradle.jvmargs=-Xmx1024m

gradlew

@@ -1,7 +1,7 @@
-#!/bin/sh
+#!/usr/bin/env sh
 
 #
-# Copyright © 2015-2021 the original authors.
+# Copyright 2015 the original author or authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,113 +17,78 @@
 #
 
 ##############################################################################
-#
+##
-#   Gradle start up script for POSIX generated by Gradle.
+##  Gradle start up script for UN*X
-#
+##
-#   Important for running:
-#
-#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
-#       noncompliant, but you have some other compliant shell such as ksh or
-#       bash, then to run this script, type that shell name before the whole
-#       command line, like:
-#
-#           ksh Gradle
-#
-#       Busybox and similar reduced shells will NOT work, because this script
-#       requires all of these POSIX shell features:
-#         * functions;
-#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
-#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
-#         * compound commands having a testable exit status, especially «case»;
-#         * various built-in commands including «command», «set», and «ulimit».
-#
-#   Important for patching:
-#
-#   (2) This script targets any POSIX shell, so it avoids extensions provided
-#       by Bash, Ksh, etc; in particular arrays are avoided.
-#
-#       The "traditional" practice of packing multiple parameters into a
-#       space-separated string is a well documented source of bugs and security
-#       problems, so this is (mostly) avoided, by progressively accumulating
-#       options in "$@", and eventually passing that to Java.
-#
-#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
-#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
-#       see the in-line comments for details.
-#
-#       There are tweaks for specific operating systems such as AIX, CygWin,
-#       Darwin, MinGW, and NonStop.
-#
-#   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
-#       within the Gradle project.
-#
-#       You can find Gradle at https://github.com/gradle/gradle/.
-#
 ##############################################################################
 
 # Attempt to set APP_HOME
-
 # Resolve links: $0 may be a link
-app_path=$0
+PRG="$0"
-
+# Need this for relative symlinks.
-# Need this for daisy-chained symlinks.
+while [ -h "$PRG" ] ; do
-while
+    ls=`ls -ld "$PRG"`
-    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    link=`expr "$ls" : '.*-> \(.*\)$'`
-    [ -h "$app_path" ]
+    if expr "$link" : '/.*' > /dev/null; then
-do
+        PRG="$link"
-    ls=$( ls -ld "$app_path" )
+    else
-    link=${ls#*' -> '}
+        PRG=`dirname "$PRG"`"/$link"
-    case $link in             #(
+    fi
-      /*)   app_path=$link ;; #(
-      *)    app_path=$APP_HOME$link ;;
-    esac
 done
-
+SAVED="`pwd`"
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
 
 APP_NAME="Gradle"
-APP_BASE_NAME=${0##*/}
+APP_BASE_NAME=`basename "$0"`
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD=maximum
+MAX_FD="maximum"
 
 warn () {
     echo "$*"
-} >&2
+}
 
 die () {
     echo
     echo "$*"
     echo
     exit 1
-} >&2
+}
 
 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
 nonstop=false
-case "$( uname )" in                #(
+case "`uname`" in
-  CYGWIN* )         cygwin=true  ;; #(
+  CYGWIN* )
-  Darwin* )         darwin=true  ;; #(
+    cygwin=true
-  MSYS* | MINGW* )  msys=true    ;; #(
+    ;;
-  NONSTOP* )        nonstop=true ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
 esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
-
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
         # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD=$JAVA_HOME/jre/sh/java
+        JAVACMD="$JAVA_HOME/jre/sh/java"
     else
-        JAVACMD=$JAVA_HOME/bin/java
+        JAVACMD="$JAVA_HOME/bin/java"
     fi
     if [ ! -x "$JAVACMD" ] ; then
         die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -132,7 +97,7 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
     fi
 else
-    JAVACMD=java
+    JAVACMD="java"
     which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
@@ -140,95 +105,84 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    case $MAX_FD in #(
+    MAX_FD_LIMIT=`ulimit -H -n`
-      max*)
+    if [ $? -eq 0 ] ; then
-        MAX_FD=$( ulimit -H -n ) ||
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            warn "Could not query maximum file descriptor limit"
+            MAX_FD="$MAX_FD_LIMIT"
-    esac
+        fi
-    case $MAX_FD in  #(
+        ulimit -n $MAX_FD
-      '' | soft) :;; #(
+        if [ $? -ne 0 ] ; then
-      *)
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        ulimit -n "$MAX_FD" ||
+        fi
-            warn "Could not set maximum file descriptor limit to $MAX_FD"
+    else
-    esac
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
 fi
 
-# Collect all arguments for the java command, stacking in reverse order:
+# For Darwin, add options to specify how the application appears in the dock
-#   * args from the command line
+if $darwin; then
-#   * the main class name
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-#   * -classpath
+fi
-#   * -D...appname settings
-#   * --module-path (only if needed)
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
 
 # For Cygwin or MSYS, switch paths to Windows format before running java
-if "$cygwin" || "$msys" ; then
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
-    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
 
-    JAVACMD=$( cygpath --unix "$JAVACMD" )
+    # We build the pattern for arguments to be converted via cygpath
-
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    SEP=""
-    for arg do
+    for dir in $ROOTDIRSRAW ; do
-        if
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
-            case $arg in                                #(
+        SEP="|"
-              -*)   false ;;                            # don't mess with options #(
-              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
-                    [ -e "$t" ] ;;                      #(
-              *)    false ;;
-            esac
-        then
-            arg=$( cygpath --path --ignore --mixed "$arg" )
-        fi
-        # Roll the args list around exactly as many times as the number of
-        # args, so each arg winds up back in the position where it started, but
-        # possibly modified.
-        #
-        # NB: a `for` loop captures its iteration list before it begins, so
-        # changing the positional parameters here affects neither the number of
-        # iterations, nor the values presented in `arg`.
-        shift                   # remove old arg
-        set -- "$@" "$arg"      # push replacement arg
     done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
 fi
 
-# Collect all arguments for the java command;
+# Escape application args
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+save () {
-#     shell script including quotes and variable substitutions, so put them in
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-#     double quotes to make sure that they get re-expanded; and
+    echo " "
-#   * put everything else in single quotes, so that it's not re-expanded.
+}
+APP_ARGS=$(save "$@")
 
-set -- \
+# Collect all arguments for the java command, following the shell quoting and substitution rules
-        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
-        -classpath "$CLASSPATH" \
-        org.gradle.wrapper.GradleWrapperMain \
-        "$@"
 
-# Use "xargs" to parse quoted args.
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-#
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+  cd "$(dirname "$0")"
-#
+fi
-# In Bash we could simply go:
-#
-#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
-#   set -- "${ARGS[@]}" "$@"
-#
-# but POSIX shell has neither arrays nor command substitution, so instead we
-# post-process each arg (as a line of input to sed) to backslash-escape any
-# character that might be a shell metacharacter, then use eval to reverse
-# that process (while maintaining the separation between arguments), and wrap
-# the whole thing up as a single "set" statement.
-#
-# This will of course break if any of these variables contains a newline or
-# an unmatched quote.
-#
-
-eval "set -- $(
-        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
-        xargs -n1 |
-        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
-        tr '\n' ' '
-    )" '"$@"'
 
 exec "$JAVACMD" "$@"

gradlew-clean.bat

@@ -1 +0,0 @@
-./gradlew clean

gradlew-jar.bat

@@ -1,2 +0,0 @@
-call .\gradlew jar
-pause

gradlew.bat

@@ -1,89 +1,100 @@
-@rem
+@rem
-@rem Copyright 2015 the original author or authors.
+@rem Copyright 2015 the original author or authors.
-@rem
+@rem
-@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem Licensed under the Apache License, Version 2.0 (the "License");
-@rem you may not use this file except in compliance with the License.
+@rem you may not use this file except in compliance with the License.
-@rem You may obtain a copy of the License at
+@rem You may obtain a copy of the License at
-@rem
+@rem
-@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem      https://www.apache.org/licenses/LICENSE-2.0
-@rem
+@rem
-@rem Unless required by applicable law or agreed to in writing, software
+@rem Unless required by applicable law or agreed to in writing, software
-@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem distributed under the License is distributed on an "AS IS" BASIS,
-@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@rem See the License for the specific language governing permissions and
+@rem See the License for the specific language governing permissions and
-@rem limitations under the License.
+@rem limitations under the License.
-@rem
+@rem
-
+
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
+@rem ##########################################################################
-@rem
+@rem
-@rem  Gradle startup script for Windows
+@rem  Gradle startup script for Windows
-@rem
+@rem
-@rem ##########################################################################
+@rem ##########################################################################
-
+
-@rem Set local scope for the variables with windows NT shell
+@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
+if "%OS%"=="Windows_NT" setlocal
-
+
-set DIRNAME=%~dp0
+set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
+set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
+set APP_HOME=%DIRNAME%
-
+
-@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
-
+
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+@rem Find java.exe
-set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+if defined JAVA_HOME goto findJavaFromJavaHome
-
+
-@rem Find java.exe
+set JAVA_EXE=java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
+%JAVA_EXE% -version >NUL 2>&1
-
+if "%ERRORLEVEL%" == "0" goto init
-set JAVA_EXE=java.exe
+
-%JAVA_EXE% -version >NUL 2>&1
+echo.
-if "%ERRORLEVEL%" == "0" goto execute
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-
+echo.
-echo.
+echo Please set the JAVA_HOME variable in your environment to match the
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo location of your Java installation.
-echo.
+
-echo Please set the JAVA_HOME variable in your environment to match the
+goto fail
-echo location of your Java installation.
+
-
+:findJavaFromJavaHome
-goto fail
+set JAVA_HOME=%JAVA_HOME:"=%
-
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-:findJavaFromJavaHome
+
-set JAVA_HOME=%JAVA_HOME:"=%
+if exist "%JAVA_EXE%" goto init
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
-
+echo.
-if exist "%JAVA_EXE%" goto execute
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-
+echo.
-echo.
+echo Please set the JAVA_HOME variable in your environment to match the
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo location of your Java installation.
-echo.
+
-echo Please set the JAVA_HOME variable in your environment to match the
+goto fail
-echo location of your Java installation.
+
-
+:init
-goto fail
+@rem Get command-line arguments, handling Windows variants
-
+
-:execute
+if not "%OS%" == "Windows_NT" goto win9xME_args
-@rem Setup the command line
+
-
+:win9xME_args
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+@rem Slurp the command line arguments.
-
+set CMD_LINE_ARGS=
-
+set _SKIP=2
-@rem Execute Gradle
+
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+:win9xME_args_slurp
-
+if "x%~1" == "x" goto execute
-:end
+
-@rem End local scope for the variables with windows NT shell
+set CMD_LINE_ARGS=%*
-if "%ERRORLEVEL%"=="0" goto mainEnd
+
-
+:execute
-:fail
+@rem Setup the command line
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+
-rem the _cmd.exe /c_ return code!
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+
-exit /b 1
+@rem Execute Gradle
-
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
-:mainEnd
+
-if "%OS%"=="Windows_NT" endlocal
+:end
-
+@rem End local scope for the variables with windows NT shell
-:omega
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega

install.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-# Grasscutter install script for GNU/Linux
+# Grasscutter install script for linux
 # Made by TurtleIdiot
 
 # Stops the installer if any command has a non-zero exit status

install_without_dependencies.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-# Grasscutter install script for GNU/Linux - Simpler version
+# Grasscutter install script for linux - Simpler version
 # This installer doesn't ask you to install dependencies, you have to install them manually
 # Made by TurtleIdiot and modified by syktyvkar (and then again modified by Blue)
 

src/generated/main/java/emu/grasscutter/net/proto/AbilityActionGenerateElemBallOuterClass.java

@@ -19,46 +19,42 @@ public final class AbilityActionGenerateElemBallOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 room_id = 3;</code>
+     * <code>uint32 room_id = 2;</code>
      * @return The roomId.
      */
     int getRoomId();
 
     /**
-     * <code>.Vector rot = 12;</code>
+     * <code>.Vector pos = 7;</code>
-     * @return Whether the rot field is set.
-     */
-    boolean hasRot();
-    /**
-     * <code>.Vector rot = 12;</code>
-     * @return The rot.
-     */
-    emu.grasscutter.net.proto.VectorOuterClass.Vector getRot();
-    /**
-     * <code>.Vector rot = 12;</code>
-     */
-    emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getRotOrBuilder();
-
-    /**
-     * <code>.Vector pos = 1;</code>
      * @return Whether the pos field is set.
      */
     boolean hasPos();
     /**
-     * <code>.Vector pos = 1;</code>
+     * <code>.Vector pos = 7;</code>
      * @return The pos.
      */
     emu.grasscutter.net.proto.VectorOuterClass.Vector getPos();
     /**
-     * <code>.Vector pos = 1;</code>
+     * <code>.Vector pos = 7;</code>
      */
     emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPosOrBuilder();
+
+    /**
+     * <code>.Vector rot = 13;</code>
+     * @return Whether the rot field is set.
+     */
+    boolean hasRot();
+    /**
+     * <code>.Vector rot = 13;</code>
+     * @return The rot.
+     */
+    emu.grasscutter.net.proto.VectorOuterClass.Vector getRot();
+    /**
+     * <code>.Vector rot = 13;</code>
+     */
+    emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getRotOrBuilder();
   }
   /**
-   * <pre>
-   * Name: CEJDDBMAHGE
-   * </pre>
-   *
    * Protobuf type {@code AbilityActionGenerateElemBall}
    */
   public static final class AbilityActionGenerateElemBall extends
@@ -103,7 +99,12 @@ public final class AbilityActionGenerateElemBallOuterClass {
             case 0:
               done = true;
               break;
-            case 10: {
+            case 16: {
+
+              roomId_ = input.readUInt32();
+              break;
+            }
+            case 58: {
               emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder subBuilder = null;
               if (pos_ != null) {
                 subBuilder = pos_.toBuilder();
@@ -116,12 +117,7 @@ public final class AbilityActionGenerateElemBallOuterClass {
 
               break;
             }
-            case 24: {
+            case 106: {
-
-              roomId_ = input.readUInt32();
-              break;
-            }
-            case 98: {
               emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder subBuilder = null;
               if (rot_ != null) {
                 subBuilder = rot_.toBuilder();
@@ -166,10 +162,10 @@ public final class AbilityActionGenerateElemBallOuterClass {
               emu.grasscutter.net.proto.AbilityActionGenerateElemBallOuterClass.AbilityActionGenerateElemBall.class, emu.grasscutter.net.proto.AbilityActionGenerateElemBallOuterClass.AbilityActionGenerateElemBall.Builder.class);
     }
 
-    public static final int ROOM_ID_FIELD_NUMBER = 3;
+    public static final int ROOM_ID_FIELD_NUMBER = 2;
     private int roomId_;
     /**
-     * <code>uint32 room_id = 3;</code>
+     * <code>uint32 room_id = 2;</code>
      * @return The roomId.
      */
     @java.lang.Override
@@ -177,36 +173,10 @@ public final class AbilityActionGenerateElemBallOuterClass {
       return roomId_;
     }
 
-    public static final int ROT_FIELD_NUMBER = 12;
+    public static final int POS_FIELD_NUMBER = 7;
-    private emu.grasscutter.net.proto.VectorOuterClass.Vector rot_;
-    /**
-     * <code>.Vector rot = 12;</code>
-     * @return Whether the rot field is set.
-     */
-    @java.lang.Override
-    public boolean hasRot() {
-      return rot_ != null;
-    }
-    /**
-     * <code>.Vector rot = 12;</code>
-     * @return The rot.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.VectorOuterClass.Vector getRot() {
-      return rot_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : rot_;
-    }
-    /**
-     * <code>.Vector rot = 12;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getRotOrBuilder() {
-      return getRot();
-    }
-
-    public static final int POS_FIELD_NUMBER = 1;
     private emu.grasscutter.net.proto.VectorOuterClass.Vector pos_;
     /**
-     * <code>.Vector pos = 1;</code>
+     * <code>.Vector pos = 7;</code>
      * @return Whether the pos field is set.
      */
     @java.lang.Override
@@ -214,7 +184,7 @@ public final class AbilityActionGenerateElemBallOuterClass {
       return pos_ != null;
     }
     /**
-     * <code>.Vector pos = 1;</code>
+     * <code>.Vector pos = 7;</code>
      * @return The pos.
      */
     @java.lang.Override
@@ -222,13 +192,39 @@ public final class AbilityActionGenerateElemBallOuterClass {
       return pos_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : pos_;
     }
     /**
-     * <code>.Vector pos = 1;</code>
+     * <code>.Vector pos = 7;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPosOrBuilder() {
       return getPos();
     }
 
+    public static final int ROT_FIELD_NUMBER = 13;
+    private emu.grasscutter.net.proto.VectorOuterClass.Vector rot_;
+    /**
+     * <code>.Vector rot = 13;</code>
+     * @return Whether the rot field is set.
+     */
+    @java.lang.Override
+    public boolean hasRot() {
+      return rot_ != null;
+    }
+    /**
+     * <code>.Vector rot = 13;</code>
+     * @return The rot.
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.VectorOuterClass.Vector getRot() {
+      return rot_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : rot_;
+    }
+    /**
+     * <code>.Vector rot = 13;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getRotOrBuilder() {
+      return getRot();
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -243,14 +239,14 @@ public final class AbilityActionGenerateElemBallOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (pos_ != null) {
-        output.writeMessage(1, getPos());
-      }
       if (roomId_ != 0) {
-        output.writeUInt32(3, roomId_);
+        output.writeUInt32(2, roomId_);
+      }
+      if (pos_ != null) {
+        output.writeMessage(7, getPos());
       }
       if (rot_ != null) {
-        output.writeMessage(12, getRot());
+        output.writeMessage(13, getRot());
       }
       unknownFields.writeTo(output);
     }
@@ -261,17 +257,17 @@ public final class AbilityActionGenerateElemBallOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (pos_ != null) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(1, getPos());
-      }
       if (roomId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(3, roomId_);
+          .computeUInt32Size(2, roomId_);
+      }
+      if (pos_ != null) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(7, getPos());
       }
       if (rot_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(12, getRot());
+          .computeMessageSize(13, getRot());
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -290,16 +286,16 @@ public final class AbilityActionGenerateElemBallOuterClass {
 
       if (getRoomId()
           != other.getRoomId()) return false;
-      if (hasRot() != other.hasRot()) return false;
-      if (hasRot()) {
-        if (!getRot()
-            .equals(other.getRot())) return false;
-      }
       if (hasPos() != other.hasPos()) return false;
       if (hasPos()) {
         if (!getPos()
             .equals(other.getPos())) return false;
       }
+      if (hasRot() != other.hasRot()) return false;
+      if (hasRot()) {
+        if (!getRot()
+            .equals(other.getRot())) return false;
+      }
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -313,14 +309,14 @@ public final class AbilityActionGenerateElemBallOuterClass {
       hash = (19 * hash) + getDescriptor().hashCode();
       hash = (37 * hash) + ROOM_ID_FIELD_NUMBER;
       hash = (53 * hash) + getRoomId();
-      if (hasRot()) {
-        hash = (37 * hash) + ROT_FIELD_NUMBER;
-        hash = (53 * hash) + getRot().hashCode();
-      }
       if (hasPos()) {
         hash = (37 * hash) + POS_FIELD_NUMBER;
         hash = (53 * hash) + getPos().hashCode();
       }
+      if (hasRot()) {
+        hash = (37 * hash) + ROT_FIELD_NUMBER;
+        hash = (53 * hash) + getRot().hashCode();
+      }
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -417,10 +413,6 @@ public final class AbilityActionGenerateElemBallOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Name: CEJDDBMAHGE
-     * </pre>
-     *
      * Protobuf type {@code AbilityActionGenerateElemBall}
      */
     public static final class Builder extends
@@ -460,18 +452,18 @@ public final class AbilityActionGenerateElemBallOuterClass {
         super.clear();
         roomId_ = 0;
 
-        if (rotBuilder_ == null) {
-          rot_ = null;
-        } else {
-          rot_ = null;
-          rotBuilder_ = null;
-        }
         if (posBuilder_ == null) {
           pos_ = null;
         } else {
           pos_ = null;
           posBuilder_ = null;
         }
+        if (rotBuilder_ == null) {
+          rot_ = null;
+        } else {
+          rot_ = null;
+          rotBuilder_ = null;
+        }
         return this;
       }
 
@@ -499,16 +491,16 @@ public final class AbilityActionGenerateElemBallOuterClass {
       public emu.grasscutter.net.proto.AbilityActionGenerateElemBallOuterClass.AbilityActionGenerateElemBall buildPartial() {
         emu.grasscutter.net.proto.AbilityActionGenerateElemBallOuterClass.AbilityActionGenerateElemBall result = new emu.grasscutter.net.proto.AbilityActionGenerateElemBallOuterClass.AbilityActionGenerateElemBall(this);
         result.roomId_ = roomId_;
-        if (rotBuilder_ == null) {
-          result.rot_ = rot_;
-        } else {
-          result.rot_ = rotBuilder_.build();
-        }
         if (posBuilder_ == null) {
           result.pos_ = pos_;
         } else {
           result.pos_ = posBuilder_.build();
         }
+        if (rotBuilder_ == null) {
+          result.rot_ = rot_;
+        } else {
+          result.rot_ = rotBuilder_.build();
+        }
         onBuilt();
         return result;
       }
@@ -560,12 +552,12 @@ public final class AbilityActionGenerateElemBallOuterClass {
         if (other.getRoomId() != 0) {
           setRoomId(other.getRoomId());
         }
-        if (other.hasRot()) {
-          mergeRot(other.getRot());
-        }
         if (other.hasPos()) {
           mergePos(other.getPos());
         }
+        if (other.hasRot()) {
+          mergeRot(other.getRot());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -597,7 +589,7 @@ public final class AbilityActionGenerateElemBallOuterClass {
 
       private int roomId_ ;
       /**
-       * <code>uint32 room_id = 3;</code>
+       * <code>uint32 room_id = 2;</code>
        * @return The roomId.
        */
       @java.lang.Override
@@ -605,7 +597,7 @@ public final class AbilityActionGenerateElemBallOuterClass {
         return roomId_;
       }
       /**
-       * <code>uint32 room_id = 3;</code>
+       * <code>uint32 room_id = 2;</code>
        * @param value The roomId to set.
        * @return This builder for chaining.
        */
@@ -616,7 +608,7 @@ public final class AbilityActionGenerateElemBallOuterClass {
         return this;
       }
       /**
-       * <code>uint32 room_id = 3;</code>
+       * <code>uint32 room_id = 2;</code>
        * @return This builder for chaining.
        */
       public Builder clearRoomId() {
@@ -626,137 +618,18 @@ public final class AbilityActionGenerateElemBallOuterClass {
         return this;
       }
 
-      private emu.grasscutter.net.proto.VectorOuterClass.Vector rot_;
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> rotBuilder_;
-      /**
-       * <code>.Vector rot = 12;</code>
-       * @return Whether the rot field is set.
-       */
-      public boolean hasRot() {
-        return rotBuilder_ != null || rot_ != null;
-      }
-      /**
-       * <code>.Vector rot = 12;</code>
-       * @return The rot.
-       */
-      public emu.grasscutter.net.proto.VectorOuterClass.Vector getRot() {
-        if (rotBuilder_ == null) {
-          return rot_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : rot_;
-        } else {
-          return rotBuilder_.getMessage();
-        }
-      }
-      /**
-       * <code>.Vector rot = 12;</code>
-       */
-      public Builder setRot(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
-        if (rotBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          rot_ = value;
-          onChanged();
-        } else {
-          rotBuilder_.setMessage(value);
-        }
-
-        return this;
-      }
-      /**
-       * <code>.Vector rot = 12;</code>
-       */
-      public Builder setRot(
-          emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) {
-        if (rotBuilder_ == null) {
-          rot_ = builderForValue.build();
-          onChanged();
-        } else {
-          rotBuilder_.setMessage(builderForValue.build());
-        }
-
-        return this;
-      }
-      /**
-       * <code>.Vector rot = 12;</code>
-       */
-      public Builder mergeRot(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
-        if (rotBuilder_ == null) {
-          if (rot_ != null) {
-            rot_ =
-              emu.grasscutter.net.proto.VectorOuterClass.Vector.newBuilder(rot_).mergeFrom(value).buildPartial();
-          } else {
-            rot_ = value;
-          }
-          onChanged();
-        } else {
-          rotBuilder_.mergeFrom(value);
-        }
-
-        return this;
-      }
-      /**
-       * <code>.Vector rot = 12;</code>
-       */
-      public Builder clearRot() {
-        if (rotBuilder_ == null) {
-          rot_ = null;
-          onChanged();
-        } else {
-          rot_ = null;
-          rotBuilder_ = null;
-        }
-
-        return this;
-      }
-      /**
-       * <code>.Vector rot = 12;</code>
-       */
-      public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getRotBuilder() {
-        
-        onChanged();
-        return getRotFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.Vector rot = 12;</code>
-       */
-      public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getRotOrBuilder() {
-        if (rotBuilder_ != null) {
-          return rotBuilder_.getMessageOrBuilder();
-        } else {
-          return rot_ == null ?
-              emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : rot_;
-        }
-      }
-      /**
-       * <code>.Vector rot = 12;</code>
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> 
-          getRotFieldBuilder() {
-        if (rotBuilder_ == null) {
-          rotBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder>(
-                  getRot(),
-                  getParentForChildren(),
-                  isClean());
-          rot_ = null;
-        }
-        return rotBuilder_;
-      }
-
       private emu.grasscutter.net.proto.VectorOuterClass.Vector pos_;
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> posBuilder_;
       /**
-       * <code>.Vector pos = 1;</code>
+       * <code>.Vector pos = 7;</code>
        * @return Whether the pos field is set.
        */
       public boolean hasPos() {
         return posBuilder_ != null || pos_ != null;
       }
       /**
-       * <code>.Vector pos = 1;</code>
+       * <code>.Vector pos = 7;</code>
        * @return The pos.
        */
       public emu.grasscutter.net.proto.VectorOuterClass.Vector getPos() {
@@ -767,7 +640,7 @@ public final class AbilityActionGenerateElemBallOuterClass {
         }
       }
       /**
-       * <code>.Vector pos = 1;</code>
+       * <code>.Vector pos = 7;</code>
        */
       public Builder setPos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
         if (posBuilder_ == null) {
@@ -783,7 +656,7 @@ public final class AbilityActionGenerateElemBallOuterClass {
         return this;
       }
       /**
-       * <code>.Vector pos = 1;</code>
+       * <code>.Vector pos = 7;</code>
        */
       public Builder setPos(
           emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) {
@@ -797,7 +670,7 @@ public final class AbilityActionGenerateElemBallOuterClass {
         return this;
       }
       /**
-       * <code>.Vector pos = 1;</code>
+       * <code>.Vector pos = 7;</code>
        */
       public Builder mergePos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
         if (posBuilder_ == null) {
@@ -815,7 +688,7 @@ public final class AbilityActionGenerateElemBallOuterClass {
         return this;
       }
       /**
-       * <code>.Vector pos = 1;</code>
+       * <code>.Vector pos = 7;</code>
        */
       public Builder clearPos() {
         if (posBuilder_ == null) {
@@ -829,7 +702,7 @@ public final class AbilityActionGenerateElemBallOuterClass {
         return this;
       }
       /**
-       * <code>.Vector pos = 1;</code>
+       * <code>.Vector pos = 7;</code>
        */
       public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getPosBuilder() {
         
@@ -837,7 +710,7 @@ public final class AbilityActionGenerateElemBallOuterClass {
         return getPosFieldBuilder().getBuilder();
       }
       /**
-       * <code>.Vector pos = 1;</code>
+       * <code>.Vector pos = 7;</code>
        */
       public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPosOrBuilder() {
         if (posBuilder_ != null) {
@@ -848,7 +721,7 @@ public final class AbilityActionGenerateElemBallOuterClass {
         }
       }
       /**
-       * <code>.Vector pos = 1;</code>
+       * <code>.Vector pos = 7;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> 
@@ -863,6 +736,125 @@ public final class AbilityActionGenerateElemBallOuterClass {
         }
         return posBuilder_;
       }
+
+      private emu.grasscutter.net.proto.VectorOuterClass.Vector rot_;
+      private com.google.protobuf.SingleFieldBuilderV3<
+          emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> rotBuilder_;
+      /**
+       * <code>.Vector rot = 13;</code>
+       * @return Whether the rot field is set.
+       */
+      public boolean hasRot() {
+        return rotBuilder_ != null || rot_ != null;
+      }
+      /**
+       * <code>.Vector rot = 13;</code>
+       * @return The rot.
+       */
+      public emu.grasscutter.net.proto.VectorOuterClass.Vector getRot() {
+        if (rotBuilder_ == null) {
+          return rot_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : rot_;
+        } else {
+          return rotBuilder_.getMessage();
+        }
+      }
+      /**
+       * <code>.Vector rot = 13;</code>
+       */
+      public Builder setRot(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
+        if (rotBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          rot_ = value;
+          onChanged();
+        } else {
+          rotBuilder_.setMessage(value);
+        }
+
+        return this;
+      }
+      /**
+       * <code>.Vector rot = 13;</code>
+       */
+      public Builder setRot(
+          emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) {
+        if (rotBuilder_ == null) {
+          rot_ = builderForValue.build();
+          onChanged();
+        } else {
+          rotBuilder_.setMessage(builderForValue.build());
+        }
+
+        return this;
+      }
+      /**
+       * <code>.Vector rot = 13;</code>
+       */
+      public Builder mergeRot(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
+        if (rotBuilder_ == null) {
+          if (rot_ != null) {
+            rot_ =
+              emu.grasscutter.net.proto.VectorOuterClass.Vector.newBuilder(rot_).mergeFrom(value).buildPartial();
+          } else {
+            rot_ = value;
+          }
+          onChanged();
+        } else {
+          rotBuilder_.mergeFrom(value);
+        }
+
+        return this;
+      }
+      /**
+       * <code>.Vector rot = 13;</code>
+       */
+      public Builder clearRot() {
+        if (rotBuilder_ == null) {
+          rot_ = null;
+          onChanged();
+        } else {
+          rot_ = null;
+          rotBuilder_ = null;
+        }
+
+        return this;
+      }
+      /**
+       * <code>.Vector rot = 13;</code>
+       */
+      public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getRotBuilder() {
+        
+        onChanged();
+        return getRotFieldBuilder().getBuilder();
+      }
+      /**
+       * <code>.Vector rot = 13;</code>
+       */
+      public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getRotOrBuilder() {
+        if (rotBuilder_ != null) {
+          return rotBuilder_.getMessageOrBuilder();
+        } else {
+          return rot_ == null ?
+              emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : rot_;
+        }
+      }
+      /**
+       * <code>.Vector rot = 13;</code>
+       */
+      private com.google.protobuf.SingleFieldBuilderV3<
+          emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> 
+          getRotFieldBuilder() {
+        if (rotBuilder_ == null) {
+          rotBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+              emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder>(
+                  getRot(),
+                  getParentForChildren(),
+                  isClean());
+          rot_ = null;
+        }
+        return rotBuilder_;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -932,8 +924,8 @@ public final class AbilityActionGenerateElemBallOuterClass {
     java.lang.String[] descriptorData = {
       "\n#AbilityActionGenerateElemBall.proto\032\014V" +
       "ector.proto\"\\\n\035AbilityActionGenerateElem" +
-      "Ball\022\017\n\007room_id\030\003 \001(\r\022\024\n\003rot\030\014 \001(\0132\007.Vec" +
+      "Ball\022\017\n\007room_id\030\002 \001(\r\022\024\n\003pos\030\007 \001(\0132\007.Vec" +
-      "tor\022\024\n\003pos\030\001 \001(\0132\007.VectorB\033\n\031emu.grasscu" +
+      "tor\022\024\n\003rot\030\r \001(\0132\007.VectorB\033\n\031emu.grasscu" +
       "tter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -946,7 +938,7 @@ public final class AbilityActionGenerateElemBallOuterClass {
     internal_static_AbilityActionGenerateElemBall_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_AbilityActionGenerateElemBall_descriptor,
-        new java.lang.String[] { "RoomId", "Rot", "Pos", });
+        new java.lang.String[] { "RoomId", "Pos", "Rot", });
     emu.grasscutter.net.proto.VectorOuterClass.getDescriptor();
   }
 

src/generated/main/java/emu/grasscutter/net/proto/AbilityAppliedAbilityOuterClass.java

@@ -79,10 +79,6 @@ public final class AbilityAppliedAbilityOuterClass {
     int getInstancedAbilityId();
   }
   /**
-   * <pre>
-   * Name: JOMDPHKGKJO
-   * </pre>
-   *
    * Protobuf type {@code AbilityAppliedAbility}
    */
   public static final class AbilityAppliedAbility extends
@@ -508,10 +504,6 @@ public final class AbilityAppliedAbilityOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Name: JOMDPHKGKJO
-     * </pre>
-     *
      * Protobuf type {@code AbilityAppliedAbility}
      */
     public static final class Builder extends

src/generated/main/java/emu/grasscutter/net/proto/AbilityAppliedModifierOuterClass.java

@@ -133,10 +133,6 @@ public final class AbilityAppliedModifierOuterClass {
     boolean getIsServerbuffModifier();
   }
   /**
-   * <pre>
-   * Name: PAECICKHAKH
-   * </pre>
-   *
    * Protobuf type {@code AbilityAppliedModifier}
    */
   public static final class AbilityAppliedModifier extends
@@ -825,10 +821,6 @@ public final class AbilityAppliedModifierOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Name: PAECICKHAKH
-     * </pre>
-     *
      * Protobuf type {@code AbilityAppliedModifier}
      */
     public static final class Builder extends

src/generated/main/java/emu/grasscutter/net/proto/AbilityAttachedModifierOuterClass.java

@@ -49,10 +49,6 @@ public final class AbilityAttachedModifierOuterClass {
     int getAttachNameHash();
   }
   /**
-   * <pre>
-   * Name: JFHLNEBEOAA
-   * </pre>
-   *
    * Protobuf type {@code AbilityAttachedModifier}
    */
   public static final class AbilityAttachedModifier extends
@@ -411,10 +407,6 @@ public final class AbilityAttachedModifierOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Name: JFHLNEBEOAA
-     * </pre>
-     *
      * Protobuf type {@code AbilityAttachedModifier}
      */
     public static final class Builder extends

src/generated/main/java/emu/grasscutter/net/proto/AbilityChangeNotifyOuterClass.java

@@ -19,30 +19,32 @@ public final class AbilityChangeNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>.AbilityControlBlock ability_control_block = 12;</code>
+     * <code>uint32 entity_id = 1;</code>
+     * @return The entityId.
+     */
+    int getEntityId();
+
+    /**
+     * <code>.AbilityControlBlock ability_control_block = 15;</code>
      * @return Whether the abilityControlBlock field is set.
      */
     boolean hasAbilityControlBlock();
     /**
-     * <code>.AbilityControlBlock ability_control_block = 12;</code>
+     * <code>.AbilityControlBlock ability_control_block = 15;</code>
      * @return The abilityControlBlock.
      */
     emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock getAbilityControlBlock();
     /**
-     * <code>.AbilityControlBlock ability_control_block = 12;</code>
+     * <code>.AbilityControlBlock ability_control_block = 15;</code>
      */
     emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlockOrBuilder getAbilityControlBlockOrBuilder();
-
-    /**
-     * <code>uint32 entity_id = 2;</code>
-     * @return The entityId.
-     */
-    int getEntityId();
   }
   /**
    * <pre>
-   * Name: FGNFEPLECFC
+   * CmdId: 1131
-   * CmdId: 1159
+   * EnetChannelId: 0
+   * EnetIsReliable: false
+   * IsAllowClient: true
    * </pre>
    *
    * Protobuf type {@code AbilityChangeNotify}
@@ -89,12 +91,12 @@ public final class AbilityChangeNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 16: {
+            case 8: {
 
               entityId_ = input.readUInt32();
               break;
             }
-            case 98: {
+            case 122: {
               emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock.Builder subBuilder = null;
               if (abilityControlBlock_ != null) {
                 subBuilder = abilityControlBlock_.toBuilder();
@@ -139,10 +141,21 @@ public final class AbilityChangeNotifyOuterClass {
               emu.grasscutter.net.proto.AbilityChangeNotifyOuterClass.AbilityChangeNotify.class, emu.grasscutter.net.proto.AbilityChangeNotifyOuterClass.AbilityChangeNotify.Builder.class);
     }
 
-    public static final int ABILITY_CONTROL_BLOCK_FIELD_NUMBER = 12;
+    public static final int ENTITY_ID_FIELD_NUMBER = 1;
+    private int entityId_;
+    /**
+     * <code>uint32 entity_id = 1;</code>
+     * @return The entityId.
+     */
+    @java.lang.Override
+    public int getEntityId() {
+      return entityId_;
+    }
+
+    public static final int ABILITY_CONTROL_BLOCK_FIELD_NUMBER = 15;
     private emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock abilityControlBlock_;
     /**
-     * <code>.AbilityControlBlock ability_control_block = 12;</code>
+     * <code>.AbilityControlBlock ability_control_block = 15;</code>
      * @return Whether the abilityControlBlock field is set.
      */
     @java.lang.Override
@@ -150,7 +163,7 @@ public final class AbilityChangeNotifyOuterClass {
       return abilityControlBlock_ != null;
     }
     /**
-     * <code>.AbilityControlBlock ability_control_block = 12;</code>
+     * <code>.AbilityControlBlock ability_control_block = 15;</code>
      * @return The abilityControlBlock.
      */
     @java.lang.Override
@@ -158,24 +171,13 @@ public final class AbilityChangeNotifyOuterClass {
       return abilityControlBlock_ == null ? emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock.getDefaultInstance() : abilityControlBlock_;
     }
     /**
-     * <code>.AbilityControlBlock ability_control_block = 12;</code>
+     * <code>.AbilityControlBlock ability_control_block = 15;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlockOrBuilder getAbilityControlBlockOrBuilder() {
       return getAbilityControlBlock();
     }
 
-    public static final int ENTITY_ID_FIELD_NUMBER = 2;
-    private int entityId_;
-    /**
-     * <code>uint32 entity_id = 2;</code>
-     * @return The entityId.
-     */
-    @java.lang.Override
-    public int getEntityId() {
-      return entityId_;
-    }
-
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -191,10 +193,10 @@ public final class AbilityChangeNotifyOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (entityId_ != 0) {
-        output.writeUInt32(2, entityId_);
+        output.writeUInt32(1, entityId_);
       }
       if (abilityControlBlock_ != null) {
-        output.writeMessage(12, getAbilityControlBlock());
+        output.writeMessage(15, getAbilityControlBlock());
       }
       unknownFields.writeTo(output);
     }
@@ -207,11 +209,11 @@ public final class AbilityChangeNotifyOuterClass {
       size = 0;
       if (entityId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(2, entityId_);
+          .computeUInt32Size(1, entityId_);
       }
       if (abilityControlBlock_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(12, getAbilityControlBlock());
+          .computeMessageSize(15, getAbilityControlBlock());
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -228,13 +230,13 @@ public final class AbilityChangeNotifyOuterClass {
       }
       emu.grasscutter.net.proto.AbilityChangeNotifyOuterClass.AbilityChangeNotify other = (emu.grasscutter.net.proto.AbilityChangeNotifyOuterClass.AbilityChangeNotify) obj;
 
+      if (getEntityId()
+          != other.getEntityId()) return false;
       if (hasAbilityControlBlock() != other.hasAbilityControlBlock()) return false;
       if (hasAbilityControlBlock()) {
         if (!getAbilityControlBlock()
             .equals(other.getAbilityControlBlock())) return false;
       }
-      if (getEntityId()
-          != other.getEntityId()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -246,12 +248,12 @@ public final class AbilityChangeNotifyOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
+      hash = (37 * hash) + ENTITY_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getEntityId();
       if (hasAbilityControlBlock()) {
         hash = (37 * hash) + ABILITY_CONTROL_BLOCK_FIELD_NUMBER;
         hash = (53 * hash) + getAbilityControlBlock().hashCode();
       }
-      hash = (37 * hash) + ENTITY_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getEntityId();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -349,8 +351,10 @@ public final class AbilityChangeNotifyOuterClass {
     }
     /**
      * <pre>
-     * Name: FGNFEPLECFC
+     * CmdId: 1131
-     * CmdId: 1159
+     * EnetChannelId: 0
+     * EnetIsReliable: false
+     * IsAllowClient: true
      * </pre>
      *
      * Protobuf type {@code AbilityChangeNotify}
@@ -390,14 +394,14 @@ public final class AbilityChangeNotifyOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        entityId_ = 0;
+
         if (abilityControlBlockBuilder_ == null) {
           abilityControlBlock_ = null;
         } else {
           abilityControlBlock_ = null;
           abilityControlBlockBuilder_ = null;
         }
-        entityId_ = 0;
-
         return this;
       }
 
@@ -424,12 +428,12 @@ public final class AbilityChangeNotifyOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.AbilityChangeNotifyOuterClass.AbilityChangeNotify buildPartial() {
         emu.grasscutter.net.proto.AbilityChangeNotifyOuterClass.AbilityChangeNotify result = new emu.grasscutter.net.proto.AbilityChangeNotifyOuterClass.AbilityChangeNotify(this);
+        result.entityId_ = entityId_;
         if (abilityControlBlockBuilder_ == null) {
           result.abilityControlBlock_ = abilityControlBlock_;
         } else {
           result.abilityControlBlock_ = abilityControlBlockBuilder_.build();
         }
-        result.entityId_ = entityId_;
         onBuilt();
         return result;
       }
@@ -478,12 +482,12 @@ public final class AbilityChangeNotifyOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.AbilityChangeNotifyOuterClass.AbilityChangeNotify other) {
         if (other == emu.grasscutter.net.proto.AbilityChangeNotifyOuterClass.AbilityChangeNotify.getDefaultInstance()) return this;
-        if (other.hasAbilityControlBlock()) {
-          mergeAbilityControlBlock(other.getAbilityControlBlock());
-        }
         if (other.getEntityId() != 0) {
           setEntityId(other.getEntityId());
         }
+        if (other.hasAbilityControlBlock()) {
+          mergeAbilityControlBlock(other.getAbilityControlBlock());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -513,18 +517,49 @@ public final class AbilityChangeNotifyOuterClass {
         return this;
       }
 
+      private int entityId_ ;
+      /**
+       * <code>uint32 entity_id = 1;</code>
+       * @return The entityId.
+       */
+      @java.lang.Override
+      public int getEntityId() {
+        return entityId_;
+      }
+      /**
+       * <code>uint32 entity_id = 1;</code>
+       * @param value The entityId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setEntityId(int value) {
+        
+        entityId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 entity_id = 1;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearEntityId() {
+        
+        entityId_ = 0;
+        onChanged();
+        return this;
+      }
+
       private emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock abilityControlBlock_;
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock, emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock.Builder, emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlockOrBuilder> abilityControlBlockBuilder_;
       /**
-       * <code>.AbilityControlBlock ability_control_block = 12;</code>
+       * <code>.AbilityControlBlock ability_control_block = 15;</code>
        * @return Whether the abilityControlBlock field is set.
        */
       public boolean hasAbilityControlBlock() {
         return abilityControlBlockBuilder_ != null || abilityControlBlock_ != null;
       }
       /**
-       * <code>.AbilityControlBlock ability_control_block = 12;</code>
+       * <code>.AbilityControlBlock ability_control_block = 15;</code>
        * @return The abilityControlBlock.
        */
       public emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock getAbilityControlBlock() {
@@ -535,7 +570,7 @@ public final class AbilityChangeNotifyOuterClass {
         }
       }
       /**
-       * <code>.AbilityControlBlock ability_control_block = 12;</code>
+       * <code>.AbilityControlBlock ability_control_block = 15;</code>
        */
       public Builder setAbilityControlBlock(emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock value) {
         if (abilityControlBlockBuilder_ == null) {
@@ -551,7 +586,7 @@ public final class AbilityChangeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.AbilityControlBlock ability_control_block = 12;</code>
+       * <code>.AbilityControlBlock ability_control_block = 15;</code>
        */
       public Builder setAbilityControlBlock(
           emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock.Builder builderForValue) {
@@ -565,7 +600,7 @@ public final class AbilityChangeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.AbilityControlBlock ability_control_block = 12;</code>
+       * <code>.AbilityControlBlock ability_control_block = 15;</code>
        */
       public Builder mergeAbilityControlBlock(emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock value) {
         if (abilityControlBlockBuilder_ == null) {
@@ -583,7 +618,7 @@ public final class AbilityChangeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.AbilityControlBlock ability_control_block = 12;</code>
+       * <code>.AbilityControlBlock ability_control_block = 15;</code>
        */
       public Builder clearAbilityControlBlock() {
         if (abilityControlBlockBuilder_ == null) {
@@ -597,7 +632,7 @@ public final class AbilityChangeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.AbilityControlBlock ability_control_block = 12;</code>
+       * <code>.AbilityControlBlock ability_control_block = 15;</code>
        */
       public emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock.Builder getAbilityControlBlockBuilder() {
         
@@ -605,7 +640,7 @@ public final class AbilityChangeNotifyOuterClass {
         return getAbilityControlBlockFieldBuilder().getBuilder();
       }
       /**
-       * <code>.AbilityControlBlock ability_control_block = 12;</code>
+       * <code>.AbilityControlBlock ability_control_block = 15;</code>
        */
       public emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlockOrBuilder getAbilityControlBlockOrBuilder() {
         if (abilityControlBlockBuilder_ != null) {
@@ -616,7 +651,7 @@ public final class AbilityChangeNotifyOuterClass {
         }
       }
       /**
-       * <code>.AbilityControlBlock ability_control_block = 12;</code>
+       * <code>.AbilityControlBlock ability_control_block = 15;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock, emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock.Builder, emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlockOrBuilder> 
@@ -631,37 +666,6 @@ public final class AbilityChangeNotifyOuterClass {
         }
         return abilityControlBlockBuilder_;
       }
-
-      private int entityId_ ;
-      /**
-       * <code>uint32 entity_id = 2;</code>
-       * @return The entityId.
-       */
-      @java.lang.Override
-      public int getEntityId() {
-        return entityId_;
-      }
-      /**
-       * <code>uint32 entity_id = 2;</code>
-       * @param value The entityId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setEntityId(int value) {
-        
-        entityId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 entity_id = 2;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearEntityId() {
-        
-        entityId_ = 0;
-        onChanged();
-        return this;
-      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -730,9 +734,9 @@ public final class AbilityChangeNotifyOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\031AbilityChangeNotify.proto\032\031AbilityCont" +
-      "rolBlock.proto\"]\n\023AbilityChangeNotify\0223\n" +
+      "rolBlock.proto\"]\n\023AbilityChangeNotify\022\021\n" +
-      "\025ability_control_block\030\014 \001(\0132\024.AbilityCo" +
+      "\tentity_id\030\001 \001(\r\0223\n\025ability_control_bloc" +
-      "ntrolBlock\022\021\n\tentity_id\030\002 \001(\rB\033\n\031emu.gra" +
+      "k\030\017 \001(\0132\024.AbilityControlBlockB\033\n\031emu.gra" +
       "sscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -745,7 +749,7 @@ public final class AbilityChangeNotifyOuterClass {
     internal_static_AbilityChangeNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_AbilityChangeNotify_descriptor,
-        new java.lang.String[] { "AbilityControlBlock", "EntityId", });
+        new java.lang.String[] { "EntityId", "AbilityControlBlock", });
     emu.grasscutter.net.proto.AbilityControlBlockOuterClass.getDescriptor();
   }
 

src/generated/main/java/emu/grasscutter/net/proto/AbilityControlBlockOuterClass.java

@@ -43,10 +43,6 @@ public final class AbilityControlBlockOuterClass {
         int index);
   }
   /**
-   * <pre>
-   * Name: KDMMAILHMCH
-   * </pre>
-   *
    * Protobuf type {@code AbilityControlBlock}
    */
   public static final class AbilityControlBlock extends
@@ -335,10 +331,6 @@ public final class AbilityControlBlockOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Name: KDMMAILHMCH
-     * </pre>
-     *
      * Protobuf type {@code AbilityControlBlock}
      */
     public static final class Builder extends

src/generated/main/java/emu/grasscutter/net/proto/AbilityEmbryoOuterClass.java

@@ -37,10 +37,6 @@ public final class AbilityEmbryoOuterClass {
     int getAbilityOverrideNameHash();
   }
   /**
-   * <pre>
-   * Name: FDIGHNLIKGA
-   * </pre>
-   *
    * Protobuf type {@code AbilityEmbryo}
    */
   public static final class AbilityEmbryo extends
@@ -343,10 +339,6 @@ public final class AbilityEmbryoOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Name: FDIGHNLIKGA
-     * </pre>
-     *
      * Protobuf type {@code AbilityEmbryo}
      */
     public static final class Builder extends

src/generated/main/java/emu/grasscutter/net/proto/AbilityGadgetInfoOuterClass.java

@@ -37,10 +37,6 @@ public final class AbilityGadgetInfoOuterClass {
     int getTargetEntityId();
   }
   /**
-   * <pre>
-   * Name: PDONEGKNDKM
-   * </pre>
-   *
    * Protobuf type {@code AbilityGadgetInfo}
    */
   public static final class AbilityGadgetInfo extends
@@ -343,10 +339,6 @@ public final class AbilityGadgetInfoOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Name: PDONEGKNDKM
-     * </pre>
-     *
      * Protobuf type {@code AbilityGadgetInfo}
      */
     public static final class Builder extends

src/generated/main/java/emu/grasscutter/net/proto/AbilityIdentifierOuterClass.java

@@ -19,46 +19,42 @@ public final class AbilityIdentifierOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>bool is_serverbuff_modifier = 2;</code>
+     * <code>uint32 modifier_owner_id = 2;</code>
-     * @return The isServerbuffModifier.
+     * @return The modifierOwnerId.
      */
-    boolean getIsServerbuffModifier();
+    int getModifierOwnerId();
 
     /**
-     * <code>uint32 CKGECLBFOCP = 9;</code>
+     * <code>uint32 instanced_modifier_id = 9;</code>
-     * @return The cKGECLBFOCP.
-     */
-    int getCKGECLBFOCP();
-
-    /**
-     * <code>int32 local_id = 12;</code>
-     * @return The localId.
-     */
-    int getLocalId();
-
-    /**
-     * <code>uint32 instanced_modifier_id = 14;</code>
      * @return The instancedModifierId.
      */
     int getInstancedModifierId();
 
     /**
-     * <code>uint32 instanced_ability_id = 7;</code>
+     * <code>uint32 instanced_ability_id = 10;</code>
      * @return The instancedAbilityId.
      */
     int getInstancedAbilityId();
 
     /**
-     * <code>uint32 NJNNPGIMJEN = 13;</code>
+     * <code>bool is_serverbuff_modifier = 6;</code>
-     * @return The nJNNPGIMJEN.
+     * @return The isServerbuffModifier.
      */
-    int getNJNNPGIMJEN();
+    boolean getIsServerbuffModifier();
+
+    /**
+     * <code>uint32 ability_caster_id = 15;</code>
+     * @return The abilityCasterId.
+     */
+    int getAbilityCasterId();
+
+    /**
+     * <code>int32 local_id = 3;</code>
+     * @return The localId.
+     */
+    int getLocalId();
   }
   /**
-   * <pre>
-   * Name: FBHPFOJEMEK
-   * </pre>
-   *
    * Protobuf type {@code AbilityIdentifier}
    */
   public static final class AbilityIdentifier extends
@@ -105,34 +101,34 @@ public final class AbilityIdentifierOuterClass {
               break;
             case 16: {
 
-              isServerbuffModifier_ = input.readBool();
+              modifierOwnerId_ = input.readUInt32();
               break;
             }
-            case 56: {
+            case 24: {
-
-              instancedAbilityId_ = input.readUInt32();
-              break;
-            }
-            case 72: {
-
-              cKGECLBFOCP_ = input.readUInt32();
-              break;
-            }
-            case 96: {
 
               localId_ = input.readInt32();
               break;
             }
-            case 104: {
+            case 48: {
 
-              nJNNPGIMJEN_ = input.readUInt32();
+              isServerbuffModifier_ = input.readBool();
               break;
             }
-            case 112: {
+            case 72: {
 
               instancedModifierId_ = input.readUInt32();
               break;
             }
+            case 80: {
+
+              instancedAbilityId_ = input.readUInt32();
+              break;
+            }
+            case 120: {
+
+              abilityCasterId_ = input.readUInt32();
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -165,43 +161,21 @@ public final class AbilityIdentifierOuterClass {
               emu.grasscutter.net.proto.AbilityIdentifierOuterClass.AbilityIdentifier.class, emu.grasscutter.net.proto.AbilityIdentifierOuterClass.AbilityIdentifier.Builder.class);
     }
 
-    public static final int IS_SERVERBUFF_MODIFIER_FIELD_NUMBER = 2;
+    public static final int MODIFIER_OWNER_ID_FIELD_NUMBER = 2;
-    private boolean isServerbuffModifier_;
+    private int modifierOwnerId_;
     /**
-     * <code>bool is_serverbuff_modifier = 2;</code>
+     * <code>uint32 modifier_owner_id = 2;</code>
-     * @return The isServerbuffModifier.
+     * @return The modifierOwnerId.
      */
     @java.lang.Override
-    public boolean getIsServerbuffModifier() {
+    public int getModifierOwnerId() {
-      return isServerbuffModifier_;
+      return modifierOwnerId_;
     }
 
-    public static final int CKGECLBFOCP_FIELD_NUMBER = 9;
+    public static final int INSTANCED_MODIFIER_ID_FIELD_NUMBER = 9;
-    private int cKGECLBFOCP_;
-    /**
-     * <code>uint32 CKGECLBFOCP = 9;</code>
-     * @return The cKGECLBFOCP.
-     */
-    @java.lang.Override
-    public int getCKGECLBFOCP() {
-      return cKGECLBFOCP_;
-    }
-
-    public static final int LOCAL_ID_FIELD_NUMBER = 12;
-    private int localId_;
-    /**
-     * <code>int32 local_id = 12;</code>
-     * @return The localId.
-     */
-    @java.lang.Override
-    public int getLocalId() {
-      return localId_;
-    }
-
-    public static final int INSTANCED_MODIFIER_ID_FIELD_NUMBER = 14;
     private int instancedModifierId_;
     /**
-     * <code>uint32 instanced_modifier_id = 14;</code>
+     * <code>uint32 instanced_modifier_id = 9;</code>
      * @return The instancedModifierId.
      */
     @java.lang.Override
@@ -209,10 +183,10 @@ public final class AbilityIdentifierOuterClass {
       return instancedModifierId_;
     }
 
-    public static final int INSTANCED_ABILITY_ID_FIELD_NUMBER = 7;
+    public static final int INSTANCED_ABILITY_ID_FIELD_NUMBER = 10;
     private int instancedAbilityId_;
     /**
-     * <code>uint32 instanced_ability_id = 7;</code>
+     * <code>uint32 instanced_ability_id = 10;</code>
      * @return The instancedAbilityId.
      */
     @java.lang.Override
@@ -220,15 +194,37 @@ public final class AbilityIdentifierOuterClass {
       return instancedAbilityId_;
     }
 
-    public static final int NJNNPGIMJEN_FIELD_NUMBER = 13;
+    public static final int IS_SERVERBUFF_MODIFIER_FIELD_NUMBER = 6;
-    private int nJNNPGIMJEN_;
+    private boolean isServerbuffModifier_;
     /**
-     * <code>uint32 NJNNPGIMJEN = 13;</code>
+     * <code>bool is_serverbuff_modifier = 6;</code>
-     * @return The nJNNPGIMJEN.
+     * @return The isServerbuffModifier.
      */
     @java.lang.Override
-    public int getNJNNPGIMJEN() {
+    public boolean getIsServerbuffModifier() {
-      return nJNNPGIMJEN_;
+      return isServerbuffModifier_;
+    }
+
+    public static final int ABILITY_CASTER_ID_FIELD_NUMBER = 15;
+    private int abilityCasterId_;
+    /**
+     * <code>uint32 ability_caster_id = 15;</code>
+     * @return The abilityCasterId.
+     */
+    @java.lang.Override
+    public int getAbilityCasterId() {
+      return abilityCasterId_;
+    }
+
+    public static final int LOCAL_ID_FIELD_NUMBER = 3;
+    private int localId_;
+    /**
+     * <code>int32 local_id = 3;</code>
+     * @return The localId.
+     */
+    @java.lang.Override
+    public int getLocalId() {
+      return localId_;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -245,23 +241,23 @@ public final class AbilityIdentifierOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (isServerbuffModifier_ != false) {
+      if (modifierOwnerId_ != 0) {
-        output.writeBool(2, isServerbuffModifier_);
+        output.writeUInt32(2, modifierOwnerId_);
-      }
-      if (instancedAbilityId_ != 0) {
-        output.writeUInt32(7, instancedAbilityId_);
-      }
-      if (cKGECLBFOCP_ != 0) {
-        output.writeUInt32(9, cKGECLBFOCP_);
       }
       if (localId_ != 0) {
-        output.writeInt32(12, localId_);
+        output.writeInt32(3, localId_);
       }
-      if (nJNNPGIMJEN_ != 0) {
+      if (isServerbuffModifier_ != false) {
-        output.writeUInt32(13, nJNNPGIMJEN_);
+        output.writeBool(6, isServerbuffModifier_);
       }
       if (instancedModifierId_ != 0) {
-        output.writeUInt32(14, instancedModifierId_);
+        output.writeUInt32(9, instancedModifierId_);
+      }
+      if (instancedAbilityId_ != 0) {
+        output.writeUInt32(10, instancedAbilityId_);
+      }
+      if (abilityCasterId_ != 0) {
+        output.writeUInt32(15, abilityCasterId_);
       }
       unknownFields.writeTo(output);
     }
@@ -272,29 +268,29 @@ public final class AbilityIdentifierOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (isServerbuffModifier_ != false) {
+      if (modifierOwnerId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(2, isServerbuffModifier_);
+          .computeUInt32Size(2, modifierOwnerId_);
-      }
-      if (instancedAbilityId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(7, instancedAbilityId_);
-      }
-      if (cKGECLBFOCP_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(9, cKGECLBFOCP_);
       }
       if (localId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(12, localId_);
+          .computeInt32Size(3, localId_);
       }
-      if (nJNNPGIMJEN_ != 0) {
+      if (isServerbuffModifier_ != false) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(13, nJNNPGIMJEN_);
+          .computeBoolSize(6, isServerbuffModifier_);
       }
       if (instancedModifierId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(14, instancedModifierId_);
+          .computeUInt32Size(9, instancedModifierId_);
+      }
+      if (instancedAbilityId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(10, instancedAbilityId_);
+      }
+      if (abilityCasterId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(15, abilityCasterId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -311,18 +307,18 @@ public final class AbilityIdentifierOuterClass {
       }
       emu.grasscutter.net.proto.AbilityIdentifierOuterClass.AbilityIdentifier other = (emu.grasscutter.net.proto.AbilityIdentifierOuterClass.AbilityIdentifier) obj;
 
-      if (getIsServerbuffModifier()
+      if (getModifierOwnerId()
-          != other.getIsServerbuffModifier()) return false;
+          != other.getModifierOwnerId()) return false;
-      if (getCKGECLBFOCP()
-          != other.getCKGECLBFOCP()) return false;
-      if (getLocalId()
-          != other.getLocalId()) return false;
       if (getInstancedModifierId()
           != other.getInstancedModifierId()) return false;
       if (getInstancedAbilityId()
           != other.getInstancedAbilityId()) return false;
-      if (getNJNNPGIMJEN()
+      if (getIsServerbuffModifier()
-          != other.getNJNNPGIMJEN()) return false;
+          != other.getIsServerbuffModifier()) return false;
+      if (getAbilityCasterId()
+          != other.getAbilityCasterId()) return false;
+      if (getLocalId()
+          != other.getLocalId()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -334,19 +330,19 @@ public final class AbilityIdentifierOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + IS_SERVERBUFF_MODIFIER_FIELD_NUMBER;
+      hash = (37 * hash) + MODIFIER_OWNER_ID_FIELD_NUMBER;
-      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+      hash = (53 * hash) + getModifierOwnerId();
-          getIsServerbuffModifier());
-      hash = (37 * hash) + CKGECLBFOCP_FIELD_NUMBER;
-      hash = (53 * hash) + getCKGECLBFOCP();
-      hash = (37 * hash) + LOCAL_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getLocalId();
       hash = (37 * hash) + INSTANCED_MODIFIER_ID_FIELD_NUMBER;
       hash = (53 * hash) + getInstancedModifierId();
       hash = (37 * hash) + INSTANCED_ABILITY_ID_FIELD_NUMBER;
       hash = (53 * hash) + getInstancedAbilityId();
-      hash = (37 * hash) + NJNNPGIMJEN_FIELD_NUMBER;
+      hash = (37 * hash) + IS_SERVERBUFF_MODIFIER_FIELD_NUMBER;
-      hash = (53 * hash) + getNJNNPGIMJEN();
+      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+          getIsServerbuffModifier());
+      hash = (37 * hash) + ABILITY_CASTER_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getAbilityCasterId();
+      hash = (37 * hash) + LOCAL_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getLocalId();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -443,10 +439,6 @@ public final class AbilityIdentifierOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Name: FBHPFOJEMEK
-     * </pre>
-     *
      * Protobuf type {@code AbilityIdentifier}
      */
     public static final class Builder extends
@@ -484,17 +476,17 @@ public final class AbilityIdentifierOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        isServerbuffModifier_ = false;
+        modifierOwnerId_ = 0;
-
-        cKGECLBFOCP_ = 0;
-
-        localId_ = 0;
 
         instancedModifierId_ = 0;
 
         instancedAbilityId_ = 0;
 
-        nJNNPGIMJEN_ = 0;
+        isServerbuffModifier_ = false;
+
+        abilityCasterId_ = 0;
+
+        localId_ = 0;
 
         return this;
       }
@@ -522,12 +514,12 @@ public final class AbilityIdentifierOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.AbilityIdentifierOuterClass.AbilityIdentifier buildPartial() {
         emu.grasscutter.net.proto.AbilityIdentifierOuterClass.AbilityIdentifier result = new emu.grasscutter.net.proto.AbilityIdentifierOuterClass.AbilityIdentifier(this);
-        result.isServerbuffModifier_ = isServerbuffModifier_;
+        result.modifierOwnerId_ = modifierOwnerId_;
-        result.cKGECLBFOCP_ = cKGECLBFOCP_;
-        result.localId_ = localId_;
         result.instancedModifierId_ = instancedModifierId_;
         result.instancedAbilityId_ = instancedAbilityId_;
-        result.nJNNPGIMJEN_ = nJNNPGIMJEN_;
+        result.isServerbuffModifier_ = isServerbuffModifier_;
+        result.abilityCasterId_ = abilityCasterId_;
+        result.localId_ = localId_;
         onBuilt();
         return result;
       }
@@ -576,14 +568,8 @@ public final class AbilityIdentifierOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.AbilityIdentifierOuterClass.AbilityIdentifier other) {
         if (other == emu.grasscutter.net.proto.AbilityIdentifierOuterClass.AbilityIdentifier.getDefaultInstance()) return this;
-        if (other.getIsServerbuffModifier() != false) {
+        if (other.getModifierOwnerId() != 0) {
-          setIsServerbuffModifier(other.getIsServerbuffModifier());
+          setModifierOwnerId(other.getModifierOwnerId());
-        }
-        if (other.getCKGECLBFOCP() != 0) {
-          setCKGECLBFOCP(other.getCKGECLBFOCP());
-        }
-        if (other.getLocalId() != 0) {
-          setLocalId(other.getLocalId());
         }
         if (other.getInstancedModifierId() != 0) {
           setInstancedModifierId(other.getInstancedModifierId());
@@ -591,8 +577,14 @@ public final class AbilityIdentifierOuterClass {
         if (other.getInstancedAbilityId() != 0) {
           setInstancedAbilityId(other.getInstancedAbilityId());
         }
-        if (other.getNJNNPGIMJEN() != 0) {
+        if (other.getIsServerbuffModifier() != false) {
-          setNJNNPGIMJEN(other.getNJNNPGIMJEN());
+          setIsServerbuffModifier(other.getIsServerbuffModifier());
+        }
+        if (other.getAbilityCasterId() != 0) {
+          setAbilityCasterId(other.getAbilityCasterId());
+        }
+        if (other.getLocalId() != 0) {
+          setLocalId(other.getLocalId());
         }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
@@ -623,102 +615,40 @@ public final class AbilityIdentifierOuterClass {
         return this;
       }
 
-      private boolean isServerbuffModifier_ ;
+      private int modifierOwnerId_ ;
       /**
-       * <code>bool is_serverbuff_modifier = 2;</code>
+       * <code>uint32 modifier_owner_id = 2;</code>
-       * @return The isServerbuffModifier.
+       * @return The modifierOwnerId.
        */
       @java.lang.Override
-      public boolean getIsServerbuffModifier() {
+      public int getModifierOwnerId() {
-        return isServerbuffModifier_;
+        return modifierOwnerId_;
       }
       /**
-       * <code>bool is_serverbuff_modifier = 2;</code>
+       * <code>uint32 modifier_owner_id = 2;</code>
-       * @param value The isServerbuffModifier to set.
+       * @param value The modifierOwnerId to set.
        * @return This builder for chaining.
        */
-      public Builder setIsServerbuffModifier(boolean value) {
+      public Builder setModifierOwnerId(int value) {
         
-        isServerbuffModifier_ = value;
+        modifierOwnerId_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>bool is_serverbuff_modifier = 2;</code>
+       * <code>uint32 modifier_owner_id = 2;</code>
        * @return This builder for chaining.
        */
-      public Builder clearIsServerbuffModifier() {
+      public Builder clearModifierOwnerId() {
         
-        isServerbuffModifier_ = false;
+        modifierOwnerId_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int cKGECLBFOCP_ ;
-      /**
-       * <code>uint32 CKGECLBFOCP = 9;</code>
-       * @return The cKGECLBFOCP.
-       */
-      @java.lang.Override
-      public int getCKGECLBFOCP() {
-        return cKGECLBFOCP_;
-      }
-      /**
-       * <code>uint32 CKGECLBFOCP = 9;</code>
-       * @param value The cKGECLBFOCP to set.
-       * @return This builder for chaining.
-       */
-      public Builder setCKGECLBFOCP(int value) {
-        
-        cKGECLBFOCP_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 CKGECLBFOCP = 9;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearCKGECLBFOCP() {
-        
-        cKGECLBFOCP_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int localId_ ;
-      /**
-       * <code>int32 local_id = 12;</code>
-       * @return The localId.
-       */
-      @java.lang.Override
-      public int getLocalId() {
-        return localId_;
-      }
-      /**
-       * <code>int32 local_id = 12;</code>
-       * @param value The localId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setLocalId(int value) {
-        
-        localId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>int32 local_id = 12;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearLocalId() {
-        
-        localId_ = 0;
         onChanged();
         return this;
       }
 
       private int instancedModifierId_ ;
       /**
-       * <code>uint32 instanced_modifier_id = 14;</code>
+       * <code>uint32 instanced_modifier_id = 9;</code>
        * @return The instancedModifierId.
        */
       @java.lang.Override
@@ -726,7 +656,7 @@ public final class AbilityIdentifierOuterClass {
         return instancedModifierId_;
       }
       /**
-       * <code>uint32 instanced_modifier_id = 14;</code>
+       * <code>uint32 instanced_modifier_id = 9;</code>
        * @param value The instancedModifierId to set.
        * @return This builder for chaining.
        */
@@ -737,7 +667,7 @@ public final class AbilityIdentifierOuterClass {
         return this;
       }
       /**
-       * <code>uint32 instanced_modifier_id = 14;</code>
+       * <code>uint32 instanced_modifier_id = 9;</code>
        * @return This builder for chaining.
        */
       public Builder clearInstancedModifierId() {
@@ -749,7 +679,7 @@ public final class AbilityIdentifierOuterClass {
 
       private int instancedAbilityId_ ;
       /**
-       * <code>uint32 instanced_ability_id = 7;</code>
+       * <code>uint32 instanced_ability_id = 10;</code>
        * @return The instancedAbilityId.
        */
       @java.lang.Override
@@ -757,7 +687,7 @@ public final class AbilityIdentifierOuterClass {
         return instancedAbilityId_;
       }
       /**
-       * <code>uint32 instanced_ability_id = 7;</code>
+       * <code>uint32 instanced_ability_id = 10;</code>
        * @param value The instancedAbilityId to set.
        * @return This builder for chaining.
        */
@@ -768,7 +698,7 @@ public final class AbilityIdentifierOuterClass {
         return this;
       }
       /**
-       * <code>uint32 instanced_ability_id = 7;</code>
+       * <code>uint32 instanced_ability_id = 10;</code>
        * @return This builder for chaining.
        */
       public Builder clearInstancedAbilityId() {
@@ -778,33 +708,95 @@ public final class AbilityIdentifierOuterClass {
         return this;
       }
 
-      private int nJNNPGIMJEN_ ;
+      private boolean isServerbuffModifier_ ;
       /**
-       * <code>uint32 NJNNPGIMJEN = 13;</code>
+       * <code>bool is_serverbuff_modifier = 6;</code>
-       * @return The nJNNPGIMJEN.
+       * @return The isServerbuffModifier.
        */
       @java.lang.Override
-      public int getNJNNPGIMJEN() {
+      public boolean getIsServerbuffModifier() {
-        return nJNNPGIMJEN_;
+        return isServerbuffModifier_;
       }
       /**
-       * <code>uint32 NJNNPGIMJEN = 13;</code>
+       * <code>bool is_serverbuff_modifier = 6;</code>
-       * @param value The nJNNPGIMJEN to set.
+       * @param value The isServerbuffModifier to set.
        * @return This builder for chaining.
        */
-      public Builder setNJNNPGIMJEN(int value) {
+      public Builder setIsServerbuffModifier(boolean value) {
         
-        nJNNPGIMJEN_ = value;
+        isServerbuffModifier_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 NJNNPGIMJEN = 13;</code>
+       * <code>bool is_serverbuff_modifier = 6;</code>
        * @return This builder for chaining.
        */
-      public Builder clearNJNNPGIMJEN() {
+      public Builder clearIsServerbuffModifier() {
         
-        nJNNPGIMJEN_ = 0;
+        isServerbuffModifier_ = false;
+        onChanged();
+        return this;
+      }
+
+      private int abilityCasterId_ ;
+      /**
+       * <code>uint32 ability_caster_id = 15;</code>
+       * @return The abilityCasterId.
+       */
+      @java.lang.Override
+      public int getAbilityCasterId() {
+        return abilityCasterId_;
+      }
+      /**
+       * <code>uint32 ability_caster_id = 15;</code>
+       * @param value The abilityCasterId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setAbilityCasterId(int value) {
+        
+        abilityCasterId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 ability_caster_id = 15;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearAbilityCasterId() {
+        
+        abilityCasterId_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int localId_ ;
+      /**
+       * <code>int32 local_id = 3;</code>
+       * @return The localId.
+       */
+      @java.lang.Override
+      public int getLocalId() {
+        return localId_;
+      }
+      /**
+       * <code>int32 local_id = 3;</code>
+       * @param value The localId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setLocalId(int value) {
+        
+        localId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>int32 local_id = 3;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearLocalId() {
+        
+        localId_ = 0;
         onChanged();
         return this;
       }
@@ -875,12 +867,13 @@ public final class AbilityIdentifierOuterClass {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\027AbilityIdentifier.proto\"\254\001\n\021AbilityIde" +
+      "\n\027AbilityIdentifier.proto\"\270\001\n\021AbilityIde" +
-      "ntifier\022\036\n\026is_serverbuff_modifier\030\002 \001(\010\022" +
+      "ntifier\022\031\n\021modifier_owner_id\030\002 \001(\r\022\035\n\025in" +
-      "\023\n\013CKGECLBFOCP\030\t \001(\r\022\020\n\010local_id\030\014 \001(\005\022\035" +
+      "stanced_modifier_id\030\t \001(\r\022\034\n\024instanced_a" +
-      "\n\025instanced_modifier_id\030\016 \001(\r\022\034\n\024instanc" +
+      "bility_id\030\n \001(\r\022\036\n\026is_serverbuff_modifie" +
-      "ed_ability_id\030\007 \001(\r\022\023\n\013NJNNPGIMJEN\030\r \001(\r" +
+      "r\030\006 \001(\010\022\031\n\021ability_caster_id\030\017 \001(\r\022\020\n\010lo" +
-      "B\033\n\031emu.grasscutter.net.protob\006proto3"
+      "cal_id\030\003 \001(\005B\033\n\031emu.grasscutter.net.prot" +
+      "ob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -891,7 +884,7 @@ public final class AbilityIdentifierOuterClass {
     internal_static_AbilityIdentifier_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_AbilityIdentifier_descriptor,
-        new java.lang.String[] { "IsServerbuffModifier", "CKGECLBFOCP", "LocalId", "InstancedModifierId", "InstancedAbilityId", "NJNNPGIMJEN", });
+        new java.lang.String[] { "ModifierOwnerId", "InstancedModifierId", "InstancedAbilityId", "IsServerbuffModifier", "AbilityCasterId", "LocalId", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)

src/generated/main/java/emu/grasscutter/net/proto/AbilityInvocationsNotifyOuterClass.java

@@ -19,33 +19,35 @@ public final class AbilityInvocationsNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>repeated .AbilityInvokeEntry invokes = 12;</code>
+     * <code>repeated .AbilityInvokeEntry invokes = 2;</code>
      */
     java.util.List<emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry> 
         getInvokesList();
     /**
-     * <code>repeated .AbilityInvokeEntry invokes = 12;</code>
+     * <code>repeated .AbilityInvokeEntry invokes = 2;</code>
      */
     emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry getInvokes(int index);
     /**
-     * <code>repeated .AbilityInvokeEntry invokes = 12;</code>
+     * <code>repeated .AbilityInvokeEntry invokes = 2;</code>
      */
     int getInvokesCount();
     /**
-     * <code>repeated .AbilityInvokeEntry invokes = 12;</code>
+     * <code>repeated .AbilityInvokeEntry invokes = 2;</code>
      */
     java.util.List<? extends emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntryOrBuilder> 
         getInvokesOrBuilderList();
     /**
-     * <code>repeated .AbilityInvokeEntry invokes = 12;</code>
+     * <code>repeated .AbilityInvokeEntry invokes = 2;</code>
      */
     emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntryOrBuilder getInvokesOrBuilder(
         int index);
   }
   /**
    * <pre>
-   * Name: KPHEJCEMNIM
+   * CmdId: 1198
-   * CmdId: 1175
+   * EnetChannelId: 0
+   * EnetIsReliable: false
+   * IsAllowClient: true
    * </pre>
    *
    * Protobuf type {@code AbilityInvocationsNotify}
@@ -94,7 +96,7 @@ public final class AbilityInvocationsNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 98: {
+            case 18: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 invokes_ = new java.util.ArrayList<emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry>();
                 mutable_bitField0_ |= 0x00000001;
@@ -138,17 +140,17 @@ public final class AbilityInvocationsNotifyOuterClass {
               emu.grasscutter.net.proto.AbilityInvocationsNotifyOuterClass.AbilityInvocationsNotify.class, emu.grasscutter.net.proto.AbilityInvocationsNotifyOuterClass.AbilityInvocationsNotify.Builder.class);
     }
 
-    public static final int INVOKES_FIELD_NUMBER = 12;
+    public static final int INVOKES_FIELD_NUMBER = 2;
     private java.util.List<emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry> invokes_;
     /**
-     * <code>repeated .AbilityInvokeEntry invokes = 12;</code>
+     * <code>repeated .AbilityInvokeEntry invokes = 2;</code>
      */
     @java.lang.Override
     public java.util.List<emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry> getInvokesList() {
       return invokes_;
     }
     /**
-     * <code>repeated .AbilityInvokeEntry invokes = 12;</code>
+     * <code>repeated .AbilityInvokeEntry invokes = 2;</code>
      */
     @java.lang.Override
     public java.util.List<? extends emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntryOrBuilder> 
@@ -156,21 +158,21 @@ public final class AbilityInvocationsNotifyOuterClass {
       return invokes_;
     }
     /**
-     * <code>repeated .AbilityInvokeEntry invokes = 12;</code>
+     * <code>repeated .AbilityInvokeEntry invokes = 2;</code>
      */
     @java.lang.Override
     public int getInvokesCount() {
       return invokes_.size();
     }
     /**
-     * <code>repeated .AbilityInvokeEntry invokes = 12;</code>
+     * <code>repeated .AbilityInvokeEntry invokes = 2;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry getInvokes(int index) {
       return invokes_.get(index);
     }
     /**
-     * <code>repeated .AbilityInvokeEntry invokes = 12;</code>
+     * <code>repeated .AbilityInvokeEntry invokes = 2;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntryOrBuilder getInvokesOrBuilder(
@@ -193,7 +195,7 @@ public final class AbilityInvocationsNotifyOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       for (int i = 0; i < invokes_.size(); i++) {
-        output.writeMessage(12, invokes_.get(i));
+        output.writeMessage(2, invokes_.get(i));
       }
       unknownFields.writeTo(output);
     }
@@ -206,7 +208,7 @@ public final class AbilityInvocationsNotifyOuterClass {
       size = 0;
       for (int i = 0; i < invokes_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(12, invokes_.get(i));
+          .computeMessageSize(2, invokes_.get(i));
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -337,8 +339,10 @@ public final class AbilityInvocationsNotifyOuterClass {
     }
     /**
      * <pre>
-     * Name: KPHEJCEMNIM
+     * CmdId: 1198
-     * CmdId: 1175
+     * EnetChannelId: 0
+     * EnetIsReliable: false
+     * IsAllowClient: true
      * </pre>
      *
      * Protobuf type {@code AbilityInvocationsNotify}
@@ -538,7 +542,7 @@ public final class AbilityInvocationsNotifyOuterClass {
           emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry, emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry.Builder, emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntryOrBuilder> invokesBuilder_;
 
       /**
-       * <code>repeated .AbilityInvokeEntry invokes = 12;</code>
+       * <code>repeated .AbilityInvokeEntry invokes = 2;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry> getInvokesList() {
         if (invokesBuilder_ == null) {
@@ -548,7 +552,7 @@ public final class AbilityInvocationsNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .AbilityInvokeEntry invokes = 12;</code>
+       * <code>repeated .AbilityInvokeEntry invokes = 2;</code>
        */
       public int getInvokesCount() {
         if (invokesBuilder_ == null) {
@@ -558,7 +562,7 @@ public final class AbilityInvocationsNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .AbilityInvokeEntry invokes = 12;</code>
+       * <code>repeated .AbilityInvokeEntry invokes = 2;</code>
        */
       public emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry getInvokes(int index) {
         if (invokesBuilder_ == null) {
@@ -568,7 +572,7 @@ public final class AbilityInvocationsNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .AbilityInvokeEntry invokes = 12;</code>
+       * <code>repeated .AbilityInvokeEntry invokes = 2;</code>
        */
       public Builder setInvokes(
           int index, emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry value) {
@@ -585,7 +589,7 @@ public final class AbilityInvocationsNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .AbilityInvokeEntry invokes = 12;</code>
+       * <code>repeated .AbilityInvokeEntry invokes = 2;</code>
        */
       public Builder setInvokes(
           int index, emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry.Builder builderForValue) {
@@ -599,7 +603,7 @@ public final class AbilityInvocationsNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .AbilityInvokeEntry invokes = 12;</code>
+       * <code>repeated .AbilityInvokeEntry invokes = 2;</code>
        */
       public Builder addInvokes(emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry value) {
         if (invokesBuilder_ == null) {
@@ -615,7 +619,7 @@ public final class AbilityInvocationsNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .AbilityInvokeEntry invokes = 12;</code>
+       * <code>repeated .AbilityInvokeEntry invokes = 2;</code>
        */
       public Builder addInvokes(
           int index, emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry value) {
@@ -632,7 +636,7 @@ public final class AbilityInvocationsNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .AbilityInvokeEntry invokes = 12;</code>
+       * <code>repeated .AbilityInvokeEntry invokes = 2;</code>
        */
       public Builder addInvokes(
           emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry.Builder builderForValue) {
@@ -646,7 +650,7 @@ public final class AbilityInvocationsNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .AbilityInvokeEntry invokes = 12;</code>
+       * <code>repeated .AbilityInvokeEntry invokes = 2;</code>
        */
       public Builder addInvokes(
           int index, emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry.Builder builderForValue) {
@@ -660,7 +664,7 @@ public final class AbilityInvocationsNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .AbilityInvokeEntry invokes = 12;</code>
+       * <code>repeated .AbilityInvokeEntry invokes = 2;</code>
        */
       public Builder addAllInvokes(
           java.lang.Iterable<? extends emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry> values) {
@@ -675,7 +679,7 @@ public final class AbilityInvocationsNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .AbilityInvokeEntry invokes = 12;</code>
+       * <code>repeated .AbilityInvokeEntry invokes = 2;</code>
        */
       public Builder clearInvokes() {
         if (invokesBuilder_ == null) {
@@ -688,7 +692,7 @@ public final class AbilityInvocationsNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .AbilityInvokeEntry invokes = 12;</code>
+       * <code>repeated .AbilityInvokeEntry invokes = 2;</code>
        */
       public Builder removeInvokes(int index) {
         if (invokesBuilder_ == null) {
@@ -701,14 +705,14 @@ public final class AbilityInvocationsNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .AbilityInvokeEntry invokes = 12;</code>
+       * <code>repeated .AbilityInvokeEntry invokes = 2;</code>
        */
       public emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry.Builder getInvokesBuilder(
           int index) {
         return getInvokesFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .AbilityInvokeEntry invokes = 12;</code>
+       * <code>repeated .AbilityInvokeEntry invokes = 2;</code>
        */
       public emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntryOrBuilder getInvokesOrBuilder(
           int index) {
@@ -718,7 +722,7 @@ public final class AbilityInvocationsNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .AbilityInvokeEntry invokes = 12;</code>
+       * <code>repeated .AbilityInvokeEntry invokes = 2;</code>
        */
       public java.util.List<? extends emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntryOrBuilder> 
            getInvokesOrBuilderList() {
@@ -729,14 +733,14 @@ public final class AbilityInvocationsNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .AbilityInvokeEntry invokes = 12;</code>
+       * <code>repeated .AbilityInvokeEntry invokes = 2;</code>
        */
       public emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry.Builder addInvokesBuilder() {
         return getInvokesFieldBuilder().addBuilder(
             emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry.getDefaultInstance());
       }
       /**
-       * <code>repeated .AbilityInvokeEntry invokes = 12;</code>
+       * <code>repeated .AbilityInvokeEntry invokes = 2;</code>
        */
       public emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry.Builder addInvokesBuilder(
           int index) {
@@ -744,7 +748,7 @@ public final class AbilityInvocationsNotifyOuterClass {
             index, emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry.getDefaultInstance());
       }
       /**
-       * <code>repeated .AbilityInvokeEntry invokes = 12;</code>
+       * <code>repeated .AbilityInvokeEntry invokes = 2;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry.Builder> 
            getInvokesBuilderList() {
@@ -833,7 +837,7 @@ public final class AbilityInvocationsNotifyOuterClass {
     java.lang.String[] descriptorData = {
       "\n\036AbilityInvocationsNotify.proto\032\030Abilit" +
       "yInvokeEntry.proto\"@\n\030AbilityInvocations" +
-      "Notify\022$\n\007invokes\030\014 \003(\0132\023.AbilityInvokeE" +
+      "Notify\022$\n\007invokes\030\002 \003(\0132\023.AbilityInvokeE" +
       "ntryB\033\n\031emu.grasscutter.net.protob\006proto" +
       "3"
     };

src/generated/main/java/emu/grasscutter/net/proto/AbilityInvokeArgumentOuterClass.java

@@ -15,10 +15,6 @@ public final class AbilityInvokeArgumentOuterClass {
         (com.google.protobuf.ExtensionRegistryLite) registry);
   }
   /**
-   * <pre>
-   * Name: FNGBAFLMEDH
-   * </pre>
-   *
    * Protobuf enum {@code AbilityInvokeArgument}
    */
   public enum AbilityInvokeArgument
@@ -68,9 +64,9 @@ public final class AbilityInvokeArgumentOuterClass {
      */
     ABILITY_INVOKE_ARGUMENT_META_ADD_OR_GET_ABILITY_AND_TRIGGER(10),
     /**
-     * <code>ABILITY_INVOKE_ARGUMENT_META_SET_KILLED_SETATE = 11;</code>
+     * <code>ABILITY_INVOKE_ARGUMENT_META_SET_KILLED_STATE = 11;</code>
      */
-    ABILITY_INVOKE_ARGUMENT_META_SET_KILLED_SETATE(11),
+    ABILITY_INVOKE_ARGUMENT_META_SET_KILLED_STATE(11),
     /**
      * <code>ABILITY_INVOKE_ARGUMENT_META_SET_ABILITY_TRIGGER = 12;</code>
      */
@@ -112,9 +108,9 @@ public final class AbilityInvokeArgumentOuterClass {
      */
     ABILITY_INVOKE_ARGUMENT_META_LOSE_HP(21),
     /**
-     * <code>ABILITY_INVOKE_ARGUMENT_META_DURABILITY_IS_ZERO = 22;</code>
+     * <code>ABILITY_INVOKE_ARGUMENT_Unk2700_JDDDLJELBLJ = 22;</code>
      */
-    ABILITY_INVOKE_ARGUMENT_META_DURABILITY_IS_ZERO(22),
+    ABILITY_INVOKE_ARGUMENT_Unk2700_JDDDLJELBLJ(22),
     /**
      * <code>ABILITY_INVOKE_ARGUMENT_ACTION_TRIGGER_ABILITY = 50;</code>
      */
@@ -168,21 +164,17 @@ public final class AbilityInvokeArgumentOuterClass {
      */
     ABILITY_INVOKE_ARGUMENT_ACTION_FIRE_AFTER_IMAGE(62),
     /**
-     * <code>ABILITY_INVOKE_ARGUMENT_ACTION_DEDUCT_STAMINA = 63;</code>
+     * <code>ABILITY_INVOKE_ARGUMENT_Unk2700_FNANDDPDLOL = 63;</code>
      */
-    ABILITY_INVOKE_ARGUMENT_ACTION_DEDUCT_STAMINA(63),
+    ABILITY_INVOKE_ARGUMENT_Unk2700_FNANDDPDLOL(63),
     /**
-     * <code>ABILITY_INVOKE_ARGUMENT_ACTION_HIT_EFFECT = 64;</code>
+     * <code>ABILITY_INVOKE_ARGUMENT_Unk3000_EEANHJONEEP = 64;</code>
      */
-    ABILITY_INVOKE_ARGUMENT_ACTION_HIT_EFFECT(64),
+    ABILITY_INVOKE_ARGUMENT_Unk3000_EEANHJONEEP(64),
     /**
-     * <code>ABILITY_INVOKE_ARGUMENT_ACTION_SET_BULLET_TRACK_TARGET = 65;</code>
+     * <code>ABILITY_INVOKE_ARGUMENT_Unk3000_ADEHJMKKBJD = 65;</code>
      */
-    ABILITY_INVOKE_ARGUMENT_ACTION_SET_BULLET_TRACK_TARGET(65),
+    ABILITY_INVOKE_ARGUMENT_Unk3000_ADEHJMKKBJD(65),
-    /**
-     * <code>ABILITY_INVOKE_ARGUMENT_INVOKE_ICLAKMCJNIO = 66;</code>
-     */
-    ABILITY_INVOKE_ARGUMENT_INVOKE_ICLAKMCJNIO(66),
     /**
      * <code>ABILITY_INVOKE_ARGUMENT_MIXIN_AVATAR_STEER_BY_CAMERA = 100;</code>
      */
@@ -236,57 +228,33 @@ public final class AbilityInvokeArgumentOuterClass {
      */
     ABILITY_INVOKE_ARGUMENT_MIXIN_WIDGET_MP_SUPPORT(112),
     /**
-     * <code>ABILITY_INVOKE_ARGUMENT_MIXIN_DO_ACTION_BY_SELF_MODIFIER_ELEMENT_DURABILITY_INVOKE_ARGUMENT_RATIO = 113;</code>
+     * <code>ABILITY_INVOKE_ARGUMENT_Unk2700_NJHBFADEOON = 113;</code>
      */
-    ABILITY_INVOKE_ARGUMENT_MIXIN_DO_ACTION_BY_SELF_MODIFIER_ELEMENT_DURABILITY_INVOKE_ARGUMENT_RATIO(113),
+    ABILITY_INVOKE_ARGUMENT_Unk2700_NJHBFADEOON(113),
     /**
-     * <code>ABILITY_INVOKE_ARGUMENT_MIXIN_FIREWORKS_LAUNCHER = 114;</code>
+     * <code>ABILITY_INVOKE_ARGUMENT_Unk2700_EGCIFFFLLBG = 114;</code>
      */
-    ABILITY_INVOKE_ARGUMENT_MIXIN_FIREWORKS_LAUNCHER(114),
+    ABILITY_INVOKE_ARGUMENT_Unk2700_EGCIFFFLLBG(114),
     /**
-     * <code>ABILITY_INVOKE_ARGUMENT_MIXIN_ATTACK_RESULT_CREATE_COUNT = 115;</code>
+     * <code>ABILITY_INVOKE_ARGUMENT_Unk2700_OFDGFACOLDI = 115;</code>
      */
-    ABILITY_INVOKE_ARGUMENT_MIXIN_ATTACK_RESULT_CREATE_COUNT(115),
+    ABILITY_INVOKE_ARGUMENT_Unk2700_OFDGFACOLDI(115),
     /**
-     * <code>ABILITY_INVOKE_ARGUMENT_MIXIN_UGC_TIME_CONTROL = 116;</code>
+     * <code>ABILITY_INVOKE_ARGUMENT_Unk2700_KDPKJGJNGFB = 116;</code>
      */
-    ABILITY_INVOKE_ARGUMENT_MIXIN_UGC_TIME_CONTROL(116),
+    ABILITY_INVOKE_ARGUMENT_Unk2700_KDPKJGJNGFB(116),
     /**
-     * <code>ABILITY_INVOKE_ARGUMENT_MIXIN_AVATAR_COMBAT = 117;</code>
+     * <code>ABILITY_INVOKE_ARGUMENT_Unk3000_BNECPACGKHP = 117;</code>
      */
-    ABILITY_INVOKE_ARGUMENT_MIXIN_AVATAR_COMBAT(117),
+    ABILITY_INVOKE_ARGUMENT_Unk3000_BNECPACGKHP(117),
     /**
-     * <code>ABILITY_INVOKE_ARGUMENT_MIXIN_DEATH_ZONE_REGIONAL_PLAY_MIXIN = 118;</code>
+     * <code>ABILITY_INVOKE_ARGUMENT_Unk3000_LGIPOCBHKAL = 118;</code>
      */
-    ABILITY_INVOKE_ARGUMENT_MIXIN_DEATH_ZONE_REGIONAL_PLAY_MIXIN(118),
+    ABILITY_INVOKE_ARGUMENT_Unk3000_LGIPOCBHKAL(118),
     /**
-     * <code>ABILITY_INVOKE_ARGUMENT_MIXIN_UI_INTERACT = 119;</code>
+     * <code>ABILITY_INVOKE_ARGUMENT_Unk3000_EFJIGCEGHJG = 119;</code>
      */
-    ABILITY_INVOKE_ARGUMENT_MIXIN_UI_INTERACT(119),
+    ABILITY_INVOKE_ARGUMENT_Unk3000_EFJIGCEGHJG(119),
-    /**
-     * <code>ABILITY_INVOKE_ARGUMENT_MIXIN_SHOOT_FROM_CAMERA = 120;</code>
-     */
-    ABILITY_INVOKE_ARGUMENT_MIXIN_SHOOT_FROM_CAMERA(120),
-    /**
-     * <code>ABILITY_INVOKE_ARGUMENT_MIXIN_ERASE_BRICK_ACTIVITY = 121;</code>
-     */
-    ABILITY_INVOKE_ARGUMENT_MIXIN_ERASE_BRICK_ACTIVITY(121),
-    /**
-     * <code>ABILITY_INVOKE_ARGUMENT_MIXIN_BREAKOUT = 122;</code>
-     */
-    ABILITY_INVOKE_ARGUMENT_MIXIN_BREAKOUT(122),
-    /**
-     * <code>ABILITY_INVOKE_ARGUMENT_INVOKE_LCBKCPPPPOF = 123;</code>
-     */
-    ABILITY_INVOKE_ARGUMENT_INVOKE_LCBKCPPPPOF(123),
-    /**
-     * <code>ABILITY_INVOKE_ARGUMENT_INVOKE_JBJPJJEGLOM = 124;</code>
-     */
-    ABILITY_INVOKE_ARGUMENT_INVOKE_JBJPJJEGLOM(124),
-    /**
-     * <code>ABILITY_INVOKE_ARGUMENT_INVOKE_BCIODCIMFBK = 125;</code>
-     */
-    ABILITY_INVOKE_ARGUMENT_INVOKE_BCIODCIMFBK(125),
     UNRECOGNIZED(-1),
     ;
 
@@ -335,9 +303,9 @@ public final class AbilityInvokeArgumentOuterClass {
      */
     public static final int ABILITY_INVOKE_ARGUMENT_META_ADD_OR_GET_ABILITY_AND_TRIGGER_VALUE = 10;
     /**
-     * <code>ABILITY_INVOKE_ARGUMENT_META_SET_KILLED_SETATE = 11;</code>
+     * <code>ABILITY_INVOKE_ARGUMENT_META_SET_KILLED_STATE = 11;</code>
      */
-    public static final int ABILITY_INVOKE_ARGUMENT_META_SET_KILLED_SETATE_VALUE = 11;
+    public static final int ABILITY_INVOKE_ARGUMENT_META_SET_KILLED_STATE_VALUE = 11;
     /**
      * <code>ABILITY_INVOKE_ARGUMENT_META_SET_ABILITY_TRIGGER = 12;</code>
      */
@@ -379,9 +347,9 @@ public final class AbilityInvokeArgumentOuterClass {
      */
     public static final int ABILITY_INVOKE_ARGUMENT_META_LOSE_HP_VALUE = 21;
     /**
-     * <code>ABILITY_INVOKE_ARGUMENT_META_DURABILITY_IS_ZERO = 22;</code>
+     * <code>ABILITY_INVOKE_ARGUMENT_Unk2700_JDDDLJELBLJ = 22;</code>
      */
-    public static final int ABILITY_INVOKE_ARGUMENT_META_DURABILITY_IS_ZERO_VALUE = 22;
+    public static final int ABILITY_INVOKE_ARGUMENT_Unk2700_JDDDLJELBLJ_VALUE = 22;
     /**
      * <code>ABILITY_INVOKE_ARGUMENT_ACTION_TRIGGER_ABILITY = 50;</code>
      */
@@ -435,21 +403,17 @@ public final class AbilityInvokeArgumentOuterClass {
      */
     public static final int ABILITY_INVOKE_ARGUMENT_ACTION_FIRE_AFTER_IMAGE_VALUE = 62;
     /**
-     * <code>ABILITY_INVOKE_ARGUMENT_ACTION_DEDUCT_STAMINA = 63;</code>
+     * <code>ABILITY_INVOKE_ARGUMENT_Unk2700_FNANDDPDLOL = 63;</code>
      */
-    public static final int ABILITY_INVOKE_ARGUMENT_ACTION_DEDUCT_STAMINA_VALUE = 63;
+    public static final int ABILITY_INVOKE_ARGUMENT_Unk2700_FNANDDPDLOL_VALUE = 63;
     /**
-     * <code>ABILITY_INVOKE_ARGUMENT_ACTION_HIT_EFFECT = 64;</code>
+     * <code>ABILITY_INVOKE_ARGUMENT_Unk3000_EEANHJONEEP = 64;</code>
      */
-    public static final int ABILITY_INVOKE_ARGUMENT_ACTION_HIT_EFFECT_VALUE = 64;
+    public static final int ABILITY_INVOKE_ARGUMENT_Unk3000_EEANHJONEEP_VALUE = 64;
     /**
-     * <code>ABILITY_INVOKE_ARGUMENT_ACTION_SET_BULLET_TRACK_TARGET = 65;</code>
+     * <code>ABILITY_INVOKE_ARGUMENT_Unk3000_ADEHJMKKBJD = 65;</code>
      */
-    public static final int ABILITY_INVOKE_ARGUMENT_ACTION_SET_BULLET_TRACK_TARGET_VALUE = 65;
+    public static final int ABILITY_INVOKE_ARGUMENT_Unk3000_ADEHJMKKBJD_VALUE = 65;
-    /**
-     * <code>ABILITY_INVOKE_ARGUMENT_INVOKE_ICLAKMCJNIO = 66;</code>
-     */
-    public static final int ABILITY_INVOKE_ARGUMENT_INVOKE_ICLAKMCJNIO_VALUE = 66;
     /**
      * <code>ABILITY_INVOKE_ARGUMENT_MIXIN_AVATAR_STEER_BY_CAMERA = 100;</code>
      */
@@ -503,57 +467,33 @@ public final class AbilityInvokeArgumentOuterClass {
      */
     public static final int ABILITY_INVOKE_ARGUMENT_MIXIN_WIDGET_MP_SUPPORT_VALUE = 112;
     /**
-     * <code>ABILITY_INVOKE_ARGUMENT_MIXIN_DO_ACTION_BY_SELF_MODIFIER_ELEMENT_DURABILITY_INVOKE_ARGUMENT_RATIO = 113;</code>
+     * <code>ABILITY_INVOKE_ARGUMENT_Unk2700_NJHBFADEOON = 113;</code>
      */
-    public static final int ABILITY_INVOKE_ARGUMENT_MIXIN_DO_ACTION_BY_SELF_MODIFIER_ELEMENT_DURABILITY_INVOKE_ARGUMENT_RATIO_VALUE = 113;
+    public static final int ABILITY_INVOKE_ARGUMENT_Unk2700_NJHBFADEOON_VALUE = 113;
     /**
-     * <code>ABILITY_INVOKE_ARGUMENT_MIXIN_FIREWORKS_LAUNCHER = 114;</code>
+     * <code>ABILITY_INVOKE_ARGUMENT_Unk2700_EGCIFFFLLBG = 114;</code>
      */
-    public static final int ABILITY_INVOKE_ARGUMENT_MIXIN_FIREWORKS_LAUNCHER_VALUE = 114;
+    public static final int ABILITY_INVOKE_ARGUMENT_Unk2700_EGCIFFFLLBG_VALUE = 114;
     /**
-     * <code>ABILITY_INVOKE_ARGUMENT_MIXIN_ATTACK_RESULT_CREATE_COUNT = 115;</code>
+     * <code>ABILITY_INVOKE_ARGUMENT_Unk2700_OFDGFACOLDI = 115;</code>
      */
-    public static final int ABILITY_INVOKE_ARGUMENT_MIXIN_ATTACK_RESULT_CREATE_COUNT_VALUE = 115;
+    public static final int ABILITY_INVOKE_ARGUMENT_Unk2700_OFDGFACOLDI_VALUE = 115;
     /**
-     * <code>ABILITY_INVOKE_ARGUMENT_MIXIN_UGC_TIME_CONTROL = 116;</code>
+     * <code>ABILITY_INVOKE_ARGUMENT_Unk2700_KDPKJGJNGFB = 116;</code>
      */
-    public static final int ABILITY_INVOKE_ARGUMENT_MIXIN_UGC_TIME_CONTROL_VALUE = 116;
+    public static final int ABILITY_INVOKE_ARGUMENT_Unk2700_KDPKJGJNGFB_VALUE = 116;
     /**
-     * <code>ABILITY_INVOKE_ARGUMENT_MIXIN_AVATAR_COMBAT = 117;</code>
+     * <code>ABILITY_INVOKE_ARGUMENT_Unk3000_BNECPACGKHP = 117;</code>
      */
-    public static final int ABILITY_INVOKE_ARGUMENT_MIXIN_AVATAR_COMBAT_VALUE = 117;
+    public static final int ABILITY_INVOKE_ARGUMENT_Unk3000_BNECPACGKHP_VALUE = 117;
     /**
-     * <code>ABILITY_INVOKE_ARGUMENT_MIXIN_DEATH_ZONE_REGIONAL_PLAY_MIXIN = 118;</code>
+     * <code>ABILITY_INVOKE_ARGUMENT_Unk3000_LGIPOCBHKAL = 118;</code>
      */
-    public static final int ABILITY_INVOKE_ARGUMENT_MIXIN_DEATH_ZONE_REGIONAL_PLAY_MIXIN_VALUE = 118;
+    public static final int ABILITY_INVOKE_ARGUMENT_Unk3000_LGIPOCBHKAL_VALUE = 118;
     /**
-     * <code>ABILITY_INVOKE_ARGUMENT_MIXIN_UI_INTERACT = 119;</code>
+     * <code>ABILITY_INVOKE_ARGUMENT_Unk3000_EFJIGCEGHJG = 119;</code>
      */
-    public static final int ABILITY_INVOKE_ARGUMENT_MIXIN_UI_INTERACT_VALUE = 119;
+    public static final int ABILITY_INVOKE_ARGUMENT_Unk3000_EFJIGCEGHJG_VALUE = 119;
-    /**
-     * <code>ABILITY_INVOKE_ARGUMENT_MIXIN_SHOOT_FROM_CAMERA = 120;</code>
-     */
-    public static final int ABILITY_INVOKE_ARGUMENT_MIXIN_SHOOT_FROM_CAMERA_VALUE = 120;
-    /**
-     * <code>ABILITY_INVOKE_ARGUMENT_MIXIN_ERASE_BRICK_ACTIVITY = 121;</code>
-     */
-    public static final int ABILITY_INVOKE_ARGUMENT_MIXIN_ERASE_BRICK_ACTIVITY_VALUE = 121;
-    /**
-     * <code>ABILITY_INVOKE_ARGUMENT_MIXIN_BREAKOUT = 122;</code>
-     */
-    public static final int ABILITY_INVOKE_ARGUMENT_MIXIN_BREAKOUT_VALUE = 122;
-    /**
-     * <code>ABILITY_INVOKE_ARGUMENT_INVOKE_LCBKCPPPPOF = 123;</code>
-     */
-    public static final int ABILITY_INVOKE_ARGUMENT_INVOKE_LCBKCPPPPOF_VALUE = 123;
-    /**
-     * <code>ABILITY_INVOKE_ARGUMENT_INVOKE_JBJPJJEGLOM = 124;</code>
-     */
-    public static final int ABILITY_INVOKE_ARGUMENT_INVOKE_JBJPJJEGLOM_VALUE = 124;
-    /**
-     * <code>ABILITY_INVOKE_ARGUMENT_INVOKE_BCIODCIMFBK = 125;</code>
-     */
-    public static final int ABILITY_INVOKE_ARGUMENT_INVOKE_BCIODCIMFBK_VALUE = 125;
 
 
     public final int getNumber() {
@@ -591,7 +531,7 @@ public final class AbilityInvokeArgumentOuterClass {
         case 8: return ABILITY_INVOKE_ARGUMENT_META_CLEAR_GLOBAL_FLOAT_VALUE;
         case 9: return ABILITY_INVOKE_ARGUMENT_META_ABILITY_ELEMENT_STRENGTH;
         case 10: return ABILITY_INVOKE_ARGUMENT_META_ADD_OR_GET_ABILITY_AND_TRIGGER;
-        case 11: return ABILITY_INVOKE_ARGUMENT_META_SET_KILLED_SETATE;
+        case 11: return ABILITY_INVOKE_ARGUMENT_META_SET_KILLED_STATE;
         case 12: return ABILITY_INVOKE_ARGUMENT_META_SET_ABILITY_TRIGGER;
         case 13: return ABILITY_INVOKE_ARGUMENT_META_ADD_NEW_ABILITY;
         case 14: return ABILITY_INVOKE_ARGUMENT_META_REMOVE_ABILITY;
@@ -602,7 +542,7 @@ public final class AbilityInvokeArgumentOuterClass {
         case 19: return ABILITY_INVOKE_ARGUMENT_META_UPDATE_BASE_REACTION_DAMAGE;
         case 20: return ABILITY_INVOKE_ARGUMENT_META_TRIGGER_ELEMENT_REACTION;
         case 21: return ABILITY_INVOKE_ARGUMENT_META_LOSE_HP;
-        case 22: return ABILITY_INVOKE_ARGUMENT_META_DURABILITY_IS_ZERO;
+        case 22: return ABILITY_INVOKE_ARGUMENT_Unk2700_JDDDLJELBLJ;
         case 50: return ABILITY_INVOKE_ARGUMENT_ACTION_TRIGGER_ABILITY;
         case 51: return ABILITY_INVOKE_ARGUMENT_ACTION_SET_CRASH_DAMAGE;
         case 52: return ABILITY_INVOKE_ARGUMENT_ACTION_EFFECT;
@@ -616,10 +556,9 @@ public final class AbilityInvokeArgumentOuterClass {
         case 60: return ABILITY_INVOKE_ARGUMENT_ACTION_CREATE_TILE;
         case 61: return ABILITY_INVOKE_ARGUMENT_ACTION_DESTROY_TILE;
         case 62: return ABILITY_INVOKE_ARGUMENT_ACTION_FIRE_AFTER_IMAGE;
-        case 63: return ABILITY_INVOKE_ARGUMENT_ACTION_DEDUCT_STAMINA;
+        case 63: return ABILITY_INVOKE_ARGUMENT_Unk2700_FNANDDPDLOL;
-        case 64: return ABILITY_INVOKE_ARGUMENT_ACTION_HIT_EFFECT;
+        case 64: return ABILITY_INVOKE_ARGUMENT_Unk3000_EEANHJONEEP;
-        case 65: return ABILITY_INVOKE_ARGUMENT_ACTION_SET_BULLET_TRACK_TARGET;
+        case 65: return ABILITY_INVOKE_ARGUMENT_Unk3000_ADEHJMKKBJD;
-        case 66: return ABILITY_INVOKE_ARGUMENT_INVOKE_ICLAKMCJNIO;
         case 100: return ABILITY_INVOKE_ARGUMENT_MIXIN_AVATAR_STEER_BY_CAMERA;
         case 101: return ABILITY_INVOKE_ARGUMENT_MIXIN_MONSTER_DEFEND;
         case 102: return ABILITY_INVOKE_ARGUMENT_MIXIN_WIND_ZONE;
@@ -633,19 +572,13 @@ public final class AbilityInvokeArgumentOuterClass {
         case 110: return ABILITY_INVOKE_ARGUMENT_MIXIN_FIELD_ENTITY_COUNT_CHANGE;
         case 111: return ABILITY_INVOKE_ARGUMENT_MIXIN_SCENE_PROP_SYNC;
         case 112: return ABILITY_INVOKE_ARGUMENT_MIXIN_WIDGET_MP_SUPPORT;
-        case 113: return ABILITY_INVOKE_ARGUMENT_MIXIN_DO_ACTION_BY_SELF_MODIFIER_ELEMENT_DURABILITY_INVOKE_ARGUMENT_RATIO;
+        case 113: return ABILITY_INVOKE_ARGUMENT_Unk2700_NJHBFADEOON;
-        case 114: return ABILITY_INVOKE_ARGUMENT_MIXIN_FIREWORKS_LAUNCHER;
+        case 114: return ABILITY_INVOKE_ARGUMENT_Unk2700_EGCIFFFLLBG;
-        case 115: return ABILITY_INVOKE_ARGUMENT_MIXIN_ATTACK_RESULT_CREATE_COUNT;
+        case 115: return ABILITY_INVOKE_ARGUMENT_Unk2700_OFDGFACOLDI;
-        case 116: return ABILITY_INVOKE_ARGUMENT_MIXIN_UGC_TIME_CONTROL;
+        case 116: return ABILITY_INVOKE_ARGUMENT_Unk2700_KDPKJGJNGFB;
-        case 117: return ABILITY_INVOKE_ARGUMENT_MIXIN_AVATAR_COMBAT;
+        case 117: return ABILITY_INVOKE_ARGUMENT_Unk3000_BNECPACGKHP;
-        case 118: return ABILITY_INVOKE_ARGUMENT_MIXIN_DEATH_ZONE_REGIONAL_PLAY_MIXIN;
+        case 118: return ABILITY_INVOKE_ARGUMENT_Unk3000_LGIPOCBHKAL;
-        case 119: return ABILITY_INVOKE_ARGUMENT_MIXIN_UI_INTERACT;
+        case 119: return ABILITY_INVOKE_ARGUMENT_Unk3000_EFJIGCEGHJG;
-        case 120: return ABILITY_INVOKE_ARGUMENT_MIXIN_SHOOT_FROM_CAMERA;
-        case 121: return ABILITY_INVOKE_ARGUMENT_MIXIN_ERASE_BRICK_ACTIVITY;
-        case 122: return ABILITY_INVOKE_ARGUMENT_MIXIN_BREAKOUT;
-        case 123: return ABILITY_INVOKE_ARGUMENT_INVOKE_LCBKCPPPPOF;
-        case 124: return ABILITY_INVOKE_ARGUMENT_INVOKE_JBJPJJEGLOM;
-        case 125: return ABILITY_INVOKE_ARGUMENT_INVOKE_BCIODCIMFBK;
         default: return null;
       }
     }
@@ -711,7 +644,7 @@ public final class AbilityInvokeArgumentOuterClass {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\033AbilityInvokeArgument.proto*\343\033\n\025Abilit" +
+      "\n\033AbilityInvokeArgument.proto*\240\030\n\025Abilit" +
       "yInvokeArgument\022 \n\034ABILITY_INVOKE_ARGUME" +
       "NT_NONE\020\000\0220\n,ABILITY_INVOKE_ARGUMENT_MET" +
       "A_MODIFIER_CHANGE\020\001\022@\n<ABILITY_INVOKE_AR" +
@@ -727,81 +660,70 @@ public final class AbilityInvokeArgumentOuterClass {
       "OAT_VALUE\020\010\0229\n5ABILITY_INVOKE_ARGUMENT_M" +
       "ETA_ABILITY_ELEMENT_STRENGTH\020\t\022?\n;ABILIT" +
       "Y_INVOKE_ARGUMENT_META_ADD_OR_GET_ABILIT" +
-      "Y_AND_TRIGGER\020\n\0222\n.ABILITY_INVOKE_ARGUME" +
+      "Y_AND_TRIGGER\020\n\0221\n-ABILITY_INVOKE_ARGUME" +
-      "NT_META_SET_KILLED_SETATE\020\013\0224\n0ABILITY_I" +
+      "NT_META_SET_KILLED_STATE\020\013\0224\n0ABILITY_IN" +
-      "NVOKE_ARGUMENT_META_SET_ABILITY_TRIGGER\020" +
+      "VOKE_ARGUMENT_META_SET_ABILITY_TRIGGER\020\014" +
-      "\014\0220\n,ABILITY_INVOKE_ARGUMENT_META_ADD_NE" +
+      "\0220\n,ABILITY_INVOKE_ARGUMENT_META_ADD_NEW" +
-      "W_ABILITY\020\r\022/\n+ABILITY_INVOKE_ARGUMENT_M" +
+      "_ABILITY\020\r\022/\n+ABILITY_INVOKE_ARGUMENT_ME" +
-      "ETA_REMOVE_ABILITY\020\016\022:\n6ABILITY_INVOKE_A" +
+      "TA_REMOVE_ABILITY\020\016\022:\n6ABILITY_INVOKE_AR" +
-      "RGUMENT_META_SET_MODIFIER_APPLY_ENTITY\020\017" +
+      "GUMENT_META_SET_MODIFIER_APPLY_ENTITY\020\017\022" +
-      "\022;\n7ABILITY_INVOKE_ARGUMENT_META_MODIFIE" +
+      ";\n7ABILITY_INVOKE_ARGUMENT_META_MODIFIER" +
-      "R_DURABILITY_CHANGE\020\020\0228\n4ABILITY_INVOKE_" +
+      "_DURABILITY_CHANGE\020\020\0228\n4ABILITY_INVOKE_A" +
-      "ARGUMENT_META_ELEMENT_REACTION_VISUAL\020\021\022" +
+      "RGUMENT_META_ELEMENT_REACTION_VISUAL\020\021\0223" +
-      "3\n/ABILITY_INVOKE_ARGUMENT_META_SET_POSE" +
+      "\n/ABILITY_INVOKE_ARGUMENT_META_SET_POSE_" +
-      "_PARAMETER\020\022\022<\n8ABILITY_INVOKE_ARGUMENT_" +
+      "PARAMETER\020\022\022<\n8ABILITY_INVOKE_ARGUMENT_M" +
-      "META_UPDATE_BASE_REACTION_DAMAGE\020\023\0229\n5AB" +
+      "ETA_UPDATE_BASE_REACTION_DAMAGE\020\023\0229\n5ABI" +
-      "ILITY_INVOKE_ARGUMENT_META_TRIGGER_ELEME" +
+      "LITY_INVOKE_ARGUMENT_META_TRIGGER_ELEMEN" +
-      "NT_REACTION\020\024\022(\n$ABILITY_INVOKE_ARGUMENT" +
+      "T_REACTION\020\024\022(\n$ABILITY_INVOKE_ARGUMENT_" +
-      "_META_LOSE_HP\020\025\0223\n/ABILITY_INVOKE_ARGUME" +
+      "META_LOSE_HP\020\025\022/\n+ABILITY_INVOKE_ARGUMEN" +
-      "NT_META_DURABILITY_IS_ZERO\020\026\0222\n.ABILITY_" +
+      "T_Unk2700_JDDDLJELBLJ\020\026\0222\n.ABILITY_INVOK" +
-      "INVOKE_ARGUMENT_ACTION_TRIGGER_ABILITY\0202" +
+      "E_ARGUMENT_ACTION_TRIGGER_ABILITY\0202\0223\n/A" +
-      "\0223\n/ABILITY_INVOKE_ARGUMENT_ACTION_SET_C" +
+      "BILITY_INVOKE_ARGUMENT_ACTION_SET_CRASH_" +
-      "RASH_DAMAGE\0203\022)\n%ABILITY_INVOKE_ARGUMENT" +
+      "DAMAGE\0203\022)\n%ABILITY_INVOKE_ARGUMENT_ACTI" +
-      "_ACTION_EFFECT\0204\022)\n%ABILITY_INVOKE_ARGUM" +
+      "ON_EFFECT\0204\022)\n%ABILITY_INVOKE_ARGUMENT_A" +
-      "ENT_ACTION_SUMMON\0205\022(\n$ABILITY_INVOKE_AR" +
+      "CTION_SUMMON\0205\022(\n$ABILITY_INVOKE_ARGUMEN" +
-      "GUMENT_ACTION_BLINK\0206\0220\n,ABILITY_INVOKE_" +
+      "T_ACTION_BLINK\0206\0220\n,ABILITY_INVOKE_ARGUM" +
-      "ARGUMENT_ACTION_CREATE_GADGET\0207\0227\n3ABILI" +
+      "ENT_ACTION_CREATE_GADGET\0207\0227\n3ABILITY_IN" +
-      "TY_INVOKE_ARGUMENT_ACTION_APPLY_LEVEL_MO" +
+      "VOKE_ARGUMENT_ACTION_APPLY_LEVEL_MODIFIE" +
-      "DIFIER\0208\0225\n1ABILITY_INVOKE_ARGUMENT_ACTI" +
+      "R\0208\0225\n1ABILITY_INVOKE_ARGUMENT_ACTION_GE" +
-      "ON_GENERATE_ELEM_BALL\0209\022@\n<ABILITY_INVOK" +
+      "NERATE_ELEM_BALL\0209\022@\n<ABILITY_INVOKE_ARG" +
-      "E_ARGUMENT_ACTION_SET_RANDOM_OVERRIDE_MA" +
+      "UMENT_ACTION_SET_RANDOM_OVERRIDE_MAP_VAL" +
-      "P_VALUE\020:\0225\n1ABILITY_INVOKE_ARGUMENT_ACT" +
+      "UE\020:\0225\n1ABILITY_INVOKE_ARGUMENT_ACTION_S" +
-      "ION_SERVER_MONSTER_LOG\020;\022.\n*ABILITY_INVO" +
+      "ERVER_MONSTER_LOG\020;\022.\n*ABILITY_INVOKE_AR" +
-      "KE_ARGUMENT_ACTION_CREATE_TILE\020<\022/\n+ABIL" +
+      "GUMENT_ACTION_CREATE_TILE\020<\022/\n+ABILITY_I" +
-      "ITY_INVOKE_ARGUMENT_ACTION_DESTROY_TILE\020" +
+      "NVOKE_ARGUMENT_ACTION_DESTROY_TILE\020=\0223\n/" +
-      "=\0223\n/ABILITY_INVOKE_ARGUMENT_ACTION_FIRE" +
+      "ABILITY_INVOKE_ARGUMENT_ACTION_FIRE_AFTE" +
-      "_AFTER_IMAGE\020>\0221\n-ABILITY_INVOKE_ARGUMEN" +
+      "R_IMAGE\020>\022/\n+ABILITY_INVOKE_ARGUMENT_Unk" +
-      "T_ACTION_DEDUCT_STAMINA\020?\022-\n)ABILITY_INV" +
+      "2700_FNANDDPDLOL\020?\022/\n+ABILITY_INVOKE_ARG" +
-      "OKE_ARGUMENT_ACTION_HIT_EFFECT\020@\022:\n6ABIL" +
+      "UMENT_Unk3000_EEANHJONEEP\020@\022/\n+ABILITY_I" +
-      "ITY_INVOKE_ARGUMENT_ACTION_SET_BULLET_TR" +
+      "NVOKE_ARGUMENT_Unk3000_ADEHJMKKBJD\020A\0228\n4" +
-      "ACK_TARGET\020A\022.\n*ABILITY_INVOKE_ARGUMENT_" +
+      "ABILITY_INVOKE_ARGUMENT_MIXIN_AVATAR_STE" +
-      "INVOKE_ICLAKMCJNIO\020B\0228\n4ABILITY_INVOKE_A" +
+      "ER_BY_CAMERA\020d\0220\n,ABILITY_INVOKE_ARGUMEN" +
-      "RGUMENT_MIXIN_AVATAR_STEER_BY_CAMERA\020d\0220" +
+      "T_MIXIN_MONSTER_DEFEND\020e\022+\n\'ABILITY_INVO" +
-      "\n,ABILITY_INVOKE_ARGUMENT_MIXIN_MONSTER_" +
+      "KE_ARGUMENT_MIXIN_WIND_ZONE\020f\022.\n*ABILITY" +
-      "DEFEND\020e\022+\n\'ABILITY_INVOKE_ARGUMENT_MIXI" +
+      "_INVOKE_ARGUMENT_MIXIN_COST_STAMINA\020g\022.\n" +
-      "N_WIND_ZONE\020f\022.\n*ABILITY_INVOKE_ARGUMENT" +
+      "*ABILITY_INVOKE_ARGUMENT_MIXIN_ELITE_SHI" +
-      "_MIXIN_COST_STAMINA\020g\022.\n*ABILITY_INVOKE_" +
+      "ELD\020h\0220\n,ABILITY_INVOKE_ARGUMENT_MIXIN_E" +
-      "ARGUMENT_MIXIN_ELITE_SHIELD\020h\0220\n,ABILITY" +
+      "LEMENT_SHIELD\020i\022/\n+ABILITY_INVOKE_ARGUME" +
-      "_INVOKE_ARGUMENT_MIXIN_ELEMENT_SHIELD\020i\022" +
+      "NT_MIXIN_GLOBAL_SHIELD\020j\022,\n(ABILITY_INVO" +
-      "/\n+ABILITY_INVOKE_ARGUMENT_MIXIN_GLOBAL_" +
+      "KE_ARGUMENT_MIXIN_SHIELD_BAR\020k\0223\n/ABILIT" +
-      "SHIELD\020j\022,\n(ABILITY_INVOKE_ARGUMENT_MIXI" +
+      "Y_INVOKE_ARGUMENT_MIXIN_WIND_SEED_SPAWNE" +
-      "N_SHIELD_BAR\020k\0223\n/ABILITY_INVOKE_ARGUMEN" +
+      "R\020l\022?\n;ABILITY_INVOKE_ARGUMENT_MIXIN_DO_" +
-      "T_MIXIN_WIND_SEED_SPAWNER\020l\022?\n;ABILITY_I" +
+      "ACTION_BY_ELEMENT_REACTION\020m\022;\n7ABILITY_" +
-      "NVOKE_ARGUMENT_MIXIN_DO_ACTION_BY_ELEMEN" +
+      "INVOKE_ARGUMENT_MIXIN_FIELD_ENTITY_COUNT" +
-      "T_REACTION\020m\022;\n7ABILITY_INVOKE_ARGUMENT_" +
+      "_CHANGE\020n\0221\n-ABILITY_INVOKE_ARGUMENT_MIX" +
-      "MIXIN_FIELD_ENTITY_COUNT_CHANGE\020n\0221\n-ABI" +
+      "IN_SCENE_PROP_SYNC\020o\0223\n/ABILITY_INVOKE_A" +
-      "LITY_INVOKE_ARGUMENT_MIXIN_SCENE_PROP_SY" +
+      "RGUMENT_MIXIN_WIDGET_MP_SUPPORT\020p\022/\n+ABI" +
-      "NC\020o\0223\n/ABILITY_INVOKE_ARGUMENT_MIXIN_WI" +
+      "LITY_INVOKE_ARGUMENT_Unk2700_NJHBFADEOON" +
-      "DGET_MP_SUPPORT\020p\022e\naABILITY_INVOKE_ARGU" +
+      "\020q\022/\n+ABILITY_INVOKE_ARGUMENT_Unk2700_EG" +
-      "MENT_MIXIN_DO_ACTION_BY_SELF_MODIFIER_EL" +
+      "CIFFFLLBG\020r\022/\n+ABILITY_INVOKE_ARGUMENT_U" +
-      "EMENT_DURABILITY_INVOKE_ARGUMENT_RATIO\020q" +
+      "nk2700_OFDGFACOLDI\020s\022/\n+ABILITY_INVOKE_A" +
-      "\0224\n0ABILITY_INVOKE_ARGUMENT_MIXIN_FIREWO" +
+      "RGUMENT_Unk2700_KDPKJGJNGFB\020t\022/\n+ABILITY" +
-      "RKS_LAUNCHER\020r\022<\n8ABILITY_INVOKE_ARGUMEN" +
+      "_INVOKE_ARGUMENT_Unk3000_BNECPACGKHP\020u\022/" +
-      "T_MIXIN_ATTACK_RESULT_CREATE_COUNT\020s\0222\n." +
+      "\n+ABILITY_INVOKE_ARGUMENT_Unk3000_LGIPOC" +
-      "ABILITY_INVOKE_ARGUMENT_MIXIN_UGC_TIME_C" +
+      "BHKAL\020v\022/\n+ABILITY_INVOKE_ARGUMENT_Unk30" +
-      "ONTROL\020t\022/\n+ABILITY_INVOKE_ARGUMENT_MIXI" +
+      "00_EFJIGCEGHJG\020wB\033\n\031emu.grasscutter.net." +
-      "N_AVATAR_COMBAT\020u\022@\n<ABILITY_INVOKE_ARGU" +
+      "protob\006proto3"
-      "MENT_MIXIN_DEATH_ZONE_REGIONAL_PLAY_MIXI" +
-      "N\020v\022-\n)ABILITY_INVOKE_ARGUMENT_MIXIN_UI_" +
-      "INTERACT\020w\0223\n/ABILITY_INVOKE_ARGUMENT_MI" +
-      "XIN_SHOOT_FROM_CAMERA\020x\0226\n2ABILITY_INVOK" +
-      "E_ARGUMENT_MIXIN_ERASE_BRICK_ACTIVITY\020y\022" +
-      "*\n&ABILITY_INVOKE_ARGUMENT_MIXIN_BREAKOU" +
-      "T\020z\022.\n*ABILITY_INVOKE_ARGUMENT_INVOKE_LC" +
-      "BKCPPPPOF\020{\022.\n*ABILITY_INVOKE_ARGUMENT_I" +
-      "NVOKE_JBJPJJEGLOM\020|\022.\n*ABILITY_INVOKE_AR" +
-      "GUMENT_INVOKE_BCIODCIMFBK\020}B\033\n\031emu.grass" +
-      "cutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,

src/generated/main/java/emu/grasscutter/net/proto/AbilityInvokeEntryHeadOuterClass.java

@@ -19,52 +19,48 @@ public final class AbilityInvokeEntryHeadOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 server_buff_uid = 10;</code>
+     * <code>int32 modifier_config_local_id = 7;</code>
-     * @return The serverBuffUid.
-     */
-    int getServerBuffUid();
-
-    /**
-     * <code>uint32 target_id = 2;</code>
-     * @return The targetId.
-     */
-    int getTargetId();
-
-    /**
-     * <code>int32 modifier_config_local_id = 5;</code>
      * @return The modifierConfigLocalId.
      */
     int getModifierConfigLocalId();
 
     /**
-     * <code>uint32 instanced_ability_id = 3;</code>
+     * <code>bool is_serverbuff_modifier = 2;</code>
-     * @return The instancedAbilityId.
-     */
-    int getInstancedAbilityId();
-
-    /**
-     * <code>bool is_serverbuff_modifier = 12;</code>
      * @return The isServerbuffModifier.
      */
     boolean getIsServerbuffModifier();
 
     /**
-     * <code>int32 local_id = 13;</code>
+     * <code>uint32 instanced_ability_id = 1;</code>
+     * @return The instancedAbilityId.
+     */
+    int getInstancedAbilityId();
+
+    /**
+     * <code>uint32 instanced_modifier_id = 12;</code>
+     * @return The instancedModifierId.
+     */
+    int getInstancedModifierId();
+
+    /**
+     * <code>int32 local_id = 10;</code>
      * @return The localId.
      */
     int getLocalId();
 
     /**
-     * <code>uint32 instanced_modifier_id = 14;</code>
+     * <code>uint32 server_buff_uid = 14;</code>
-     * @return The instancedModifierId.
+     * @return The serverBuffUid.
      */
-    int getInstancedModifierId();
+    int getServerBuffUid();
+
+    /**
+     * <code>uint32 target_id = 3;</code>
+     * @return The targetId.
+     */
+    int getTargetId();
   }
   /**
-   * <pre>
-   * Name: DPAJKOIMAOF
-   * </pre>
-   *
    * Protobuf type {@code AbilityInvokeEntryHead}
    */
   public static final class AbilityInvokeEntryHead extends
@@ -109,39 +105,39 @@ public final class AbilityInvokeEntryHeadOuterClass {
             case 0:
               done = true;
               break;
-            case 16: {
+            case 8: {
-
-              targetId_ = input.readUInt32();
-              break;
-            }
-            case 24: {
 
               instancedAbilityId_ = input.readUInt32();
               break;
             }
-            case 40: {
+            case 16: {
+
+              isServerbuffModifier_ = input.readBool();
+              break;
+            }
+            case 24: {
+
+              targetId_ = input.readUInt32();
+              break;
+            }
+            case 56: {
 
               modifierConfigLocalId_ = input.readInt32();
               break;
             }
             case 80: {
 
-              serverBuffUid_ = input.readUInt32();
+              localId_ = input.readInt32();
               break;
             }
             case 96: {
 
-              isServerbuffModifier_ = input.readBool();
+              instancedModifierId_ = input.readUInt32();
-              break;
-            }
-            case 104: {
-
-              localId_ = input.readInt32();
               break;
             }
             case 112: {
 
-              instancedModifierId_ = input.readUInt32();
+              serverBuffUid_ = input.readUInt32();
               break;
             }
             default: {
@@ -176,32 +172,10 @@ public final class AbilityInvokeEntryHeadOuterClass {
               emu.grasscutter.net.proto.AbilityInvokeEntryHeadOuterClass.AbilityInvokeEntryHead.class, emu.grasscutter.net.proto.AbilityInvokeEntryHeadOuterClass.AbilityInvokeEntryHead.Builder.class);
     }
 
-    public static final int SERVER_BUFF_UID_FIELD_NUMBER = 10;
+    public static final int MODIFIER_CONFIG_LOCAL_ID_FIELD_NUMBER = 7;
-    private int serverBuffUid_;
-    /**
-     * <code>uint32 server_buff_uid = 10;</code>
-     * @return The serverBuffUid.
-     */
-    @java.lang.Override
-    public int getServerBuffUid() {
-      return serverBuffUid_;
-    }
-
-    public static final int TARGET_ID_FIELD_NUMBER = 2;
-    private int targetId_;
-    /**
-     * <code>uint32 target_id = 2;</code>
-     * @return The targetId.
-     */
-    @java.lang.Override
-    public int getTargetId() {
-      return targetId_;
-    }
-
-    public static final int MODIFIER_CONFIG_LOCAL_ID_FIELD_NUMBER = 5;
     private int modifierConfigLocalId_;
     /**
-     * <code>int32 modifier_config_local_id = 5;</code>
+     * <code>int32 modifier_config_local_id = 7;</code>
      * @return The modifierConfigLocalId.
      */
     @java.lang.Override
@@ -209,21 +183,10 @@ public final class AbilityInvokeEntryHeadOuterClass {
       return modifierConfigLocalId_;
     }
 
-    public static final int INSTANCED_ABILITY_ID_FIELD_NUMBER = 3;
+    public static final int IS_SERVERBUFF_MODIFIER_FIELD_NUMBER = 2;
-    private int instancedAbilityId_;
-    /**
-     * <code>uint32 instanced_ability_id = 3;</code>
-     * @return The instancedAbilityId.
-     */
-    @java.lang.Override
-    public int getInstancedAbilityId() {
-      return instancedAbilityId_;
-    }
-
-    public static final int IS_SERVERBUFF_MODIFIER_FIELD_NUMBER = 12;
     private boolean isServerbuffModifier_;
     /**
-     * <code>bool is_serverbuff_modifier = 12;</code>
+     * <code>bool is_serverbuff_modifier = 2;</code>
      * @return The isServerbuffModifier.
      */
     @java.lang.Override
@@ -231,10 +194,32 @@ public final class AbilityInvokeEntryHeadOuterClass {
       return isServerbuffModifier_;
     }
 
-    public static final int LOCAL_ID_FIELD_NUMBER = 13;
+    public static final int INSTANCED_ABILITY_ID_FIELD_NUMBER = 1;
+    private int instancedAbilityId_;
+    /**
+     * <code>uint32 instanced_ability_id = 1;</code>
+     * @return The instancedAbilityId.
+     */
+    @java.lang.Override
+    public int getInstancedAbilityId() {
+      return instancedAbilityId_;
+    }
+
+    public static final int INSTANCED_MODIFIER_ID_FIELD_NUMBER = 12;
+    private int instancedModifierId_;
+    /**
+     * <code>uint32 instanced_modifier_id = 12;</code>
+     * @return The instancedModifierId.
+     */
+    @java.lang.Override
+    public int getInstancedModifierId() {
+      return instancedModifierId_;
+    }
+
+    public static final int LOCAL_ID_FIELD_NUMBER = 10;
     private int localId_;
     /**
-     * <code>int32 local_id = 13;</code>
+     * <code>int32 local_id = 10;</code>
      * @return The localId.
      */
     @java.lang.Override
@@ -242,15 +227,26 @@ public final class AbilityInvokeEntryHeadOuterClass {
       return localId_;
     }
 
-    public static final int INSTANCED_MODIFIER_ID_FIELD_NUMBER = 14;
+    public static final int SERVER_BUFF_UID_FIELD_NUMBER = 14;
-    private int instancedModifierId_;
+    private int serverBuffUid_;
     /**
-     * <code>uint32 instanced_modifier_id = 14;</code>
+     * <code>uint32 server_buff_uid = 14;</code>
-     * @return The instancedModifierId.
+     * @return The serverBuffUid.
      */
     @java.lang.Override
-    public int getInstancedModifierId() {
+    public int getServerBuffUid() {
-      return instancedModifierId_;
+      return serverBuffUid_;
+    }
+
+    public static final int TARGET_ID_FIELD_NUMBER = 3;
+    private int targetId_;
+    /**
+     * <code>uint32 target_id = 3;</code>
+     * @return The targetId.
+     */
+    @java.lang.Override
+    public int getTargetId() {
+      return targetId_;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -267,26 +263,26 @@ public final class AbilityInvokeEntryHeadOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (targetId_ != 0) {
-        output.writeUInt32(2, targetId_);
-      }
       if (instancedAbilityId_ != 0) {
-        output.writeUInt32(3, instancedAbilityId_);
+        output.writeUInt32(1, instancedAbilityId_);
-      }
-      if (modifierConfigLocalId_ != 0) {
-        output.writeInt32(5, modifierConfigLocalId_);
-      }
-      if (serverBuffUid_ != 0) {
-        output.writeUInt32(10, serverBuffUid_);
       }
       if (isServerbuffModifier_ != false) {
-        output.writeBool(12, isServerbuffModifier_);
+        output.writeBool(2, isServerbuffModifier_);
+      }
+      if (targetId_ != 0) {
+        output.writeUInt32(3, targetId_);
+      }
+      if (modifierConfigLocalId_ != 0) {
+        output.writeInt32(7, modifierConfigLocalId_);
       }
       if (localId_ != 0) {
-        output.writeInt32(13, localId_);
+        output.writeInt32(10, localId_);
       }
       if (instancedModifierId_ != 0) {
-        output.writeUInt32(14, instancedModifierId_);
+        output.writeUInt32(12, instancedModifierId_);
+      }
+      if (serverBuffUid_ != 0) {
+        output.writeUInt32(14, serverBuffUid_);
       }
       unknownFields.writeTo(output);
     }
@@ -297,33 +293,33 @@ public final class AbilityInvokeEntryHeadOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (targetId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(2, targetId_);
-      }
       if (instancedAbilityId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(3, instancedAbilityId_);
+          .computeUInt32Size(1, instancedAbilityId_);
-      }
-      if (modifierConfigLocalId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(5, modifierConfigLocalId_);
-      }
-      if (serverBuffUid_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(10, serverBuffUid_);
       }
       if (isServerbuffModifier_ != false) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(12, isServerbuffModifier_);
+          .computeBoolSize(2, isServerbuffModifier_);
+      }
+      if (targetId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(3, targetId_);
+      }
+      if (modifierConfigLocalId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeInt32Size(7, modifierConfigLocalId_);
       }
       if (localId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(13, localId_);
+          .computeInt32Size(10, localId_);
       }
       if (instancedModifierId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(14, instancedModifierId_);
+          .computeUInt32Size(12, instancedModifierId_);
+      }
+      if (serverBuffUid_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(14, serverBuffUid_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -340,20 +336,20 @@ public final class AbilityInvokeEntryHeadOuterClass {
       }
       emu.grasscutter.net.proto.AbilityInvokeEntryHeadOuterClass.AbilityInvokeEntryHead other = (emu.grasscutter.net.proto.AbilityInvokeEntryHeadOuterClass.AbilityInvokeEntryHead) obj;
 
+      if (getModifierConfigLocalId()
+          != other.getModifierConfigLocalId()) return false;
+      if (getIsServerbuffModifier()
+          != other.getIsServerbuffModifier()) return false;
+      if (getInstancedAbilityId()
+          != other.getInstancedAbilityId()) return false;
+      if (getInstancedModifierId()
+          != other.getInstancedModifierId()) return false;
+      if (getLocalId()
+          != other.getLocalId()) return false;
       if (getServerBuffUid()
           != other.getServerBuffUid()) return false;
       if (getTargetId()
           != other.getTargetId()) return false;
-      if (getModifierConfigLocalId()
-          != other.getModifierConfigLocalId()) return false;
-      if (getInstancedAbilityId()
-          != other.getInstancedAbilityId()) return false;
-      if (getIsServerbuffModifier()
-          != other.getIsServerbuffModifier()) return false;
-      if (getLocalId()
-          != other.getLocalId()) return false;
-      if (getInstancedModifierId()
-          != other.getInstancedModifierId()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -365,21 +361,21 @@ public final class AbilityInvokeEntryHeadOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
+      hash = (37 * hash) + MODIFIER_CONFIG_LOCAL_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getModifierConfigLocalId();
+      hash = (37 * hash) + IS_SERVERBUFF_MODIFIER_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+          getIsServerbuffModifier());
+      hash = (37 * hash) + INSTANCED_ABILITY_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getInstancedAbilityId();
+      hash = (37 * hash) + INSTANCED_MODIFIER_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getInstancedModifierId();
+      hash = (37 * hash) + LOCAL_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getLocalId();
       hash = (37 * hash) + SERVER_BUFF_UID_FIELD_NUMBER;
       hash = (53 * hash) + getServerBuffUid();
       hash = (37 * hash) + TARGET_ID_FIELD_NUMBER;
       hash = (53 * hash) + getTargetId();
-      hash = (37 * hash) + MODIFIER_CONFIG_LOCAL_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getModifierConfigLocalId();
-      hash = (37 * hash) + INSTANCED_ABILITY_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getInstancedAbilityId();
-      hash = (37 * hash) + IS_SERVERBUFF_MODIFIER_FIELD_NUMBER;
-      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
-          getIsServerbuffModifier());
-      hash = (37 * hash) + LOCAL_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getLocalId();
-      hash = (37 * hash) + INSTANCED_MODIFIER_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getInstancedModifierId();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -476,10 +472,6 @@ public final class AbilityInvokeEntryHeadOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Name: DPAJKOIMAOF
-     * </pre>
-     *
      * Protobuf type {@code AbilityInvokeEntryHead}
      */
     public static final class Builder extends
@@ -517,20 +509,20 @@ public final class AbilityInvokeEntryHeadOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        serverBuffUid_ = 0;
-
-        targetId_ = 0;
-
         modifierConfigLocalId_ = 0;
 
-        instancedAbilityId_ = 0;
-
         isServerbuffModifier_ = false;
 
-        localId_ = 0;
+        instancedAbilityId_ = 0;
 
         instancedModifierId_ = 0;
 
+        localId_ = 0;
+
+        serverBuffUid_ = 0;
+
+        targetId_ = 0;
+
         return this;
       }
 
@@ -557,13 +549,13 @@ public final class AbilityInvokeEntryHeadOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.AbilityInvokeEntryHeadOuterClass.AbilityInvokeEntryHead buildPartial() {
         emu.grasscutter.net.proto.AbilityInvokeEntryHeadOuterClass.AbilityInvokeEntryHead result = new emu.grasscutter.net.proto.AbilityInvokeEntryHeadOuterClass.AbilityInvokeEntryHead(this);
+        result.modifierConfigLocalId_ = modifierConfigLocalId_;
+        result.isServerbuffModifier_ = isServerbuffModifier_;
+        result.instancedAbilityId_ = instancedAbilityId_;
+        result.instancedModifierId_ = instancedModifierId_;
+        result.localId_ = localId_;
         result.serverBuffUid_ = serverBuffUid_;
         result.targetId_ = targetId_;
-        result.modifierConfigLocalId_ = modifierConfigLocalId_;
-        result.instancedAbilityId_ = instancedAbilityId_;
-        result.isServerbuffModifier_ = isServerbuffModifier_;
-        result.localId_ = localId_;
-        result.instancedModifierId_ = instancedModifierId_;
         onBuilt();
         return result;
       }
@@ -612,27 +604,27 @@ public final class AbilityInvokeEntryHeadOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.AbilityInvokeEntryHeadOuterClass.AbilityInvokeEntryHead other) {
         if (other == emu.grasscutter.net.proto.AbilityInvokeEntryHeadOuterClass.AbilityInvokeEntryHead.getDefaultInstance()) return this;
+        if (other.getModifierConfigLocalId() != 0) {
+          setModifierConfigLocalId(other.getModifierConfigLocalId());
+        }
+        if (other.getIsServerbuffModifier() != false) {
+          setIsServerbuffModifier(other.getIsServerbuffModifier());
+        }
+        if (other.getInstancedAbilityId() != 0) {
+          setInstancedAbilityId(other.getInstancedAbilityId());
+        }
+        if (other.getInstancedModifierId() != 0) {
+          setInstancedModifierId(other.getInstancedModifierId());
+        }
+        if (other.getLocalId() != 0) {
+          setLocalId(other.getLocalId());
+        }
         if (other.getServerBuffUid() != 0) {
           setServerBuffUid(other.getServerBuffUid());
         }
         if (other.getTargetId() != 0) {
           setTargetId(other.getTargetId());
         }
-        if (other.getModifierConfigLocalId() != 0) {
-          setModifierConfigLocalId(other.getModifierConfigLocalId());
-        }
-        if (other.getInstancedAbilityId() != 0) {
-          setInstancedAbilityId(other.getInstancedAbilityId());
-        }
-        if (other.getIsServerbuffModifier() != false) {
-          setIsServerbuffModifier(other.getIsServerbuffModifier());
-        }
-        if (other.getLocalId() != 0) {
-          setLocalId(other.getLocalId());
-        }
-        if (other.getInstancedModifierId() != 0) {
-          setInstancedModifierId(other.getInstancedModifierId());
-        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -662,9 +654,164 @@ public final class AbilityInvokeEntryHeadOuterClass {
         return this;
       }
 
+      private int modifierConfigLocalId_ ;
+      /**
+       * <code>int32 modifier_config_local_id = 7;</code>
+       * @return The modifierConfigLocalId.
+       */
+      @java.lang.Override
+      public int getModifierConfigLocalId() {
+        return modifierConfigLocalId_;
+      }
+      /**
+       * <code>int32 modifier_config_local_id = 7;</code>
+       * @param value The modifierConfigLocalId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setModifierConfigLocalId(int value) {
+        
+        modifierConfigLocalId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>int32 modifier_config_local_id = 7;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearModifierConfigLocalId() {
+        
+        modifierConfigLocalId_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private boolean isServerbuffModifier_ ;
+      /**
+       * <code>bool is_serverbuff_modifier = 2;</code>
+       * @return The isServerbuffModifier.
+       */
+      @java.lang.Override
+      public boolean getIsServerbuffModifier() {
+        return isServerbuffModifier_;
+      }
+      /**
+       * <code>bool is_serverbuff_modifier = 2;</code>
+       * @param value The isServerbuffModifier to set.
+       * @return This builder for chaining.
+       */
+      public Builder setIsServerbuffModifier(boolean value) {
+        
+        isServerbuffModifier_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>bool is_serverbuff_modifier = 2;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearIsServerbuffModifier() {
+        
+        isServerbuffModifier_ = false;
+        onChanged();
+        return this;
+      }
+
+      private int instancedAbilityId_ ;
+      /**
+       * <code>uint32 instanced_ability_id = 1;</code>
+       * @return The instancedAbilityId.
+       */
+      @java.lang.Override
+      public int getInstancedAbilityId() {
+        return instancedAbilityId_;
+      }
+      /**
+       * <code>uint32 instanced_ability_id = 1;</code>
+       * @param value The instancedAbilityId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setInstancedAbilityId(int value) {
+        
+        instancedAbilityId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 instanced_ability_id = 1;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearInstancedAbilityId() {
+        
+        instancedAbilityId_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int instancedModifierId_ ;
+      /**
+       * <code>uint32 instanced_modifier_id = 12;</code>
+       * @return The instancedModifierId.
+       */
+      @java.lang.Override
+      public int getInstancedModifierId() {
+        return instancedModifierId_;
+      }
+      /**
+       * <code>uint32 instanced_modifier_id = 12;</code>
+       * @param value The instancedModifierId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setInstancedModifierId(int value) {
+        
+        instancedModifierId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 instanced_modifier_id = 12;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearInstancedModifierId() {
+        
+        instancedModifierId_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int localId_ ;
+      /**
+       * <code>int32 local_id = 10;</code>
+       * @return The localId.
+       */
+      @java.lang.Override
+      public int getLocalId() {
+        return localId_;
+      }
+      /**
+       * <code>int32 local_id = 10;</code>
+       * @param value The localId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setLocalId(int value) {
+        
+        localId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>int32 local_id = 10;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearLocalId() {
+        
+        localId_ = 0;
+        onChanged();
+        return this;
+      }
+
       private int serverBuffUid_ ;
       /**
-       * <code>uint32 server_buff_uid = 10;</code>
+       * <code>uint32 server_buff_uid = 14;</code>
        * @return The serverBuffUid.
        */
       @java.lang.Override
@@ -672,7 +819,7 @@ public final class AbilityInvokeEntryHeadOuterClass {
         return serverBuffUid_;
       }
       /**
-       * <code>uint32 server_buff_uid = 10;</code>
+       * <code>uint32 server_buff_uid = 14;</code>
        * @param value The serverBuffUid to set.
        * @return This builder for chaining.
        */
@@ -683,7 +830,7 @@ public final class AbilityInvokeEntryHeadOuterClass {
         return this;
       }
       /**
-       * <code>uint32 server_buff_uid = 10;</code>
+       * <code>uint32 server_buff_uid = 14;</code>
        * @return This builder for chaining.
        */
       public Builder clearServerBuffUid() {
@@ -695,7 +842,7 @@ public final class AbilityInvokeEntryHeadOuterClass {
 
       private int targetId_ ;
       /**
-       * <code>uint32 target_id = 2;</code>
+       * <code>uint32 target_id = 3;</code>
        * @return The targetId.
        */
       @java.lang.Override
@@ -703,7 +850,7 @@ public final class AbilityInvokeEntryHeadOuterClass {
         return targetId_;
       }
       /**
-       * <code>uint32 target_id = 2;</code>
+       * <code>uint32 target_id = 3;</code>
        * @param value The targetId to set.
        * @return This builder for chaining.
        */
@@ -714,7 +861,7 @@ public final class AbilityInvokeEntryHeadOuterClass {
         return this;
       }
       /**
-       * <code>uint32 target_id = 2;</code>
+       * <code>uint32 target_id = 3;</code>
        * @return This builder for chaining.
        */
       public Builder clearTargetId() {
@@ -723,161 +870,6 @@ public final class AbilityInvokeEntryHeadOuterClass {
         onChanged();
         return this;
       }
-
-      private int modifierConfigLocalId_ ;
-      /**
-       * <code>int32 modifier_config_local_id = 5;</code>
-       * @return The modifierConfigLocalId.
-       */
-      @java.lang.Override
-      public int getModifierConfigLocalId() {
-        return modifierConfigLocalId_;
-      }
-      /**
-       * <code>int32 modifier_config_local_id = 5;</code>
-       * @param value The modifierConfigLocalId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setModifierConfigLocalId(int value) {
-        
-        modifierConfigLocalId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>int32 modifier_config_local_id = 5;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearModifierConfigLocalId() {
-        
-        modifierConfigLocalId_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int instancedAbilityId_ ;
-      /**
-       * <code>uint32 instanced_ability_id = 3;</code>
-       * @return The instancedAbilityId.
-       */
-      @java.lang.Override
-      public int getInstancedAbilityId() {
-        return instancedAbilityId_;
-      }
-      /**
-       * <code>uint32 instanced_ability_id = 3;</code>
-       * @param value The instancedAbilityId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setInstancedAbilityId(int value) {
-        
-        instancedAbilityId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 instanced_ability_id = 3;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearInstancedAbilityId() {
-        
-        instancedAbilityId_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private boolean isServerbuffModifier_ ;
-      /**
-       * <code>bool is_serverbuff_modifier = 12;</code>
-       * @return The isServerbuffModifier.
-       */
-      @java.lang.Override
-      public boolean getIsServerbuffModifier() {
-        return isServerbuffModifier_;
-      }
-      /**
-       * <code>bool is_serverbuff_modifier = 12;</code>
-       * @param value The isServerbuffModifier to set.
-       * @return This builder for chaining.
-       */
-      public Builder setIsServerbuffModifier(boolean value) {
-        
-        isServerbuffModifier_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>bool is_serverbuff_modifier = 12;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearIsServerbuffModifier() {
-        
-        isServerbuffModifier_ = false;
-        onChanged();
-        return this;
-      }
-
-      private int localId_ ;
-      /**
-       * <code>int32 local_id = 13;</code>
-       * @return The localId.
-       */
-      @java.lang.Override
-      public int getLocalId() {
-        return localId_;
-      }
-      /**
-       * <code>int32 local_id = 13;</code>
-       * @param value The localId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setLocalId(int value) {
-        
-        localId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>int32 local_id = 13;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearLocalId() {
-        
-        localId_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int instancedModifierId_ ;
-      /**
-       * <code>uint32 instanced_modifier_id = 14;</code>
-       * @return The instancedModifierId.
-       */
-      @java.lang.Override
-      public int getInstancedModifierId() {
-        return instancedModifierId_;
-      }
-      /**
-       * <code>uint32 instanced_modifier_id = 14;</code>
-       * @param value The instancedModifierId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setInstancedModifierId(int value) {
-        
-        instancedModifierId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 instanced_modifier_id = 14;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearInstancedModifierId() {
-        
-        instancedModifierId_ = 0;
-        onChanged();
-        return this;
-      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -946,12 +938,12 @@ public final class AbilityInvokeEntryHeadOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\034AbilityInvokeEntryHead.proto\"\325\001\n\026Abili" +
-      "tyInvokeEntryHead\022\027\n\017server_buff_uid\030\n \001" +
+      "tyInvokeEntryHead\022 \n\030modifier_config_loc" +
-      "(\r\022\021\n\ttarget_id\030\002 \001(\r\022 \n\030modifier_config" +
+      "al_id\030\007 \001(\005\022\036\n\026is_serverbuff_modifier\030\002 " +
-      "_local_id\030\005 \001(\005\022\034\n\024instanced_ability_id\030" +
+      "\001(\010\022\034\n\024instanced_ability_id\030\001 \001(\r\022\035\n\025ins" +
-      "\003 \001(\r\022\036\n\026is_serverbuff_modifier\030\014 \001(\010\022\020\n" +
+      "tanced_modifier_id\030\014 \001(\r\022\020\n\010local_id\030\n \001" +
-      "\010local_id\030\r \001(\005\022\035\n\025instanced_modifier_id" +
+      "(\005\022\027\n\017server_buff_uid\030\016 \001(\r\022\021\n\ttarget_id" +
-      "\030\016 \001(\rB\033\n\031emu.grasscutter.net.protob\006pro" +
+      "\030\003 \001(\rB\033\n\031emu.grasscutter.net.protob\006pro" +
       "to3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -963,7 +955,7 @@ public final class AbilityInvokeEntryHeadOuterClass {
     internal_static_AbilityInvokeEntryHead_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_AbilityInvokeEntryHead_descriptor,
-        new java.lang.String[] { "ServerBuffUid", "TargetId", "ModifierConfigLocalId", "InstancedAbilityId", "IsServerbuffModifier", "LocalId", "InstancedModifierId", });
+        new java.lang.String[] { "ModifierConfigLocalId", "IsServerbuffModifier", "InstancedAbilityId", "InstancedModifierId", "LocalId", "ServerBuffUid", "TargetId", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)

src/generated/main/java/emu/grasscutter/net/proto/AbilityInvokeEntryOuterClass.java

@@ -19,34 +19,16 @@ public final class AbilityInvokeEntryOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>.AbilityInvokeArgument argument_type = 6;</code>
+     * <code>.AbilityInvokeArgument argument_type = 1;</code>
      * @return The enum numeric value on the wire for argumentType.
      */
     int getArgumentTypeValue();
     /**
-     * <code>.AbilityInvokeArgument argument_type = 6;</code>
+     * <code>.AbilityInvokeArgument argument_type = 1;</code>
      * @return The argumentType.
      */
     emu.grasscutter.net.proto.AbilityInvokeArgumentOuterClass.AbilityInvokeArgument getArgumentType();
 
-    /**
-     * <code>uint32 event_id = 7;</code>
-     * @return The eventId.
-     */
-    int getEventId();
-
-    /**
-     * <code>bool is_ignore_auth = 5;</code>
-     * @return The isIgnoreAuth.
-     */
-    boolean getIsIgnoreAuth();
-
-    /**
-     * <code>uint32 forward_peer = 1;</code>
-     * @return The forwardPeer.
-     */
-    int getForwardPeer();
-
     /**
      * <code>.AbilityInvokeEntryHead head = 2;</code>
      * @return Whether the head field is set.
@@ -63,39 +45,47 @@ public final class AbilityInvokeEntryOuterClass {
     emu.grasscutter.net.proto.AbilityInvokeEntryHeadOuterClass.AbilityInvokeEntryHeadOrBuilder getHeadOrBuilder();
 
     /**
-     * <code>.ForwardType forward_type = 4;</code>
+     * <code>uint32 forward_peer = 4;</code>
+     * @return The forwardPeer.
+     */
+    int getForwardPeer();
+
+    /**
+     * <code>uint32 event_id = 12;</code>
+     * @return The eventId.
+     */
+    int getEventId();
+
+    /**
+     * <code>.ForwardType forward_type = 3;</code>
      * @return The enum numeric value on the wire for forwardType.
      */
     int getForwardTypeValue();
     /**
-     * <code>.ForwardType forward_type = 4;</code>
+     * <code>.ForwardType forward_type = 3;</code>
      * @return The forwardType.
      */
     emu.grasscutter.net.proto.ForwardTypeOuterClass.ForwardType getForwardType();
 
     /**
-     * <code>double total_tick_time = 9;</code>
+     * <code>bytes ability_data = 15;</code>
-     * @return The totalTickTime.
-     */
-    double getTotalTickTime();
-
-    /**
-     * <code>bytes ability_data = 3;</code>
      * @return The abilityData.
      */
     com.google.protobuf.ByteString getAbilityData();
 
     /**
-     * <code>uint32 entity_id = 11;</code>
+     * <code>double total_tick_time = 14;</code>
+     * @return The totalTickTime.
+     */
+    double getTotalTickTime();
+
+    /**
+     * <code>uint32 entity_id = 9;</code>
      * @return The entityId.
      */
     int getEntityId();
   }
   /**
-   * <pre>
-   * Name: KBLDACDEINJ
-   * </pre>
-   *
    * Protobuf type {@code AbilityInvokeEntry}
    */
   public static final class AbilityInvokeEntry extends
@@ -144,8 +134,9 @@ public final class AbilityInvokeEntryOuterClass {
               done = true;
               break;
             case 8: {
+              int rawValue = input.readEnum();
 
-              forwardPeer_ = input.readUInt32();
+              argumentType_ = rawValue;
               break;
             }
             case 18: {
@@ -161,41 +152,35 @@ public final class AbilityInvokeEntryOuterClass {
 
               break;
             }
-            case 26: {
+            case 24: {
-
-              abilityData_ = input.readBytes();
-              break;
-            }
-            case 32: {
               int rawValue = input.readEnum();
 
               forwardType_ = rawValue;
               break;
             }
-            case 40: {
+            case 32: {
 
-              isIgnoreAuth_ = input.readBool();
+              forwardPeer_ = input.readUInt32();
               break;
             }
-            case 48: {
+            case 72: {
-              int rawValue = input.readEnum();
 
-              argumentType_ = rawValue;
+              entityId_ = input.readUInt32();
               break;
             }
-            case 56: {
+            case 96: {
 
               eventId_ = input.readUInt32();
               break;
             }
-            case 73: {
+            case 113: {
 
               totalTickTime_ = input.readDouble();
               break;
             }
-            case 88: {
+            case 122: {
 
-              entityId_ = input.readUInt32();
+              abilityData_ = input.readBytes();
               break;
             }
             default: {
@@ -230,17 +215,17 @@ public final class AbilityInvokeEntryOuterClass {
               emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry.class, emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry.Builder.class);
     }
 
-    public static final int ARGUMENT_TYPE_FIELD_NUMBER = 6;
+    public static final int ARGUMENT_TYPE_FIELD_NUMBER = 1;
     private int argumentType_;
     /**
-     * <code>.AbilityInvokeArgument argument_type = 6;</code>
+     * <code>.AbilityInvokeArgument argument_type = 1;</code>
      * @return The enum numeric value on the wire for argumentType.
      */
     @java.lang.Override public int getArgumentTypeValue() {
       return argumentType_;
     }
     /**
-     * <code>.AbilityInvokeArgument argument_type = 6;</code>
+     * <code>.AbilityInvokeArgument argument_type = 1;</code>
      * @return The argumentType.
      */
     @java.lang.Override public emu.grasscutter.net.proto.AbilityInvokeArgumentOuterClass.AbilityInvokeArgument getArgumentType() {
@@ -249,39 +234,6 @@ public final class AbilityInvokeEntryOuterClass {
       return result == null ? emu.grasscutter.net.proto.AbilityInvokeArgumentOuterClass.AbilityInvokeArgument.UNRECOGNIZED : result;
     }
 
-    public static final int EVENT_ID_FIELD_NUMBER = 7;
-    private int eventId_;
-    /**
-     * <code>uint32 event_id = 7;</code>
-     * @return The eventId.
-     */
-    @java.lang.Override
-    public int getEventId() {
-      return eventId_;
-    }
-
-    public static final int IS_IGNORE_AUTH_FIELD_NUMBER = 5;
-    private boolean isIgnoreAuth_;
-    /**
-     * <code>bool is_ignore_auth = 5;</code>
-     * @return The isIgnoreAuth.
-     */
-    @java.lang.Override
-    public boolean getIsIgnoreAuth() {
-      return isIgnoreAuth_;
-    }
-
-    public static final int FORWARD_PEER_FIELD_NUMBER = 1;
-    private int forwardPeer_;
-    /**
-     * <code>uint32 forward_peer = 1;</code>
-     * @return The forwardPeer.
-     */
-    @java.lang.Override
-    public int getForwardPeer() {
-      return forwardPeer_;
-    }
-
     public static final int HEAD_FIELD_NUMBER = 2;
     private emu.grasscutter.net.proto.AbilityInvokeEntryHeadOuterClass.AbilityInvokeEntryHead head_;
     /**
@@ -308,17 +260,39 @@ public final class AbilityInvokeEntryOuterClass {
       return getHead();
     }
 
-    public static final int FORWARD_TYPE_FIELD_NUMBER = 4;
+    public static final int FORWARD_PEER_FIELD_NUMBER = 4;
+    private int forwardPeer_;
+    /**
+     * <code>uint32 forward_peer = 4;</code>
+     * @return The forwardPeer.
+     */
+    @java.lang.Override
+    public int getForwardPeer() {
+      return forwardPeer_;
+    }
+
+    public static final int EVENT_ID_FIELD_NUMBER = 12;
+    private int eventId_;
+    /**
+     * <code>uint32 event_id = 12;</code>
+     * @return The eventId.
+     */
+    @java.lang.Override
+    public int getEventId() {
+      return eventId_;
+    }
+
+    public static final int FORWARD_TYPE_FIELD_NUMBER = 3;
     private int forwardType_;
     /**
-     * <code>.ForwardType forward_type = 4;</code>
+     * <code>.ForwardType forward_type = 3;</code>
      * @return The enum numeric value on the wire for forwardType.
      */
     @java.lang.Override public int getForwardTypeValue() {
       return forwardType_;
     }
     /**
-     * <code>.ForwardType forward_type = 4;</code>
+     * <code>.ForwardType forward_type = 3;</code>
      * @return The forwardType.
      */
     @java.lang.Override public emu.grasscutter.net.proto.ForwardTypeOuterClass.ForwardType getForwardType() {
@@ -327,21 +301,10 @@ public final class AbilityInvokeEntryOuterClass {
       return result == null ? emu.grasscutter.net.proto.ForwardTypeOuterClass.ForwardType.UNRECOGNIZED : result;
     }
 
-    public static final int TOTAL_TICK_TIME_FIELD_NUMBER = 9;
+    public static final int ABILITY_DATA_FIELD_NUMBER = 15;
-    private double totalTickTime_;
-    /**
-     * <code>double total_tick_time = 9;</code>
-     * @return The totalTickTime.
-     */
-    @java.lang.Override
-    public double getTotalTickTime() {
-      return totalTickTime_;
-    }
-
-    public static final int ABILITY_DATA_FIELD_NUMBER = 3;
     private com.google.protobuf.ByteString abilityData_;
     /**
-     * <code>bytes ability_data = 3;</code>
+     * <code>bytes ability_data = 15;</code>
      * @return The abilityData.
      */
     @java.lang.Override
@@ -349,10 +312,21 @@ public final class AbilityInvokeEntryOuterClass {
       return abilityData_;
     }
 
-    public static final int ENTITY_ID_FIELD_NUMBER = 11;
+    public static final int TOTAL_TICK_TIME_FIELD_NUMBER = 14;
+    private double totalTickTime_;
+    /**
+     * <code>double total_tick_time = 14;</code>
+     * @return The totalTickTime.
+     */
+    @java.lang.Override
+    public double getTotalTickTime() {
+      return totalTickTime_;
+    }
+
+    public static final int ENTITY_ID_FIELD_NUMBER = 9;
     private int entityId_;
     /**
-     * <code>uint32 entity_id = 11;</code>
+     * <code>uint32 entity_id = 9;</code>
      * @return The entityId.
      */
     @java.lang.Override
@@ -374,32 +348,29 @@ public final class AbilityInvokeEntryOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (forwardPeer_ != 0) {
+      if (argumentType_ != emu.grasscutter.net.proto.AbilityInvokeArgumentOuterClass.AbilityInvokeArgument.ABILITY_INVOKE_ARGUMENT_NONE.getNumber()) {
-        output.writeUInt32(1, forwardPeer_);
+        output.writeEnum(1, argumentType_);
       }
       if (head_ != null) {
         output.writeMessage(2, getHead());
       }
-      if (!abilityData_.isEmpty()) {
-        output.writeBytes(3, abilityData_);
-      }
       if (forwardType_ != emu.grasscutter.net.proto.ForwardTypeOuterClass.ForwardType.FORWARD_TYPE_LOCAL.getNumber()) {
-        output.writeEnum(4, forwardType_);
+        output.writeEnum(3, forwardType_);
       }
-      if (isIgnoreAuth_ != false) {
+      if (forwardPeer_ != 0) {
-        output.writeBool(5, isIgnoreAuth_);
+        output.writeUInt32(4, forwardPeer_);
-      }
-      if (argumentType_ != emu.grasscutter.net.proto.AbilityInvokeArgumentOuterClass.AbilityInvokeArgument.ABILITY_INVOKE_ARGUMENT_NONE.getNumber()) {
-        output.writeEnum(6, argumentType_);
-      }
-      if (eventId_ != 0) {
-        output.writeUInt32(7, eventId_);
-      }
-      if (totalTickTime_ != 0D) {
-        output.writeDouble(9, totalTickTime_);
       }
       if (entityId_ != 0) {
-        output.writeUInt32(11, entityId_);
+        output.writeUInt32(9, entityId_);
+      }
+      if (eventId_ != 0) {
+        output.writeUInt32(12, eventId_);
+      }
+      if (totalTickTime_ != 0D) {
+        output.writeDouble(14, totalTickTime_);
+      }
+      if (!abilityData_.isEmpty()) {
+        output.writeBytes(15, abilityData_);
       }
       unknownFields.writeTo(output);
     }
@@ -410,41 +381,37 @@ public final class AbilityInvokeEntryOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (forwardPeer_ != 0) {
+      if (argumentType_ != emu.grasscutter.net.proto.AbilityInvokeArgumentOuterClass.AbilityInvokeArgument.ABILITY_INVOKE_ARGUMENT_NONE.getNumber()) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(1, forwardPeer_);
+          .computeEnumSize(1, argumentType_);
       }
       if (head_ != null) {
         size += com.google.protobuf.CodedOutputStream
           .computeMessageSize(2, getHead());
       }
-      if (!abilityData_.isEmpty()) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeBytesSize(3, abilityData_);
-      }
       if (forwardType_ != emu.grasscutter.net.proto.ForwardTypeOuterClass.ForwardType.FORWARD_TYPE_LOCAL.getNumber()) {
         size += com.google.protobuf.CodedOutputStream
-          .computeEnumSize(4, forwardType_);
+          .computeEnumSize(3, forwardType_);
       }
-      if (isIgnoreAuth_ != false) {
+      if (forwardPeer_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(5, isIgnoreAuth_);
+          .computeUInt32Size(4, forwardPeer_);
-      }
-      if (argumentType_ != emu.grasscutter.net.proto.AbilityInvokeArgumentOuterClass.AbilityInvokeArgument.ABILITY_INVOKE_ARGUMENT_NONE.getNumber()) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeEnumSize(6, argumentType_);
-      }
-      if (eventId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(7, eventId_);
-      }
-      if (totalTickTime_ != 0D) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeDoubleSize(9, totalTickTime_);
       }
       if (entityId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(11, entityId_);
+          .computeUInt32Size(9, entityId_);
+      }
+      if (eventId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(12, eventId_);
+      }
+      if (totalTickTime_ != 0D) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeDoubleSize(14, totalTickTime_);
+      }
+      if (!abilityData_.isEmpty()) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBytesSize(15, abilityData_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -462,23 +429,21 @@ public final class AbilityInvokeEntryOuterClass {
       emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry other = (emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry) obj;
 
       if (argumentType_ != other.argumentType_) return false;
-      if (getEventId()
-          != other.getEventId()) return false;
-      if (getIsIgnoreAuth()
-          != other.getIsIgnoreAuth()) return false;
-      if (getForwardPeer()
-          != other.getForwardPeer()) return false;
       if (hasHead() != other.hasHead()) return false;
       if (hasHead()) {
         if (!getHead()
             .equals(other.getHead())) return false;
       }
+      if (getForwardPeer()
+          != other.getForwardPeer()) return false;
+      if (getEventId()
+          != other.getEventId()) return false;
       if (forwardType_ != other.forwardType_) return false;
+      if (!getAbilityData()
+          .equals(other.getAbilityData())) return false;
       if (java.lang.Double.doubleToLongBits(getTotalTickTime())
           != java.lang.Double.doubleToLongBits(
               other.getTotalTickTime())) return false;
-      if (!getAbilityData()
-          .equals(other.getAbilityData())) return false;
       if (getEntityId()
           != other.getEntityId()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
@@ -494,24 +459,21 @@ public final class AbilityInvokeEntryOuterClass {
       hash = (19 * hash) + getDescriptor().hashCode();
       hash = (37 * hash) + ARGUMENT_TYPE_FIELD_NUMBER;
       hash = (53 * hash) + argumentType_;
-      hash = (37 * hash) + EVENT_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getEventId();
-      hash = (37 * hash) + IS_IGNORE_AUTH_FIELD_NUMBER;
-      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
-          getIsIgnoreAuth());
-      hash = (37 * hash) + FORWARD_PEER_FIELD_NUMBER;
-      hash = (53 * hash) + getForwardPeer();
       if (hasHead()) {
         hash = (37 * hash) + HEAD_FIELD_NUMBER;
         hash = (53 * hash) + getHead().hashCode();
       }
+      hash = (37 * hash) + FORWARD_PEER_FIELD_NUMBER;
+      hash = (53 * hash) + getForwardPeer();
+      hash = (37 * hash) + EVENT_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getEventId();
       hash = (37 * hash) + FORWARD_TYPE_FIELD_NUMBER;
       hash = (53 * hash) + forwardType_;
+      hash = (37 * hash) + ABILITY_DATA_FIELD_NUMBER;
+      hash = (53 * hash) + getAbilityData().hashCode();
       hash = (37 * hash) + TOTAL_TICK_TIME_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
           java.lang.Double.doubleToLongBits(getTotalTickTime()));
-      hash = (37 * hash) + ABILITY_DATA_FIELD_NUMBER;
-      hash = (53 * hash) + getAbilityData().hashCode();
       hash = (37 * hash) + ENTITY_ID_FIELD_NUMBER;
       hash = (53 * hash) + getEntityId();
       hash = (29 * hash) + unknownFields.hashCode();
@@ -610,10 +572,6 @@ public final class AbilityInvokeEntryOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Name: KBLDACDEINJ
-     * </pre>
-     *
      * Protobuf type {@code AbilityInvokeEntry}
      */
     public static final class Builder extends
@@ -653,24 +611,22 @@ public final class AbilityInvokeEntryOuterClass {
         super.clear();
         argumentType_ = 0;
 
-        eventId_ = 0;
-
-        isIgnoreAuth_ = false;
-
-        forwardPeer_ = 0;
-
         if (headBuilder_ == null) {
           head_ = null;
         } else {
           head_ = null;
           headBuilder_ = null;
         }
+        forwardPeer_ = 0;
+
+        eventId_ = 0;
+
         forwardType_ = 0;
 
-        totalTickTime_ = 0D;
-
         abilityData_ = com.google.protobuf.ByteString.EMPTY;
 
+        totalTickTime_ = 0D;
+
         entityId_ = 0;
 
         return this;
@@ -700,17 +656,16 @@ public final class AbilityInvokeEntryOuterClass {
       public emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry buildPartial() {
         emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry result = new emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry(this);
         result.argumentType_ = argumentType_;
-        result.eventId_ = eventId_;
-        result.isIgnoreAuth_ = isIgnoreAuth_;
-        result.forwardPeer_ = forwardPeer_;
         if (headBuilder_ == null) {
           result.head_ = head_;
         } else {
           result.head_ = headBuilder_.build();
         }
+        result.forwardPeer_ = forwardPeer_;
+        result.eventId_ = eventId_;
         result.forwardType_ = forwardType_;
-        result.totalTickTime_ = totalTickTime_;
         result.abilityData_ = abilityData_;
+        result.totalTickTime_ = totalTickTime_;
         result.entityId_ = entityId_;
         onBuilt();
         return result;
@@ -763,27 +718,24 @@ public final class AbilityInvokeEntryOuterClass {
         if (other.argumentType_ != 0) {
           setArgumentTypeValue(other.getArgumentTypeValue());
         }
-        if (other.getEventId() != 0) {
+        if (other.hasHead()) {
-          setEventId(other.getEventId());
+          mergeHead(other.getHead());
-        }
-        if (other.getIsIgnoreAuth() != false) {
-          setIsIgnoreAuth(other.getIsIgnoreAuth());
         }
         if (other.getForwardPeer() != 0) {
           setForwardPeer(other.getForwardPeer());
         }
-        if (other.hasHead()) {
+        if (other.getEventId() != 0) {
-          mergeHead(other.getHead());
+          setEventId(other.getEventId());
         }
         if (other.forwardType_ != 0) {
           setForwardTypeValue(other.getForwardTypeValue());
         }
-        if (other.getTotalTickTime() != 0D) {
-          setTotalTickTime(other.getTotalTickTime());
-        }
         if (other.getAbilityData() != com.google.protobuf.ByteString.EMPTY) {
           setAbilityData(other.getAbilityData());
         }
+        if (other.getTotalTickTime() != 0D) {
+          setTotalTickTime(other.getTotalTickTime());
+        }
         if (other.getEntityId() != 0) {
           setEntityId(other.getEntityId());
         }
@@ -818,14 +770,14 @@ public final class AbilityInvokeEntryOuterClass {
 
       private int argumentType_ = 0;
       /**
-       * <code>.AbilityInvokeArgument argument_type = 6;</code>
+       * <code>.AbilityInvokeArgument argument_type = 1;</code>
        * @return The enum numeric value on the wire for argumentType.
        */
       @java.lang.Override public int getArgumentTypeValue() {
         return argumentType_;
       }
       /**
-       * <code>.AbilityInvokeArgument argument_type = 6;</code>
+       * <code>.AbilityInvokeArgument argument_type = 1;</code>
        * @param value The enum numeric value on the wire for argumentType to set.
        * @return This builder for chaining.
        */
@@ -836,7 +788,7 @@ public final class AbilityInvokeEntryOuterClass {
         return this;
       }
       /**
-       * <code>.AbilityInvokeArgument argument_type = 6;</code>
+       * <code>.AbilityInvokeArgument argument_type = 1;</code>
        * @return The argumentType.
        */
       @java.lang.Override
@@ -846,7 +798,7 @@ public final class AbilityInvokeEntryOuterClass {
         return result == null ? emu.grasscutter.net.proto.AbilityInvokeArgumentOuterClass.AbilityInvokeArgument.UNRECOGNIZED : result;
       }
       /**
-       * <code>.AbilityInvokeArgument argument_type = 6;</code>
+       * <code>.AbilityInvokeArgument argument_type = 1;</code>
        * @param value The argumentType to set.
        * @return This builder for chaining.
        */
@@ -860,7 +812,7 @@ public final class AbilityInvokeEntryOuterClass {
         return this;
       }
       /**
-       * <code>.AbilityInvokeArgument argument_type = 6;</code>
+       * <code>.AbilityInvokeArgument argument_type = 1;</code>
        * @return This builder for chaining.
        */
       public Builder clearArgumentType() {
@@ -870,99 +822,6 @@ public final class AbilityInvokeEntryOuterClass {
         return this;
       }
 
-      private int eventId_ ;
-      /**
-       * <code>uint32 event_id = 7;</code>
-       * @return The eventId.
-       */
-      @java.lang.Override
-      public int getEventId() {
-        return eventId_;
-      }
-      /**
-       * <code>uint32 event_id = 7;</code>
-       * @param value The eventId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setEventId(int value) {
-        
-        eventId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 event_id = 7;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearEventId() {
-        
-        eventId_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private boolean isIgnoreAuth_ ;
-      /**
-       * <code>bool is_ignore_auth = 5;</code>
-       * @return The isIgnoreAuth.
-       */
-      @java.lang.Override
-      public boolean getIsIgnoreAuth() {
-        return isIgnoreAuth_;
-      }
-      /**
-       * <code>bool is_ignore_auth = 5;</code>
-       * @param value The isIgnoreAuth to set.
-       * @return This builder for chaining.
-       */
-      public Builder setIsIgnoreAuth(boolean value) {
-        
-        isIgnoreAuth_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>bool is_ignore_auth = 5;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearIsIgnoreAuth() {
-        
-        isIgnoreAuth_ = false;
-        onChanged();
-        return this;
-      }
-
-      private int forwardPeer_ ;
-      /**
-       * <code>uint32 forward_peer = 1;</code>
-       * @return The forwardPeer.
-       */
-      @java.lang.Override
-      public int getForwardPeer() {
-        return forwardPeer_;
-      }
-      /**
-       * <code>uint32 forward_peer = 1;</code>
-       * @param value The forwardPeer to set.
-       * @return This builder for chaining.
-       */
-      public Builder setForwardPeer(int value) {
-        
-        forwardPeer_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 forward_peer = 1;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearForwardPeer() {
-        
-        forwardPeer_ = 0;
-        onChanged();
-        return this;
-      }
-
       private emu.grasscutter.net.proto.AbilityInvokeEntryHeadOuterClass.AbilityInvokeEntryHead head_;
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.AbilityInvokeEntryHeadOuterClass.AbilityInvokeEntryHead, emu.grasscutter.net.proto.AbilityInvokeEntryHeadOuterClass.AbilityInvokeEntryHead.Builder, emu.grasscutter.net.proto.AbilityInvokeEntryHeadOuterClass.AbilityInvokeEntryHeadOrBuilder> headBuilder_;
@@ -1082,16 +941,78 @@ public final class AbilityInvokeEntryOuterClass {
         return headBuilder_;
       }
 
+      private int forwardPeer_ ;
+      /**
+       * <code>uint32 forward_peer = 4;</code>
+       * @return The forwardPeer.
+       */
+      @java.lang.Override
+      public int getForwardPeer() {
+        return forwardPeer_;
+      }
+      /**
+       * <code>uint32 forward_peer = 4;</code>
+       * @param value The forwardPeer to set.
+       * @return This builder for chaining.
+       */
+      public Builder setForwardPeer(int value) {
+        
+        forwardPeer_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 forward_peer = 4;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearForwardPeer() {
+        
+        forwardPeer_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int eventId_ ;
+      /**
+       * <code>uint32 event_id = 12;</code>
+       * @return The eventId.
+       */
+      @java.lang.Override
+      public int getEventId() {
+        return eventId_;
+      }
+      /**
+       * <code>uint32 event_id = 12;</code>
+       * @param value The eventId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setEventId(int value) {
+        
+        eventId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 event_id = 12;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearEventId() {
+        
+        eventId_ = 0;
+        onChanged();
+        return this;
+      }
+
       private int forwardType_ = 0;
       /**
-       * <code>.ForwardType forward_type = 4;</code>
+       * <code>.ForwardType forward_type = 3;</code>
        * @return The enum numeric value on the wire for forwardType.
        */
       @java.lang.Override public int getForwardTypeValue() {
         return forwardType_;
       }
       /**
-       * <code>.ForwardType forward_type = 4;</code>
+       * <code>.ForwardType forward_type = 3;</code>
        * @param value The enum numeric value on the wire for forwardType to set.
        * @return This builder for chaining.
        */
@@ -1102,7 +1023,7 @@ public final class AbilityInvokeEntryOuterClass {
         return this;
       }
       /**
-       * <code>.ForwardType forward_type = 4;</code>
+       * <code>.ForwardType forward_type = 3;</code>
        * @return The forwardType.
        */
       @java.lang.Override
@@ -1112,7 +1033,7 @@ public final class AbilityInvokeEntryOuterClass {
         return result == null ? emu.grasscutter.net.proto.ForwardTypeOuterClass.ForwardType.UNRECOGNIZED : result;
       }
       /**
-       * <code>.ForwardType forward_type = 4;</code>
+       * <code>.ForwardType forward_type = 3;</code>
        * @param value The forwardType to set.
        * @return This builder for chaining.
        */
@@ -1126,7 +1047,7 @@ public final class AbilityInvokeEntryOuterClass {
         return this;
       }
       /**
-       * <code>.ForwardType forward_type = 4;</code>
+       * <code>.ForwardType forward_type = 3;</code>
        * @return This builder for chaining.
        */
       public Builder clearForwardType() {
@@ -1136,40 +1057,9 @@ public final class AbilityInvokeEntryOuterClass {
         return this;
       }
 
-      private double totalTickTime_ ;
-      /**
-       * <code>double total_tick_time = 9;</code>
-       * @return The totalTickTime.
-       */
-      @java.lang.Override
-      public double getTotalTickTime() {
-        return totalTickTime_;
-      }
-      /**
-       * <code>double total_tick_time = 9;</code>
-       * @param value The totalTickTime to set.
-       * @return This builder for chaining.
-       */
-      public Builder setTotalTickTime(double value) {
-        
-        totalTickTime_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>double total_tick_time = 9;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearTotalTickTime() {
-        
-        totalTickTime_ = 0D;
-        onChanged();
-        return this;
-      }
-
       private com.google.protobuf.ByteString abilityData_ = com.google.protobuf.ByteString.EMPTY;
       /**
-       * <code>bytes ability_data = 3;</code>
+       * <code>bytes ability_data = 15;</code>
        * @return The abilityData.
        */
       @java.lang.Override
@@ -1177,7 +1067,7 @@ public final class AbilityInvokeEntryOuterClass {
         return abilityData_;
       }
       /**
-       * <code>bytes ability_data = 3;</code>
+       * <code>bytes ability_data = 15;</code>
        * @param value The abilityData to set.
        * @return This builder for chaining.
        */
@@ -1191,7 +1081,7 @@ public final class AbilityInvokeEntryOuterClass {
         return this;
       }
       /**
-       * <code>bytes ability_data = 3;</code>
+       * <code>bytes ability_data = 15;</code>
        * @return This builder for chaining.
        */
       public Builder clearAbilityData() {
@@ -1201,9 +1091,40 @@ public final class AbilityInvokeEntryOuterClass {
         return this;
       }
 
+      private double totalTickTime_ ;
+      /**
+       * <code>double total_tick_time = 14;</code>
+       * @return The totalTickTime.
+       */
+      @java.lang.Override
+      public double getTotalTickTime() {
+        return totalTickTime_;
+      }
+      /**
+       * <code>double total_tick_time = 14;</code>
+       * @param value The totalTickTime to set.
+       * @return This builder for chaining.
+       */
+      public Builder setTotalTickTime(double value) {
+        
+        totalTickTime_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>double total_tick_time = 14;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearTotalTickTime() {
+        
+        totalTickTime_ = 0D;
+        onChanged();
+        return this;
+      }
+
       private int entityId_ ;
       /**
-       * <code>uint32 entity_id = 11;</code>
+       * <code>uint32 entity_id = 9;</code>
        * @return The entityId.
        */
       @java.lang.Override
@@ -1211,7 +1132,7 @@ public final class AbilityInvokeEntryOuterClass {
         return entityId_;
       }
       /**
-       * <code>uint32 entity_id = 11;</code>
+       * <code>uint32 entity_id = 9;</code>
        * @param value The entityId to set.
        * @return This builder for chaining.
        */
@@ -1222,7 +1143,7 @@ public final class AbilityInvokeEntryOuterClass {
         return this;
       }
       /**
-       * <code>uint32 entity_id = 11;</code>
+       * <code>uint32 entity_id = 9;</code>
        * @return This builder for chaining.
        */
       public Builder clearEntityId() {
@@ -1300,15 +1221,14 @@ public final class AbilityInvokeEntryOuterClass {
     java.lang.String[] descriptorData = {
       "\n\030AbilityInvokeEntry.proto\032\033AbilityInvok" +
       "eArgument.proto\032\034AbilityInvokeEntryHead." +
-      "proto\032\021ForwardType.proto\"\220\002\n\022AbilityInvo" +
+      "proto\032\021ForwardType.proto\"\370\001\n\022AbilityInvo" +
-      "keEntry\022-\n\rargument_type\030\006 \001(\0162\026.Ability" +
+      "keEntry\022-\n\rargument_type\030\001 \001(\0162\026.Ability" +
-      "InvokeArgument\022\020\n\010event_id\030\007 \001(\r\022\026\n\016is_i" +
+      "InvokeArgument\022%\n\004head\030\002 \001(\0132\027.AbilityIn" +
-      "gnore_auth\030\005 \001(\010\022\024\n\014forward_peer\030\001 \001(\r\022%" +
+      "vokeEntryHead\022\024\n\014forward_peer\030\004 \001(\r\022\020\n\010e" +
-      "\n\004head\030\002 \001(\0132\027.AbilityInvokeEntryHead\022\"\n" +
+      "vent_id\030\014 \001(\r\022\"\n\014forward_type\030\003 \001(\0162\014.Fo" +
-      "\014forward_type\030\004 \001(\0162\014.ForwardType\022\027\n\017tot" +
+      "rwardType\022\024\n\014ability_data\030\017 \001(\014\022\027\n\017total" +
-      "al_tick_time\030\t \001(\001\022\024\n\014ability_data\030\003 \001(\014" +
+      "_tick_time\030\016 \001(\001\022\021\n\tentity_id\030\t \001(\rB\033\n\031e" +
-      "\022\021\n\tentity_id\030\013 \001(\rB\033\n\031emu.grasscutter.n" +
+      "mu.grasscutter.net.protob\006proto3"
-      "et.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -1322,7 +1242,7 @@ public final class AbilityInvokeEntryOuterClass {
     internal_static_AbilityInvokeEntry_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_AbilityInvokeEntry_descriptor,
-        new java.lang.String[] { "ArgumentType", "EventId", "IsIgnoreAuth", "ForwardPeer", "Head", "ForwardType", "TotalTickTime", "AbilityData", "EntityId", });
+        new java.lang.String[] { "ArgumentType", "Head", "ForwardPeer", "EventId", "ForwardType", "AbilityData", "TotalTickTime", "EntityId", });
     emu.grasscutter.net.proto.AbilityInvokeArgumentOuterClass.getDescriptor();
     emu.grasscutter.net.proto.AbilityInvokeEntryHeadOuterClass.getDescriptor();
     emu.grasscutter.net.proto.ForwardTypeOuterClass.getDescriptor();

src/generated/main/java/emu/grasscutter/net/proto/AbilityMetaReInitOverrideMapOuterClass.java

@@ -19,34 +19,30 @@ public final class AbilityMetaReInitOverrideMapOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>repeated .AbilityScalarValueEntry override_map = 9;</code>
+     * <code>repeated .AbilityScalarValueEntry override_map = 7;</code>
      */
     java.util.List<emu.grasscutter.net.proto.AbilityScalarValueEntryOuterClass.AbilityScalarValueEntry> 
         getOverrideMapList();
     /**
-     * <code>repeated .AbilityScalarValueEntry override_map = 9;</code>
+     * <code>repeated .AbilityScalarValueEntry override_map = 7;</code>
      */
     emu.grasscutter.net.proto.AbilityScalarValueEntryOuterClass.AbilityScalarValueEntry getOverrideMap(int index);
     /**
-     * <code>repeated .AbilityScalarValueEntry override_map = 9;</code>
+     * <code>repeated .AbilityScalarValueEntry override_map = 7;</code>
      */
     int getOverrideMapCount();
     /**
-     * <code>repeated .AbilityScalarValueEntry override_map = 9;</code>
+     * <code>repeated .AbilityScalarValueEntry override_map = 7;</code>
      */
     java.util.List<? extends emu.grasscutter.net.proto.AbilityScalarValueEntryOuterClass.AbilityScalarValueEntryOrBuilder> 
         getOverrideMapOrBuilderList();
     /**
-     * <code>repeated .AbilityScalarValueEntry override_map = 9;</code>
+     * <code>repeated .AbilityScalarValueEntry override_map = 7;</code>
      */
     emu.grasscutter.net.proto.AbilityScalarValueEntryOuterClass.AbilityScalarValueEntryOrBuilder getOverrideMapOrBuilder(
         int index);
   }
   /**
-   * <pre>
-   * Name: EEACBNFBEHI
-   * </pre>
-   *
    * Protobuf type {@code AbilityMetaReInitOverrideMap}
    */
   public static final class AbilityMetaReInitOverrideMap extends
@@ -93,7 +89,7 @@ public final class AbilityMetaReInitOverrideMapOuterClass {
             case 0:
               done = true;
               break;
-            case 74: {
+            case 58: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 overrideMap_ = new java.util.ArrayList<emu.grasscutter.net.proto.AbilityScalarValueEntryOuterClass.AbilityScalarValueEntry>();
                 mutable_bitField0_ |= 0x00000001;
@@ -137,17 +133,17 @@ public final class AbilityMetaReInitOverrideMapOuterClass {
               emu.grasscutter.net.proto.AbilityMetaReInitOverrideMapOuterClass.AbilityMetaReInitOverrideMap.class, emu.grasscutter.net.proto.AbilityMetaReInitOverrideMapOuterClass.AbilityMetaReInitOverrideMap.Builder.class);
     }
 
-    public static final int OVERRIDE_MAP_FIELD_NUMBER = 9;
+    public static final int OVERRIDE_MAP_FIELD_NUMBER = 7;
     private java.util.List<emu.grasscutter.net.proto.AbilityScalarValueEntryOuterClass.AbilityScalarValueEntry> overrideMap_;
     /**
-     * <code>repeated .AbilityScalarValueEntry override_map = 9;</code>
+     * <code>repeated .AbilityScalarValueEntry override_map = 7;</code>
      */
     @java.lang.Override
     public java.util.List<emu.grasscutter.net.proto.AbilityScalarValueEntryOuterClass.AbilityScalarValueEntry> getOverrideMapList() {
       return overrideMap_;
     }
     /**
-     * <code>repeated .AbilityScalarValueEntry override_map = 9;</code>
+     * <code>repeated .AbilityScalarValueEntry override_map = 7;</code>
      */
     @java.lang.Override
     public java.util.List<? extends emu.grasscutter.net.proto.AbilityScalarValueEntryOuterClass.AbilityScalarValueEntryOrBuilder> 
@@ -155,21 +151,21 @@ public final class AbilityMetaReInitOverrideMapOuterClass {
       return overrideMap_;
     }
     /**
-     * <code>repeated .AbilityScalarValueEntry override_map = 9;</code>
+     * <code>repeated .AbilityScalarValueEntry override_map = 7;</code>
      */
     @java.lang.Override
     public int getOverrideMapCount() {
       return overrideMap_.size();
     }
     /**
-     * <code>repeated .AbilityScalarValueEntry override_map = 9;</code>
+     * <code>repeated .AbilityScalarValueEntry override_map = 7;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.AbilityScalarValueEntryOuterClass.AbilityScalarValueEntry getOverrideMap(int index) {
       return overrideMap_.get(index);
     }
     /**
-     * <code>repeated .AbilityScalarValueEntry override_map = 9;</code>
+     * <code>repeated .AbilityScalarValueEntry override_map = 7;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.AbilityScalarValueEntryOuterClass.AbilityScalarValueEntryOrBuilder getOverrideMapOrBuilder(
@@ -192,7 +188,7 @@ public final class AbilityMetaReInitOverrideMapOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       for (int i = 0; i < overrideMap_.size(); i++) {
-        output.writeMessage(9, overrideMap_.get(i));
+        output.writeMessage(7, overrideMap_.get(i));
       }
       unknownFields.writeTo(output);
     }
@@ -205,7 +201,7 @@ public final class AbilityMetaReInitOverrideMapOuterClass {
       size = 0;
       for (int i = 0; i < overrideMap_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(9, overrideMap_.get(i));
+          .computeMessageSize(7, overrideMap_.get(i));
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -335,10 +331,6 @@ public final class AbilityMetaReInitOverrideMapOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Name: EEACBNFBEHI
-     * </pre>
-     *
      * Protobuf type {@code AbilityMetaReInitOverrideMap}
      */
     public static final class Builder extends
@@ -536,7 +528,7 @@ public final class AbilityMetaReInitOverrideMapOuterClass {
           emu.grasscutter.net.proto.AbilityScalarValueEntryOuterClass.AbilityScalarValueEntry, emu.grasscutter.net.proto.AbilityScalarValueEntryOuterClass.AbilityScalarValueEntry.Builder, emu.grasscutter.net.proto.AbilityScalarValueEntryOuterClass.AbilityScalarValueEntryOrBuilder> overrideMapBuilder_;
 
       /**
-       * <code>repeated .AbilityScalarValueEntry override_map = 9;</code>
+       * <code>repeated .AbilityScalarValueEntry override_map = 7;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.AbilityScalarValueEntryOuterClass.AbilityScalarValueEntry> getOverrideMapList() {
         if (overrideMapBuilder_ == null) {
@@ -546,7 +538,7 @@ public final class AbilityMetaReInitOverrideMapOuterClass {
         }
       }
       /**
-       * <code>repeated .AbilityScalarValueEntry override_map = 9;</code>
+       * <code>repeated .AbilityScalarValueEntry override_map = 7;</code>
        */
       public int getOverrideMapCount() {
         if (overrideMapBuilder_ == null) {
@@ -556,7 +548,7 @@ public final class AbilityMetaReInitOverrideMapOuterClass {
         }
       }
       /**
-       * <code>repeated .AbilityScalarValueEntry override_map = 9;</code>
+       * <code>repeated .AbilityScalarValueEntry override_map = 7;</code>
        */
       public emu.grasscutter.net.proto.AbilityScalarValueEntryOuterClass.AbilityScalarValueEntry getOverrideMap(int index) {
         if (overrideMapBuilder_ == null) {
@@ -566,7 +558,7 @@ public final class AbilityMetaReInitOverrideMapOuterClass {
         }
       }
       /**
-       * <code>repeated .AbilityScalarValueEntry override_map = 9;</code>
+       * <code>repeated .AbilityScalarValueEntry override_map = 7;</code>
        */
       public Builder setOverrideMap(
           int index, emu.grasscutter.net.proto.AbilityScalarValueEntryOuterClass.AbilityScalarValueEntry value) {
@@ -583,7 +575,7 @@ public final class AbilityMetaReInitOverrideMapOuterClass {
         return this;
       }
       /**
-       * <code>repeated .AbilityScalarValueEntry override_map = 9;</code>
+       * <code>repeated .AbilityScalarValueEntry override_map = 7;</code>
        */
       public Builder setOverrideMap(
           int index, emu.grasscutter.net.proto.AbilityScalarValueEntryOuterClass.AbilityScalarValueEntry.Builder builderForValue) {
@@ -597,7 +589,7 @@ public final class AbilityMetaReInitOverrideMapOuterClass {
         return this;
       }
       /**
-       * <code>repeated .AbilityScalarValueEntry override_map = 9;</code>
+       * <code>repeated .AbilityScalarValueEntry override_map = 7;</code>
        */
       public Builder addOverrideMap(emu.grasscutter.net.proto.AbilityScalarValueEntryOuterClass.AbilityScalarValueEntry value) {
         if (overrideMapBuilder_ == null) {
@@ -613,7 +605,7 @@ public final class AbilityMetaReInitOverrideMapOuterClass {
         return this;
       }
       /**
-       * <code>repeated .AbilityScalarValueEntry override_map = 9;</code>
+       * <code>repeated .AbilityScalarValueEntry override_map = 7;</code>
        */
       public Builder addOverrideMap(
           int index, emu.grasscutter.net.proto.AbilityScalarValueEntryOuterClass.AbilityScalarValueEntry value) {
@@ -630,7 +622,7 @@ public final class AbilityMetaReInitOverrideMapOuterClass {
         return this;
       }
       /**
-       * <code>repeated .AbilityScalarValueEntry override_map = 9;</code>
+       * <code>repeated .AbilityScalarValueEntry override_map = 7;</code>
        */
       public Builder addOverrideMap(
           emu.grasscutter.net.proto.AbilityScalarValueEntryOuterClass.AbilityScalarValueEntry.Builder builderForValue) {
@@ -644,7 +636,7 @@ public final class AbilityMetaReInitOverrideMapOuterClass {
         return this;
       }
       /**
-       * <code>repeated .AbilityScalarValueEntry override_map = 9;</code>
+       * <code>repeated .AbilityScalarValueEntry override_map = 7;</code>
        */
       public Builder addOverrideMap(
           int index, emu.grasscutter.net.proto.AbilityScalarValueEntryOuterClass.AbilityScalarValueEntry.Builder builderForValue) {
@@ -658,7 +650,7 @@ public final class AbilityMetaReInitOverrideMapOuterClass {
         return this;
       }
       /**
-       * <code>repeated .AbilityScalarValueEntry override_map = 9;</code>
+       * <code>repeated .AbilityScalarValueEntry override_map = 7;</code>
        */
       public Builder addAllOverrideMap(
           java.lang.Iterable<? extends emu.grasscutter.net.proto.AbilityScalarValueEntryOuterClass.AbilityScalarValueEntry> values) {
@@ -673,7 +665,7 @@ public final class AbilityMetaReInitOverrideMapOuterClass {
         return this;
       }
       /**
-       * <code>repeated .AbilityScalarValueEntry override_map = 9;</code>
+       * <code>repeated .AbilityScalarValueEntry override_map = 7;</code>
        */
       public Builder clearOverrideMap() {
         if (overrideMapBuilder_ == null) {
@@ -686,7 +678,7 @@ public final class AbilityMetaReInitOverrideMapOuterClass {
         return this;
       }
       /**
-       * <code>repeated .AbilityScalarValueEntry override_map = 9;</code>
+       * <code>repeated .AbilityScalarValueEntry override_map = 7;</code>
        */
       public Builder removeOverrideMap(int index) {
         if (overrideMapBuilder_ == null) {
@@ -699,14 +691,14 @@ public final class AbilityMetaReInitOverrideMapOuterClass {
         return this;
       }
       /**
-       * <code>repeated .AbilityScalarValueEntry override_map = 9;</code>
+       * <code>repeated .AbilityScalarValueEntry override_map = 7;</code>
        */
       public emu.grasscutter.net.proto.AbilityScalarValueEntryOuterClass.AbilityScalarValueEntry.Builder getOverrideMapBuilder(
           int index) {
         return getOverrideMapFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .AbilityScalarValueEntry override_map = 9;</code>
+       * <code>repeated .AbilityScalarValueEntry override_map = 7;</code>
        */
       public emu.grasscutter.net.proto.AbilityScalarValueEntryOuterClass.AbilityScalarValueEntryOrBuilder getOverrideMapOrBuilder(
           int index) {
@@ -716,7 +708,7 @@ public final class AbilityMetaReInitOverrideMapOuterClass {
         }
       }
       /**
-       * <code>repeated .AbilityScalarValueEntry override_map = 9;</code>
+       * <code>repeated .AbilityScalarValueEntry override_map = 7;</code>
        */
       public java.util.List<? extends emu.grasscutter.net.proto.AbilityScalarValueEntryOuterClass.AbilityScalarValueEntryOrBuilder> 
            getOverrideMapOrBuilderList() {
@@ -727,14 +719,14 @@ public final class AbilityMetaReInitOverrideMapOuterClass {
         }
       }
       /**
-       * <code>repeated .AbilityScalarValueEntry override_map = 9;</code>
+       * <code>repeated .AbilityScalarValueEntry override_map = 7;</code>
        */
       public emu.grasscutter.net.proto.AbilityScalarValueEntryOuterClass.AbilityScalarValueEntry.Builder addOverrideMapBuilder() {
         return getOverrideMapFieldBuilder().addBuilder(
             emu.grasscutter.net.proto.AbilityScalarValueEntryOuterClass.AbilityScalarValueEntry.getDefaultInstance());
       }
       /**
-       * <code>repeated .AbilityScalarValueEntry override_map = 9;</code>
+       * <code>repeated .AbilityScalarValueEntry override_map = 7;</code>
        */
       public emu.grasscutter.net.proto.AbilityScalarValueEntryOuterClass.AbilityScalarValueEntry.Builder addOverrideMapBuilder(
           int index) {
@@ -742,7 +734,7 @@ public final class AbilityMetaReInitOverrideMapOuterClass {
             index, emu.grasscutter.net.proto.AbilityScalarValueEntryOuterClass.AbilityScalarValueEntry.getDefaultInstance());
       }
       /**
-       * <code>repeated .AbilityScalarValueEntry override_map = 9;</code>
+       * <code>repeated .AbilityScalarValueEntry override_map = 7;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.AbilityScalarValueEntryOuterClass.AbilityScalarValueEntry.Builder> 
            getOverrideMapBuilderList() {
@@ -831,7 +823,7 @@ public final class AbilityMetaReInitOverrideMapOuterClass {
     java.lang.String[] descriptorData = {
       "\n\"AbilityMetaReInitOverrideMap.proto\032\035Ab" +
       "ilityScalarValueEntry.proto\"N\n\034AbilityMe" +
-      "taReInitOverrideMap\022.\n\014override_map\030\t \003(" +
+      "taReInitOverrideMap\022.\n\014override_map\030\007 \003(" +
       "\0132\030.AbilityScalarValueEntryB\033\n\031emu.grass" +
       "cutter.net.protob\006proto3"
     };

src/generated/main/java/emu/grasscutter/net/proto/AbilityMixinCostStaminaOuterClass.java

@@ -19,7 +19,7 @@ public final class AbilityMixinCostStaminaOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>bool is_swim = 7;</code>
+     * <code>bool is_swim = 3;</code>
      * @return The isSwim.
      */
     boolean getIsSwim();
@@ -69,7 +69,7 @@ public final class AbilityMixinCostStaminaOuterClass {
             case 0:
               done = true;
               break;
-            case 56: {
+            case 24: {
 
               isSwim_ = input.readBool();
               break;
@@ -106,10 +106,10 @@ public final class AbilityMixinCostStaminaOuterClass {
               emu.grasscutter.net.proto.AbilityMixinCostStaminaOuterClass.AbilityMixinCostStamina.class, emu.grasscutter.net.proto.AbilityMixinCostStaminaOuterClass.AbilityMixinCostStamina.Builder.class);
     }
 
-    public static final int IS_SWIM_FIELD_NUMBER = 7;
+    public static final int IS_SWIM_FIELD_NUMBER = 3;
     private boolean isSwim_;
     /**
-     * <code>bool is_swim = 7;</code>
+     * <code>bool is_swim = 3;</code>
      * @return The isSwim.
      */
     @java.lang.Override
@@ -132,7 +132,7 @@ public final class AbilityMixinCostStaminaOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (isSwim_ != false) {
-        output.writeBool(7, isSwim_);
+        output.writeBool(3, isSwim_);
       }
       unknownFields.writeTo(output);
     }
@@ -145,7 +145,7 @@ public final class AbilityMixinCostStaminaOuterClass {
       size = 0;
       if (isSwim_ != false) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(7, isSwim_);
+          .computeBoolSize(3, isSwim_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -422,7 +422,7 @@ public final class AbilityMixinCostStaminaOuterClass {
 
       private boolean isSwim_ ;
       /**
-       * <code>bool is_swim = 7;</code>
+       * <code>bool is_swim = 3;</code>
        * @return The isSwim.
        */
       @java.lang.Override
@@ -430,7 +430,7 @@ public final class AbilityMixinCostStaminaOuterClass {
         return isSwim_;
       }
       /**
-       * <code>bool is_swim = 7;</code>
+       * <code>bool is_swim = 3;</code>
        * @param value The isSwim to set.
        * @return This builder for chaining.
        */
@@ -441,7 +441,7 @@ public final class AbilityMixinCostStaminaOuterClass {
         return this;
       }
       /**
-       * <code>bool is_swim = 7;</code>
+       * <code>bool is_swim = 3;</code>
        * @return This builder for chaining.
        */
       public Builder clearIsSwim() {
@@ -518,7 +518,7 @@ public final class AbilityMixinCostStaminaOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\035AbilityMixinCostStamina.proto\"*\n\027Abili" +
-      "tyMixinCostStamina\022\017\n\007is_swim\030\007 \001(\010B\033\n\031e" +
+      "tyMixinCostStamina\022\017\n\007is_swim\030\003 \001(\010B\033\n\031e" +
       "mu.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor

src/generated/main/java/emu/grasscutter/net/proto/AbilityMixinRecoverInfoOuterClass.java

@@ -71,21 +71,6 @@ public final class AbilityMixinRecoverInfoOuterClass {
     emu.grasscutter.net.proto.MassivePropSyncInfoOuterClass.MassivePropSyncInfoOrBuilder getMassivePropListOrBuilder(
         int index);
 
-    /**
-     * <code>.BreakoutSnapShot breakout_snap_shot = 7;</code>
-     * @return Whether the breakoutSnapShot field is set.
-     */
-    boolean hasBreakoutSnapShot();
-    /**
-     * <code>.BreakoutSnapShot breakout_snap_shot = 7;</code>
-     * @return The breakoutSnapShot.
-     */
-    emu.grasscutter.net.proto.BreakoutSnapShotOuterClass.BreakoutSnapShot getBreakoutSnapShot();
-    /**
-     * <code>.BreakoutSnapShot breakout_snap_shot = 7;</code>
-     */
-    emu.grasscutter.net.proto.BreakoutSnapShotOuterClass.BreakoutSnapShotOrBuilder getBreakoutSnapShotOrBuilder();
-
     /**
      * <code>uint32 instanced_ability_id = 1;</code>
      * @return Whether the instancedAbilityId field is set.
@@ -111,10 +96,6 @@ public final class AbilityMixinRecoverInfoOuterClass {
     public emu.grasscutter.net.proto.AbilityMixinRecoverInfoOuterClass.AbilityMixinRecoverInfo.SourceCase getSourceCase();
   }
   /**
-   * <pre>
-   * Name: LMMFGNIDKME
-   * </pre>
-   *
    * Protobuf type {@code AbilityMixinRecoverInfo}
    */
   public static final class AbilityMixinRecoverInfo extends
@@ -212,19 +193,6 @@ public final class AbilityMixinRecoverInfoOuterClass {
                   input.readMessage(emu.grasscutter.net.proto.MassivePropSyncInfoOuterClass.MassivePropSyncInfo.parser(), extensionRegistry));
               break;
             }
-            case 58: {
-              emu.grasscutter.net.proto.BreakoutSnapShotOuterClass.BreakoutSnapShot.Builder subBuilder = null;
-              if (breakoutSnapShot_ != null) {
-                subBuilder = breakoutSnapShot_.toBuilder();
-              }
-              breakoutSnapShot_ = input.readMessage(emu.grasscutter.net.proto.BreakoutSnapShotOuterClass.BreakoutSnapShot.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(breakoutSnapShot_);
-                breakoutSnapShot_ = subBuilder.buildPartial();
-              }
-
-              break;
-            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -394,32 +362,6 @@ public final class AbilityMixinRecoverInfoOuterClass {
       return massivePropList_.get(index);
     }
 
-    public static final int BREAKOUT_SNAP_SHOT_FIELD_NUMBER = 7;
-    private emu.grasscutter.net.proto.BreakoutSnapShotOuterClass.BreakoutSnapShot breakoutSnapShot_;
-    /**
-     * <code>.BreakoutSnapShot breakout_snap_shot = 7;</code>
-     * @return Whether the breakoutSnapShot field is set.
-     */
-    @java.lang.Override
-    public boolean hasBreakoutSnapShot() {
-      return breakoutSnapShot_ != null;
-    }
-    /**
-     * <code>.BreakoutSnapShot breakout_snap_shot = 7;</code>
-     * @return The breakoutSnapShot.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.BreakoutSnapShotOuterClass.BreakoutSnapShot getBreakoutSnapShot() {
-      return breakoutSnapShot_ == null ? emu.grasscutter.net.proto.BreakoutSnapShotOuterClass.BreakoutSnapShot.getDefaultInstance() : breakoutSnapShot_;
-    }
-    /**
-     * <code>.BreakoutSnapShot breakout_snap_shot = 7;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.BreakoutSnapShotOuterClass.BreakoutSnapShotOrBuilder getBreakoutSnapShotOrBuilder() {
-      return getBreakoutSnapShot();
-    }
-
     public static final int INSTANCED_ABILITY_ID_FIELD_NUMBER = 1;
     /**
      * <code>uint32 instanced_ability_id = 1;</code>
@@ -501,9 +443,6 @@ public final class AbilityMixinRecoverInfoOuterClass {
       for (int i = 0; i < massivePropList_.size(); i++) {
         output.writeMessage(6, massivePropList_.get(i));
       }
-      if (breakoutSnapShot_ != null) {
-        output.writeMessage(7, getBreakoutSnapShot());
-      }
       unknownFields.writeTo(output);
     }
 
@@ -549,10 +488,6 @@ public final class AbilityMixinRecoverInfoOuterClass {
         size += com.google.protobuf.CodedOutputStream
           .computeMessageSize(6, massivePropList_.get(i));
       }
-      if (breakoutSnapShot_ != null) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(7, getBreakoutSnapShot());
-      }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
@@ -576,11 +511,6 @@ public final class AbilityMixinRecoverInfoOuterClass {
           != other.getIsServerbuffModifier()) return false;
       if (!getMassivePropListList()
           .equals(other.getMassivePropListList())) return false;
-      if (hasBreakoutSnapShot() != other.hasBreakoutSnapShot()) return false;
-      if (hasBreakoutSnapShot()) {
-        if (!getBreakoutSnapShot()
-            .equals(other.getBreakoutSnapShot())) return false;
-      }
       if (!getSourceCase().equals(other.getSourceCase())) return false;
       switch (sourceCase_) {
         case 1:
@@ -618,10 +548,6 @@ public final class AbilityMixinRecoverInfoOuterClass {
         hash = (37 * hash) + MASSIVE_PROP_LIST_FIELD_NUMBER;
         hash = (53 * hash) + getMassivePropListList().hashCode();
       }
-      if (hasBreakoutSnapShot()) {
-        hash = (37 * hash) + BREAKOUT_SNAP_SHOT_FIELD_NUMBER;
-        hash = (53 * hash) + getBreakoutSnapShot().hashCode();
-      }
       switch (sourceCase_) {
         case 1:
           hash = (37 * hash) + INSTANCED_ABILITY_ID_FIELD_NUMBER;
@@ -730,10 +656,6 @@ public final class AbilityMixinRecoverInfoOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Name: LMMFGNIDKME
-     * </pre>
-     *
      * Protobuf type {@code AbilityMixinRecoverInfo}
      */
     public static final class Builder extends
@@ -784,12 +706,6 @@ public final class AbilityMixinRecoverInfoOuterClass {
         } else {
           massivePropListBuilder_.clear();
         }
-        if (breakoutSnapShotBuilder_ == null) {
-          breakoutSnapShot_ = null;
-        } else {
-          breakoutSnapShot_ = null;
-          breakoutSnapShotBuilder_ = null;
-        }
         sourceCase_ = 0;
         source_ = null;
         return this;
@@ -835,11 +751,6 @@ public final class AbilityMixinRecoverInfoOuterClass {
         } else {
           result.massivePropList_ = massivePropListBuilder_.build();
         }
-        if (breakoutSnapShotBuilder_ == null) {
-          result.breakoutSnapShot_ = breakoutSnapShot_;
-        } else {
-          result.breakoutSnapShot_ = breakoutSnapShotBuilder_.build();
-        }
         if (sourceCase_ == 1) {
           result.source_ = source_;
         }
@@ -937,9 +848,6 @@ public final class AbilityMixinRecoverInfoOuterClass {
             }
           }
         }
-        if (other.hasBreakoutSnapShot()) {
-          mergeBreakoutSnapShot(other.getBreakoutSnapShot());
-        }
         switch (other.getSourceCase()) {
           case INSTANCED_ABILITY_ID: {
             setInstancedAbilityId(other.getInstancedAbilityId());
@@ -1379,125 +1287,6 @@ public final class AbilityMixinRecoverInfoOuterClass {
         return massivePropListBuilder_;
       }
 
-      private emu.grasscutter.net.proto.BreakoutSnapShotOuterClass.BreakoutSnapShot breakoutSnapShot_;
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.BreakoutSnapShotOuterClass.BreakoutSnapShot, emu.grasscutter.net.proto.BreakoutSnapShotOuterClass.BreakoutSnapShot.Builder, emu.grasscutter.net.proto.BreakoutSnapShotOuterClass.BreakoutSnapShotOrBuilder> breakoutSnapShotBuilder_;
-      /**
-       * <code>.BreakoutSnapShot breakout_snap_shot = 7;</code>
-       * @return Whether the breakoutSnapShot field is set.
-       */
-      public boolean hasBreakoutSnapShot() {
-        return breakoutSnapShotBuilder_ != null || breakoutSnapShot_ != null;
-      }
-      /**
-       * <code>.BreakoutSnapShot breakout_snap_shot = 7;</code>
-       * @return The breakoutSnapShot.
-       */
-      public emu.grasscutter.net.proto.BreakoutSnapShotOuterClass.BreakoutSnapShot getBreakoutSnapShot() {
-        if (breakoutSnapShotBuilder_ == null) {
-          return breakoutSnapShot_ == null ? emu.grasscutter.net.proto.BreakoutSnapShotOuterClass.BreakoutSnapShot.getDefaultInstance() : breakoutSnapShot_;
-        } else {
-          return breakoutSnapShotBuilder_.getMessage();
-        }
-      }
-      /**
-       * <code>.BreakoutSnapShot breakout_snap_shot = 7;</code>
-       */
-      public Builder setBreakoutSnapShot(emu.grasscutter.net.proto.BreakoutSnapShotOuterClass.BreakoutSnapShot value) {
-        if (breakoutSnapShotBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          breakoutSnapShot_ = value;
-          onChanged();
-        } else {
-          breakoutSnapShotBuilder_.setMessage(value);
-        }
-
-        return this;
-      }
-      /**
-       * <code>.BreakoutSnapShot breakout_snap_shot = 7;</code>
-       */
-      public Builder setBreakoutSnapShot(
-          emu.grasscutter.net.proto.BreakoutSnapShotOuterClass.BreakoutSnapShot.Builder builderForValue) {
-        if (breakoutSnapShotBuilder_ == null) {
-          breakoutSnapShot_ = builderForValue.build();
-          onChanged();
-        } else {
-          breakoutSnapShotBuilder_.setMessage(builderForValue.build());
-        }
-
-        return this;
-      }
-      /**
-       * <code>.BreakoutSnapShot breakout_snap_shot = 7;</code>
-       */
-      public Builder mergeBreakoutSnapShot(emu.grasscutter.net.proto.BreakoutSnapShotOuterClass.BreakoutSnapShot value) {
-        if (breakoutSnapShotBuilder_ == null) {
-          if (breakoutSnapShot_ != null) {
-            breakoutSnapShot_ =
-              emu.grasscutter.net.proto.BreakoutSnapShotOuterClass.BreakoutSnapShot.newBuilder(breakoutSnapShot_).mergeFrom(value).buildPartial();
-          } else {
-            breakoutSnapShot_ = value;
-          }
-          onChanged();
-        } else {
-          breakoutSnapShotBuilder_.mergeFrom(value);
-        }
-
-        return this;
-      }
-      /**
-       * <code>.BreakoutSnapShot breakout_snap_shot = 7;</code>
-       */
-      public Builder clearBreakoutSnapShot() {
-        if (breakoutSnapShotBuilder_ == null) {
-          breakoutSnapShot_ = null;
-          onChanged();
-        } else {
-          breakoutSnapShot_ = null;
-          breakoutSnapShotBuilder_ = null;
-        }
-
-        return this;
-      }
-      /**
-       * <code>.BreakoutSnapShot breakout_snap_shot = 7;</code>
-       */
-      public emu.grasscutter.net.proto.BreakoutSnapShotOuterClass.BreakoutSnapShot.Builder getBreakoutSnapShotBuilder() {
-        
-        onChanged();
-        return getBreakoutSnapShotFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.BreakoutSnapShot breakout_snap_shot = 7;</code>
-       */
-      public emu.grasscutter.net.proto.BreakoutSnapShotOuterClass.BreakoutSnapShotOrBuilder getBreakoutSnapShotOrBuilder() {
-        if (breakoutSnapShotBuilder_ != null) {
-          return breakoutSnapShotBuilder_.getMessageOrBuilder();
-        } else {
-          return breakoutSnapShot_ == null ?
-              emu.grasscutter.net.proto.BreakoutSnapShotOuterClass.BreakoutSnapShot.getDefaultInstance() : breakoutSnapShot_;
-        }
-      }
-      /**
-       * <code>.BreakoutSnapShot breakout_snap_shot = 7;</code>
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.BreakoutSnapShotOuterClass.BreakoutSnapShot, emu.grasscutter.net.proto.BreakoutSnapShotOuterClass.BreakoutSnapShot.Builder, emu.grasscutter.net.proto.BreakoutSnapShotOuterClass.BreakoutSnapShotOrBuilder> 
-          getBreakoutSnapShotFieldBuilder() {
-        if (breakoutSnapShotBuilder_ == null) {
-          breakoutSnapShotBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.BreakoutSnapShotOuterClass.BreakoutSnapShot, emu.grasscutter.net.proto.BreakoutSnapShotOuterClass.BreakoutSnapShot.Builder, emu.grasscutter.net.proto.BreakoutSnapShotOuterClass.BreakoutSnapShotOrBuilder>(
-                  getBreakoutSnapShot(),
-                  getParentForChildren(),
-                  isClean());
-          breakoutSnapShot_ = null;
-        }
-        return breakoutSnapShotBuilder_;
-      }
-
       /**
        * <code>uint32 instanced_ability_id = 1;</code>
        * @return Whether the instancedAbilityId field is set.
@@ -1646,21 +1435,18 @@ public final class AbilityMixinRecoverInfoOuterClass {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\035AbilityMixinRecoverInfo.proto\032\026Breakou" +
+      "\n\035AbilityMixinRecoverInfo.proto\032\031Massive" +
-      "tSnapShot.proto\032\031MassivePropSyncInfo.pro" +
+      "PropSyncInfo.proto\"\332\001\n\027AbilityMixinRecov" +
-      "to\"\211\002\n\027AbilityMixinRecoverInfo\022\020\n\010local_" +
+      "erInfo\022\020\n\010local_id\030\003 \001(\r\022\021\n\tdata_list\030\004 " +
-      "id\030\003 \001(\r\022\021\n\tdata_list\030\004 \003(\r\022\036\n\026is_server" +
+      "\003(\r\022\036\n\026is_serverbuff_modifier\030\005 \001(\010\022/\n\021m" +
-      "buff_modifier\030\005 \001(\010\022/\n\021massive_prop_list" +
+      "assive_prop_list\030\006 \003(\0132\024.MassivePropSync" +
-      "\030\006 \003(\0132\024.MassivePropSyncInfo\022-\n\022breakout" +
+      "Info\022\036\n\024instanced_ability_id\030\001 \001(\rH\000\022\037\n\025" +
-      "_snap_shot\030\007 \001(\0132\021.BreakoutSnapShot\022\036\n\024i" +
+      "instanced_modifier_id\030\002 \001(\rH\000B\010\n\006sourceB" +
-      "nstanced_ability_id\030\001 \001(\rH\000\022\037\n\025instanced" +
+      "\033\n\031emu.grasscutter.net.protob\006proto3"
-      "_modifier_id\030\002 \001(\rH\000B\010\n\006sourceB\033\n\031emu.gr" +
-      "asscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
         new com.google.protobuf.Descriptors.FileDescriptor[] {
-          emu.grasscutter.net.proto.BreakoutSnapShotOuterClass.getDescriptor(),
           emu.grasscutter.net.proto.MassivePropSyncInfoOuterClass.getDescriptor(),
         });
     internal_static_AbilityMixinRecoverInfo_descriptor =
@@ -1668,8 +1454,7 @@ public final class AbilityMixinRecoverInfoOuterClass {
     internal_static_AbilityMixinRecoverInfo_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_AbilityMixinRecoverInfo_descriptor,
-        new java.lang.String[] { "LocalId", "DataList", "IsServerbuffModifier", "MassivePropList", "BreakoutSnapShot", "InstancedAbilityId", "InstancedModifierId", "Source", });
+        new java.lang.String[] { "LocalId", "DataList", "IsServerbuffModifier", "MassivePropList", "InstancedAbilityId", "InstancedModifierId", "Source", });
-    emu.grasscutter.net.proto.BreakoutSnapShotOuterClass.getDescriptor();
     emu.grasscutter.net.proto.MassivePropSyncInfoOuterClass.getDescriptor();
   }
 

src/generated/main/java/emu/grasscutter/net/proto/AbilityMixinWidgetMpSupportOuterClass.java

@@ -1,10 +1,10 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: TakeMaterialDeleteReturnRsp.proto
+// source: AbilityMixinWidgetMpSupport.proto
 
 package emu.grasscutter.net.proto;
 
-public final class TakeMaterialDeleteReturnRspOuterClass {
+public final class AbilityMixinWidgetMpSupportOuterClass {
-  private TakeMaterialDeleteReturnRspOuterClass() {}
+  private AbilityMixinWidgetMpSupportOuterClass() {}
   public static void registerAllExtensions(
       com.google.protobuf.ExtensionRegistryLite registry) {
   }
@@ -14,41 +14,36 @@ public final class TakeMaterialDeleteReturnRspOuterClass {
     registerAllExtensions(
         (com.google.protobuf.ExtensionRegistryLite) registry);
   }
-  public interface TakeMaterialDeleteReturnRspOrBuilder extends
+  public interface AbilityMixinWidgetMpSupportOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:TakeMaterialDeleteReturnRsp)
+      // @@protoc_insertion_point(interface_extends:AbilityMixinWidgetMpSupport)
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>int32 retcode = 9;</code>
+     * <code>uint32 target_entity_id = 9;</code>
-     * @return The retcode.
+     * @return The targetEntityId.
      */
-    int getRetcode();
+    int getTargetEntityId();
   }
   /**
-   * <pre>
+   * Protobuf type {@code AbilityMixinWidgetMpSupport}
-   * Name: GOHLFBHEKIN
-   * CmdId: 604
-   * </pre>
-   *
-   * Protobuf type {@code TakeMaterialDeleteReturnRsp}
    */
-  public static final class TakeMaterialDeleteReturnRsp extends
+  public static final class AbilityMixinWidgetMpSupport extends
       com.google.protobuf.GeneratedMessageV3 implements
-      // @@protoc_insertion_point(message_implements:TakeMaterialDeleteReturnRsp)
+      // @@protoc_insertion_point(message_implements:AbilityMixinWidgetMpSupport)
-      TakeMaterialDeleteReturnRspOrBuilder {
+      AbilityMixinWidgetMpSupportOrBuilder {
   private static final long serialVersionUID = 0L;
-    // Use TakeMaterialDeleteReturnRsp.newBuilder() to construct.
+    // Use AbilityMixinWidgetMpSupport.newBuilder() to construct.
-    private TakeMaterialDeleteReturnRsp(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
+    private AbilityMixinWidgetMpSupport(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
       super(builder);
     }
-    private TakeMaterialDeleteReturnRsp() {
+    private AbilityMixinWidgetMpSupport() {
     }
 
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
         UnusedPrivateParameter unused) {
-      return new TakeMaterialDeleteReturnRsp();
+      return new AbilityMixinWidgetMpSupport();
     }
 
     @java.lang.Override
@@ -56,7 +51,7 @@ public final class TakeMaterialDeleteReturnRspOuterClass {
     getUnknownFields() {
       return this.unknownFields;
     }
-    private TakeMaterialDeleteReturnRsp(
+    private AbilityMixinWidgetMpSupport(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
@@ -76,7 +71,7 @@ public final class TakeMaterialDeleteReturnRspOuterClass {
               break;
             case 72: {
 
-              retcode_ = input.readInt32();
+              targetEntityId_ = input.readUInt32();
               break;
             }
             default: {
@@ -100,26 +95,26 @@ public final class TakeMaterialDeleteReturnRspOuterClass {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return emu.grasscutter.net.proto.TakeMaterialDeleteReturnRspOuterClass.internal_static_TakeMaterialDeleteReturnRsp_descriptor;
+      return emu.grasscutter.net.proto.AbilityMixinWidgetMpSupportOuterClass.internal_static_AbilityMixinWidgetMpSupport_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return emu.grasscutter.net.proto.TakeMaterialDeleteReturnRspOuterClass.internal_static_TakeMaterialDeleteReturnRsp_fieldAccessorTable
+      return emu.grasscutter.net.proto.AbilityMixinWidgetMpSupportOuterClass.internal_static_AbilityMixinWidgetMpSupport_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              emu.grasscutter.net.proto.TakeMaterialDeleteReturnRspOuterClass.TakeMaterialDeleteReturnRsp.class, emu.grasscutter.net.proto.TakeMaterialDeleteReturnRspOuterClass.TakeMaterialDeleteReturnRsp.Builder.class);
+              emu.grasscutter.net.proto.AbilityMixinWidgetMpSupportOuterClass.AbilityMixinWidgetMpSupport.class, emu.grasscutter.net.proto.AbilityMixinWidgetMpSupportOuterClass.AbilityMixinWidgetMpSupport.Builder.class);
     }
 
-    public static final int RETCODE_FIELD_NUMBER = 9;
+    public static final int TARGET_ENTITY_ID_FIELD_NUMBER = 9;
-    private int retcode_;
+    private int targetEntityId_;
     /**
-     * <code>int32 retcode = 9;</code>
+     * <code>uint32 target_entity_id = 9;</code>
-     * @return The retcode.
+     * @return The targetEntityId.
      */
     @java.lang.Override
-    public int getRetcode() {
+    public int getTargetEntityId() {
-      return retcode_;
+      return targetEntityId_;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -136,8 +131,8 @@ public final class TakeMaterialDeleteReturnRspOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (retcode_ != 0) {
+      if (targetEntityId_ != 0) {
-        output.writeInt32(9, retcode_);
+        output.writeUInt32(9, targetEntityId_);
       }
       unknownFields.writeTo(output);
     }
@@ -148,9 +143,9 @@ public final class TakeMaterialDeleteReturnRspOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (retcode_ != 0) {
+      if (targetEntityId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(9, retcode_);
+          .computeUInt32Size(9, targetEntityId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -162,13 +157,13 @@ public final class TakeMaterialDeleteReturnRspOuterClass {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof emu.grasscutter.net.proto.TakeMaterialDeleteReturnRspOuterClass.TakeMaterialDeleteReturnRsp)) {
+      if (!(obj instanceof emu.grasscutter.net.proto.AbilityMixinWidgetMpSupportOuterClass.AbilityMixinWidgetMpSupport)) {
         return super.equals(obj);
       }
-      emu.grasscutter.net.proto.TakeMaterialDeleteReturnRspOuterClass.TakeMaterialDeleteReturnRsp other = (emu.grasscutter.net.proto.TakeMaterialDeleteReturnRspOuterClass.TakeMaterialDeleteReturnRsp) obj;
+      emu.grasscutter.net.proto.AbilityMixinWidgetMpSupportOuterClass.AbilityMixinWidgetMpSupport other = (emu.grasscutter.net.proto.AbilityMixinWidgetMpSupportOuterClass.AbilityMixinWidgetMpSupport) obj;
 
-      if (getRetcode()
+      if (getTargetEntityId()
-          != other.getRetcode()) return false;
+          != other.getTargetEntityId()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -180,76 +175,76 @@ public final class TakeMaterialDeleteReturnRspOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + RETCODE_FIELD_NUMBER;
+      hash = (37 * hash) + TARGET_ENTITY_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getRetcode();
+      hash = (53 * hash) + getTargetEntityId();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
     }
 
-    public static emu.grasscutter.net.proto.TakeMaterialDeleteReturnRspOuterClass.TakeMaterialDeleteReturnRsp parseFrom(
+    public static emu.grasscutter.net.proto.AbilityMixinWidgetMpSupportOuterClass.AbilityMixinWidgetMpSupport parseFrom(
         java.nio.ByteBuffer data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static emu.grasscutter.net.proto.TakeMaterialDeleteReturnRspOuterClass.TakeMaterialDeleteReturnRsp parseFrom(
+    public static emu.grasscutter.net.proto.AbilityMixinWidgetMpSupportOuterClass.AbilityMixinWidgetMpSupport parseFrom(
         java.nio.ByteBuffer data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static emu.grasscutter.net.proto.TakeMaterialDeleteReturnRspOuterClass.TakeMaterialDeleteReturnRsp parseFrom(
+    public static emu.grasscutter.net.proto.AbilityMixinWidgetMpSupportOuterClass.AbilityMixinWidgetMpSupport parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static emu.grasscutter.net.proto.TakeMaterialDeleteReturnRspOuterClass.TakeMaterialDeleteReturnRsp parseFrom(
+    public static emu.grasscutter.net.proto.AbilityMixinWidgetMpSupportOuterClass.AbilityMixinWidgetMpSupport parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static emu.grasscutter.net.proto.TakeMaterialDeleteReturnRspOuterClass.TakeMaterialDeleteReturnRsp parseFrom(byte[] data)
+    public static emu.grasscutter.net.proto.AbilityMixinWidgetMpSupportOuterClass.AbilityMixinWidgetMpSupport parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static emu.grasscutter.net.proto.TakeMaterialDeleteReturnRspOuterClass.TakeMaterialDeleteReturnRsp parseFrom(
+    public static emu.grasscutter.net.proto.AbilityMixinWidgetMpSupportOuterClass.AbilityMixinWidgetMpSupport parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static emu.grasscutter.net.proto.TakeMaterialDeleteReturnRspOuterClass.TakeMaterialDeleteReturnRsp parseFrom(java.io.InputStream input)
+    public static emu.grasscutter.net.proto.AbilityMixinWidgetMpSupportOuterClass.AbilityMixinWidgetMpSupport parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static emu.grasscutter.net.proto.TakeMaterialDeleteReturnRspOuterClass.TakeMaterialDeleteReturnRsp parseFrom(
+    public static emu.grasscutter.net.proto.AbilityMixinWidgetMpSupportOuterClass.AbilityMixinWidgetMpSupport parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static emu.grasscutter.net.proto.TakeMaterialDeleteReturnRspOuterClass.TakeMaterialDeleteReturnRsp parseDelimitedFrom(java.io.InputStream input)
+    public static emu.grasscutter.net.proto.AbilityMixinWidgetMpSupportOuterClass.AbilityMixinWidgetMpSupport parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static emu.grasscutter.net.proto.TakeMaterialDeleteReturnRspOuterClass.TakeMaterialDeleteReturnRsp parseDelimitedFrom(
+    public static emu.grasscutter.net.proto.AbilityMixinWidgetMpSupportOuterClass.AbilityMixinWidgetMpSupport parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static emu.grasscutter.net.proto.TakeMaterialDeleteReturnRspOuterClass.TakeMaterialDeleteReturnRsp parseFrom(
+    public static emu.grasscutter.net.proto.AbilityMixinWidgetMpSupportOuterClass.AbilityMixinWidgetMpSupport parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static emu.grasscutter.net.proto.TakeMaterialDeleteReturnRspOuterClass.TakeMaterialDeleteReturnRsp parseFrom(
+    public static emu.grasscutter.net.proto.AbilityMixinWidgetMpSupportOuterClass.AbilityMixinWidgetMpSupport parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -262,7 +257,7 @@ public final class TakeMaterialDeleteReturnRspOuterClass {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(emu.grasscutter.net.proto.TakeMaterialDeleteReturnRspOuterClass.TakeMaterialDeleteReturnRsp prototype) {
+    public static Builder newBuilder(emu.grasscutter.net.proto.AbilityMixinWidgetMpSupportOuterClass.AbilityMixinWidgetMpSupport prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -278,31 +273,26 @@ public final class TakeMaterialDeleteReturnRspOuterClass {
       return builder;
     }
     /**
-     * <pre>
+     * Protobuf type {@code AbilityMixinWidgetMpSupport}
-     * Name: GOHLFBHEKIN
-     * CmdId: 604
-     * </pre>
-     *
-     * Protobuf type {@code TakeMaterialDeleteReturnRsp}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
-        // @@protoc_insertion_point(builder_implements:TakeMaterialDeleteReturnRsp)
+        // @@protoc_insertion_point(builder_implements:AbilityMixinWidgetMpSupport)
-        emu.grasscutter.net.proto.TakeMaterialDeleteReturnRspOuterClass.TakeMaterialDeleteReturnRspOrBuilder {
+        emu.grasscutter.net.proto.AbilityMixinWidgetMpSupportOuterClass.AbilityMixinWidgetMpSupportOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return emu.grasscutter.net.proto.TakeMaterialDeleteReturnRspOuterClass.internal_static_TakeMaterialDeleteReturnRsp_descriptor;
+        return emu.grasscutter.net.proto.AbilityMixinWidgetMpSupportOuterClass.internal_static_AbilityMixinWidgetMpSupport_descriptor;
       }
 
       @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return emu.grasscutter.net.proto.TakeMaterialDeleteReturnRspOuterClass.internal_static_TakeMaterialDeleteReturnRsp_fieldAccessorTable
+        return emu.grasscutter.net.proto.AbilityMixinWidgetMpSupportOuterClass.internal_static_AbilityMixinWidgetMpSupport_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                emu.grasscutter.net.proto.TakeMaterialDeleteReturnRspOuterClass.TakeMaterialDeleteReturnRsp.class, emu.grasscutter.net.proto.TakeMaterialDeleteReturnRspOuterClass.TakeMaterialDeleteReturnRsp.Builder.class);
+                emu.grasscutter.net.proto.AbilityMixinWidgetMpSupportOuterClass.AbilityMixinWidgetMpSupport.class, emu.grasscutter.net.proto.AbilityMixinWidgetMpSupportOuterClass.AbilityMixinWidgetMpSupport.Builder.class);
       }
 
-      // Construct using emu.grasscutter.net.proto.TakeMaterialDeleteReturnRspOuterClass.TakeMaterialDeleteReturnRsp.newBuilder()
+      // Construct using emu.grasscutter.net.proto.AbilityMixinWidgetMpSupportOuterClass.AbilityMixinWidgetMpSupport.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -320,7 +310,7 @@ public final class TakeMaterialDeleteReturnRspOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        retcode_ = 0;
+        targetEntityId_ = 0;
 
         return this;
       }
@@ -328,17 +318,17 @@ public final class TakeMaterialDeleteReturnRspOuterClass {
       @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return emu.grasscutter.net.proto.TakeMaterialDeleteReturnRspOuterClass.internal_static_TakeMaterialDeleteReturnRsp_descriptor;
+        return emu.grasscutter.net.proto.AbilityMixinWidgetMpSupportOuterClass.internal_static_AbilityMixinWidgetMpSupport_descriptor;
       }
 
       @java.lang.Override
-      public emu.grasscutter.net.proto.TakeMaterialDeleteReturnRspOuterClass.TakeMaterialDeleteReturnRsp getDefaultInstanceForType() {
+      public emu.grasscutter.net.proto.AbilityMixinWidgetMpSupportOuterClass.AbilityMixinWidgetMpSupport getDefaultInstanceForType() {
-        return emu.grasscutter.net.proto.TakeMaterialDeleteReturnRspOuterClass.TakeMaterialDeleteReturnRsp.getDefaultInstance();
+        return emu.grasscutter.net.proto.AbilityMixinWidgetMpSupportOuterClass.AbilityMixinWidgetMpSupport.getDefaultInstance();
       }
 
       @java.lang.Override
-      public emu.grasscutter.net.proto.TakeMaterialDeleteReturnRspOuterClass.TakeMaterialDeleteReturnRsp build() {
+      public emu.grasscutter.net.proto.AbilityMixinWidgetMpSupportOuterClass.AbilityMixinWidgetMpSupport build() {
-        emu.grasscutter.net.proto.TakeMaterialDeleteReturnRspOuterClass.TakeMaterialDeleteReturnRsp result = buildPartial();
+        emu.grasscutter.net.proto.AbilityMixinWidgetMpSupportOuterClass.AbilityMixinWidgetMpSupport result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -346,9 +336,9 @@ public final class TakeMaterialDeleteReturnRspOuterClass {
       }
 
       @java.lang.Override
-      public emu.grasscutter.net.proto.TakeMaterialDeleteReturnRspOuterClass.TakeMaterialDeleteReturnRsp buildPartial() {
+      public emu.grasscutter.net.proto.AbilityMixinWidgetMpSupportOuterClass.AbilityMixinWidgetMpSupport buildPartial() {
-        emu.grasscutter.net.proto.TakeMaterialDeleteReturnRspOuterClass.TakeMaterialDeleteReturnRsp result = new emu.grasscutter.net.proto.TakeMaterialDeleteReturnRspOuterClass.TakeMaterialDeleteReturnRsp(this);
+        emu.grasscutter.net.proto.AbilityMixinWidgetMpSupportOuterClass.AbilityMixinWidgetMpSupport result = new emu.grasscutter.net.proto.AbilityMixinWidgetMpSupportOuterClass.AbilityMixinWidgetMpSupport(this);
-        result.retcode_ = retcode_;
+        result.targetEntityId_ = targetEntityId_;
         onBuilt();
         return result;
       }
@@ -387,18 +377,18 @@ public final class TakeMaterialDeleteReturnRspOuterClass {
       }
       @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof emu.grasscutter.net.proto.TakeMaterialDeleteReturnRspOuterClass.TakeMaterialDeleteReturnRsp) {
+        if (other instanceof emu.grasscutter.net.proto.AbilityMixinWidgetMpSupportOuterClass.AbilityMixinWidgetMpSupport) {
-          return mergeFrom((emu.grasscutter.net.proto.TakeMaterialDeleteReturnRspOuterClass.TakeMaterialDeleteReturnRsp)other);
+          return mergeFrom((emu.grasscutter.net.proto.AbilityMixinWidgetMpSupportOuterClass.AbilityMixinWidgetMpSupport)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(emu.grasscutter.net.proto.TakeMaterialDeleteReturnRspOuterClass.TakeMaterialDeleteReturnRsp other) {
+      public Builder mergeFrom(emu.grasscutter.net.proto.AbilityMixinWidgetMpSupportOuterClass.AbilityMixinWidgetMpSupport other) {
-        if (other == emu.grasscutter.net.proto.TakeMaterialDeleteReturnRspOuterClass.TakeMaterialDeleteReturnRsp.getDefaultInstance()) return this;
+        if (other == emu.grasscutter.net.proto.AbilityMixinWidgetMpSupportOuterClass.AbilityMixinWidgetMpSupport.getDefaultInstance()) return this;
-        if (other.getRetcode() != 0) {
+        if (other.getTargetEntityId() != 0) {
-          setRetcode(other.getRetcode());
+          setTargetEntityId(other.getTargetEntityId());
         }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
@@ -415,11 +405,11 @@ public final class TakeMaterialDeleteReturnRspOuterClass {
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        emu.grasscutter.net.proto.TakeMaterialDeleteReturnRspOuterClass.TakeMaterialDeleteReturnRsp parsedMessage = null;
+        emu.grasscutter.net.proto.AbilityMixinWidgetMpSupportOuterClass.AbilityMixinWidgetMpSupport parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (emu.grasscutter.net.proto.TakeMaterialDeleteReturnRspOuterClass.TakeMaterialDeleteReturnRsp) e.getUnfinishedMessage();
+          parsedMessage = (emu.grasscutter.net.proto.AbilityMixinWidgetMpSupportOuterClass.AbilityMixinWidgetMpSupport) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -429,33 +419,33 @@ public final class TakeMaterialDeleteReturnRspOuterClass {
         return this;
       }
 
-      private int retcode_ ;
+      private int targetEntityId_ ;
       /**
-       * <code>int32 retcode = 9;</code>
+       * <code>uint32 target_entity_id = 9;</code>
-       * @return The retcode.
+       * @return The targetEntityId.
        */
       @java.lang.Override
-      public int getRetcode() {
+      public int getTargetEntityId() {
-        return retcode_;
+        return targetEntityId_;
       }
       /**
-       * <code>int32 retcode = 9;</code>
+       * <code>uint32 target_entity_id = 9;</code>
-       * @param value The retcode to set.
+       * @param value The targetEntityId to set.
        * @return This builder for chaining.
        */
-      public Builder setRetcode(int value) {
+      public Builder setTargetEntityId(int value) {
         
-        retcode_ = value;
+        targetEntityId_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>int32 retcode = 9;</code>
+       * <code>uint32 target_entity_id = 9;</code>
        * @return This builder for chaining.
        */
-      public Builder clearRetcode() {
+      public Builder clearTargetEntityId() {
         
-        retcode_ = 0;
+        targetEntityId_ = 0;
         onChanged();
         return this;
       }
@@ -472,51 +462,51 @@ public final class TakeMaterialDeleteReturnRspOuterClass {
       }
 
 
-      // @@protoc_insertion_point(builder_scope:TakeMaterialDeleteReturnRsp)
+      // @@protoc_insertion_point(builder_scope:AbilityMixinWidgetMpSupport)
     }
 
-    // @@protoc_insertion_point(class_scope:TakeMaterialDeleteReturnRsp)
+    // @@protoc_insertion_point(class_scope:AbilityMixinWidgetMpSupport)
-    private static final emu.grasscutter.net.proto.TakeMaterialDeleteReturnRspOuterClass.TakeMaterialDeleteReturnRsp DEFAULT_INSTANCE;
+    private static final emu.grasscutter.net.proto.AbilityMixinWidgetMpSupportOuterClass.AbilityMixinWidgetMpSupport DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new emu.grasscutter.net.proto.TakeMaterialDeleteReturnRspOuterClass.TakeMaterialDeleteReturnRsp();
+      DEFAULT_INSTANCE = new emu.grasscutter.net.proto.AbilityMixinWidgetMpSupportOuterClass.AbilityMixinWidgetMpSupport();
     }
 
-    public static emu.grasscutter.net.proto.TakeMaterialDeleteReturnRspOuterClass.TakeMaterialDeleteReturnRsp getDefaultInstance() {
+    public static emu.grasscutter.net.proto.AbilityMixinWidgetMpSupportOuterClass.AbilityMixinWidgetMpSupport getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    private static final com.google.protobuf.Parser<TakeMaterialDeleteReturnRsp>
+    private static final com.google.protobuf.Parser<AbilityMixinWidgetMpSupport>
-        PARSER = new com.google.protobuf.AbstractParser<TakeMaterialDeleteReturnRsp>() {
+        PARSER = new com.google.protobuf.AbstractParser<AbilityMixinWidgetMpSupport>() {
       @java.lang.Override
-      public TakeMaterialDeleteReturnRsp parsePartialFrom(
+      public AbilityMixinWidgetMpSupport parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new TakeMaterialDeleteReturnRsp(input, extensionRegistry);
+        return new AbilityMixinWidgetMpSupport(input, extensionRegistry);
       }
     };
 
-    public static com.google.protobuf.Parser<TakeMaterialDeleteReturnRsp> parser() {
+    public static com.google.protobuf.Parser<AbilityMixinWidgetMpSupport> parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public com.google.protobuf.Parser<TakeMaterialDeleteReturnRsp> getParserForType() {
+    public com.google.protobuf.Parser<AbilityMixinWidgetMpSupport> getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public emu.grasscutter.net.proto.TakeMaterialDeleteReturnRspOuterClass.TakeMaterialDeleteReturnRsp getDefaultInstanceForType() {
+    public emu.grasscutter.net.proto.AbilityMixinWidgetMpSupportOuterClass.AbilityMixinWidgetMpSupport getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
   }
 
   private static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_TakeMaterialDeleteReturnRsp_descriptor;
+    internal_static_AbilityMixinWidgetMpSupport_descriptor;
   private static final 
     com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_TakeMaterialDeleteReturnRsp_fieldAccessorTable;
+      internal_static_AbilityMixinWidgetMpSupport_fieldAccessorTable;
 
   public static com.google.protobuf.Descriptors.FileDescriptor
       getDescriptor() {
@@ -526,20 +516,21 @@ public final class TakeMaterialDeleteReturnRspOuterClass {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n!TakeMaterialDeleteReturnRsp.proto\".\n\033T" +
+      "\n!AbilityMixinWidgetMpSupport.proto\"7\n\033A" +
-      "akeMaterialDeleteReturnRsp\022\017\n\007retcode\030\t " +
+      "bilityMixinWidgetMpSupport\022\030\n\020target_ent" +
-      "\001(\005B\033\n\031emu.grasscutter.net.protob\006proto3"
+      "ity_id\030\t \001(\rB\033\n\031emu.grasscutter.net.prot" +
+      "ob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
         new com.google.protobuf.Descriptors.FileDescriptor[] {
         });
-    internal_static_TakeMaterialDeleteReturnRsp_descriptor =
+    internal_static_AbilityMixinWidgetMpSupport_descriptor =
       getDescriptor().getMessageTypes().get(0);
-    internal_static_TakeMaterialDeleteReturnRsp_fieldAccessorTable = new
+    internal_static_AbilityMixinWidgetMpSupport_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_TakeMaterialDeleteReturnRsp_descriptor,
+        internal_static_AbilityMixinWidgetMpSupport_descriptor,
-        new java.lang.String[] { "Retcode", });
+        new java.lang.String[] { "TargetEntityId", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)

src/generated/main/java/emu/grasscutter/net/proto/AbilityScalarTypeOuterClass.java

@@ -15,10 +15,6 @@ public final class AbilityScalarTypeOuterClass {
         (com.google.protobuf.ExtensionRegistryLite) registry);
   }
   /**
-   * <pre>
-   * Name: MLNEEGJPBCO
-   * </pre>
-   *
    * Protobuf enum {@code AbilityScalarType}
    */
   public enum AbilityScalarType

src/generated/main/java/emu/grasscutter/net/proto/AbilityScalarValueEntryOuterClass.java

@@ -97,10 +97,6 @@ public final class AbilityScalarValueEntryOuterClass {
     public emu.grasscutter.net.proto.AbilityScalarValueEntryOuterClass.AbilityScalarValueEntry.ValueCase getValueCase();
   }
   /**
-   * <pre>
-   * Name: JHJPOIJGPEB
-   * </pre>
-   *
    * Protobuf type {@code AbilityScalarValueEntry}
    */
   public static final class AbilityScalarValueEntry extends
@@ -670,10 +666,6 @@ public final class AbilityScalarValueEntryOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Name: JHJPOIJGPEB
-     * </pre>
-     *
      * Protobuf type {@code AbilityScalarValueEntry}
      */
     public static final class Builder extends

src/generated/main/java/emu/grasscutter/net/proto/AbilityStringOuterClass.java

@@ -49,10 +49,6 @@ public final class AbilityStringOuterClass {
     public emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityString.TypeCase getTypeCase();
   }
   /**
-   * <pre>
-   * Name: ALGGELGLCLJ
-   * </pre>
-   *
    * Protobuf type {@code AbilityString}
    */
   public static final class AbilityString extends
@@ -439,10 +435,6 @@ public final class AbilityStringOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Name: ALGGELGLCLJ
-     * </pre>
-     *
      * Protobuf type {@code AbilityString}
      */
     public static final class Builder extends

src/generated/main/java/emu/grasscutter/net/proto/AbilitySyncStateInfoOuterClass.java

@@ -145,10 +145,6 @@ public final class AbilitySyncStateInfoOuterClass {
         int index);
   }
   /**
-   * <pre>
-   * Name: ONHDINIKADE
-   * </pre>
-   *
    * Protobuf type {@code AbilitySyncStateInfo}
    */
   public static final class AbilitySyncStateInfo extends
@@ -729,10 +725,6 @@ public final class AbilitySyncStateInfoOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Name: ONHDINIKADE
-     * </pre>
-     *
      * Protobuf type {@code AbilitySyncStateInfo}
      */
     public static final class Builder extends

src/generated/main/java/emu/grasscutter/net/proto/AchievementUpdateNotifyOuterClass.java

@@ -1,854 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: AchievementUpdateNotify.proto
-
-package emu.grasscutter.net.proto;
-
-public final class AchievementUpdateNotifyOuterClass {
-  private AchievementUpdateNotifyOuterClass() {}
-  public static void registerAllExtensions(
-      com.google.protobuf.ExtensionRegistryLite registry) {
-  }
-
-  public static void registerAllExtensions(
-      com.google.protobuf.ExtensionRegistry registry) {
-    registerAllExtensions(
-        (com.google.protobuf.ExtensionRegistryLite) registry);
-  }
-  public interface AchievementUpdateNotifyOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:AchievementUpdateNotify)
-      com.google.protobuf.MessageOrBuilder {
-
-    /**
-     * <code>repeated .Achievement achievement_list = 2;</code>
-     */
-    java.util.List<emu.grasscutter.net.proto.AchievementOuterClass.Achievement> 
-        getAchievementListList();
-    /**
-     * <code>repeated .Achievement achievement_list = 2;</code>
-     */
-    emu.grasscutter.net.proto.AchievementOuterClass.Achievement getAchievementList(int index);
-    /**
-     * <code>repeated .Achievement achievement_list = 2;</code>
-     */
-    int getAchievementListCount();
-    /**
-     * <code>repeated .Achievement achievement_list = 2;</code>
-     */
-    java.util.List<? extends emu.grasscutter.net.proto.AchievementOuterClass.AchievementOrBuilder> 
-        getAchievementListOrBuilderList();
-    /**
-     * <code>repeated .Achievement achievement_list = 2;</code>
-     */
-    emu.grasscutter.net.proto.AchievementOuterClass.AchievementOrBuilder getAchievementListOrBuilder(
-        int index);
-  }
-  /**
-   * <pre>
-   * Name: PFKCLOLEDDE
-   * CmdId: 2693
-   * </pre>
-   *
-   * Protobuf type {@code AchievementUpdateNotify}
-   */
-  public static final class AchievementUpdateNotify extends
-      com.google.protobuf.GeneratedMessageV3 implements
-      // @@protoc_insertion_point(message_implements:AchievementUpdateNotify)
-      AchievementUpdateNotifyOrBuilder {
-  private static final long serialVersionUID = 0L;
-    // Use AchievementUpdateNotify.newBuilder() to construct.
-    private AchievementUpdateNotify(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
-      super(builder);
-    }
-    private AchievementUpdateNotify() {
-      achievementList_ = java.util.Collections.emptyList();
-    }
-
-    @java.lang.Override
-    @SuppressWarnings({"unused"})
-    protected java.lang.Object newInstance(
-        UnusedPrivateParameter unused) {
-      return new AchievementUpdateNotify();
-    }
-
-    @java.lang.Override
-    public final com.google.protobuf.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private AchievementUpdateNotify(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-          com.google.protobuf.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 18: {
-              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                achievementList_ = new java.util.ArrayList<emu.grasscutter.net.proto.AchievementOuterClass.Achievement>();
-                mutable_bitField0_ |= 0x00000001;
-              }
-              achievementList_.add(
-                  input.readMessage(emu.grasscutter.net.proto.AchievementOuterClass.Achievement.parser(), extensionRegistry));
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new com.google.protobuf.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        if (((mutable_bitField0_ & 0x00000001) != 0)) {
-          achievementList_ = java.util.Collections.unmodifiableList(achievementList_);
-        }
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return emu.grasscutter.net.proto.AchievementUpdateNotifyOuterClass.internal_static_AchievementUpdateNotify_descriptor;
-    }
-
-    @java.lang.Override
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return emu.grasscutter.net.proto.AchievementUpdateNotifyOuterClass.internal_static_AchievementUpdateNotify_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              emu.grasscutter.net.proto.AchievementUpdateNotifyOuterClass.AchievementUpdateNotify.class, emu.grasscutter.net.proto.AchievementUpdateNotifyOuterClass.AchievementUpdateNotify.Builder.class);
-    }
-
-    public static final int ACHIEVEMENT_LIST_FIELD_NUMBER = 2;
-    private java.util.List<emu.grasscutter.net.proto.AchievementOuterClass.Achievement> achievementList_;
-    /**
-     * <code>repeated .Achievement achievement_list = 2;</code>
-     */
-    @java.lang.Override
-    public java.util.List<emu.grasscutter.net.proto.AchievementOuterClass.Achievement> getAchievementListList() {
-      return achievementList_;
-    }
-    /**
-     * <code>repeated .Achievement achievement_list = 2;</code>
-     */
-    @java.lang.Override
-    public java.util.List<? extends emu.grasscutter.net.proto.AchievementOuterClass.AchievementOrBuilder> 
-        getAchievementListOrBuilderList() {
-      return achievementList_;
-    }
-    /**
-     * <code>repeated .Achievement achievement_list = 2;</code>
-     */
-    @java.lang.Override
-    public int getAchievementListCount() {
-      return achievementList_.size();
-    }
-    /**
-     * <code>repeated .Achievement achievement_list = 2;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.AchievementOuterClass.Achievement getAchievementList(int index) {
-      return achievementList_.get(index);
-    }
-    /**
-     * <code>repeated .Achievement achievement_list = 2;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.AchievementOuterClass.AchievementOrBuilder getAchievementListOrBuilder(
-        int index) {
-      return achievementList_.get(index);
-    }
-
-    private byte memoizedIsInitialized = -1;
-    @java.lang.Override
-    public final boolean isInitialized() {
-      byte isInitialized = memoizedIsInitialized;
-      if (isInitialized == 1) return true;
-      if (isInitialized == 0) return false;
-
-      memoizedIsInitialized = 1;
-      return true;
-    }
-
-    @java.lang.Override
-    public void writeTo(com.google.protobuf.CodedOutputStream output)
-                        throws java.io.IOException {
-      for (int i = 0; i < achievementList_.size(); i++) {
-        output.writeMessage(2, achievementList_.get(i));
-      }
-      unknownFields.writeTo(output);
-    }
-
-    @java.lang.Override
-    public int getSerializedSize() {
-      int size = memoizedSize;
-      if (size != -1) return size;
-
-      size = 0;
-      for (int i = 0; i < achievementList_.size(); i++) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(2, achievementList_.get(i));
-      }
-      size += unknownFields.getSerializedSize();
-      memoizedSize = size;
-      return size;
-    }
-
-    @java.lang.Override
-    public boolean equals(final java.lang.Object obj) {
-      if (obj == this) {
-       return true;
-      }
-      if (!(obj instanceof emu.grasscutter.net.proto.AchievementUpdateNotifyOuterClass.AchievementUpdateNotify)) {
-        return super.equals(obj);
-      }
-      emu.grasscutter.net.proto.AchievementUpdateNotifyOuterClass.AchievementUpdateNotify other = (emu.grasscutter.net.proto.AchievementUpdateNotifyOuterClass.AchievementUpdateNotify) obj;
-
-      if (!getAchievementListList()
-          .equals(other.getAchievementListList())) return false;
-      if (!unknownFields.equals(other.unknownFields)) return false;
-      return true;
-    }
-
-    @java.lang.Override
-    public int hashCode() {
-      if (memoizedHashCode != 0) {
-        return memoizedHashCode;
-      }
-      int hash = 41;
-      hash = (19 * hash) + getDescriptor().hashCode();
-      if (getAchievementListCount() > 0) {
-        hash = (37 * hash) + ACHIEVEMENT_LIST_FIELD_NUMBER;
-        hash = (53 * hash) + getAchievementListList().hashCode();
-      }
-      hash = (29 * hash) + unknownFields.hashCode();
-      memoizedHashCode = hash;
-      return hash;
-    }
-
-    public static emu.grasscutter.net.proto.AchievementUpdateNotifyOuterClass.AchievementUpdateNotify parseFrom(
-        java.nio.ByteBuffer data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
-    }
-    public static emu.grasscutter.net.proto.AchievementUpdateNotifyOuterClass.AchievementUpdateNotify parseFrom(
-        java.nio.ByteBuffer data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
-    }
-    public static emu.grasscutter.net.proto.AchievementUpdateNotifyOuterClass.AchievementUpdateNotify parseFrom(
-        com.google.protobuf.ByteString data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
-    }
-    public static emu.grasscutter.net.proto.AchievementUpdateNotifyOuterClass.AchievementUpdateNotify parseFrom(
-        com.google.protobuf.ByteString data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
-    }
-    public static emu.grasscutter.net.proto.AchievementUpdateNotifyOuterClass.AchievementUpdateNotify parseFrom(byte[] data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
-    }
-    public static emu.grasscutter.net.proto.AchievementUpdateNotifyOuterClass.AchievementUpdateNotify parseFrom(
-        byte[] data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
-    }
-    public static emu.grasscutter.net.proto.AchievementUpdateNotifyOuterClass.AchievementUpdateNotify parseFrom(java.io.InputStream input)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input);
-    }
-    public static emu.grasscutter.net.proto.AchievementUpdateNotifyOuterClass.AchievementUpdateNotify parseFrom(
-        java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input, extensionRegistry);
-    }
-    public static emu.grasscutter.net.proto.AchievementUpdateNotifyOuterClass.AchievementUpdateNotify parseDelimitedFrom(java.io.InputStream input)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseDelimitedWithIOException(PARSER, input);
-    }
-    public static emu.grasscutter.net.proto.AchievementUpdateNotifyOuterClass.AchievementUpdateNotify parseDelimitedFrom(
-        java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-    }
-    public static emu.grasscutter.net.proto.AchievementUpdateNotifyOuterClass.AchievementUpdateNotify parseFrom(
-        com.google.protobuf.CodedInputStream input)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input);
-    }
-    public static emu.grasscutter.net.proto.AchievementUpdateNotifyOuterClass.AchievementUpdateNotify parseFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input, extensionRegistry);
-    }
-
-    @java.lang.Override
-    public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder() {
-      return DEFAULT_INSTANCE.toBuilder();
-    }
-    public static Builder newBuilder(emu.grasscutter.net.proto.AchievementUpdateNotifyOuterClass.AchievementUpdateNotify prototype) {
-      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-    }
-    @java.lang.Override
-    public Builder toBuilder() {
-      return this == DEFAULT_INSTANCE
-          ? new Builder() : new Builder().mergeFrom(this);
-    }
-
-    @java.lang.Override
-    protected Builder newBuilderForType(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-      Builder builder = new Builder(parent);
-      return builder;
-    }
-    /**
-     * <pre>
-     * Name: PFKCLOLEDDE
-     * CmdId: 2693
-     * </pre>
-     *
-     * Protobuf type {@code AchievementUpdateNotify}
-     */
-    public static final class Builder extends
-        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
-        // @@protoc_insertion_point(builder_implements:AchievementUpdateNotify)
-        emu.grasscutter.net.proto.AchievementUpdateNotifyOuterClass.AchievementUpdateNotifyOrBuilder {
-      public static final com.google.protobuf.Descriptors.Descriptor
-          getDescriptor() {
-        return emu.grasscutter.net.proto.AchievementUpdateNotifyOuterClass.internal_static_AchievementUpdateNotify_descriptor;
-      }
-
-      @java.lang.Override
-      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-          internalGetFieldAccessorTable() {
-        return emu.grasscutter.net.proto.AchievementUpdateNotifyOuterClass.internal_static_AchievementUpdateNotify_fieldAccessorTable
-            .ensureFieldAccessorsInitialized(
-                emu.grasscutter.net.proto.AchievementUpdateNotifyOuterClass.AchievementUpdateNotify.class, emu.grasscutter.net.proto.AchievementUpdateNotifyOuterClass.AchievementUpdateNotify.Builder.class);
-      }
-
-      // Construct using emu.grasscutter.net.proto.AchievementUpdateNotifyOuterClass.AchievementUpdateNotify.newBuilder()
-      private Builder() {
-        maybeForceBuilderInitialization();
-      }
-
-      private Builder(
-          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-        super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (com.google.protobuf.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-          getAchievementListFieldBuilder();
-        }
-      }
-      @java.lang.Override
-      public Builder clear() {
-        super.clear();
-        if (achievementListBuilder_ == null) {
-          achievementList_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000001);
-        } else {
-          achievementListBuilder_.clear();
-        }
-        return this;
-      }
-
-      @java.lang.Override
-      public com.google.protobuf.Descriptors.Descriptor
-          getDescriptorForType() {
-        return emu.grasscutter.net.proto.AchievementUpdateNotifyOuterClass.internal_static_AchievementUpdateNotify_descriptor;
-      }
-
-      @java.lang.Override
-      public emu.grasscutter.net.proto.AchievementUpdateNotifyOuterClass.AchievementUpdateNotify getDefaultInstanceForType() {
-        return emu.grasscutter.net.proto.AchievementUpdateNotifyOuterClass.AchievementUpdateNotify.getDefaultInstance();
-      }
-
-      @java.lang.Override
-      public emu.grasscutter.net.proto.AchievementUpdateNotifyOuterClass.AchievementUpdateNotify build() {
-        emu.grasscutter.net.proto.AchievementUpdateNotifyOuterClass.AchievementUpdateNotify result = buildPartial();
-        if (!result.isInitialized()) {
-          throw newUninitializedMessageException(result);
-        }
-        return result;
-      }
-
-      @java.lang.Override
-      public emu.grasscutter.net.proto.AchievementUpdateNotifyOuterClass.AchievementUpdateNotify buildPartial() {
-        emu.grasscutter.net.proto.AchievementUpdateNotifyOuterClass.AchievementUpdateNotify result = new emu.grasscutter.net.proto.AchievementUpdateNotifyOuterClass.AchievementUpdateNotify(this);
-        int from_bitField0_ = bitField0_;
-        if (achievementListBuilder_ == null) {
-          if (((bitField0_ & 0x00000001) != 0)) {
-            achievementList_ = java.util.Collections.unmodifiableList(achievementList_);
-            bitField0_ = (bitField0_ & ~0x00000001);
-          }
-          result.achievementList_ = achievementList_;
-        } else {
-          result.achievementList_ = achievementListBuilder_.build();
-        }
-        onBuilt();
-        return result;
-      }
-
-      @java.lang.Override
-      public Builder clone() {
-        return super.clone();
-      }
-      @java.lang.Override
-      public Builder setField(
-          com.google.protobuf.Descriptors.FieldDescriptor field,
-          java.lang.Object value) {
-        return super.setField(field, value);
-      }
-      @java.lang.Override
-      public Builder clearField(
-          com.google.protobuf.Descriptors.FieldDescriptor field) {
-        return super.clearField(field);
-      }
-      @java.lang.Override
-      public Builder clearOneof(
-          com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-        return super.clearOneof(oneof);
-      }
-      @java.lang.Override
-      public Builder setRepeatedField(
-          com.google.protobuf.Descriptors.FieldDescriptor field,
-          int index, java.lang.Object value) {
-        return super.setRepeatedField(field, index, value);
-      }
-      @java.lang.Override
-      public Builder addRepeatedField(
-          com.google.protobuf.Descriptors.FieldDescriptor field,
-          java.lang.Object value) {
-        return super.addRepeatedField(field, value);
-      }
-      @java.lang.Override
-      public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof emu.grasscutter.net.proto.AchievementUpdateNotifyOuterClass.AchievementUpdateNotify) {
-          return mergeFrom((emu.grasscutter.net.proto.AchievementUpdateNotifyOuterClass.AchievementUpdateNotify)other);
-        } else {
-          super.mergeFrom(other);
-          return this;
-        }
-      }
-
-      public Builder mergeFrom(emu.grasscutter.net.proto.AchievementUpdateNotifyOuterClass.AchievementUpdateNotify other) {
-        if (other == emu.grasscutter.net.proto.AchievementUpdateNotifyOuterClass.AchievementUpdateNotify.getDefaultInstance()) return this;
-        if (achievementListBuilder_ == null) {
-          if (!other.achievementList_.isEmpty()) {
-            if (achievementList_.isEmpty()) {
-              achievementList_ = other.achievementList_;
-              bitField0_ = (bitField0_ & ~0x00000001);
-            } else {
-              ensureAchievementListIsMutable();
-              achievementList_.addAll(other.achievementList_);
-            }
-            onChanged();
-          }
-        } else {
-          if (!other.achievementList_.isEmpty()) {
-            if (achievementListBuilder_.isEmpty()) {
-              achievementListBuilder_.dispose();
-              achievementListBuilder_ = null;
-              achievementList_ = other.achievementList_;
-              bitField0_ = (bitField0_ & ~0x00000001);
-              achievementListBuilder_ = 
-                com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
-                   getAchievementListFieldBuilder() : null;
-            } else {
-              achievementListBuilder_.addAllMessages(other.achievementList_);
-            }
-          }
-        }
-        this.mergeUnknownFields(other.unknownFields);
-        onChanged();
-        return this;
-      }
-
-      @java.lang.Override
-      public final boolean isInitialized() {
-        return true;
-      }
-
-      @java.lang.Override
-      public Builder mergeFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws java.io.IOException {
-        emu.grasscutter.net.proto.AchievementUpdateNotifyOuterClass.AchievementUpdateNotify parsedMessage = null;
-        try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (emu.grasscutter.net.proto.AchievementUpdateNotifyOuterClass.AchievementUpdateNotify) e.getUnfinishedMessage();
-          throw e.unwrapIOException();
-        } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
-        return this;
-      }
-      private int bitField0_;
-
-      private java.util.List<emu.grasscutter.net.proto.AchievementOuterClass.Achievement> achievementList_ =
-        java.util.Collections.emptyList();
-      private void ensureAchievementListIsMutable() {
-        if (!((bitField0_ & 0x00000001) != 0)) {
-          achievementList_ = new java.util.ArrayList<emu.grasscutter.net.proto.AchievementOuterClass.Achievement>(achievementList_);
-          bitField0_ |= 0x00000001;
-         }
-      }
-
-      private com.google.protobuf.RepeatedFieldBuilderV3<
-          emu.grasscutter.net.proto.AchievementOuterClass.Achievement, emu.grasscutter.net.proto.AchievementOuterClass.Achievement.Builder, emu.grasscutter.net.proto.AchievementOuterClass.AchievementOrBuilder> achievementListBuilder_;
-
-      /**
-       * <code>repeated .Achievement achievement_list = 2;</code>
-       */
-      public java.util.List<emu.grasscutter.net.proto.AchievementOuterClass.Achievement> getAchievementListList() {
-        if (achievementListBuilder_ == null) {
-          return java.util.Collections.unmodifiableList(achievementList_);
-        } else {
-          return achievementListBuilder_.getMessageList();
-        }
-      }
-      /**
-       * <code>repeated .Achievement achievement_list = 2;</code>
-       */
-      public int getAchievementListCount() {
-        if (achievementListBuilder_ == null) {
-          return achievementList_.size();
-        } else {
-          return achievementListBuilder_.getCount();
-        }
-      }
-      /**
-       * <code>repeated .Achievement achievement_list = 2;</code>
-       */
-      public emu.grasscutter.net.proto.AchievementOuterClass.Achievement getAchievementList(int index) {
-        if (achievementListBuilder_ == null) {
-          return achievementList_.get(index);
-        } else {
-          return achievementListBuilder_.getMessage(index);
-        }
-      }
-      /**
-       * <code>repeated .Achievement achievement_list = 2;</code>
-       */
-      public Builder setAchievementList(
-          int index, emu.grasscutter.net.proto.AchievementOuterClass.Achievement value) {
-        if (achievementListBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureAchievementListIsMutable();
-          achievementList_.set(index, value);
-          onChanged();
-        } else {
-          achievementListBuilder_.setMessage(index, value);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .Achievement achievement_list = 2;</code>
-       */
-      public Builder setAchievementList(
-          int index, emu.grasscutter.net.proto.AchievementOuterClass.Achievement.Builder builderForValue) {
-        if (achievementListBuilder_ == null) {
-          ensureAchievementListIsMutable();
-          achievementList_.set(index, builderForValue.build());
-          onChanged();
-        } else {
-          achievementListBuilder_.setMessage(index, builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .Achievement achievement_list = 2;</code>
-       */
-      public Builder addAchievementList(emu.grasscutter.net.proto.AchievementOuterClass.Achievement value) {
-        if (achievementListBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureAchievementListIsMutable();
-          achievementList_.add(value);
-          onChanged();
-        } else {
-          achievementListBuilder_.addMessage(value);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .Achievement achievement_list = 2;</code>
-       */
-      public Builder addAchievementList(
-          int index, emu.grasscutter.net.proto.AchievementOuterClass.Achievement value) {
-        if (achievementListBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureAchievementListIsMutable();
-          achievementList_.add(index, value);
-          onChanged();
-        } else {
-          achievementListBuilder_.addMessage(index, value);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .Achievement achievement_list = 2;</code>
-       */
-      public Builder addAchievementList(
-          emu.grasscutter.net.proto.AchievementOuterClass.Achievement.Builder builderForValue) {
-        if (achievementListBuilder_ == null) {
-          ensureAchievementListIsMutable();
-          achievementList_.add(builderForValue.build());
-          onChanged();
-        } else {
-          achievementListBuilder_.addMessage(builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .Achievement achievement_list = 2;</code>
-       */
-      public Builder addAchievementList(
-          int index, emu.grasscutter.net.proto.AchievementOuterClass.Achievement.Builder builderForValue) {
-        if (achievementListBuilder_ == null) {
-          ensureAchievementListIsMutable();
-          achievementList_.add(index, builderForValue.build());
-          onChanged();
-        } else {
-          achievementListBuilder_.addMessage(index, builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .Achievement achievement_list = 2;</code>
-       */
-      public Builder addAllAchievementList(
-          java.lang.Iterable<? extends emu.grasscutter.net.proto.AchievementOuterClass.Achievement> values) {
-        if (achievementListBuilder_ == null) {
-          ensureAchievementListIsMutable();
-          com.google.protobuf.AbstractMessageLite.Builder.addAll(
-              values, achievementList_);
-          onChanged();
-        } else {
-          achievementListBuilder_.addAllMessages(values);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .Achievement achievement_list = 2;</code>
-       */
-      public Builder clearAchievementList() {
-        if (achievementListBuilder_ == null) {
-          achievementList_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000001);
-          onChanged();
-        } else {
-          achievementListBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .Achievement achievement_list = 2;</code>
-       */
-      public Builder removeAchievementList(int index) {
-        if (achievementListBuilder_ == null) {
-          ensureAchievementListIsMutable();
-          achievementList_.remove(index);
-          onChanged();
-        } else {
-          achievementListBuilder_.remove(index);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .Achievement achievement_list = 2;</code>
-       */
-      public emu.grasscutter.net.proto.AchievementOuterClass.Achievement.Builder getAchievementListBuilder(
-          int index) {
-        return getAchievementListFieldBuilder().getBuilder(index);
-      }
-      /**
-       * <code>repeated .Achievement achievement_list = 2;</code>
-       */
-      public emu.grasscutter.net.proto.AchievementOuterClass.AchievementOrBuilder getAchievementListOrBuilder(
-          int index) {
-        if (achievementListBuilder_ == null) {
-          return achievementList_.get(index);  } else {
-          return achievementListBuilder_.getMessageOrBuilder(index);
-        }
-      }
-      /**
-       * <code>repeated .Achievement achievement_list = 2;</code>
-       */
-      public java.util.List<? extends emu.grasscutter.net.proto.AchievementOuterClass.AchievementOrBuilder> 
-           getAchievementListOrBuilderList() {
-        if (achievementListBuilder_ != null) {
-          return achievementListBuilder_.getMessageOrBuilderList();
-        } else {
-          return java.util.Collections.unmodifiableList(achievementList_);
-        }
-      }
-      /**
-       * <code>repeated .Achievement achievement_list = 2;</code>
-       */
-      public emu.grasscutter.net.proto.AchievementOuterClass.Achievement.Builder addAchievementListBuilder() {
-        return getAchievementListFieldBuilder().addBuilder(
-            emu.grasscutter.net.proto.AchievementOuterClass.Achievement.getDefaultInstance());
-      }
-      /**
-       * <code>repeated .Achievement achievement_list = 2;</code>
-       */
-      public emu.grasscutter.net.proto.AchievementOuterClass.Achievement.Builder addAchievementListBuilder(
-          int index) {
-        return getAchievementListFieldBuilder().addBuilder(
-            index, emu.grasscutter.net.proto.AchievementOuterClass.Achievement.getDefaultInstance());
-      }
-      /**
-       * <code>repeated .Achievement achievement_list = 2;</code>
-       */
-      public java.util.List<emu.grasscutter.net.proto.AchievementOuterClass.Achievement.Builder> 
-           getAchievementListBuilderList() {
-        return getAchievementListFieldBuilder().getBuilderList();
-      }
-      private com.google.protobuf.RepeatedFieldBuilderV3<
-          emu.grasscutter.net.proto.AchievementOuterClass.Achievement, emu.grasscutter.net.proto.AchievementOuterClass.Achievement.Builder, emu.grasscutter.net.proto.AchievementOuterClass.AchievementOrBuilder> 
-          getAchievementListFieldBuilder() {
-        if (achievementListBuilder_ == null) {
-          achievementListBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
-              emu.grasscutter.net.proto.AchievementOuterClass.Achievement, emu.grasscutter.net.proto.AchievementOuterClass.Achievement.Builder, emu.grasscutter.net.proto.AchievementOuterClass.AchievementOrBuilder>(
-                  achievementList_,
-                  ((bitField0_ & 0x00000001) != 0),
-                  getParentForChildren(),
-                  isClean());
-          achievementList_ = null;
-        }
-        return achievementListBuilder_;
-      }
-      @java.lang.Override
-      public final Builder setUnknownFields(
-          final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return super.setUnknownFields(unknownFields);
-      }
-
-      @java.lang.Override
-      public final Builder mergeUnknownFields(
-          final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return super.mergeUnknownFields(unknownFields);
-      }
-
-
-      // @@protoc_insertion_point(builder_scope:AchievementUpdateNotify)
-    }
-
-    // @@protoc_insertion_point(class_scope:AchievementUpdateNotify)
-    private static final emu.grasscutter.net.proto.AchievementUpdateNotifyOuterClass.AchievementUpdateNotify DEFAULT_INSTANCE;
-    static {
-      DEFAULT_INSTANCE = new emu.grasscutter.net.proto.AchievementUpdateNotifyOuterClass.AchievementUpdateNotify();
-    }
-
-    public static emu.grasscutter.net.proto.AchievementUpdateNotifyOuterClass.AchievementUpdateNotify getDefaultInstance() {
-      return DEFAULT_INSTANCE;
-    }
-
-    private static final com.google.protobuf.Parser<AchievementUpdateNotify>
-        PARSER = new com.google.protobuf.AbstractParser<AchievementUpdateNotify>() {
-      @java.lang.Override
-      public AchievementUpdateNotify parsePartialFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return new AchievementUpdateNotify(input, extensionRegistry);
-      }
-    };
-
-    public static com.google.protobuf.Parser<AchievementUpdateNotify> parser() {
-      return PARSER;
-    }
-
-    @java.lang.Override
-    public com.google.protobuf.Parser<AchievementUpdateNotify> getParserForType() {
-      return PARSER;
-    }
-
-    @java.lang.Override
-    public emu.grasscutter.net.proto.AchievementUpdateNotifyOuterClass.AchievementUpdateNotify getDefaultInstanceForType() {
-      return DEFAULT_INSTANCE;
-    }
-
-  }
-
-  private static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_AchievementUpdateNotify_descriptor;
-  private static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_AchievementUpdateNotify_fieldAccessorTable;
-
-  public static com.google.protobuf.Descriptors.FileDescriptor
-      getDescriptor() {
-    return descriptor;
-  }
-  private static  com.google.protobuf.Descriptors.FileDescriptor
-      descriptor;
-  static {
-    java.lang.String[] descriptorData = {
-      "\n\035AchievementUpdateNotify.proto\032\021Achieve" +
-      "ment.proto\"A\n\027AchievementUpdateNotify\022&\n" +
-      "\020achievement_list\030\002 \003(\0132\014.AchievementB\033\n" +
-      "\031emu.grasscutter.net.protob\006proto3"
-    };
-    descriptor = com.google.protobuf.Descriptors.FileDescriptor
-      .internalBuildGeneratedFileFrom(descriptorData,
-        new com.google.protobuf.Descriptors.FileDescriptor[] {
-          emu.grasscutter.net.proto.AchievementOuterClass.getDescriptor(),
-        });
-    internal_static_AchievementUpdateNotify_descriptor =
-      getDescriptor().getMessageTypes().get(0);
-    internal_static_AchievementUpdateNotify_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_AchievementUpdateNotify_descriptor,
-        new java.lang.String[] { "AchievementList", });
-    emu.grasscutter.net.proto.AchievementOuterClass.getDescriptor();
-  }
-
-  // @@protoc_insertion_point(outer_class_scope)
-}

src/generated/main/java/emu/grasscutter/net/proto/ActivityInfoNotifyOuterClass.java

@@ -35,8 +35,10 @@ public final class ActivityInfoNotifyOuterClass {
   }
   /**
    * <pre>
-   * Name: BKCOKLBOIIF
+   * CmdId: 2060
-   * CmdId: 2134
+   * EnetChannelId: 0
+   * EnetIsReliable: false
+   * IsAllowClient: true
    * </pre>
    *
    * Protobuf type {@code ActivityInfoNotify}
@@ -316,8 +318,10 @@ public final class ActivityInfoNotifyOuterClass {
     }
     /**
      * <pre>
-     * Name: BKCOKLBOIIF
+     * CmdId: 2060
-     * CmdId: 2134
+     * EnetChannelId: 0
+     * EnetIsReliable: false
+     * IsAllowClient: true
      * </pre>
      *
      * Protobuf type {@code ActivityInfoNotify}

src/generated/main/java/emu/grasscutter/net/proto/ActivityNullDetailInfoOuterClass.java

@@ -1,10 +1,10 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: AddBackupAvatarTeamReq.proto
+// source: ActivityNullDetailInfo.proto
 
 package emu.grasscutter.net.proto;
 
-public final class AddBackupAvatarTeamReqOuterClass {
+public final class ActivityNullDetailInfoOuterClass {
-  private AddBackupAvatarTeamReqOuterClass() {}
+  private ActivityNullDetailInfoOuterClass() {}
   public static void registerAllExtensions(
       com.google.protobuf.ExtensionRegistryLite registry) {
   }
@@ -14,35 +14,30 @@ public final class AddBackupAvatarTeamReqOuterClass {
     registerAllExtensions(
         (com.google.protobuf.ExtensionRegistryLite) registry);
   }
-  public interface AddBackupAvatarTeamReqOrBuilder extends
+  public interface ActivityNullDetailInfoOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:AddBackupAvatarTeamReq)
+      // @@protoc_insertion_point(interface_extends:ActivityNullDetailInfo)
       com.google.protobuf.MessageOrBuilder {
   }
   /**
-   * <pre>
+   * Protobuf type {@code ActivityNullDetailInfo}
-   * Name: DGBNGBAJBLO
-   * CmdId: 1602
-   * </pre>
-   *
-   * Protobuf type {@code AddBackupAvatarTeamReq}
    */
-  public static final class AddBackupAvatarTeamReq extends
+  public static final class ActivityNullDetailInfo extends
       com.google.protobuf.GeneratedMessageV3 implements
-      // @@protoc_insertion_point(message_implements:AddBackupAvatarTeamReq)
+      // @@protoc_insertion_point(message_implements:ActivityNullDetailInfo)
-      AddBackupAvatarTeamReqOrBuilder {
+      ActivityNullDetailInfoOrBuilder {
   private static final long serialVersionUID = 0L;
-    // Use AddBackupAvatarTeamReq.newBuilder() to construct.
+    // Use ActivityNullDetailInfo.newBuilder() to construct.
-    private AddBackupAvatarTeamReq(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
+    private ActivityNullDetailInfo(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
       super(builder);
     }
-    private AddBackupAvatarTeamReq() {
+    private ActivityNullDetailInfo() {
     }
 
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
         UnusedPrivateParameter unused) {
-      return new AddBackupAvatarTeamReq();
+      return new ActivityNullDetailInfo();
     }
 
     @java.lang.Override
@@ -50,7 +45,7 @@ public final class AddBackupAvatarTeamReqOuterClass {
     getUnknownFields() {
       return this.unknownFields;
     }
-    private AddBackupAvatarTeamReq(
+    private ActivityNullDetailInfo(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
@@ -89,15 +84,15 @@ public final class AddBackupAvatarTeamReqOuterClass {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return emu.grasscutter.net.proto.AddBackupAvatarTeamReqOuterClass.internal_static_AddBackupAvatarTeamReq_descriptor;
+      return emu.grasscutter.net.proto.ActivityNullDetailInfoOuterClass.internal_static_ActivityNullDetailInfo_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return emu.grasscutter.net.proto.AddBackupAvatarTeamReqOuterClass.internal_static_AddBackupAvatarTeamReq_fieldAccessorTable
+      return emu.grasscutter.net.proto.ActivityNullDetailInfoOuterClass.internal_static_ActivityNullDetailInfo_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              emu.grasscutter.net.proto.AddBackupAvatarTeamReqOuterClass.AddBackupAvatarTeamReq.class, emu.grasscutter.net.proto.AddBackupAvatarTeamReqOuterClass.AddBackupAvatarTeamReq.Builder.class);
+              emu.grasscutter.net.proto.ActivityNullDetailInfoOuterClass.ActivityNullDetailInfo.class, emu.grasscutter.net.proto.ActivityNullDetailInfoOuterClass.ActivityNullDetailInfo.Builder.class);
     }
 
     private byte memoizedIsInitialized = -1;
@@ -133,10 +128,10 @@ public final class AddBackupAvatarTeamReqOuterClass {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof emu.grasscutter.net.proto.AddBackupAvatarTeamReqOuterClass.AddBackupAvatarTeamReq)) {
+      if (!(obj instanceof emu.grasscutter.net.proto.ActivityNullDetailInfoOuterClass.ActivityNullDetailInfo)) {
         return super.equals(obj);
       }
-      emu.grasscutter.net.proto.AddBackupAvatarTeamReqOuterClass.AddBackupAvatarTeamReq other = (emu.grasscutter.net.proto.AddBackupAvatarTeamReqOuterClass.AddBackupAvatarTeamReq) obj;
+      emu.grasscutter.net.proto.ActivityNullDetailInfoOuterClass.ActivityNullDetailInfo other = (emu.grasscutter.net.proto.ActivityNullDetailInfoOuterClass.ActivityNullDetailInfo) obj;
 
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
@@ -154,69 +149,69 @@ public final class AddBackupAvatarTeamReqOuterClass {
       return hash;
     }
 
-    public static emu.grasscutter.net.proto.AddBackupAvatarTeamReqOuterClass.AddBackupAvatarTeamReq parseFrom(
+    public static emu.grasscutter.net.proto.ActivityNullDetailInfoOuterClass.ActivityNullDetailInfo parseFrom(
         java.nio.ByteBuffer data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static emu.grasscutter.net.proto.AddBackupAvatarTeamReqOuterClass.AddBackupAvatarTeamReq parseFrom(
+    public static emu.grasscutter.net.proto.ActivityNullDetailInfoOuterClass.ActivityNullDetailInfo parseFrom(
         java.nio.ByteBuffer data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static emu.grasscutter.net.proto.AddBackupAvatarTeamReqOuterClass.AddBackupAvatarTeamReq parseFrom(
+    public static emu.grasscutter.net.proto.ActivityNullDetailInfoOuterClass.ActivityNullDetailInfo parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static emu.grasscutter.net.proto.AddBackupAvatarTeamReqOuterClass.AddBackupAvatarTeamReq parseFrom(
+    public static emu.grasscutter.net.proto.ActivityNullDetailInfoOuterClass.ActivityNullDetailInfo parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static emu.grasscutter.net.proto.AddBackupAvatarTeamReqOuterClass.AddBackupAvatarTeamReq parseFrom(byte[] data)
+    public static emu.grasscutter.net.proto.ActivityNullDetailInfoOuterClass.ActivityNullDetailInfo parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static emu.grasscutter.net.proto.AddBackupAvatarTeamReqOuterClass.AddBackupAvatarTeamReq parseFrom(
+    public static emu.grasscutter.net.proto.ActivityNullDetailInfoOuterClass.ActivityNullDetailInfo parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static emu.grasscutter.net.proto.AddBackupAvatarTeamReqOuterClass.AddBackupAvatarTeamReq parseFrom(java.io.InputStream input)
+    public static emu.grasscutter.net.proto.ActivityNullDetailInfoOuterClass.ActivityNullDetailInfo parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static emu.grasscutter.net.proto.AddBackupAvatarTeamReqOuterClass.AddBackupAvatarTeamReq parseFrom(
+    public static emu.grasscutter.net.proto.ActivityNullDetailInfoOuterClass.ActivityNullDetailInfo parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static emu.grasscutter.net.proto.AddBackupAvatarTeamReqOuterClass.AddBackupAvatarTeamReq parseDelimitedFrom(java.io.InputStream input)
+    public static emu.grasscutter.net.proto.ActivityNullDetailInfoOuterClass.ActivityNullDetailInfo parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static emu.grasscutter.net.proto.AddBackupAvatarTeamReqOuterClass.AddBackupAvatarTeamReq parseDelimitedFrom(
+    public static emu.grasscutter.net.proto.ActivityNullDetailInfoOuterClass.ActivityNullDetailInfo parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static emu.grasscutter.net.proto.AddBackupAvatarTeamReqOuterClass.AddBackupAvatarTeamReq parseFrom(
+    public static emu.grasscutter.net.proto.ActivityNullDetailInfoOuterClass.ActivityNullDetailInfo parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static emu.grasscutter.net.proto.AddBackupAvatarTeamReqOuterClass.AddBackupAvatarTeamReq parseFrom(
+    public static emu.grasscutter.net.proto.ActivityNullDetailInfoOuterClass.ActivityNullDetailInfo parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -229,7 +224,7 @@ public final class AddBackupAvatarTeamReqOuterClass {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(emu.grasscutter.net.proto.AddBackupAvatarTeamReqOuterClass.AddBackupAvatarTeamReq prototype) {
+    public static Builder newBuilder(emu.grasscutter.net.proto.ActivityNullDetailInfoOuterClass.ActivityNullDetailInfo prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -245,31 +240,26 @@ public final class AddBackupAvatarTeamReqOuterClass {
       return builder;
     }
     /**
-     * <pre>
+     * Protobuf type {@code ActivityNullDetailInfo}
-     * Name: DGBNGBAJBLO
-     * CmdId: 1602
-     * </pre>
-     *
-     * Protobuf type {@code AddBackupAvatarTeamReq}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
-        // @@protoc_insertion_point(builder_implements:AddBackupAvatarTeamReq)
+        // @@protoc_insertion_point(builder_implements:ActivityNullDetailInfo)
-        emu.grasscutter.net.proto.AddBackupAvatarTeamReqOuterClass.AddBackupAvatarTeamReqOrBuilder {
+        emu.grasscutter.net.proto.ActivityNullDetailInfoOuterClass.ActivityNullDetailInfoOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return emu.grasscutter.net.proto.AddBackupAvatarTeamReqOuterClass.internal_static_AddBackupAvatarTeamReq_descriptor;
+        return emu.grasscutter.net.proto.ActivityNullDetailInfoOuterClass.internal_static_ActivityNullDetailInfo_descriptor;
       }
 
       @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return emu.grasscutter.net.proto.AddBackupAvatarTeamReqOuterClass.internal_static_AddBackupAvatarTeamReq_fieldAccessorTable
+        return emu.grasscutter.net.proto.ActivityNullDetailInfoOuterClass.internal_static_ActivityNullDetailInfo_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                emu.grasscutter.net.proto.AddBackupAvatarTeamReqOuterClass.AddBackupAvatarTeamReq.class, emu.grasscutter.net.proto.AddBackupAvatarTeamReqOuterClass.AddBackupAvatarTeamReq.Builder.class);
+                emu.grasscutter.net.proto.ActivityNullDetailInfoOuterClass.ActivityNullDetailInfo.class, emu.grasscutter.net.proto.ActivityNullDetailInfoOuterClass.ActivityNullDetailInfo.Builder.class);
       }
 
-      // Construct using emu.grasscutter.net.proto.AddBackupAvatarTeamReqOuterClass.AddBackupAvatarTeamReq.newBuilder()
+      // Construct using emu.grasscutter.net.proto.ActivityNullDetailInfoOuterClass.ActivityNullDetailInfo.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -293,17 +283,17 @@ public final class AddBackupAvatarTeamReqOuterClass {
       @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return emu.grasscutter.net.proto.AddBackupAvatarTeamReqOuterClass.internal_static_AddBackupAvatarTeamReq_descriptor;
+        return emu.grasscutter.net.proto.ActivityNullDetailInfoOuterClass.internal_static_ActivityNullDetailInfo_descriptor;
       }
 
       @java.lang.Override
-      public emu.grasscutter.net.proto.AddBackupAvatarTeamReqOuterClass.AddBackupAvatarTeamReq getDefaultInstanceForType() {
+      public emu.grasscutter.net.proto.ActivityNullDetailInfoOuterClass.ActivityNullDetailInfo getDefaultInstanceForType() {
-        return emu.grasscutter.net.proto.AddBackupAvatarTeamReqOuterClass.AddBackupAvatarTeamReq.getDefaultInstance();
+        return emu.grasscutter.net.proto.ActivityNullDetailInfoOuterClass.ActivityNullDetailInfo.getDefaultInstance();
       }
 
       @java.lang.Override
-      public emu.grasscutter.net.proto.AddBackupAvatarTeamReqOuterClass.AddBackupAvatarTeamReq build() {
+      public emu.grasscutter.net.proto.ActivityNullDetailInfoOuterClass.ActivityNullDetailInfo build() {
-        emu.grasscutter.net.proto.AddBackupAvatarTeamReqOuterClass.AddBackupAvatarTeamReq result = buildPartial();
+        emu.grasscutter.net.proto.ActivityNullDetailInfoOuterClass.ActivityNullDetailInfo result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -311,8 +301,8 @@ public final class AddBackupAvatarTeamReqOuterClass {
       }
 
       @java.lang.Override
-      public emu.grasscutter.net.proto.AddBackupAvatarTeamReqOuterClass.AddBackupAvatarTeamReq buildPartial() {
+      public emu.grasscutter.net.proto.ActivityNullDetailInfoOuterClass.ActivityNullDetailInfo buildPartial() {
-        emu.grasscutter.net.proto.AddBackupAvatarTeamReqOuterClass.AddBackupAvatarTeamReq result = new emu.grasscutter.net.proto.AddBackupAvatarTeamReqOuterClass.AddBackupAvatarTeamReq(this);
+        emu.grasscutter.net.proto.ActivityNullDetailInfoOuterClass.ActivityNullDetailInfo result = new emu.grasscutter.net.proto.ActivityNullDetailInfoOuterClass.ActivityNullDetailInfo(this);
         onBuilt();
         return result;
       }
@@ -351,16 +341,16 @@ public final class AddBackupAvatarTeamReqOuterClass {
       }
       @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof emu.grasscutter.net.proto.AddBackupAvatarTeamReqOuterClass.AddBackupAvatarTeamReq) {
+        if (other instanceof emu.grasscutter.net.proto.ActivityNullDetailInfoOuterClass.ActivityNullDetailInfo) {
-          return mergeFrom((emu.grasscutter.net.proto.AddBackupAvatarTeamReqOuterClass.AddBackupAvatarTeamReq)other);
+          return mergeFrom((emu.grasscutter.net.proto.ActivityNullDetailInfoOuterClass.ActivityNullDetailInfo)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(emu.grasscutter.net.proto.AddBackupAvatarTeamReqOuterClass.AddBackupAvatarTeamReq other) {
+      public Builder mergeFrom(emu.grasscutter.net.proto.ActivityNullDetailInfoOuterClass.ActivityNullDetailInfo other) {
-        if (other == emu.grasscutter.net.proto.AddBackupAvatarTeamReqOuterClass.AddBackupAvatarTeamReq.getDefaultInstance()) return this;
+        if (other == emu.grasscutter.net.proto.ActivityNullDetailInfoOuterClass.ActivityNullDetailInfo.getDefaultInstance()) return this;
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -376,11 +366,11 @@ public final class AddBackupAvatarTeamReqOuterClass {
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        emu.grasscutter.net.proto.AddBackupAvatarTeamReqOuterClass.AddBackupAvatarTeamReq parsedMessage = null;
+        emu.grasscutter.net.proto.ActivityNullDetailInfoOuterClass.ActivityNullDetailInfo parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (emu.grasscutter.net.proto.AddBackupAvatarTeamReqOuterClass.AddBackupAvatarTeamReq) e.getUnfinishedMessage();
+          parsedMessage = (emu.grasscutter.net.proto.ActivityNullDetailInfoOuterClass.ActivityNullDetailInfo) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -402,51 +392,51 @@ public final class AddBackupAvatarTeamReqOuterClass {
       }
 
 
-      // @@protoc_insertion_point(builder_scope:AddBackupAvatarTeamReq)
+      // @@protoc_insertion_point(builder_scope:ActivityNullDetailInfo)
     }
 
-    // @@protoc_insertion_point(class_scope:AddBackupAvatarTeamReq)
+    // @@protoc_insertion_point(class_scope:ActivityNullDetailInfo)
-    private static final emu.grasscutter.net.proto.AddBackupAvatarTeamReqOuterClass.AddBackupAvatarTeamReq DEFAULT_INSTANCE;
+    private static final emu.grasscutter.net.proto.ActivityNullDetailInfoOuterClass.ActivityNullDetailInfo DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new emu.grasscutter.net.proto.AddBackupAvatarTeamReqOuterClass.AddBackupAvatarTeamReq();
+      DEFAULT_INSTANCE = new emu.grasscutter.net.proto.ActivityNullDetailInfoOuterClass.ActivityNullDetailInfo();
     }
 
-    public static emu.grasscutter.net.proto.AddBackupAvatarTeamReqOuterClass.AddBackupAvatarTeamReq getDefaultInstance() {
+    public static emu.grasscutter.net.proto.ActivityNullDetailInfoOuterClass.ActivityNullDetailInfo getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    private static final com.google.protobuf.Parser<AddBackupAvatarTeamReq>
+    private static final com.google.protobuf.Parser<ActivityNullDetailInfo>
-        PARSER = new com.google.protobuf.AbstractParser<AddBackupAvatarTeamReq>() {
+        PARSER = new com.google.protobuf.AbstractParser<ActivityNullDetailInfo>() {
       @java.lang.Override
-      public AddBackupAvatarTeamReq parsePartialFrom(
+      public ActivityNullDetailInfo parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new AddBackupAvatarTeamReq(input, extensionRegistry);
+        return new ActivityNullDetailInfo(input, extensionRegistry);
       }
     };
 
-    public static com.google.protobuf.Parser<AddBackupAvatarTeamReq> parser() {
+    public static com.google.protobuf.Parser<ActivityNullDetailInfo> parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public com.google.protobuf.Parser<AddBackupAvatarTeamReq> getParserForType() {
+    public com.google.protobuf.Parser<ActivityNullDetailInfo> getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public emu.grasscutter.net.proto.AddBackupAvatarTeamReqOuterClass.AddBackupAvatarTeamReq getDefaultInstanceForType() {
+    public emu.grasscutter.net.proto.ActivityNullDetailInfoOuterClass.ActivityNullDetailInfo getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
   }
 
   private static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_AddBackupAvatarTeamReq_descriptor;
+    internal_static_ActivityNullDetailInfo_descriptor;
   private static final 
     com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_AddBackupAvatarTeamReq_fieldAccessorTable;
+      internal_static_ActivityNullDetailInfo_fieldAccessorTable;
 
   public static com.google.protobuf.Descriptors.FileDescriptor
       getDescriptor() {
@@ -456,19 +446,19 @@ public final class AddBackupAvatarTeamReqOuterClass {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\034AddBackupAvatarTeamReq.proto\"\030\n\026AddBac" +
+      "\n\034ActivityNullDetailInfo.proto\"\030\n\026Activi" +
-      "kupAvatarTeamReqB\033\n\031emu.grasscutter.net." +
+      "tyNullDetailInfoB\033\n\031emu.grasscutter.net." +
       "protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
         new com.google.protobuf.Descriptors.FileDescriptor[] {
         });
-    internal_static_AddBackupAvatarTeamReq_descriptor =
+    internal_static_ActivityNullDetailInfo_descriptor =
       getDescriptor().getMessageTypes().get(0);
-    internal_static_AddBackupAvatarTeamReq_fieldAccessorTable = new
+    internal_static_ActivityNullDetailInfo_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_AddBackupAvatarTeamReq_descriptor,
+        internal_static_ActivityNullDetailInfo_descriptor,
         new java.lang.String[] { });
   }
 

src/generated/main/java/emu/grasscutter/net/proto/ActivityPushTipsStateOuterClass.java

@@ -1,160 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: ActivityPushTipsState.proto
-
-package emu.grasscutter.net.proto;
-
-public final class ActivityPushTipsStateOuterClass {
-  private ActivityPushTipsStateOuterClass() {}
-  public static void registerAllExtensions(
-      com.google.protobuf.ExtensionRegistryLite registry) {
-  }
-
-  public static void registerAllExtensions(
-      com.google.protobuf.ExtensionRegistry registry) {
-    registerAllExtensions(
-        (com.google.protobuf.ExtensionRegistryLite) registry);
-  }
-  /**
-   * <pre>
-   * Name: POKOFBAJMFO
-   * </pre>
-   *
-   * Protobuf enum {@code ActivityPushTipsState}
-   */
-  public enum ActivityPushTipsState
-      implements com.google.protobuf.ProtocolMessageEnum {
-    /**
-     * <code>ACTIVITY_PUSH_TIPS_STATE_NONE = 0;</code>
-     */
-    ACTIVITY_PUSH_TIPS_STATE_NONE(0),
-    /**
-     * <code>ACTIVITY_PUSH_TIPS_STATE_START = 1;</code>
-     */
-    ACTIVITY_PUSH_TIPS_STATE_START(1),
-    /**
-     * <code>ACTIVITY_PUSH_TIPS_STATE_READ = 2;</code>
-     */
-    ACTIVITY_PUSH_TIPS_STATE_READ(2),
-    UNRECOGNIZED(-1),
-    ;
-
-    /**
-     * <code>ACTIVITY_PUSH_TIPS_STATE_NONE = 0;</code>
-     */
-    public static final int ACTIVITY_PUSH_TIPS_STATE_NONE_VALUE = 0;
-    /**
-     * <code>ACTIVITY_PUSH_TIPS_STATE_START = 1;</code>
-     */
-    public static final int ACTIVITY_PUSH_TIPS_STATE_START_VALUE = 1;
-    /**
-     * <code>ACTIVITY_PUSH_TIPS_STATE_READ = 2;</code>
-     */
-    public static final int ACTIVITY_PUSH_TIPS_STATE_READ_VALUE = 2;
-
-
-    public final int getNumber() {
-      if (this == UNRECOGNIZED) {
-        throw new java.lang.IllegalArgumentException(
-            "Can't get the number of an unknown enum value.");
-      }
-      return value;
-    }
-
-    /**
-     * @param value The numeric wire value of the corresponding enum entry.
-     * @return The enum associated with the given numeric wire value.
-     * @deprecated Use {@link #forNumber(int)} instead.
-     */
-    @java.lang.Deprecated
-    public static ActivityPushTipsState valueOf(int value) {
-      return forNumber(value);
-    }
-
-    /**
-     * @param value The numeric wire value of the corresponding enum entry.
-     * @return The enum associated with the given numeric wire value.
-     */
-    public static ActivityPushTipsState forNumber(int value) {
-      switch (value) {
-        case 0: return ACTIVITY_PUSH_TIPS_STATE_NONE;
-        case 1: return ACTIVITY_PUSH_TIPS_STATE_START;
-        case 2: return ACTIVITY_PUSH_TIPS_STATE_READ;
-        default: return null;
-      }
-    }
-
-    public static com.google.protobuf.Internal.EnumLiteMap<ActivityPushTipsState>
-        internalGetValueMap() {
-      return internalValueMap;
-    }
-    private static final com.google.protobuf.Internal.EnumLiteMap<
-        ActivityPushTipsState> internalValueMap =
-          new com.google.protobuf.Internal.EnumLiteMap<ActivityPushTipsState>() {
-            public ActivityPushTipsState findValueByNumber(int number) {
-              return ActivityPushTipsState.forNumber(number);
-            }
-          };
-
-    public final com.google.protobuf.Descriptors.EnumValueDescriptor
-        getValueDescriptor() {
-      if (this == UNRECOGNIZED) {
-        throw new java.lang.IllegalStateException(
-            "Can't get the descriptor of an unrecognized enum value.");
-      }
-      return getDescriptor().getValues().get(ordinal());
-    }
-    public final com.google.protobuf.Descriptors.EnumDescriptor
-        getDescriptorForType() {
-      return getDescriptor();
-    }
-    public static final com.google.protobuf.Descriptors.EnumDescriptor
-        getDescriptor() {
-      return emu.grasscutter.net.proto.ActivityPushTipsStateOuterClass.getDescriptor().getEnumTypes().get(0);
-    }
-
-    private static final ActivityPushTipsState[] VALUES = values();
-
-    public static ActivityPushTipsState valueOf(
-        com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
-      if (desc.getType() != getDescriptor()) {
-        throw new java.lang.IllegalArgumentException(
-          "EnumValueDescriptor is not for this type.");
-      }
-      if (desc.getIndex() == -1) {
-        return UNRECOGNIZED;
-      }
-      return VALUES[desc.getIndex()];
-    }
-
-    private final int value;
-
-    private ActivityPushTipsState(int value) {
-      this.value = value;
-    }
-
-    // @@protoc_insertion_point(enum_scope:ActivityPushTipsState)
-  }
-
-
-  public static com.google.protobuf.Descriptors.FileDescriptor
-      getDescriptor() {
-    return descriptor;
-  }
-  private static  com.google.protobuf.Descriptors.FileDescriptor
-      descriptor;
-  static {
-    java.lang.String[] descriptorData = {
-      "\n\033ActivityPushTipsState.proto*\201\001\n\025Activi" +
-      "tyPushTipsState\022!\n\035ACTIVITY_PUSH_TIPS_ST" +
-      "ATE_NONE\020\000\022\"\n\036ACTIVITY_PUSH_TIPS_STATE_S" +
-      "TART\020\001\022!\n\035ACTIVITY_PUSH_TIPS_STATE_READ\020" +
-      "\002B\033\n\031emu.grasscutter.net.protob\006proto3"
-    };
-    descriptor = com.google.protobuf.Descriptors.FileDescriptor
-      .internalBuildGeneratedFileFrom(descriptorData,
-        new com.google.protobuf.Descriptors.FileDescriptor[] {
-        });
-  }
-
-  // @@protoc_insertion_point(outer_class_scope)
-}

src/generated/main/java/emu/grasscutter/net/proto/ActivityScheduleInfoNotifyOuterClass.java

@@ -19,39 +19,41 @@ public final class ActivityScheduleInfoNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 remain_fly_sea_lamp_num = 12;</code>
+     * <code>repeated .ActivityScheduleInfo activity_schedule_list = 12;</code>
-     * @return The remainFlySeaLampNum.
-     */
-    int getRemainFlySeaLampNum();
-
-    /**
-     * <code>repeated .ActivityScheduleInfo activity_schedule_list = 11;</code>
      */
     java.util.List<emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo> 
         getActivityScheduleListList();
     /**
-     * <code>repeated .ActivityScheduleInfo activity_schedule_list = 11;</code>
+     * <code>repeated .ActivityScheduleInfo activity_schedule_list = 12;</code>
      */
     emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo getActivityScheduleList(int index);
     /**
-     * <code>repeated .ActivityScheduleInfo activity_schedule_list = 11;</code>
+     * <code>repeated .ActivityScheduleInfo activity_schedule_list = 12;</code>
      */
     int getActivityScheduleListCount();
     /**
-     * <code>repeated .ActivityScheduleInfo activity_schedule_list = 11;</code>
+     * <code>repeated .ActivityScheduleInfo activity_schedule_list = 12;</code>
      */
     java.util.List<? extends emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfoOrBuilder> 
         getActivityScheduleListOrBuilderList();
     /**
-     * <code>repeated .ActivityScheduleInfo activity_schedule_list = 11;</code>
+     * <code>repeated .ActivityScheduleInfo activity_schedule_list = 12;</code>
      */
     emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfoOrBuilder getActivityScheduleListOrBuilder(
         int index);
+
+    /**
+     * <code>uint32 remain_fly_sea_lamp_num = 6;</code>
+     * @return The remainFlySeaLampNum.
+     */
+    int getRemainFlySeaLampNum();
   }
   /**
    * <pre>
-   * Name: KEDKIAAFGKO
+   * CmdId: 2073
-   * CmdId: 2068
+   * EnetChannelId: 0
+   * EnetIsReliable: false
+   * IsAllowClient: true
    * </pre>
    *
    * Protobuf type {@code ActivityScheduleInfoNotify}
@@ -100,7 +102,12 @@ public final class ActivityScheduleInfoNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 90: {
+            case 48: {
+
+              remainFlySeaLampNum_ = input.readUInt32();
+              break;
+            }
+            case 98: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 activityScheduleList_ = new java.util.ArrayList<emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo>();
                 mutable_bitField0_ |= 0x00000001;
@@ -109,11 +116,6 @@ public final class ActivityScheduleInfoNotifyOuterClass {
                   input.readMessage(emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo.parser(), extensionRegistry));
               break;
             }
-            case 96: {
-
-              remainFlySeaLampNum_ = input.readUInt32();
-              break;
-            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -149,28 +151,17 @@ public final class ActivityScheduleInfoNotifyOuterClass {
               emu.grasscutter.net.proto.ActivityScheduleInfoNotifyOuterClass.ActivityScheduleInfoNotify.class, emu.grasscutter.net.proto.ActivityScheduleInfoNotifyOuterClass.ActivityScheduleInfoNotify.Builder.class);
     }
 
-    public static final int REMAIN_FLY_SEA_LAMP_NUM_FIELD_NUMBER = 12;
+    public static final int ACTIVITY_SCHEDULE_LIST_FIELD_NUMBER = 12;
-    private int remainFlySeaLampNum_;
-    /**
-     * <code>uint32 remain_fly_sea_lamp_num = 12;</code>
-     * @return The remainFlySeaLampNum.
-     */
-    @java.lang.Override
-    public int getRemainFlySeaLampNum() {
-      return remainFlySeaLampNum_;
-    }
-
-    public static final int ACTIVITY_SCHEDULE_LIST_FIELD_NUMBER = 11;
     private java.util.List<emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo> activityScheduleList_;
     /**
-     * <code>repeated .ActivityScheduleInfo activity_schedule_list = 11;</code>
+     * <code>repeated .ActivityScheduleInfo activity_schedule_list = 12;</code>
      */
     @java.lang.Override
     public java.util.List<emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo> getActivityScheduleListList() {
       return activityScheduleList_;
     }
     /**
-     * <code>repeated .ActivityScheduleInfo activity_schedule_list = 11;</code>
+     * <code>repeated .ActivityScheduleInfo activity_schedule_list = 12;</code>
      */
     @java.lang.Override
     public java.util.List<? extends emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfoOrBuilder> 
@@ -178,21 +169,21 @@ public final class ActivityScheduleInfoNotifyOuterClass {
       return activityScheduleList_;
     }
     /**
-     * <code>repeated .ActivityScheduleInfo activity_schedule_list = 11;</code>
+     * <code>repeated .ActivityScheduleInfo activity_schedule_list = 12;</code>
      */
     @java.lang.Override
     public int getActivityScheduleListCount() {
       return activityScheduleList_.size();
     }
     /**
-     * <code>repeated .ActivityScheduleInfo activity_schedule_list = 11;</code>
+     * <code>repeated .ActivityScheduleInfo activity_schedule_list = 12;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo getActivityScheduleList(int index) {
       return activityScheduleList_.get(index);
     }
     /**
-     * <code>repeated .ActivityScheduleInfo activity_schedule_list = 11;</code>
+     * <code>repeated .ActivityScheduleInfo activity_schedule_list = 12;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfoOrBuilder getActivityScheduleListOrBuilder(
@@ -200,6 +191,17 @@ public final class ActivityScheduleInfoNotifyOuterClass {
       return activityScheduleList_.get(index);
     }
 
+    public static final int REMAIN_FLY_SEA_LAMP_NUM_FIELD_NUMBER = 6;
+    private int remainFlySeaLampNum_;
+    /**
+     * <code>uint32 remain_fly_sea_lamp_num = 6;</code>
+     * @return The remainFlySeaLampNum.
+     */
+    @java.lang.Override
+    public int getRemainFlySeaLampNum() {
+      return remainFlySeaLampNum_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -214,11 +216,11 @@ public final class ActivityScheduleInfoNotifyOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      for (int i = 0; i < activityScheduleList_.size(); i++) {
-        output.writeMessage(11, activityScheduleList_.get(i));
-      }
       if (remainFlySeaLampNum_ != 0) {
-        output.writeUInt32(12, remainFlySeaLampNum_);
+        output.writeUInt32(6, remainFlySeaLampNum_);
+      }
+      for (int i = 0; i < activityScheduleList_.size(); i++) {
+        output.writeMessage(12, activityScheduleList_.get(i));
       }
       unknownFields.writeTo(output);
     }
@@ -229,13 +231,13 @@ public final class ActivityScheduleInfoNotifyOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      for (int i = 0; i < activityScheduleList_.size(); i++) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(11, activityScheduleList_.get(i));
-      }
       if (remainFlySeaLampNum_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(12, remainFlySeaLampNum_);
+          .computeUInt32Size(6, remainFlySeaLampNum_);
+      }
+      for (int i = 0; i < activityScheduleList_.size(); i++) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(12, activityScheduleList_.get(i));
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -252,10 +254,10 @@ public final class ActivityScheduleInfoNotifyOuterClass {
       }
       emu.grasscutter.net.proto.ActivityScheduleInfoNotifyOuterClass.ActivityScheduleInfoNotify other = (emu.grasscutter.net.proto.ActivityScheduleInfoNotifyOuterClass.ActivityScheduleInfoNotify) obj;
 
-      if (getRemainFlySeaLampNum()
-          != other.getRemainFlySeaLampNum()) return false;
       if (!getActivityScheduleListList()
           .equals(other.getActivityScheduleListList())) return false;
+      if (getRemainFlySeaLampNum()
+          != other.getRemainFlySeaLampNum()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -267,12 +269,12 @@ public final class ActivityScheduleInfoNotifyOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + REMAIN_FLY_SEA_LAMP_NUM_FIELD_NUMBER;
-      hash = (53 * hash) + getRemainFlySeaLampNum();
       if (getActivityScheduleListCount() > 0) {
         hash = (37 * hash) + ACTIVITY_SCHEDULE_LIST_FIELD_NUMBER;
         hash = (53 * hash) + getActivityScheduleListList().hashCode();
       }
+      hash = (37 * hash) + REMAIN_FLY_SEA_LAMP_NUM_FIELD_NUMBER;
+      hash = (53 * hash) + getRemainFlySeaLampNum();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -370,8 +372,10 @@ public final class ActivityScheduleInfoNotifyOuterClass {
     }
     /**
      * <pre>
-     * Name: KEDKIAAFGKO
+     * CmdId: 2073
-     * CmdId: 2068
+     * EnetChannelId: 0
+     * EnetIsReliable: false
+     * IsAllowClient: true
      * </pre>
      *
      * Protobuf type {@code ActivityScheduleInfoNotify}
@@ -412,14 +416,14 @@ public final class ActivityScheduleInfoNotifyOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        remainFlySeaLampNum_ = 0;
-
         if (activityScheduleListBuilder_ == null) {
           activityScheduleList_ = java.util.Collections.emptyList();
           bitField0_ = (bitField0_ & ~0x00000001);
         } else {
           activityScheduleListBuilder_.clear();
         }
+        remainFlySeaLampNum_ = 0;
+
         return this;
       }
 
@@ -447,7 +451,6 @@ public final class ActivityScheduleInfoNotifyOuterClass {
       public emu.grasscutter.net.proto.ActivityScheduleInfoNotifyOuterClass.ActivityScheduleInfoNotify buildPartial() {
         emu.grasscutter.net.proto.ActivityScheduleInfoNotifyOuterClass.ActivityScheduleInfoNotify result = new emu.grasscutter.net.proto.ActivityScheduleInfoNotifyOuterClass.ActivityScheduleInfoNotify(this);
         int from_bitField0_ = bitField0_;
-        result.remainFlySeaLampNum_ = remainFlySeaLampNum_;
         if (activityScheduleListBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0)) {
             activityScheduleList_ = java.util.Collections.unmodifiableList(activityScheduleList_);
@@ -457,6 +460,7 @@ public final class ActivityScheduleInfoNotifyOuterClass {
         } else {
           result.activityScheduleList_ = activityScheduleListBuilder_.build();
         }
+        result.remainFlySeaLampNum_ = remainFlySeaLampNum_;
         onBuilt();
         return result;
       }
@@ -505,9 +509,6 @@ public final class ActivityScheduleInfoNotifyOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.ActivityScheduleInfoNotifyOuterClass.ActivityScheduleInfoNotify other) {
         if (other == emu.grasscutter.net.proto.ActivityScheduleInfoNotifyOuterClass.ActivityScheduleInfoNotify.getDefaultInstance()) return this;
-        if (other.getRemainFlySeaLampNum() != 0) {
-          setRemainFlySeaLampNum(other.getRemainFlySeaLampNum());
-        }
         if (activityScheduleListBuilder_ == null) {
           if (!other.activityScheduleList_.isEmpty()) {
             if (activityScheduleList_.isEmpty()) {
@@ -534,6 +535,9 @@ public final class ActivityScheduleInfoNotifyOuterClass {
             }
           }
         }
+        if (other.getRemainFlySeaLampNum() != 0) {
+          setRemainFlySeaLampNum(other.getRemainFlySeaLampNum());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -564,37 +568,6 @@ public final class ActivityScheduleInfoNotifyOuterClass {
       }
       private int bitField0_;
 
-      private int remainFlySeaLampNum_ ;
-      /**
-       * <code>uint32 remain_fly_sea_lamp_num = 12;</code>
-       * @return The remainFlySeaLampNum.
-       */
-      @java.lang.Override
-      public int getRemainFlySeaLampNum() {
-        return remainFlySeaLampNum_;
-      }
-      /**
-       * <code>uint32 remain_fly_sea_lamp_num = 12;</code>
-       * @param value The remainFlySeaLampNum to set.
-       * @return This builder for chaining.
-       */
-      public Builder setRemainFlySeaLampNum(int value) {
-        
-        remainFlySeaLampNum_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 remain_fly_sea_lamp_num = 12;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearRemainFlySeaLampNum() {
-        
-        remainFlySeaLampNum_ = 0;
-        onChanged();
-        return this;
-      }
-
       private java.util.List<emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo> activityScheduleList_ =
         java.util.Collections.emptyList();
       private void ensureActivityScheduleListIsMutable() {
@@ -608,7 +581,7 @@ public final class ActivityScheduleInfoNotifyOuterClass {
           emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo, emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo.Builder, emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfoOrBuilder> activityScheduleListBuilder_;
 
       /**
-       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 11;</code>
+       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 12;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo> getActivityScheduleListList() {
         if (activityScheduleListBuilder_ == null) {
@@ -618,7 +591,7 @@ public final class ActivityScheduleInfoNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 11;</code>
+       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 12;</code>
        */
       public int getActivityScheduleListCount() {
         if (activityScheduleListBuilder_ == null) {
@@ -628,7 +601,7 @@ public final class ActivityScheduleInfoNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 11;</code>
+       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 12;</code>
        */
       public emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo getActivityScheduleList(int index) {
         if (activityScheduleListBuilder_ == null) {
@@ -638,7 +611,7 @@ public final class ActivityScheduleInfoNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 11;</code>
+       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 12;</code>
        */
       public Builder setActivityScheduleList(
           int index, emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo value) {
@@ -655,7 +628,7 @@ public final class ActivityScheduleInfoNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 11;</code>
+       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 12;</code>
        */
       public Builder setActivityScheduleList(
           int index, emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo.Builder builderForValue) {
@@ -669,7 +642,7 @@ public final class ActivityScheduleInfoNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 11;</code>
+       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 12;</code>
        */
       public Builder addActivityScheduleList(emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo value) {
         if (activityScheduleListBuilder_ == null) {
@@ -685,7 +658,7 @@ public final class ActivityScheduleInfoNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 11;</code>
+       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 12;</code>
        */
       public Builder addActivityScheduleList(
           int index, emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo value) {
@@ -702,7 +675,7 @@ public final class ActivityScheduleInfoNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 11;</code>
+       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 12;</code>
        */
       public Builder addActivityScheduleList(
           emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo.Builder builderForValue) {
@@ -716,7 +689,7 @@ public final class ActivityScheduleInfoNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 11;</code>
+       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 12;</code>
        */
       public Builder addActivityScheduleList(
           int index, emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo.Builder builderForValue) {
@@ -730,7 +703,7 @@ public final class ActivityScheduleInfoNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 11;</code>
+       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 12;</code>
        */
       public Builder addAllActivityScheduleList(
           java.lang.Iterable<? extends emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo> values) {
@@ -745,7 +718,7 @@ public final class ActivityScheduleInfoNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 11;</code>
+       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 12;</code>
        */
       public Builder clearActivityScheduleList() {
         if (activityScheduleListBuilder_ == null) {
@@ -758,7 +731,7 @@ public final class ActivityScheduleInfoNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 11;</code>
+       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 12;</code>
        */
       public Builder removeActivityScheduleList(int index) {
         if (activityScheduleListBuilder_ == null) {
@@ -771,14 +744,14 @@ public final class ActivityScheduleInfoNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 11;</code>
+       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 12;</code>
        */
       public emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo.Builder getActivityScheduleListBuilder(
           int index) {
         return getActivityScheduleListFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 11;</code>
+       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 12;</code>
        */
       public emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfoOrBuilder getActivityScheduleListOrBuilder(
           int index) {
@@ -788,7 +761,7 @@ public final class ActivityScheduleInfoNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 11;</code>
+       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 12;</code>
        */
       public java.util.List<? extends emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfoOrBuilder> 
            getActivityScheduleListOrBuilderList() {
@@ -799,14 +772,14 @@ public final class ActivityScheduleInfoNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 11;</code>
+       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 12;</code>
        */
       public emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo.Builder addActivityScheduleListBuilder() {
         return getActivityScheduleListFieldBuilder().addBuilder(
             emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo.getDefaultInstance());
       }
       /**
-       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 11;</code>
+       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 12;</code>
        */
       public emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo.Builder addActivityScheduleListBuilder(
           int index) {
@@ -814,7 +787,7 @@ public final class ActivityScheduleInfoNotifyOuterClass {
             index, emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo.getDefaultInstance());
       }
       /**
-       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 11;</code>
+       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 12;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo.Builder> 
            getActivityScheduleListBuilderList() {
@@ -834,6 +807,37 @@ public final class ActivityScheduleInfoNotifyOuterClass {
         }
         return activityScheduleListBuilder_;
       }
+
+      private int remainFlySeaLampNum_ ;
+      /**
+       * <code>uint32 remain_fly_sea_lamp_num = 6;</code>
+       * @return The remainFlySeaLampNum.
+       */
+      @java.lang.Override
+      public int getRemainFlySeaLampNum() {
+        return remainFlySeaLampNum_;
+      }
+      /**
+       * <code>uint32 remain_fly_sea_lamp_num = 6;</code>
+       * @param value The remainFlySeaLampNum to set.
+       * @return This builder for chaining.
+       */
+      public Builder setRemainFlySeaLampNum(int value) {
+        
+        remainFlySeaLampNum_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 remain_fly_sea_lamp_num = 6;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearRemainFlySeaLampNum() {
+        
+        remainFlySeaLampNum_ = 0;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -903,9 +907,9 @@ public final class ActivityScheduleInfoNotifyOuterClass {
     java.lang.String[] descriptorData = {
       "\n ActivityScheduleInfoNotify.proto\032\032Acti" +
       "vityScheduleInfo.proto\"t\n\032ActivitySchedu" +
-      "leInfoNotify\022\037\n\027remain_fly_sea_lamp_num\030" +
+      "leInfoNotify\0225\n\026activity_schedule_list\030\014" +
-      "\014 \001(\r\0225\n\026activity_schedule_list\030\013 \003(\0132\025." +
+      " \003(\0132\025.ActivityScheduleInfo\022\037\n\027remain_fl" +
-      "ActivityScheduleInfoB\033\n\031emu.grasscutter." +
+      "y_sea_lamp_num\030\006 \001(\rB\033\n\031emu.grasscutter." +
       "net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -918,7 +922,7 @@ public final class ActivityScheduleInfoNotifyOuterClass {
     internal_static_ActivityScheduleInfoNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_ActivityScheduleInfoNotify_descriptor,
-        new java.lang.String[] { "RemainFlySeaLampNum", "ActivityScheduleList", });
+        new java.lang.String[] { "ActivityScheduleList", "RemainFlySeaLampNum", });
     emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.getDescriptor();
   }
 

src/generated/main/java/emu/grasscutter/net/proto/ActivityScheduleInfoOuterClass.java

@@ -19,40 +19,36 @@ public final class ActivityScheduleInfoOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 schedule_id = 8;</code>
+     * <code>uint32 schedule_id = 13;</code>
      * @return The scheduleId.
      */
     int getScheduleId();
 
     /**
-     * <code>bool is_open = 1;</code>
+     * <code>bool is_open = 2;</code>
      * @return The isOpen.
      */
     boolean getIsOpen();
 
-    /**
-     * <code>uint32 begin_time = 10;</code>
-     * @return The beginTime.
-     */
-    int getBeginTime();
-
-    /**
-     * <code>uint32 end_time = 6;</code>
-     * @return The endTime.
-     */
-    int getEndTime();
-
     /**
      * <code>uint32 activity_id = 14;</code>
      * @return The activityId.
      */
     int getActivityId();
+
+    /**
+     * <code>uint32 end_time = 1;</code>
+     * @return The endTime.
+     */
+    int getEndTime();
+
+    /**
+     * <code>uint32 begin_time = 10;</code>
+     * @return The beginTime.
+     */
+    int getBeginTime();
   }
   /**
-   * <pre>
-   * Name: NIFNHCLOBPA
-   * </pre>
-   *
    * Protobuf type {@code ActivityScheduleInfo}
    */
   public static final class ActivityScheduleInfo extends
@@ -99,17 +95,12 @@ public final class ActivityScheduleInfoOuterClass {
               break;
             case 8: {
 
-              isOpen_ = input.readBool();
-              break;
-            }
-            case 48: {
-
               endTime_ = input.readUInt32();
               break;
             }
-            case 64: {
+            case 16: {
 
-              scheduleId_ = input.readUInt32();
+              isOpen_ = input.readBool();
               break;
             }
             case 80: {
@@ -117,6 +108,11 @@ public final class ActivityScheduleInfoOuterClass {
               beginTime_ = input.readUInt32();
               break;
             }
+            case 104: {
+
+              scheduleId_ = input.readUInt32();
+              break;
+            }
             case 112: {
 
               activityId_ = input.readUInt32();
@@ -154,10 +150,10 @@ public final class ActivityScheduleInfoOuterClass {
               emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo.class, emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo.Builder.class);
     }
 
-    public static final int SCHEDULE_ID_FIELD_NUMBER = 8;
+    public static final int SCHEDULE_ID_FIELD_NUMBER = 13;
     private int scheduleId_;
     /**
-     * <code>uint32 schedule_id = 8;</code>
+     * <code>uint32 schedule_id = 13;</code>
      * @return The scheduleId.
      */
     @java.lang.Override
@@ -165,10 +161,10 @@ public final class ActivityScheduleInfoOuterClass {
       return scheduleId_;
     }
 
-    public static final int IS_OPEN_FIELD_NUMBER = 1;
+    public static final int IS_OPEN_FIELD_NUMBER = 2;
     private boolean isOpen_;
     /**
-     * <code>bool is_open = 1;</code>
+     * <code>bool is_open = 2;</code>
      * @return The isOpen.
      */
     @java.lang.Override
@@ -176,28 +172,6 @@ public final class ActivityScheduleInfoOuterClass {
       return isOpen_;
     }
 
-    public static final int BEGIN_TIME_FIELD_NUMBER = 10;
-    private int beginTime_;
-    /**
-     * <code>uint32 begin_time = 10;</code>
-     * @return The beginTime.
-     */
-    @java.lang.Override
-    public int getBeginTime() {
-      return beginTime_;
-    }
-
-    public static final int END_TIME_FIELD_NUMBER = 6;
-    private int endTime_;
-    /**
-     * <code>uint32 end_time = 6;</code>
-     * @return The endTime.
-     */
-    @java.lang.Override
-    public int getEndTime() {
-      return endTime_;
-    }
-
     public static final int ACTIVITY_ID_FIELD_NUMBER = 14;
     private int activityId_;
     /**
@@ -209,6 +183,28 @@ public final class ActivityScheduleInfoOuterClass {
       return activityId_;
     }
 
+    public static final int END_TIME_FIELD_NUMBER = 1;
+    private int endTime_;
+    /**
+     * <code>uint32 end_time = 1;</code>
+     * @return The endTime.
+     */
+    @java.lang.Override
+    public int getEndTime() {
+      return endTime_;
+    }
+
+    public static final int BEGIN_TIME_FIELD_NUMBER = 10;
+    private int beginTime_;
+    /**
+     * <code>uint32 begin_time = 10;</code>
+     * @return The beginTime.
+     */
+    @java.lang.Override
+    public int getBeginTime() {
+      return beginTime_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -223,18 +219,18 @@ public final class ActivityScheduleInfoOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (isOpen_ != false) {
-        output.writeBool(1, isOpen_);
-      }
       if (endTime_ != 0) {
-        output.writeUInt32(6, endTime_);
+        output.writeUInt32(1, endTime_);
       }
-      if (scheduleId_ != 0) {
+      if (isOpen_ != false) {
-        output.writeUInt32(8, scheduleId_);
+        output.writeBool(2, isOpen_);
       }
       if (beginTime_ != 0) {
         output.writeUInt32(10, beginTime_);
       }
+      if (scheduleId_ != 0) {
+        output.writeUInt32(13, scheduleId_);
+      }
       if (activityId_ != 0) {
         output.writeUInt32(14, activityId_);
       }
@@ -247,22 +243,22 @@ public final class ActivityScheduleInfoOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (isOpen_ != false) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(1, isOpen_);
-      }
       if (endTime_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(6, endTime_);
+          .computeUInt32Size(1, endTime_);
       }
-      if (scheduleId_ != 0) {
+      if (isOpen_ != false) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(8, scheduleId_);
+          .computeBoolSize(2, isOpen_);
       }
       if (beginTime_ != 0) {
         size += com.google.protobuf.CodedOutputStream
           .computeUInt32Size(10, beginTime_);
       }
+      if (scheduleId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(13, scheduleId_);
+      }
       if (activityId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
           .computeUInt32Size(14, activityId_);
@@ -286,12 +282,12 @@ public final class ActivityScheduleInfoOuterClass {
           != other.getScheduleId()) return false;
       if (getIsOpen()
           != other.getIsOpen()) return false;
-      if (getBeginTime()
-          != other.getBeginTime()) return false;
-      if (getEndTime()
-          != other.getEndTime()) return false;
       if (getActivityId()
           != other.getActivityId()) return false;
+      if (getEndTime()
+          != other.getEndTime()) return false;
+      if (getBeginTime()
+          != other.getBeginTime()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -308,12 +304,12 @@ public final class ActivityScheduleInfoOuterClass {
       hash = (37 * hash) + IS_OPEN_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
           getIsOpen());
-      hash = (37 * hash) + BEGIN_TIME_FIELD_NUMBER;
-      hash = (53 * hash) + getBeginTime();
-      hash = (37 * hash) + END_TIME_FIELD_NUMBER;
-      hash = (53 * hash) + getEndTime();
       hash = (37 * hash) + ACTIVITY_ID_FIELD_NUMBER;
       hash = (53 * hash) + getActivityId();
+      hash = (37 * hash) + END_TIME_FIELD_NUMBER;
+      hash = (53 * hash) + getEndTime();
+      hash = (37 * hash) + BEGIN_TIME_FIELD_NUMBER;
+      hash = (53 * hash) + getBeginTime();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -410,10 +406,6 @@ public final class ActivityScheduleInfoOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Name: NIFNHCLOBPA
-     * </pre>
-     *
      * Protobuf type {@code ActivityScheduleInfo}
      */
     public static final class Builder extends
@@ -455,11 +447,11 @@ public final class ActivityScheduleInfoOuterClass {
 
         isOpen_ = false;
 
-        beginTime_ = 0;
+        activityId_ = 0;
 
         endTime_ = 0;
 
-        activityId_ = 0;
+        beginTime_ = 0;
 
         return this;
       }
@@ -489,9 +481,9 @@ public final class ActivityScheduleInfoOuterClass {
         emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo result = new emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo(this);
         result.scheduleId_ = scheduleId_;
         result.isOpen_ = isOpen_;
-        result.beginTime_ = beginTime_;
-        result.endTime_ = endTime_;
         result.activityId_ = activityId_;
+        result.endTime_ = endTime_;
+        result.beginTime_ = beginTime_;
         onBuilt();
         return result;
       }
@@ -546,14 +538,14 @@ public final class ActivityScheduleInfoOuterClass {
         if (other.getIsOpen() != false) {
           setIsOpen(other.getIsOpen());
         }
-        if (other.getBeginTime() != 0) {
+        if (other.getActivityId() != 0) {
-          setBeginTime(other.getBeginTime());
+          setActivityId(other.getActivityId());
         }
         if (other.getEndTime() != 0) {
           setEndTime(other.getEndTime());
         }
-        if (other.getActivityId() != 0) {
+        if (other.getBeginTime() != 0) {
-          setActivityId(other.getActivityId());
+          setBeginTime(other.getBeginTime());
         }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
@@ -586,7 +578,7 @@ public final class ActivityScheduleInfoOuterClass {
 
       private int scheduleId_ ;
       /**
-       * <code>uint32 schedule_id = 8;</code>
+       * <code>uint32 schedule_id = 13;</code>
        * @return The scheduleId.
        */
       @java.lang.Override
@@ -594,7 +586,7 @@ public final class ActivityScheduleInfoOuterClass {
         return scheduleId_;
       }
       /**
-       * <code>uint32 schedule_id = 8;</code>
+       * <code>uint32 schedule_id = 13;</code>
        * @param value The scheduleId to set.
        * @return This builder for chaining.
        */
@@ -605,7 +597,7 @@ public final class ActivityScheduleInfoOuterClass {
         return this;
       }
       /**
-       * <code>uint32 schedule_id = 8;</code>
+       * <code>uint32 schedule_id = 13;</code>
        * @return This builder for chaining.
        */
       public Builder clearScheduleId() {
@@ -617,7 +609,7 @@ public final class ActivityScheduleInfoOuterClass {
 
       private boolean isOpen_ ;
       /**
-       * <code>bool is_open = 1;</code>
+       * <code>bool is_open = 2;</code>
        * @return The isOpen.
        */
       @java.lang.Override
@@ -625,7 +617,7 @@ public final class ActivityScheduleInfoOuterClass {
         return isOpen_;
       }
       /**
-       * <code>bool is_open = 1;</code>
+       * <code>bool is_open = 2;</code>
        * @param value The isOpen to set.
        * @return This builder for chaining.
        */
@@ -636,7 +628,7 @@ public final class ActivityScheduleInfoOuterClass {
         return this;
       }
       /**
-       * <code>bool is_open = 1;</code>
+       * <code>bool is_open = 2;</code>
        * @return This builder for chaining.
        */
       public Builder clearIsOpen() {
@@ -646,68 +638,6 @@ public final class ActivityScheduleInfoOuterClass {
         return this;
       }
 
-      private int beginTime_ ;
-      /**
-       * <code>uint32 begin_time = 10;</code>
-       * @return The beginTime.
-       */
-      @java.lang.Override
-      public int getBeginTime() {
-        return beginTime_;
-      }
-      /**
-       * <code>uint32 begin_time = 10;</code>
-       * @param value The beginTime to set.
-       * @return This builder for chaining.
-       */
-      public Builder setBeginTime(int value) {
-        
-        beginTime_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 begin_time = 10;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearBeginTime() {
-        
-        beginTime_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int endTime_ ;
-      /**
-       * <code>uint32 end_time = 6;</code>
-       * @return The endTime.
-       */
-      @java.lang.Override
-      public int getEndTime() {
-        return endTime_;
-      }
-      /**
-       * <code>uint32 end_time = 6;</code>
-       * @param value The endTime to set.
-       * @return This builder for chaining.
-       */
-      public Builder setEndTime(int value) {
-        
-        endTime_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 end_time = 6;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearEndTime() {
-        
-        endTime_ = 0;
-        onChanged();
-        return this;
-      }
-
       private int activityId_ ;
       /**
        * <code>uint32 activity_id = 14;</code>
@@ -738,6 +668,68 @@ public final class ActivityScheduleInfoOuterClass {
         onChanged();
         return this;
       }
+
+      private int endTime_ ;
+      /**
+       * <code>uint32 end_time = 1;</code>
+       * @return The endTime.
+       */
+      @java.lang.Override
+      public int getEndTime() {
+        return endTime_;
+      }
+      /**
+       * <code>uint32 end_time = 1;</code>
+       * @param value The endTime to set.
+       * @return This builder for chaining.
+       */
+      public Builder setEndTime(int value) {
+        
+        endTime_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 end_time = 1;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearEndTime() {
+        
+        endTime_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int beginTime_ ;
+      /**
+       * <code>uint32 begin_time = 10;</code>
+       * @return The beginTime.
+       */
+      @java.lang.Override
+      public int getBeginTime() {
+        return beginTime_;
+      }
+      /**
+       * <code>uint32 begin_time = 10;</code>
+       * @param value The beginTime to set.
+       * @return This builder for chaining.
+       */
+      public Builder setBeginTime(int value) {
+        
+        beginTime_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 begin_time = 10;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearBeginTime() {
+        
+        beginTime_ = 0;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -806,9 +798,9 @@ public final class ActivityScheduleInfoOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\032ActivityScheduleInfo.proto\"w\n\024Activity" +
-      "ScheduleInfo\022\023\n\013schedule_id\030\010 \001(\r\022\017\n\007is_" +
+      "ScheduleInfo\022\023\n\013schedule_id\030\r \001(\r\022\017\n\007is_" +
-      "open\030\001 \001(\010\022\022\n\nbegin_time\030\n \001(\r\022\020\n\010end_ti" +
+      "open\030\002 \001(\010\022\023\n\013activity_id\030\016 \001(\r\022\020\n\010end_t" +
-      "me\030\006 \001(\r\022\023\n\013activity_id\030\016 \001(\rB\033\n\031emu.gra" +
+      "ime\030\001 \001(\r\022\022\n\nbegin_time\030\n \001(\rB\033\n\031emu.gra" +
       "sscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -820,7 +812,7 @@ public final class ActivityScheduleInfoOuterClass {
     internal_static_ActivityScheduleInfo_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_ActivityScheduleInfo_descriptor,
-        new java.lang.String[] { "ScheduleId", "IsOpen", "BeginTime", "EndTime", "ActivityId", });
+        new java.lang.String[] { "ScheduleId", "IsOpen", "ActivityId", "EndTime", "BeginTime", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)

src/generated/main/java/emu/grasscutter/net/proto/ActivityShopSheetInfoOuterClass.java

@@ -1,685 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: ActivityShopSheetInfo.proto
-
-package emu.grasscutter.net.proto;
-
-public final class ActivityShopSheetInfoOuterClass {
-  private ActivityShopSheetInfoOuterClass() {}
-  public static void registerAllExtensions(
-      com.google.protobuf.ExtensionRegistryLite registry) {
-  }
-
-  public static void registerAllExtensions(
-      com.google.protobuf.ExtensionRegistry registry) {
-    registerAllExtensions(
-        (com.google.protobuf.ExtensionRegistryLite) registry);
-  }
-  public interface ActivityShopSheetInfoOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:ActivityShopSheetInfo)
-      com.google.protobuf.MessageOrBuilder {
-
-    /**
-     * <code>uint32 end_time = 8;</code>
-     * @return The endTime.
-     */
-    int getEndTime();
-
-    /**
-     * <code>uint32 sheet_id = 10;</code>
-     * @return The sheetId.
-     */
-    int getSheetId();
-
-    /**
-     * <code>uint32 begin_time = 7;</code>
-     * @return The beginTime.
-     */
-    int getBeginTime();
-  }
-  /**
-   * <pre>
-   * Name: GHBBGOLDLCL
-   * </pre>
-   *
-   * Protobuf type {@code ActivityShopSheetInfo}
-   */
-  public static final class ActivityShopSheetInfo extends
-      com.google.protobuf.GeneratedMessageV3 implements
-      // @@protoc_insertion_point(message_implements:ActivityShopSheetInfo)
-      ActivityShopSheetInfoOrBuilder {
-  private static final long serialVersionUID = 0L;
-    // Use ActivityShopSheetInfo.newBuilder() to construct.
-    private ActivityShopSheetInfo(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
-      super(builder);
-    }
-    private ActivityShopSheetInfo() {
-    }
-
-    @java.lang.Override
-    @SuppressWarnings({"unused"})
-    protected java.lang.Object newInstance(
-        UnusedPrivateParameter unused) {
-      return new ActivityShopSheetInfo();
-    }
-
-    @java.lang.Override
-    public final com.google.protobuf.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private ActivityShopSheetInfo(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-          com.google.protobuf.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 56: {
-
-              beginTime_ = input.readUInt32();
-              break;
-            }
-            case 64: {
-
-              endTime_ = input.readUInt32();
-              break;
-            }
-            case 80: {
-
-              sheetId_ = input.readUInt32();
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new com.google.protobuf.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return emu.grasscutter.net.proto.ActivityShopSheetInfoOuterClass.internal_static_ActivityShopSheetInfo_descriptor;
-    }
-
-    @java.lang.Override
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return emu.grasscutter.net.proto.ActivityShopSheetInfoOuterClass.internal_static_ActivityShopSheetInfo_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              emu.grasscutter.net.proto.ActivityShopSheetInfoOuterClass.ActivityShopSheetInfo.class, emu.grasscutter.net.proto.ActivityShopSheetInfoOuterClass.ActivityShopSheetInfo.Builder.class);
-    }
-
-    public static final int END_TIME_FIELD_NUMBER = 8;
-    private int endTime_;
-    /**
-     * <code>uint32 end_time = 8;</code>
-     * @return The endTime.
-     */
-    @java.lang.Override
-    public int getEndTime() {
-      return endTime_;
-    }
-
-    public static final int SHEET_ID_FIELD_NUMBER = 10;
-    private int sheetId_;
-    /**
-     * <code>uint32 sheet_id = 10;</code>
-     * @return The sheetId.
-     */
-    @java.lang.Override
-    public int getSheetId() {
-      return sheetId_;
-    }
-
-    public static final int BEGIN_TIME_FIELD_NUMBER = 7;
-    private int beginTime_;
-    /**
-     * <code>uint32 begin_time = 7;</code>
-     * @return The beginTime.
-     */
-    @java.lang.Override
-    public int getBeginTime() {
-      return beginTime_;
-    }
-
-    private byte memoizedIsInitialized = -1;
-    @java.lang.Override
-    public final boolean isInitialized() {
-      byte isInitialized = memoizedIsInitialized;
-      if (isInitialized == 1) return true;
-      if (isInitialized == 0) return false;
-
-      memoizedIsInitialized = 1;
-      return true;
-    }
-
-    @java.lang.Override
-    public void writeTo(com.google.protobuf.CodedOutputStream output)
-                        throws java.io.IOException {
-      if (beginTime_ != 0) {
-        output.writeUInt32(7, beginTime_);
-      }
-      if (endTime_ != 0) {
-        output.writeUInt32(8, endTime_);
-      }
-      if (sheetId_ != 0) {
-        output.writeUInt32(10, sheetId_);
-      }
-      unknownFields.writeTo(output);
-    }
-
-    @java.lang.Override
-    public int getSerializedSize() {
-      int size = memoizedSize;
-      if (size != -1) return size;
-
-      size = 0;
-      if (beginTime_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(7, beginTime_);
-      }
-      if (endTime_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(8, endTime_);
-      }
-      if (sheetId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(10, sheetId_);
-      }
-      size += unknownFields.getSerializedSize();
-      memoizedSize = size;
-      return size;
-    }
-
-    @java.lang.Override
-    public boolean equals(final java.lang.Object obj) {
-      if (obj == this) {
-       return true;
-      }
-      if (!(obj instanceof emu.grasscutter.net.proto.ActivityShopSheetInfoOuterClass.ActivityShopSheetInfo)) {
-        return super.equals(obj);
-      }
-      emu.grasscutter.net.proto.ActivityShopSheetInfoOuterClass.ActivityShopSheetInfo other = (emu.grasscutter.net.proto.ActivityShopSheetInfoOuterClass.ActivityShopSheetInfo) obj;
-
-      if (getEndTime()
-          != other.getEndTime()) return false;
-      if (getSheetId()
-          != other.getSheetId()) return false;
-      if (getBeginTime()
-          != other.getBeginTime()) return false;
-      if (!unknownFields.equals(other.unknownFields)) return false;
-      return true;
-    }
-
-    @java.lang.Override
-    public int hashCode() {
-      if (memoizedHashCode != 0) {
-        return memoizedHashCode;
-      }
-      int hash = 41;
-      hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + END_TIME_FIELD_NUMBER;
-      hash = (53 * hash) + getEndTime();
-      hash = (37 * hash) + SHEET_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getSheetId();
-      hash = (37 * hash) + BEGIN_TIME_FIELD_NUMBER;
-      hash = (53 * hash) + getBeginTime();
-      hash = (29 * hash) + unknownFields.hashCode();
-      memoizedHashCode = hash;
-      return hash;
-    }
-
-    public static emu.grasscutter.net.proto.ActivityShopSheetInfoOuterClass.ActivityShopSheetInfo parseFrom(
-        java.nio.ByteBuffer data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
-    }
-    public static emu.grasscutter.net.proto.ActivityShopSheetInfoOuterClass.ActivityShopSheetInfo parseFrom(
-        java.nio.ByteBuffer data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
-    }
-    public static emu.grasscutter.net.proto.ActivityShopSheetInfoOuterClass.ActivityShopSheetInfo parseFrom(
-        com.google.protobuf.ByteString data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
-    }
-    public static emu.grasscutter.net.proto.ActivityShopSheetInfoOuterClass.ActivityShopSheetInfo parseFrom(
-        com.google.protobuf.ByteString data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
-    }
-    public static emu.grasscutter.net.proto.ActivityShopSheetInfoOuterClass.ActivityShopSheetInfo parseFrom(byte[] data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
-    }
-    public static emu.grasscutter.net.proto.ActivityShopSheetInfoOuterClass.ActivityShopSheetInfo parseFrom(
-        byte[] data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
-    }
-    public static emu.grasscutter.net.proto.ActivityShopSheetInfoOuterClass.ActivityShopSheetInfo parseFrom(java.io.InputStream input)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input);
-    }
-    public static emu.grasscutter.net.proto.ActivityShopSheetInfoOuterClass.ActivityShopSheetInfo parseFrom(
-        java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input, extensionRegistry);
-    }
-    public static emu.grasscutter.net.proto.ActivityShopSheetInfoOuterClass.ActivityShopSheetInfo parseDelimitedFrom(java.io.InputStream input)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseDelimitedWithIOException(PARSER, input);
-    }
-    public static emu.grasscutter.net.proto.ActivityShopSheetInfoOuterClass.ActivityShopSheetInfo parseDelimitedFrom(
-        java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-    }
-    public static emu.grasscutter.net.proto.ActivityShopSheetInfoOuterClass.ActivityShopSheetInfo parseFrom(
-        com.google.protobuf.CodedInputStream input)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input);
-    }
-    public static emu.grasscutter.net.proto.ActivityShopSheetInfoOuterClass.ActivityShopSheetInfo parseFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input, extensionRegistry);
-    }
-
-    @java.lang.Override
-    public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder() {
-      return DEFAULT_INSTANCE.toBuilder();
-    }
-    public static Builder newBuilder(emu.grasscutter.net.proto.ActivityShopSheetInfoOuterClass.ActivityShopSheetInfo prototype) {
-      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-    }
-    @java.lang.Override
-    public Builder toBuilder() {
-      return this == DEFAULT_INSTANCE
-          ? new Builder() : new Builder().mergeFrom(this);
-    }
-
-    @java.lang.Override
-    protected Builder newBuilderForType(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-      Builder builder = new Builder(parent);
-      return builder;
-    }
-    /**
-     * <pre>
-     * Name: GHBBGOLDLCL
-     * </pre>
-     *
-     * Protobuf type {@code ActivityShopSheetInfo}
-     */
-    public static final class Builder extends
-        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
-        // @@protoc_insertion_point(builder_implements:ActivityShopSheetInfo)
-        emu.grasscutter.net.proto.ActivityShopSheetInfoOuterClass.ActivityShopSheetInfoOrBuilder {
-      public static final com.google.protobuf.Descriptors.Descriptor
-          getDescriptor() {
-        return emu.grasscutter.net.proto.ActivityShopSheetInfoOuterClass.internal_static_ActivityShopSheetInfo_descriptor;
-      }
-
-      @java.lang.Override
-      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-          internalGetFieldAccessorTable() {
-        return emu.grasscutter.net.proto.ActivityShopSheetInfoOuterClass.internal_static_ActivityShopSheetInfo_fieldAccessorTable
-            .ensureFieldAccessorsInitialized(
-                emu.grasscutter.net.proto.ActivityShopSheetInfoOuterClass.ActivityShopSheetInfo.class, emu.grasscutter.net.proto.ActivityShopSheetInfoOuterClass.ActivityShopSheetInfo.Builder.class);
-      }
-
-      // Construct using emu.grasscutter.net.proto.ActivityShopSheetInfoOuterClass.ActivityShopSheetInfo.newBuilder()
-      private Builder() {
-        maybeForceBuilderInitialization();
-      }
-
-      private Builder(
-          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-        super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (com.google.protobuf.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-        }
-      }
-      @java.lang.Override
-      public Builder clear() {
-        super.clear();
-        endTime_ = 0;
-
-        sheetId_ = 0;
-
-        beginTime_ = 0;
-
-        return this;
-      }
-
-      @java.lang.Override
-      public com.google.protobuf.Descriptors.Descriptor
-          getDescriptorForType() {
-        return emu.grasscutter.net.proto.ActivityShopSheetInfoOuterClass.internal_static_ActivityShopSheetInfo_descriptor;
-      }
-
-      @java.lang.Override
-      public emu.grasscutter.net.proto.ActivityShopSheetInfoOuterClass.ActivityShopSheetInfo getDefaultInstanceForType() {
-        return emu.grasscutter.net.proto.ActivityShopSheetInfoOuterClass.ActivityShopSheetInfo.getDefaultInstance();
-      }
-
-      @java.lang.Override
-      public emu.grasscutter.net.proto.ActivityShopSheetInfoOuterClass.ActivityShopSheetInfo build() {
-        emu.grasscutter.net.proto.ActivityShopSheetInfoOuterClass.ActivityShopSheetInfo result = buildPartial();
-        if (!result.isInitialized()) {
-          throw newUninitializedMessageException(result);
-        }
-        return result;
-      }
-
-      @java.lang.Override
-      public emu.grasscutter.net.proto.ActivityShopSheetInfoOuterClass.ActivityShopSheetInfo buildPartial() {
-        emu.grasscutter.net.proto.ActivityShopSheetInfoOuterClass.ActivityShopSheetInfo result = new emu.grasscutter.net.proto.ActivityShopSheetInfoOuterClass.ActivityShopSheetInfo(this);
-        result.endTime_ = endTime_;
-        result.sheetId_ = sheetId_;
-        result.beginTime_ = beginTime_;
-        onBuilt();
-        return result;
-      }
-
-      @java.lang.Override
-      public Builder clone() {
-        return super.clone();
-      }
-      @java.lang.Override
-      public Builder setField(
-          com.google.protobuf.Descriptors.FieldDescriptor field,
-          java.lang.Object value) {
-        return super.setField(field, value);
-      }
-      @java.lang.Override
-      public Builder clearField(
-          com.google.protobuf.Descriptors.FieldDescriptor field) {
-        return super.clearField(field);
-      }
-      @java.lang.Override
-      public Builder clearOneof(
-          com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-        return super.clearOneof(oneof);
-      }
-      @java.lang.Override
-      public Builder setRepeatedField(
-          com.google.protobuf.Descriptors.FieldDescriptor field,
-          int index, java.lang.Object value) {
-        return super.setRepeatedField(field, index, value);
-      }
-      @java.lang.Override
-      public Builder addRepeatedField(
-          com.google.protobuf.Descriptors.FieldDescriptor field,
-          java.lang.Object value) {
-        return super.addRepeatedField(field, value);
-      }
-      @java.lang.Override
-      public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof emu.grasscutter.net.proto.ActivityShopSheetInfoOuterClass.ActivityShopSheetInfo) {
-          return mergeFrom((emu.grasscutter.net.proto.ActivityShopSheetInfoOuterClass.ActivityShopSheetInfo)other);
-        } else {
-          super.mergeFrom(other);
-          return this;
-        }
-      }
-
-      public Builder mergeFrom(emu.grasscutter.net.proto.ActivityShopSheetInfoOuterClass.ActivityShopSheetInfo other) {
-        if (other == emu.grasscutter.net.proto.ActivityShopSheetInfoOuterClass.ActivityShopSheetInfo.getDefaultInstance()) return this;
-        if (other.getEndTime() != 0) {
-          setEndTime(other.getEndTime());
-        }
-        if (other.getSheetId() != 0) {
-          setSheetId(other.getSheetId());
-        }
-        if (other.getBeginTime() != 0) {
-          setBeginTime(other.getBeginTime());
-        }
-        this.mergeUnknownFields(other.unknownFields);
-        onChanged();
-        return this;
-      }
-
-      @java.lang.Override
-      public final boolean isInitialized() {
-        return true;
-      }
-
-      @java.lang.Override
-      public Builder mergeFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws java.io.IOException {
-        emu.grasscutter.net.proto.ActivityShopSheetInfoOuterClass.ActivityShopSheetInfo parsedMessage = null;
-        try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (emu.grasscutter.net.proto.ActivityShopSheetInfoOuterClass.ActivityShopSheetInfo) e.getUnfinishedMessage();
-          throw e.unwrapIOException();
-        } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
-        return this;
-      }
-
-      private int endTime_ ;
-      /**
-       * <code>uint32 end_time = 8;</code>
-       * @return The endTime.
-       */
-      @java.lang.Override
-      public int getEndTime() {
-        return endTime_;
-      }
-      /**
-       * <code>uint32 end_time = 8;</code>
-       * @param value The endTime to set.
-       * @return This builder for chaining.
-       */
-      public Builder setEndTime(int value) {
-        
-        endTime_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 end_time = 8;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearEndTime() {
-        
-        endTime_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int sheetId_ ;
-      /**
-       * <code>uint32 sheet_id = 10;</code>
-       * @return The sheetId.
-       */
-      @java.lang.Override
-      public int getSheetId() {
-        return sheetId_;
-      }
-      /**
-       * <code>uint32 sheet_id = 10;</code>
-       * @param value The sheetId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setSheetId(int value) {
-        
-        sheetId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 sheet_id = 10;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearSheetId() {
-        
-        sheetId_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int beginTime_ ;
-      /**
-       * <code>uint32 begin_time = 7;</code>
-       * @return The beginTime.
-       */
-      @java.lang.Override
-      public int getBeginTime() {
-        return beginTime_;
-      }
-      /**
-       * <code>uint32 begin_time = 7;</code>
-       * @param value The beginTime to set.
-       * @return This builder for chaining.
-       */
-      public Builder setBeginTime(int value) {
-        
-        beginTime_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 begin_time = 7;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearBeginTime() {
-        
-        beginTime_ = 0;
-        onChanged();
-        return this;
-      }
-      @java.lang.Override
-      public final Builder setUnknownFields(
-          final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return super.setUnknownFields(unknownFields);
-      }
-
-      @java.lang.Override
-      public final Builder mergeUnknownFields(
-          final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return super.mergeUnknownFields(unknownFields);
-      }
-
-
-      // @@protoc_insertion_point(builder_scope:ActivityShopSheetInfo)
-    }
-
-    // @@protoc_insertion_point(class_scope:ActivityShopSheetInfo)
-    private static final emu.grasscutter.net.proto.ActivityShopSheetInfoOuterClass.ActivityShopSheetInfo DEFAULT_INSTANCE;
-    static {
-      DEFAULT_INSTANCE = new emu.grasscutter.net.proto.ActivityShopSheetInfoOuterClass.ActivityShopSheetInfo();
-    }
-
-    public static emu.grasscutter.net.proto.ActivityShopSheetInfoOuterClass.ActivityShopSheetInfo getDefaultInstance() {
-      return DEFAULT_INSTANCE;
-    }
-
-    private static final com.google.protobuf.Parser<ActivityShopSheetInfo>
-        PARSER = new com.google.protobuf.AbstractParser<ActivityShopSheetInfo>() {
-      @java.lang.Override
-      public ActivityShopSheetInfo parsePartialFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return new ActivityShopSheetInfo(input, extensionRegistry);
-      }
-    };
-
-    public static com.google.protobuf.Parser<ActivityShopSheetInfo> parser() {
-      return PARSER;
-    }
-
-    @java.lang.Override
-    public com.google.protobuf.Parser<ActivityShopSheetInfo> getParserForType() {
-      return PARSER;
-    }
-
-    @java.lang.Override
-    public emu.grasscutter.net.proto.ActivityShopSheetInfoOuterClass.ActivityShopSheetInfo getDefaultInstanceForType() {
-      return DEFAULT_INSTANCE;
-    }
-
-  }
-
-  private static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_ActivityShopSheetInfo_descriptor;
-  private static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_ActivityShopSheetInfo_fieldAccessorTable;
-
-  public static com.google.protobuf.Descriptors.FileDescriptor
-      getDescriptor() {
-    return descriptor;
-  }
-  private static  com.google.protobuf.Descriptors.FileDescriptor
-      descriptor;
-  static {
-    java.lang.String[] descriptorData = {
-      "\n\033ActivityShopSheetInfo.proto\"O\n\025Activit" +
-      "yShopSheetInfo\022\020\n\010end_time\030\010 \001(\r\022\020\n\010shee" +
-      "t_id\030\n \001(\r\022\022\n\nbegin_time\030\007 \001(\rB\033\n\031emu.gr" +
-      "asscutter.net.protob\006proto3"
-    };
-    descriptor = com.google.protobuf.Descriptors.FileDescriptor
-      .internalBuildGeneratedFileFrom(descriptorData,
-        new com.google.protobuf.Descriptors.FileDescriptor[] {
-        });
-    internal_static_ActivityShopSheetInfo_descriptor =
-      getDescriptor().getMessageTypes().get(0);
-    internal_static_ActivityShopSheetInfo_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_ActivityShopSheetInfo_descriptor,
-        new java.lang.String[] { "EndTime", "SheetId", "BeginTime", });
-  }
-
-  // @@protoc_insertion_point(outer_class_scope)
-}

src/generated/main/java/emu/grasscutter/net/proto/ActivityTakeWatcherRewardReqOuterClass.java

@@ -19,21 +19,23 @@ public final class ActivityTakeWatcherRewardReqOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 activity_id = 5;</code>
+     * <code>uint32 activity_id = 4;</code>
      * @return The activityId.
      */
     int getActivityId();
 
     /**
-     * <code>uint32 watcher_id = 15;</code>
+     * <code>uint32 watcher_id = 14;</code>
      * @return The watcherId.
      */
     int getWatcherId();
   }
   /**
    * <pre>
-   * Name: DEADHMNJBHA
+   * CmdId: 2038
-   * CmdId: 2063
+   * EnetChannelId: 0
+   * EnetIsReliable: false
+   * IsAllowClient: true
    * </pre>
    *
    * Protobuf type {@code ActivityTakeWatcherRewardReq}
@@ -80,12 +82,12 @@ public final class ActivityTakeWatcherRewardReqOuterClass {
             case 0:
               done = true;
               break;
-            case 40: {
+            case 32: {
 
               activityId_ = input.readUInt32();
               break;
             }
-            case 120: {
+            case 112: {
 
               watcherId_ = input.readUInt32();
               break;
@@ -122,10 +124,10 @@ public final class ActivityTakeWatcherRewardReqOuterClass {
               emu.grasscutter.net.proto.ActivityTakeWatcherRewardReqOuterClass.ActivityTakeWatcherRewardReq.class, emu.grasscutter.net.proto.ActivityTakeWatcherRewardReqOuterClass.ActivityTakeWatcherRewardReq.Builder.class);
     }
 
-    public static final int ACTIVITY_ID_FIELD_NUMBER = 5;
+    public static final int ACTIVITY_ID_FIELD_NUMBER = 4;
     private int activityId_;
     /**
-     * <code>uint32 activity_id = 5;</code>
+     * <code>uint32 activity_id = 4;</code>
      * @return The activityId.
      */
     @java.lang.Override
@@ -133,10 +135,10 @@ public final class ActivityTakeWatcherRewardReqOuterClass {
       return activityId_;
     }
 
-    public static final int WATCHER_ID_FIELD_NUMBER = 15;
+    public static final int WATCHER_ID_FIELD_NUMBER = 14;
     private int watcherId_;
     /**
-     * <code>uint32 watcher_id = 15;</code>
+     * <code>uint32 watcher_id = 14;</code>
      * @return The watcherId.
      */
     @java.lang.Override
@@ -159,10 +161,10 @@ public final class ActivityTakeWatcherRewardReqOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (activityId_ != 0) {
-        output.writeUInt32(5, activityId_);
+        output.writeUInt32(4, activityId_);
       }
       if (watcherId_ != 0) {
-        output.writeUInt32(15, watcherId_);
+        output.writeUInt32(14, watcherId_);
       }
       unknownFields.writeTo(output);
     }
@@ -175,11 +177,11 @@ public final class ActivityTakeWatcherRewardReqOuterClass {
       size = 0;
       if (activityId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(5, activityId_);
+          .computeUInt32Size(4, activityId_);
       }
       if (watcherId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(15, watcherId_);
+          .computeUInt32Size(14, watcherId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -312,8 +314,10 @@ public final class ActivityTakeWatcherRewardReqOuterClass {
     }
     /**
      * <pre>
-     * Name: DEADHMNJBHA
+     * CmdId: 2038
-     * CmdId: 2063
+     * EnetChannelId: 0
+     * EnetIsReliable: false
+     * IsAllowClient: true
      * </pre>
      *
      * Protobuf type {@code ActivityTakeWatcherRewardReq}
@@ -470,7 +474,7 @@ public final class ActivityTakeWatcherRewardReqOuterClass {
 
       private int activityId_ ;
       /**
-       * <code>uint32 activity_id = 5;</code>
+       * <code>uint32 activity_id = 4;</code>
        * @return The activityId.
        */
       @java.lang.Override
@@ -478,7 +482,7 @@ public final class ActivityTakeWatcherRewardReqOuterClass {
         return activityId_;
       }
       /**
-       * <code>uint32 activity_id = 5;</code>
+       * <code>uint32 activity_id = 4;</code>
        * @param value The activityId to set.
        * @return This builder for chaining.
        */
@@ -489,7 +493,7 @@ public final class ActivityTakeWatcherRewardReqOuterClass {
         return this;
       }
       /**
-       * <code>uint32 activity_id = 5;</code>
+       * <code>uint32 activity_id = 4;</code>
        * @return This builder for chaining.
        */
       public Builder clearActivityId() {
@@ -501,7 +505,7 @@ public final class ActivityTakeWatcherRewardReqOuterClass {
 
       private int watcherId_ ;
       /**
-       * <code>uint32 watcher_id = 15;</code>
+       * <code>uint32 watcher_id = 14;</code>
        * @return The watcherId.
        */
       @java.lang.Override
@@ -509,7 +513,7 @@ public final class ActivityTakeWatcherRewardReqOuterClass {
         return watcherId_;
       }
       /**
-       * <code>uint32 watcher_id = 15;</code>
+       * <code>uint32 watcher_id = 14;</code>
        * @param value The watcherId to set.
        * @return This builder for chaining.
        */
@@ -520,7 +524,7 @@ public final class ActivityTakeWatcherRewardReqOuterClass {
         return this;
       }
       /**
-       * <code>uint32 watcher_id = 15;</code>
+       * <code>uint32 watcher_id = 14;</code>
        * @return This builder for chaining.
        */
       public Builder clearWatcherId() {
@@ -598,7 +602,7 @@ public final class ActivityTakeWatcherRewardReqOuterClass {
     java.lang.String[] descriptorData = {
       "\n\"ActivityTakeWatcherRewardReq.proto\"G\n\034" +
       "ActivityTakeWatcherRewardReq\022\023\n\013activity" +
-      "_id\030\005 \001(\r\022\022\n\nwatcher_id\030\017 \001(\rB\033\n\031emu.gra" +
+      "_id\030\004 \001(\r\022\022\n\nwatcher_id\030\016 \001(\rB\033\n\031emu.gra" +
       "sscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor

src/generated/main/java/emu/grasscutter/net/proto/ActivityTakeWatcherRewardRspOuterClass.java

@@ -19,27 +19,29 @@ public final class ActivityTakeWatcherRewardRspOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>int32 retcode = 13;</code>
+     * <code>uint32 activity_id = 14;</code>
-     * @return The retcode.
+     * @return The activityId.
      */
-    int getRetcode();
+    int getActivityId();
 
     /**
-     * <code>uint32 watcher_id = 5;</code>
+     * <code>uint32 watcher_id = 7;</code>
      * @return The watcherId.
      */
     int getWatcherId();
 
     /**
-     * <code>uint32 activity_id = 3;</code>
+     * <code>int32 retcode = 9;</code>
-     * @return The activityId.
+     * @return The retcode.
      */
-    int getActivityId();
+    int getRetcode();
   }
   /**
    * <pre>
-   * Name: FBJIKPIMBJM
+   * CmdId: 2034
-   * CmdId: 2082
+   * EnetChannelId: 0
+   * EnetIsReliable: false
+   * IsAllowClient: true
    * </pre>
    *
    * Protobuf type {@code ActivityTakeWatcherRewardRsp}
@@ -86,21 +88,21 @@ public final class ActivityTakeWatcherRewardRspOuterClass {
             case 0:
               done = true;
               break;
-            case 24: {
+            case 56: {
-
-              activityId_ = input.readUInt32();
-              break;
-            }
-            case 40: {
 
               watcherId_ = input.readUInt32();
               break;
             }
-            case 104: {
+            case 72: {
 
               retcode_ = input.readInt32();
               break;
             }
+            case 112: {
+
+              activityId_ = input.readUInt32();
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -133,21 +135,21 @@ public final class ActivityTakeWatcherRewardRspOuterClass {
               emu.grasscutter.net.proto.ActivityTakeWatcherRewardRspOuterClass.ActivityTakeWatcherRewardRsp.class, emu.grasscutter.net.proto.ActivityTakeWatcherRewardRspOuterClass.ActivityTakeWatcherRewardRsp.Builder.class);
     }
 
-    public static final int RETCODE_FIELD_NUMBER = 13;
+    public static final int ACTIVITY_ID_FIELD_NUMBER = 14;
-    private int retcode_;
+    private int activityId_;
     /**
-     * <code>int32 retcode = 13;</code>
+     * <code>uint32 activity_id = 14;</code>
-     * @return The retcode.
+     * @return The activityId.
      */
     @java.lang.Override
-    public int getRetcode() {
+    public int getActivityId() {
-      return retcode_;
+      return activityId_;
     }
 
-    public static final int WATCHER_ID_FIELD_NUMBER = 5;
+    public static final int WATCHER_ID_FIELD_NUMBER = 7;
     private int watcherId_;
     /**
-     * <code>uint32 watcher_id = 5;</code>
+     * <code>uint32 watcher_id = 7;</code>
      * @return The watcherId.
      */
     @java.lang.Override
@@ -155,15 +157,15 @@ public final class ActivityTakeWatcherRewardRspOuterClass {
       return watcherId_;
     }
 
-    public static final int ACTIVITY_ID_FIELD_NUMBER = 3;
+    public static final int RETCODE_FIELD_NUMBER = 9;
-    private int activityId_;
+    private int retcode_;
     /**
-     * <code>uint32 activity_id = 3;</code>
+     * <code>int32 retcode = 9;</code>
-     * @return The activityId.
+     * @return The retcode.
      */
     @java.lang.Override
-    public int getActivityId() {
+    public int getRetcode() {
-      return activityId_;
+      return retcode_;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -180,14 +182,14 @@ public final class ActivityTakeWatcherRewardRspOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (activityId_ != 0) {
-        output.writeUInt32(3, activityId_);
-      }
       if (watcherId_ != 0) {
-        output.writeUInt32(5, watcherId_);
+        output.writeUInt32(7, watcherId_);
       }
       if (retcode_ != 0) {
-        output.writeInt32(13, retcode_);
+        output.writeInt32(9, retcode_);
+      }
+      if (activityId_ != 0) {
+        output.writeUInt32(14, activityId_);
       }
       unknownFields.writeTo(output);
     }
@@ -198,17 +200,17 @@ public final class ActivityTakeWatcherRewardRspOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (activityId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(3, activityId_);
-      }
       if (watcherId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(5, watcherId_);
+          .computeUInt32Size(7, watcherId_);
       }
       if (retcode_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(13, retcode_);
+          .computeInt32Size(9, retcode_);
+      }
+      if (activityId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(14, activityId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -225,12 +227,12 @@ public final class ActivityTakeWatcherRewardRspOuterClass {
       }
       emu.grasscutter.net.proto.ActivityTakeWatcherRewardRspOuterClass.ActivityTakeWatcherRewardRsp other = (emu.grasscutter.net.proto.ActivityTakeWatcherRewardRspOuterClass.ActivityTakeWatcherRewardRsp) obj;
 
-      if (getRetcode()
-          != other.getRetcode()) return false;
-      if (getWatcherId()
-          != other.getWatcherId()) return false;
       if (getActivityId()
           != other.getActivityId()) return false;
+      if (getWatcherId()
+          != other.getWatcherId()) return false;
+      if (getRetcode()
+          != other.getRetcode()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -242,12 +244,12 @@ public final class ActivityTakeWatcherRewardRspOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + RETCODE_FIELD_NUMBER;
-      hash = (53 * hash) + getRetcode();
-      hash = (37 * hash) + WATCHER_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getWatcherId();
       hash = (37 * hash) + ACTIVITY_ID_FIELD_NUMBER;
       hash = (53 * hash) + getActivityId();
+      hash = (37 * hash) + WATCHER_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getWatcherId();
+      hash = (37 * hash) + RETCODE_FIELD_NUMBER;
+      hash = (53 * hash) + getRetcode();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -345,8 +347,10 @@ public final class ActivityTakeWatcherRewardRspOuterClass {
     }
     /**
      * <pre>
-     * Name: FBJIKPIMBJM
+     * CmdId: 2034
-     * CmdId: 2082
+     * EnetChannelId: 0
+     * EnetIsReliable: false
+     * IsAllowClient: true
      * </pre>
      *
      * Protobuf type {@code ActivityTakeWatcherRewardRsp}
@@ -386,11 +390,11 @@ public final class ActivityTakeWatcherRewardRspOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        retcode_ = 0;
+        activityId_ = 0;
 
         watcherId_ = 0;
 
-        activityId_ = 0;
+        retcode_ = 0;
 
         return this;
       }
@@ -418,9 +422,9 @@ public final class ActivityTakeWatcherRewardRspOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.ActivityTakeWatcherRewardRspOuterClass.ActivityTakeWatcherRewardRsp buildPartial() {
         emu.grasscutter.net.proto.ActivityTakeWatcherRewardRspOuterClass.ActivityTakeWatcherRewardRsp result = new emu.grasscutter.net.proto.ActivityTakeWatcherRewardRspOuterClass.ActivityTakeWatcherRewardRsp(this);
-        result.retcode_ = retcode_;
-        result.watcherId_ = watcherId_;
         result.activityId_ = activityId_;
+        result.watcherId_ = watcherId_;
+        result.retcode_ = retcode_;
         onBuilt();
         return result;
       }
@@ -469,14 +473,14 @@ public final class ActivityTakeWatcherRewardRspOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.ActivityTakeWatcherRewardRspOuterClass.ActivityTakeWatcherRewardRsp other) {
         if (other == emu.grasscutter.net.proto.ActivityTakeWatcherRewardRspOuterClass.ActivityTakeWatcherRewardRsp.getDefaultInstance()) return this;
-        if (other.getRetcode() != 0) {
+        if (other.getActivityId() != 0) {
-          setRetcode(other.getRetcode());
+          setActivityId(other.getActivityId());
         }
         if (other.getWatcherId() != 0) {
           setWatcherId(other.getWatcherId());
         }
-        if (other.getActivityId() != 0) {
+        if (other.getRetcode() != 0) {
-          setActivityId(other.getActivityId());
+          setRetcode(other.getRetcode());
         }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
@@ -507,71 +511,9 @@ public final class ActivityTakeWatcherRewardRspOuterClass {
         return this;
       }
 
-      private int retcode_ ;
-      /**
-       * <code>int32 retcode = 13;</code>
-       * @return The retcode.
-       */
-      @java.lang.Override
-      public int getRetcode() {
-        return retcode_;
-      }
-      /**
-       * <code>int32 retcode = 13;</code>
-       * @param value The retcode to set.
-       * @return This builder for chaining.
-       */
-      public Builder setRetcode(int value) {
-        
-        retcode_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>int32 retcode = 13;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearRetcode() {
-        
-        retcode_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int watcherId_ ;
-      /**
-       * <code>uint32 watcher_id = 5;</code>
-       * @return The watcherId.
-       */
-      @java.lang.Override
-      public int getWatcherId() {
-        return watcherId_;
-      }
-      /**
-       * <code>uint32 watcher_id = 5;</code>
-       * @param value The watcherId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setWatcherId(int value) {
-        
-        watcherId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 watcher_id = 5;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearWatcherId() {
-        
-        watcherId_ = 0;
-        onChanged();
-        return this;
-      }
-
       private int activityId_ ;
       /**
-       * <code>uint32 activity_id = 3;</code>
+       * <code>uint32 activity_id = 14;</code>
        * @return The activityId.
        */
       @java.lang.Override
@@ -579,7 +521,7 @@ public final class ActivityTakeWatcherRewardRspOuterClass {
         return activityId_;
       }
       /**
-       * <code>uint32 activity_id = 3;</code>
+       * <code>uint32 activity_id = 14;</code>
        * @param value The activityId to set.
        * @return This builder for chaining.
        */
@@ -590,7 +532,7 @@ public final class ActivityTakeWatcherRewardRspOuterClass {
         return this;
       }
       /**
-       * <code>uint32 activity_id = 3;</code>
+       * <code>uint32 activity_id = 14;</code>
        * @return This builder for chaining.
        */
       public Builder clearActivityId() {
@@ -599,6 +541,68 @@ public final class ActivityTakeWatcherRewardRspOuterClass {
         onChanged();
         return this;
       }
+
+      private int watcherId_ ;
+      /**
+       * <code>uint32 watcher_id = 7;</code>
+       * @return The watcherId.
+       */
+      @java.lang.Override
+      public int getWatcherId() {
+        return watcherId_;
+      }
+      /**
+       * <code>uint32 watcher_id = 7;</code>
+       * @param value The watcherId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setWatcherId(int value) {
+        
+        watcherId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 watcher_id = 7;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearWatcherId() {
+        
+        watcherId_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int retcode_ ;
+      /**
+       * <code>int32 retcode = 9;</code>
+       * @return The retcode.
+       */
+      @java.lang.Override
+      public int getRetcode() {
+        return retcode_;
+      }
+      /**
+       * <code>int32 retcode = 9;</code>
+       * @param value The retcode to set.
+       * @return This builder for chaining.
+       */
+      public Builder setRetcode(int value) {
+        
+        retcode_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>int32 retcode = 9;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearRetcode() {
+        
+        retcode_ = 0;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -667,9 +671,9 @@ public final class ActivityTakeWatcherRewardRspOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\"ActivityTakeWatcherRewardRsp.proto\"X\n\034" +
-      "ActivityTakeWatcherRewardRsp\022\017\n\007retcode\030" +
+      "ActivityTakeWatcherRewardRsp\022\023\n\013activity" +
-      "\r \001(\005\022\022\n\nwatcher_id\030\005 \001(\r\022\023\n\013activity_id" +
+      "_id\030\016 \001(\r\022\022\n\nwatcher_id\030\007 \001(\r\022\017\n\007retcode" +
-      "\030\003 \001(\rB\033\n\031emu.grasscutter.net.protob\006pro" +
+      "\030\t \001(\005B\033\n\031emu.grasscutter.net.protob\006pro" +
       "to3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -681,7 +685,7 @@ public final class ActivityTakeWatcherRewardRspOuterClass {
     internal_static_ActivityTakeWatcherRewardRsp_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_ActivityTakeWatcherRewardRsp_descriptor,
-        new java.lang.String[] { "Retcode", "WatcherId", "ActivityId", });
+        new java.lang.String[] { "ActivityId", "WatcherId", "Retcode", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)

src/generated/main/java/emu/grasscutter/net/proto/ActivityUpdateWatcherNotifyOuterClass.java

@@ -19,30 +19,32 @@ public final class ActivityUpdateWatcherNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 activity_id = 15;</code>
+     * <code>.ActivityWatcherInfo watcher_info = 2;</code>
-     * @return The activityId.
-     */
-    int getActivityId();
-
-    /**
-     * <code>.ActivityWatcherInfo watcher_info = 3;</code>
      * @return Whether the watcherInfo field is set.
      */
     boolean hasWatcherInfo();
     /**
-     * <code>.ActivityWatcherInfo watcher_info = 3;</code>
+     * <code>.ActivityWatcherInfo watcher_info = 2;</code>
      * @return The watcherInfo.
      */
     emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass.ActivityWatcherInfo getWatcherInfo();
     /**
-     * <code>.ActivityWatcherInfo watcher_info = 3;</code>
+     * <code>.ActivityWatcherInfo watcher_info = 2;</code>
      */
     emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass.ActivityWatcherInfoOrBuilder getWatcherInfoOrBuilder();
+
+    /**
+     * <code>uint32 activity_id = 1;</code>
+     * @return The activityId.
+     */
+    int getActivityId();
   }
   /**
    * <pre>
-   * Name: PPOLCIAJKGN
+   * CmdId: 2156
-   * CmdId: 2183
+   * EnetChannelId: 0
+   * EnetIsReliable: false
+   * IsAllowClient: true
    * </pre>
    *
    * Protobuf type {@code ActivityUpdateWatcherNotify}
@@ -89,7 +91,12 @@ public final class ActivityUpdateWatcherNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 26: {
+            case 8: {
+
+              activityId_ = input.readUInt32();
+              break;
+            }
+            case 18: {
               emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass.ActivityWatcherInfo.Builder subBuilder = null;
               if (watcherInfo_ != null) {
                 subBuilder = watcherInfo_.toBuilder();
@@ -102,11 +109,6 @@ public final class ActivityUpdateWatcherNotifyOuterClass {
 
               break;
             }
-            case 120: {
-
-              activityId_ = input.readUInt32();
-              break;
-            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -139,21 +141,10 @@ public final class ActivityUpdateWatcherNotifyOuterClass {
               emu.grasscutter.net.proto.ActivityUpdateWatcherNotifyOuterClass.ActivityUpdateWatcherNotify.class, emu.grasscutter.net.proto.ActivityUpdateWatcherNotifyOuterClass.ActivityUpdateWatcherNotify.Builder.class);
     }
 
-    public static final int ACTIVITY_ID_FIELD_NUMBER = 15;
+    public static final int WATCHER_INFO_FIELD_NUMBER = 2;
-    private int activityId_;
-    /**
-     * <code>uint32 activity_id = 15;</code>
-     * @return The activityId.
-     */
-    @java.lang.Override
-    public int getActivityId() {
-      return activityId_;
-    }
-
-    public static final int WATCHER_INFO_FIELD_NUMBER = 3;
     private emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass.ActivityWatcherInfo watcherInfo_;
     /**
-     * <code>.ActivityWatcherInfo watcher_info = 3;</code>
+     * <code>.ActivityWatcherInfo watcher_info = 2;</code>
      * @return Whether the watcherInfo field is set.
      */
     @java.lang.Override
@@ -161,7 +152,7 @@ public final class ActivityUpdateWatcherNotifyOuterClass {
       return watcherInfo_ != null;
     }
     /**
-     * <code>.ActivityWatcherInfo watcher_info = 3;</code>
+     * <code>.ActivityWatcherInfo watcher_info = 2;</code>
      * @return The watcherInfo.
      */
     @java.lang.Override
@@ -169,13 +160,24 @@ public final class ActivityUpdateWatcherNotifyOuterClass {
       return watcherInfo_ == null ? emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass.ActivityWatcherInfo.getDefaultInstance() : watcherInfo_;
     }
     /**
-     * <code>.ActivityWatcherInfo watcher_info = 3;</code>
+     * <code>.ActivityWatcherInfo watcher_info = 2;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass.ActivityWatcherInfoOrBuilder getWatcherInfoOrBuilder() {
       return getWatcherInfo();
     }
 
+    public static final int ACTIVITY_ID_FIELD_NUMBER = 1;
+    private int activityId_;
+    /**
+     * <code>uint32 activity_id = 1;</code>
+     * @return The activityId.
+     */
+    @java.lang.Override
+    public int getActivityId() {
+      return activityId_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -190,11 +192,11 @@ public final class ActivityUpdateWatcherNotifyOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (watcherInfo_ != null) {
-        output.writeMessage(3, getWatcherInfo());
-      }
       if (activityId_ != 0) {
-        output.writeUInt32(15, activityId_);
+        output.writeUInt32(1, activityId_);
+      }
+      if (watcherInfo_ != null) {
+        output.writeMessage(2, getWatcherInfo());
       }
       unknownFields.writeTo(output);
     }
@@ -205,13 +207,13 @@ public final class ActivityUpdateWatcherNotifyOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (watcherInfo_ != null) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(3, getWatcherInfo());
-      }
       if (activityId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(15, activityId_);
+          .computeUInt32Size(1, activityId_);
+      }
+      if (watcherInfo_ != null) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(2, getWatcherInfo());
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -228,13 +230,13 @@ public final class ActivityUpdateWatcherNotifyOuterClass {
       }
       emu.grasscutter.net.proto.ActivityUpdateWatcherNotifyOuterClass.ActivityUpdateWatcherNotify other = (emu.grasscutter.net.proto.ActivityUpdateWatcherNotifyOuterClass.ActivityUpdateWatcherNotify) obj;
 
-      if (getActivityId()
-          != other.getActivityId()) return false;
       if (hasWatcherInfo() != other.hasWatcherInfo()) return false;
       if (hasWatcherInfo()) {
         if (!getWatcherInfo()
             .equals(other.getWatcherInfo())) return false;
       }
+      if (getActivityId()
+          != other.getActivityId()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -246,12 +248,12 @@ public final class ActivityUpdateWatcherNotifyOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + ACTIVITY_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getActivityId();
       if (hasWatcherInfo()) {
         hash = (37 * hash) + WATCHER_INFO_FIELD_NUMBER;
         hash = (53 * hash) + getWatcherInfo().hashCode();
       }
+      hash = (37 * hash) + ACTIVITY_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getActivityId();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -349,8 +351,10 @@ public final class ActivityUpdateWatcherNotifyOuterClass {
     }
     /**
      * <pre>
-     * Name: PPOLCIAJKGN
+     * CmdId: 2156
-     * CmdId: 2183
+     * EnetChannelId: 0
+     * EnetIsReliable: false
+     * IsAllowClient: true
      * </pre>
      *
      * Protobuf type {@code ActivityUpdateWatcherNotify}
@@ -390,14 +394,14 @@ public final class ActivityUpdateWatcherNotifyOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        activityId_ = 0;
-
         if (watcherInfoBuilder_ == null) {
           watcherInfo_ = null;
         } else {
           watcherInfo_ = null;
           watcherInfoBuilder_ = null;
         }
+        activityId_ = 0;
+
         return this;
       }
 
@@ -424,12 +428,12 @@ public final class ActivityUpdateWatcherNotifyOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.ActivityUpdateWatcherNotifyOuterClass.ActivityUpdateWatcherNotify buildPartial() {
         emu.grasscutter.net.proto.ActivityUpdateWatcherNotifyOuterClass.ActivityUpdateWatcherNotify result = new emu.grasscutter.net.proto.ActivityUpdateWatcherNotifyOuterClass.ActivityUpdateWatcherNotify(this);
-        result.activityId_ = activityId_;
         if (watcherInfoBuilder_ == null) {
           result.watcherInfo_ = watcherInfo_;
         } else {
           result.watcherInfo_ = watcherInfoBuilder_.build();
         }
+        result.activityId_ = activityId_;
         onBuilt();
         return result;
       }
@@ -478,12 +482,12 @@ public final class ActivityUpdateWatcherNotifyOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.ActivityUpdateWatcherNotifyOuterClass.ActivityUpdateWatcherNotify other) {
         if (other == emu.grasscutter.net.proto.ActivityUpdateWatcherNotifyOuterClass.ActivityUpdateWatcherNotify.getDefaultInstance()) return this;
-        if (other.getActivityId() != 0) {
-          setActivityId(other.getActivityId());
-        }
         if (other.hasWatcherInfo()) {
           mergeWatcherInfo(other.getWatcherInfo());
         }
+        if (other.getActivityId() != 0) {
+          setActivityId(other.getActivityId());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -513,49 +517,18 @@ public final class ActivityUpdateWatcherNotifyOuterClass {
         return this;
       }
 
-      private int activityId_ ;
-      /**
-       * <code>uint32 activity_id = 15;</code>
-       * @return The activityId.
-       */
-      @java.lang.Override
-      public int getActivityId() {
-        return activityId_;
-      }
-      /**
-       * <code>uint32 activity_id = 15;</code>
-       * @param value The activityId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setActivityId(int value) {
-        
-        activityId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 activity_id = 15;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearActivityId() {
-        
-        activityId_ = 0;
-        onChanged();
-        return this;
-      }
-
       private emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass.ActivityWatcherInfo watcherInfo_;
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass.ActivityWatcherInfo, emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass.ActivityWatcherInfo.Builder, emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass.ActivityWatcherInfoOrBuilder> watcherInfoBuilder_;
       /**
-       * <code>.ActivityWatcherInfo watcher_info = 3;</code>
+       * <code>.ActivityWatcherInfo watcher_info = 2;</code>
        * @return Whether the watcherInfo field is set.
        */
       public boolean hasWatcherInfo() {
         return watcherInfoBuilder_ != null || watcherInfo_ != null;
       }
       /**
-       * <code>.ActivityWatcherInfo watcher_info = 3;</code>
+       * <code>.ActivityWatcherInfo watcher_info = 2;</code>
        * @return The watcherInfo.
        */
       public emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass.ActivityWatcherInfo getWatcherInfo() {
@@ -566,7 +539,7 @@ public final class ActivityUpdateWatcherNotifyOuterClass {
         }
       }
       /**
-       * <code>.ActivityWatcherInfo watcher_info = 3;</code>
+       * <code>.ActivityWatcherInfo watcher_info = 2;</code>
        */
       public Builder setWatcherInfo(emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass.ActivityWatcherInfo value) {
         if (watcherInfoBuilder_ == null) {
@@ -582,7 +555,7 @@ public final class ActivityUpdateWatcherNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.ActivityWatcherInfo watcher_info = 3;</code>
+       * <code>.ActivityWatcherInfo watcher_info = 2;</code>
        */
       public Builder setWatcherInfo(
           emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass.ActivityWatcherInfo.Builder builderForValue) {
@@ -596,7 +569,7 @@ public final class ActivityUpdateWatcherNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.ActivityWatcherInfo watcher_info = 3;</code>
+       * <code>.ActivityWatcherInfo watcher_info = 2;</code>
        */
       public Builder mergeWatcherInfo(emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass.ActivityWatcherInfo value) {
         if (watcherInfoBuilder_ == null) {
@@ -614,7 +587,7 @@ public final class ActivityUpdateWatcherNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.ActivityWatcherInfo watcher_info = 3;</code>
+       * <code>.ActivityWatcherInfo watcher_info = 2;</code>
        */
       public Builder clearWatcherInfo() {
         if (watcherInfoBuilder_ == null) {
@@ -628,7 +601,7 @@ public final class ActivityUpdateWatcherNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.ActivityWatcherInfo watcher_info = 3;</code>
+       * <code>.ActivityWatcherInfo watcher_info = 2;</code>
        */
       public emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass.ActivityWatcherInfo.Builder getWatcherInfoBuilder() {
         
@@ -636,7 +609,7 @@ public final class ActivityUpdateWatcherNotifyOuterClass {
         return getWatcherInfoFieldBuilder().getBuilder();
       }
       /**
-       * <code>.ActivityWatcherInfo watcher_info = 3;</code>
+       * <code>.ActivityWatcherInfo watcher_info = 2;</code>
        */
       public emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass.ActivityWatcherInfoOrBuilder getWatcherInfoOrBuilder() {
         if (watcherInfoBuilder_ != null) {
@@ -647,7 +620,7 @@ public final class ActivityUpdateWatcherNotifyOuterClass {
         }
       }
       /**
-       * <code>.ActivityWatcherInfo watcher_info = 3;</code>
+       * <code>.ActivityWatcherInfo watcher_info = 2;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass.ActivityWatcherInfo, emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass.ActivityWatcherInfo.Builder, emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass.ActivityWatcherInfoOrBuilder> 
@@ -662,6 +635,37 @@ public final class ActivityUpdateWatcherNotifyOuterClass {
         }
         return watcherInfoBuilder_;
       }
+
+      private int activityId_ ;
+      /**
+       * <code>uint32 activity_id = 1;</code>
+       * @return The activityId.
+       */
+      @java.lang.Override
+      public int getActivityId() {
+        return activityId_;
+      }
+      /**
+       * <code>uint32 activity_id = 1;</code>
+       * @param value The activityId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setActivityId(int value) {
+        
+        activityId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 activity_id = 1;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearActivityId() {
+        
+        activityId_ = 0;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -731,8 +735,8 @@ public final class ActivityUpdateWatcherNotifyOuterClass {
     java.lang.String[] descriptorData = {
       "\n!ActivityUpdateWatcherNotify.proto\032\031Act" +
       "ivityWatcherInfo.proto\"^\n\033ActivityUpdate" +
-      "WatcherNotify\022\023\n\013activity_id\030\017 \001(\r\022*\n\014wa" +
+      "WatcherNotify\022*\n\014watcher_info\030\002 \001(\0132\024.Ac" +
-      "tcher_info\030\003 \001(\0132\024.ActivityWatcherInfoB\033" +
+      "tivityWatcherInfo\022\023\n\013activity_id\030\001 \001(\rB\033" +
       "\n\031emu.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -745,7 +749,7 @@ public final class ActivityUpdateWatcherNotifyOuterClass {
     internal_static_ActivityUpdateWatcherNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_ActivityUpdateWatcherNotify_descriptor,
-        new java.lang.String[] { "ActivityId", "WatcherInfo", });
+        new java.lang.String[] { "WatcherInfo", "ActivityId", });
     emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass.getDescriptor();
   }
 

src/generated/main/java/emu/grasscutter/net/proto/ActivityWatcherInfoOuterClass.java

@@ -19,34 +19,30 @@ public final class ActivityWatcherInfoOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 watcher_id = 14;</code>
+     * <code>bool is_taken_reward = 8;</code>
-     * @return The watcherId.
+     * @return The isTakenReward.
      */
-    int getWatcherId();
+    boolean getIsTakenReward();
 
     /**
-     * <code>uint32 cur_progress = 1;</code>
+     * <code>uint32 cur_progress = 2;</code>
      * @return The curProgress.
      */
     int getCurProgress();
 
     /**
-     * <code>uint32 total_progress = 13;</code>
+     * <code>uint32 total_progress = 4;</code>
      * @return The totalProgress.
      */
     int getTotalProgress();
 
     /**
-     * <code>bool is_taken_reward = 12;</code>
+     * <code>uint32 watcher_id = 5;</code>
-     * @return The isTakenReward.
+     * @return The watcherId.
      */
-    boolean getIsTakenReward();
+    int getWatcherId();
   }
   /**
-   * <pre>
-   * Name: NACCPGOMNLE
-   * </pre>
-   *
    * Protobuf type {@code ActivityWatcherInfo}
    */
   public static final class ActivityWatcherInfo extends
@@ -91,26 +87,26 @@ public final class ActivityWatcherInfoOuterClass {
             case 0:
               done = true;
               break;
-            case 8: {
+            case 16: {
 
               curProgress_ = input.readUInt32();
               break;
             }
-            case 96: {
+            case 32: {
-
-              isTakenReward_ = input.readBool();
-              break;
-            }
-            case 104: {
 
               totalProgress_ = input.readUInt32();
               break;
             }
-            case 112: {
+            case 40: {
 
               watcherId_ = input.readUInt32();
               break;
             }
+            case 64: {
+
+              isTakenReward_ = input.readBool();
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -143,21 +139,21 @@ public final class ActivityWatcherInfoOuterClass {
               emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass.ActivityWatcherInfo.class, emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass.ActivityWatcherInfo.Builder.class);
     }
 
-    public static final int WATCHER_ID_FIELD_NUMBER = 14;
+    public static final int IS_TAKEN_REWARD_FIELD_NUMBER = 8;
-    private int watcherId_;
+    private boolean isTakenReward_;
     /**
-     * <code>uint32 watcher_id = 14;</code>
+     * <code>bool is_taken_reward = 8;</code>
-     * @return The watcherId.
+     * @return The isTakenReward.
      */
     @java.lang.Override
-    public int getWatcherId() {
+    public boolean getIsTakenReward() {
-      return watcherId_;
+      return isTakenReward_;
     }
 
-    public static final int CUR_PROGRESS_FIELD_NUMBER = 1;
+    public static final int CUR_PROGRESS_FIELD_NUMBER = 2;
     private int curProgress_;
     /**
-     * <code>uint32 cur_progress = 1;</code>
+     * <code>uint32 cur_progress = 2;</code>
      * @return The curProgress.
      */
     @java.lang.Override
@@ -165,10 +161,10 @@ public final class ActivityWatcherInfoOuterClass {
       return curProgress_;
     }
 
-    public static final int TOTAL_PROGRESS_FIELD_NUMBER = 13;
+    public static final int TOTAL_PROGRESS_FIELD_NUMBER = 4;
     private int totalProgress_;
     /**
-     * <code>uint32 total_progress = 13;</code>
+     * <code>uint32 total_progress = 4;</code>
      * @return The totalProgress.
      */
     @java.lang.Override
@@ -176,15 +172,15 @@ public final class ActivityWatcherInfoOuterClass {
       return totalProgress_;
     }
 
-    public static final int IS_TAKEN_REWARD_FIELD_NUMBER = 12;
+    public static final int WATCHER_ID_FIELD_NUMBER = 5;
-    private boolean isTakenReward_;
+    private int watcherId_;
     /**
-     * <code>bool is_taken_reward = 12;</code>
+     * <code>uint32 watcher_id = 5;</code>
-     * @return The isTakenReward.
+     * @return The watcherId.
      */
     @java.lang.Override
-    public boolean getIsTakenReward() {
+    public int getWatcherId() {
-      return isTakenReward_;
+      return watcherId_;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -202,16 +198,16 @@ public final class ActivityWatcherInfoOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (curProgress_ != 0) {
-        output.writeUInt32(1, curProgress_);
+        output.writeUInt32(2, curProgress_);
-      }
-      if (isTakenReward_ != false) {
-        output.writeBool(12, isTakenReward_);
       }
       if (totalProgress_ != 0) {
-        output.writeUInt32(13, totalProgress_);
+        output.writeUInt32(4, totalProgress_);
       }
       if (watcherId_ != 0) {
-        output.writeUInt32(14, watcherId_);
+        output.writeUInt32(5, watcherId_);
+      }
+      if (isTakenReward_ != false) {
+        output.writeBool(8, isTakenReward_);
       }
       unknownFields.writeTo(output);
     }
@@ -224,19 +220,19 @@ public final class ActivityWatcherInfoOuterClass {
       size = 0;
       if (curProgress_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(1, curProgress_);
+          .computeUInt32Size(2, curProgress_);
-      }
-      if (isTakenReward_ != false) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(12, isTakenReward_);
       }
       if (totalProgress_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(13, totalProgress_);
+          .computeUInt32Size(4, totalProgress_);
       }
       if (watcherId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(14, watcherId_);
+          .computeUInt32Size(5, watcherId_);
+      }
+      if (isTakenReward_ != false) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBoolSize(8, isTakenReward_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -253,14 +249,14 @@ public final class ActivityWatcherInfoOuterClass {
       }
       emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass.ActivityWatcherInfo other = (emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass.ActivityWatcherInfo) obj;
 
-      if (getWatcherId()
+      if (getIsTakenReward()
-          != other.getWatcherId()) return false;
+          != other.getIsTakenReward()) return false;
       if (getCurProgress()
           != other.getCurProgress()) return false;
       if (getTotalProgress()
           != other.getTotalProgress()) return false;
-      if (getIsTakenReward()
+      if (getWatcherId()
-          != other.getIsTakenReward()) return false;
+          != other.getWatcherId()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -272,15 +268,15 @@ public final class ActivityWatcherInfoOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + WATCHER_ID_FIELD_NUMBER;
+      hash = (37 * hash) + IS_TAKEN_REWARD_FIELD_NUMBER;
-      hash = (53 * hash) + getWatcherId();
+      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+          getIsTakenReward());
       hash = (37 * hash) + CUR_PROGRESS_FIELD_NUMBER;
       hash = (53 * hash) + getCurProgress();
       hash = (37 * hash) + TOTAL_PROGRESS_FIELD_NUMBER;
       hash = (53 * hash) + getTotalProgress();
-      hash = (37 * hash) + IS_TAKEN_REWARD_FIELD_NUMBER;
+      hash = (37 * hash) + WATCHER_ID_FIELD_NUMBER;
-      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+      hash = (53 * hash) + getWatcherId();
-          getIsTakenReward());
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -377,10 +373,6 @@ public final class ActivityWatcherInfoOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Name: NACCPGOMNLE
-     * </pre>
-     *
      * Protobuf type {@code ActivityWatcherInfo}
      */
     public static final class Builder extends
@@ -418,13 +410,13 @@ public final class ActivityWatcherInfoOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        watcherId_ = 0;
+        isTakenReward_ = false;
 
         curProgress_ = 0;
 
         totalProgress_ = 0;
 
-        isTakenReward_ = false;
+        watcherId_ = 0;
 
         return this;
       }
@@ -452,10 +444,10 @@ public final class ActivityWatcherInfoOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass.ActivityWatcherInfo buildPartial() {
         emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass.ActivityWatcherInfo result = new emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass.ActivityWatcherInfo(this);
-        result.watcherId_ = watcherId_;
+        result.isTakenReward_ = isTakenReward_;
         result.curProgress_ = curProgress_;
         result.totalProgress_ = totalProgress_;
-        result.isTakenReward_ = isTakenReward_;
+        result.watcherId_ = watcherId_;
         onBuilt();
         return result;
       }
@@ -504,8 +496,8 @@ public final class ActivityWatcherInfoOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass.ActivityWatcherInfo other) {
         if (other == emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass.ActivityWatcherInfo.getDefaultInstance()) return this;
-        if (other.getWatcherId() != 0) {
+        if (other.getIsTakenReward() != false) {
-          setWatcherId(other.getWatcherId());
+          setIsTakenReward(other.getIsTakenReward());
         }
         if (other.getCurProgress() != 0) {
           setCurProgress(other.getCurProgress());
@@ -513,8 +505,8 @@ public final class ActivityWatcherInfoOuterClass {
         if (other.getTotalProgress() != 0) {
           setTotalProgress(other.getTotalProgress());
         }
-        if (other.getIsTakenReward() != false) {
+        if (other.getWatcherId() != 0) {
-          setIsTakenReward(other.getIsTakenReward());
+          setWatcherId(other.getWatcherId());
         }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
@@ -545,40 +537,40 @@ public final class ActivityWatcherInfoOuterClass {
         return this;
       }
 
-      private int watcherId_ ;
+      private boolean isTakenReward_ ;
       /**
-       * <code>uint32 watcher_id = 14;</code>
+       * <code>bool is_taken_reward = 8;</code>
-       * @return The watcherId.
+       * @return The isTakenReward.
        */
       @java.lang.Override
-      public int getWatcherId() {
+      public boolean getIsTakenReward() {
-        return watcherId_;
+        return isTakenReward_;
       }
       /**
-       * <code>uint32 watcher_id = 14;</code>
+       * <code>bool is_taken_reward = 8;</code>
-       * @param value The watcherId to set.
+       * @param value The isTakenReward to set.
        * @return This builder for chaining.
        */
-      public Builder setWatcherId(int value) {
+      public Builder setIsTakenReward(boolean value) {
         
-        watcherId_ = value;
+        isTakenReward_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 watcher_id = 14;</code>
+       * <code>bool is_taken_reward = 8;</code>
        * @return This builder for chaining.
        */
-      public Builder clearWatcherId() {
+      public Builder clearIsTakenReward() {
         
-        watcherId_ = 0;
+        isTakenReward_ = false;
         onChanged();
         return this;
       }
 
       private int curProgress_ ;
       /**
-       * <code>uint32 cur_progress = 1;</code>
+       * <code>uint32 cur_progress = 2;</code>
        * @return The curProgress.
        */
       @java.lang.Override
@@ -586,7 +578,7 @@ public final class ActivityWatcherInfoOuterClass {
         return curProgress_;
       }
       /**
-       * <code>uint32 cur_progress = 1;</code>
+       * <code>uint32 cur_progress = 2;</code>
        * @param value The curProgress to set.
        * @return This builder for chaining.
        */
@@ -597,7 +589,7 @@ public final class ActivityWatcherInfoOuterClass {
         return this;
       }
       /**
-       * <code>uint32 cur_progress = 1;</code>
+       * <code>uint32 cur_progress = 2;</code>
        * @return This builder for chaining.
        */
       public Builder clearCurProgress() {
@@ -609,7 +601,7 @@ public final class ActivityWatcherInfoOuterClass {
 
       private int totalProgress_ ;
       /**
-       * <code>uint32 total_progress = 13;</code>
+       * <code>uint32 total_progress = 4;</code>
        * @return The totalProgress.
        */
       @java.lang.Override
@@ -617,7 +609,7 @@ public final class ActivityWatcherInfoOuterClass {
         return totalProgress_;
       }
       /**
-       * <code>uint32 total_progress = 13;</code>
+       * <code>uint32 total_progress = 4;</code>
        * @param value The totalProgress to set.
        * @return This builder for chaining.
        */
@@ -628,7 +620,7 @@ public final class ActivityWatcherInfoOuterClass {
         return this;
       }
       /**
-       * <code>uint32 total_progress = 13;</code>
+       * <code>uint32 total_progress = 4;</code>
        * @return This builder for chaining.
        */
       public Builder clearTotalProgress() {
@@ -638,33 +630,33 @@ public final class ActivityWatcherInfoOuterClass {
         return this;
       }
 
-      private boolean isTakenReward_ ;
+      private int watcherId_ ;
       /**
-       * <code>bool is_taken_reward = 12;</code>
+       * <code>uint32 watcher_id = 5;</code>
-       * @return The isTakenReward.
+       * @return The watcherId.
        */
       @java.lang.Override
-      public boolean getIsTakenReward() {
+      public int getWatcherId() {
-        return isTakenReward_;
+        return watcherId_;
       }
       /**
-       * <code>bool is_taken_reward = 12;</code>
+       * <code>uint32 watcher_id = 5;</code>
-       * @param value The isTakenReward to set.
+       * @param value The watcherId to set.
        * @return This builder for chaining.
        */
-      public Builder setIsTakenReward(boolean value) {
+      public Builder setWatcherId(int value) {
         
-        isTakenReward_ = value;
+        watcherId_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>bool is_taken_reward = 12;</code>
+       * <code>uint32 watcher_id = 5;</code>
        * @return This builder for chaining.
        */
-      public Builder clearIsTakenReward() {
+      public Builder clearWatcherId() {
         
-        isTakenReward_ = false;
+        watcherId_ = 0;
         onChanged();
         return this;
       }
@@ -736,9 +728,9 @@ public final class ActivityWatcherInfoOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\031ActivityWatcherInfo.proto\"p\n\023ActivityW" +
-      "atcherInfo\022\022\n\nwatcher_id\030\016 \001(\r\022\024\n\014cur_pr" +
+      "atcherInfo\022\027\n\017is_taken_reward\030\010 \001(\010\022\024\n\014c" +
-      "ogress\030\001 \001(\r\022\026\n\016total_progress\030\r \001(\r\022\027\n\017" +
+      "ur_progress\030\002 \001(\r\022\026\n\016total_progress\030\004 \001(" +
-      "is_taken_reward\030\014 \001(\010B\033\n\031emu.grasscutter" +
+      "\r\022\022\n\nwatcher_id\030\005 \001(\rB\033\n\031emu.grasscutter" +
       ".net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -750,7 +742,7 @@ public final class ActivityWatcherInfoOuterClass {
     internal_static_ActivityWatcherInfo_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_ActivityWatcherInfo_descriptor,
-        new java.lang.String[] { "WatcherId", "CurProgress", "TotalProgress", "IsTakenReward", });
+        new java.lang.String[] { "IsTakenReward", "CurProgress", "TotalProgress", "WatcherId", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)

src/generated/main/java/emu/grasscutter/net/proto/AddCustomTeamReqOuterClass.java

@@ -1,10 +1,10 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: GetCompoundDataReq.proto
+// source: AddCustomTeamReq.proto
 
 package emu.grasscutter.net.proto;
 
-public final class GetCompoundDataReqOuterClass {
+public final class AddCustomTeamReqOuterClass {
-  private GetCompoundDataReqOuterClass() {}
+  private AddCustomTeamReqOuterClass() {}
   public static void registerAllExtensions(
       com.google.protobuf.ExtensionRegistryLite registry) {
   }
@@ -14,35 +14,37 @@ public final class GetCompoundDataReqOuterClass {
     registerAllExtensions(
         (com.google.protobuf.ExtensionRegistryLite) registry);
   }
-  public interface GetCompoundDataReqOrBuilder extends
+  public interface AddCustomTeamReqOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:GetCompoundDataReq)
+      // @@protoc_insertion_point(interface_extends:AddCustomTeamReq)
       com.google.protobuf.MessageOrBuilder {
   }
   /**
    * <pre>
-   * Name: KJDGGCGBDCK
+   * CmdId: 1687
-   * CmdId: 158
+   * EnetChannelId: 0
+   * EnetIsReliable: true
+   * IsAllowClient: true
    * </pre>
    *
-   * Protobuf type {@code GetCompoundDataReq}
+   * Protobuf type {@code AddCustomTeamReq}
    */
-  public static final class GetCompoundDataReq extends
+  public static final class AddCustomTeamReq extends
       com.google.protobuf.GeneratedMessageV3 implements
-      // @@protoc_insertion_point(message_implements:GetCompoundDataReq)
+      // @@protoc_insertion_point(message_implements:AddCustomTeamReq)
-      GetCompoundDataReqOrBuilder {
+      AddCustomTeamReqOrBuilder {
   private static final long serialVersionUID = 0L;
-    // Use GetCompoundDataReq.newBuilder() to construct.
+    // Use AddCustomTeamReq.newBuilder() to construct.
-    private GetCompoundDataReq(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
+    private AddCustomTeamReq(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
       super(builder);
     }
-    private GetCompoundDataReq() {
+    private AddCustomTeamReq() {
     }
 
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
         UnusedPrivateParameter unused) {
-      return new GetCompoundDataReq();
+      return new AddCustomTeamReq();
     }
 
     @java.lang.Override
@@ -50,7 +52,7 @@ public final class GetCompoundDataReqOuterClass {
     getUnknownFields() {
       return this.unknownFields;
     }
-    private GetCompoundDataReq(
+    private AddCustomTeamReq(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
@@ -89,15 +91,15 @@ public final class GetCompoundDataReqOuterClass {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return emu.grasscutter.net.proto.GetCompoundDataReqOuterClass.internal_static_GetCompoundDataReq_descriptor;
+      return emu.grasscutter.net.proto.AddCustomTeamReqOuterClass.internal_static_AddCustomTeamReq_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return emu.grasscutter.net.proto.GetCompoundDataReqOuterClass.internal_static_GetCompoundDataReq_fieldAccessorTable
+      return emu.grasscutter.net.proto.AddCustomTeamReqOuterClass.internal_static_AddCustomTeamReq_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              emu.grasscutter.net.proto.GetCompoundDataReqOuterClass.GetCompoundDataReq.class, emu.grasscutter.net.proto.GetCompoundDataReqOuterClass.GetCompoundDataReq.Builder.class);
+              emu.grasscutter.net.proto.AddCustomTeamReqOuterClass.AddCustomTeamReq.class, emu.grasscutter.net.proto.AddCustomTeamReqOuterClass.AddCustomTeamReq.Builder.class);
     }
 
     private byte memoizedIsInitialized = -1;
@@ -133,10 +135,10 @@ public final class GetCompoundDataReqOuterClass {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof emu.grasscutter.net.proto.GetCompoundDataReqOuterClass.GetCompoundDataReq)) {
+      if (!(obj instanceof emu.grasscutter.net.proto.AddCustomTeamReqOuterClass.AddCustomTeamReq)) {
         return super.equals(obj);
       }
-      emu.grasscutter.net.proto.GetCompoundDataReqOuterClass.GetCompoundDataReq other = (emu.grasscutter.net.proto.GetCompoundDataReqOuterClass.GetCompoundDataReq) obj;
+      emu.grasscutter.net.proto.AddCustomTeamReqOuterClass.AddCustomTeamReq other = (emu.grasscutter.net.proto.AddCustomTeamReqOuterClass.AddCustomTeamReq) obj;
 
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
@@ -154,69 +156,69 @@ public final class GetCompoundDataReqOuterClass {
       return hash;
     }
 
-    public static emu.grasscutter.net.proto.GetCompoundDataReqOuterClass.GetCompoundDataReq parseFrom(
+    public static emu.grasscutter.net.proto.AddCustomTeamReqOuterClass.AddCustomTeamReq parseFrom(
         java.nio.ByteBuffer data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static emu.grasscutter.net.proto.GetCompoundDataReqOuterClass.GetCompoundDataReq parseFrom(
+    public static emu.grasscutter.net.proto.AddCustomTeamReqOuterClass.AddCustomTeamReq parseFrom(
         java.nio.ByteBuffer data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static emu.grasscutter.net.proto.GetCompoundDataReqOuterClass.GetCompoundDataReq parseFrom(
+    public static emu.grasscutter.net.proto.AddCustomTeamReqOuterClass.AddCustomTeamReq parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static emu.grasscutter.net.proto.GetCompoundDataReqOuterClass.GetCompoundDataReq parseFrom(
+    public static emu.grasscutter.net.proto.AddCustomTeamReqOuterClass.AddCustomTeamReq parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static emu.grasscutter.net.proto.GetCompoundDataReqOuterClass.GetCompoundDataReq parseFrom(byte[] data)
+    public static emu.grasscutter.net.proto.AddCustomTeamReqOuterClass.AddCustomTeamReq parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static emu.grasscutter.net.proto.GetCompoundDataReqOuterClass.GetCompoundDataReq parseFrom(
+    public static emu.grasscutter.net.proto.AddCustomTeamReqOuterClass.AddCustomTeamReq parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static emu.grasscutter.net.proto.GetCompoundDataReqOuterClass.GetCompoundDataReq parseFrom(java.io.InputStream input)
+    public static emu.grasscutter.net.proto.AddCustomTeamReqOuterClass.AddCustomTeamReq parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static emu.grasscutter.net.proto.GetCompoundDataReqOuterClass.GetCompoundDataReq parseFrom(
+    public static emu.grasscutter.net.proto.AddCustomTeamReqOuterClass.AddCustomTeamReq parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static emu.grasscutter.net.proto.GetCompoundDataReqOuterClass.GetCompoundDataReq parseDelimitedFrom(java.io.InputStream input)
+    public static emu.grasscutter.net.proto.AddCustomTeamReqOuterClass.AddCustomTeamReq parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static emu.grasscutter.net.proto.GetCompoundDataReqOuterClass.GetCompoundDataReq parseDelimitedFrom(
+    public static emu.grasscutter.net.proto.AddCustomTeamReqOuterClass.AddCustomTeamReq parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static emu.grasscutter.net.proto.GetCompoundDataReqOuterClass.GetCompoundDataReq parseFrom(
+    public static emu.grasscutter.net.proto.AddCustomTeamReqOuterClass.AddCustomTeamReq parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static emu.grasscutter.net.proto.GetCompoundDataReqOuterClass.GetCompoundDataReq parseFrom(
+    public static emu.grasscutter.net.proto.AddCustomTeamReqOuterClass.AddCustomTeamReq parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -229,7 +231,7 @@ public final class GetCompoundDataReqOuterClass {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(emu.grasscutter.net.proto.GetCompoundDataReqOuterClass.GetCompoundDataReq prototype) {
+    public static Builder newBuilder(emu.grasscutter.net.proto.AddCustomTeamReqOuterClass.AddCustomTeamReq prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -246,30 +248,32 @@ public final class GetCompoundDataReqOuterClass {
     }
     /**
      * <pre>
-     * Name: KJDGGCGBDCK
+     * CmdId: 1687
-     * CmdId: 158
+     * EnetChannelId: 0
+     * EnetIsReliable: true
+     * IsAllowClient: true
      * </pre>
      *
-     * Protobuf type {@code GetCompoundDataReq}
+     * Protobuf type {@code AddCustomTeamReq}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
-        // @@protoc_insertion_point(builder_implements:GetCompoundDataReq)
+        // @@protoc_insertion_point(builder_implements:AddCustomTeamReq)
-        emu.grasscutter.net.proto.GetCompoundDataReqOuterClass.GetCompoundDataReqOrBuilder {
+        emu.grasscutter.net.proto.AddCustomTeamReqOuterClass.AddCustomTeamReqOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return emu.grasscutter.net.proto.GetCompoundDataReqOuterClass.internal_static_GetCompoundDataReq_descriptor;
+        return emu.grasscutter.net.proto.AddCustomTeamReqOuterClass.internal_static_AddCustomTeamReq_descriptor;
       }
 
       @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return emu.grasscutter.net.proto.GetCompoundDataReqOuterClass.internal_static_GetCompoundDataReq_fieldAccessorTable
+        return emu.grasscutter.net.proto.AddCustomTeamReqOuterClass.internal_static_AddCustomTeamReq_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                emu.grasscutter.net.proto.GetCompoundDataReqOuterClass.GetCompoundDataReq.class, emu.grasscutter.net.proto.GetCompoundDataReqOuterClass.GetCompoundDataReq.Builder.class);
+                emu.grasscutter.net.proto.AddCustomTeamReqOuterClass.AddCustomTeamReq.class, emu.grasscutter.net.proto.AddCustomTeamReqOuterClass.AddCustomTeamReq.Builder.class);
       }
 
-      // Construct using emu.grasscutter.net.proto.GetCompoundDataReqOuterClass.GetCompoundDataReq.newBuilder()
+      // Construct using emu.grasscutter.net.proto.AddCustomTeamReqOuterClass.AddCustomTeamReq.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -293,17 +297,17 @@ public final class GetCompoundDataReqOuterClass {
       @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return emu.grasscutter.net.proto.GetCompoundDataReqOuterClass.internal_static_GetCompoundDataReq_descriptor;
+        return emu.grasscutter.net.proto.AddCustomTeamReqOuterClass.internal_static_AddCustomTeamReq_descriptor;
       }
 
       @java.lang.Override
-      public emu.grasscutter.net.proto.GetCompoundDataReqOuterClass.GetCompoundDataReq getDefaultInstanceForType() {
+      public emu.grasscutter.net.proto.AddCustomTeamReqOuterClass.AddCustomTeamReq getDefaultInstanceForType() {
-        return emu.grasscutter.net.proto.GetCompoundDataReqOuterClass.GetCompoundDataReq.getDefaultInstance();
+        return emu.grasscutter.net.proto.AddCustomTeamReqOuterClass.AddCustomTeamReq.getDefaultInstance();
       }
 
       @java.lang.Override
-      public emu.grasscutter.net.proto.GetCompoundDataReqOuterClass.GetCompoundDataReq build() {
+      public emu.grasscutter.net.proto.AddCustomTeamReqOuterClass.AddCustomTeamReq build() {
-        emu.grasscutter.net.proto.GetCompoundDataReqOuterClass.GetCompoundDataReq result = buildPartial();
+        emu.grasscutter.net.proto.AddCustomTeamReqOuterClass.AddCustomTeamReq result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -311,8 +315,8 @@ public final class GetCompoundDataReqOuterClass {
       }
 
       @java.lang.Override
-      public emu.grasscutter.net.proto.GetCompoundDataReqOuterClass.GetCompoundDataReq buildPartial() {
+      public emu.grasscutter.net.proto.AddCustomTeamReqOuterClass.AddCustomTeamReq buildPartial() {
-        emu.grasscutter.net.proto.GetCompoundDataReqOuterClass.GetCompoundDataReq result = new emu.grasscutter.net.proto.GetCompoundDataReqOuterClass.GetCompoundDataReq(this);
+        emu.grasscutter.net.proto.AddCustomTeamReqOuterClass.AddCustomTeamReq result = new emu.grasscutter.net.proto.AddCustomTeamReqOuterClass.AddCustomTeamReq(this);
         onBuilt();
         return result;
       }
@@ -351,16 +355,16 @@ public final class GetCompoundDataReqOuterClass {
       }
       @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof emu.grasscutter.net.proto.GetCompoundDataReqOuterClass.GetCompoundDataReq) {
+        if (other instanceof emu.grasscutter.net.proto.AddCustomTeamReqOuterClass.AddCustomTeamReq) {
-          return mergeFrom((emu.grasscutter.net.proto.GetCompoundDataReqOuterClass.GetCompoundDataReq)other);
+          return mergeFrom((emu.grasscutter.net.proto.AddCustomTeamReqOuterClass.AddCustomTeamReq)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(emu.grasscutter.net.proto.GetCompoundDataReqOuterClass.GetCompoundDataReq other) {
+      public Builder mergeFrom(emu.grasscutter.net.proto.AddCustomTeamReqOuterClass.AddCustomTeamReq other) {
-        if (other == emu.grasscutter.net.proto.GetCompoundDataReqOuterClass.GetCompoundDataReq.getDefaultInstance()) return this;
+        if (other == emu.grasscutter.net.proto.AddCustomTeamReqOuterClass.AddCustomTeamReq.getDefaultInstance()) return this;
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -376,11 +380,11 @@ public final class GetCompoundDataReqOuterClass {
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        emu.grasscutter.net.proto.GetCompoundDataReqOuterClass.GetCompoundDataReq parsedMessage = null;
+        emu.grasscutter.net.proto.AddCustomTeamReqOuterClass.AddCustomTeamReq parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (emu.grasscutter.net.proto.GetCompoundDataReqOuterClass.GetCompoundDataReq) e.getUnfinishedMessage();
+          parsedMessage = (emu.grasscutter.net.proto.AddCustomTeamReqOuterClass.AddCustomTeamReq) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -402,51 +406,51 @@ public final class GetCompoundDataReqOuterClass {
       }
 
 
-      // @@protoc_insertion_point(builder_scope:GetCompoundDataReq)
+      // @@protoc_insertion_point(builder_scope:AddCustomTeamReq)
     }
 
-    // @@protoc_insertion_point(class_scope:GetCompoundDataReq)
+    // @@protoc_insertion_point(class_scope:AddCustomTeamReq)
-    private static final emu.grasscutter.net.proto.GetCompoundDataReqOuterClass.GetCompoundDataReq DEFAULT_INSTANCE;
+    private static final emu.grasscutter.net.proto.AddCustomTeamReqOuterClass.AddCustomTeamReq DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new emu.grasscutter.net.proto.GetCompoundDataReqOuterClass.GetCompoundDataReq();
+      DEFAULT_INSTANCE = new emu.grasscutter.net.proto.AddCustomTeamReqOuterClass.AddCustomTeamReq();
     }
 
-    public static emu.grasscutter.net.proto.GetCompoundDataReqOuterClass.GetCompoundDataReq getDefaultInstance() {
+    public static emu.grasscutter.net.proto.AddCustomTeamReqOuterClass.AddCustomTeamReq getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    private static final com.google.protobuf.Parser<GetCompoundDataReq>
+    private static final com.google.protobuf.Parser<AddCustomTeamReq>
-        PARSER = new com.google.protobuf.AbstractParser<GetCompoundDataReq>() {
+        PARSER = new com.google.protobuf.AbstractParser<AddCustomTeamReq>() {
       @java.lang.Override
-      public GetCompoundDataReq parsePartialFrom(
+      public AddCustomTeamReq parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new GetCompoundDataReq(input, extensionRegistry);
+        return new AddCustomTeamReq(input, extensionRegistry);
       }
     };
 
-    public static com.google.protobuf.Parser<GetCompoundDataReq> parser() {
+    public static com.google.protobuf.Parser<AddCustomTeamReq> parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public com.google.protobuf.Parser<GetCompoundDataReq> getParserForType() {
+    public com.google.protobuf.Parser<AddCustomTeamReq> getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public emu.grasscutter.net.proto.GetCompoundDataReqOuterClass.GetCompoundDataReq getDefaultInstanceForType() {
+    public emu.grasscutter.net.proto.AddCustomTeamReqOuterClass.AddCustomTeamReq getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
   }
 
   private static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_GetCompoundDataReq_descriptor;
+    internal_static_AddCustomTeamReq_descriptor;
   private static final 
     com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_GetCompoundDataReq_fieldAccessorTable;
+      internal_static_AddCustomTeamReq_fieldAccessorTable;
 
   public static com.google.protobuf.Descriptors.FileDescriptor
       getDescriptor() {
@@ -456,19 +460,19 @@ public final class GetCompoundDataReqOuterClass {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\030GetCompoundDataReq.proto\"\024\n\022GetCompoun" +
+      "\n\026AddCustomTeamReq.proto\"\022\n\020AddCustomTea" +
-      "dDataReqB\033\n\031emu.grasscutter.net.protob\006p" +
+      "mReqB\033\n\031emu.grasscutter.net.protob\006proto" +
-      "roto3"
+      "3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
         new com.google.protobuf.Descriptors.FileDescriptor[] {
         });
-    internal_static_GetCompoundDataReq_descriptor =
+    internal_static_AddCustomTeamReq_descriptor =
       getDescriptor().getMessageTypes().get(0);
-    internal_static_GetCompoundDataReq_fieldAccessorTable = new
+    internal_static_AddCustomTeamReq_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_GetCompoundDataReq_descriptor,
+        internal_static_AddCustomTeamReq_descriptor,
         new java.lang.String[] { });
   }
 

src/generated/main/java/emu/grasscutter/net/proto/AddCustomTeamRspOuterClass.java

@@ -1,10 +1,10 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: PlayerSetPauseRsp.proto
+// source: AddCustomTeamRsp.proto
 
 package emu.grasscutter.net.proto;
 
-public final class PlayerSetPauseRspOuterClass {
+public final class AddCustomTeamRspOuterClass {
-  private PlayerSetPauseRspOuterClass() {}
+  private AddCustomTeamRspOuterClass() {}
   public static void registerAllExtensions(
       com.google.protobuf.ExtensionRegistryLite registry) {
   }
@@ -14,8 +14,8 @@ public final class PlayerSetPauseRspOuterClass {
     registerAllExtensions(
         (com.google.protobuf.ExtensionRegistryLite) registry);
   }
-  public interface PlayerSetPauseRspOrBuilder extends
+  public interface AddCustomTeamRspOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:PlayerSetPauseRsp)
+      // @@protoc_insertion_point(interface_extends:AddCustomTeamRsp)
       com.google.protobuf.MessageOrBuilder {
 
     /**
@@ -26,29 +26,30 @@ public final class PlayerSetPauseRspOuterClass {
   }
   /**
    * <pre>
-   * Name: LKBGOHAPNME
+   * CmdId: 1735
-   * CmdId: 188
+   * EnetChannelId: 0
+   * EnetIsReliable: true
    * </pre>
    *
-   * Protobuf type {@code PlayerSetPauseRsp}
+   * Protobuf type {@code AddCustomTeamRsp}
    */
-  public static final class PlayerSetPauseRsp extends
+  public static final class AddCustomTeamRsp extends
       com.google.protobuf.GeneratedMessageV3 implements
-      // @@protoc_insertion_point(message_implements:PlayerSetPauseRsp)
+      // @@protoc_insertion_point(message_implements:AddCustomTeamRsp)
-      PlayerSetPauseRspOrBuilder {
+      AddCustomTeamRspOrBuilder {
   private static final long serialVersionUID = 0L;
-    // Use PlayerSetPauseRsp.newBuilder() to construct.
+    // Use AddCustomTeamRsp.newBuilder() to construct.
-    private PlayerSetPauseRsp(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
+    private AddCustomTeamRsp(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
       super(builder);
     }
-    private PlayerSetPauseRsp() {
+    private AddCustomTeamRsp() {
     }
 
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
         UnusedPrivateParameter unused) {
-      return new PlayerSetPauseRsp();
+      return new AddCustomTeamRsp();
     }
 
     @java.lang.Override
@@ -56,7 +57,7 @@ public final class PlayerSetPauseRspOuterClass {
     getUnknownFields() {
       return this.unknownFields;
     }
-    private PlayerSetPauseRsp(
+    private AddCustomTeamRsp(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
@@ -100,15 +101,15 @@ public final class PlayerSetPauseRspOuterClass {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return emu.grasscutter.net.proto.PlayerSetPauseRspOuterClass.internal_static_PlayerSetPauseRsp_descriptor;
+      return emu.grasscutter.net.proto.AddCustomTeamRspOuterClass.internal_static_AddCustomTeamRsp_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return emu.grasscutter.net.proto.PlayerSetPauseRspOuterClass.internal_static_PlayerSetPauseRsp_fieldAccessorTable
+      return emu.grasscutter.net.proto.AddCustomTeamRspOuterClass.internal_static_AddCustomTeamRsp_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              emu.grasscutter.net.proto.PlayerSetPauseRspOuterClass.PlayerSetPauseRsp.class, emu.grasscutter.net.proto.PlayerSetPauseRspOuterClass.PlayerSetPauseRsp.Builder.class);
+              emu.grasscutter.net.proto.AddCustomTeamRspOuterClass.AddCustomTeamRsp.class, emu.grasscutter.net.proto.AddCustomTeamRspOuterClass.AddCustomTeamRsp.Builder.class);
     }
 
     public static final int RETCODE_FIELD_NUMBER = 4;
@@ -162,10 +163,10 @@ public final class PlayerSetPauseRspOuterClass {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof emu.grasscutter.net.proto.PlayerSetPauseRspOuterClass.PlayerSetPauseRsp)) {
+      if (!(obj instanceof emu.grasscutter.net.proto.AddCustomTeamRspOuterClass.AddCustomTeamRsp)) {
         return super.equals(obj);
       }
-      emu.grasscutter.net.proto.PlayerSetPauseRspOuterClass.PlayerSetPauseRsp other = (emu.grasscutter.net.proto.PlayerSetPauseRspOuterClass.PlayerSetPauseRsp) obj;
+      emu.grasscutter.net.proto.AddCustomTeamRspOuterClass.AddCustomTeamRsp other = (emu.grasscutter.net.proto.AddCustomTeamRspOuterClass.AddCustomTeamRsp) obj;
 
       if (getRetcode()
           != other.getRetcode()) return false;
@@ -187,69 +188,69 @@ public final class PlayerSetPauseRspOuterClass {
       return hash;
     }
 
-    public static emu.grasscutter.net.proto.PlayerSetPauseRspOuterClass.PlayerSetPauseRsp parseFrom(
+    public static emu.grasscutter.net.proto.AddCustomTeamRspOuterClass.AddCustomTeamRsp parseFrom(
         java.nio.ByteBuffer data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static emu.grasscutter.net.proto.PlayerSetPauseRspOuterClass.PlayerSetPauseRsp parseFrom(
+    public static emu.grasscutter.net.proto.AddCustomTeamRspOuterClass.AddCustomTeamRsp parseFrom(
         java.nio.ByteBuffer data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static emu.grasscutter.net.proto.PlayerSetPauseRspOuterClass.PlayerSetPauseRsp parseFrom(
+    public static emu.grasscutter.net.proto.AddCustomTeamRspOuterClass.AddCustomTeamRsp parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static emu.grasscutter.net.proto.PlayerSetPauseRspOuterClass.PlayerSetPauseRsp parseFrom(
+    public static emu.grasscutter.net.proto.AddCustomTeamRspOuterClass.AddCustomTeamRsp parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static emu.grasscutter.net.proto.PlayerSetPauseRspOuterClass.PlayerSetPauseRsp parseFrom(byte[] data)
+    public static emu.grasscutter.net.proto.AddCustomTeamRspOuterClass.AddCustomTeamRsp parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static emu.grasscutter.net.proto.PlayerSetPauseRspOuterClass.PlayerSetPauseRsp parseFrom(
+    public static emu.grasscutter.net.proto.AddCustomTeamRspOuterClass.AddCustomTeamRsp parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static emu.grasscutter.net.proto.PlayerSetPauseRspOuterClass.PlayerSetPauseRsp parseFrom(java.io.InputStream input)
+    public static emu.grasscutter.net.proto.AddCustomTeamRspOuterClass.AddCustomTeamRsp parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static emu.grasscutter.net.proto.PlayerSetPauseRspOuterClass.PlayerSetPauseRsp parseFrom(
+    public static emu.grasscutter.net.proto.AddCustomTeamRspOuterClass.AddCustomTeamRsp parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static emu.grasscutter.net.proto.PlayerSetPauseRspOuterClass.PlayerSetPauseRsp parseDelimitedFrom(java.io.InputStream input)
+    public static emu.grasscutter.net.proto.AddCustomTeamRspOuterClass.AddCustomTeamRsp parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static emu.grasscutter.net.proto.PlayerSetPauseRspOuterClass.PlayerSetPauseRsp parseDelimitedFrom(
+    public static emu.grasscutter.net.proto.AddCustomTeamRspOuterClass.AddCustomTeamRsp parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static emu.grasscutter.net.proto.PlayerSetPauseRspOuterClass.PlayerSetPauseRsp parseFrom(
+    public static emu.grasscutter.net.proto.AddCustomTeamRspOuterClass.AddCustomTeamRsp parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static emu.grasscutter.net.proto.PlayerSetPauseRspOuterClass.PlayerSetPauseRsp parseFrom(
+    public static emu.grasscutter.net.proto.AddCustomTeamRspOuterClass.AddCustomTeamRsp parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -262,7 +263,7 @@ public final class PlayerSetPauseRspOuterClass {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(emu.grasscutter.net.proto.PlayerSetPauseRspOuterClass.PlayerSetPauseRsp prototype) {
+    public static Builder newBuilder(emu.grasscutter.net.proto.AddCustomTeamRspOuterClass.AddCustomTeamRsp prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -279,30 +280,31 @@ public final class PlayerSetPauseRspOuterClass {
     }
     /**
      * <pre>
-     * Name: LKBGOHAPNME
+     * CmdId: 1735
-     * CmdId: 188
+     * EnetChannelId: 0
+     * EnetIsReliable: true
      * </pre>
      *
-     * Protobuf type {@code PlayerSetPauseRsp}
+     * Protobuf type {@code AddCustomTeamRsp}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
-        // @@protoc_insertion_point(builder_implements:PlayerSetPauseRsp)
+        // @@protoc_insertion_point(builder_implements:AddCustomTeamRsp)
-        emu.grasscutter.net.proto.PlayerSetPauseRspOuterClass.PlayerSetPauseRspOrBuilder {
+        emu.grasscutter.net.proto.AddCustomTeamRspOuterClass.AddCustomTeamRspOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return emu.grasscutter.net.proto.PlayerSetPauseRspOuterClass.internal_static_PlayerSetPauseRsp_descriptor;
+        return emu.grasscutter.net.proto.AddCustomTeamRspOuterClass.internal_static_AddCustomTeamRsp_descriptor;
       }
 
       @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return emu.grasscutter.net.proto.PlayerSetPauseRspOuterClass.internal_static_PlayerSetPauseRsp_fieldAccessorTable
+        return emu.grasscutter.net.proto.AddCustomTeamRspOuterClass.internal_static_AddCustomTeamRsp_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                emu.grasscutter.net.proto.PlayerSetPauseRspOuterClass.PlayerSetPauseRsp.class, emu.grasscutter.net.proto.PlayerSetPauseRspOuterClass.PlayerSetPauseRsp.Builder.class);
+                emu.grasscutter.net.proto.AddCustomTeamRspOuterClass.AddCustomTeamRsp.class, emu.grasscutter.net.proto.AddCustomTeamRspOuterClass.AddCustomTeamRsp.Builder.class);
       }
 
-      // Construct using emu.grasscutter.net.proto.PlayerSetPauseRspOuterClass.PlayerSetPauseRsp.newBuilder()
+      // Construct using emu.grasscutter.net.proto.AddCustomTeamRspOuterClass.AddCustomTeamRsp.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -328,17 +330,17 @@ public final class PlayerSetPauseRspOuterClass {
       @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return emu.grasscutter.net.proto.PlayerSetPauseRspOuterClass.internal_static_PlayerSetPauseRsp_descriptor;
+        return emu.grasscutter.net.proto.AddCustomTeamRspOuterClass.internal_static_AddCustomTeamRsp_descriptor;
       }
 
       @java.lang.Override
-      public emu.grasscutter.net.proto.PlayerSetPauseRspOuterClass.PlayerSetPauseRsp getDefaultInstanceForType() {
+      public emu.grasscutter.net.proto.AddCustomTeamRspOuterClass.AddCustomTeamRsp getDefaultInstanceForType() {
-        return emu.grasscutter.net.proto.PlayerSetPauseRspOuterClass.PlayerSetPauseRsp.getDefaultInstance();
+        return emu.grasscutter.net.proto.AddCustomTeamRspOuterClass.AddCustomTeamRsp.getDefaultInstance();
       }
 
       @java.lang.Override
-      public emu.grasscutter.net.proto.PlayerSetPauseRspOuterClass.PlayerSetPauseRsp build() {
+      public emu.grasscutter.net.proto.AddCustomTeamRspOuterClass.AddCustomTeamRsp build() {
-        emu.grasscutter.net.proto.PlayerSetPauseRspOuterClass.PlayerSetPauseRsp result = buildPartial();
+        emu.grasscutter.net.proto.AddCustomTeamRspOuterClass.AddCustomTeamRsp result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -346,8 +348,8 @@ public final class PlayerSetPauseRspOuterClass {
       }
 
       @java.lang.Override
-      public emu.grasscutter.net.proto.PlayerSetPauseRspOuterClass.PlayerSetPauseRsp buildPartial() {
+      public emu.grasscutter.net.proto.AddCustomTeamRspOuterClass.AddCustomTeamRsp buildPartial() {
-        emu.grasscutter.net.proto.PlayerSetPauseRspOuterClass.PlayerSetPauseRsp result = new emu.grasscutter.net.proto.PlayerSetPauseRspOuterClass.PlayerSetPauseRsp(this);
+        emu.grasscutter.net.proto.AddCustomTeamRspOuterClass.AddCustomTeamRsp result = new emu.grasscutter.net.proto.AddCustomTeamRspOuterClass.AddCustomTeamRsp(this);
         result.retcode_ = retcode_;
         onBuilt();
         return result;
@@ -387,16 +389,16 @@ public final class PlayerSetPauseRspOuterClass {
       }
       @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof emu.grasscutter.net.proto.PlayerSetPauseRspOuterClass.PlayerSetPauseRsp) {
+        if (other instanceof emu.grasscutter.net.proto.AddCustomTeamRspOuterClass.AddCustomTeamRsp) {
-          return mergeFrom((emu.grasscutter.net.proto.PlayerSetPauseRspOuterClass.PlayerSetPauseRsp)other);
+          return mergeFrom((emu.grasscutter.net.proto.AddCustomTeamRspOuterClass.AddCustomTeamRsp)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(emu.grasscutter.net.proto.PlayerSetPauseRspOuterClass.PlayerSetPauseRsp other) {
+      public Builder mergeFrom(emu.grasscutter.net.proto.AddCustomTeamRspOuterClass.AddCustomTeamRsp other) {
-        if (other == emu.grasscutter.net.proto.PlayerSetPauseRspOuterClass.PlayerSetPauseRsp.getDefaultInstance()) return this;
+        if (other == emu.grasscutter.net.proto.AddCustomTeamRspOuterClass.AddCustomTeamRsp.getDefaultInstance()) return this;
         if (other.getRetcode() != 0) {
           setRetcode(other.getRetcode());
         }
@@ -415,11 +417,11 @@ public final class PlayerSetPauseRspOuterClass {
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        emu.grasscutter.net.proto.PlayerSetPauseRspOuterClass.PlayerSetPauseRsp parsedMessage = null;
+        emu.grasscutter.net.proto.AddCustomTeamRspOuterClass.AddCustomTeamRsp parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (emu.grasscutter.net.proto.PlayerSetPauseRspOuterClass.PlayerSetPauseRsp) e.getUnfinishedMessage();
+          parsedMessage = (emu.grasscutter.net.proto.AddCustomTeamRspOuterClass.AddCustomTeamRsp) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -472,51 +474,51 @@ public final class PlayerSetPauseRspOuterClass {
       }
 
 
-      // @@protoc_insertion_point(builder_scope:PlayerSetPauseRsp)
+      // @@protoc_insertion_point(builder_scope:AddCustomTeamRsp)
     }
 
-    // @@protoc_insertion_point(class_scope:PlayerSetPauseRsp)
+    // @@protoc_insertion_point(class_scope:AddCustomTeamRsp)
-    private static final emu.grasscutter.net.proto.PlayerSetPauseRspOuterClass.PlayerSetPauseRsp DEFAULT_INSTANCE;
+    private static final emu.grasscutter.net.proto.AddCustomTeamRspOuterClass.AddCustomTeamRsp DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new emu.grasscutter.net.proto.PlayerSetPauseRspOuterClass.PlayerSetPauseRsp();
+      DEFAULT_INSTANCE = new emu.grasscutter.net.proto.AddCustomTeamRspOuterClass.AddCustomTeamRsp();
     }
 
-    public static emu.grasscutter.net.proto.PlayerSetPauseRspOuterClass.PlayerSetPauseRsp getDefaultInstance() {
+    public static emu.grasscutter.net.proto.AddCustomTeamRspOuterClass.AddCustomTeamRsp getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    private static final com.google.protobuf.Parser<PlayerSetPauseRsp>
+    private static final com.google.protobuf.Parser<AddCustomTeamRsp>
-        PARSER = new com.google.protobuf.AbstractParser<PlayerSetPauseRsp>() {
+        PARSER = new com.google.protobuf.AbstractParser<AddCustomTeamRsp>() {
       @java.lang.Override
-      public PlayerSetPauseRsp parsePartialFrom(
+      public AddCustomTeamRsp parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new PlayerSetPauseRsp(input, extensionRegistry);
+        return new AddCustomTeamRsp(input, extensionRegistry);
       }
     };
 
-    public static com.google.protobuf.Parser<PlayerSetPauseRsp> parser() {
+    public static com.google.protobuf.Parser<AddCustomTeamRsp> parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public com.google.protobuf.Parser<PlayerSetPauseRsp> getParserForType() {
+    public com.google.protobuf.Parser<AddCustomTeamRsp> getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public emu.grasscutter.net.proto.PlayerSetPauseRspOuterClass.PlayerSetPauseRsp getDefaultInstanceForType() {
+    public emu.grasscutter.net.proto.AddCustomTeamRspOuterClass.AddCustomTeamRsp getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
   }
 
   private static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_PlayerSetPauseRsp_descriptor;
+    internal_static_AddCustomTeamRsp_descriptor;
   private static final 
     com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_PlayerSetPauseRsp_fieldAccessorTable;
+      internal_static_AddCustomTeamRsp_fieldAccessorTable;
 
   public static com.google.protobuf.Descriptors.FileDescriptor
       getDescriptor() {
@@ -526,19 +528,19 @@ public final class PlayerSetPauseRspOuterClass {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\027PlayerSetPauseRsp.proto\"$\n\021PlayerSetPa" +
+      "\n\026AddCustomTeamRsp.proto\"#\n\020AddCustomTea" +
-      "useRsp\022\017\n\007retcode\030\004 \001(\005B\033\n\031emu.grasscutt" +
+      "mRsp\022\017\n\007retcode\030\004 \001(\005B\033\n\031emu.grasscutter" +
-      "er.net.protob\006proto3"
+      ".net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
         new com.google.protobuf.Descriptors.FileDescriptor[] {
         });
-    internal_static_PlayerSetPauseRsp_descriptor =
+    internal_static_AddCustomTeamRsp_descriptor =
       getDescriptor().getMessageTypes().get(0);
-    internal_static_PlayerSetPauseRsp_fieldAccessorTable = new
+    internal_static_AddCustomTeamRsp_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_PlayerSetPauseRsp_descriptor,
+        internal_static_AddCustomTeamRsp_descriptor,
         new java.lang.String[] { "Retcode", });
   }
 

src/generated/main/java/emu/grasscutter/net/proto/AddNoGachaAvatarCardTransferItemOuterClass.java

@@ -1,687 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: AddNoGachaAvatarCardTransferItem.proto
-
-package emu.grasscutter.net.proto;
-
-public final class AddNoGachaAvatarCardTransferItemOuterClass {
-  private AddNoGachaAvatarCardTransferItemOuterClass() {}
-  public static void registerAllExtensions(
-      com.google.protobuf.ExtensionRegistryLite registry) {
-  }
-
-  public static void registerAllExtensions(
-      com.google.protobuf.ExtensionRegistry registry) {
-    registerAllExtensions(
-        (com.google.protobuf.ExtensionRegistryLite) registry);
-  }
-  public interface AddNoGachaAvatarCardTransferItemOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:AddNoGachaAvatarCardTransferItem)
-      com.google.protobuf.MessageOrBuilder {
-
-    /**
-     * <code>bool is_new = 1;</code>
-     * @return The isNew.
-     */
-    boolean getIsNew();
-
-    /**
-     * <code>uint32 count = 9;</code>
-     * @return The count.
-     */
-    int getCount();
-
-    /**
-     * <code>uint32 item_id = 14;</code>
-     * @return The itemId.
-     */
-    int getItemId();
-  }
-  /**
-   * <pre>
-   * Name: CMDOHKNKFDH
-   * </pre>
-   *
-   * Protobuf type {@code AddNoGachaAvatarCardTransferItem}
-   */
-  public static final class AddNoGachaAvatarCardTransferItem extends
-      com.google.protobuf.GeneratedMessageV3 implements
-      // @@protoc_insertion_point(message_implements:AddNoGachaAvatarCardTransferItem)
-      AddNoGachaAvatarCardTransferItemOrBuilder {
-  private static final long serialVersionUID = 0L;
-    // Use AddNoGachaAvatarCardTransferItem.newBuilder() to construct.
-    private AddNoGachaAvatarCardTransferItem(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
-      super(builder);
-    }
-    private AddNoGachaAvatarCardTransferItem() {
-    }
-
-    @java.lang.Override
-    @SuppressWarnings({"unused"})
-    protected java.lang.Object newInstance(
-        UnusedPrivateParameter unused) {
-      return new AddNoGachaAvatarCardTransferItem();
-    }
-
-    @java.lang.Override
-    public final com.google.protobuf.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private AddNoGachaAvatarCardTransferItem(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-          com.google.protobuf.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 8: {
-
-              isNew_ = input.readBool();
-              break;
-            }
-            case 72: {
-
-              count_ = input.readUInt32();
-              break;
-            }
-            case 112: {
-
-              itemId_ = input.readUInt32();
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new com.google.protobuf.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return emu.grasscutter.net.proto.AddNoGachaAvatarCardTransferItemOuterClass.internal_static_AddNoGachaAvatarCardTransferItem_descriptor;
-    }
-
-    @java.lang.Override
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return emu.grasscutter.net.proto.AddNoGachaAvatarCardTransferItemOuterClass.internal_static_AddNoGachaAvatarCardTransferItem_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              emu.grasscutter.net.proto.AddNoGachaAvatarCardTransferItemOuterClass.AddNoGachaAvatarCardTransferItem.class, emu.grasscutter.net.proto.AddNoGachaAvatarCardTransferItemOuterClass.AddNoGachaAvatarCardTransferItem.Builder.class);
-    }
-
-    public static final int IS_NEW_FIELD_NUMBER = 1;
-    private boolean isNew_;
-    /**
-     * <code>bool is_new = 1;</code>
-     * @return The isNew.
-     */
-    @java.lang.Override
-    public boolean getIsNew() {
-      return isNew_;
-    }
-
-    public static final int COUNT_FIELD_NUMBER = 9;
-    private int count_;
-    /**
-     * <code>uint32 count = 9;</code>
-     * @return The count.
-     */
-    @java.lang.Override
-    public int getCount() {
-      return count_;
-    }
-
-    public static final int ITEM_ID_FIELD_NUMBER = 14;
-    private int itemId_;
-    /**
-     * <code>uint32 item_id = 14;</code>
-     * @return The itemId.
-     */
-    @java.lang.Override
-    public int getItemId() {
-      return itemId_;
-    }
-
-    private byte memoizedIsInitialized = -1;
-    @java.lang.Override
-    public final boolean isInitialized() {
-      byte isInitialized = memoizedIsInitialized;
-      if (isInitialized == 1) return true;
-      if (isInitialized == 0) return false;
-
-      memoizedIsInitialized = 1;
-      return true;
-    }
-
-    @java.lang.Override
-    public void writeTo(com.google.protobuf.CodedOutputStream output)
-                        throws java.io.IOException {
-      if (isNew_ != false) {
-        output.writeBool(1, isNew_);
-      }
-      if (count_ != 0) {
-        output.writeUInt32(9, count_);
-      }
-      if (itemId_ != 0) {
-        output.writeUInt32(14, itemId_);
-      }
-      unknownFields.writeTo(output);
-    }
-
-    @java.lang.Override
-    public int getSerializedSize() {
-      int size = memoizedSize;
-      if (size != -1) return size;
-
-      size = 0;
-      if (isNew_ != false) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(1, isNew_);
-      }
-      if (count_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(9, count_);
-      }
-      if (itemId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(14, itemId_);
-      }
-      size += unknownFields.getSerializedSize();
-      memoizedSize = size;
-      return size;
-    }
-
-    @java.lang.Override
-    public boolean equals(final java.lang.Object obj) {
-      if (obj == this) {
-       return true;
-      }
-      if (!(obj instanceof emu.grasscutter.net.proto.AddNoGachaAvatarCardTransferItemOuterClass.AddNoGachaAvatarCardTransferItem)) {
-        return super.equals(obj);
-      }
-      emu.grasscutter.net.proto.AddNoGachaAvatarCardTransferItemOuterClass.AddNoGachaAvatarCardTransferItem other = (emu.grasscutter.net.proto.AddNoGachaAvatarCardTransferItemOuterClass.AddNoGachaAvatarCardTransferItem) obj;
-
-      if (getIsNew()
-          != other.getIsNew()) return false;
-      if (getCount()
-          != other.getCount()) return false;
-      if (getItemId()
-          != other.getItemId()) return false;
-      if (!unknownFields.equals(other.unknownFields)) return false;
-      return true;
-    }
-
-    @java.lang.Override
-    public int hashCode() {
-      if (memoizedHashCode != 0) {
-        return memoizedHashCode;
-      }
-      int hash = 41;
-      hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + IS_NEW_FIELD_NUMBER;
-      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
-          getIsNew());
-      hash = (37 * hash) + COUNT_FIELD_NUMBER;
-      hash = (53 * hash) + getCount();
-      hash = (37 * hash) + ITEM_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getItemId();
-      hash = (29 * hash) + unknownFields.hashCode();
-      memoizedHashCode = hash;
-      return hash;
-    }
-
-    public static emu.grasscutter.net.proto.AddNoGachaAvatarCardTransferItemOuterClass.AddNoGachaAvatarCardTransferItem parseFrom(
-        java.nio.ByteBuffer data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
-    }
-    public static emu.grasscutter.net.proto.AddNoGachaAvatarCardTransferItemOuterClass.AddNoGachaAvatarCardTransferItem parseFrom(
-        java.nio.ByteBuffer data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
-    }
-    public static emu.grasscutter.net.proto.AddNoGachaAvatarCardTransferItemOuterClass.AddNoGachaAvatarCardTransferItem parseFrom(
-        com.google.protobuf.ByteString data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
-    }
-    public static emu.grasscutter.net.proto.AddNoGachaAvatarCardTransferItemOuterClass.AddNoGachaAvatarCardTransferItem parseFrom(
-        com.google.protobuf.ByteString data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
-    }
-    public static emu.grasscutter.net.proto.AddNoGachaAvatarCardTransferItemOuterClass.AddNoGachaAvatarCardTransferItem parseFrom(byte[] data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
-    }
-    public static emu.grasscutter.net.proto.AddNoGachaAvatarCardTransferItemOuterClass.AddNoGachaAvatarCardTransferItem parseFrom(
-        byte[] data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
-    }
-    public static emu.grasscutter.net.proto.AddNoGachaAvatarCardTransferItemOuterClass.AddNoGachaAvatarCardTransferItem parseFrom(java.io.InputStream input)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input);
-    }
-    public static emu.grasscutter.net.proto.AddNoGachaAvatarCardTransferItemOuterClass.AddNoGachaAvatarCardTransferItem parseFrom(
-        java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input, extensionRegistry);
-    }
-    public static emu.grasscutter.net.proto.AddNoGachaAvatarCardTransferItemOuterClass.AddNoGachaAvatarCardTransferItem parseDelimitedFrom(java.io.InputStream input)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseDelimitedWithIOException(PARSER, input);
-    }
-    public static emu.grasscutter.net.proto.AddNoGachaAvatarCardTransferItemOuterClass.AddNoGachaAvatarCardTransferItem parseDelimitedFrom(
-        java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-    }
-    public static emu.grasscutter.net.proto.AddNoGachaAvatarCardTransferItemOuterClass.AddNoGachaAvatarCardTransferItem parseFrom(
-        com.google.protobuf.CodedInputStream input)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input);
-    }
-    public static emu.grasscutter.net.proto.AddNoGachaAvatarCardTransferItemOuterClass.AddNoGachaAvatarCardTransferItem parseFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input, extensionRegistry);
-    }
-
-    @java.lang.Override
-    public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder() {
-      return DEFAULT_INSTANCE.toBuilder();
-    }
-    public static Builder newBuilder(emu.grasscutter.net.proto.AddNoGachaAvatarCardTransferItemOuterClass.AddNoGachaAvatarCardTransferItem prototype) {
-      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-    }
-    @java.lang.Override
-    public Builder toBuilder() {
-      return this == DEFAULT_INSTANCE
-          ? new Builder() : new Builder().mergeFrom(this);
-    }
-
-    @java.lang.Override
-    protected Builder newBuilderForType(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-      Builder builder = new Builder(parent);
-      return builder;
-    }
-    /**
-     * <pre>
-     * Name: CMDOHKNKFDH
-     * </pre>
-     *
-     * Protobuf type {@code AddNoGachaAvatarCardTransferItem}
-     */
-    public static final class Builder extends
-        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
-        // @@protoc_insertion_point(builder_implements:AddNoGachaAvatarCardTransferItem)
-        emu.grasscutter.net.proto.AddNoGachaAvatarCardTransferItemOuterClass.AddNoGachaAvatarCardTransferItemOrBuilder {
-      public static final com.google.protobuf.Descriptors.Descriptor
-          getDescriptor() {
-        return emu.grasscutter.net.proto.AddNoGachaAvatarCardTransferItemOuterClass.internal_static_AddNoGachaAvatarCardTransferItem_descriptor;
-      }
-
-      @java.lang.Override
-      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-          internalGetFieldAccessorTable() {
-        return emu.grasscutter.net.proto.AddNoGachaAvatarCardTransferItemOuterClass.internal_static_AddNoGachaAvatarCardTransferItem_fieldAccessorTable
-            .ensureFieldAccessorsInitialized(
-                emu.grasscutter.net.proto.AddNoGachaAvatarCardTransferItemOuterClass.AddNoGachaAvatarCardTransferItem.class, emu.grasscutter.net.proto.AddNoGachaAvatarCardTransferItemOuterClass.AddNoGachaAvatarCardTransferItem.Builder.class);
-      }
-
-      // Construct using emu.grasscutter.net.proto.AddNoGachaAvatarCardTransferItemOuterClass.AddNoGachaAvatarCardTransferItem.newBuilder()
-      private Builder() {
-        maybeForceBuilderInitialization();
-      }
-
-      private Builder(
-          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-        super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (com.google.protobuf.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-        }
-      }
-      @java.lang.Override
-      public Builder clear() {
-        super.clear();
-        isNew_ = false;
-
-        count_ = 0;
-
-        itemId_ = 0;
-
-        return this;
-      }
-
-      @java.lang.Override
-      public com.google.protobuf.Descriptors.Descriptor
-          getDescriptorForType() {
-        return emu.grasscutter.net.proto.AddNoGachaAvatarCardTransferItemOuterClass.internal_static_AddNoGachaAvatarCardTransferItem_descriptor;
-      }
-
-      @java.lang.Override
-      public emu.grasscutter.net.proto.AddNoGachaAvatarCardTransferItemOuterClass.AddNoGachaAvatarCardTransferItem getDefaultInstanceForType() {
-        return emu.grasscutter.net.proto.AddNoGachaAvatarCardTransferItemOuterClass.AddNoGachaAvatarCardTransferItem.getDefaultInstance();
-      }
-
-      @java.lang.Override
-      public emu.grasscutter.net.proto.AddNoGachaAvatarCardTransferItemOuterClass.AddNoGachaAvatarCardTransferItem build() {
-        emu.grasscutter.net.proto.AddNoGachaAvatarCardTransferItemOuterClass.AddNoGachaAvatarCardTransferItem result = buildPartial();
-        if (!result.isInitialized()) {
-          throw newUninitializedMessageException(result);
-        }
-        return result;
-      }
-
-      @java.lang.Override
-      public emu.grasscutter.net.proto.AddNoGachaAvatarCardTransferItemOuterClass.AddNoGachaAvatarCardTransferItem buildPartial() {
-        emu.grasscutter.net.proto.AddNoGachaAvatarCardTransferItemOuterClass.AddNoGachaAvatarCardTransferItem result = new emu.grasscutter.net.proto.AddNoGachaAvatarCardTransferItemOuterClass.AddNoGachaAvatarCardTransferItem(this);
-        result.isNew_ = isNew_;
-        result.count_ = count_;
-        result.itemId_ = itemId_;
-        onBuilt();
-        return result;
-      }
-
-      @java.lang.Override
-      public Builder clone() {
-        return super.clone();
-      }
-      @java.lang.Override
-      public Builder setField(
-          com.google.protobuf.Descriptors.FieldDescriptor field,
-          java.lang.Object value) {
-        return super.setField(field, value);
-      }
-      @java.lang.Override
-      public Builder clearField(
-          com.google.protobuf.Descriptors.FieldDescriptor field) {
-        return super.clearField(field);
-      }
-      @java.lang.Override
-      public Builder clearOneof(
-          com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-        return super.clearOneof(oneof);
-      }
-      @java.lang.Override
-      public Builder setRepeatedField(
-          com.google.protobuf.Descriptors.FieldDescriptor field,
-          int index, java.lang.Object value) {
-        return super.setRepeatedField(field, index, value);
-      }
-      @java.lang.Override
-      public Builder addRepeatedField(
-          com.google.protobuf.Descriptors.FieldDescriptor field,
-          java.lang.Object value) {
-        return super.addRepeatedField(field, value);
-      }
-      @java.lang.Override
-      public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof emu.grasscutter.net.proto.AddNoGachaAvatarCardTransferItemOuterClass.AddNoGachaAvatarCardTransferItem) {
-          return mergeFrom((emu.grasscutter.net.proto.AddNoGachaAvatarCardTransferItemOuterClass.AddNoGachaAvatarCardTransferItem)other);
-        } else {
-          super.mergeFrom(other);
-          return this;
-        }
-      }
-
-      public Builder mergeFrom(emu.grasscutter.net.proto.AddNoGachaAvatarCardTransferItemOuterClass.AddNoGachaAvatarCardTransferItem other) {
-        if (other == emu.grasscutter.net.proto.AddNoGachaAvatarCardTransferItemOuterClass.AddNoGachaAvatarCardTransferItem.getDefaultInstance()) return this;
-        if (other.getIsNew() != false) {
-          setIsNew(other.getIsNew());
-        }
-        if (other.getCount() != 0) {
-          setCount(other.getCount());
-        }
-        if (other.getItemId() != 0) {
-          setItemId(other.getItemId());
-        }
-        this.mergeUnknownFields(other.unknownFields);
-        onChanged();
-        return this;
-      }
-
-      @java.lang.Override
-      public final boolean isInitialized() {
-        return true;
-      }
-
-      @java.lang.Override
-      public Builder mergeFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws java.io.IOException {
-        emu.grasscutter.net.proto.AddNoGachaAvatarCardTransferItemOuterClass.AddNoGachaAvatarCardTransferItem parsedMessage = null;
-        try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (emu.grasscutter.net.proto.AddNoGachaAvatarCardTransferItemOuterClass.AddNoGachaAvatarCardTransferItem) e.getUnfinishedMessage();
-          throw e.unwrapIOException();
-        } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
-        return this;
-      }
-
-      private boolean isNew_ ;
-      /**
-       * <code>bool is_new = 1;</code>
-       * @return The isNew.
-       */
-      @java.lang.Override
-      public boolean getIsNew() {
-        return isNew_;
-      }
-      /**
-       * <code>bool is_new = 1;</code>
-       * @param value The isNew to set.
-       * @return This builder for chaining.
-       */
-      public Builder setIsNew(boolean value) {
-        
-        isNew_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>bool is_new = 1;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearIsNew() {
-        
-        isNew_ = false;
-        onChanged();
-        return this;
-      }
-
-      private int count_ ;
-      /**
-       * <code>uint32 count = 9;</code>
-       * @return The count.
-       */
-      @java.lang.Override
-      public int getCount() {
-        return count_;
-      }
-      /**
-       * <code>uint32 count = 9;</code>
-       * @param value The count to set.
-       * @return This builder for chaining.
-       */
-      public Builder setCount(int value) {
-        
-        count_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 count = 9;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearCount() {
-        
-        count_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int itemId_ ;
-      /**
-       * <code>uint32 item_id = 14;</code>
-       * @return The itemId.
-       */
-      @java.lang.Override
-      public int getItemId() {
-        return itemId_;
-      }
-      /**
-       * <code>uint32 item_id = 14;</code>
-       * @param value The itemId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setItemId(int value) {
-        
-        itemId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 item_id = 14;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearItemId() {
-        
-        itemId_ = 0;
-        onChanged();
-        return this;
-      }
-      @java.lang.Override
-      public final Builder setUnknownFields(
-          final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return super.setUnknownFields(unknownFields);
-      }
-
-      @java.lang.Override
-      public final Builder mergeUnknownFields(
-          final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return super.mergeUnknownFields(unknownFields);
-      }
-
-
-      // @@protoc_insertion_point(builder_scope:AddNoGachaAvatarCardTransferItem)
-    }
-
-    // @@protoc_insertion_point(class_scope:AddNoGachaAvatarCardTransferItem)
-    private static final emu.grasscutter.net.proto.AddNoGachaAvatarCardTransferItemOuterClass.AddNoGachaAvatarCardTransferItem DEFAULT_INSTANCE;
-    static {
-      DEFAULT_INSTANCE = new emu.grasscutter.net.proto.AddNoGachaAvatarCardTransferItemOuterClass.AddNoGachaAvatarCardTransferItem();
-    }
-
-    public static emu.grasscutter.net.proto.AddNoGachaAvatarCardTransferItemOuterClass.AddNoGachaAvatarCardTransferItem getDefaultInstance() {
-      return DEFAULT_INSTANCE;
-    }
-
-    private static final com.google.protobuf.Parser<AddNoGachaAvatarCardTransferItem>
-        PARSER = new com.google.protobuf.AbstractParser<AddNoGachaAvatarCardTransferItem>() {
-      @java.lang.Override
-      public AddNoGachaAvatarCardTransferItem parsePartialFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return new AddNoGachaAvatarCardTransferItem(input, extensionRegistry);
-      }
-    };
-
-    public static com.google.protobuf.Parser<AddNoGachaAvatarCardTransferItem> parser() {
-      return PARSER;
-    }
-
-    @java.lang.Override
-    public com.google.protobuf.Parser<AddNoGachaAvatarCardTransferItem> getParserForType() {
-      return PARSER;
-    }
-
-    @java.lang.Override
-    public emu.grasscutter.net.proto.AddNoGachaAvatarCardTransferItemOuterClass.AddNoGachaAvatarCardTransferItem getDefaultInstanceForType() {
-      return DEFAULT_INSTANCE;
-    }
-
-  }
-
-  private static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_AddNoGachaAvatarCardTransferItem_descriptor;
-  private static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_AddNoGachaAvatarCardTransferItem_fieldAccessorTable;
-
-  public static com.google.protobuf.Descriptors.FileDescriptor
-      getDescriptor() {
-    return descriptor;
-  }
-  private static  com.google.protobuf.Descriptors.FileDescriptor
-      descriptor;
-  static {
-    java.lang.String[] descriptorData = {
-      "\n&AddNoGachaAvatarCardTransferItem.proto" +
-      "\"R\n AddNoGachaAvatarCardTransferItem\022\016\n\006" +
-      "is_new\030\001 \001(\010\022\r\n\005count\030\t \001(\r\022\017\n\007item_id\030\016" +
-      " \001(\rB\033\n\031emu.grasscutter.net.protob\006proto" +
-      "3"
-    };
-    descriptor = com.google.protobuf.Descriptors.FileDescriptor
-      .internalBuildGeneratedFileFrom(descriptorData,
-        new com.google.protobuf.Descriptors.FileDescriptor[] {
-        });
-    internal_static_AddNoGachaAvatarCardTransferItem_descriptor =
-      getDescriptor().getMessageTypes().get(0);
-    internal_static_AddNoGachaAvatarCardTransferItem_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_AddNoGachaAvatarCardTransferItem_descriptor,
-        new java.lang.String[] { "IsNew", "Count", "ItemId", });
-  }
-
-  // @@protoc_insertion_point(outer_class_scope)
-}

src/generated/main/java/emu/grasscutter/net/proto/AddQuestContentProgressReqOuterClass.java

@@ -19,27 +19,29 @@ public final class AddQuestContentProgressReqOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 param = 10;</code>
+     * <code>uint32 content_type = 6;</code>
-     * @return The param.
-     */
-    int getParam();
-
-    /**
-     * <code>uint32 content_type = 2;</code>
      * @return The contentType.
      */
     int getContentType();
 
     /**
-     * <code>uint32 add_progress = 8;</code>
+     * <code>uint32 param = 12;</code>
+     * @return The param.
+     */
+    int getParam();
+
+    /**
+     * <code>uint32 add_progress = 15;</code>
      * @return The addProgress.
      */
     int getAddProgress();
   }
   /**
    * <pre>
-   * Name: GALKBFKDBEG
+   * CmdId: 421
-   * CmdId: 434
+   * EnetChannelId: 0
+   * EnetIsReliable: false
+   * IsAllowClient: true
    * </pre>
    *
    * Protobuf type {@code AddQuestContentProgressReq}
@@ -86,21 +88,21 @@ public final class AddQuestContentProgressReqOuterClass {
             case 0:
               done = true;
               break;
-            case 16: {
+            case 48: {
 
               contentType_ = input.readUInt32();
               break;
             }
-            case 64: {
+            case 96: {
-
-              addProgress_ = input.readUInt32();
-              break;
-            }
-            case 80: {
 
               param_ = input.readUInt32();
               break;
             }
+            case 120: {
+
+              addProgress_ = input.readUInt32();
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -133,21 +135,10 @@ public final class AddQuestContentProgressReqOuterClass {
               emu.grasscutter.net.proto.AddQuestContentProgressReqOuterClass.AddQuestContentProgressReq.class, emu.grasscutter.net.proto.AddQuestContentProgressReqOuterClass.AddQuestContentProgressReq.Builder.class);
     }
 
-    public static final int PARAM_FIELD_NUMBER = 10;
+    public static final int CONTENT_TYPE_FIELD_NUMBER = 6;
-    private int param_;
-    /**
-     * <code>uint32 param = 10;</code>
-     * @return The param.
-     */
-    @java.lang.Override
-    public int getParam() {
-      return param_;
-    }
-
-    public static final int CONTENT_TYPE_FIELD_NUMBER = 2;
     private int contentType_;
     /**
-     * <code>uint32 content_type = 2;</code>
+     * <code>uint32 content_type = 6;</code>
      * @return The contentType.
      */
     @java.lang.Override
@@ -155,10 +146,21 @@ public final class AddQuestContentProgressReqOuterClass {
       return contentType_;
     }
 
-    public static final int ADD_PROGRESS_FIELD_NUMBER = 8;
+    public static final int PARAM_FIELD_NUMBER = 12;
+    private int param_;
+    /**
+     * <code>uint32 param = 12;</code>
+     * @return The param.
+     */
+    @java.lang.Override
+    public int getParam() {
+      return param_;
+    }
+
+    public static final int ADD_PROGRESS_FIELD_NUMBER = 15;
     private int addProgress_;
     /**
-     * <code>uint32 add_progress = 8;</code>
+     * <code>uint32 add_progress = 15;</code>
      * @return The addProgress.
      */
     @java.lang.Override
@@ -181,13 +183,13 @@ public final class AddQuestContentProgressReqOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (contentType_ != 0) {
-        output.writeUInt32(2, contentType_);
+        output.writeUInt32(6, contentType_);
-      }
-      if (addProgress_ != 0) {
-        output.writeUInt32(8, addProgress_);
       }
       if (param_ != 0) {
-        output.writeUInt32(10, param_);
+        output.writeUInt32(12, param_);
+      }
+      if (addProgress_ != 0) {
+        output.writeUInt32(15, addProgress_);
       }
       unknownFields.writeTo(output);
     }
@@ -200,15 +202,15 @@ public final class AddQuestContentProgressReqOuterClass {
       size = 0;
       if (contentType_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(2, contentType_);
+          .computeUInt32Size(6, contentType_);
-      }
-      if (addProgress_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(8, addProgress_);
       }
       if (param_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(10, param_);
+          .computeUInt32Size(12, param_);
+      }
+      if (addProgress_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(15, addProgress_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -225,10 +227,10 @@ public final class AddQuestContentProgressReqOuterClass {
       }
       emu.grasscutter.net.proto.AddQuestContentProgressReqOuterClass.AddQuestContentProgressReq other = (emu.grasscutter.net.proto.AddQuestContentProgressReqOuterClass.AddQuestContentProgressReq) obj;
 
-      if (getParam()
-          != other.getParam()) return false;
       if (getContentType()
           != other.getContentType()) return false;
+      if (getParam()
+          != other.getParam()) return false;
       if (getAddProgress()
           != other.getAddProgress()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
@@ -242,10 +244,10 @@ public final class AddQuestContentProgressReqOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + PARAM_FIELD_NUMBER;
-      hash = (53 * hash) + getParam();
       hash = (37 * hash) + CONTENT_TYPE_FIELD_NUMBER;
       hash = (53 * hash) + getContentType();
+      hash = (37 * hash) + PARAM_FIELD_NUMBER;
+      hash = (53 * hash) + getParam();
       hash = (37 * hash) + ADD_PROGRESS_FIELD_NUMBER;
       hash = (53 * hash) + getAddProgress();
       hash = (29 * hash) + unknownFields.hashCode();
@@ -345,8 +347,10 @@ public final class AddQuestContentProgressReqOuterClass {
     }
     /**
      * <pre>
-     * Name: GALKBFKDBEG
+     * CmdId: 421
-     * CmdId: 434
+     * EnetChannelId: 0
+     * EnetIsReliable: false
+     * IsAllowClient: true
      * </pre>
      *
      * Protobuf type {@code AddQuestContentProgressReq}
@@ -386,10 +390,10 @@ public final class AddQuestContentProgressReqOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        param_ = 0;
-
         contentType_ = 0;
 
+        param_ = 0;
+
         addProgress_ = 0;
 
         return this;
@@ -418,8 +422,8 @@ public final class AddQuestContentProgressReqOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.AddQuestContentProgressReqOuterClass.AddQuestContentProgressReq buildPartial() {
         emu.grasscutter.net.proto.AddQuestContentProgressReqOuterClass.AddQuestContentProgressReq result = new emu.grasscutter.net.proto.AddQuestContentProgressReqOuterClass.AddQuestContentProgressReq(this);
-        result.param_ = param_;
         result.contentType_ = contentType_;
+        result.param_ = param_;
         result.addProgress_ = addProgress_;
         onBuilt();
         return result;
@@ -469,12 +473,12 @@ public final class AddQuestContentProgressReqOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.AddQuestContentProgressReqOuterClass.AddQuestContentProgressReq other) {
         if (other == emu.grasscutter.net.proto.AddQuestContentProgressReqOuterClass.AddQuestContentProgressReq.getDefaultInstance()) return this;
-        if (other.getParam() != 0) {
-          setParam(other.getParam());
-        }
         if (other.getContentType() != 0) {
           setContentType(other.getContentType());
         }
+        if (other.getParam() != 0) {
+          setParam(other.getParam());
+        }
         if (other.getAddProgress() != 0) {
           setAddProgress(other.getAddProgress());
         }
@@ -507,40 +511,9 @@ public final class AddQuestContentProgressReqOuterClass {
         return this;
       }
 
-      private int param_ ;
-      /**
-       * <code>uint32 param = 10;</code>
-       * @return The param.
-       */
-      @java.lang.Override
-      public int getParam() {
-        return param_;
-      }
-      /**
-       * <code>uint32 param = 10;</code>
-       * @param value The param to set.
-       * @return This builder for chaining.
-       */
-      public Builder setParam(int value) {
-        
-        param_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 param = 10;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearParam() {
-        
-        param_ = 0;
-        onChanged();
-        return this;
-      }
-
       private int contentType_ ;
       /**
-       * <code>uint32 content_type = 2;</code>
+       * <code>uint32 content_type = 6;</code>
        * @return The contentType.
        */
       @java.lang.Override
@@ -548,7 +521,7 @@ public final class AddQuestContentProgressReqOuterClass {
         return contentType_;
       }
       /**
-       * <code>uint32 content_type = 2;</code>
+       * <code>uint32 content_type = 6;</code>
        * @param value The contentType to set.
        * @return This builder for chaining.
        */
@@ -559,7 +532,7 @@ public final class AddQuestContentProgressReqOuterClass {
         return this;
       }
       /**
-       * <code>uint32 content_type = 2;</code>
+       * <code>uint32 content_type = 6;</code>
        * @return This builder for chaining.
        */
       public Builder clearContentType() {
@@ -569,9 +542,40 @@ public final class AddQuestContentProgressReqOuterClass {
         return this;
       }
 
+      private int param_ ;
+      /**
+       * <code>uint32 param = 12;</code>
+       * @return The param.
+       */
+      @java.lang.Override
+      public int getParam() {
+        return param_;
+      }
+      /**
+       * <code>uint32 param = 12;</code>
+       * @param value The param to set.
+       * @return This builder for chaining.
+       */
+      public Builder setParam(int value) {
+        
+        param_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 param = 12;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearParam() {
+        
+        param_ = 0;
+        onChanged();
+        return this;
+      }
+
       private int addProgress_ ;
       /**
-       * <code>uint32 add_progress = 8;</code>
+       * <code>uint32 add_progress = 15;</code>
        * @return The addProgress.
        */
       @java.lang.Override
@@ -579,7 +583,7 @@ public final class AddQuestContentProgressReqOuterClass {
         return addProgress_;
       }
       /**
-       * <code>uint32 add_progress = 8;</code>
+       * <code>uint32 add_progress = 15;</code>
        * @param value The addProgress to set.
        * @return This builder for chaining.
        */
@@ -590,7 +594,7 @@ public final class AddQuestContentProgressReqOuterClass {
         return this;
       }
       /**
-       * <code>uint32 add_progress = 8;</code>
+       * <code>uint32 add_progress = 15;</code>
        * @return This builder for chaining.
        */
       public Builder clearAddProgress() {
@@ -667,8 +671,8 @@ public final class AddQuestContentProgressReqOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n AddQuestContentProgressReq.proto\"W\n\032Ad" +
-      "dQuestContentProgressReq\022\r\n\005param\030\n \001(\r\022" +
+      "dQuestContentProgressReq\022\024\n\014content_type" +
-      "\024\n\014content_type\030\002 \001(\r\022\024\n\014add_progress\030\010 " +
+      "\030\006 \001(\r\022\r\n\005param\030\014 \001(\r\022\024\n\014add_progress\030\017 " +
       "\001(\rB\033\n\031emu.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -680,7 +684,7 @@ public final class AddQuestContentProgressReqOuterClass {
     internal_static_AddQuestContentProgressReq_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_AddQuestContentProgressReq_descriptor,
-        new java.lang.String[] { "Param", "ContentType", "AddProgress", });
+        new java.lang.String[] { "ContentType", "Param", "AddProgress", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)

src/generated/main/java/emu/grasscutter/net/proto/AddQuestContentProgressRspOuterClass.java

@@ -19,21 +19,23 @@ public final class AddQuestContentProgressRspOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>int32 retcode = 5;</code>
+     * <code>int32 retcode = 13;</code>
      * @return The retcode.
      */
     int getRetcode();
 
     /**
-     * <code>uint32 content_type = 12;</code>
+     * <code>uint32 content_type = 4;</code>
      * @return The contentType.
      */
     int getContentType();
   }
   /**
    * <pre>
-   * Name: LNEHHKPDPHL
+   * CmdId: 403
-   * CmdId: 472
+   * EnetChannelId: 0
+   * EnetIsReliable: false
+   * IsAllowClient: true
    * </pre>
    *
    * Protobuf type {@code AddQuestContentProgressRsp}
@@ -80,16 +82,16 @@ public final class AddQuestContentProgressRspOuterClass {
             case 0:
               done = true;
               break;
-            case 40: {
+            case 32: {
-
-              retcode_ = input.readInt32();
-              break;
-            }
-            case 96: {
 
               contentType_ = input.readUInt32();
               break;
             }
+            case 104: {
+
+              retcode_ = input.readInt32();
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -122,10 +124,10 @@ public final class AddQuestContentProgressRspOuterClass {
               emu.grasscutter.net.proto.AddQuestContentProgressRspOuterClass.AddQuestContentProgressRsp.class, emu.grasscutter.net.proto.AddQuestContentProgressRspOuterClass.AddQuestContentProgressRsp.Builder.class);
     }
 
-    public static final int RETCODE_FIELD_NUMBER = 5;
+    public static final int RETCODE_FIELD_NUMBER = 13;
     private int retcode_;
     /**
-     * <code>int32 retcode = 5;</code>
+     * <code>int32 retcode = 13;</code>
      * @return The retcode.
      */
     @java.lang.Override
@@ -133,10 +135,10 @@ public final class AddQuestContentProgressRspOuterClass {
       return retcode_;
     }
 
-    public static final int CONTENT_TYPE_FIELD_NUMBER = 12;
+    public static final int CONTENT_TYPE_FIELD_NUMBER = 4;
     private int contentType_;
     /**
-     * <code>uint32 content_type = 12;</code>
+     * <code>uint32 content_type = 4;</code>
      * @return The contentType.
      */
     @java.lang.Override
@@ -158,11 +160,11 @@ public final class AddQuestContentProgressRspOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (retcode_ != 0) {
-        output.writeInt32(5, retcode_);
-      }
       if (contentType_ != 0) {
-        output.writeUInt32(12, contentType_);
+        output.writeUInt32(4, contentType_);
+      }
+      if (retcode_ != 0) {
+        output.writeInt32(13, retcode_);
       }
       unknownFields.writeTo(output);
     }
@@ -173,13 +175,13 @@ public final class AddQuestContentProgressRspOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (retcode_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(5, retcode_);
-      }
       if (contentType_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(12, contentType_);
+          .computeUInt32Size(4, contentType_);
+      }
+      if (retcode_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeInt32Size(13, retcode_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -312,8 +314,10 @@ public final class AddQuestContentProgressRspOuterClass {
     }
     /**
      * <pre>
-     * Name: LNEHHKPDPHL
+     * CmdId: 403
-     * CmdId: 472
+     * EnetChannelId: 0
+     * EnetIsReliable: false
+     * IsAllowClient: true
      * </pre>
      *
      * Protobuf type {@code AddQuestContentProgressRsp}
@@ -470,7 +474,7 @@ public final class AddQuestContentProgressRspOuterClass {
 
       private int retcode_ ;
       /**
-       * <code>int32 retcode = 5;</code>
+       * <code>int32 retcode = 13;</code>
        * @return The retcode.
        */
       @java.lang.Override
@@ -478,7 +482,7 @@ public final class AddQuestContentProgressRspOuterClass {
         return retcode_;
       }
       /**
-       * <code>int32 retcode = 5;</code>
+       * <code>int32 retcode = 13;</code>
        * @param value The retcode to set.
        * @return This builder for chaining.
        */
@@ -489,7 +493,7 @@ public final class AddQuestContentProgressRspOuterClass {
         return this;
       }
       /**
-       * <code>int32 retcode = 5;</code>
+       * <code>int32 retcode = 13;</code>
        * @return This builder for chaining.
        */
       public Builder clearRetcode() {
@@ -501,7 +505,7 @@ public final class AddQuestContentProgressRspOuterClass {
 
       private int contentType_ ;
       /**
-       * <code>uint32 content_type = 12;</code>
+       * <code>uint32 content_type = 4;</code>
        * @return The contentType.
        */
       @java.lang.Override
@@ -509,7 +513,7 @@ public final class AddQuestContentProgressRspOuterClass {
         return contentType_;
       }
       /**
-       * <code>uint32 content_type = 12;</code>
+       * <code>uint32 content_type = 4;</code>
        * @param value The contentType to set.
        * @return This builder for chaining.
        */
@@ -520,7 +524,7 @@ public final class AddQuestContentProgressRspOuterClass {
         return this;
       }
       /**
-       * <code>uint32 content_type = 12;</code>
+       * <code>uint32 content_type = 4;</code>
        * @return This builder for chaining.
        */
       public Builder clearContentType() {
@@ -597,8 +601,8 @@ public final class AddQuestContentProgressRspOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n AddQuestContentProgressRsp.proto\"C\n\032Ad" +
-      "dQuestContentProgressRsp\022\017\n\007retcode\030\005 \001(" +
+      "dQuestContentProgressRsp\022\017\n\007retcode\030\r \001(" +
-      "\005\022\024\n\014content_type\030\014 \001(\rB\033\n\031emu.grasscutt" +
+      "\005\022\024\n\014content_type\030\004 \001(\rB\033\n\031emu.grasscutt" +
       "er.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor

src/generated/main/java/emu/grasscutter/net/proto/AiSkillCdInfoOuterClass.java

@@ -18,40 +18,6 @@ public final class AiSkillCdInfoOuterClass {
       // @@protoc_insertion_point(interface_extends:AiSkillCdInfo)
       com.google.protobuf.MessageOrBuilder {
 
-    /**
-     * <code>map&lt;uint32, uint32&gt; skill_group_cd_map = 1;</code>
-     */
-    int getSkillGroupCdMapCount();
-    /**
-     * <code>map&lt;uint32, uint32&gt; skill_group_cd_map = 1;</code>
-     */
-    boolean containsSkillGroupCdMap(
-        int key);
-    /**
-     * Use {@link #getSkillGroupCdMapMap()} instead.
-     */
-    @java.lang.Deprecated
-    java.util.Map<java.lang.Integer, java.lang.Integer>
-    getSkillGroupCdMap();
-    /**
-     * <code>map&lt;uint32, uint32&gt; skill_group_cd_map = 1;</code>
-     */
-    java.util.Map<java.lang.Integer, java.lang.Integer>
-    getSkillGroupCdMapMap();
-    /**
-     * <code>map&lt;uint32, uint32&gt; skill_group_cd_map = 1;</code>
-     */
-
-    int getSkillGroupCdMapOrDefault(
-        int key,
-        int defaultValue);
-    /**
-     * <code>map&lt;uint32, uint32&gt; skill_group_cd_map = 1;</code>
-     */
-
-    int getSkillGroupCdMapOrThrow(
-        int key);
-
     /**
      * <code>map&lt;uint32, uint32&gt; skill_cd_map = 11;</code>
      */
@@ -85,12 +51,42 @@ public final class AiSkillCdInfoOuterClass {
 
     int getSkillCdMapOrThrow(
         int key);
+
+    /**
+     * <code>map&lt;uint32, uint32&gt; skill_group_cd_map = 6;</code>
+     */
+    int getSkillGroupCdMapCount();
+    /**
+     * <code>map&lt;uint32, uint32&gt; skill_group_cd_map = 6;</code>
+     */
+    boolean containsSkillGroupCdMap(
+        int key);
+    /**
+     * Use {@link #getSkillGroupCdMapMap()} instead.
+     */
+    @java.lang.Deprecated
+    java.util.Map<java.lang.Integer, java.lang.Integer>
+    getSkillGroupCdMap();
+    /**
+     * <code>map&lt;uint32, uint32&gt; skill_group_cd_map = 6;</code>
+     */
+    java.util.Map<java.lang.Integer, java.lang.Integer>
+    getSkillGroupCdMapMap();
+    /**
+     * <code>map&lt;uint32, uint32&gt; skill_group_cd_map = 6;</code>
+     */
+
+    int getSkillGroupCdMapOrDefault(
+        int key,
+        int defaultValue);
+    /**
+     * <code>map&lt;uint32, uint32&gt; skill_group_cd_map = 6;</code>
+     */
+
+    int getSkillGroupCdMapOrThrow(
+        int key);
   }
   /**
-   * <pre>
-   * Name: DFMOCHLPHCF
-   * </pre>
-   *
    * Protobuf type {@code AiSkillCdInfo}
    */
   public static final class AiSkillCdInfo extends
@@ -136,11 +132,11 @@ public final class AiSkillCdInfoOuterClass {
             case 0:
               done = true;
               break;
-            case 10: {
+            case 50: {
-              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
                 skillGroupCdMap_ = com.google.protobuf.MapField.newMapField(
                     SkillGroupCdMapDefaultEntryHolder.defaultEntry);
-                mutable_bitField0_ |= 0x00000001;
+                mutable_bitField0_ |= 0x00000002;
               }
               com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer>
               skillGroupCdMap__ = input.readMessage(
@@ -150,10 +146,10 @@ public final class AiSkillCdInfoOuterClass {
               break;
             }
             case 90: {
-              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 skillCdMap_ = com.google.protobuf.MapField.newMapField(
                     SkillCdMapDefaultEntryHolder.defaultEntry);
-                mutable_bitField0_ |= 0x00000002;
+                mutable_bitField0_ |= 0x00000001;
               }
               com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer>
               skillCdMap__ = input.readMessage(
@@ -191,10 +187,10 @@ public final class AiSkillCdInfoOuterClass {
     protected com.google.protobuf.MapField internalGetMapField(
         int number) {
       switch (number) {
-        case 1:
-          return internalGetSkillGroupCdMap();
         case 11:
           return internalGetSkillCdMap();
+        case 6:
+          return internalGetSkillGroupCdMap();
         default:
           throw new RuntimeException(
               "Invalid map field number: " + number);
@@ -208,87 +204,6 @@ public final class AiSkillCdInfoOuterClass {
               emu.grasscutter.net.proto.AiSkillCdInfoOuterClass.AiSkillCdInfo.class, emu.grasscutter.net.proto.AiSkillCdInfoOuterClass.AiSkillCdInfo.Builder.class);
     }
 
-    public static final int SKILL_GROUP_CD_MAP_FIELD_NUMBER = 1;
-    private static final class SkillGroupCdMapDefaultEntryHolder {
-      static final com.google.protobuf.MapEntry<
-          java.lang.Integer, java.lang.Integer> defaultEntry =
-              com.google.protobuf.MapEntry
-              .<java.lang.Integer, java.lang.Integer>newDefaultInstance(
-                  emu.grasscutter.net.proto.AiSkillCdInfoOuterClass.internal_static_AiSkillCdInfo_SkillGroupCdMapEntry_descriptor, 
-                  com.google.protobuf.WireFormat.FieldType.UINT32,
-                  0,
-                  com.google.protobuf.WireFormat.FieldType.UINT32,
-                  0);
-    }
-    private com.google.protobuf.MapField<
-        java.lang.Integer, java.lang.Integer> skillGroupCdMap_;
-    private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
-    internalGetSkillGroupCdMap() {
-      if (skillGroupCdMap_ == null) {
-        return com.google.protobuf.MapField.emptyMapField(
-            SkillGroupCdMapDefaultEntryHolder.defaultEntry);
-      }
-      return skillGroupCdMap_;
-    }
-
-    public int getSkillGroupCdMapCount() {
-      return internalGetSkillGroupCdMap().getMap().size();
-    }
-    /**
-     * <code>map&lt;uint32, uint32&gt; skill_group_cd_map = 1;</code>
-     */
-
-    @java.lang.Override
-    public boolean containsSkillGroupCdMap(
-        int key) {
-      
-      return internalGetSkillGroupCdMap().getMap().containsKey(key);
-    }
-    /**
-     * Use {@link #getSkillGroupCdMapMap()} instead.
-     */
-    @java.lang.Override
-    @java.lang.Deprecated
-    public java.util.Map<java.lang.Integer, java.lang.Integer> getSkillGroupCdMap() {
-      return getSkillGroupCdMapMap();
-    }
-    /**
-     * <code>map&lt;uint32, uint32&gt; skill_group_cd_map = 1;</code>
-     */
-    @java.lang.Override
-
-    public java.util.Map<java.lang.Integer, java.lang.Integer> getSkillGroupCdMapMap() {
-      return internalGetSkillGroupCdMap().getMap();
-    }
-    /**
-     * <code>map&lt;uint32, uint32&gt; skill_group_cd_map = 1;</code>
-     */
-    @java.lang.Override
-
-    public int getSkillGroupCdMapOrDefault(
-        int key,
-        int defaultValue) {
-      
-      java.util.Map<java.lang.Integer, java.lang.Integer> map =
-          internalGetSkillGroupCdMap().getMap();
-      return map.containsKey(key) ? map.get(key) : defaultValue;
-    }
-    /**
-     * <code>map&lt;uint32, uint32&gt; skill_group_cd_map = 1;</code>
-     */
-    @java.lang.Override
-
-    public int getSkillGroupCdMapOrThrow(
-        int key) {
-      
-      java.util.Map<java.lang.Integer, java.lang.Integer> map =
-          internalGetSkillGroupCdMap().getMap();
-      if (!map.containsKey(key)) {
-        throw new java.lang.IllegalArgumentException();
-      }
-      return map.get(key);
-    }
-
     public static final int SKILL_CD_MAP_FIELD_NUMBER = 11;
     private static final class SkillCdMapDefaultEntryHolder {
       static final com.google.protobuf.MapEntry<
@@ -370,6 +285,87 @@ public final class AiSkillCdInfoOuterClass {
       return map.get(key);
     }
 
+    public static final int SKILL_GROUP_CD_MAP_FIELD_NUMBER = 6;
+    private static final class SkillGroupCdMapDefaultEntryHolder {
+      static final com.google.protobuf.MapEntry<
+          java.lang.Integer, java.lang.Integer> defaultEntry =
+              com.google.protobuf.MapEntry
+              .<java.lang.Integer, java.lang.Integer>newDefaultInstance(
+                  emu.grasscutter.net.proto.AiSkillCdInfoOuterClass.internal_static_AiSkillCdInfo_SkillGroupCdMapEntry_descriptor, 
+                  com.google.protobuf.WireFormat.FieldType.UINT32,
+                  0,
+                  com.google.protobuf.WireFormat.FieldType.UINT32,
+                  0);
+    }
+    private com.google.protobuf.MapField<
+        java.lang.Integer, java.lang.Integer> skillGroupCdMap_;
+    private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
+    internalGetSkillGroupCdMap() {
+      if (skillGroupCdMap_ == null) {
+        return com.google.protobuf.MapField.emptyMapField(
+            SkillGroupCdMapDefaultEntryHolder.defaultEntry);
+      }
+      return skillGroupCdMap_;
+    }
+
+    public int getSkillGroupCdMapCount() {
+      return internalGetSkillGroupCdMap().getMap().size();
+    }
+    /**
+     * <code>map&lt;uint32, uint32&gt; skill_group_cd_map = 6;</code>
+     */
+
+    @java.lang.Override
+    public boolean containsSkillGroupCdMap(
+        int key) {
+      
+      return internalGetSkillGroupCdMap().getMap().containsKey(key);
+    }
+    /**
+     * Use {@link #getSkillGroupCdMapMap()} instead.
+     */
+    @java.lang.Override
+    @java.lang.Deprecated
+    public java.util.Map<java.lang.Integer, java.lang.Integer> getSkillGroupCdMap() {
+      return getSkillGroupCdMapMap();
+    }
+    /**
+     * <code>map&lt;uint32, uint32&gt; skill_group_cd_map = 6;</code>
+     */
+    @java.lang.Override
+
+    public java.util.Map<java.lang.Integer, java.lang.Integer> getSkillGroupCdMapMap() {
+      return internalGetSkillGroupCdMap().getMap();
+    }
+    /**
+     * <code>map&lt;uint32, uint32&gt; skill_group_cd_map = 6;</code>
+     */
+    @java.lang.Override
+
+    public int getSkillGroupCdMapOrDefault(
+        int key,
+        int defaultValue) {
+      
+      java.util.Map<java.lang.Integer, java.lang.Integer> map =
+          internalGetSkillGroupCdMap().getMap();
+      return map.containsKey(key) ? map.get(key) : defaultValue;
+    }
+    /**
+     * <code>map&lt;uint32, uint32&gt; skill_group_cd_map = 6;</code>
+     */
+    @java.lang.Override
+
+    public int getSkillGroupCdMapOrThrow(
+        int key) {
+      
+      java.util.Map<java.lang.Integer, java.lang.Integer> map =
+          internalGetSkillGroupCdMap().getMap();
+      if (!map.containsKey(key)) {
+        throw new java.lang.IllegalArgumentException();
+      }
+      return map.get(key);
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -389,7 +385,7 @@ public final class AiSkillCdInfoOuterClass {
           output,
           internalGetSkillGroupCdMap(),
           SkillGroupCdMapDefaultEntryHolder.defaultEntry,
-          1);
+          6);
       com.google.protobuf.GeneratedMessageV3
         .serializeIntegerMapTo(
           output,
@@ -413,7 +409,7 @@ public final class AiSkillCdInfoOuterClass {
             .setValue(entry.getValue())
             .build();
         size += com.google.protobuf.CodedOutputStream
-            .computeMessageSize(1, skillGroupCdMap__);
+            .computeMessageSize(6, skillGroupCdMap__);
       }
       for (java.util.Map.Entry<java.lang.Integer, java.lang.Integer> entry
            : internalGetSkillCdMap().getMap().entrySet()) {
@@ -440,10 +436,10 @@ public final class AiSkillCdInfoOuterClass {
       }
       emu.grasscutter.net.proto.AiSkillCdInfoOuterClass.AiSkillCdInfo other = (emu.grasscutter.net.proto.AiSkillCdInfoOuterClass.AiSkillCdInfo) obj;
 
-      if (!internalGetSkillGroupCdMap().equals(
-          other.internalGetSkillGroupCdMap())) return false;
       if (!internalGetSkillCdMap().equals(
           other.internalGetSkillCdMap())) return false;
+      if (!internalGetSkillGroupCdMap().equals(
+          other.internalGetSkillGroupCdMap())) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -455,14 +451,14 @@ public final class AiSkillCdInfoOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      if (!internalGetSkillGroupCdMap().getMap().isEmpty()) {
-        hash = (37 * hash) + SKILL_GROUP_CD_MAP_FIELD_NUMBER;
-        hash = (53 * hash) + internalGetSkillGroupCdMap().hashCode();
-      }
       if (!internalGetSkillCdMap().getMap().isEmpty()) {
         hash = (37 * hash) + SKILL_CD_MAP_FIELD_NUMBER;
         hash = (53 * hash) + internalGetSkillCdMap().hashCode();
       }
+      if (!internalGetSkillGroupCdMap().getMap().isEmpty()) {
+        hash = (37 * hash) + SKILL_GROUP_CD_MAP_FIELD_NUMBER;
+        hash = (53 * hash) + internalGetSkillGroupCdMap().hashCode();
+      }
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -559,10 +555,6 @@ public final class AiSkillCdInfoOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Name: DFMOCHLPHCF
-     * </pre>
-     *
      * Protobuf type {@code AiSkillCdInfo}
      */
     public static final class Builder extends
@@ -578,10 +570,10 @@ public final class AiSkillCdInfoOuterClass {
       protected com.google.protobuf.MapField internalGetMapField(
           int number) {
         switch (number) {
-          case 1:
-            return internalGetSkillGroupCdMap();
           case 11:
             return internalGetSkillCdMap();
+          case 6:
+            return internalGetSkillGroupCdMap();
           default:
             throw new RuntimeException(
                 "Invalid map field number: " + number);
@@ -591,10 +583,10 @@ public final class AiSkillCdInfoOuterClass {
       protected com.google.protobuf.MapField internalGetMutableMapField(
           int number) {
         switch (number) {
-          case 1:
-            return internalGetMutableSkillGroupCdMap();
           case 11:
             return internalGetMutableSkillCdMap();
+          case 6:
+            return internalGetMutableSkillGroupCdMap();
           default:
             throw new RuntimeException(
                 "Invalid map field number: " + number);
@@ -626,8 +618,8 @@ public final class AiSkillCdInfoOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        internalGetMutableSkillGroupCdMap().clear();
         internalGetMutableSkillCdMap().clear();
+        internalGetMutableSkillGroupCdMap().clear();
         return this;
       }
 
@@ -655,10 +647,10 @@ public final class AiSkillCdInfoOuterClass {
       public emu.grasscutter.net.proto.AiSkillCdInfoOuterClass.AiSkillCdInfo buildPartial() {
         emu.grasscutter.net.proto.AiSkillCdInfoOuterClass.AiSkillCdInfo result = new emu.grasscutter.net.proto.AiSkillCdInfoOuterClass.AiSkillCdInfo(this);
         int from_bitField0_ = bitField0_;
-        result.skillGroupCdMap_ = internalGetSkillGroupCdMap();
-        result.skillGroupCdMap_.makeImmutable();
         result.skillCdMap_ = internalGetSkillCdMap();
         result.skillCdMap_.makeImmutable();
+        result.skillGroupCdMap_ = internalGetSkillGroupCdMap();
+        result.skillGroupCdMap_.makeImmutable();
         onBuilt();
         return result;
       }
@@ -707,10 +699,10 @@ public final class AiSkillCdInfoOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.AiSkillCdInfoOuterClass.AiSkillCdInfo other) {
         if (other == emu.grasscutter.net.proto.AiSkillCdInfoOuterClass.AiSkillCdInfo.getDefaultInstance()) return this;
-        internalGetMutableSkillGroupCdMap().mergeFrom(
-            other.internalGetSkillGroupCdMap());
         internalGetMutableSkillCdMap().mergeFrom(
             other.internalGetSkillCdMap());
+        internalGetMutableSkillGroupCdMap().mergeFrom(
+            other.internalGetSkillGroupCdMap());
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -741,134 +733,6 @@ public final class AiSkillCdInfoOuterClass {
       }
       private int bitField0_;
 
-      private com.google.protobuf.MapField<
-          java.lang.Integer, java.lang.Integer> skillGroupCdMap_;
-      private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
-      internalGetSkillGroupCdMap() {
-        if (skillGroupCdMap_ == null) {
-          return com.google.protobuf.MapField.emptyMapField(
-              SkillGroupCdMapDefaultEntryHolder.defaultEntry);
-        }
-        return skillGroupCdMap_;
-      }
-      private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
-      internalGetMutableSkillGroupCdMap() {
-        onChanged();;
-        if (skillGroupCdMap_ == null) {
-          skillGroupCdMap_ = com.google.protobuf.MapField.newMapField(
-              SkillGroupCdMapDefaultEntryHolder.defaultEntry);
-        }
-        if (!skillGroupCdMap_.isMutable()) {
-          skillGroupCdMap_ = skillGroupCdMap_.copy();
-        }
-        return skillGroupCdMap_;
-      }
-
-      public int getSkillGroupCdMapCount() {
-        return internalGetSkillGroupCdMap().getMap().size();
-      }
-      /**
-       * <code>map&lt;uint32, uint32&gt; skill_group_cd_map = 1;</code>
-       */
-
-      @java.lang.Override
-      public boolean containsSkillGroupCdMap(
-          int key) {
-        
-        return internalGetSkillGroupCdMap().getMap().containsKey(key);
-      }
-      /**
-       * Use {@link #getSkillGroupCdMapMap()} instead.
-       */
-      @java.lang.Override
-      @java.lang.Deprecated
-      public java.util.Map<java.lang.Integer, java.lang.Integer> getSkillGroupCdMap() {
-        return getSkillGroupCdMapMap();
-      }
-      /**
-       * <code>map&lt;uint32, uint32&gt; skill_group_cd_map = 1;</code>
-       */
-      @java.lang.Override
-
-      public java.util.Map<java.lang.Integer, java.lang.Integer> getSkillGroupCdMapMap() {
-        return internalGetSkillGroupCdMap().getMap();
-      }
-      /**
-       * <code>map&lt;uint32, uint32&gt; skill_group_cd_map = 1;</code>
-       */
-      @java.lang.Override
-
-      public int getSkillGroupCdMapOrDefault(
-          int key,
-          int defaultValue) {
-        
-        java.util.Map<java.lang.Integer, java.lang.Integer> map =
-            internalGetSkillGroupCdMap().getMap();
-        return map.containsKey(key) ? map.get(key) : defaultValue;
-      }
-      /**
-       * <code>map&lt;uint32, uint32&gt; skill_group_cd_map = 1;</code>
-       */
-      @java.lang.Override
-
-      public int getSkillGroupCdMapOrThrow(
-          int key) {
-        
-        java.util.Map<java.lang.Integer, java.lang.Integer> map =
-            internalGetSkillGroupCdMap().getMap();
-        if (!map.containsKey(key)) {
-          throw new java.lang.IllegalArgumentException();
-        }
-        return map.get(key);
-      }
-
-      public Builder clearSkillGroupCdMap() {
-        internalGetMutableSkillGroupCdMap().getMutableMap()
-            .clear();
-        return this;
-      }
-      /**
-       * <code>map&lt;uint32, uint32&gt; skill_group_cd_map = 1;</code>
-       */
-
-      public Builder removeSkillGroupCdMap(
-          int key) {
-        
-        internalGetMutableSkillGroupCdMap().getMutableMap()
-            .remove(key);
-        return this;
-      }
-      /**
-       * Use alternate mutation accessors instead.
-       */
-      @java.lang.Deprecated
-      public java.util.Map<java.lang.Integer, java.lang.Integer>
-      getMutableSkillGroupCdMap() {
-        return internalGetMutableSkillGroupCdMap().getMutableMap();
-      }
-      /**
-       * <code>map&lt;uint32, uint32&gt; skill_group_cd_map = 1;</code>
-       */
-      public Builder putSkillGroupCdMap(
-          int key,
-          int value) {
-        
-        
-        internalGetMutableSkillGroupCdMap().getMutableMap()
-            .put(key, value);
-        return this;
-      }
-      /**
-       * <code>map&lt;uint32, uint32&gt; skill_group_cd_map = 1;</code>
-       */
-
-      public Builder putAllSkillGroupCdMap(
-          java.util.Map<java.lang.Integer, java.lang.Integer> values) {
-        internalGetMutableSkillGroupCdMap().getMutableMap()
-            .putAll(values);
-        return this;
-      }
-
       private com.google.protobuf.MapField<
           java.lang.Integer, java.lang.Integer> skillCdMap_;
       private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
@@ -996,6 +860,134 @@ public final class AiSkillCdInfoOuterClass {
             .putAll(values);
         return this;
       }
+
+      private com.google.protobuf.MapField<
+          java.lang.Integer, java.lang.Integer> skillGroupCdMap_;
+      private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
+      internalGetSkillGroupCdMap() {
+        if (skillGroupCdMap_ == null) {
+          return com.google.protobuf.MapField.emptyMapField(
+              SkillGroupCdMapDefaultEntryHolder.defaultEntry);
+        }
+        return skillGroupCdMap_;
+      }
+      private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
+      internalGetMutableSkillGroupCdMap() {
+        onChanged();;
+        if (skillGroupCdMap_ == null) {
+          skillGroupCdMap_ = com.google.protobuf.MapField.newMapField(
+              SkillGroupCdMapDefaultEntryHolder.defaultEntry);
+        }
+        if (!skillGroupCdMap_.isMutable()) {
+          skillGroupCdMap_ = skillGroupCdMap_.copy();
+        }
+        return skillGroupCdMap_;
+      }
+
+      public int getSkillGroupCdMapCount() {
+        return internalGetSkillGroupCdMap().getMap().size();
+      }
+      /**
+       * <code>map&lt;uint32, uint32&gt; skill_group_cd_map = 6;</code>
+       */
+
+      @java.lang.Override
+      public boolean containsSkillGroupCdMap(
+          int key) {
+        
+        return internalGetSkillGroupCdMap().getMap().containsKey(key);
+      }
+      /**
+       * Use {@link #getSkillGroupCdMapMap()} instead.
+       */
+      @java.lang.Override
+      @java.lang.Deprecated
+      public java.util.Map<java.lang.Integer, java.lang.Integer> getSkillGroupCdMap() {
+        return getSkillGroupCdMapMap();
+      }
+      /**
+       * <code>map&lt;uint32, uint32&gt; skill_group_cd_map = 6;</code>
+       */
+      @java.lang.Override
+
+      public java.util.Map<java.lang.Integer, java.lang.Integer> getSkillGroupCdMapMap() {
+        return internalGetSkillGroupCdMap().getMap();
+      }
+      /**
+       * <code>map&lt;uint32, uint32&gt; skill_group_cd_map = 6;</code>
+       */
+      @java.lang.Override
+
+      public int getSkillGroupCdMapOrDefault(
+          int key,
+          int defaultValue) {
+        
+        java.util.Map<java.lang.Integer, java.lang.Integer> map =
+            internalGetSkillGroupCdMap().getMap();
+        return map.containsKey(key) ? map.get(key) : defaultValue;
+      }
+      /**
+       * <code>map&lt;uint32, uint32&gt; skill_group_cd_map = 6;</code>
+       */
+      @java.lang.Override
+
+      public int getSkillGroupCdMapOrThrow(
+          int key) {
+        
+        java.util.Map<java.lang.Integer, java.lang.Integer> map =
+            internalGetSkillGroupCdMap().getMap();
+        if (!map.containsKey(key)) {
+          throw new java.lang.IllegalArgumentException();
+        }
+        return map.get(key);
+      }
+
+      public Builder clearSkillGroupCdMap() {
+        internalGetMutableSkillGroupCdMap().getMutableMap()
+            .clear();
+        return this;
+      }
+      /**
+       * <code>map&lt;uint32, uint32&gt; skill_group_cd_map = 6;</code>
+       */
+
+      public Builder removeSkillGroupCdMap(
+          int key) {
+        
+        internalGetMutableSkillGroupCdMap().getMutableMap()
+            .remove(key);
+        return this;
+      }
+      /**
+       * Use alternate mutation accessors instead.
+       */
+      @java.lang.Deprecated
+      public java.util.Map<java.lang.Integer, java.lang.Integer>
+      getMutableSkillGroupCdMap() {
+        return internalGetMutableSkillGroupCdMap().getMutableMap();
+      }
+      /**
+       * <code>map&lt;uint32, uint32&gt; skill_group_cd_map = 6;</code>
+       */
+      public Builder putSkillGroupCdMap(
+          int key,
+          int value) {
+        
+        
+        internalGetMutableSkillGroupCdMap().getMutableMap()
+            .put(key, value);
+        return this;
+      }
+      /**
+       * <code>map&lt;uint32, uint32&gt; skill_group_cd_map = 6;</code>
+       */
+
+      public Builder putAllSkillGroupCdMap(
+          java.util.Map<java.lang.Integer, java.lang.Integer> values) {
+        internalGetMutableSkillGroupCdMap().getMutableMap()
+            .putAll(values);
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -1054,16 +1046,16 @@ public final class AiSkillCdInfoOuterClass {
   private static final 
     com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_AiSkillCdInfo_fieldAccessorTable;
-  private static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_AiSkillCdInfo_SkillGroupCdMapEntry_descriptor;
-  private static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_AiSkillCdInfo_SkillGroupCdMapEntry_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
     internal_static_AiSkillCdInfo_SkillCdMapEntry_descriptor;
   private static final 
     com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_AiSkillCdInfo_SkillCdMapEntry_fieldAccessorTable;
+  private static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_AiSkillCdInfo_SkillGroupCdMapEntry_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_AiSkillCdInfo_SkillGroupCdMapEntry_fieldAccessorTable;
 
   public static com.google.protobuf.Descriptors.FileDescriptor
       getDescriptor() {
@@ -1074,11 +1066,11 @@ public final class AiSkillCdInfoOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\023AiSkillCdInfo.proto\"\361\001\n\rAiSkillCdInfo\022" +
-      "?\n\022skill_group_cd_map\030\001 \003(\0132#.AiSkillCdI" +
+      "4\n\014skill_cd_map\030\013 \003(\0132\036.AiSkillCdInfo.Sk" +
-      "nfo.SkillGroupCdMapEntry\0224\n\014skill_cd_map" +
+      "illCdMapEntry\022?\n\022skill_group_cd_map\030\006 \003(" +
-      "\030\013 \003(\0132\036.AiSkillCdInfo.SkillCdMapEntry\0326" +
+      "\0132#.AiSkillCdInfo.SkillGroupCdMapEntry\0321" +
-      "\n\024SkillGroupCdMapEntry\022\013\n\003key\030\001 \001(\r\022\r\n\005v" +
+      "\n\017SkillCdMapEntry\022\013\n\003key\030\001 \001(\r\022\r\n\005value\030" +
-      "alue\030\002 \001(\r:\0028\001\0321\n\017SkillCdMapEntry\022\013\n\003key" +
+      "\002 \001(\r:\0028\001\0326\n\024SkillGroupCdMapEntry\022\013\n\003key" +
       "\030\001 \001(\r\022\r\n\005value\030\002 \001(\r:\0028\001B\033\n\031emu.grasscu" +
       "tter.net.protob\006proto3"
     };
@@ -1091,19 +1083,19 @@ public final class AiSkillCdInfoOuterClass {
     internal_static_AiSkillCdInfo_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_AiSkillCdInfo_descriptor,
-        new java.lang.String[] { "SkillGroupCdMap", "SkillCdMap", });
+        new java.lang.String[] { "SkillCdMap", "SkillGroupCdMap", });
-    internal_static_AiSkillCdInfo_SkillGroupCdMapEntry_descriptor =
-      internal_static_AiSkillCdInfo_descriptor.getNestedTypes().get(0);
-    internal_static_AiSkillCdInfo_SkillGroupCdMapEntry_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_AiSkillCdInfo_SkillGroupCdMapEntry_descriptor,
-        new java.lang.String[] { "Key", "Value", });
     internal_static_AiSkillCdInfo_SkillCdMapEntry_descriptor =
-      internal_static_AiSkillCdInfo_descriptor.getNestedTypes().get(1);
+      internal_static_AiSkillCdInfo_descriptor.getNestedTypes().get(0);
     internal_static_AiSkillCdInfo_SkillCdMapEntry_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_AiSkillCdInfo_SkillCdMapEntry_descriptor,
         new java.lang.String[] { "Key", "Value", });
+    internal_static_AiSkillCdInfo_SkillGroupCdMapEntry_descriptor =
+      internal_static_AiSkillCdInfo_descriptor.getNestedTypes().get(1);
+    internal_static_AiSkillCdInfo_SkillGroupCdMapEntry_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_AiSkillCdInfo_SkillGroupCdMapEntry_descriptor,
+        new java.lang.String[] { "Key", "Value", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)

src/generated/main/java/emu/grasscutter/net/proto/AiSyncInfoOuterClass.java

@@ -19,28 +19,24 @@ public final class AiSyncInfoOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 entity_id = 10;</code>
+     * <code>uint32 entity_id = 9;</code>
      * @return The entityId.
      */
     int getEntityId();
 
     /**
-     * <code>bool is_self_killing = 6;</code>
+     * <code>bool is_self_killing = 8;</code>
      * @return The isSelfKilling.
      */
     boolean getIsSelfKilling();
 
     /**
-     * <code>bool has_path_to_target = 8;</code>
+     * <code>bool has_path_to_target = 4;</code>
      * @return The hasPathToTarget.
      */
     boolean getHasPathToTarget();
   }
   /**
-   * <pre>
-   * Name: FCJLAGHOIFC
-   * </pre>
-   *
    * Protobuf type {@code AiSyncInfo}
    */
   public static final class AiSyncInfo extends
@@ -85,17 +81,17 @@ public final class AiSyncInfoOuterClass {
             case 0:
               done = true;
               break;
-            case 48: {
+            case 32: {
-
-              isSelfKilling_ = input.readBool();
-              break;
-            }
-            case 64: {
 
               hasPathToTarget_ = input.readBool();
               break;
             }
-            case 80: {
+            case 64: {
+
+              isSelfKilling_ = input.readBool();
+              break;
+            }
+            case 72: {
 
               entityId_ = input.readUInt32();
               break;
@@ -132,10 +128,10 @@ public final class AiSyncInfoOuterClass {
               emu.grasscutter.net.proto.AiSyncInfoOuterClass.AiSyncInfo.class, emu.grasscutter.net.proto.AiSyncInfoOuterClass.AiSyncInfo.Builder.class);
     }
 
-    public static final int ENTITY_ID_FIELD_NUMBER = 10;
+    public static final int ENTITY_ID_FIELD_NUMBER = 9;
     private int entityId_;
     /**
-     * <code>uint32 entity_id = 10;</code>
+     * <code>uint32 entity_id = 9;</code>
      * @return The entityId.
      */
     @java.lang.Override
@@ -143,10 +139,10 @@ public final class AiSyncInfoOuterClass {
       return entityId_;
     }
 
-    public static final int IS_SELF_KILLING_FIELD_NUMBER = 6;
+    public static final int IS_SELF_KILLING_FIELD_NUMBER = 8;
     private boolean isSelfKilling_;
     /**
-     * <code>bool is_self_killing = 6;</code>
+     * <code>bool is_self_killing = 8;</code>
      * @return The isSelfKilling.
      */
     @java.lang.Override
@@ -154,10 +150,10 @@ public final class AiSyncInfoOuterClass {
       return isSelfKilling_;
     }
 
-    public static final int HAS_PATH_TO_TARGET_FIELD_NUMBER = 8;
+    public static final int HAS_PATH_TO_TARGET_FIELD_NUMBER = 4;
     private boolean hasPathToTarget_;
     /**
-     * <code>bool has_path_to_target = 8;</code>
+     * <code>bool has_path_to_target = 4;</code>
      * @return The hasPathToTarget.
      */
     @java.lang.Override
@@ -179,14 +175,14 @@ public final class AiSyncInfoOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (isSelfKilling_ != false) {
-        output.writeBool(6, isSelfKilling_);
-      }
       if (hasPathToTarget_ != false) {
-        output.writeBool(8, hasPathToTarget_);
+        output.writeBool(4, hasPathToTarget_);
+      }
+      if (isSelfKilling_ != false) {
+        output.writeBool(8, isSelfKilling_);
       }
       if (entityId_ != 0) {
-        output.writeUInt32(10, entityId_);
+        output.writeUInt32(9, entityId_);
       }
       unknownFields.writeTo(output);
     }
@@ -197,17 +193,17 @@ public final class AiSyncInfoOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (isSelfKilling_ != false) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(6, isSelfKilling_);
-      }
       if (hasPathToTarget_ != false) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(8, hasPathToTarget_);
+          .computeBoolSize(4, hasPathToTarget_);
+      }
+      if (isSelfKilling_ != false) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBoolSize(8, isSelfKilling_);
       }
       if (entityId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(10, entityId_);
+          .computeUInt32Size(9, entityId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -345,10 +341,6 @@ public final class AiSyncInfoOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Name: FCJLAGHOIFC
-     * </pre>
-     *
      * Protobuf type {@code AiSyncInfo}
      */
     public static final class Builder extends
@@ -509,7 +501,7 @@ public final class AiSyncInfoOuterClass {
 
       private int entityId_ ;
       /**
-       * <code>uint32 entity_id = 10;</code>
+       * <code>uint32 entity_id = 9;</code>
        * @return The entityId.
        */
       @java.lang.Override
@@ -517,7 +509,7 @@ public final class AiSyncInfoOuterClass {
         return entityId_;
       }
       /**
-       * <code>uint32 entity_id = 10;</code>
+       * <code>uint32 entity_id = 9;</code>
        * @param value The entityId to set.
        * @return This builder for chaining.
        */
@@ -528,7 +520,7 @@ public final class AiSyncInfoOuterClass {
         return this;
       }
       /**
-       * <code>uint32 entity_id = 10;</code>
+       * <code>uint32 entity_id = 9;</code>
        * @return This builder for chaining.
        */
       public Builder clearEntityId() {
@@ -540,7 +532,7 @@ public final class AiSyncInfoOuterClass {
 
       private boolean isSelfKilling_ ;
       /**
-       * <code>bool is_self_killing = 6;</code>
+       * <code>bool is_self_killing = 8;</code>
        * @return The isSelfKilling.
        */
       @java.lang.Override
@@ -548,7 +540,7 @@ public final class AiSyncInfoOuterClass {
         return isSelfKilling_;
       }
       /**
-       * <code>bool is_self_killing = 6;</code>
+       * <code>bool is_self_killing = 8;</code>
        * @param value The isSelfKilling to set.
        * @return This builder for chaining.
        */
@@ -559,7 +551,7 @@ public final class AiSyncInfoOuterClass {
         return this;
       }
       /**
-       * <code>bool is_self_killing = 6;</code>
+       * <code>bool is_self_killing = 8;</code>
        * @return This builder for chaining.
        */
       public Builder clearIsSelfKilling() {
@@ -571,7 +563,7 @@ public final class AiSyncInfoOuterClass {
 
       private boolean hasPathToTarget_ ;
       /**
-       * <code>bool has_path_to_target = 8;</code>
+       * <code>bool has_path_to_target = 4;</code>
        * @return The hasPathToTarget.
        */
       @java.lang.Override
@@ -579,7 +571,7 @@ public final class AiSyncInfoOuterClass {
         return hasPathToTarget_;
       }
       /**
-       * <code>bool has_path_to_target = 8;</code>
+       * <code>bool has_path_to_target = 4;</code>
        * @param value The hasPathToTarget to set.
        * @return This builder for chaining.
        */
@@ -590,7 +582,7 @@ public final class AiSyncInfoOuterClass {
         return this;
       }
       /**
-       * <code>bool has_path_to_target = 8;</code>
+       * <code>bool has_path_to_target = 4;</code>
        * @return This builder for chaining.
        */
       public Builder clearHasPathToTarget() {
@@ -667,8 +659,8 @@ public final class AiSyncInfoOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\020AiSyncInfo.proto\"T\n\nAiSyncInfo\022\021\n\tenti" +
-      "ty_id\030\n \001(\r\022\027\n\017is_self_killing\030\006 \001(\010\022\032\n\022" +
+      "ty_id\030\t \001(\r\022\027\n\017is_self_killing\030\010 \001(\010\022\032\n\022" +
-      "has_path_to_target\030\010 \001(\010B\033\n\031emu.grasscut" +
+      "has_path_to_target\030\004 \001(\010B\033\n\031emu.grasscut" +
       "ter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor

src/generated/main/java/emu/grasscutter/net/proto/AiThreatInfoOuterClass.java

@@ -19,11 +19,11 @@ public final class AiThreatInfoOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>map&lt;uint32, uint32&gt; ai_threat_map = 6;</code>
+     * <code>map&lt;uint32, uint32&gt; ai_threat_map = 11;</code>
      */
     int getAiThreatMapCount();
     /**
-     * <code>map&lt;uint32, uint32&gt; ai_threat_map = 6;</code>
+     * <code>map&lt;uint32, uint32&gt; ai_threat_map = 11;</code>
      */
     boolean containsAiThreatMap(
         int key);
@@ -34,29 +34,25 @@ public final class AiThreatInfoOuterClass {
     java.util.Map<java.lang.Integer, java.lang.Integer>
     getAiThreatMap();
     /**
-     * <code>map&lt;uint32, uint32&gt; ai_threat_map = 6;</code>
+     * <code>map&lt;uint32, uint32&gt; ai_threat_map = 11;</code>
      */
     java.util.Map<java.lang.Integer, java.lang.Integer>
     getAiThreatMapMap();
     /**
-     * <code>map&lt;uint32, uint32&gt; ai_threat_map = 6;</code>
+     * <code>map&lt;uint32, uint32&gt; ai_threat_map = 11;</code>
      */
 
     int getAiThreatMapOrDefault(
         int key,
         int defaultValue);
     /**
-     * <code>map&lt;uint32, uint32&gt; ai_threat_map = 6;</code>
+     * <code>map&lt;uint32, uint32&gt; ai_threat_map = 11;</code>
      */
 
     int getAiThreatMapOrThrow(
         int key);
   }
   /**
-   * <pre>
-   * Name: GIMHFKKKBMN
-   * </pre>
-   *
    * Protobuf type {@code AiThreatInfo}
    */
   public static final class AiThreatInfo extends
@@ -102,7 +98,7 @@ public final class AiThreatInfoOuterClass {
             case 0:
               done = true;
               break;
-            case 50: {
+            case 90: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 aiThreatMap_ = com.google.protobuf.MapField.newMapField(
                     AiThreatMapDefaultEntryHolder.defaultEntry);
@@ -144,7 +140,7 @@ public final class AiThreatInfoOuterClass {
     protected com.google.protobuf.MapField internalGetMapField(
         int number) {
       switch (number) {
-        case 6:
+        case 11:
           return internalGetAiThreatMap();
         default:
           throw new RuntimeException(
@@ -159,7 +155,7 @@ public final class AiThreatInfoOuterClass {
               emu.grasscutter.net.proto.AiThreatInfoOuterClass.AiThreatInfo.class, emu.grasscutter.net.proto.AiThreatInfoOuterClass.AiThreatInfo.Builder.class);
     }
 
-    public static final int AI_THREAT_MAP_FIELD_NUMBER = 6;
+    public static final int AI_THREAT_MAP_FIELD_NUMBER = 11;
     private static final class AiThreatMapDefaultEntryHolder {
       static final com.google.protobuf.MapEntry<
           java.lang.Integer, java.lang.Integer> defaultEntry =
@@ -186,7 +182,7 @@ public final class AiThreatInfoOuterClass {
       return internalGetAiThreatMap().getMap().size();
     }
     /**
-     * <code>map&lt;uint32, uint32&gt; ai_threat_map = 6;</code>
+     * <code>map&lt;uint32, uint32&gt; ai_threat_map = 11;</code>
      */
 
     @java.lang.Override
@@ -204,7 +200,7 @@ public final class AiThreatInfoOuterClass {
       return getAiThreatMapMap();
     }
     /**
-     * <code>map&lt;uint32, uint32&gt; ai_threat_map = 6;</code>
+     * <code>map&lt;uint32, uint32&gt; ai_threat_map = 11;</code>
      */
     @java.lang.Override
 
@@ -212,7 +208,7 @@ public final class AiThreatInfoOuterClass {
       return internalGetAiThreatMap().getMap();
     }
     /**
-     * <code>map&lt;uint32, uint32&gt; ai_threat_map = 6;</code>
+     * <code>map&lt;uint32, uint32&gt; ai_threat_map = 11;</code>
      */
     @java.lang.Override
 
@@ -225,7 +221,7 @@ public final class AiThreatInfoOuterClass {
       return map.containsKey(key) ? map.get(key) : defaultValue;
     }
     /**
-     * <code>map&lt;uint32, uint32&gt; ai_threat_map = 6;</code>
+     * <code>map&lt;uint32, uint32&gt; ai_threat_map = 11;</code>
      */
     @java.lang.Override
 
@@ -259,7 +255,7 @@ public final class AiThreatInfoOuterClass {
           output,
           internalGetAiThreatMap(),
           AiThreatMapDefaultEntryHolder.defaultEntry,
-          6);
+          11);
       unknownFields.writeTo(output);
     }
 
@@ -277,7 +273,7 @@ public final class AiThreatInfoOuterClass {
             .setValue(entry.getValue())
             .build();
         size += com.google.protobuf.CodedOutputStream
-            .computeMessageSize(6, aiThreatMap__);
+            .computeMessageSize(11, aiThreatMap__);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -407,10 +403,6 @@ public final class AiThreatInfoOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Name: GIMHFKKKBMN
-     * </pre>
-     *
      * Protobuf type {@code AiThreatInfo}
      */
     public static final class Builder extends
@@ -426,7 +418,7 @@ public final class AiThreatInfoOuterClass {
       protected com.google.protobuf.MapField internalGetMapField(
           int number) {
         switch (number) {
-          case 6:
+          case 11:
             return internalGetAiThreatMap();
           default:
             throw new RuntimeException(
@@ -437,7 +429,7 @@ public final class AiThreatInfoOuterClass {
       protected com.google.protobuf.MapField internalGetMutableMapField(
           int number) {
         switch (number) {
-          case 6:
+          case 11:
             return internalGetMutableAiThreatMap();
           default:
             throw new RuntimeException(
@@ -607,7 +599,7 @@ public final class AiThreatInfoOuterClass {
         return internalGetAiThreatMap().getMap().size();
       }
       /**
-       * <code>map&lt;uint32, uint32&gt; ai_threat_map = 6;</code>
+       * <code>map&lt;uint32, uint32&gt; ai_threat_map = 11;</code>
        */
 
       @java.lang.Override
@@ -625,7 +617,7 @@ public final class AiThreatInfoOuterClass {
         return getAiThreatMapMap();
       }
       /**
-       * <code>map&lt;uint32, uint32&gt; ai_threat_map = 6;</code>
+       * <code>map&lt;uint32, uint32&gt; ai_threat_map = 11;</code>
        */
       @java.lang.Override
 
@@ -633,7 +625,7 @@ public final class AiThreatInfoOuterClass {
         return internalGetAiThreatMap().getMap();
       }
       /**
-       * <code>map&lt;uint32, uint32&gt; ai_threat_map = 6;</code>
+       * <code>map&lt;uint32, uint32&gt; ai_threat_map = 11;</code>
        */
       @java.lang.Override
 
@@ -646,7 +638,7 @@ public final class AiThreatInfoOuterClass {
         return map.containsKey(key) ? map.get(key) : defaultValue;
       }
       /**
-       * <code>map&lt;uint32, uint32&gt; ai_threat_map = 6;</code>
+       * <code>map&lt;uint32, uint32&gt; ai_threat_map = 11;</code>
        */
       @java.lang.Override
 
@@ -667,7 +659,7 @@ public final class AiThreatInfoOuterClass {
         return this;
       }
       /**
-       * <code>map&lt;uint32, uint32&gt; ai_threat_map = 6;</code>
+       * <code>map&lt;uint32, uint32&gt; ai_threat_map = 11;</code>
        */
 
       public Builder removeAiThreatMap(
@@ -686,7 +678,7 @@ public final class AiThreatInfoOuterClass {
         return internalGetMutableAiThreatMap().getMutableMap();
       }
       /**
-       * <code>map&lt;uint32, uint32&gt; ai_threat_map = 6;</code>
+       * <code>map&lt;uint32, uint32&gt; ai_threat_map = 11;</code>
        */
       public Builder putAiThreatMap(
           int key,
@@ -698,7 +690,7 @@ public final class AiThreatInfoOuterClass {
         return this;
       }
       /**
-       * <code>map&lt;uint32, uint32&gt; ai_threat_map = 6;</code>
+       * <code>map&lt;uint32, uint32&gt; ai_threat_map = 11;</code>
        */
 
       public Builder putAllAiThreatMap(
@@ -780,7 +772,7 @@ public final class AiThreatInfoOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\022AiThreatInfo.proto\"y\n\014AiThreatInfo\0225\n\r" +
-      "ai_threat_map\030\006 \003(\0132\036.AiThreatInfo.AiThr" +
+      "ai_threat_map\030\013 \003(\0132\036.AiThreatInfo.AiThr" +
       "eatMapEntry\0322\n\020AiThreatMapEntry\022\013\n\003key\030\001" +
       " \001(\r\022\r\n\005value\030\002 \001(\r:\0028\001B\033\n\031emu.grasscutt" +
       "er.net.protob\006proto3"

src/generated/main/java/emu/grasscutter/net/proto/AnchorPointDataNotifyOuterClass.java

@@ -0,0 +1,929 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: AnchorPointDataNotify.proto
+
+package emu.grasscutter.net.proto;
+
+public final class AnchorPointDataNotifyOuterClass {
+  private AnchorPointDataNotifyOuterClass() {}
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistryLite registry) {
+  }
+
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistry registry) {
+    registerAllExtensions(
+        (com.google.protobuf.ExtensionRegistryLite) registry);
+  }
+  public interface AnchorPointDataNotifyOrBuilder extends
+      // @@protoc_insertion_point(interface_extends:AnchorPointDataNotify)
+      com.google.protobuf.MessageOrBuilder {
+
+    /**
+     * <code>repeated .AnchorPointData anchor_point_list = 10;</code>
+     */
+    java.util.List<emu.grasscutter.net.proto.AnchorPointDataOuterClass.AnchorPointData> 
+        getAnchorPointListList();
+    /**
+     * <code>repeated .AnchorPointData anchor_point_list = 10;</code>
+     */
+    emu.grasscutter.net.proto.AnchorPointDataOuterClass.AnchorPointData getAnchorPointList(int index);
+    /**
+     * <code>repeated .AnchorPointData anchor_point_list = 10;</code>
+     */
+    int getAnchorPointListCount();
+    /**
+     * <code>repeated .AnchorPointData anchor_point_list = 10;</code>
+     */
+    java.util.List<? extends emu.grasscutter.net.proto.AnchorPointDataOuterClass.AnchorPointDataOrBuilder> 
+        getAnchorPointListOrBuilderList();
+    /**
+     * <code>repeated .AnchorPointData anchor_point_list = 10;</code>
+     */
+    emu.grasscutter.net.proto.AnchorPointDataOuterClass.AnchorPointDataOrBuilder getAnchorPointListOrBuilder(
+        int index);
+
+    /**
+     * <code>uint32 next_usable_time = 14;</code>
+     * @return The nextUsableTime.
+     */
+    int getNextUsableTime();
+  }
+  /**
+   * <pre>
+   * CmdId: 4276
+   * EnetChannelId: 0
+   * EnetIsReliable: false
+   * IsAllowClient: true
+   * </pre>
+   *
+   * Protobuf type {@code AnchorPointDataNotify}
+   */
+  public static final class AnchorPointDataNotify extends
+      com.google.protobuf.GeneratedMessageV3 implements
+      // @@protoc_insertion_point(message_implements:AnchorPointDataNotify)
+      AnchorPointDataNotifyOrBuilder {
+  private static final long serialVersionUID = 0L;
+    // Use AnchorPointDataNotify.newBuilder() to construct.
+    private AnchorPointDataNotify(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
+      super(builder);
+    }
+    private AnchorPointDataNotify() {
+      anchorPointList_ = java.util.Collections.emptyList();
+    }
+
+    @java.lang.Override
+    @SuppressWarnings({"unused"})
+    protected java.lang.Object newInstance(
+        UnusedPrivateParameter unused) {
+      return new AnchorPointDataNotify();
+    }
+
+    @java.lang.Override
+    public final com.google.protobuf.UnknownFieldSet
+    getUnknownFields() {
+      return this.unknownFields;
+    }
+    private AnchorPointDataNotify(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
+      int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 82: {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                anchorPointList_ = new java.util.ArrayList<emu.grasscutter.net.proto.AnchorPointDataOuterClass.AnchorPointData>();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              anchorPointList_.add(
+                  input.readMessage(emu.grasscutter.net.proto.AnchorPointDataOuterClass.AnchorPointData.parser(), extensionRegistry));
+              break;
+            }
+            case 112: {
+
+              nextUsableTime_ = input.readUInt32();
+              break;
+            }
+            default: {
+              if (!parseUnknownField(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+          }
+        }
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.setUnfinishedMessage(this);
+      } catch (java.io.IOException e) {
+        throw new com.google.protobuf.InvalidProtocolBufferException(
+            e).setUnfinishedMessage(this);
+      } finally {
+        if (((mutable_bitField0_ & 0x00000001) != 0)) {
+          anchorPointList_ = java.util.Collections.unmodifiableList(anchorPointList_);
+        }
+        this.unknownFields = unknownFields.build();
+        makeExtensionsImmutable();
+      }
+    }
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return emu.grasscutter.net.proto.AnchorPointDataNotifyOuterClass.internal_static_AnchorPointDataNotify_descriptor;
+    }
+
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return emu.grasscutter.net.proto.AnchorPointDataNotifyOuterClass.internal_static_AnchorPointDataNotify_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              emu.grasscutter.net.proto.AnchorPointDataNotifyOuterClass.AnchorPointDataNotify.class, emu.grasscutter.net.proto.AnchorPointDataNotifyOuterClass.AnchorPointDataNotify.Builder.class);
+    }
+
+    public static final int ANCHOR_POINT_LIST_FIELD_NUMBER = 10;
+    private java.util.List<emu.grasscutter.net.proto.AnchorPointDataOuterClass.AnchorPointData> anchorPointList_;
+    /**
+     * <code>repeated .AnchorPointData anchor_point_list = 10;</code>
+     */
+    @java.lang.Override
+    public java.util.List<emu.grasscutter.net.proto.AnchorPointDataOuterClass.AnchorPointData> getAnchorPointListList() {
+      return anchorPointList_;
+    }
+    /**
+     * <code>repeated .AnchorPointData anchor_point_list = 10;</code>
+     */
+    @java.lang.Override
+    public java.util.List<? extends emu.grasscutter.net.proto.AnchorPointDataOuterClass.AnchorPointDataOrBuilder> 
+        getAnchorPointListOrBuilderList() {
+      return anchorPointList_;
+    }
+    /**
+     * <code>repeated .AnchorPointData anchor_point_list = 10;</code>
+     */
+    @java.lang.Override
+    public int getAnchorPointListCount() {
+      return anchorPointList_.size();
+    }
+    /**
+     * <code>repeated .AnchorPointData anchor_point_list = 10;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.AnchorPointDataOuterClass.AnchorPointData getAnchorPointList(int index) {
+      return anchorPointList_.get(index);
+    }
+    /**
+     * <code>repeated .AnchorPointData anchor_point_list = 10;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.AnchorPointDataOuterClass.AnchorPointDataOrBuilder getAnchorPointListOrBuilder(
+        int index) {
+      return anchorPointList_.get(index);
+    }
+
+    public static final int NEXT_USABLE_TIME_FIELD_NUMBER = 14;
+    private int nextUsableTime_;
+    /**
+     * <code>uint32 next_usable_time = 14;</code>
+     * @return The nextUsableTime.
+     */
+    @java.lang.Override
+    public int getNextUsableTime() {
+      return nextUsableTime_;
+    }
+
+    private byte memoizedIsInitialized = -1;
+    @java.lang.Override
+    public final boolean isInitialized() {
+      byte isInitialized = memoizedIsInitialized;
+      if (isInitialized == 1) return true;
+      if (isInitialized == 0) return false;
+
+      memoizedIsInitialized = 1;
+      return true;
+    }
+
+    @java.lang.Override
+    public void writeTo(com.google.protobuf.CodedOutputStream output)
+                        throws java.io.IOException {
+      for (int i = 0; i < anchorPointList_.size(); i++) {
+        output.writeMessage(10, anchorPointList_.get(i));
+      }
+      if (nextUsableTime_ != 0) {
+        output.writeUInt32(14, nextUsableTime_);
+      }
+      unknownFields.writeTo(output);
+    }
+
+    @java.lang.Override
+    public int getSerializedSize() {
+      int size = memoizedSize;
+      if (size != -1) return size;
+
+      size = 0;
+      for (int i = 0; i < anchorPointList_.size(); i++) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(10, anchorPointList_.get(i));
+      }
+      if (nextUsableTime_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(14, nextUsableTime_);
+      }
+      size += unknownFields.getSerializedSize();
+      memoizedSize = size;
+      return size;
+    }
+
+    @java.lang.Override
+    public boolean equals(final java.lang.Object obj) {
+      if (obj == this) {
+       return true;
+      }
+      if (!(obj instanceof emu.grasscutter.net.proto.AnchorPointDataNotifyOuterClass.AnchorPointDataNotify)) {
+        return super.equals(obj);
+      }
+      emu.grasscutter.net.proto.AnchorPointDataNotifyOuterClass.AnchorPointDataNotify other = (emu.grasscutter.net.proto.AnchorPointDataNotifyOuterClass.AnchorPointDataNotify) obj;
+
+      if (!getAnchorPointListList()
+          .equals(other.getAnchorPointListList())) return false;
+      if (getNextUsableTime()
+          != other.getNextUsableTime()) return false;
+      if (!unknownFields.equals(other.unknownFields)) return false;
+      return true;
+    }
+
+    @java.lang.Override
+    public int hashCode() {
+      if (memoizedHashCode != 0) {
+        return memoizedHashCode;
+      }
+      int hash = 41;
+      hash = (19 * hash) + getDescriptor().hashCode();
+      if (getAnchorPointListCount() > 0) {
+        hash = (37 * hash) + ANCHOR_POINT_LIST_FIELD_NUMBER;
+        hash = (53 * hash) + getAnchorPointListList().hashCode();
+      }
+      hash = (37 * hash) + NEXT_USABLE_TIME_FIELD_NUMBER;
+      hash = (53 * hash) + getNextUsableTime();
+      hash = (29 * hash) + unknownFields.hashCode();
+      memoizedHashCode = hash;
+      return hash;
+    }
+
+    public static emu.grasscutter.net.proto.AnchorPointDataNotifyOuterClass.AnchorPointDataNotify parseFrom(
+        java.nio.ByteBuffer data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static emu.grasscutter.net.proto.AnchorPointDataNotifyOuterClass.AnchorPointDataNotify parseFrom(
+        java.nio.ByteBuffer data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.AnchorPointDataNotifyOuterClass.AnchorPointDataNotify parseFrom(
+        com.google.protobuf.ByteString data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static emu.grasscutter.net.proto.AnchorPointDataNotifyOuterClass.AnchorPointDataNotify parseFrom(
+        com.google.protobuf.ByteString data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.AnchorPointDataNotifyOuterClass.AnchorPointDataNotify parseFrom(byte[] data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static emu.grasscutter.net.proto.AnchorPointDataNotifyOuterClass.AnchorPointDataNotify parseFrom(
+        byte[] data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.AnchorPointDataNotifyOuterClass.AnchorPointDataNotify parseFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
+    }
+    public static emu.grasscutter.net.proto.AnchorPointDataNotifyOuterClass.AnchorPointDataNotify parseFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.AnchorPointDataNotifyOuterClass.AnchorPointDataNotify parseDelimitedFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input);
+    }
+    public static emu.grasscutter.net.proto.AnchorPointDataNotifyOuterClass.AnchorPointDataNotify parseDelimitedFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.AnchorPointDataNotifyOuterClass.AnchorPointDataNotify parseFrom(
+        com.google.protobuf.CodedInputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
+    }
+    public static emu.grasscutter.net.proto.AnchorPointDataNotifyOuterClass.AnchorPointDataNotify parseFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
+    }
+
+    @java.lang.Override
+    public Builder newBuilderForType() { return newBuilder(); }
+    public static Builder newBuilder() {
+      return DEFAULT_INSTANCE.toBuilder();
+    }
+    public static Builder newBuilder(emu.grasscutter.net.proto.AnchorPointDataNotifyOuterClass.AnchorPointDataNotify prototype) {
+      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+    }
+    @java.lang.Override
+    public Builder toBuilder() {
+      return this == DEFAULT_INSTANCE
+          ? new Builder() : new Builder().mergeFrom(this);
+    }
+
+    @java.lang.Override
+    protected Builder newBuilderForType(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      Builder builder = new Builder(parent);
+      return builder;
+    }
+    /**
+     * <pre>
+     * CmdId: 4276
+     * EnetChannelId: 0
+     * EnetIsReliable: false
+     * IsAllowClient: true
+     * </pre>
+     *
+     * Protobuf type {@code AnchorPointDataNotify}
+     */
+    public static final class Builder extends
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
+        // @@protoc_insertion_point(builder_implements:AnchorPointDataNotify)
+        emu.grasscutter.net.proto.AnchorPointDataNotifyOuterClass.AnchorPointDataNotifyOrBuilder {
+      public static final com.google.protobuf.Descriptors.Descriptor
+          getDescriptor() {
+        return emu.grasscutter.net.proto.AnchorPointDataNotifyOuterClass.internal_static_AnchorPointDataNotify_descriptor;
+      }
+
+      @java.lang.Override
+      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+          internalGetFieldAccessorTable() {
+        return emu.grasscutter.net.proto.AnchorPointDataNotifyOuterClass.internal_static_AnchorPointDataNotify_fieldAccessorTable
+            .ensureFieldAccessorsInitialized(
+                emu.grasscutter.net.proto.AnchorPointDataNotifyOuterClass.AnchorPointDataNotify.class, emu.grasscutter.net.proto.AnchorPointDataNotifyOuterClass.AnchorPointDataNotify.Builder.class);
+      }
+
+      // Construct using emu.grasscutter.net.proto.AnchorPointDataNotifyOuterClass.AnchorPointDataNotify.newBuilder()
+      private Builder() {
+        maybeForceBuilderInitialization();
+      }
+
+      private Builder(
+          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+        super(parent);
+        maybeForceBuilderInitialization();
+      }
+      private void maybeForceBuilderInitialization() {
+        if (com.google.protobuf.GeneratedMessageV3
+                .alwaysUseFieldBuilders) {
+          getAnchorPointListFieldBuilder();
+        }
+      }
+      @java.lang.Override
+      public Builder clear() {
+        super.clear();
+        if (anchorPointListBuilder_ == null) {
+          anchorPointList_ = java.util.Collections.emptyList();
+          bitField0_ = (bitField0_ & ~0x00000001);
+        } else {
+          anchorPointListBuilder_.clear();
+        }
+        nextUsableTime_ = 0;
+
+        return this;
+      }
+
+      @java.lang.Override
+      public com.google.protobuf.Descriptors.Descriptor
+          getDescriptorForType() {
+        return emu.grasscutter.net.proto.AnchorPointDataNotifyOuterClass.internal_static_AnchorPointDataNotify_descriptor;
+      }
+
+      @java.lang.Override
+      public emu.grasscutter.net.proto.AnchorPointDataNotifyOuterClass.AnchorPointDataNotify getDefaultInstanceForType() {
+        return emu.grasscutter.net.proto.AnchorPointDataNotifyOuterClass.AnchorPointDataNotify.getDefaultInstance();
+      }
+
+      @java.lang.Override
+      public emu.grasscutter.net.proto.AnchorPointDataNotifyOuterClass.AnchorPointDataNotify build() {
+        emu.grasscutter.net.proto.AnchorPointDataNotifyOuterClass.AnchorPointDataNotify result = buildPartial();
+        if (!result.isInitialized()) {
+          throw newUninitializedMessageException(result);
+        }
+        return result;
+      }
+
+      @java.lang.Override
+      public emu.grasscutter.net.proto.AnchorPointDataNotifyOuterClass.AnchorPointDataNotify buildPartial() {
+        emu.grasscutter.net.proto.AnchorPointDataNotifyOuterClass.AnchorPointDataNotify result = new emu.grasscutter.net.proto.AnchorPointDataNotifyOuterClass.AnchorPointDataNotify(this);
+        int from_bitField0_ = bitField0_;
+        if (anchorPointListBuilder_ == null) {
+          if (((bitField0_ & 0x00000001) != 0)) {
+            anchorPointList_ = java.util.Collections.unmodifiableList(anchorPointList_);
+            bitField0_ = (bitField0_ & ~0x00000001);
+          }
+          result.anchorPointList_ = anchorPointList_;
+        } else {
+          result.anchorPointList_ = anchorPointListBuilder_.build();
+        }
+        result.nextUsableTime_ = nextUsableTime_;
+        onBuilt();
+        return result;
+      }
+
+      @java.lang.Override
+      public Builder clone() {
+        return super.clone();
+      }
+      @java.lang.Override
+      public Builder setField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return super.setField(field, value);
+      }
+      @java.lang.Override
+      public Builder clearField(
+          com.google.protobuf.Descriptors.FieldDescriptor field) {
+        return super.clearField(field);
+      }
+      @java.lang.Override
+      public Builder clearOneof(
+          com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+        return super.clearOneof(oneof);
+      }
+      @java.lang.Override
+      public Builder setRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          int index, java.lang.Object value) {
+        return super.setRepeatedField(field, index, value);
+      }
+      @java.lang.Override
+      public Builder addRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return super.addRepeatedField(field, value);
+      }
+      @java.lang.Override
+      public Builder mergeFrom(com.google.protobuf.Message other) {
+        if (other instanceof emu.grasscutter.net.proto.AnchorPointDataNotifyOuterClass.AnchorPointDataNotify) {
+          return mergeFrom((emu.grasscutter.net.proto.AnchorPointDataNotifyOuterClass.AnchorPointDataNotify)other);
+        } else {
+          super.mergeFrom(other);
+          return this;
+        }
+      }
+
+      public Builder mergeFrom(emu.grasscutter.net.proto.AnchorPointDataNotifyOuterClass.AnchorPointDataNotify other) {
+        if (other == emu.grasscutter.net.proto.AnchorPointDataNotifyOuterClass.AnchorPointDataNotify.getDefaultInstance()) return this;
+        if (anchorPointListBuilder_ == null) {
+          if (!other.anchorPointList_.isEmpty()) {
+            if (anchorPointList_.isEmpty()) {
+              anchorPointList_ = other.anchorPointList_;
+              bitField0_ = (bitField0_ & ~0x00000001);
+            } else {
+              ensureAnchorPointListIsMutable();
+              anchorPointList_.addAll(other.anchorPointList_);
+            }
+            onChanged();
+          }
+        } else {
+          if (!other.anchorPointList_.isEmpty()) {
+            if (anchorPointListBuilder_.isEmpty()) {
+              anchorPointListBuilder_.dispose();
+              anchorPointListBuilder_ = null;
+              anchorPointList_ = other.anchorPointList_;
+              bitField0_ = (bitField0_ & ~0x00000001);
+              anchorPointListBuilder_ = 
+                com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
+                   getAnchorPointListFieldBuilder() : null;
+            } else {
+              anchorPointListBuilder_.addAllMessages(other.anchorPointList_);
+            }
+          }
+        }
+        if (other.getNextUsableTime() != 0) {
+          setNextUsableTime(other.getNextUsableTime());
+        }
+        this.mergeUnknownFields(other.unknownFields);
+        onChanged();
+        return this;
+      }
+
+      @java.lang.Override
+      public final boolean isInitialized() {
+        return true;
+      }
+
+      @java.lang.Override
+      public Builder mergeFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws java.io.IOException {
+        emu.grasscutter.net.proto.AnchorPointDataNotifyOuterClass.AnchorPointDataNotify parsedMessage = null;
+        try {
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage = (emu.grasscutter.net.proto.AnchorPointDataNotifyOuterClass.AnchorPointDataNotify) e.getUnfinishedMessage();
+          throw e.unwrapIOException();
+        } finally {
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
+          }
+        }
+        return this;
+      }
+      private int bitField0_;
+
+      private java.util.List<emu.grasscutter.net.proto.AnchorPointDataOuterClass.AnchorPointData> anchorPointList_ =
+        java.util.Collections.emptyList();
+      private void ensureAnchorPointListIsMutable() {
+        if (!((bitField0_ & 0x00000001) != 0)) {
+          anchorPointList_ = new java.util.ArrayList<emu.grasscutter.net.proto.AnchorPointDataOuterClass.AnchorPointData>(anchorPointList_);
+          bitField0_ |= 0x00000001;
+         }
+      }
+
+      private com.google.protobuf.RepeatedFieldBuilderV3<
+          emu.grasscutter.net.proto.AnchorPointDataOuterClass.AnchorPointData, emu.grasscutter.net.proto.AnchorPointDataOuterClass.AnchorPointData.Builder, emu.grasscutter.net.proto.AnchorPointDataOuterClass.AnchorPointDataOrBuilder> anchorPointListBuilder_;
+
+      /**
+       * <code>repeated .AnchorPointData anchor_point_list = 10;</code>
+       */
+      public java.util.List<emu.grasscutter.net.proto.AnchorPointDataOuterClass.AnchorPointData> getAnchorPointListList() {
+        if (anchorPointListBuilder_ == null) {
+          return java.util.Collections.unmodifiableList(anchorPointList_);
+        } else {
+          return anchorPointListBuilder_.getMessageList();
+        }
+      }
+      /**
+       * <code>repeated .AnchorPointData anchor_point_list = 10;</code>
+       */
+      public int getAnchorPointListCount() {
+        if (anchorPointListBuilder_ == null) {
+          return anchorPointList_.size();
+        } else {
+          return anchorPointListBuilder_.getCount();
+        }
+      }
+      /**
+       * <code>repeated .AnchorPointData anchor_point_list = 10;</code>
+       */
+      public emu.grasscutter.net.proto.AnchorPointDataOuterClass.AnchorPointData getAnchorPointList(int index) {
+        if (anchorPointListBuilder_ == null) {
+          return anchorPointList_.get(index);
+        } else {
+          return anchorPointListBuilder_.getMessage(index);
+        }
+      }
+      /**
+       * <code>repeated .AnchorPointData anchor_point_list = 10;</code>
+       */
+      public Builder setAnchorPointList(
+          int index, emu.grasscutter.net.proto.AnchorPointDataOuterClass.AnchorPointData value) {
+        if (anchorPointListBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureAnchorPointListIsMutable();
+          anchorPointList_.set(index, value);
+          onChanged();
+        } else {
+          anchorPointListBuilder_.setMessage(index, value);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .AnchorPointData anchor_point_list = 10;</code>
+       */
+      public Builder setAnchorPointList(
+          int index, emu.grasscutter.net.proto.AnchorPointDataOuterClass.AnchorPointData.Builder builderForValue) {
+        if (anchorPointListBuilder_ == null) {
+          ensureAnchorPointListIsMutable();
+          anchorPointList_.set(index, builderForValue.build());
+          onChanged();
+        } else {
+          anchorPointListBuilder_.setMessage(index, builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .AnchorPointData anchor_point_list = 10;</code>
+       */
+      public Builder addAnchorPointList(emu.grasscutter.net.proto.AnchorPointDataOuterClass.AnchorPointData value) {
+        if (anchorPointListBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureAnchorPointListIsMutable();
+          anchorPointList_.add(value);
+          onChanged();
+        } else {
+          anchorPointListBuilder_.addMessage(value);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .AnchorPointData anchor_point_list = 10;</code>
+       */
+      public Builder addAnchorPointList(
+          int index, emu.grasscutter.net.proto.AnchorPointDataOuterClass.AnchorPointData value) {
+        if (anchorPointListBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureAnchorPointListIsMutable();
+          anchorPointList_.add(index, value);
+          onChanged();
+        } else {
+          anchorPointListBuilder_.addMessage(index, value);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .AnchorPointData anchor_point_list = 10;</code>
+       */
+      public Builder addAnchorPointList(
+          emu.grasscutter.net.proto.AnchorPointDataOuterClass.AnchorPointData.Builder builderForValue) {
+        if (anchorPointListBuilder_ == null) {
+          ensureAnchorPointListIsMutable();
+          anchorPointList_.add(builderForValue.build());
+          onChanged();
+        } else {
+          anchorPointListBuilder_.addMessage(builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .AnchorPointData anchor_point_list = 10;</code>
+       */
+      public Builder addAnchorPointList(
+          int index, emu.grasscutter.net.proto.AnchorPointDataOuterClass.AnchorPointData.Builder builderForValue) {
+        if (anchorPointListBuilder_ == null) {
+          ensureAnchorPointListIsMutable();
+          anchorPointList_.add(index, builderForValue.build());
+          onChanged();
+        } else {
+          anchorPointListBuilder_.addMessage(index, builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .AnchorPointData anchor_point_list = 10;</code>
+       */
+      public Builder addAllAnchorPointList(
+          java.lang.Iterable<? extends emu.grasscutter.net.proto.AnchorPointDataOuterClass.AnchorPointData> values) {
+        if (anchorPointListBuilder_ == null) {
+          ensureAnchorPointListIsMutable();
+          com.google.protobuf.AbstractMessageLite.Builder.addAll(
+              values, anchorPointList_);
+          onChanged();
+        } else {
+          anchorPointListBuilder_.addAllMessages(values);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .AnchorPointData anchor_point_list = 10;</code>
+       */
+      public Builder clearAnchorPointList() {
+        if (anchorPointListBuilder_ == null) {
+          anchorPointList_ = java.util.Collections.emptyList();
+          bitField0_ = (bitField0_ & ~0x00000001);
+          onChanged();
+        } else {
+          anchorPointListBuilder_.clear();
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .AnchorPointData anchor_point_list = 10;</code>
+       */
+      public Builder removeAnchorPointList(int index) {
+        if (anchorPointListBuilder_ == null) {
+          ensureAnchorPointListIsMutable();
+          anchorPointList_.remove(index);
+          onChanged();
+        } else {
+          anchorPointListBuilder_.remove(index);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .AnchorPointData anchor_point_list = 10;</code>
+       */
+      public emu.grasscutter.net.proto.AnchorPointDataOuterClass.AnchorPointData.Builder getAnchorPointListBuilder(
+          int index) {
+        return getAnchorPointListFieldBuilder().getBuilder(index);
+      }
+      /**
+       * <code>repeated .AnchorPointData anchor_point_list = 10;</code>
+       */
+      public emu.grasscutter.net.proto.AnchorPointDataOuterClass.AnchorPointDataOrBuilder getAnchorPointListOrBuilder(
+          int index) {
+        if (anchorPointListBuilder_ == null) {
+          return anchorPointList_.get(index);  } else {
+          return anchorPointListBuilder_.getMessageOrBuilder(index);
+        }
+      }
+      /**
+       * <code>repeated .AnchorPointData anchor_point_list = 10;</code>
+       */
+      public java.util.List<? extends emu.grasscutter.net.proto.AnchorPointDataOuterClass.AnchorPointDataOrBuilder> 
+           getAnchorPointListOrBuilderList() {
+        if (anchorPointListBuilder_ != null) {
+          return anchorPointListBuilder_.getMessageOrBuilderList();
+        } else {
+          return java.util.Collections.unmodifiableList(anchorPointList_);
+        }
+      }
+      /**
+       * <code>repeated .AnchorPointData anchor_point_list = 10;</code>
+       */
+      public emu.grasscutter.net.proto.AnchorPointDataOuterClass.AnchorPointData.Builder addAnchorPointListBuilder() {
+        return getAnchorPointListFieldBuilder().addBuilder(
+            emu.grasscutter.net.proto.AnchorPointDataOuterClass.AnchorPointData.getDefaultInstance());
+      }
+      /**
+       * <code>repeated .AnchorPointData anchor_point_list = 10;</code>
+       */
+      public emu.grasscutter.net.proto.AnchorPointDataOuterClass.AnchorPointData.Builder addAnchorPointListBuilder(
+          int index) {
+        return getAnchorPointListFieldBuilder().addBuilder(
+            index, emu.grasscutter.net.proto.AnchorPointDataOuterClass.AnchorPointData.getDefaultInstance());
+      }
+      /**
+       * <code>repeated .AnchorPointData anchor_point_list = 10;</code>
+       */
+      public java.util.List<emu.grasscutter.net.proto.AnchorPointDataOuterClass.AnchorPointData.Builder> 
+           getAnchorPointListBuilderList() {
+        return getAnchorPointListFieldBuilder().getBuilderList();
+      }
+      private com.google.protobuf.RepeatedFieldBuilderV3<
+          emu.grasscutter.net.proto.AnchorPointDataOuterClass.AnchorPointData, emu.grasscutter.net.proto.AnchorPointDataOuterClass.AnchorPointData.Builder, emu.grasscutter.net.proto.AnchorPointDataOuterClass.AnchorPointDataOrBuilder> 
+          getAnchorPointListFieldBuilder() {
+        if (anchorPointListBuilder_ == null) {
+          anchorPointListBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
+              emu.grasscutter.net.proto.AnchorPointDataOuterClass.AnchorPointData, emu.grasscutter.net.proto.AnchorPointDataOuterClass.AnchorPointData.Builder, emu.grasscutter.net.proto.AnchorPointDataOuterClass.AnchorPointDataOrBuilder>(
+                  anchorPointList_,
+                  ((bitField0_ & 0x00000001) != 0),
+                  getParentForChildren(),
+                  isClean());
+          anchorPointList_ = null;
+        }
+        return anchorPointListBuilder_;
+      }
+
+      private int nextUsableTime_ ;
+      /**
+       * <code>uint32 next_usable_time = 14;</code>
+       * @return The nextUsableTime.
+       */
+      @java.lang.Override
+      public int getNextUsableTime() {
+        return nextUsableTime_;
+      }
+      /**
+       * <code>uint32 next_usable_time = 14;</code>
+       * @param value The nextUsableTime to set.
+       * @return This builder for chaining.
+       */
+      public Builder setNextUsableTime(int value) {
+        
+        nextUsableTime_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 next_usable_time = 14;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearNextUsableTime() {
+        
+        nextUsableTime_ = 0;
+        onChanged();
+        return this;
+      }
+      @java.lang.Override
+      public final Builder setUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.setUnknownFields(unknownFields);
+      }
+
+      @java.lang.Override
+      public final Builder mergeUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.mergeUnknownFields(unknownFields);
+      }
+
+
+      // @@protoc_insertion_point(builder_scope:AnchorPointDataNotify)
+    }
+
+    // @@protoc_insertion_point(class_scope:AnchorPointDataNotify)
+    private static final emu.grasscutter.net.proto.AnchorPointDataNotifyOuterClass.AnchorPointDataNotify DEFAULT_INSTANCE;
+    static {
+      DEFAULT_INSTANCE = new emu.grasscutter.net.proto.AnchorPointDataNotifyOuterClass.AnchorPointDataNotify();
+    }
+
+    public static emu.grasscutter.net.proto.AnchorPointDataNotifyOuterClass.AnchorPointDataNotify getDefaultInstance() {
+      return DEFAULT_INSTANCE;
+    }
+
+    private static final com.google.protobuf.Parser<AnchorPointDataNotify>
+        PARSER = new com.google.protobuf.AbstractParser<AnchorPointDataNotify>() {
+      @java.lang.Override
+      public AnchorPointDataNotify parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return new AnchorPointDataNotify(input, extensionRegistry);
+      }
+    };
+
+    public static com.google.protobuf.Parser<AnchorPointDataNotify> parser() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<AnchorPointDataNotify> getParserForType() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public emu.grasscutter.net.proto.AnchorPointDataNotifyOuterClass.AnchorPointDataNotify getDefaultInstanceForType() {
+      return DEFAULT_INSTANCE;
+    }
+
+  }
+
+  private static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_AnchorPointDataNotify_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_AnchorPointDataNotify_fieldAccessorTable;
+
+  public static com.google.protobuf.Descriptors.FileDescriptor
+      getDescriptor() {
+    return descriptor;
+  }
+  private static  com.google.protobuf.Descriptors.FileDescriptor
+      descriptor;
+  static {
+    java.lang.String[] descriptorData = {
+      "\n\033AnchorPointDataNotify.proto\032\025AnchorPoi" +
+      "ntData.proto\"^\n\025AnchorPointDataNotify\022+\n" +
+      "\021anchor_point_list\030\n \003(\0132\020.AnchorPointDa" +
+      "ta\022\030\n\020next_usable_time\030\016 \001(\rB\033\n\031emu.gras" +
+      "scutter.net.protob\006proto3"
+    };
+    descriptor = com.google.protobuf.Descriptors.FileDescriptor
+      .internalBuildGeneratedFileFrom(descriptorData,
+        new com.google.protobuf.Descriptors.FileDescriptor[] {
+          emu.grasscutter.net.proto.AnchorPointDataOuterClass.getDescriptor(),
+        });
+    internal_static_AnchorPointDataNotify_descriptor =
+      getDescriptor().getMessageTypes().get(0);
+    internal_static_AnchorPointDataNotify_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_AnchorPointDataNotify_descriptor,
+        new java.lang.String[] { "AnchorPointList", "NextUsableTime", });
+    emu.grasscutter.net.proto.AnchorPointDataOuterClass.getDescriptor();
+  }
+
+  // @@protoc_insertion_point(outer_class_scope)
+}

src/generated/main/java/emu/grasscutter/net/proto/AnchorPointDataOuterClass.java

@@ -19,58 +19,54 @@ public final class AnchorPointDataOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>.Vector pos = 1;</code>
+     * <code>uint32 scene_id = 5;</code>
-     * @return Whether the pos field is set.
+     * @return The sceneId.
      */
-    boolean hasPos();
+    int getSceneId();
-    /**
-     * <code>.Vector pos = 1;</code>
-     * @return The pos.
-     */
-    emu.grasscutter.net.proto.VectorOuterClass.Vector getPos();
-    /**
-     * <code>.Vector pos = 1;</code>
-     */
-    emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPosOrBuilder();
 
     /**
-     * <code>uint32 end_time = 9;</code>
+     * <code>uint32 anchor_point_id = 9;</code>
-     * @return The endTime.
-     */
-    int getEndTime();
-
-    /**
-     * <code>.Vector rot = 6;</code>
-     * @return Whether the rot field is set.
-     */
-    boolean hasRot();
-    /**
-     * <code>.Vector rot = 6;</code>
-     * @return The rot.
-     */
-    emu.grasscutter.net.proto.VectorOuterClass.Vector getRot();
-    /**
-     * <code>.Vector rot = 6;</code>
-     */
-    emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getRotOrBuilder();
-
-    /**
-     * <code>uint32 anchor_point_id = 5;</code>
      * @return The anchorPointId.
      */
     int getAnchorPointId();
 
     /**
-     * <code>uint32 scene_id = 15;</code>
+     * <code>uint32 end_time = 8;</code>
-     * @return The sceneId.
+     * @return The endTime.
      */
-    int getSceneId();
+    int getEndTime();
+
+    /**
+     * <code>.Vector pos = 15;</code>
+     * @return Whether the pos field is set.
+     */
+    boolean hasPos();
+    /**
+     * <code>.Vector pos = 15;</code>
+     * @return The pos.
+     */
+    emu.grasscutter.net.proto.VectorOuterClass.Vector getPos();
+    /**
+     * <code>.Vector pos = 15;</code>
+     */
+    emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPosOrBuilder();
+
+    /**
+     * <code>.Vector rot = 2;</code>
+     * @return Whether the rot field is set.
+     */
+    boolean hasRot();
+    /**
+     * <code>.Vector rot = 2;</code>
+     * @return The rot.
+     */
+    emu.grasscutter.net.proto.VectorOuterClass.Vector getRot();
+    /**
+     * <code>.Vector rot = 2;</code>
+     */
+    emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getRotOrBuilder();
   }
   /**
-   * <pre>
-   * Name: GBGELAPCNII
-   * </pre>
-   *
    * Protobuf type {@code AnchorPointData}
    */
   public static final class AnchorPointData extends
@@ -115,25 +111,7 @@ public final class AnchorPointDataOuterClass {
             case 0:
               done = true;
               break;
-            case 10: {
+            case 18: {
-              emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder subBuilder = null;
-              if (pos_ != null) {
-                subBuilder = pos_.toBuilder();
-              }
-              pos_ = input.readMessage(emu.grasscutter.net.proto.VectorOuterClass.Vector.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(pos_);
-                pos_ = subBuilder.buildPartial();
-              }
-
-              break;
-            }
-            case 40: {
-
-              anchorPointId_ = input.readUInt32();
-              break;
-            }
-            case 50: {
               emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder subBuilder = null;
               if (rot_ != null) {
                 subBuilder = rot_.toBuilder();
@@ -146,14 +124,32 @@ public final class AnchorPointDataOuterClass {
 
               break;
             }
-            case 72: {
+            case 40: {
+
+              sceneId_ = input.readUInt32();
+              break;
+            }
+            case 64: {
 
               endTime_ = input.readUInt32();
               break;
             }
-            case 120: {
+            case 72: {
+
+              anchorPointId_ = input.readUInt32();
+              break;
+            }
+            case 122: {
+              emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder subBuilder = null;
+              if (pos_ != null) {
+                subBuilder = pos_.toBuilder();
+              }
+              pos_ = input.readMessage(emu.grasscutter.net.proto.VectorOuterClass.Vector.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(pos_);
+                pos_ = subBuilder.buildPartial();
+              }
 
-              sceneId_ = input.readUInt32();
               break;
             }
             default: {
@@ -188,73 +184,21 @@ public final class AnchorPointDataOuterClass {
               emu.grasscutter.net.proto.AnchorPointDataOuterClass.AnchorPointData.class, emu.grasscutter.net.proto.AnchorPointDataOuterClass.AnchorPointData.Builder.class);
     }
 
-    public static final int POS_FIELD_NUMBER = 1;
+    public static final int SCENE_ID_FIELD_NUMBER = 5;
-    private emu.grasscutter.net.proto.VectorOuterClass.Vector pos_;
+    private int sceneId_;
     /**
-     * <code>.Vector pos = 1;</code>
+     * <code>uint32 scene_id = 5;</code>
-     * @return Whether the pos field is set.
+     * @return The sceneId.
      */
     @java.lang.Override
-    public boolean hasPos() {
+    public int getSceneId() {
-      return pos_ != null;
+      return sceneId_;
-    }
-    /**
-     * <code>.Vector pos = 1;</code>
-     * @return The pos.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.VectorOuterClass.Vector getPos() {
-      return pos_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : pos_;
-    }
-    /**
-     * <code>.Vector pos = 1;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPosOrBuilder() {
-      return getPos();
     }
 
-    public static final int END_TIME_FIELD_NUMBER = 9;
+    public static final int ANCHOR_POINT_ID_FIELD_NUMBER = 9;
-    private int endTime_;
-    /**
-     * <code>uint32 end_time = 9;</code>
-     * @return The endTime.
-     */
-    @java.lang.Override
-    public int getEndTime() {
-      return endTime_;
-    }
-
-    public static final int ROT_FIELD_NUMBER = 6;
-    private emu.grasscutter.net.proto.VectorOuterClass.Vector rot_;
-    /**
-     * <code>.Vector rot = 6;</code>
-     * @return Whether the rot field is set.
-     */
-    @java.lang.Override
-    public boolean hasRot() {
-      return rot_ != null;
-    }
-    /**
-     * <code>.Vector rot = 6;</code>
-     * @return The rot.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.VectorOuterClass.Vector getRot() {
-      return rot_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : rot_;
-    }
-    /**
-     * <code>.Vector rot = 6;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getRotOrBuilder() {
-      return getRot();
-    }
-
-    public static final int ANCHOR_POINT_ID_FIELD_NUMBER = 5;
     private int anchorPointId_;
     /**
-     * <code>uint32 anchor_point_id = 5;</code>
+     * <code>uint32 anchor_point_id = 9;</code>
      * @return The anchorPointId.
      */
     @java.lang.Override
@@ -262,15 +206,67 @@ public final class AnchorPointDataOuterClass {
       return anchorPointId_;
     }
 
-    public static final int SCENE_ID_FIELD_NUMBER = 15;
+    public static final int END_TIME_FIELD_NUMBER = 8;
-    private int sceneId_;
+    private int endTime_;
     /**
-     * <code>uint32 scene_id = 15;</code>
+     * <code>uint32 end_time = 8;</code>
-     * @return The sceneId.
+     * @return The endTime.
      */
     @java.lang.Override
-    public int getSceneId() {
+    public int getEndTime() {
-      return sceneId_;
+      return endTime_;
+    }
+
+    public static final int POS_FIELD_NUMBER = 15;
+    private emu.grasscutter.net.proto.VectorOuterClass.Vector pos_;
+    /**
+     * <code>.Vector pos = 15;</code>
+     * @return Whether the pos field is set.
+     */
+    @java.lang.Override
+    public boolean hasPos() {
+      return pos_ != null;
+    }
+    /**
+     * <code>.Vector pos = 15;</code>
+     * @return The pos.
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.VectorOuterClass.Vector getPos() {
+      return pos_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : pos_;
+    }
+    /**
+     * <code>.Vector pos = 15;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPosOrBuilder() {
+      return getPos();
+    }
+
+    public static final int ROT_FIELD_NUMBER = 2;
+    private emu.grasscutter.net.proto.VectorOuterClass.Vector rot_;
+    /**
+     * <code>.Vector rot = 2;</code>
+     * @return Whether the rot field is set.
+     */
+    @java.lang.Override
+    public boolean hasRot() {
+      return rot_ != null;
+    }
+    /**
+     * <code>.Vector rot = 2;</code>
+     * @return The rot.
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.VectorOuterClass.Vector getRot() {
+      return rot_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : rot_;
+    }
+    /**
+     * <code>.Vector rot = 2;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getRotOrBuilder() {
+      return getRot();
     }
 
     private byte memoizedIsInitialized = -1;
@@ -287,20 +283,20 @@ public final class AnchorPointDataOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (pos_ != null) {
-        output.writeMessage(1, getPos());
-      }
-      if (anchorPointId_ != 0) {
-        output.writeUInt32(5, anchorPointId_);
-      }
       if (rot_ != null) {
-        output.writeMessage(6, getRot());
+        output.writeMessage(2, getRot());
-      }
-      if (endTime_ != 0) {
-        output.writeUInt32(9, endTime_);
       }
       if (sceneId_ != 0) {
-        output.writeUInt32(15, sceneId_);
+        output.writeUInt32(5, sceneId_);
+      }
+      if (endTime_ != 0) {
+        output.writeUInt32(8, endTime_);
+      }
+      if (anchorPointId_ != 0) {
+        output.writeUInt32(9, anchorPointId_);
+      }
+      if (pos_ != null) {
+        output.writeMessage(15, getPos());
       }
       unknownFields.writeTo(output);
     }
@@ -311,25 +307,25 @@ public final class AnchorPointDataOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (pos_ != null) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(1, getPos());
-      }
-      if (anchorPointId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(5, anchorPointId_);
-      }
       if (rot_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(6, getRot());
+          .computeMessageSize(2, getRot());
-      }
-      if (endTime_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(9, endTime_);
       }
       if (sceneId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(15, sceneId_);
+          .computeUInt32Size(5, sceneId_);
+      }
+      if (endTime_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(8, endTime_);
+      }
+      if (anchorPointId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(9, anchorPointId_);
+      }
+      if (pos_ != null) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(15, getPos());
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -346,22 +342,22 @@ public final class AnchorPointDataOuterClass {
       }
       emu.grasscutter.net.proto.AnchorPointDataOuterClass.AnchorPointData other = (emu.grasscutter.net.proto.AnchorPointDataOuterClass.AnchorPointData) obj;
 
+      if (getSceneId()
+          != other.getSceneId()) return false;
+      if (getAnchorPointId()
+          != other.getAnchorPointId()) return false;
+      if (getEndTime()
+          != other.getEndTime()) return false;
       if (hasPos() != other.hasPos()) return false;
       if (hasPos()) {
         if (!getPos()
             .equals(other.getPos())) return false;
       }
-      if (getEndTime()
-          != other.getEndTime()) return false;
       if (hasRot() != other.hasRot()) return false;
       if (hasRot()) {
         if (!getRot()
             .equals(other.getRot())) return false;
       }
-      if (getAnchorPointId()
-          != other.getAnchorPointId()) return false;
-      if (getSceneId()
-          != other.getSceneId()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -373,20 +369,20 @@ public final class AnchorPointDataOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
+      hash = (37 * hash) + SCENE_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getSceneId();
+      hash = (37 * hash) + ANCHOR_POINT_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getAnchorPointId();
+      hash = (37 * hash) + END_TIME_FIELD_NUMBER;
+      hash = (53 * hash) + getEndTime();
       if (hasPos()) {
         hash = (37 * hash) + POS_FIELD_NUMBER;
         hash = (53 * hash) + getPos().hashCode();
       }
-      hash = (37 * hash) + END_TIME_FIELD_NUMBER;
-      hash = (53 * hash) + getEndTime();
       if (hasRot()) {
         hash = (37 * hash) + ROT_FIELD_NUMBER;
         hash = (53 * hash) + getRot().hashCode();
       }
-      hash = (37 * hash) + ANCHOR_POINT_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getAnchorPointId();
-      hash = (37 * hash) + SCENE_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getSceneId();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -483,10 +479,6 @@ public final class AnchorPointDataOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Name: GBGELAPCNII
-     * </pre>
-     *
      * Protobuf type {@code AnchorPointData}
      */
     public static final class Builder extends
@@ -524,24 +516,24 @@ public final class AnchorPointDataOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        sceneId_ = 0;
+
+        anchorPointId_ = 0;
+
+        endTime_ = 0;
+
         if (posBuilder_ == null) {
           pos_ = null;
         } else {
           pos_ = null;
           posBuilder_ = null;
         }
-        endTime_ = 0;
-
         if (rotBuilder_ == null) {
           rot_ = null;
         } else {
           rot_ = null;
           rotBuilder_ = null;
         }
-        anchorPointId_ = 0;
-
-        sceneId_ = 0;
-
         return this;
       }
 
@@ -568,19 +560,19 @@ public final class AnchorPointDataOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.AnchorPointDataOuterClass.AnchorPointData buildPartial() {
         emu.grasscutter.net.proto.AnchorPointDataOuterClass.AnchorPointData result = new emu.grasscutter.net.proto.AnchorPointDataOuterClass.AnchorPointData(this);
+        result.sceneId_ = sceneId_;
+        result.anchorPointId_ = anchorPointId_;
+        result.endTime_ = endTime_;
         if (posBuilder_ == null) {
           result.pos_ = pos_;
         } else {
           result.pos_ = posBuilder_.build();
         }
-        result.endTime_ = endTime_;
         if (rotBuilder_ == null) {
           result.rot_ = rot_;
         } else {
           result.rot_ = rotBuilder_.build();
         }
-        result.anchorPointId_ = anchorPointId_;
-        result.sceneId_ = sceneId_;
         onBuilt();
         return result;
       }
@@ -629,20 +621,20 @@ public final class AnchorPointDataOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.AnchorPointDataOuterClass.AnchorPointData other) {
         if (other == emu.grasscutter.net.proto.AnchorPointDataOuterClass.AnchorPointData.getDefaultInstance()) return this;
-        if (other.hasPos()) {
+        if (other.getSceneId() != 0) {
-          mergePos(other.getPos());
+          setSceneId(other.getSceneId());
-        }
-        if (other.getEndTime() != 0) {
-          setEndTime(other.getEndTime());
-        }
-        if (other.hasRot()) {
-          mergeRot(other.getRot());
         }
         if (other.getAnchorPointId() != 0) {
           setAnchorPointId(other.getAnchorPointId());
         }
-        if (other.getSceneId() != 0) {
+        if (other.getEndTime() != 0) {
-          setSceneId(other.getSceneId());
+          setEndTime(other.getEndTime());
+        }
+        if (other.hasPos()) {
+          mergePos(other.getPos());
+        }
+        if (other.hasRot()) {
+          mergeRot(other.getRot());
         }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
@@ -673,18 +665,111 @@ public final class AnchorPointDataOuterClass {
         return this;
       }
 
+      private int sceneId_ ;
+      /**
+       * <code>uint32 scene_id = 5;</code>
+       * @return The sceneId.
+       */
+      @java.lang.Override
+      public int getSceneId() {
+        return sceneId_;
+      }
+      /**
+       * <code>uint32 scene_id = 5;</code>
+       * @param value The sceneId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setSceneId(int value) {
+        
+        sceneId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 scene_id = 5;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearSceneId() {
+        
+        sceneId_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int anchorPointId_ ;
+      /**
+       * <code>uint32 anchor_point_id = 9;</code>
+       * @return The anchorPointId.
+       */
+      @java.lang.Override
+      public int getAnchorPointId() {
+        return anchorPointId_;
+      }
+      /**
+       * <code>uint32 anchor_point_id = 9;</code>
+       * @param value The anchorPointId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setAnchorPointId(int value) {
+        
+        anchorPointId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 anchor_point_id = 9;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearAnchorPointId() {
+        
+        anchorPointId_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int endTime_ ;
+      /**
+       * <code>uint32 end_time = 8;</code>
+       * @return The endTime.
+       */
+      @java.lang.Override
+      public int getEndTime() {
+        return endTime_;
+      }
+      /**
+       * <code>uint32 end_time = 8;</code>
+       * @param value The endTime to set.
+       * @return This builder for chaining.
+       */
+      public Builder setEndTime(int value) {
+        
+        endTime_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 end_time = 8;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearEndTime() {
+        
+        endTime_ = 0;
+        onChanged();
+        return this;
+      }
+
       private emu.grasscutter.net.proto.VectorOuterClass.Vector pos_;
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> posBuilder_;
       /**
-       * <code>.Vector pos = 1;</code>
+       * <code>.Vector pos = 15;</code>
        * @return Whether the pos field is set.
        */
       public boolean hasPos() {
         return posBuilder_ != null || pos_ != null;
       }
       /**
-       * <code>.Vector pos = 1;</code>
+       * <code>.Vector pos = 15;</code>
        * @return The pos.
        */
       public emu.grasscutter.net.proto.VectorOuterClass.Vector getPos() {
@@ -695,7 +780,7 @@ public final class AnchorPointDataOuterClass {
         }
       }
       /**
-       * <code>.Vector pos = 1;</code>
+       * <code>.Vector pos = 15;</code>
        */
       public Builder setPos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
         if (posBuilder_ == null) {
@@ -711,7 +796,7 @@ public final class AnchorPointDataOuterClass {
         return this;
       }
       /**
-       * <code>.Vector pos = 1;</code>
+       * <code>.Vector pos = 15;</code>
        */
       public Builder setPos(
           emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) {
@@ -725,7 +810,7 @@ public final class AnchorPointDataOuterClass {
         return this;
       }
       /**
-       * <code>.Vector pos = 1;</code>
+       * <code>.Vector pos = 15;</code>
        */
       public Builder mergePos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
         if (posBuilder_ == null) {
@@ -743,7 +828,7 @@ public final class AnchorPointDataOuterClass {
         return this;
       }
       /**
-       * <code>.Vector pos = 1;</code>
+       * <code>.Vector pos = 15;</code>
        */
       public Builder clearPos() {
         if (posBuilder_ == null) {
@@ -757,7 +842,7 @@ public final class AnchorPointDataOuterClass {
         return this;
       }
       /**
-       * <code>.Vector pos = 1;</code>
+       * <code>.Vector pos = 15;</code>
        */
       public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getPosBuilder() {
         
@@ -765,7 +850,7 @@ public final class AnchorPointDataOuterClass {
         return getPosFieldBuilder().getBuilder();
       }
       /**
-       * <code>.Vector pos = 1;</code>
+       * <code>.Vector pos = 15;</code>
        */
       public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPosOrBuilder() {
         if (posBuilder_ != null) {
@@ -776,7 +861,7 @@ public final class AnchorPointDataOuterClass {
         }
       }
       /**
-       * <code>.Vector pos = 1;</code>
+       * <code>.Vector pos = 15;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> 
@@ -792,49 +877,18 @@ public final class AnchorPointDataOuterClass {
         return posBuilder_;
       }
 
-      private int endTime_ ;
-      /**
-       * <code>uint32 end_time = 9;</code>
-       * @return The endTime.
-       */
-      @java.lang.Override
-      public int getEndTime() {
-        return endTime_;
-      }
-      /**
-       * <code>uint32 end_time = 9;</code>
-       * @param value The endTime to set.
-       * @return This builder for chaining.
-       */
-      public Builder setEndTime(int value) {
-        
-        endTime_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 end_time = 9;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearEndTime() {
-        
-        endTime_ = 0;
-        onChanged();
-        return this;
-      }
-
       private emu.grasscutter.net.proto.VectorOuterClass.Vector rot_;
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> rotBuilder_;
       /**
-       * <code>.Vector rot = 6;</code>
+       * <code>.Vector rot = 2;</code>
        * @return Whether the rot field is set.
        */
       public boolean hasRot() {
         return rotBuilder_ != null || rot_ != null;
       }
       /**
-       * <code>.Vector rot = 6;</code>
+       * <code>.Vector rot = 2;</code>
        * @return The rot.
        */
       public emu.grasscutter.net.proto.VectorOuterClass.Vector getRot() {
@@ -845,7 +899,7 @@ public final class AnchorPointDataOuterClass {
         }
       }
       /**
-       * <code>.Vector rot = 6;</code>
+       * <code>.Vector rot = 2;</code>
        */
       public Builder setRot(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
         if (rotBuilder_ == null) {
@@ -861,7 +915,7 @@ public final class AnchorPointDataOuterClass {
         return this;
       }
       /**
-       * <code>.Vector rot = 6;</code>
+       * <code>.Vector rot = 2;</code>
        */
       public Builder setRot(
           emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) {
@@ -875,7 +929,7 @@ public final class AnchorPointDataOuterClass {
         return this;
       }
       /**
-       * <code>.Vector rot = 6;</code>
+       * <code>.Vector rot = 2;</code>
        */
       public Builder mergeRot(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
         if (rotBuilder_ == null) {
@@ -893,7 +947,7 @@ public final class AnchorPointDataOuterClass {
         return this;
       }
       /**
-       * <code>.Vector rot = 6;</code>
+       * <code>.Vector rot = 2;</code>
        */
       public Builder clearRot() {
         if (rotBuilder_ == null) {
@@ -907,7 +961,7 @@ public final class AnchorPointDataOuterClass {
         return this;
       }
       /**
-       * <code>.Vector rot = 6;</code>
+       * <code>.Vector rot = 2;</code>
        */
       public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getRotBuilder() {
         
@@ -915,7 +969,7 @@ public final class AnchorPointDataOuterClass {
         return getRotFieldBuilder().getBuilder();
       }
       /**
-       * <code>.Vector rot = 6;</code>
+       * <code>.Vector rot = 2;</code>
        */
       public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getRotOrBuilder() {
         if (rotBuilder_ != null) {
@@ -926,7 +980,7 @@ public final class AnchorPointDataOuterClass {
         }
       }
       /**
-       * <code>.Vector rot = 6;</code>
+       * <code>.Vector rot = 2;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> 
@@ -941,68 +995,6 @@ public final class AnchorPointDataOuterClass {
         }
         return rotBuilder_;
       }
-
-      private int anchorPointId_ ;
-      /**
-       * <code>uint32 anchor_point_id = 5;</code>
-       * @return The anchorPointId.
-       */
-      @java.lang.Override
-      public int getAnchorPointId() {
-        return anchorPointId_;
-      }
-      /**
-       * <code>uint32 anchor_point_id = 5;</code>
-       * @param value The anchorPointId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setAnchorPointId(int value) {
-        
-        anchorPointId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 anchor_point_id = 5;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearAnchorPointId() {
-        
-        anchorPointId_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int sceneId_ ;
-      /**
-       * <code>uint32 scene_id = 15;</code>
-       * @return The sceneId.
-       */
-      @java.lang.Override
-      public int getSceneId() {
-        return sceneId_;
-      }
-      /**
-       * <code>uint32 scene_id = 15;</code>
-       * @param value The sceneId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setSceneId(int value) {
-        
-        sceneId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 scene_id = 15;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearSceneId() {
-        
-        sceneId_ = 0;
-        onChanged();
-        return this;
-      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -1071,10 +1063,10 @@ public final class AnchorPointDataOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\025AnchorPointData.proto\032\014Vector.proto\"z\n" +
-      "\017AnchorPointData\022\024\n\003pos\030\001 \001(\0132\007.Vector\022\020" +
+      "\017AnchorPointData\022\020\n\010scene_id\030\005 \001(\r\022\027\n\017an" +
-      "\n\010end_time\030\t \001(\r\022\024\n\003rot\030\006 \001(\0132\007.Vector\022\027" +
+      "chor_point_id\030\t \001(\r\022\020\n\010end_time\030\010 \001(\r\022\024\n" +
-      "\n\017anchor_point_id\030\005 \001(\r\022\020\n\010scene_id\030\017 \001(" +
+      "\003pos\030\017 \001(\0132\007.Vector\022\024\n\003rot\030\002 \001(\0132\007.Vecto" +
-      "\rB\033\n\031emu.grasscutter.net.protob\006proto3"
+      "rB\033\n\031emu.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -1086,7 +1078,7 @@ public final class AnchorPointDataOuterClass {
     internal_static_AnchorPointData_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_AnchorPointData_descriptor,
-        new java.lang.String[] { "Pos", "EndTime", "Rot", "AnchorPointId", "SceneId", });
+        new java.lang.String[] { "SceneId", "AnchorPointId", "EndTime", "Pos", "Rot", });
     emu.grasscutter.net.proto.VectorOuterClass.getDescriptor();
   }
 

src/generated/main/java/emu/grasscutter/net/proto/AnchorPointOpReqOuterClass.java

@@ -0,0 +1,741 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: AnchorPointOpReq.proto
+
+package emu.grasscutter.net.proto;
+
+public final class AnchorPointOpReqOuterClass {
+  private AnchorPointOpReqOuterClass() {}
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistryLite registry) {
+  }
+
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistry registry) {
+    registerAllExtensions(
+        (com.google.protobuf.ExtensionRegistryLite) registry);
+  }
+  public interface AnchorPointOpReqOrBuilder extends
+      // @@protoc_insertion_point(interface_extends:AnchorPointOpReq)
+      com.google.protobuf.MessageOrBuilder {
+
+    /**
+     * <code>uint32 anchor_point_id = 9;</code>
+     * @return The anchorPointId.
+     */
+    int getAnchorPointId();
+
+    /**
+     * <code>uint32 anchor_point_op_type = 12;</code>
+     * @return The anchorPointOpType.
+     */
+    int getAnchorPointOpType();
+  }
+  /**
+   * <pre>
+   * CmdId: 4257
+   * EnetChannelId: 0
+   * EnetIsReliable: false
+   * IsAllowClient: true
+   * </pre>
+   *
+   * Protobuf type {@code AnchorPointOpReq}
+   */
+  public static final class AnchorPointOpReq extends
+      com.google.protobuf.GeneratedMessageV3 implements
+      // @@protoc_insertion_point(message_implements:AnchorPointOpReq)
+      AnchorPointOpReqOrBuilder {
+  private static final long serialVersionUID = 0L;
+    // Use AnchorPointOpReq.newBuilder() to construct.
+    private AnchorPointOpReq(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
+      super(builder);
+    }
+    private AnchorPointOpReq() {
+    }
+
+    @java.lang.Override
+    @SuppressWarnings({"unused"})
+    protected java.lang.Object newInstance(
+        UnusedPrivateParameter unused) {
+      return new AnchorPointOpReq();
+    }
+
+    @java.lang.Override
+    public final com.google.protobuf.UnknownFieldSet
+    getUnknownFields() {
+      return this.unknownFields;
+    }
+    private AnchorPointOpReq(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 72: {
+
+              anchorPointId_ = input.readUInt32();
+              break;
+            }
+            case 96: {
+
+              anchorPointOpType_ = input.readUInt32();
+              break;
+            }
+            default: {
+              if (!parseUnknownField(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+          }
+        }
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.setUnfinishedMessage(this);
+      } catch (java.io.IOException e) {
+        throw new com.google.protobuf.InvalidProtocolBufferException(
+            e).setUnfinishedMessage(this);
+      } finally {
+        this.unknownFields = unknownFields.build();
+        makeExtensionsImmutable();
+      }
+    }
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return emu.grasscutter.net.proto.AnchorPointOpReqOuterClass.internal_static_AnchorPointOpReq_descriptor;
+    }
+
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return emu.grasscutter.net.proto.AnchorPointOpReqOuterClass.internal_static_AnchorPointOpReq_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              emu.grasscutter.net.proto.AnchorPointOpReqOuterClass.AnchorPointOpReq.class, emu.grasscutter.net.proto.AnchorPointOpReqOuterClass.AnchorPointOpReq.Builder.class);
+    }
+
+    /**
+     * Protobuf enum {@code AnchorPointOpReq.AnchorPointOpType}
+     */
+    public enum AnchorPointOpType
+        implements com.google.protobuf.ProtocolMessageEnum {
+      /**
+       * <code>ANCHOR_POINT_OP_TYPE_NONE = 0;</code>
+       */
+      ANCHOR_POINT_OP_TYPE_NONE(0),
+      /**
+       * <code>ANCHOR_POINT_OP_TYPE_TELEPORT = 1;</code>
+       */
+      ANCHOR_POINT_OP_TYPE_TELEPORT(1),
+      /**
+       * <code>ANCHOR_POINT_OP_TYPE_REMOVE = 2;</code>
+       */
+      ANCHOR_POINT_OP_TYPE_REMOVE(2),
+      UNRECOGNIZED(-1),
+      ;
+
+      /**
+       * <code>ANCHOR_POINT_OP_TYPE_NONE = 0;</code>
+       */
+      public static final int ANCHOR_POINT_OP_TYPE_NONE_VALUE = 0;
+      /**
+       * <code>ANCHOR_POINT_OP_TYPE_TELEPORT = 1;</code>
+       */
+      public static final int ANCHOR_POINT_OP_TYPE_TELEPORT_VALUE = 1;
+      /**
+       * <code>ANCHOR_POINT_OP_TYPE_REMOVE = 2;</code>
+       */
+      public static final int ANCHOR_POINT_OP_TYPE_REMOVE_VALUE = 2;
+
+
+      public final int getNumber() {
+        if (this == UNRECOGNIZED) {
+          throw new java.lang.IllegalArgumentException(
+              "Can't get the number of an unknown enum value.");
+        }
+        return value;
+      }
+
+      /**
+       * @param value The numeric wire value of the corresponding enum entry.
+       * @return The enum associated with the given numeric wire value.
+       * @deprecated Use {@link #forNumber(int)} instead.
+       */
+      @java.lang.Deprecated
+      public static AnchorPointOpType valueOf(int value) {
+        return forNumber(value);
+      }
+
+      /**
+       * @param value The numeric wire value of the corresponding enum entry.
+       * @return The enum associated with the given numeric wire value.
+       */
+      public static AnchorPointOpType forNumber(int value) {
+        switch (value) {
+          case 0: return ANCHOR_POINT_OP_TYPE_NONE;
+          case 1: return ANCHOR_POINT_OP_TYPE_TELEPORT;
+          case 2: return ANCHOR_POINT_OP_TYPE_REMOVE;
+          default: return null;
+        }
+      }
+
+      public static com.google.protobuf.Internal.EnumLiteMap<AnchorPointOpType>
+          internalGetValueMap() {
+        return internalValueMap;
+      }
+      private static final com.google.protobuf.Internal.EnumLiteMap<
+          AnchorPointOpType> internalValueMap =
+            new com.google.protobuf.Internal.EnumLiteMap<AnchorPointOpType>() {
+              public AnchorPointOpType findValueByNumber(int number) {
+                return AnchorPointOpType.forNumber(number);
+              }
+            };
+
+      public final com.google.protobuf.Descriptors.EnumValueDescriptor
+          getValueDescriptor() {
+        if (this == UNRECOGNIZED) {
+          throw new java.lang.IllegalStateException(
+              "Can't get the descriptor of an unrecognized enum value.");
+        }
+        return getDescriptor().getValues().get(ordinal());
+      }
+      public final com.google.protobuf.Descriptors.EnumDescriptor
+          getDescriptorForType() {
+        return getDescriptor();
+      }
+      public static final com.google.protobuf.Descriptors.EnumDescriptor
+          getDescriptor() {
+        return emu.grasscutter.net.proto.AnchorPointOpReqOuterClass.AnchorPointOpReq.getDescriptor().getEnumTypes().get(0);
+      }
+
+      private static final AnchorPointOpType[] VALUES = values();
+
+      public static AnchorPointOpType valueOf(
+          com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
+        if (desc.getType() != getDescriptor()) {
+          throw new java.lang.IllegalArgumentException(
+            "EnumValueDescriptor is not for this type.");
+        }
+        if (desc.getIndex() == -1) {
+          return UNRECOGNIZED;
+        }
+        return VALUES[desc.getIndex()];
+      }
+
+      private final int value;
+
+      private AnchorPointOpType(int value) {
+        this.value = value;
+      }
+
+      // @@protoc_insertion_point(enum_scope:AnchorPointOpReq.AnchorPointOpType)
+    }
+
+    public static final int ANCHOR_POINT_ID_FIELD_NUMBER = 9;
+    private int anchorPointId_;
+    /**
+     * <code>uint32 anchor_point_id = 9;</code>
+     * @return The anchorPointId.
+     */
+    @java.lang.Override
+    public int getAnchorPointId() {
+      return anchorPointId_;
+    }
+
+    public static final int ANCHOR_POINT_OP_TYPE_FIELD_NUMBER = 12;
+    private int anchorPointOpType_;
+    /**
+     * <code>uint32 anchor_point_op_type = 12;</code>
+     * @return The anchorPointOpType.
+     */
+    @java.lang.Override
+    public int getAnchorPointOpType() {
+      return anchorPointOpType_;
+    }
+
+    private byte memoizedIsInitialized = -1;
+    @java.lang.Override
+    public final boolean isInitialized() {
+      byte isInitialized = memoizedIsInitialized;
+      if (isInitialized == 1) return true;
+      if (isInitialized == 0) return false;
+
+      memoizedIsInitialized = 1;
+      return true;
+    }
+
+    @java.lang.Override
+    public void writeTo(com.google.protobuf.CodedOutputStream output)
+                        throws java.io.IOException {
+      if (anchorPointId_ != 0) {
+        output.writeUInt32(9, anchorPointId_);
+      }
+      if (anchorPointOpType_ != 0) {
+        output.writeUInt32(12, anchorPointOpType_);
+      }
+      unknownFields.writeTo(output);
+    }
+
+    @java.lang.Override
+    public int getSerializedSize() {
+      int size = memoizedSize;
+      if (size != -1) return size;
+
+      size = 0;
+      if (anchorPointId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(9, anchorPointId_);
+      }
+      if (anchorPointOpType_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(12, anchorPointOpType_);
+      }
+      size += unknownFields.getSerializedSize();
+      memoizedSize = size;
+      return size;
+    }
+
+    @java.lang.Override
+    public boolean equals(final java.lang.Object obj) {
+      if (obj == this) {
+       return true;
+      }
+      if (!(obj instanceof emu.grasscutter.net.proto.AnchorPointOpReqOuterClass.AnchorPointOpReq)) {
+        return super.equals(obj);
+      }
+      emu.grasscutter.net.proto.AnchorPointOpReqOuterClass.AnchorPointOpReq other = (emu.grasscutter.net.proto.AnchorPointOpReqOuterClass.AnchorPointOpReq) obj;
+
+      if (getAnchorPointId()
+          != other.getAnchorPointId()) return false;
+      if (getAnchorPointOpType()
+          != other.getAnchorPointOpType()) return false;
+      if (!unknownFields.equals(other.unknownFields)) return false;
+      return true;
+    }
+
+    @java.lang.Override
+    public int hashCode() {
+      if (memoizedHashCode != 0) {
+        return memoizedHashCode;
+      }
+      int hash = 41;
+      hash = (19 * hash) + getDescriptor().hashCode();
+      hash = (37 * hash) + ANCHOR_POINT_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getAnchorPointId();
+      hash = (37 * hash) + ANCHOR_POINT_OP_TYPE_FIELD_NUMBER;
+      hash = (53 * hash) + getAnchorPointOpType();
+      hash = (29 * hash) + unknownFields.hashCode();
+      memoizedHashCode = hash;
+      return hash;
+    }
+
+    public static emu.grasscutter.net.proto.AnchorPointOpReqOuterClass.AnchorPointOpReq parseFrom(
+        java.nio.ByteBuffer data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static emu.grasscutter.net.proto.AnchorPointOpReqOuterClass.AnchorPointOpReq parseFrom(
+        java.nio.ByteBuffer data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.AnchorPointOpReqOuterClass.AnchorPointOpReq parseFrom(
+        com.google.protobuf.ByteString data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static emu.grasscutter.net.proto.AnchorPointOpReqOuterClass.AnchorPointOpReq parseFrom(
+        com.google.protobuf.ByteString data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.AnchorPointOpReqOuterClass.AnchorPointOpReq parseFrom(byte[] data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static emu.grasscutter.net.proto.AnchorPointOpReqOuterClass.AnchorPointOpReq parseFrom(
+        byte[] data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.AnchorPointOpReqOuterClass.AnchorPointOpReq parseFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
+    }
+    public static emu.grasscutter.net.proto.AnchorPointOpReqOuterClass.AnchorPointOpReq parseFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.AnchorPointOpReqOuterClass.AnchorPointOpReq parseDelimitedFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input);
+    }
+    public static emu.grasscutter.net.proto.AnchorPointOpReqOuterClass.AnchorPointOpReq parseDelimitedFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.AnchorPointOpReqOuterClass.AnchorPointOpReq parseFrom(
+        com.google.protobuf.CodedInputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
+    }
+    public static emu.grasscutter.net.proto.AnchorPointOpReqOuterClass.AnchorPointOpReq parseFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
+    }
+
+    @java.lang.Override
+    public Builder newBuilderForType() { return newBuilder(); }
+    public static Builder newBuilder() {
+      return DEFAULT_INSTANCE.toBuilder();
+    }
+    public static Builder newBuilder(emu.grasscutter.net.proto.AnchorPointOpReqOuterClass.AnchorPointOpReq prototype) {
+      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+    }
+    @java.lang.Override
+    public Builder toBuilder() {
+      return this == DEFAULT_INSTANCE
+          ? new Builder() : new Builder().mergeFrom(this);
+    }
+
+    @java.lang.Override
+    protected Builder newBuilderForType(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      Builder builder = new Builder(parent);
+      return builder;
+    }
+    /**
+     * <pre>
+     * CmdId: 4257
+     * EnetChannelId: 0
+     * EnetIsReliable: false
+     * IsAllowClient: true
+     * </pre>
+     *
+     * Protobuf type {@code AnchorPointOpReq}
+     */
+    public static final class Builder extends
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
+        // @@protoc_insertion_point(builder_implements:AnchorPointOpReq)
+        emu.grasscutter.net.proto.AnchorPointOpReqOuterClass.AnchorPointOpReqOrBuilder {
+      public static final com.google.protobuf.Descriptors.Descriptor
+          getDescriptor() {
+        return emu.grasscutter.net.proto.AnchorPointOpReqOuterClass.internal_static_AnchorPointOpReq_descriptor;
+      }
+
+      @java.lang.Override
+      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+          internalGetFieldAccessorTable() {
+        return emu.grasscutter.net.proto.AnchorPointOpReqOuterClass.internal_static_AnchorPointOpReq_fieldAccessorTable
+            .ensureFieldAccessorsInitialized(
+                emu.grasscutter.net.proto.AnchorPointOpReqOuterClass.AnchorPointOpReq.class, emu.grasscutter.net.proto.AnchorPointOpReqOuterClass.AnchorPointOpReq.Builder.class);
+      }
+
+      // Construct using emu.grasscutter.net.proto.AnchorPointOpReqOuterClass.AnchorPointOpReq.newBuilder()
+      private Builder() {
+        maybeForceBuilderInitialization();
+      }
+
+      private Builder(
+          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+        super(parent);
+        maybeForceBuilderInitialization();
+      }
+      private void maybeForceBuilderInitialization() {
+        if (com.google.protobuf.GeneratedMessageV3
+                .alwaysUseFieldBuilders) {
+        }
+      }
+      @java.lang.Override
+      public Builder clear() {
+        super.clear();
+        anchorPointId_ = 0;
+
+        anchorPointOpType_ = 0;
+
+        return this;
+      }
+
+      @java.lang.Override
+      public com.google.protobuf.Descriptors.Descriptor
+          getDescriptorForType() {
+        return emu.grasscutter.net.proto.AnchorPointOpReqOuterClass.internal_static_AnchorPointOpReq_descriptor;
+      }
+
+      @java.lang.Override
+      public emu.grasscutter.net.proto.AnchorPointOpReqOuterClass.AnchorPointOpReq getDefaultInstanceForType() {
+        return emu.grasscutter.net.proto.AnchorPointOpReqOuterClass.AnchorPointOpReq.getDefaultInstance();
+      }
+
+      @java.lang.Override
+      public emu.grasscutter.net.proto.AnchorPointOpReqOuterClass.AnchorPointOpReq build() {
+        emu.grasscutter.net.proto.AnchorPointOpReqOuterClass.AnchorPointOpReq result = buildPartial();
+        if (!result.isInitialized()) {
+          throw newUninitializedMessageException(result);
+        }
+        return result;
+      }
+
+      @java.lang.Override
+      public emu.grasscutter.net.proto.AnchorPointOpReqOuterClass.AnchorPointOpReq buildPartial() {
+        emu.grasscutter.net.proto.AnchorPointOpReqOuterClass.AnchorPointOpReq result = new emu.grasscutter.net.proto.AnchorPointOpReqOuterClass.AnchorPointOpReq(this);
+        result.anchorPointId_ = anchorPointId_;
+        result.anchorPointOpType_ = anchorPointOpType_;
+        onBuilt();
+        return result;
+      }
+
+      @java.lang.Override
+      public Builder clone() {
+        return super.clone();
+      }
+      @java.lang.Override
+      public Builder setField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return super.setField(field, value);
+      }
+      @java.lang.Override
+      public Builder clearField(
+          com.google.protobuf.Descriptors.FieldDescriptor field) {
+        return super.clearField(field);
+      }
+      @java.lang.Override
+      public Builder clearOneof(
+          com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+        return super.clearOneof(oneof);
+      }
+      @java.lang.Override
+      public Builder setRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          int index, java.lang.Object value) {
+        return super.setRepeatedField(field, index, value);
+      }
+      @java.lang.Override
+      public Builder addRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return super.addRepeatedField(field, value);
+      }
+      @java.lang.Override
+      public Builder mergeFrom(com.google.protobuf.Message other) {
+        if (other instanceof emu.grasscutter.net.proto.AnchorPointOpReqOuterClass.AnchorPointOpReq) {
+          return mergeFrom((emu.grasscutter.net.proto.AnchorPointOpReqOuterClass.AnchorPointOpReq)other);
+        } else {
+          super.mergeFrom(other);
+          return this;
+        }
+      }
+
+      public Builder mergeFrom(emu.grasscutter.net.proto.AnchorPointOpReqOuterClass.AnchorPointOpReq other) {
+        if (other == emu.grasscutter.net.proto.AnchorPointOpReqOuterClass.AnchorPointOpReq.getDefaultInstance()) return this;
+        if (other.getAnchorPointId() != 0) {
+          setAnchorPointId(other.getAnchorPointId());
+        }
+        if (other.getAnchorPointOpType() != 0) {
+          setAnchorPointOpType(other.getAnchorPointOpType());
+        }
+        this.mergeUnknownFields(other.unknownFields);
+        onChanged();
+        return this;
+      }
+
+      @java.lang.Override
+      public final boolean isInitialized() {
+        return true;
+      }
+
+      @java.lang.Override
+      public Builder mergeFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws java.io.IOException {
+        emu.grasscutter.net.proto.AnchorPointOpReqOuterClass.AnchorPointOpReq parsedMessage = null;
+        try {
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage = (emu.grasscutter.net.proto.AnchorPointOpReqOuterClass.AnchorPointOpReq) e.getUnfinishedMessage();
+          throw e.unwrapIOException();
+        } finally {
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
+          }
+        }
+        return this;
+      }
+
+      private int anchorPointId_ ;
+      /**
+       * <code>uint32 anchor_point_id = 9;</code>
+       * @return The anchorPointId.
+       */
+      @java.lang.Override
+      public int getAnchorPointId() {
+        return anchorPointId_;
+      }
+      /**
+       * <code>uint32 anchor_point_id = 9;</code>
+       * @param value The anchorPointId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setAnchorPointId(int value) {
+        
+        anchorPointId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 anchor_point_id = 9;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearAnchorPointId() {
+        
+        anchorPointId_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int anchorPointOpType_ ;
+      /**
+       * <code>uint32 anchor_point_op_type = 12;</code>
+       * @return The anchorPointOpType.
+       */
+      @java.lang.Override
+      public int getAnchorPointOpType() {
+        return anchorPointOpType_;
+      }
+      /**
+       * <code>uint32 anchor_point_op_type = 12;</code>
+       * @param value The anchorPointOpType to set.
+       * @return This builder for chaining.
+       */
+      public Builder setAnchorPointOpType(int value) {
+        
+        anchorPointOpType_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 anchor_point_op_type = 12;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearAnchorPointOpType() {
+        
+        anchorPointOpType_ = 0;
+        onChanged();
+        return this;
+      }
+      @java.lang.Override
+      public final Builder setUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.setUnknownFields(unknownFields);
+      }
+
+      @java.lang.Override
+      public final Builder mergeUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.mergeUnknownFields(unknownFields);
+      }
+
+
+      // @@protoc_insertion_point(builder_scope:AnchorPointOpReq)
+    }
+
+    // @@protoc_insertion_point(class_scope:AnchorPointOpReq)
+    private static final emu.grasscutter.net.proto.AnchorPointOpReqOuterClass.AnchorPointOpReq DEFAULT_INSTANCE;
+    static {
+      DEFAULT_INSTANCE = new emu.grasscutter.net.proto.AnchorPointOpReqOuterClass.AnchorPointOpReq();
+    }
+
+    public static emu.grasscutter.net.proto.AnchorPointOpReqOuterClass.AnchorPointOpReq getDefaultInstance() {
+      return DEFAULT_INSTANCE;
+    }
+
+    private static final com.google.protobuf.Parser<AnchorPointOpReq>
+        PARSER = new com.google.protobuf.AbstractParser<AnchorPointOpReq>() {
+      @java.lang.Override
+      public AnchorPointOpReq parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return new AnchorPointOpReq(input, extensionRegistry);
+      }
+    };
+
+    public static com.google.protobuf.Parser<AnchorPointOpReq> parser() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<AnchorPointOpReq> getParserForType() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public emu.grasscutter.net.proto.AnchorPointOpReqOuterClass.AnchorPointOpReq getDefaultInstanceForType() {
+      return DEFAULT_INSTANCE;
+    }
+
+  }
+
+  private static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_AnchorPointOpReq_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_AnchorPointOpReq_fieldAccessorTable;
+
+  public static com.google.protobuf.Descriptors.FileDescriptor
+      getDescriptor() {
+    return descriptor;
+  }
+  private static  com.google.protobuf.Descriptors.FileDescriptor
+      descriptor;
+  static {
+    java.lang.String[] descriptorData = {
+      "\n\026AnchorPointOpReq.proto\"\301\001\n\020AnchorPoint" +
+      "OpReq\022\027\n\017anchor_point_id\030\t \001(\r\022\034\n\024anchor" +
+      "_point_op_type\030\014 \001(\r\"v\n\021AnchorPointOpTyp" +
+      "e\022\035\n\031ANCHOR_POINT_OP_TYPE_NONE\020\000\022!\n\035ANCH" +
+      "OR_POINT_OP_TYPE_TELEPORT\020\001\022\037\n\033ANCHOR_PO" +
+      "INT_OP_TYPE_REMOVE\020\002B\033\n\031emu.grasscutter." +
+      "net.protob\006proto3"
+    };
+    descriptor = com.google.protobuf.Descriptors.FileDescriptor
+      .internalBuildGeneratedFileFrom(descriptorData,
+        new com.google.protobuf.Descriptors.FileDescriptor[] {
+        });
+    internal_static_AnchorPointOpReq_descriptor =
+      getDescriptor().getMessageTypes().get(0);
+    internal_static_AnchorPointOpReq_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_AnchorPointOpReq_descriptor,
+        new java.lang.String[] { "AnchorPointId", "AnchorPointOpType", });
+  }
+
+  // @@protoc_insertion_point(outer_class_scope)
+}

src/generated/main/java/emu/grasscutter/net/proto/AnchorPointOpRspOuterClass.java

@@ -1,10 +1,10 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: QuestDestroyNpcRsp.proto
+// source: AnchorPointOpRsp.proto
 
 package emu.grasscutter.net.proto;
 
-public final class QuestDestroyNpcRspOuterClass {
+public final class AnchorPointOpRspOuterClass {
-  private QuestDestroyNpcRspOuterClass() {}
+  private AnchorPointOpRspOuterClass() {}
   public static void registerAllExtensions(
       com.google.protobuf.ExtensionRegistryLite registry) {
   }
@@ -14,53 +14,55 @@ public final class QuestDestroyNpcRspOuterClass {
     registerAllExtensions(
         (com.google.protobuf.ExtensionRegistryLite) registry);
   }
-  public interface QuestDestroyNpcRspOrBuilder extends
+  public interface AnchorPointOpRspOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:QuestDestroyNpcRsp)
+      // @@protoc_insertion_point(interface_extends:AnchorPointOpRsp)
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 parent_quest_id = 5;</code>
+     * <code>int32 retcode = 5;</code>
-     * @return The parentQuestId.
-     */
-    int getParentQuestId();
-
-    /**
-     * <code>uint32 npc_id = 3;</code>
-     * @return The npcId.
-     */
-    int getNpcId();
-
-    /**
-     * <code>int32 retcode = 1;</code>
      * @return The retcode.
      */
     int getRetcode();
+
+    /**
+     * <code>uint32 anchor_point_id = 12;</code>
+     * @return The anchorPointId.
+     */
+    int getAnchorPointId();
+
+    /**
+     * <code>uint32 anchor_point_op_type = 4;</code>
+     * @return The anchorPointOpType.
+     */
+    int getAnchorPointOpType();
   }
   /**
    * <pre>
-   * Name: IHAMDEJMOKK
+   * CmdId: 4252
-   * CmdId: 444
+   * EnetChannelId: 0
+   * EnetIsReliable: false
+   * IsAllowClient: true
    * </pre>
    *
-   * Protobuf type {@code QuestDestroyNpcRsp}
+   * Protobuf type {@code AnchorPointOpRsp}
    */
-  public static final class QuestDestroyNpcRsp extends
+  public static final class AnchorPointOpRsp extends
       com.google.protobuf.GeneratedMessageV3 implements
-      // @@protoc_insertion_point(message_implements:QuestDestroyNpcRsp)
+      // @@protoc_insertion_point(message_implements:AnchorPointOpRsp)
-      QuestDestroyNpcRspOrBuilder {
+      AnchorPointOpRspOrBuilder {
   private static final long serialVersionUID = 0L;
-    // Use QuestDestroyNpcRsp.newBuilder() to construct.
+    // Use AnchorPointOpRsp.newBuilder() to construct.
-    private QuestDestroyNpcRsp(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
+    private AnchorPointOpRsp(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
       super(builder);
     }
-    private QuestDestroyNpcRsp() {
+    private AnchorPointOpRsp() {
     }
 
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
         UnusedPrivateParameter unused) {
-      return new QuestDestroyNpcRsp();
+      return new AnchorPointOpRsp();
     }
 
     @java.lang.Override
@@ -68,7 +70,7 @@ public final class QuestDestroyNpcRspOuterClass {
     getUnknownFields() {
       return this.unknownFields;
     }
-    private QuestDestroyNpcRsp(
+    private AnchorPointOpRsp(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
@@ -86,19 +88,19 @@ public final class QuestDestroyNpcRspOuterClass {
             case 0:
               done = true;
               break;
-            case 8: {
+            case 32: {
 
-              retcode_ = input.readInt32();
+              anchorPointOpType_ = input.readUInt32();
-              break;
-            }
-            case 24: {
-
-              npcId_ = input.readUInt32();
               break;
             }
             case 40: {
 
-              parentQuestId_ = input.readUInt32();
+              retcode_ = input.readInt32();
+              break;
+            }
+            case 96: {
+
+              anchorPointId_ = input.readUInt32();
               break;
             }
             default: {
@@ -122,43 +124,21 @@ public final class QuestDestroyNpcRspOuterClass {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return emu.grasscutter.net.proto.QuestDestroyNpcRspOuterClass.internal_static_QuestDestroyNpcRsp_descriptor;
+      return emu.grasscutter.net.proto.AnchorPointOpRspOuterClass.internal_static_AnchorPointOpRsp_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return emu.grasscutter.net.proto.QuestDestroyNpcRspOuterClass.internal_static_QuestDestroyNpcRsp_fieldAccessorTable
+      return emu.grasscutter.net.proto.AnchorPointOpRspOuterClass.internal_static_AnchorPointOpRsp_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              emu.grasscutter.net.proto.QuestDestroyNpcRspOuterClass.QuestDestroyNpcRsp.class, emu.grasscutter.net.proto.QuestDestroyNpcRspOuterClass.QuestDestroyNpcRsp.Builder.class);
+              emu.grasscutter.net.proto.AnchorPointOpRspOuterClass.AnchorPointOpRsp.class, emu.grasscutter.net.proto.AnchorPointOpRspOuterClass.AnchorPointOpRsp.Builder.class);
     }
 
-    public static final int PARENT_QUEST_ID_FIELD_NUMBER = 5;
+    public static final int RETCODE_FIELD_NUMBER = 5;
-    private int parentQuestId_;
-    /**
-     * <code>uint32 parent_quest_id = 5;</code>
-     * @return The parentQuestId.
-     */
-    @java.lang.Override
-    public int getParentQuestId() {
-      return parentQuestId_;
-    }
-
-    public static final int NPC_ID_FIELD_NUMBER = 3;
-    private int npcId_;
-    /**
-     * <code>uint32 npc_id = 3;</code>
-     * @return The npcId.
-     */
-    @java.lang.Override
-    public int getNpcId() {
-      return npcId_;
-    }
-
-    public static final int RETCODE_FIELD_NUMBER = 1;
     private int retcode_;
     /**
-     * <code>int32 retcode = 1;</code>
+     * <code>int32 retcode = 5;</code>
      * @return The retcode.
      */
     @java.lang.Override
@@ -166,6 +146,28 @@ public final class QuestDestroyNpcRspOuterClass {
       return retcode_;
     }
 
+    public static final int ANCHOR_POINT_ID_FIELD_NUMBER = 12;
+    private int anchorPointId_;
+    /**
+     * <code>uint32 anchor_point_id = 12;</code>
+     * @return The anchorPointId.
+     */
+    @java.lang.Override
+    public int getAnchorPointId() {
+      return anchorPointId_;
+    }
+
+    public static final int ANCHOR_POINT_OP_TYPE_FIELD_NUMBER = 4;
+    private int anchorPointOpType_;
+    /**
+     * <code>uint32 anchor_point_op_type = 4;</code>
+     * @return The anchorPointOpType.
+     */
+    @java.lang.Override
+    public int getAnchorPointOpType() {
+      return anchorPointOpType_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -180,14 +182,14 @@ public final class QuestDestroyNpcRspOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
+      if (anchorPointOpType_ != 0) {
+        output.writeUInt32(4, anchorPointOpType_);
+      }
       if (retcode_ != 0) {
-        output.writeInt32(1, retcode_);
+        output.writeInt32(5, retcode_);
       }
-      if (npcId_ != 0) {
+      if (anchorPointId_ != 0) {
-        output.writeUInt32(3, npcId_);
+        output.writeUInt32(12, anchorPointId_);
-      }
-      if (parentQuestId_ != 0) {
-        output.writeUInt32(5, parentQuestId_);
       }
       unknownFields.writeTo(output);
     }
@@ -198,17 +200,17 @@ public final class QuestDestroyNpcRspOuterClass {
       if (size != -1) return size;
 
       size = 0;
+      if (anchorPointOpType_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(4, anchorPointOpType_);
+      }
       if (retcode_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(1, retcode_);
+          .computeInt32Size(5, retcode_);
       }
-      if (npcId_ != 0) {
+      if (anchorPointId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(3, npcId_);
+          .computeUInt32Size(12, anchorPointId_);
-      }
-      if (parentQuestId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(5, parentQuestId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -220,17 +222,17 @@ public final class QuestDestroyNpcRspOuterClass {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof emu.grasscutter.net.proto.QuestDestroyNpcRspOuterClass.QuestDestroyNpcRsp)) {
+      if (!(obj instanceof emu.grasscutter.net.proto.AnchorPointOpRspOuterClass.AnchorPointOpRsp)) {
         return super.equals(obj);
       }
-      emu.grasscutter.net.proto.QuestDestroyNpcRspOuterClass.QuestDestroyNpcRsp other = (emu.grasscutter.net.proto.QuestDestroyNpcRspOuterClass.QuestDestroyNpcRsp) obj;
+      emu.grasscutter.net.proto.AnchorPointOpRspOuterClass.AnchorPointOpRsp other = (emu.grasscutter.net.proto.AnchorPointOpRspOuterClass.AnchorPointOpRsp) obj;
 
-      if (getParentQuestId()
-          != other.getParentQuestId()) return false;
-      if (getNpcId()
-          != other.getNpcId()) return false;
       if (getRetcode()
           != other.getRetcode()) return false;
+      if (getAnchorPointId()
+          != other.getAnchorPointId()) return false;
+      if (getAnchorPointOpType()
+          != other.getAnchorPointOpType()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -242,80 +244,80 @@ public final class QuestDestroyNpcRspOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + PARENT_QUEST_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getParentQuestId();
-      hash = (37 * hash) + NPC_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getNpcId();
       hash = (37 * hash) + RETCODE_FIELD_NUMBER;
       hash = (53 * hash) + getRetcode();
+      hash = (37 * hash) + ANCHOR_POINT_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getAnchorPointId();
+      hash = (37 * hash) + ANCHOR_POINT_OP_TYPE_FIELD_NUMBER;
+      hash = (53 * hash) + getAnchorPointOpType();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
     }
 
-    public static emu.grasscutter.net.proto.QuestDestroyNpcRspOuterClass.QuestDestroyNpcRsp parseFrom(
+    public static emu.grasscutter.net.proto.AnchorPointOpRspOuterClass.AnchorPointOpRsp parseFrom(
         java.nio.ByteBuffer data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static emu.grasscutter.net.proto.QuestDestroyNpcRspOuterClass.QuestDestroyNpcRsp parseFrom(
+    public static emu.grasscutter.net.proto.AnchorPointOpRspOuterClass.AnchorPointOpRsp parseFrom(
         java.nio.ByteBuffer data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static emu.grasscutter.net.proto.QuestDestroyNpcRspOuterClass.QuestDestroyNpcRsp parseFrom(
+    public static emu.grasscutter.net.proto.AnchorPointOpRspOuterClass.AnchorPointOpRsp parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static emu.grasscutter.net.proto.QuestDestroyNpcRspOuterClass.QuestDestroyNpcRsp parseFrom(
+    public static emu.grasscutter.net.proto.AnchorPointOpRspOuterClass.AnchorPointOpRsp parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static emu.grasscutter.net.proto.QuestDestroyNpcRspOuterClass.QuestDestroyNpcRsp parseFrom(byte[] data)
+    public static emu.grasscutter.net.proto.AnchorPointOpRspOuterClass.AnchorPointOpRsp parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static emu.grasscutter.net.proto.QuestDestroyNpcRspOuterClass.QuestDestroyNpcRsp parseFrom(
+    public static emu.grasscutter.net.proto.AnchorPointOpRspOuterClass.AnchorPointOpRsp parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static emu.grasscutter.net.proto.QuestDestroyNpcRspOuterClass.QuestDestroyNpcRsp parseFrom(java.io.InputStream input)
+    public static emu.grasscutter.net.proto.AnchorPointOpRspOuterClass.AnchorPointOpRsp parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static emu.grasscutter.net.proto.QuestDestroyNpcRspOuterClass.QuestDestroyNpcRsp parseFrom(
+    public static emu.grasscutter.net.proto.AnchorPointOpRspOuterClass.AnchorPointOpRsp parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static emu.grasscutter.net.proto.QuestDestroyNpcRspOuterClass.QuestDestroyNpcRsp parseDelimitedFrom(java.io.InputStream input)
+    public static emu.grasscutter.net.proto.AnchorPointOpRspOuterClass.AnchorPointOpRsp parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static emu.grasscutter.net.proto.QuestDestroyNpcRspOuterClass.QuestDestroyNpcRsp parseDelimitedFrom(
+    public static emu.grasscutter.net.proto.AnchorPointOpRspOuterClass.AnchorPointOpRsp parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static emu.grasscutter.net.proto.QuestDestroyNpcRspOuterClass.QuestDestroyNpcRsp parseFrom(
+    public static emu.grasscutter.net.proto.AnchorPointOpRspOuterClass.AnchorPointOpRsp parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static emu.grasscutter.net.proto.QuestDestroyNpcRspOuterClass.QuestDestroyNpcRsp parseFrom(
+    public static emu.grasscutter.net.proto.AnchorPointOpRspOuterClass.AnchorPointOpRsp parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -328,7 +330,7 @@ public final class QuestDestroyNpcRspOuterClass {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(emu.grasscutter.net.proto.QuestDestroyNpcRspOuterClass.QuestDestroyNpcRsp prototype) {
+    public static Builder newBuilder(emu.grasscutter.net.proto.AnchorPointOpRspOuterClass.AnchorPointOpRsp prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -345,30 +347,32 @@ public final class QuestDestroyNpcRspOuterClass {
     }
     /**
      * <pre>
-     * Name: IHAMDEJMOKK
+     * CmdId: 4252
-     * CmdId: 444
+     * EnetChannelId: 0
+     * EnetIsReliable: false
+     * IsAllowClient: true
      * </pre>
      *
-     * Protobuf type {@code QuestDestroyNpcRsp}
+     * Protobuf type {@code AnchorPointOpRsp}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
-        // @@protoc_insertion_point(builder_implements:QuestDestroyNpcRsp)
+        // @@protoc_insertion_point(builder_implements:AnchorPointOpRsp)
-        emu.grasscutter.net.proto.QuestDestroyNpcRspOuterClass.QuestDestroyNpcRspOrBuilder {
+        emu.grasscutter.net.proto.AnchorPointOpRspOuterClass.AnchorPointOpRspOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return emu.grasscutter.net.proto.QuestDestroyNpcRspOuterClass.internal_static_QuestDestroyNpcRsp_descriptor;
+        return emu.grasscutter.net.proto.AnchorPointOpRspOuterClass.internal_static_AnchorPointOpRsp_descriptor;
       }
 
       @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return emu.grasscutter.net.proto.QuestDestroyNpcRspOuterClass.internal_static_QuestDestroyNpcRsp_fieldAccessorTable
+        return emu.grasscutter.net.proto.AnchorPointOpRspOuterClass.internal_static_AnchorPointOpRsp_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                emu.grasscutter.net.proto.QuestDestroyNpcRspOuterClass.QuestDestroyNpcRsp.class, emu.grasscutter.net.proto.QuestDestroyNpcRspOuterClass.QuestDestroyNpcRsp.Builder.class);
+                emu.grasscutter.net.proto.AnchorPointOpRspOuterClass.AnchorPointOpRsp.class, emu.grasscutter.net.proto.AnchorPointOpRspOuterClass.AnchorPointOpRsp.Builder.class);
       }
 
-      // Construct using emu.grasscutter.net.proto.QuestDestroyNpcRspOuterClass.QuestDestroyNpcRsp.newBuilder()
+      // Construct using emu.grasscutter.net.proto.AnchorPointOpRspOuterClass.AnchorPointOpRsp.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -386,29 +390,29 @@ public final class QuestDestroyNpcRspOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        parentQuestId_ = 0;
-
-        npcId_ = 0;
-
         retcode_ = 0;
 
+        anchorPointId_ = 0;
+
+        anchorPointOpType_ = 0;
+
         return this;
       }
 
       @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return emu.grasscutter.net.proto.QuestDestroyNpcRspOuterClass.internal_static_QuestDestroyNpcRsp_descriptor;
+        return emu.grasscutter.net.proto.AnchorPointOpRspOuterClass.internal_static_AnchorPointOpRsp_descriptor;
       }
 
       @java.lang.Override
-      public emu.grasscutter.net.proto.QuestDestroyNpcRspOuterClass.QuestDestroyNpcRsp getDefaultInstanceForType() {
+      public emu.grasscutter.net.proto.AnchorPointOpRspOuterClass.AnchorPointOpRsp getDefaultInstanceForType() {
-        return emu.grasscutter.net.proto.QuestDestroyNpcRspOuterClass.QuestDestroyNpcRsp.getDefaultInstance();
+        return emu.grasscutter.net.proto.AnchorPointOpRspOuterClass.AnchorPointOpRsp.getDefaultInstance();
       }
 
       @java.lang.Override
-      public emu.grasscutter.net.proto.QuestDestroyNpcRspOuterClass.QuestDestroyNpcRsp build() {
+      public emu.grasscutter.net.proto.AnchorPointOpRspOuterClass.AnchorPointOpRsp build() {
-        emu.grasscutter.net.proto.QuestDestroyNpcRspOuterClass.QuestDestroyNpcRsp result = buildPartial();
+        emu.grasscutter.net.proto.AnchorPointOpRspOuterClass.AnchorPointOpRsp result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -416,11 +420,11 @@ public final class QuestDestroyNpcRspOuterClass {
       }
 
       @java.lang.Override
-      public emu.grasscutter.net.proto.QuestDestroyNpcRspOuterClass.QuestDestroyNpcRsp buildPartial() {
+      public emu.grasscutter.net.proto.AnchorPointOpRspOuterClass.AnchorPointOpRsp buildPartial() {
-        emu.grasscutter.net.proto.QuestDestroyNpcRspOuterClass.QuestDestroyNpcRsp result = new emu.grasscutter.net.proto.QuestDestroyNpcRspOuterClass.QuestDestroyNpcRsp(this);
+        emu.grasscutter.net.proto.AnchorPointOpRspOuterClass.AnchorPointOpRsp result = new emu.grasscutter.net.proto.AnchorPointOpRspOuterClass.AnchorPointOpRsp(this);
-        result.parentQuestId_ = parentQuestId_;
-        result.npcId_ = npcId_;
         result.retcode_ = retcode_;
+        result.anchorPointId_ = anchorPointId_;
+        result.anchorPointOpType_ = anchorPointOpType_;
         onBuilt();
         return result;
       }
@@ -459,25 +463,25 @@ public final class QuestDestroyNpcRspOuterClass {
       }
       @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof emu.grasscutter.net.proto.QuestDestroyNpcRspOuterClass.QuestDestroyNpcRsp) {
+        if (other instanceof emu.grasscutter.net.proto.AnchorPointOpRspOuterClass.AnchorPointOpRsp) {
-          return mergeFrom((emu.grasscutter.net.proto.QuestDestroyNpcRspOuterClass.QuestDestroyNpcRsp)other);
+          return mergeFrom((emu.grasscutter.net.proto.AnchorPointOpRspOuterClass.AnchorPointOpRsp)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(emu.grasscutter.net.proto.QuestDestroyNpcRspOuterClass.QuestDestroyNpcRsp other) {
+      public Builder mergeFrom(emu.grasscutter.net.proto.AnchorPointOpRspOuterClass.AnchorPointOpRsp other) {
-        if (other == emu.grasscutter.net.proto.QuestDestroyNpcRspOuterClass.QuestDestroyNpcRsp.getDefaultInstance()) return this;
+        if (other == emu.grasscutter.net.proto.AnchorPointOpRspOuterClass.AnchorPointOpRsp.getDefaultInstance()) return this;
-        if (other.getParentQuestId() != 0) {
-          setParentQuestId(other.getParentQuestId());
-        }
-        if (other.getNpcId() != 0) {
-          setNpcId(other.getNpcId());
-        }
         if (other.getRetcode() != 0) {
           setRetcode(other.getRetcode());
         }
+        if (other.getAnchorPointId() != 0) {
+          setAnchorPointId(other.getAnchorPointId());
+        }
+        if (other.getAnchorPointOpType() != 0) {
+          setAnchorPointOpType(other.getAnchorPointOpType());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -493,11 +497,11 @@ public final class QuestDestroyNpcRspOuterClass {
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        emu.grasscutter.net.proto.QuestDestroyNpcRspOuterClass.QuestDestroyNpcRsp parsedMessage = null;
+        emu.grasscutter.net.proto.AnchorPointOpRspOuterClass.AnchorPointOpRsp parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (emu.grasscutter.net.proto.QuestDestroyNpcRspOuterClass.QuestDestroyNpcRsp) e.getUnfinishedMessage();
+          parsedMessage = (emu.grasscutter.net.proto.AnchorPointOpRspOuterClass.AnchorPointOpRsp) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -507,71 +511,9 @@ public final class QuestDestroyNpcRspOuterClass {
         return this;
       }
 
-      private int parentQuestId_ ;
-      /**
-       * <code>uint32 parent_quest_id = 5;</code>
-       * @return The parentQuestId.
-       */
-      @java.lang.Override
-      public int getParentQuestId() {
-        return parentQuestId_;
-      }
-      /**
-       * <code>uint32 parent_quest_id = 5;</code>
-       * @param value The parentQuestId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setParentQuestId(int value) {
-        
-        parentQuestId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 parent_quest_id = 5;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearParentQuestId() {
-        
-        parentQuestId_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int npcId_ ;
-      /**
-       * <code>uint32 npc_id = 3;</code>
-       * @return The npcId.
-       */
-      @java.lang.Override
-      public int getNpcId() {
-        return npcId_;
-      }
-      /**
-       * <code>uint32 npc_id = 3;</code>
-       * @param value The npcId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setNpcId(int value) {
-        
-        npcId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 npc_id = 3;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearNpcId() {
-        
-        npcId_ = 0;
-        onChanged();
-        return this;
-      }
-
       private int retcode_ ;
       /**
-       * <code>int32 retcode = 1;</code>
+       * <code>int32 retcode = 5;</code>
        * @return The retcode.
        */
       @java.lang.Override
@@ -579,7 +521,7 @@ public final class QuestDestroyNpcRspOuterClass {
         return retcode_;
       }
       /**
-       * <code>int32 retcode = 1;</code>
+       * <code>int32 retcode = 5;</code>
        * @param value The retcode to set.
        * @return This builder for chaining.
        */
@@ -590,7 +532,7 @@ public final class QuestDestroyNpcRspOuterClass {
         return this;
       }
       /**
-       * <code>int32 retcode = 1;</code>
+       * <code>int32 retcode = 5;</code>
        * @return This builder for chaining.
        */
       public Builder clearRetcode() {
@@ -599,6 +541,68 @@ public final class QuestDestroyNpcRspOuterClass {
         onChanged();
         return this;
       }
+
+      private int anchorPointId_ ;
+      /**
+       * <code>uint32 anchor_point_id = 12;</code>
+       * @return The anchorPointId.
+       */
+      @java.lang.Override
+      public int getAnchorPointId() {
+        return anchorPointId_;
+      }
+      /**
+       * <code>uint32 anchor_point_id = 12;</code>
+       * @param value The anchorPointId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setAnchorPointId(int value) {
+        
+        anchorPointId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 anchor_point_id = 12;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearAnchorPointId() {
+        
+        anchorPointId_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int anchorPointOpType_ ;
+      /**
+       * <code>uint32 anchor_point_op_type = 4;</code>
+       * @return The anchorPointOpType.
+       */
+      @java.lang.Override
+      public int getAnchorPointOpType() {
+        return anchorPointOpType_;
+      }
+      /**
+       * <code>uint32 anchor_point_op_type = 4;</code>
+       * @param value The anchorPointOpType to set.
+       * @return This builder for chaining.
+       */
+      public Builder setAnchorPointOpType(int value) {
+        
+        anchorPointOpType_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 anchor_point_op_type = 4;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearAnchorPointOpType() {
+        
+        anchorPointOpType_ = 0;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -612,51 +616,51 @@ public final class QuestDestroyNpcRspOuterClass {
       }
 
 
-      // @@protoc_insertion_point(builder_scope:QuestDestroyNpcRsp)
+      // @@protoc_insertion_point(builder_scope:AnchorPointOpRsp)
     }
 
-    // @@protoc_insertion_point(class_scope:QuestDestroyNpcRsp)
+    // @@protoc_insertion_point(class_scope:AnchorPointOpRsp)
-    private static final emu.grasscutter.net.proto.QuestDestroyNpcRspOuterClass.QuestDestroyNpcRsp DEFAULT_INSTANCE;
+    private static final emu.grasscutter.net.proto.AnchorPointOpRspOuterClass.AnchorPointOpRsp DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new emu.grasscutter.net.proto.QuestDestroyNpcRspOuterClass.QuestDestroyNpcRsp();
+      DEFAULT_INSTANCE = new emu.grasscutter.net.proto.AnchorPointOpRspOuterClass.AnchorPointOpRsp();
     }
 
-    public static emu.grasscutter.net.proto.QuestDestroyNpcRspOuterClass.QuestDestroyNpcRsp getDefaultInstance() {
+    public static emu.grasscutter.net.proto.AnchorPointOpRspOuterClass.AnchorPointOpRsp getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    private static final com.google.protobuf.Parser<QuestDestroyNpcRsp>
+    private static final com.google.protobuf.Parser<AnchorPointOpRsp>
-        PARSER = new com.google.protobuf.AbstractParser<QuestDestroyNpcRsp>() {
+        PARSER = new com.google.protobuf.AbstractParser<AnchorPointOpRsp>() {
       @java.lang.Override
-      public QuestDestroyNpcRsp parsePartialFrom(
+      public AnchorPointOpRsp parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new QuestDestroyNpcRsp(input, extensionRegistry);
+        return new AnchorPointOpRsp(input, extensionRegistry);
       }
     };
 
-    public static com.google.protobuf.Parser<QuestDestroyNpcRsp> parser() {
+    public static com.google.protobuf.Parser<AnchorPointOpRsp> parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public com.google.protobuf.Parser<QuestDestroyNpcRsp> getParserForType() {
+    public com.google.protobuf.Parser<AnchorPointOpRsp> getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public emu.grasscutter.net.proto.QuestDestroyNpcRspOuterClass.QuestDestroyNpcRsp getDefaultInstanceForType() {
+    public emu.grasscutter.net.proto.AnchorPointOpRspOuterClass.AnchorPointOpRsp getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
   }
 
   private static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_QuestDestroyNpcRsp_descriptor;
+    internal_static_AnchorPointOpRsp_descriptor;
   private static final 
     com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_QuestDestroyNpcRsp_fieldAccessorTable;
+      internal_static_AnchorPointOpRsp_fieldAccessorTable;
 
   public static com.google.protobuf.Descriptors.FileDescriptor
       getDescriptor() {
@@ -666,21 +670,21 @@ public final class QuestDestroyNpcRspOuterClass {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\030QuestDestroyNpcRsp.proto\"N\n\022QuestDestr" +
+      "\n\026AnchorPointOpRsp.proto\"Z\n\020AnchorPointO" +
-      "oyNpcRsp\022\027\n\017parent_quest_id\030\005 \001(\r\022\016\n\006npc" +
+      "pRsp\022\017\n\007retcode\030\005 \001(\005\022\027\n\017anchor_point_id" +
-      "_id\030\003 \001(\r\022\017\n\007retcode\030\001 \001(\005B\033\n\031emu.grassc" +
+      "\030\014 \001(\r\022\034\n\024anchor_point_op_type\030\004 \001(\rB\033\n\031" +
-      "utter.net.protob\006proto3"
+      "emu.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
         new com.google.protobuf.Descriptors.FileDescriptor[] {
         });
-    internal_static_QuestDestroyNpcRsp_descriptor =
+    internal_static_AnchorPointOpRsp_descriptor =
       getDescriptor().getMessageTypes().get(0);
-    internal_static_QuestDestroyNpcRsp_fieldAccessorTable = new
+    internal_static_AnchorPointOpRsp_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_QuestDestroyNpcRsp_descriptor,
+        internal_static_AnchorPointOpRsp_descriptor,
-        new java.lang.String[] { "ParentQuestId", "NpcId", "Retcode", });
+        new java.lang.String[] { "Retcode", "AnchorPointId", "AnchorPointOpType", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)

src/generated/main/java/emu/grasscutter/net/proto/AnimatorParameterValueInfoOuterClass.java

@@ -60,10 +60,6 @@ public final class AnimatorParameterValueInfoOuterClass {
     public emu.grasscutter.net.proto.AnimatorParameterValueInfoOuterClass.AnimatorParameterValueInfo.ParaValCase getParaValCase();
   }
   /**
-   * <pre>
-   * Name: NNHECDNAAAO
-   * </pre>
-   *
    * Protobuf type {@code AnimatorParameterValueInfo}
    */
   public static final class AnimatorParameterValueInfo extends
@@ -496,10 +492,6 @@ public final class AnimatorParameterValueInfoOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Name: NNHECDNAAAO
-     * </pre>
-     *
      * Protobuf type {@code AnimatorParameterValueInfo}
      */
     public static final class Builder extends
@@ -910,11 +902,11 @@ public final class AnimatorParameterValueInfoOuterClass {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n AnimatorParameterValueInfo.proto\"v\n\032An" +
+      "\n AnimatorParameterValueInfo.proto\"w\n\032An" +
       "imatorParameterValueInfo\022\021\n\tpara_type\030\001 " +
       "\001(\r\022\021\n\007int_val\030\002 \001(\005H\000\022\023\n\tfloat_val\030\003 \001(" +
-      "\002H\000\022\022\n\010bool_val\030\004 \001(\010H\000B\t\n\007paraValB\033\n\031em" +
+      "\002H\000\022\022\n\010bool_val\030\004 \001(\010H\000B\n\n\010para_valB\033\n\031e" +
-      "u.grasscutter.net.protob\006proto3"
+      "mu.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,

src/generated/main/java/emu/grasscutter/net/proto/AnimatorParameterValueInfoPairOuterClass.java

@@ -40,10 +40,6 @@ public final class AnimatorParameterValueInfoPairOuterClass {
     emu.grasscutter.net.proto.AnimatorParameterValueInfoOuterClass.AnimatorParameterValueInfoOrBuilder getAnimatorParaOrBuilder();
   }
   /**
-   * <pre>
-   * Name: FEGCMMBGONJ
-   * </pre>
-   *
    * Protobuf type {@code AnimatorParameterValueInfoPair}
    */
   public static final class AnimatorParameterValueInfoPair extends
@@ -347,10 +343,6 @@ public final class AnimatorParameterValueInfoPairOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Name: FEGCMMBGONJ
-     * </pre>
-     *
      * Protobuf type {@code AnimatorParameterValueInfoPair}
      */
     public static final class Builder extends

src/generated/main/java/emu/grasscutter/net/proto/AskAddFriendNotifyOuterClass.java

@@ -19,30 +19,32 @@ public final class AskAddFriendNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 target_uid = 9;</code>
+     * <code>.FriendBrief target_friend_brief = 15;</code>
-     * @return The targetUid.
-     */
-    int getTargetUid();
-
-    /**
-     * <code>.FriendBrief target_friend_brief = 3;</code>
      * @return Whether the targetFriendBrief field is set.
      */
     boolean hasTargetFriendBrief();
     /**
-     * <code>.FriendBrief target_friend_brief = 3;</code>
+     * <code>.FriendBrief target_friend_brief = 15;</code>
      * @return The targetFriendBrief.
      */
     emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief getTargetFriendBrief();
     /**
-     * <code>.FriendBrief target_friend_brief = 3;</code>
+     * <code>.FriendBrief target_friend_brief = 15;</code>
      */
     emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBriefOrBuilder getTargetFriendBriefOrBuilder();
+
+    /**
+     * <code>uint32 target_uid = 9;</code>
+     * @return The targetUid.
+     */
+    int getTargetUid();
   }
   /**
    * <pre>
-   * Name: PCOJKOCFPIN
+   * CmdId: 4065
-   * CmdId: 4044
+   * EnetChannelId: 0
+   * EnetIsReliable: false
+   * IsAllowClient: true
    * </pre>
    *
    * Protobuf type {@code AskAddFriendNotify}
@@ -89,7 +91,12 @@ public final class AskAddFriendNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 26: {
+            case 72: {
+
+              targetUid_ = input.readUInt32();
+              break;
+            }
+            case 122: {
               emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief.Builder subBuilder = null;
               if (targetFriendBrief_ != null) {
                 subBuilder = targetFriendBrief_.toBuilder();
@@ -102,11 +109,6 @@ public final class AskAddFriendNotifyOuterClass {
 
               break;
             }
-            case 72: {
-
-              targetUid_ = input.readUInt32();
-              break;
-            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -139,6 +141,32 @@ public final class AskAddFriendNotifyOuterClass {
               emu.grasscutter.net.proto.AskAddFriendNotifyOuterClass.AskAddFriendNotify.class, emu.grasscutter.net.proto.AskAddFriendNotifyOuterClass.AskAddFriendNotify.Builder.class);
     }
 
+    public static final int TARGET_FRIEND_BRIEF_FIELD_NUMBER = 15;
+    private emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief targetFriendBrief_;
+    /**
+     * <code>.FriendBrief target_friend_brief = 15;</code>
+     * @return Whether the targetFriendBrief field is set.
+     */
+    @java.lang.Override
+    public boolean hasTargetFriendBrief() {
+      return targetFriendBrief_ != null;
+    }
+    /**
+     * <code>.FriendBrief target_friend_brief = 15;</code>
+     * @return The targetFriendBrief.
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief getTargetFriendBrief() {
+      return targetFriendBrief_ == null ? emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief.getDefaultInstance() : targetFriendBrief_;
+    }
+    /**
+     * <code>.FriendBrief target_friend_brief = 15;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBriefOrBuilder getTargetFriendBriefOrBuilder() {
+      return getTargetFriendBrief();
+    }
+
     public static final int TARGET_UID_FIELD_NUMBER = 9;
     private int targetUid_;
     /**
@@ -150,32 +178,6 @@ public final class AskAddFriendNotifyOuterClass {
       return targetUid_;
     }
 
-    public static final int TARGET_FRIEND_BRIEF_FIELD_NUMBER = 3;
-    private emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief targetFriendBrief_;
-    /**
-     * <code>.FriendBrief target_friend_brief = 3;</code>
-     * @return Whether the targetFriendBrief field is set.
-     */
-    @java.lang.Override
-    public boolean hasTargetFriendBrief() {
-      return targetFriendBrief_ != null;
-    }
-    /**
-     * <code>.FriendBrief target_friend_brief = 3;</code>
-     * @return The targetFriendBrief.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief getTargetFriendBrief() {
-      return targetFriendBrief_ == null ? emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief.getDefaultInstance() : targetFriendBrief_;
-    }
-    /**
-     * <code>.FriendBrief target_friend_brief = 3;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBriefOrBuilder getTargetFriendBriefOrBuilder() {
-      return getTargetFriendBrief();
-    }
-
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -190,12 +192,12 @@ public final class AskAddFriendNotifyOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (targetFriendBrief_ != null) {
-        output.writeMessage(3, getTargetFriendBrief());
-      }
       if (targetUid_ != 0) {
         output.writeUInt32(9, targetUid_);
       }
+      if (targetFriendBrief_ != null) {
+        output.writeMessage(15, getTargetFriendBrief());
+      }
       unknownFields.writeTo(output);
     }
 
@@ -205,14 +207,14 @@ public final class AskAddFriendNotifyOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (targetFriendBrief_ != null) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(3, getTargetFriendBrief());
-      }
       if (targetUid_ != 0) {
         size += com.google.protobuf.CodedOutputStream
           .computeUInt32Size(9, targetUid_);
       }
+      if (targetFriendBrief_ != null) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(15, getTargetFriendBrief());
+      }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
@@ -228,13 +230,13 @@ public final class AskAddFriendNotifyOuterClass {
       }
       emu.grasscutter.net.proto.AskAddFriendNotifyOuterClass.AskAddFriendNotify other = (emu.grasscutter.net.proto.AskAddFriendNotifyOuterClass.AskAddFriendNotify) obj;
 
-      if (getTargetUid()
-          != other.getTargetUid()) return false;
       if (hasTargetFriendBrief() != other.hasTargetFriendBrief()) return false;
       if (hasTargetFriendBrief()) {
         if (!getTargetFriendBrief()
             .equals(other.getTargetFriendBrief())) return false;
       }
+      if (getTargetUid()
+          != other.getTargetUid()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -246,12 +248,12 @@ public final class AskAddFriendNotifyOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + TARGET_UID_FIELD_NUMBER;
-      hash = (53 * hash) + getTargetUid();
       if (hasTargetFriendBrief()) {
         hash = (37 * hash) + TARGET_FRIEND_BRIEF_FIELD_NUMBER;
         hash = (53 * hash) + getTargetFriendBrief().hashCode();
       }
+      hash = (37 * hash) + TARGET_UID_FIELD_NUMBER;
+      hash = (53 * hash) + getTargetUid();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -349,8 +351,10 @@ public final class AskAddFriendNotifyOuterClass {
     }
     /**
      * <pre>
-     * Name: PCOJKOCFPIN
+     * CmdId: 4065
-     * CmdId: 4044
+     * EnetChannelId: 0
+     * EnetIsReliable: false
+     * IsAllowClient: true
      * </pre>
      *
      * Protobuf type {@code AskAddFriendNotify}
@@ -390,14 +394,14 @@ public final class AskAddFriendNotifyOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        targetUid_ = 0;
-
         if (targetFriendBriefBuilder_ == null) {
           targetFriendBrief_ = null;
         } else {
           targetFriendBrief_ = null;
           targetFriendBriefBuilder_ = null;
         }
+        targetUid_ = 0;
+
         return this;
       }
 
@@ -424,12 +428,12 @@ public final class AskAddFriendNotifyOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.AskAddFriendNotifyOuterClass.AskAddFriendNotify buildPartial() {
         emu.grasscutter.net.proto.AskAddFriendNotifyOuterClass.AskAddFriendNotify result = new emu.grasscutter.net.proto.AskAddFriendNotifyOuterClass.AskAddFriendNotify(this);
-        result.targetUid_ = targetUid_;
         if (targetFriendBriefBuilder_ == null) {
           result.targetFriendBrief_ = targetFriendBrief_;
         } else {
           result.targetFriendBrief_ = targetFriendBriefBuilder_.build();
         }
+        result.targetUid_ = targetUid_;
         onBuilt();
         return result;
       }
@@ -478,12 +482,12 @@ public final class AskAddFriendNotifyOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.AskAddFriendNotifyOuterClass.AskAddFriendNotify other) {
         if (other == emu.grasscutter.net.proto.AskAddFriendNotifyOuterClass.AskAddFriendNotify.getDefaultInstance()) return this;
-        if (other.getTargetUid() != 0) {
-          setTargetUid(other.getTargetUid());
-        }
         if (other.hasTargetFriendBrief()) {
           mergeTargetFriendBrief(other.getTargetFriendBrief());
         }
+        if (other.getTargetUid() != 0) {
+          setTargetUid(other.getTargetUid());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -513,6 +517,125 @@ public final class AskAddFriendNotifyOuterClass {
         return this;
       }
 
+      private emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief targetFriendBrief_;
+      private com.google.protobuf.SingleFieldBuilderV3<
+          emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief, emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief.Builder, emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBriefOrBuilder> targetFriendBriefBuilder_;
+      /**
+       * <code>.FriendBrief target_friend_brief = 15;</code>
+       * @return Whether the targetFriendBrief field is set.
+       */
+      public boolean hasTargetFriendBrief() {
+        return targetFriendBriefBuilder_ != null || targetFriendBrief_ != null;
+      }
+      /**
+       * <code>.FriendBrief target_friend_brief = 15;</code>
+       * @return The targetFriendBrief.
+       */
+      public emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief getTargetFriendBrief() {
+        if (targetFriendBriefBuilder_ == null) {
+          return targetFriendBrief_ == null ? emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief.getDefaultInstance() : targetFriendBrief_;
+        } else {
+          return targetFriendBriefBuilder_.getMessage();
+        }
+      }
+      /**
+       * <code>.FriendBrief target_friend_brief = 15;</code>
+       */
+      public Builder setTargetFriendBrief(emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief value) {
+        if (targetFriendBriefBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          targetFriendBrief_ = value;
+          onChanged();
+        } else {
+          targetFriendBriefBuilder_.setMessage(value);
+        }
+
+        return this;
+      }
+      /**
+       * <code>.FriendBrief target_friend_brief = 15;</code>
+       */
+      public Builder setTargetFriendBrief(
+          emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief.Builder builderForValue) {
+        if (targetFriendBriefBuilder_ == null) {
+          targetFriendBrief_ = builderForValue.build();
+          onChanged();
+        } else {
+          targetFriendBriefBuilder_.setMessage(builderForValue.build());
+        }
+
+        return this;
+      }
+      /**
+       * <code>.FriendBrief target_friend_brief = 15;</code>
+       */
+      public Builder mergeTargetFriendBrief(emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief value) {
+        if (targetFriendBriefBuilder_ == null) {
+          if (targetFriendBrief_ != null) {
+            targetFriendBrief_ =
+              emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief.newBuilder(targetFriendBrief_).mergeFrom(value).buildPartial();
+          } else {
+            targetFriendBrief_ = value;
+          }
+          onChanged();
+        } else {
+          targetFriendBriefBuilder_.mergeFrom(value);
+        }
+
+        return this;
+      }
+      /**
+       * <code>.FriendBrief target_friend_brief = 15;</code>
+       */
+      public Builder clearTargetFriendBrief() {
+        if (targetFriendBriefBuilder_ == null) {
+          targetFriendBrief_ = null;
+          onChanged();
+        } else {
+          targetFriendBrief_ = null;
+          targetFriendBriefBuilder_ = null;
+        }
+
+        return this;
+      }
+      /**
+       * <code>.FriendBrief target_friend_brief = 15;</code>
+       */
+      public emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief.Builder getTargetFriendBriefBuilder() {
+        
+        onChanged();
+        return getTargetFriendBriefFieldBuilder().getBuilder();
+      }
+      /**
+       * <code>.FriendBrief target_friend_brief = 15;</code>
+       */
+      public emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBriefOrBuilder getTargetFriendBriefOrBuilder() {
+        if (targetFriendBriefBuilder_ != null) {
+          return targetFriendBriefBuilder_.getMessageOrBuilder();
+        } else {
+          return targetFriendBrief_ == null ?
+              emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief.getDefaultInstance() : targetFriendBrief_;
+        }
+      }
+      /**
+       * <code>.FriendBrief target_friend_brief = 15;</code>
+       */
+      private com.google.protobuf.SingleFieldBuilderV3<
+          emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief, emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief.Builder, emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBriefOrBuilder> 
+          getTargetFriendBriefFieldBuilder() {
+        if (targetFriendBriefBuilder_ == null) {
+          targetFriendBriefBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+              emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief, emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief.Builder, emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBriefOrBuilder>(
+                  getTargetFriendBrief(),
+                  getParentForChildren(),
+                  isClean());
+          targetFriendBrief_ = null;
+        }
+        return targetFriendBriefBuilder_;
+      }
+
       private int targetUid_ ;
       /**
        * <code>uint32 target_uid = 9;</code>
@@ -543,125 +666,6 @@ public final class AskAddFriendNotifyOuterClass {
         onChanged();
         return this;
       }
-
-      private emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief targetFriendBrief_;
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief, emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief.Builder, emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBriefOrBuilder> targetFriendBriefBuilder_;
-      /**
-       * <code>.FriendBrief target_friend_brief = 3;</code>
-       * @return Whether the targetFriendBrief field is set.
-       */
-      public boolean hasTargetFriendBrief() {
-        return targetFriendBriefBuilder_ != null || targetFriendBrief_ != null;
-      }
-      /**
-       * <code>.FriendBrief target_friend_brief = 3;</code>
-       * @return The targetFriendBrief.
-       */
-      public emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief getTargetFriendBrief() {
-        if (targetFriendBriefBuilder_ == null) {
-          return targetFriendBrief_ == null ? emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief.getDefaultInstance() : targetFriendBrief_;
-        } else {
-          return targetFriendBriefBuilder_.getMessage();
-        }
-      }
-      /**
-       * <code>.FriendBrief target_friend_brief = 3;</code>
-       */
-      public Builder setTargetFriendBrief(emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief value) {
-        if (targetFriendBriefBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          targetFriendBrief_ = value;
-          onChanged();
-        } else {
-          targetFriendBriefBuilder_.setMessage(value);
-        }
-
-        return this;
-      }
-      /**
-       * <code>.FriendBrief target_friend_brief = 3;</code>
-       */
-      public Builder setTargetFriendBrief(
-          emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief.Builder builderForValue) {
-        if (targetFriendBriefBuilder_ == null) {
-          targetFriendBrief_ = builderForValue.build();
-          onChanged();
-        } else {
-          targetFriendBriefBuilder_.setMessage(builderForValue.build());
-        }
-
-        return this;
-      }
-      /**
-       * <code>.FriendBrief target_friend_brief = 3;</code>
-       */
-      public Builder mergeTargetFriendBrief(emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief value) {
-        if (targetFriendBriefBuilder_ == null) {
-          if (targetFriendBrief_ != null) {
-            targetFriendBrief_ =
-              emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief.newBuilder(targetFriendBrief_).mergeFrom(value).buildPartial();
-          } else {
-            targetFriendBrief_ = value;
-          }
-          onChanged();
-        } else {
-          targetFriendBriefBuilder_.mergeFrom(value);
-        }
-
-        return this;
-      }
-      /**
-       * <code>.FriendBrief target_friend_brief = 3;</code>
-       */
-      public Builder clearTargetFriendBrief() {
-        if (targetFriendBriefBuilder_ == null) {
-          targetFriendBrief_ = null;
-          onChanged();
-        } else {
-          targetFriendBrief_ = null;
-          targetFriendBriefBuilder_ = null;
-        }
-
-        return this;
-      }
-      /**
-       * <code>.FriendBrief target_friend_brief = 3;</code>
-       */
-      public emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief.Builder getTargetFriendBriefBuilder() {
-        
-        onChanged();
-        return getTargetFriendBriefFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.FriendBrief target_friend_brief = 3;</code>
-       */
-      public emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBriefOrBuilder getTargetFriendBriefOrBuilder() {
-        if (targetFriendBriefBuilder_ != null) {
-          return targetFriendBriefBuilder_.getMessageOrBuilder();
-        } else {
-          return targetFriendBrief_ == null ?
-              emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief.getDefaultInstance() : targetFriendBrief_;
-        }
-      }
-      /**
-       * <code>.FriendBrief target_friend_brief = 3;</code>
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief, emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief.Builder, emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBriefOrBuilder> 
-          getTargetFriendBriefFieldBuilder() {
-        if (targetFriendBriefBuilder_ == null) {
-          targetFriendBriefBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief, emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief.Builder, emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBriefOrBuilder>(
-                  getTargetFriendBrief(),
-                  getParentForChildren(),
-                  isClean());
-          targetFriendBrief_ = null;
-        }
-        return targetFriendBriefBuilder_;
-      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -730,9 +734,9 @@ public final class AskAddFriendNotifyOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\030AskAddFriendNotify.proto\032\021FriendBrief." +
-      "proto\"S\n\022AskAddFriendNotify\022\022\n\ntarget_ui" +
+      "proto\"S\n\022AskAddFriendNotify\022)\n\023target_fr" +
-      "d\030\t \001(\r\022)\n\023target_friend_brief\030\003 \001(\0132\014.F" +
+      "iend_brief\030\017 \001(\0132\014.FriendBrief\022\022\n\ntarget" +
-      "riendBriefB\033\n\031emu.grasscutter.net.protob" +
+      "_uid\030\t \001(\rB\033\n\031emu.grasscutter.net.protob" +
       "\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -745,7 +749,7 @@ public final class AskAddFriendNotifyOuterClass {
     internal_static_AskAddFriendNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_AskAddFriendNotify_descriptor,
-        new java.lang.String[] { "TargetUid", "TargetFriendBrief", });
+        new java.lang.String[] { "TargetFriendBrief", "TargetUid", });
     emu.grasscutter.net.proto.FriendBriefOuterClass.getDescriptor();
   }
 

src/generated/main/java/emu/grasscutter/net/proto/AskAddFriendReqOuterClass.java

@@ -19,15 +19,17 @@ public final class AskAddFriendReqOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 target_uid = 12;</code>
+     * <code>uint32 target_uid = 7;</code>
      * @return The targetUid.
      */
     int getTargetUid();
   }
   /**
    * <pre>
-   * Name: GENFFKJKIDB
+   * CmdId: 4007
-   * CmdId: 4014
+   * EnetChannelId: 0
+   * EnetIsReliable: false
+   * IsAllowClient: true
    * </pre>
    *
    * Protobuf type {@code AskAddFriendReq}
@@ -74,7 +76,7 @@ public final class AskAddFriendReqOuterClass {
             case 0:
               done = true;
               break;
-            case 96: {
+            case 56: {
 
               targetUid_ = input.readUInt32();
               break;
@@ -111,10 +113,10 @@ public final class AskAddFriendReqOuterClass {
               emu.grasscutter.net.proto.AskAddFriendReqOuterClass.AskAddFriendReq.class, emu.grasscutter.net.proto.AskAddFriendReqOuterClass.AskAddFriendReq.Builder.class);
     }
 
-    public static final int TARGET_UID_FIELD_NUMBER = 12;
+    public static final int TARGET_UID_FIELD_NUMBER = 7;
     private int targetUid_;
     /**
-     * <code>uint32 target_uid = 12;</code>
+     * <code>uint32 target_uid = 7;</code>
      * @return The targetUid.
      */
     @java.lang.Override
@@ -137,7 +139,7 @@ public final class AskAddFriendReqOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (targetUid_ != 0) {
-        output.writeUInt32(12, targetUid_);
+        output.writeUInt32(7, targetUid_);
       }
       unknownFields.writeTo(output);
     }
@@ -150,7 +152,7 @@ public final class AskAddFriendReqOuterClass {
       size = 0;
       if (targetUid_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(12, targetUid_);
+          .computeUInt32Size(7, targetUid_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -279,8 +281,10 @@ public final class AskAddFriendReqOuterClass {
     }
     /**
      * <pre>
-     * Name: GENFFKJKIDB
+     * CmdId: 4007
-     * CmdId: 4014
+     * EnetChannelId: 0
+     * EnetIsReliable: false
+     * IsAllowClient: true
      * </pre>
      *
      * Protobuf type {@code AskAddFriendReq}
@@ -431,7 +435,7 @@ public final class AskAddFriendReqOuterClass {
 
       private int targetUid_ ;
       /**
-       * <code>uint32 target_uid = 12;</code>
+       * <code>uint32 target_uid = 7;</code>
        * @return The targetUid.
        */
       @java.lang.Override
@@ -439,7 +443,7 @@ public final class AskAddFriendReqOuterClass {
         return targetUid_;
       }
       /**
-       * <code>uint32 target_uid = 12;</code>
+       * <code>uint32 target_uid = 7;</code>
        * @param value The targetUid to set.
        * @return This builder for chaining.
        */
@@ -450,7 +454,7 @@ public final class AskAddFriendReqOuterClass {
         return this;
       }
       /**
-       * <code>uint32 target_uid = 12;</code>
+       * <code>uint32 target_uid = 7;</code>
        * @return This builder for chaining.
        */
       public Builder clearTargetUid() {
@@ -527,7 +531,7 @@ public final class AskAddFriendReqOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\025AskAddFriendReq.proto\"%\n\017AskAddFriendR" +
-      "eq\022\022\n\ntarget_uid\030\014 \001(\rB\033\n\031emu.grasscutte" +
+      "eq\022\022\n\ntarget_uid\030\007 \001(\rB\033\n\031emu.grasscutte" +
       "r.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor

src/generated/main/java/emu/grasscutter/net/proto/AskAddFriendRspOuterClass.java

@@ -19,27 +19,29 @@ public final class AskAddFriendRspOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>int32 retcode = 15;</code>
+     * <code>uint32 param = 8;</code>
-     * @return The retcode.
-     */
-    int getRetcode();
-
-    /**
-     * <code>uint32 param = 1;</code>
      * @return The param.
      */
     int getParam();
 
     /**
-     * <code>uint32 target_uid = 3;</code>
+     * <code>int32 retcode = 7;</code>
+     * @return The retcode.
+     */
+    int getRetcode();
+
+    /**
+     * <code>uint32 target_uid = 4;</code>
      * @return The targetUid.
      */
     int getTargetUid();
   }
   /**
    * <pre>
-   * Name: PJFHJCNBAFB
+   * CmdId: 4021
-   * CmdId: 4034
+   * EnetChannelId: 0
+   * EnetIsReliable: false
+   * IsAllowClient: true
    * </pre>
    *
    * Protobuf type {@code AskAddFriendRsp}
@@ -86,21 +88,21 @@ public final class AskAddFriendRspOuterClass {
             case 0:
               done = true;
               break;
-            case 8: {
+            case 32: {
-
-              param_ = input.readUInt32();
-              break;
-            }
-            case 24: {
 
               targetUid_ = input.readUInt32();
               break;
             }
-            case 120: {
+            case 56: {
 
               retcode_ = input.readInt32();
               break;
             }
+            case 64: {
+
+              param_ = input.readUInt32();
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -133,21 +135,10 @@ public final class AskAddFriendRspOuterClass {
               emu.grasscutter.net.proto.AskAddFriendRspOuterClass.AskAddFriendRsp.class, emu.grasscutter.net.proto.AskAddFriendRspOuterClass.AskAddFriendRsp.Builder.class);
     }
 
-    public static final int RETCODE_FIELD_NUMBER = 15;
+    public static final int PARAM_FIELD_NUMBER = 8;
-    private int retcode_;
-    /**
-     * <code>int32 retcode = 15;</code>
-     * @return The retcode.
-     */
-    @java.lang.Override
-    public int getRetcode() {
-      return retcode_;
-    }
-
-    public static final int PARAM_FIELD_NUMBER = 1;
     private int param_;
     /**
-     * <code>uint32 param = 1;</code>
+     * <code>uint32 param = 8;</code>
      * @return The param.
      */
     @java.lang.Override
@@ -155,10 +146,21 @@ public final class AskAddFriendRspOuterClass {
       return param_;
     }
 
-    public static final int TARGET_UID_FIELD_NUMBER = 3;
+    public static final int RETCODE_FIELD_NUMBER = 7;
+    private int retcode_;
+    /**
+     * <code>int32 retcode = 7;</code>
+     * @return The retcode.
+     */
+    @java.lang.Override
+    public int getRetcode() {
+      return retcode_;
+    }
+
+    public static final int TARGET_UID_FIELD_NUMBER = 4;
     private int targetUid_;
     /**
-     * <code>uint32 target_uid = 3;</code>
+     * <code>uint32 target_uid = 4;</code>
      * @return The targetUid.
      */
     @java.lang.Override
@@ -180,14 +182,14 @@ public final class AskAddFriendRspOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (param_ != 0) {
-        output.writeUInt32(1, param_);
-      }
       if (targetUid_ != 0) {
-        output.writeUInt32(3, targetUid_);
+        output.writeUInt32(4, targetUid_);
       }
       if (retcode_ != 0) {
-        output.writeInt32(15, retcode_);
+        output.writeInt32(7, retcode_);
+      }
+      if (param_ != 0) {
+        output.writeUInt32(8, param_);
       }
       unknownFields.writeTo(output);
     }
@@ -198,17 +200,17 @@ public final class AskAddFriendRspOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (param_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(1, param_);
-      }
       if (targetUid_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(3, targetUid_);
+          .computeUInt32Size(4, targetUid_);
       }
       if (retcode_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(15, retcode_);
+          .computeInt32Size(7, retcode_);
+      }
+      if (param_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(8, param_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -225,10 +227,10 @@ public final class AskAddFriendRspOuterClass {
       }
       emu.grasscutter.net.proto.AskAddFriendRspOuterClass.AskAddFriendRsp other = (emu.grasscutter.net.proto.AskAddFriendRspOuterClass.AskAddFriendRsp) obj;
 
-      if (getRetcode()
-          != other.getRetcode()) return false;
       if (getParam()
           != other.getParam()) return false;
+      if (getRetcode()
+          != other.getRetcode()) return false;
       if (getTargetUid()
           != other.getTargetUid()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
@@ -242,10 +244,10 @@ public final class AskAddFriendRspOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + RETCODE_FIELD_NUMBER;
-      hash = (53 * hash) + getRetcode();
       hash = (37 * hash) + PARAM_FIELD_NUMBER;
       hash = (53 * hash) + getParam();
+      hash = (37 * hash) + RETCODE_FIELD_NUMBER;
+      hash = (53 * hash) + getRetcode();
       hash = (37 * hash) + TARGET_UID_FIELD_NUMBER;
       hash = (53 * hash) + getTargetUid();
       hash = (29 * hash) + unknownFields.hashCode();
@@ -345,8 +347,10 @@ public final class AskAddFriendRspOuterClass {
     }
     /**
      * <pre>
-     * Name: PJFHJCNBAFB
+     * CmdId: 4021
-     * CmdId: 4034
+     * EnetChannelId: 0
+     * EnetIsReliable: false
+     * IsAllowClient: true
      * </pre>
      *
      * Protobuf type {@code AskAddFriendRsp}
@@ -386,10 +390,10 @@ public final class AskAddFriendRspOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        retcode_ = 0;
-
         param_ = 0;
 
+        retcode_ = 0;
+
         targetUid_ = 0;
 
         return this;
@@ -418,8 +422,8 @@ public final class AskAddFriendRspOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.AskAddFriendRspOuterClass.AskAddFriendRsp buildPartial() {
         emu.grasscutter.net.proto.AskAddFriendRspOuterClass.AskAddFriendRsp result = new emu.grasscutter.net.proto.AskAddFriendRspOuterClass.AskAddFriendRsp(this);
-        result.retcode_ = retcode_;
         result.param_ = param_;
+        result.retcode_ = retcode_;
         result.targetUid_ = targetUid_;
         onBuilt();
         return result;
@@ -469,12 +473,12 @@ public final class AskAddFriendRspOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.AskAddFriendRspOuterClass.AskAddFriendRsp other) {
         if (other == emu.grasscutter.net.proto.AskAddFriendRspOuterClass.AskAddFriendRsp.getDefaultInstance()) return this;
-        if (other.getRetcode() != 0) {
-          setRetcode(other.getRetcode());
-        }
         if (other.getParam() != 0) {
           setParam(other.getParam());
         }
+        if (other.getRetcode() != 0) {
+          setRetcode(other.getRetcode());
+        }
         if (other.getTargetUid() != 0) {
           setTargetUid(other.getTargetUid());
         }
@@ -507,40 +511,9 @@ public final class AskAddFriendRspOuterClass {
         return this;
       }
 
-      private int retcode_ ;
-      /**
-       * <code>int32 retcode = 15;</code>
-       * @return The retcode.
-       */
-      @java.lang.Override
-      public int getRetcode() {
-        return retcode_;
-      }
-      /**
-       * <code>int32 retcode = 15;</code>
-       * @param value The retcode to set.
-       * @return This builder for chaining.
-       */
-      public Builder setRetcode(int value) {
-        
-        retcode_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>int32 retcode = 15;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearRetcode() {
-        
-        retcode_ = 0;
-        onChanged();
-        return this;
-      }
-
       private int param_ ;
       /**
-       * <code>uint32 param = 1;</code>
+       * <code>uint32 param = 8;</code>
        * @return The param.
        */
       @java.lang.Override
@@ -548,7 +521,7 @@ public final class AskAddFriendRspOuterClass {
         return param_;
       }
       /**
-       * <code>uint32 param = 1;</code>
+       * <code>uint32 param = 8;</code>
        * @param value The param to set.
        * @return This builder for chaining.
        */
@@ -559,7 +532,7 @@ public final class AskAddFriendRspOuterClass {
         return this;
       }
       /**
-       * <code>uint32 param = 1;</code>
+       * <code>uint32 param = 8;</code>
        * @return This builder for chaining.
        */
       public Builder clearParam() {
@@ -569,9 +542,40 @@ public final class AskAddFriendRspOuterClass {
         return this;
       }
 
+      private int retcode_ ;
+      /**
+       * <code>int32 retcode = 7;</code>
+       * @return The retcode.
+       */
+      @java.lang.Override
+      public int getRetcode() {
+        return retcode_;
+      }
+      /**
+       * <code>int32 retcode = 7;</code>
+       * @param value The retcode to set.
+       * @return This builder for chaining.
+       */
+      public Builder setRetcode(int value) {
+        
+        retcode_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>int32 retcode = 7;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearRetcode() {
+        
+        retcode_ = 0;
+        onChanged();
+        return this;
+      }
+
       private int targetUid_ ;
       /**
-       * <code>uint32 target_uid = 3;</code>
+       * <code>uint32 target_uid = 4;</code>
        * @return The targetUid.
        */
       @java.lang.Override
@@ -579,7 +583,7 @@ public final class AskAddFriendRspOuterClass {
         return targetUid_;
       }
       /**
-       * <code>uint32 target_uid = 3;</code>
+       * <code>uint32 target_uid = 4;</code>
        * @param value The targetUid to set.
        * @return This builder for chaining.
        */
@@ -590,7 +594,7 @@ public final class AskAddFriendRspOuterClass {
         return this;
       }
       /**
-       * <code>uint32 target_uid = 3;</code>
+       * <code>uint32 target_uid = 4;</code>
        * @return This builder for chaining.
        */
       public Builder clearTargetUid() {
@@ -667,8 +671,8 @@ public final class AskAddFriendRspOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\025AskAddFriendRsp.proto\"E\n\017AskAddFriendR" +
-      "sp\022\017\n\007retcode\030\017 \001(\005\022\r\n\005param\030\001 \001(\r\022\022\n\nta" +
+      "sp\022\r\n\005param\030\010 \001(\r\022\017\n\007retcode\030\007 \001(\005\022\022\n\nta" +
-      "rget_uid\030\003 \001(\rB\033\n\031emu.grasscutter.net.pr" +
+      "rget_uid\030\004 \001(\rB\033\n\031emu.grasscutter.net.pr" +
       "otob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -680,7 +684,7 @@ public final class AskAddFriendRspOuterClass {
     internal_static_AskAddFriendRsp_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_AskAddFriendRsp_descriptor,
-        new java.lang.String[] { "Retcode", "Param", "TargetUid", });
+        new java.lang.String[] { "Param", "Retcode", "TargetUid", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)

src/generated/main/java/emu/grasscutter/net/proto/AttackHitEffectResultOuterClass.java

@@ -19,54 +19,42 @@ public final class AttackHitEffectResultOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <pre>
+     * <code>float hit_halt_time_scale = 8;</code>
-     * NCIHLNFLAAF
+     * @return The hitHaltTimeScale.
-     * </pre>
-     *
-     * <code>uint32 Unk3300_KLNGDAMMFIF = 10;</code>
-     * @return The unk3300KLNGDAMMFIF.
      */
-    int getUnk3300KLNGDAMMFIF();
+    float getHitHaltTimeScale();
 
     /**
-     * <code>float airStrength = 6;</code>
+     * <code>uint32 original_hit_eff_level = 12;</code>
+     * @return The originalHitEffLevel.
+     */
+    int getOriginalHitEffLevel();
+
+    /**
+     * <code>float air_strength = 15;</code>
      * @return The airStrength.
      */
     float getAirStrength();
 
     /**
-     * <pre>
+     * <code>uint32 hit_eff_level = 2;</code>
-     * LDDDDFHEMBA
+     * @return The hitEffLevel.
-     * </pre>
-     *
-     * <code>uint32 Unk3300_LCKECJCKKJK = 3;</code>
-     * @return The unk3300LCKECJCKKJK.
      */
-    int getUnk3300LCKECJCKKJK();
+    int getHitEffLevel();
 
     /**
-     * <code>float hitHaltTime = 15;</code>
+     * <code>float hit_halt_time = 13;</code>
      * @return The hitHaltTime.
      */
     float getHitHaltTime();
 
     /**
-     * <code>float retreatStrength = 4;</code>
+     * <code>float retreat_strength = 7;</code>
      * @return The retreatStrength.
      */
     float getRetreatStrength();
-
-    /**
-     * <code>float hitHaltTimeScale = 7;</code>
-     * @return The hitHaltTimeScale.
-     */
-    float getHitHaltTimeScale();
   }
   /**
-   * <pre>
-   * Name: KPDGACKMNJA
-   * </pre>
-   *
    * Protobuf type {@code AttackHitEffectResult}
    */
   public static final class AttackHitEffectResult extends
@@ -111,34 +99,34 @@ public final class AttackHitEffectResultOuterClass {
             case 0:
               done = true;
               break;
-            case 24: {
+            case 16: {
 
-              unk3300LCKECJCKKJK_ = input.readUInt32();
+              hitEffLevel_ = input.readUInt32();
-              break;
-            }
-            case 37: {
-
-              retreatStrength_ = input.readFloat();
-              break;
-            }
-            case 53: {
-
-              airStrength_ = input.readFloat();
               break;
             }
             case 61: {
 
+              retreatStrength_ = input.readFloat();
+              break;
+            }
+            case 69: {
+
               hitHaltTimeScale_ = input.readFloat();
               break;
             }
-            case 80: {
+            case 96: {
 
-              unk3300KLNGDAMMFIF_ = input.readUInt32();
+              originalHitEffLevel_ = input.readUInt32();
+              break;
+            }
+            case 109: {
+
+              hitHaltTime_ = input.readFloat();
               break;
             }
             case 125: {
 
-              hitHaltTime_ = input.readFloat();
+              airStrength_ = input.readFloat();
               break;
             }
             default: {
@@ -173,25 +161,32 @@ public final class AttackHitEffectResultOuterClass {
               emu.grasscutter.net.proto.AttackHitEffectResultOuterClass.AttackHitEffectResult.class, emu.grasscutter.net.proto.AttackHitEffectResultOuterClass.AttackHitEffectResult.Builder.class);
     }
 
-    public static final int UNK3300_KLNGDAMMFIF_FIELD_NUMBER = 10;
+    public static final int HIT_HALT_TIME_SCALE_FIELD_NUMBER = 8;
-    private int unk3300KLNGDAMMFIF_;
+    private float hitHaltTimeScale_;
     /**
-     * <pre>
+     * <code>float hit_halt_time_scale = 8;</code>
-     * NCIHLNFLAAF
+     * @return The hitHaltTimeScale.
-     * </pre>
-     *
-     * <code>uint32 Unk3300_KLNGDAMMFIF = 10;</code>
-     * @return The unk3300KLNGDAMMFIF.
      */
     @java.lang.Override
-    public int getUnk3300KLNGDAMMFIF() {
+    public float getHitHaltTimeScale() {
-      return unk3300KLNGDAMMFIF_;
+      return hitHaltTimeScale_;
     }
 
-    public static final int AIRSTRENGTH_FIELD_NUMBER = 6;
+    public static final int ORIGINAL_HIT_EFF_LEVEL_FIELD_NUMBER = 12;
+    private int originalHitEffLevel_;
+    /**
+     * <code>uint32 original_hit_eff_level = 12;</code>
+     * @return The originalHitEffLevel.
+     */
+    @java.lang.Override
+    public int getOriginalHitEffLevel() {
+      return originalHitEffLevel_;
+    }
+
+    public static final int AIR_STRENGTH_FIELD_NUMBER = 15;
     private float airStrength_;
     /**
-     * <code>float airStrength = 6;</code>
+     * <code>float air_strength = 15;</code>
      * @return The airStrength.
      */
     @java.lang.Override
@@ -199,25 +194,21 @@ public final class AttackHitEffectResultOuterClass {
       return airStrength_;
     }
 
-    public static final int UNK3300_LCKECJCKKJK_FIELD_NUMBER = 3;
+    public static final int HIT_EFF_LEVEL_FIELD_NUMBER = 2;
-    private int unk3300LCKECJCKKJK_;
+    private int hitEffLevel_;
     /**
-     * <pre>
+     * <code>uint32 hit_eff_level = 2;</code>
-     * LDDDDFHEMBA
+     * @return The hitEffLevel.
-     * </pre>
-     *
-     * <code>uint32 Unk3300_LCKECJCKKJK = 3;</code>
-     * @return The unk3300LCKECJCKKJK.
      */
     @java.lang.Override
-    public int getUnk3300LCKECJCKKJK() {
+    public int getHitEffLevel() {
-      return unk3300LCKECJCKKJK_;
+      return hitEffLevel_;
     }
 
-    public static final int HITHALTTIME_FIELD_NUMBER = 15;
+    public static final int HIT_HALT_TIME_FIELD_NUMBER = 13;
     private float hitHaltTime_;
     /**
-     * <code>float hitHaltTime = 15;</code>
+     * <code>float hit_halt_time = 13;</code>
      * @return The hitHaltTime.
      */
     @java.lang.Override
@@ -225,10 +216,10 @@ public final class AttackHitEffectResultOuterClass {
       return hitHaltTime_;
     }
 
-    public static final int RETREATSTRENGTH_FIELD_NUMBER = 4;
+    public static final int RETREAT_STRENGTH_FIELD_NUMBER = 7;
     private float retreatStrength_;
     /**
-     * <code>float retreatStrength = 4;</code>
+     * <code>float retreat_strength = 7;</code>
      * @return The retreatStrength.
      */
     @java.lang.Override
@@ -236,17 +227,6 @@ public final class AttackHitEffectResultOuterClass {
       return retreatStrength_;
     }
 
-    public static final int HITHALTTIMESCALE_FIELD_NUMBER = 7;
-    private float hitHaltTimeScale_;
-    /**
-     * <code>float hitHaltTimeScale = 7;</code>
-     * @return The hitHaltTimeScale.
-     */
-    @java.lang.Override
-    public float getHitHaltTimeScale() {
-      return hitHaltTimeScale_;
-    }
-
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -261,23 +241,23 @@ public final class AttackHitEffectResultOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (unk3300LCKECJCKKJK_ != 0) {
+      if (hitEffLevel_ != 0) {
-        output.writeUInt32(3, unk3300LCKECJCKKJK_);
+        output.writeUInt32(2, hitEffLevel_);
       }
       if (retreatStrength_ != 0F) {
-        output.writeFloat(4, retreatStrength_);
+        output.writeFloat(7, retreatStrength_);
-      }
-      if (airStrength_ != 0F) {
-        output.writeFloat(6, airStrength_);
       }
       if (hitHaltTimeScale_ != 0F) {
-        output.writeFloat(7, hitHaltTimeScale_);
+        output.writeFloat(8, hitHaltTimeScale_);
       }
-      if (unk3300KLNGDAMMFIF_ != 0) {
+      if (originalHitEffLevel_ != 0) {
-        output.writeUInt32(10, unk3300KLNGDAMMFIF_);
+        output.writeUInt32(12, originalHitEffLevel_);
       }
       if (hitHaltTime_ != 0F) {
-        output.writeFloat(15, hitHaltTime_);
+        output.writeFloat(13, hitHaltTime_);
+      }
+      if (airStrength_ != 0F) {
+        output.writeFloat(15, airStrength_);
       }
       unknownFields.writeTo(output);
     }
@@ -288,29 +268,29 @@ public final class AttackHitEffectResultOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (unk3300LCKECJCKKJK_ != 0) {
+      if (hitEffLevel_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(3, unk3300LCKECJCKKJK_);
+          .computeUInt32Size(2, hitEffLevel_);
       }
       if (retreatStrength_ != 0F) {
         size += com.google.protobuf.CodedOutputStream
-          .computeFloatSize(4, retreatStrength_);
+          .computeFloatSize(7, retreatStrength_);
-      }
-      if (airStrength_ != 0F) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeFloatSize(6, airStrength_);
       }
       if (hitHaltTimeScale_ != 0F) {
         size += com.google.protobuf.CodedOutputStream
-          .computeFloatSize(7, hitHaltTimeScale_);
+          .computeFloatSize(8, hitHaltTimeScale_);
       }
-      if (unk3300KLNGDAMMFIF_ != 0) {
+      if (originalHitEffLevel_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(10, unk3300KLNGDAMMFIF_);
+          .computeUInt32Size(12, originalHitEffLevel_);
       }
       if (hitHaltTime_ != 0F) {
         size += com.google.protobuf.CodedOutputStream
-          .computeFloatSize(15, hitHaltTime_);
+          .computeFloatSize(13, hitHaltTime_);
+      }
+      if (airStrength_ != 0F) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeFloatSize(15, airStrength_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -327,22 +307,22 @@ public final class AttackHitEffectResultOuterClass {
       }
       emu.grasscutter.net.proto.AttackHitEffectResultOuterClass.AttackHitEffectResult other = (emu.grasscutter.net.proto.AttackHitEffectResultOuterClass.AttackHitEffectResult) obj;
 
-      if (getUnk3300KLNGDAMMFIF()
+      if (java.lang.Float.floatToIntBits(getHitHaltTimeScale())
-          != other.getUnk3300KLNGDAMMFIF()) return false;
+          != java.lang.Float.floatToIntBits(
+              other.getHitHaltTimeScale())) return false;
+      if (getOriginalHitEffLevel()
+          != other.getOriginalHitEffLevel()) return false;
       if (java.lang.Float.floatToIntBits(getAirStrength())
           != java.lang.Float.floatToIntBits(
               other.getAirStrength())) return false;
-      if (getUnk3300LCKECJCKKJK()
+      if (getHitEffLevel()
-          != other.getUnk3300LCKECJCKKJK()) return false;
+          != other.getHitEffLevel()) return false;
       if (java.lang.Float.floatToIntBits(getHitHaltTime())
           != java.lang.Float.floatToIntBits(
               other.getHitHaltTime())) return false;
       if (java.lang.Float.floatToIntBits(getRetreatStrength())
           != java.lang.Float.floatToIntBits(
               other.getRetreatStrength())) return false;
-      if (java.lang.Float.floatToIntBits(getHitHaltTimeScale())
-          != java.lang.Float.floatToIntBits(
-              other.getHitHaltTimeScale())) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -354,22 +334,22 @@ public final class AttackHitEffectResultOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + UNK3300_KLNGDAMMFIF_FIELD_NUMBER;
+      hash = (37 * hash) + HIT_HALT_TIME_SCALE_FIELD_NUMBER;
-      hash = (53 * hash) + getUnk3300KLNGDAMMFIF();
-      hash = (37 * hash) + AIRSTRENGTH_FIELD_NUMBER;
-      hash = (53 * hash) + java.lang.Float.floatToIntBits(
-          getAirStrength());
-      hash = (37 * hash) + UNK3300_LCKECJCKKJK_FIELD_NUMBER;
-      hash = (53 * hash) + getUnk3300LCKECJCKKJK();
-      hash = (37 * hash) + HITHALTTIME_FIELD_NUMBER;
-      hash = (53 * hash) + java.lang.Float.floatToIntBits(
-          getHitHaltTime());
-      hash = (37 * hash) + RETREATSTRENGTH_FIELD_NUMBER;
-      hash = (53 * hash) + java.lang.Float.floatToIntBits(
-          getRetreatStrength());
-      hash = (37 * hash) + HITHALTTIMESCALE_FIELD_NUMBER;
       hash = (53 * hash) + java.lang.Float.floatToIntBits(
           getHitHaltTimeScale());
+      hash = (37 * hash) + ORIGINAL_HIT_EFF_LEVEL_FIELD_NUMBER;
+      hash = (53 * hash) + getOriginalHitEffLevel();
+      hash = (37 * hash) + AIR_STRENGTH_FIELD_NUMBER;
+      hash = (53 * hash) + java.lang.Float.floatToIntBits(
+          getAirStrength());
+      hash = (37 * hash) + HIT_EFF_LEVEL_FIELD_NUMBER;
+      hash = (53 * hash) + getHitEffLevel();
+      hash = (37 * hash) + HIT_HALT_TIME_FIELD_NUMBER;
+      hash = (53 * hash) + java.lang.Float.floatToIntBits(
+          getHitHaltTime());
+      hash = (37 * hash) + RETREAT_STRENGTH_FIELD_NUMBER;
+      hash = (53 * hash) + java.lang.Float.floatToIntBits(
+          getRetreatStrength());
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -466,10 +446,6 @@ public final class AttackHitEffectResultOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Name: KPDGACKMNJA
-     * </pre>
-     *
      * Protobuf type {@code AttackHitEffectResult}
      */
     public static final class Builder extends
@@ -507,18 +483,18 @@ public final class AttackHitEffectResultOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        unk3300KLNGDAMMFIF_ = 0;
+        hitHaltTimeScale_ = 0F;
+
+        originalHitEffLevel_ = 0;
 
         airStrength_ = 0F;
 
-        unk3300LCKECJCKKJK_ = 0;
+        hitEffLevel_ = 0;
 
         hitHaltTime_ = 0F;
 
         retreatStrength_ = 0F;
 
-        hitHaltTimeScale_ = 0F;
-
         return this;
       }
 
@@ -545,12 +521,12 @@ public final class AttackHitEffectResultOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.AttackHitEffectResultOuterClass.AttackHitEffectResult buildPartial() {
         emu.grasscutter.net.proto.AttackHitEffectResultOuterClass.AttackHitEffectResult result = new emu.grasscutter.net.proto.AttackHitEffectResultOuterClass.AttackHitEffectResult(this);
-        result.unk3300KLNGDAMMFIF_ = unk3300KLNGDAMMFIF_;
+        result.hitHaltTimeScale_ = hitHaltTimeScale_;
+        result.originalHitEffLevel_ = originalHitEffLevel_;
         result.airStrength_ = airStrength_;
-        result.unk3300LCKECJCKKJK_ = unk3300LCKECJCKKJK_;
+        result.hitEffLevel_ = hitEffLevel_;
         result.hitHaltTime_ = hitHaltTime_;
         result.retreatStrength_ = retreatStrength_;
-        result.hitHaltTimeScale_ = hitHaltTimeScale_;
         onBuilt();
         return result;
       }
@@ -599,14 +575,17 @@ public final class AttackHitEffectResultOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.AttackHitEffectResultOuterClass.AttackHitEffectResult other) {
         if (other == emu.grasscutter.net.proto.AttackHitEffectResultOuterClass.AttackHitEffectResult.getDefaultInstance()) return this;
-        if (other.getUnk3300KLNGDAMMFIF() != 0) {
+        if (other.getHitHaltTimeScale() != 0F) {
-          setUnk3300KLNGDAMMFIF(other.getUnk3300KLNGDAMMFIF());
+          setHitHaltTimeScale(other.getHitHaltTimeScale());
+        }
+        if (other.getOriginalHitEffLevel() != 0) {
+          setOriginalHitEffLevel(other.getOriginalHitEffLevel());
         }
         if (other.getAirStrength() != 0F) {
           setAirStrength(other.getAirStrength());
         }
-        if (other.getUnk3300LCKECJCKKJK() != 0) {
+        if (other.getHitEffLevel() != 0) {
-          setUnk3300LCKECJCKKJK(other.getUnk3300LCKECJCKKJK());
+          setHitEffLevel(other.getHitEffLevel());
         }
         if (other.getHitHaltTime() != 0F) {
           setHitHaltTime(other.getHitHaltTime());
@@ -614,9 +593,6 @@ public final class AttackHitEffectResultOuterClass {
         if (other.getRetreatStrength() != 0F) {
           setRetreatStrength(other.getRetreatStrength());
         }
-        if (other.getHitHaltTimeScale() != 0F) {
-          setHitHaltTimeScale(other.getHitHaltTimeScale());
-        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -646,52 +622,71 @@ public final class AttackHitEffectResultOuterClass {
         return this;
       }
 
-      private int unk3300KLNGDAMMFIF_ ;
+      private float hitHaltTimeScale_ ;
       /**
-       * <pre>
+       * <code>float hit_halt_time_scale = 8;</code>
-       * NCIHLNFLAAF
+       * @return The hitHaltTimeScale.
-       * </pre>
-       *
-       * <code>uint32 Unk3300_KLNGDAMMFIF = 10;</code>
-       * @return The unk3300KLNGDAMMFIF.
        */
       @java.lang.Override
-      public int getUnk3300KLNGDAMMFIF() {
+      public float getHitHaltTimeScale() {
-        return unk3300KLNGDAMMFIF_;
+        return hitHaltTimeScale_;
       }
       /**
-       * <pre>
+       * <code>float hit_halt_time_scale = 8;</code>
-       * NCIHLNFLAAF
+       * @param value The hitHaltTimeScale to set.
-       * </pre>
-       *
-       * <code>uint32 Unk3300_KLNGDAMMFIF = 10;</code>
-       * @param value The unk3300KLNGDAMMFIF to set.
        * @return This builder for chaining.
        */
-      public Builder setUnk3300KLNGDAMMFIF(int value) {
+      public Builder setHitHaltTimeScale(float value) {
         
-        unk3300KLNGDAMMFIF_ = value;
+        hitHaltTimeScale_ = value;
         onChanged();
         return this;
       }
       /**
-       * <pre>
+       * <code>float hit_halt_time_scale = 8;</code>
-       * NCIHLNFLAAF
-       * </pre>
-       *
-       * <code>uint32 Unk3300_KLNGDAMMFIF = 10;</code>
        * @return This builder for chaining.
        */
-      public Builder clearUnk3300KLNGDAMMFIF() {
+      public Builder clearHitHaltTimeScale() {
         
-        unk3300KLNGDAMMFIF_ = 0;
+        hitHaltTimeScale_ = 0F;
+        onChanged();
+        return this;
+      }
+
+      private int originalHitEffLevel_ ;
+      /**
+       * <code>uint32 original_hit_eff_level = 12;</code>
+       * @return The originalHitEffLevel.
+       */
+      @java.lang.Override
+      public int getOriginalHitEffLevel() {
+        return originalHitEffLevel_;
+      }
+      /**
+       * <code>uint32 original_hit_eff_level = 12;</code>
+       * @param value The originalHitEffLevel to set.
+       * @return This builder for chaining.
+       */
+      public Builder setOriginalHitEffLevel(int value) {
+        
+        originalHitEffLevel_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 original_hit_eff_level = 12;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearOriginalHitEffLevel() {
+        
+        originalHitEffLevel_ = 0;
         onChanged();
         return this;
       }
 
       private float airStrength_ ;
       /**
-       * <code>float airStrength = 6;</code>
+       * <code>float air_strength = 15;</code>
        * @return The airStrength.
        */
       @java.lang.Override
@@ -699,7 +694,7 @@ public final class AttackHitEffectResultOuterClass {
         return airStrength_;
       }
       /**
-       * <code>float airStrength = 6;</code>
+       * <code>float air_strength = 15;</code>
        * @param value The airStrength to set.
        * @return This builder for chaining.
        */
@@ -710,7 +705,7 @@ public final class AttackHitEffectResultOuterClass {
         return this;
       }
       /**
-       * <code>float airStrength = 6;</code>
+       * <code>float air_strength = 15;</code>
        * @return This builder for chaining.
        */
       public Builder clearAirStrength() {
@@ -720,52 +715,40 @@ public final class AttackHitEffectResultOuterClass {
         return this;
       }
 
-      private int unk3300LCKECJCKKJK_ ;
+      private int hitEffLevel_ ;
       /**
-       * <pre>
+       * <code>uint32 hit_eff_level = 2;</code>
-       * LDDDDFHEMBA
+       * @return The hitEffLevel.
-       * </pre>
-       *
-       * <code>uint32 Unk3300_LCKECJCKKJK = 3;</code>
-       * @return The unk3300LCKECJCKKJK.
        */
       @java.lang.Override
-      public int getUnk3300LCKECJCKKJK() {
+      public int getHitEffLevel() {
-        return unk3300LCKECJCKKJK_;
+        return hitEffLevel_;
       }
       /**
-       * <pre>
+       * <code>uint32 hit_eff_level = 2;</code>
-       * LDDDDFHEMBA
+       * @param value The hitEffLevel to set.
-       * </pre>
-       *
-       * <code>uint32 Unk3300_LCKECJCKKJK = 3;</code>
-       * @param value The unk3300LCKECJCKKJK to set.
        * @return This builder for chaining.
        */
-      public Builder setUnk3300LCKECJCKKJK(int value) {
+      public Builder setHitEffLevel(int value) {
         
-        unk3300LCKECJCKKJK_ = value;
+        hitEffLevel_ = value;
         onChanged();
         return this;
       }
       /**
-       * <pre>
+       * <code>uint32 hit_eff_level = 2;</code>
-       * LDDDDFHEMBA
-       * </pre>
-       *
-       * <code>uint32 Unk3300_LCKECJCKKJK = 3;</code>
        * @return This builder for chaining.
        */
-      public Builder clearUnk3300LCKECJCKKJK() {
+      public Builder clearHitEffLevel() {
         
-        unk3300LCKECJCKKJK_ = 0;
+        hitEffLevel_ = 0;
         onChanged();
         return this;
       }
 
       private float hitHaltTime_ ;
       /**
-       * <code>float hitHaltTime = 15;</code>
+       * <code>float hit_halt_time = 13;</code>
        * @return The hitHaltTime.
        */
       @java.lang.Override
@@ -773,7 +756,7 @@ public final class AttackHitEffectResultOuterClass {
         return hitHaltTime_;
       }
       /**
-       * <code>float hitHaltTime = 15;</code>
+       * <code>float hit_halt_time = 13;</code>
        * @param value The hitHaltTime to set.
        * @return This builder for chaining.
        */
@@ -784,7 +767,7 @@ public final class AttackHitEffectResultOuterClass {
         return this;
       }
       /**
-       * <code>float hitHaltTime = 15;</code>
+       * <code>float hit_halt_time = 13;</code>
        * @return This builder for chaining.
        */
       public Builder clearHitHaltTime() {
@@ -796,7 +779,7 @@ public final class AttackHitEffectResultOuterClass {
 
       private float retreatStrength_ ;
       /**
-       * <code>float retreatStrength = 4;</code>
+       * <code>float retreat_strength = 7;</code>
        * @return The retreatStrength.
        */
       @java.lang.Override
@@ -804,7 +787,7 @@ public final class AttackHitEffectResultOuterClass {
         return retreatStrength_;
       }
       /**
-       * <code>float retreatStrength = 4;</code>
+       * <code>float retreat_strength = 7;</code>
        * @param value The retreatStrength to set.
        * @return This builder for chaining.
        */
@@ -815,7 +798,7 @@ public final class AttackHitEffectResultOuterClass {
         return this;
       }
       /**
-       * <code>float retreatStrength = 4;</code>
+       * <code>float retreat_strength = 7;</code>
        * @return This builder for chaining.
        */
       public Builder clearRetreatStrength() {
@@ -824,37 +807,6 @@ public final class AttackHitEffectResultOuterClass {
         onChanged();
         return this;
       }
-
-      private float hitHaltTimeScale_ ;
-      /**
-       * <code>float hitHaltTimeScale = 7;</code>
-       * @return The hitHaltTimeScale.
-       */
-      @java.lang.Override
-      public float getHitHaltTimeScale() {
-        return hitHaltTimeScale_;
-      }
-      /**
-       * <code>float hitHaltTimeScale = 7;</code>
-       * @param value The hitHaltTimeScale to set.
-       * @return This builder for chaining.
-       */
-      public Builder setHitHaltTimeScale(float value) {
-        
-        hitHaltTimeScale_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>float hitHaltTimeScale = 7;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearHitHaltTimeScale() {
-        
-        hitHaltTimeScale_ = 0F;
-        onChanged();
-        return this;
-      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -922,13 +874,13 @@ public final class AttackHitEffectResultOuterClass {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\033AttackHitEffectResult.proto\"\256\001\n\025Attack" +
+      "\n\033AttackHitEffectResult.proto\"\262\001\n\025Attack" +
-      "HitEffectResult\022\033\n\023Unk3300_KLNGDAMMFIF\030\n" +
+      "HitEffectResult\022\033\n\023hit_halt_time_scale\030\010" +
-      " \001(\r\022\023\n\013airStrength\030\006 \001(\002\022\033\n\023Unk3300_LCK" +
+      " \001(\002\022\036\n\026original_hit_eff_level\030\014 \001(\r\022\024\n\014" +
-      "ECJCKKJK\030\003 \001(\r\022\023\n\013hitHaltTime\030\017 \001(\002\022\027\n\017r" +
+      "air_strength\030\017 \001(\002\022\025\n\rhit_eff_level\030\002 \001(" +
-      "etreatStrength\030\004 \001(\002\022\030\n\020hitHaltTimeScale" +
+      "\r\022\025\n\rhit_halt_time\030\r \001(\002\022\030\n\020retreat_stre" +
-      "\030\007 \001(\002B\033\n\031emu.grasscutter.net.protob\006pro" +
+      "ngth\030\007 \001(\002B\033\n\031emu.grasscutter.net.protob" +
-      "to3"
+      "\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -939,7 +891,7 @@ public final class AttackHitEffectResultOuterClass {
     internal_static_AttackHitEffectResult_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_AttackHitEffectResult_descriptor,
-        new java.lang.String[] { "Unk3300KLNGDAMMFIF", "AirStrength", "Unk3300LCKECJCKKJK", "HitHaltTime", "RetreatStrength", "HitHaltTimeScale", });
+        new java.lang.String[] { "HitHaltTimeScale", "OriginalHitEffLevel", "AirStrength", "HitEffLevel", "HitHaltTime", "RetreatStrength", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)

src/generated/main/java/emu/grasscutter/net/proto/AvatarAddNotifyOuterClass.java

@@ -19,30 +19,32 @@ public final class AvatarAddNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>bool is_in_team = 1;</code>
+     * <code>.AvatarInfo avatar = 13;</code>
-     * @return The isInTeam.
-     */
-    boolean getIsInTeam();
-
-    /**
-     * <code>.AvatarInfo avatar = 6;</code>
      * @return Whether the avatar field is set.
      */
     boolean hasAvatar();
     /**
-     * <code>.AvatarInfo avatar = 6;</code>
+     * <code>.AvatarInfo avatar = 13;</code>
      * @return The avatar.
      */
     emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo getAvatar();
     /**
-     * <code>.AvatarInfo avatar = 6;</code>
+     * <code>.AvatarInfo avatar = 13;</code>
      */
     emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfoOrBuilder getAvatarOrBuilder();
+
+    /**
+     * <code>bool is_in_team = 12;</code>
+     * @return The isInTeam.
+     */
+    boolean getIsInTeam();
   }
   /**
    * <pre>
-   * Name: JKFHGKAMAHH
+   * CmdId: 1769
-   * CmdId: 1756
+   * EnetChannelId: 0
+   * EnetIsReliable: false
+   * IsAllowClient: true
    * </pre>
    *
    * Protobuf type {@code AvatarAddNotify}
@@ -89,12 +91,12 @@ public final class AvatarAddNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 8: {
+            case 96: {
 
               isInTeam_ = input.readBool();
               break;
             }
-            case 50: {
+            case 106: {
               emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo.Builder subBuilder = null;
               if (avatar_ != null) {
                 subBuilder = avatar_.toBuilder();
@@ -139,21 +141,10 @@ public final class AvatarAddNotifyOuterClass {
               emu.grasscutter.net.proto.AvatarAddNotifyOuterClass.AvatarAddNotify.class, emu.grasscutter.net.proto.AvatarAddNotifyOuterClass.AvatarAddNotify.Builder.class);
     }
 
-    public static final int IS_IN_TEAM_FIELD_NUMBER = 1;
+    public static final int AVATAR_FIELD_NUMBER = 13;
-    private boolean isInTeam_;
-    /**
-     * <code>bool is_in_team = 1;</code>
-     * @return The isInTeam.
-     */
-    @java.lang.Override
-    public boolean getIsInTeam() {
-      return isInTeam_;
-    }
-
-    public static final int AVATAR_FIELD_NUMBER = 6;
     private emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo avatar_;
     /**
-     * <code>.AvatarInfo avatar = 6;</code>
+     * <code>.AvatarInfo avatar = 13;</code>
      * @return Whether the avatar field is set.
      */
     @java.lang.Override
@@ -161,7 +152,7 @@ public final class AvatarAddNotifyOuterClass {
       return avatar_ != null;
     }
     /**
-     * <code>.AvatarInfo avatar = 6;</code>
+     * <code>.AvatarInfo avatar = 13;</code>
      * @return The avatar.
      */
     @java.lang.Override
@@ -169,13 +160,24 @@ public final class AvatarAddNotifyOuterClass {
       return avatar_ == null ? emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo.getDefaultInstance() : avatar_;
     }
     /**
-     * <code>.AvatarInfo avatar = 6;</code>
+     * <code>.AvatarInfo avatar = 13;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfoOrBuilder getAvatarOrBuilder() {
       return getAvatar();
     }
 
+    public static final int IS_IN_TEAM_FIELD_NUMBER = 12;
+    private boolean isInTeam_;
+    /**
+     * <code>bool is_in_team = 12;</code>
+     * @return The isInTeam.
+     */
+    @java.lang.Override
+    public boolean getIsInTeam() {
+      return isInTeam_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -191,10 +193,10 @@ public final class AvatarAddNotifyOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (isInTeam_ != false) {
-        output.writeBool(1, isInTeam_);
+        output.writeBool(12, isInTeam_);
       }
       if (avatar_ != null) {
-        output.writeMessage(6, getAvatar());
+        output.writeMessage(13, getAvatar());
       }
       unknownFields.writeTo(output);
     }
@@ -207,11 +209,11 @@ public final class AvatarAddNotifyOuterClass {
       size = 0;
       if (isInTeam_ != false) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(1, isInTeam_);
+          .computeBoolSize(12, isInTeam_);
       }
       if (avatar_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(6, getAvatar());
+          .computeMessageSize(13, getAvatar());
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -228,13 +230,13 @@ public final class AvatarAddNotifyOuterClass {
       }
       emu.grasscutter.net.proto.AvatarAddNotifyOuterClass.AvatarAddNotify other = (emu.grasscutter.net.proto.AvatarAddNotifyOuterClass.AvatarAddNotify) obj;
 
-      if (getIsInTeam()
-          != other.getIsInTeam()) return false;
       if (hasAvatar() != other.hasAvatar()) return false;
       if (hasAvatar()) {
         if (!getAvatar()
             .equals(other.getAvatar())) return false;
       }
+      if (getIsInTeam()
+          != other.getIsInTeam()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -246,13 +248,13 @@ public final class AvatarAddNotifyOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + IS_IN_TEAM_FIELD_NUMBER;
-      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
-          getIsInTeam());
       if (hasAvatar()) {
         hash = (37 * hash) + AVATAR_FIELD_NUMBER;
         hash = (53 * hash) + getAvatar().hashCode();
       }
+      hash = (37 * hash) + IS_IN_TEAM_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+          getIsInTeam());
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -350,8 +352,10 @@ public final class AvatarAddNotifyOuterClass {
     }
     /**
      * <pre>
-     * Name: JKFHGKAMAHH
+     * CmdId: 1769
-     * CmdId: 1756
+     * EnetChannelId: 0
+     * EnetIsReliable: false
+     * IsAllowClient: true
      * </pre>
      *
      * Protobuf type {@code AvatarAddNotify}
@@ -391,14 +395,14 @@ public final class AvatarAddNotifyOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        isInTeam_ = false;
-
         if (avatarBuilder_ == null) {
           avatar_ = null;
         } else {
           avatar_ = null;
           avatarBuilder_ = null;
         }
+        isInTeam_ = false;
+
         return this;
       }
 
@@ -425,12 +429,12 @@ public final class AvatarAddNotifyOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.AvatarAddNotifyOuterClass.AvatarAddNotify buildPartial() {
         emu.grasscutter.net.proto.AvatarAddNotifyOuterClass.AvatarAddNotify result = new emu.grasscutter.net.proto.AvatarAddNotifyOuterClass.AvatarAddNotify(this);
-        result.isInTeam_ = isInTeam_;
         if (avatarBuilder_ == null) {
           result.avatar_ = avatar_;
         } else {
           result.avatar_ = avatarBuilder_.build();
         }
+        result.isInTeam_ = isInTeam_;
         onBuilt();
         return result;
       }
@@ -479,12 +483,12 @@ public final class AvatarAddNotifyOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.AvatarAddNotifyOuterClass.AvatarAddNotify other) {
         if (other == emu.grasscutter.net.proto.AvatarAddNotifyOuterClass.AvatarAddNotify.getDefaultInstance()) return this;
-        if (other.getIsInTeam() != false) {
-          setIsInTeam(other.getIsInTeam());
-        }
         if (other.hasAvatar()) {
           mergeAvatar(other.getAvatar());
         }
+        if (other.getIsInTeam() != false) {
+          setIsInTeam(other.getIsInTeam());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -514,49 +518,18 @@ public final class AvatarAddNotifyOuterClass {
         return this;
       }
 
-      private boolean isInTeam_ ;
-      /**
-       * <code>bool is_in_team = 1;</code>
-       * @return The isInTeam.
-       */
-      @java.lang.Override
-      public boolean getIsInTeam() {
-        return isInTeam_;
-      }
-      /**
-       * <code>bool is_in_team = 1;</code>
-       * @param value The isInTeam to set.
-       * @return This builder for chaining.
-       */
-      public Builder setIsInTeam(boolean value) {
-        
-        isInTeam_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>bool is_in_team = 1;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearIsInTeam() {
-        
-        isInTeam_ = false;
-        onChanged();
-        return this;
-      }
-
       private emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo avatar_;
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo, emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo.Builder, emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfoOrBuilder> avatarBuilder_;
       /**
-       * <code>.AvatarInfo avatar = 6;</code>
+       * <code>.AvatarInfo avatar = 13;</code>
        * @return Whether the avatar field is set.
        */
       public boolean hasAvatar() {
         return avatarBuilder_ != null || avatar_ != null;
       }
       /**
-       * <code>.AvatarInfo avatar = 6;</code>
+       * <code>.AvatarInfo avatar = 13;</code>
        * @return The avatar.
        */
       public emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo getAvatar() {
@@ -567,7 +540,7 @@ public final class AvatarAddNotifyOuterClass {
         }
       }
       /**
-       * <code>.AvatarInfo avatar = 6;</code>
+       * <code>.AvatarInfo avatar = 13;</code>
        */
       public Builder setAvatar(emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo value) {
         if (avatarBuilder_ == null) {
@@ -583,7 +556,7 @@ public final class AvatarAddNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.AvatarInfo avatar = 6;</code>
+       * <code>.AvatarInfo avatar = 13;</code>
        */
       public Builder setAvatar(
           emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo.Builder builderForValue) {
@@ -597,7 +570,7 @@ public final class AvatarAddNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.AvatarInfo avatar = 6;</code>
+       * <code>.AvatarInfo avatar = 13;</code>
        */
       public Builder mergeAvatar(emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo value) {
         if (avatarBuilder_ == null) {
@@ -615,7 +588,7 @@ public final class AvatarAddNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.AvatarInfo avatar = 6;</code>
+       * <code>.AvatarInfo avatar = 13;</code>
        */
       public Builder clearAvatar() {
         if (avatarBuilder_ == null) {
@@ -629,7 +602,7 @@ public final class AvatarAddNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.AvatarInfo avatar = 6;</code>
+       * <code>.AvatarInfo avatar = 13;</code>
        */
       public emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo.Builder getAvatarBuilder() {
         
@@ -637,7 +610,7 @@ public final class AvatarAddNotifyOuterClass {
         return getAvatarFieldBuilder().getBuilder();
       }
       /**
-       * <code>.AvatarInfo avatar = 6;</code>
+       * <code>.AvatarInfo avatar = 13;</code>
        */
       public emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfoOrBuilder getAvatarOrBuilder() {
         if (avatarBuilder_ != null) {
@@ -648,7 +621,7 @@ public final class AvatarAddNotifyOuterClass {
         }
       }
       /**
-       * <code>.AvatarInfo avatar = 6;</code>
+       * <code>.AvatarInfo avatar = 13;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo, emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo.Builder, emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfoOrBuilder> 
@@ -663,6 +636,37 @@ public final class AvatarAddNotifyOuterClass {
         }
         return avatarBuilder_;
       }
+
+      private boolean isInTeam_ ;
+      /**
+       * <code>bool is_in_team = 12;</code>
+       * @return The isInTeam.
+       */
+      @java.lang.Override
+      public boolean getIsInTeam() {
+        return isInTeam_;
+      }
+      /**
+       * <code>bool is_in_team = 12;</code>
+       * @param value The isInTeam to set.
+       * @return This builder for chaining.
+       */
+      public Builder setIsInTeam(boolean value) {
+        
+        isInTeam_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>bool is_in_team = 12;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearIsInTeam() {
+        
+        isInTeam_ = false;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -731,8 +735,8 @@ public final class AvatarAddNotifyOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\025AvatarAddNotify.proto\032\020AvatarInfo.prot" +
-      "o\"B\n\017AvatarAddNotify\022\022\n\nis_in_team\030\001 \001(\010" +
+      "o\"B\n\017AvatarAddNotify\022\033\n\006avatar\030\r \001(\0132\013.A" +
-      "\022\033\n\006avatar\030\006 \001(\0132\013.AvatarInfoB\033\n\031emu.gra" +
+      "vatarInfo\022\022\n\nis_in_team\030\014 \001(\010B\033\n\031emu.gra" +
       "sscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -745,7 +749,7 @@ public final class AvatarAddNotifyOuterClass {
     internal_static_AvatarAddNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_AvatarAddNotify_descriptor,
-        new java.lang.String[] { "IsInTeam", "Avatar", });
+        new java.lang.String[] { "Avatar", "IsInTeam", });
     emu.grasscutter.net.proto.AvatarInfoOuterClass.getDescriptor();
   }
 

src/generated/main/java/emu/grasscutter/net/proto/AvatarChangeCostumeNotifyOuterClass.java

@@ -19,24 +19,26 @@ public final class AvatarChangeCostumeNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>.SceneEntityInfo entity_info = 3;</code>
+     * <code>.SceneEntityInfo entity_info = 7;</code>
      * @return Whether the entityInfo field is set.
      */
     boolean hasEntityInfo();
     /**
-     * <code>.SceneEntityInfo entity_info = 3;</code>
+     * <code>.SceneEntityInfo entity_info = 7;</code>
      * @return The entityInfo.
      */
     emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo getEntityInfo();
     /**
-     * <code>.SceneEntityInfo entity_info = 3;</code>
+     * <code>.SceneEntityInfo entity_info = 7;</code>
      */
     emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfoOrBuilder getEntityInfoOrBuilder();
   }
   /**
    * <pre>
-   * Name: DDPDLNJBKAP
+   * CmdId: 1644
-   * CmdId: 1759
+   * EnetChannelId: 0
+   * EnetIsReliable: false
+   * IsAllowClient: true
    * </pre>
    *
    * Protobuf type {@code AvatarChangeCostumeNotify}
@@ -83,7 +85,7 @@ public final class AvatarChangeCostumeNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 26: {
+            case 58: {
               emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo.Builder subBuilder = null;
               if (entityInfo_ != null) {
                 subBuilder = entityInfo_.toBuilder();
@@ -128,10 +130,10 @@ public final class AvatarChangeCostumeNotifyOuterClass {
               emu.grasscutter.net.proto.AvatarChangeCostumeNotifyOuterClass.AvatarChangeCostumeNotify.class, emu.grasscutter.net.proto.AvatarChangeCostumeNotifyOuterClass.AvatarChangeCostumeNotify.Builder.class);
     }
 
-    public static final int ENTITY_INFO_FIELD_NUMBER = 3;
+    public static final int ENTITY_INFO_FIELD_NUMBER = 7;
     private emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo entityInfo_;
     /**
-     * <code>.SceneEntityInfo entity_info = 3;</code>
+     * <code>.SceneEntityInfo entity_info = 7;</code>
      * @return Whether the entityInfo field is set.
      */
     @java.lang.Override
@@ -139,7 +141,7 @@ public final class AvatarChangeCostumeNotifyOuterClass {
       return entityInfo_ != null;
     }
     /**
-     * <code>.SceneEntityInfo entity_info = 3;</code>
+     * <code>.SceneEntityInfo entity_info = 7;</code>
      * @return The entityInfo.
      */
     @java.lang.Override
@@ -147,7 +149,7 @@ public final class AvatarChangeCostumeNotifyOuterClass {
       return entityInfo_ == null ? emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo.getDefaultInstance() : entityInfo_;
     }
     /**
-     * <code>.SceneEntityInfo entity_info = 3;</code>
+     * <code>.SceneEntityInfo entity_info = 7;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfoOrBuilder getEntityInfoOrBuilder() {
@@ -169,7 +171,7 @@ public final class AvatarChangeCostumeNotifyOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (entityInfo_ != null) {
-        output.writeMessage(3, getEntityInfo());
+        output.writeMessage(7, getEntityInfo());
       }
       unknownFields.writeTo(output);
     }
@@ -182,7 +184,7 @@ public final class AvatarChangeCostumeNotifyOuterClass {
       size = 0;
       if (entityInfo_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(3, getEntityInfo());
+          .computeMessageSize(7, getEntityInfo());
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -316,8 +318,10 @@ public final class AvatarChangeCostumeNotifyOuterClass {
     }
     /**
      * <pre>
-     * Name: DDPDLNJBKAP
+     * CmdId: 1644
-     * CmdId: 1759
+     * EnetChannelId: 0
+     * EnetIsReliable: false
+     * IsAllowClient: true
      * </pre>
      *
      * Protobuf type {@code AvatarChangeCostumeNotify}
@@ -478,14 +482,14 @@ public final class AvatarChangeCostumeNotifyOuterClass {
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo, emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo.Builder, emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfoOrBuilder> entityInfoBuilder_;
       /**
-       * <code>.SceneEntityInfo entity_info = 3;</code>
+       * <code>.SceneEntityInfo entity_info = 7;</code>
        * @return Whether the entityInfo field is set.
        */
       public boolean hasEntityInfo() {
         return entityInfoBuilder_ != null || entityInfo_ != null;
       }
       /**
-       * <code>.SceneEntityInfo entity_info = 3;</code>
+       * <code>.SceneEntityInfo entity_info = 7;</code>
        * @return The entityInfo.
        */
       public emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo getEntityInfo() {
@@ -496,7 +500,7 @@ public final class AvatarChangeCostumeNotifyOuterClass {
         }
       }
       /**
-       * <code>.SceneEntityInfo entity_info = 3;</code>
+       * <code>.SceneEntityInfo entity_info = 7;</code>
        */
       public Builder setEntityInfo(emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo value) {
         if (entityInfoBuilder_ == null) {
@@ -512,7 +516,7 @@ public final class AvatarChangeCostumeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.SceneEntityInfo entity_info = 3;</code>
+       * <code>.SceneEntityInfo entity_info = 7;</code>
        */
       public Builder setEntityInfo(
           emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo.Builder builderForValue) {
@@ -526,7 +530,7 @@ public final class AvatarChangeCostumeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.SceneEntityInfo entity_info = 3;</code>
+       * <code>.SceneEntityInfo entity_info = 7;</code>
        */
       public Builder mergeEntityInfo(emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo value) {
         if (entityInfoBuilder_ == null) {
@@ -544,7 +548,7 @@ public final class AvatarChangeCostumeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.SceneEntityInfo entity_info = 3;</code>
+       * <code>.SceneEntityInfo entity_info = 7;</code>
        */
       public Builder clearEntityInfo() {
         if (entityInfoBuilder_ == null) {
@@ -558,7 +562,7 @@ public final class AvatarChangeCostumeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.SceneEntityInfo entity_info = 3;</code>
+       * <code>.SceneEntityInfo entity_info = 7;</code>
        */
       public emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo.Builder getEntityInfoBuilder() {
         
@@ -566,7 +570,7 @@ public final class AvatarChangeCostumeNotifyOuterClass {
         return getEntityInfoFieldBuilder().getBuilder();
       }
       /**
-       * <code>.SceneEntityInfo entity_info = 3;</code>
+       * <code>.SceneEntityInfo entity_info = 7;</code>
        */
       public emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfoOrBuilder getEntityInfoOrBuilder() {
         if (entityInfoBuilder_ != null) {
@@ -577,7 +581,7 @@ public final class AvatarChangeCostumeNotifyOuterClass {
         }
       }
       /**
-       * <code>.SceneEntityInfo entity_info = 3;</code>
+       * <code>.SceneEntityInfo entity_info = 7;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo, emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo.Builder, emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfoOrBuilder> 
@@ -661,7 +665,7 @@ public final class AvatarChangeCostumeNotifyOuterClass {
     java.lang.String[] descriptorData = {
       "\n\037AvatarChangeCostumeNotify.proto\032\025Scene" +
       "EntityInfo.proto\"B\n\031AvatarChangeCostumeN" +
-      "otify\022%\n\013entity_info\030\003 \001(\0132\020.SceneEntity" +
+      "otify\022%\n\013entity_info\030\007 \001(\0132\020.SceneEntity" +
       "InfoB\033\n\031emu.grasscutter.net.protob\006proto" +
       "3"
     };

src/generated/main/java/emu/grasscutter/net/proto/AvatarChangeCostumeReqOuterClass.java

@@ -19,21 +19,23 @@ public final class AvatarChangeCostumeReqOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 costume_id = 7;</code>
+     * <code>uint32 costume_id = 4;</code>
      * @return The costumeId.
      */
     int getCostumeId();
 
     /**
-     * <code>uint64 avatar_guid = 9;</code>
+     * <code>uint64 avatar_guid = 2;</code>
      * @return The avatarGuid.
      */
     long getAvatarGuid();
   }
   /**
    * <pre>
-   * Name: BKAPIOCCGGM
+   * CmdId: 1778
-   * CmdId: 1611
+   * EnetChannelId: 0
+   * EnetIsReliable: false
+   * IsAllowClient: true
    * </pre>
    *
    * Protobuf type {@code AvatarChangeCostumeReq}
@@ -80,16 +82,16 @@ public final class AvatarChangeCostumeReqOuterClass {
             case 0:
               done = true;
               break;
-            case 56: {
+            case 16: {
-
-              costumeId_ = input.readUInt32();
-              break;
-            }
-            case 72: {
 
               avatarGuid_ = input.readUInt64();
               break;
             }
+            case 32: {
+
+              costumeId_ = input.readUInt32();
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -122,10 +124,10 @@ public final class AvatarChangeCostumeReqOuterClass {
               emu.grasscutter.net.proto.AvatarChangeCostumeReqOuterClass.AvatarChangeCostumeReq.class, emu.grasscutter.net.proto.AvatarChangeCostumeReqOuterClass.AvatarChangeCostumeReq.Builder.class);
     }
 
-    public static final int COSTUME_ID_FIELD_NUMBER = 7;
+    public static final int COSTUME_ID_FIELD_NUMBER = 4;
     private int costumeId_;
     /**
-     * <code>uint32 costume_id = 7;</code>
+     * <code>uint32 costume_id = 4;</code>
      * @return The costumeId.
      */
     @java.lang.Override
@@ -133,10 +135,10 @@ public final class AvatarChangeCostumeReqOuterClass {
       return costumeId_;
     }
 
-    public static final int AVATAR_GUID_FIELD_NUMBER = 9;
+    public static final int AVATAR_GUID_FIELD_NUMBER = 2;
     private long avatarGuid_;
     /**
-     * <code>uint64 avatar_guid = 9;</code>
+     * <code>uint64 avatar_guid = 2;</code>
      * @return The avatarGuid.
      */
     @java.lang.Override
@@ -158,11 +160,11 @@ public final class AvatarChangeCostumeReqOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (costumeId_ != 0) {
-        output.writeUInt32(7, costumeId_);
-      }
       if (avatarGuid_ != 0L) {
-        output.writeUInt64(9, avatarGuid_);
+        output.writeUInt64(2, avatarGuid_);
+      }
+      if (costumeId_ != 0) {
+        output.writeUInt32(4, costumeId_);
       }
       unknownFields.writeTo(output);
     }
@@ -173,13 +175,13 @@ public final class AvatarChangeCostumeReqOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (costumeId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(7, costumeId_);
-      }
       if (avatarGuid_ != 0L) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt64Size(9, avatarGuid_);
+          .computeUInt64Size(2, avatarGuid_);
+      }
+      if (costumeId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(4, costumeId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -313,8 +315,10 @@ public final class AvatarChangeCostumeReqOuterClass {
     }
     /**
      * <pre>
-     * Name: BKAPIOCCGGM
+     * CmdId: 1778
-     * CmdId: 1611
+     * EnetChannelId: 0
+     * EnetIsReliable: false
+     * IsAllowClient: true
      * </pre>
      *
      * Protobuf type {@code AvatarChangeCostumeReq}
@@ -471,7 +475,7 @@ public final class AvatarChangeCostumeReqOuterClass {
 
       private int costumeId_ ;
       /**
-       * <code>uint32 costume_id = 7;</code>
+       * <code>uint32 costume_id = 4;</code>
        * @return The costumeId.
        */
       @java.lang.Override
@@ -479,7 +483,7 @@ public final class AvatarChangeCostumeReqOuterClass {
         return costumeId_;
       }
       /**
-       * <code>uint32 costume_id = 7;</code>
+       * <code>uint32 costume_id = 4;</code>
        * @param value The costumeId to set.
        * @return This builder for chaining.
        */
@@ -490,7 +494,7 @@ public final class AvatarChangeCostumeReqOuterClass {
         return this;
       }
       /**
-       * <code>uint32 costume_id = 7;</code>
+       * <code>uint32 costume_id = 4;</code>
        * @return This builder for chaining.
        */
       public Builder clearCostumeId() {
@@ -502,7 +506,7 @@ public final class AvatarChangeCostumeReqOuterClass {
 
       private long avatarGuid_ ;
       /**
-       * <code>uint64 avatar_guid = 9;</code>
+       * <code>uint64 avatar_guid = 2;</code>
        * @return The avatarGuid.
        */
       @java.lang.Override
@@ -510,7 +514,7 @@ public final class AvatarChangeCostumeReqOuterClass {
         return avatarGuid_;
       }
       /**
-       * <code>uint64 avatar_guid = 9;</code>
+       * <code>uint64 avatar_guid = 2;</code>
        * @param value The avatarGuid to set.
        * @return This builder for chaining.
        */
@@ -521,7 +525,7 @@ public final class AvatarChangeCostumeReqOuterClass {
         return this;
       }
       /**
-       * <code>uint64 avatar_guid = 9;</code>
+       * <code>uint64 avatar_guid = 2;</code>
        * @return This builder for chaining.
        */
       public Builder clearAvatarGuid() {
@@ -598,8 +602,8 @@ public final class AvatarChangeCostumeReqOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\034AvatarChangeCostumeReq.proto\"A\n\026Avatar" +
-      "ChangeCostumeReq\022\022\n\ncostume_id\030\007 \001(\r\022\023\n\013" +
+      "ChangeCostumeReq\022\022\n\ncostume_id\030\004 \001(\r\022\023\n\013" +
-      "avatar_guid\030\t \001(\004B\033\n\031emu.grasscutter.net" +
+      "avatar_guid\030\002 \001(\004B\033\n\031emu.grasscutter.net" +
       ".protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor

src/generated/main/java/emu/grasscutter/net/proto/AvatarChangeCostumeRspOuterClass.java

@@ -18,6 +18,12 @@ public final class AvatarChangeCostumeRspOuterClass {
       // @@protoc_insertion_point(interface_extends:AvatarChangeCostumeRsp)
       com.google.protobuf.MessageOrBuilder {
 
+    /**
+     * <code>uint64 avatar_guid = 12;</code>
+     * @return The avatarGuid.
+     */
+    long getAvatarGuid();
+
     /**
      * <code>int32 retcode = 7;</code>
      * @return The retcode.
@@ -25,21 +31,17 @@ public final class AvatarChangeCostumeRspOuterClass {
     int getRetcode();
 
     /**
-     * <code>uint32 costume_id = 12;</code>
+     * <code>uint32 costume_id = 13;</code>
      * @return The costumeId.
      */
     int getCostumeId();
-
-    /**
-     * <code>uint64 avatar_guid = 3;</code>
-     * @return The avatarGuid.
-     */
-    long getAvatarGuid();
   }
   /**
    * <pre>
-   * Name: COGFNDJFHDJ
+   * CmdId: 1645
-   * CmdId: 1760
+   * EnetChannelId: 0
+   * EnetIsReliable: false
+   * IsAllowClient: true
    * </pre>
    *
    * Protobuf type {@code AvatarChangeCostumeRsp}
@@ -86,11 +88,6 @@ public final class AvatarChangeCostumeRspOuterClass {
             case 0:
               done = true;
               break;
-            case 24: {
-
-              avatarGuid_ = input.readUInt64();
-              break;
-            }
             case 56: {
 
               retcode_ = input.readInt32();
@@ -98,6 +95,11 @@ public final class AvatarChangeCostumeRspOuterClass {
             }
             case 96: {
 
+              avatarGuid_ = input.readUInt64();
+              break;
+            }
+            case 104: {
+
               costumeId_ = input.readUInt32();
               break;
             }
@@ -133,6 +135,17 @@ public final class AvatarChangeCostumeRspOuterClass {
               emu.grasscutter.net.proto.AvatarChangeCostumeRspOuterClass.AvatarChangeCostumeRsp.class, emu.grasscutter.net.proto.AvatarChangeCostumeRspOuterClass.AvatarChangeCostumeRsp.Builder.class);
     }
 
+    public static final int AVATAR_GUID_FIELD_NUMBER = 12;
+    private long avatarGuid_;
+    /**
+     * <code>uint64 avatar_guid = 12;</code>
+     * @return The avatarGuid.
+     */
+    @java.lang.Override
+    public long getAvatarGuid() {
+      return avatarGuid_;
+    }
+
     public static final int RETCODE_FIELD_NUMBER = 7;
     private int retcode_;
     /**
@@ -144,10 +157,10 @@ public final class AvatarChangeCostumeRspOuterClass {
       return retcode_;
     }
 
-    public static final int COSTUME_ID_FIELD_NUMBER = 12;
+    public static final int COSTUME_ID_FIELD_NUMBER = 13;
     private int costumeId_;
     /**
-     * <code>uint32 costume_id = 12;</code>
+     * <code>uint32 costume_id = 13;</code>
      * @return The costumeId.
      */
     @java.lang.Override
@@ -155,17 +168,6 @@ public final class AvatarChangeCostumeRspOuterClass {
       return costumeId_;
     }
 
-    public static final int AVATAR_GUID_FIELD_NUMBER = 3;
-    private long avatarGuid_;
-    /**
-     * <code>uint64 avatar_guid = 3;</code>
-     * @return The avatarGuid.
-     */
-    @java.lang.Override
-    public long getAvatarGuid() {
-      return avatarGuid_;
-    }
-
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -180,14 +182,14 @@ public final class AvatarChangeCostumeRspOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (avatarGuid_ != 0L) {
-        output.writeUInt64(3, avatarGuid_);
-      }
       if (retcode_ != 0) {
         output.writeInt32(7, retcode_);
       }
+      if (avatarGuid_ != 0L) {
+        output.writeUInt64(12, avatarGuid_);
+      }
       if (costumeId_ != 0) {
-        output.writeUInt32(12, costumeId_);
+        output.writeUInt32(13, costumeId_);
       }
       unknownFields.writeTo(output);
     }
@@ -198,17 +200,17 @@ public final class AvatarChangeCostumeRspOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (avatarGuid_ != 0L) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt64Size(3, avatarGuid_);
-      }
       if (retcode_ != 0) {
         size += com.google.protobuf.CodedOutputStream
           .computeInt32Size(7, retcode_);
       }
+      if (avatarGuid_ != 0L) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt64Size(12, avatarGuid_);
+      }
       if (costumeId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(12, costumeId_);
+          .computeUInt32Size(13, costumeId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -225,12 +227,12 @@ public final class AvatarChangeCostumeRspOuterClass {
       }
       emu.grasscutter.net.proto.AvatarChangeCostumeRspOuterClass.AvatarChangeCostumeRsp other = (emu.grasscutter.net.proto.AvatarChangeCostumeRspOuterClass.AvatarChangeCostumeRsp) obj;
 
+      if (getAvatarGuid()
+          != other.getAvatarGuid()) return false;
       if (getRetcode()
           != other.getRetcode()) return false;
       if (getCostumeId()
           != other.getCostumeId()) return false;
-      if (getAvatarGuid()
-          != other.getAvatarGuid()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -242,13 +244,13 @@ public final class AvatarChangeCostumeRspOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
+      hash = (37 * hash) + AVATAR_GUID_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+          getAvatarGuid());
       hash = (37 * hash) + RETCODE_FIELD_NUMBER;
       hash = (53 * hash) + getRetcode();
       hash = (37 * hash) + COSTUME_ID_FIELD_NUMBER;
       hash = (53 * hash) + getCostumeId();
-      hash = (37 * hash) + AVATAR_GUID_FIELD_NUMBER;
-      hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
-          getAvatarGuid());
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -346,8 +348,10 @@ public final class AvatarChangeCostumeRspOuterClass {
     }
     /**
      * <pre>
-     * Name: COGFNDJFHDJ
+     * CmdId: 1645
-     * CmdId: 1760
+     * EnetChannelId: 0
+     * EnetIsReliable: false
+     * IsAllowClient: true
      * </pre>
      *
      * Protobuf type {@code AvatarChangeCostumeRsp}
@@ -387,12 +391,12 @@ public final class AvatarChangeCostumeRspOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        avatarGuid_ = 0L;
+
         retcode_ = 0;
 
         costumeId_ = 0;
 
-        avatarGuid_ = 0L;
-
         return this;
       }
 
@@ -419,9 +423,9 @@ public final class AvatarChangeCostumeRspOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.AvatarChangeCostumeRspOuterClass.AvatarChangeCostumeRsp buildPartial() {
         emu.grasscutter.net.proto.AvatarChangeCostumeRspOuterClass.AvatarChangeCostumeRsp result = new emu.grasscutter.net.proto.AvatarChangeCostumeRspOuterClass.AvatarChangeCostumeRsp(this);
+        result.avatarGuid_ = avatarGuid_;
         result.retcode_ = retcode_;
         result.costumeId_ = costumeId_;
-        result.avatarGuid_ = avatarGuid_;
         onBuilt();
         return result;
       }
@@ -470,15 +474,15 @@ public final class AvatarChangeCostumeRspOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.AvatarChangeCostumeRspOuterClass.AvatarChangeCostumeRsp other) {
         if (other == emu.grasscutter.net.proto.AvatarChangeCostumeRspOuterClass.AvatarChangeCostumeRsp.getDefaultInstance()) return this;
+        if (other.getAvatarGuid() != 0L) {
+          setAvatarGuid(other.getAvatarGuid());
+        }
         if (other.getRetcode() != 0) {
           setRetcode(other.getRetcode());
         }
         if (other.getCostumeId() != 0) {
           setCostumeId(other.getCostumeId());
         }
-        if (other.getAvatarGuid() != 0L) {
-          setAvatarGuid(other.getAvatarGuid());
-        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -508,6 +512,37 @@ public final class AvatarChangeCostumeRspOuterClass {
         return this;
       }
 
+      private long avatarGuid_ ;
+      /**
+       * <code>uint64 avatar_guid = 12;</code>
+       * @return The avatarGuid.
+       */
+      @java.lang.Override
+      public long getAvatarGuid() {
+        return avatarGuid_;
+      }
+      /**
+       * <code>uint64 avatar_guid = 12;</code>
+       * @param value The avatarGuid to set.
+       * @return This builder for chaining.
+       */
+      public Builder setAvatarGuid(long value) {
+        
+        avatarGuid_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint64 avatar_guid = 12;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearAvatarGuid() {
+        
+        avatarGuid_ = 0L;
+        onChanged();
+        return this;
+      }
+
       private int retcode_ ;
       /**
        * <code>int32 retcode = 7;</code>
@@ -541,7 +576,7 @@ public final class AvatarChangeCostumeRspOuterClass {
 
       private int costumeId_ ;
       /**
-       * <code>uint32 costume_id = 12;</code>
+       * <code>uint32 costume_id = 13;</code>
        * @return The costumeId.
        */
       @java.lang.Override
@@ -549,7 +584,7 @@ public final class AvatarChangeCostumeRspOuterClass {
         return costumeId_;
       }
       /**
-       * <code>uint32 costume_id = 12;</code>
+       * <code>uint32 costume_id = 13;</code>
        * @param value The costumeId to set.
        * @return This builder for chaining.
        */
@@ -560,7 +595,7 @@ public final class AvatarChangeCostumeRspOuterClass {
         return this;
       }
       /**
-       * <code>uint32 costume_id = 12;</code>
+       * <code>uint32 costume_id = 13;</code>
        * @return This builder for chaining.
        */
       public Builder clearCostumeId() {
@@ -569,37 +604,6 @@ public final class AvatarChangeCostumeRspOuterClass {
         onChanged();
         return this;
       }
-
-      private long avatarGuid_ ;
-      /**
-       * <code>uint64 avatar_guid = 3;</code>
-       * @return The avatarGuid.
-       */
-      @java.lang.Override
-      public long getAvatarGuid() {
-        return avatarGuid_;
-      }
-      /**
-       * <code>uint64 avatar_guid = 3;</code>
-       * @param value The avatarGuid to set.
-       * @return This builder for chaining.
-       */
-      public Builder setAvatarGuid(long value) {
-        
-        avatarGuid_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint64 avatar_guid = 3;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearAvatarGuid() {
-        
-        avatarGuid_ = 0L;
-        onChanged();
-        return this;
-      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -668,8 +672,8 @@ public final class AvatarChangeCostumeRspOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\034AvatarChangeCostumeRsp.proto\"R\n\026Avatar" +
-      "ChangeCostumeRsp\022\017\n\007retcode\030\007 \001(\005\022\022\n\ncos" +
+      "ChangeCostumeRsp\022\023\n\013avatar_guid\030\014 \001(\004\022\017\n" +
-      "tume_id\030\014 \001(\r\022\023\n\013avatar_guid\030\003 \001(\004B\033\n\031em" +
+      "\007retcode\030\007 \001(\005\022\022\n\ncostume_id\030\r \001(\rB\033\n\031em" +
       "u.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -681,7 +685,7 @@ public final class AvatarChangeCostumeRspOuterClass {
     internal_static_AvatarChangeCostumeRsp_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_AvatarChangeCostumeRsp_descriptor,
-        new java.lang.String[] { "Retcode", "CostumeId", "AvatarGuid", });
+        new java.lang.String[] { "AvatarGuid", "Retcode", "CostumeId", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)

src/generated/main/java/emu/grasscutter/net/proto/AvatarChangeElementTypeReqOuterClass.java

@@ -19,21 +19,23 @@ public final class AvatarChangeElementTypeReqOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 area_id = 4;</code>
+     * <code>uint32 scene_id = 7;</code>
-     * @return The areaId.
-     */
-    int getAreaId();
-
-    /**
-     * <code>uint32 scene_id = 2;</code>
      * @return The sceneId.
      */
     int getSceneId();
+
+    /**
+     * <code>uint32 area_id = 3;</code>
+     * @return The areaId.
+     */
+    int getAreaId();
   }
   /**
    * <pre>
-   * Name: FKDDKBKAMBO
+   * CmdId: 1785
-   * CmdId: 1790
+   * EnetChannelId: 0
+   * EnetIsReliable: false
+   * IsAllowClient: true
    * </pre>
    *
    * Protobuf type {@code AvatarChangeElementTypeReq}
@@ -80,16 +82,16 @@ public final class AvatarChangeElementTypeReqOuterClass {
             case 0:
               done = true;
               break;
-            case 16: {
+            case 24: {
-
-              sceneId_ = input.readUInt32();
-              break;
-            }
-            case 32: {
 
               areaId_ = input.readUInt32();
               break;
             }
+            case 56: {
+
+              sceneId_ = input.readUInt32();
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -122,21 +124,10 @@ public final class AvatarChangeElementTypeReqOuterClass {
               emu.grasscutter.net.proto.AvatarChangeElementTypeReqOuterClass.AvatarChangeElementTypeReq.class, emu.grasscutter.net.proto.AvatarChangeElementTypeReqOuterClass.AvatarChangeElementTypeReq.Builder.class);
     }
 
-    public static final int AREA_ID_FIELD_NUMBER = 4;
+    public static final int SCENE_ID_FIELD_NUMBER = 7;
-    private int areaId_;
-    /**
-     * <code>uint32 area_id = 4;</code>
-     * @return The areaId.
-     */
-    @java.lang.Override
-    public int getAreaId() {
-      return areaId_;
-    }
-
-    public static final int SCENE_ID_FIELD_NUMBER = 2;
     private int sceneId_;
     /**
-     * <code>uint32 scene_id = 2;</code>
+     * <code>uint32 scene_id = 7;</code>
      * @return The sceneId.
      */
     @java.lang.Override
@@ -144,6 +135,17 @@ public final class AvatarChangeElementTypeReqOuterClass {
       return sceneId_;
     }
 
+    public static final int AREA_ID_FIELD_NUMBER = 3;
+    private int areaId_;
+    /**
+     * <code>uint32 area_id = 3;</code>
+     * @return The areaId.
+     */
+    @java.lang.Override
+    public int getAreaId() {
+      return areaId_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -158,11 +160,11 @@ public final class AvatarChangeElementTypeReqOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (sceneId_ != 0) {
-        output.writeUInt32(2, sceneId_);
-      }
       if (areaId_ != 0) {
-        output.writeUInt32(4, areaId_);
+        output.writeUInt32(3, areaId_);
+      }
+      if (sceneId_ != 0) {
+        output.writeUInt32(7, sceneId_);
       }
       unknownFields.writeTo(output);
     }
@@ -173,13 +175,13 @@ public final class AvatarChangeElementTypeReqOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (sceneId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(2, sceneId_);
-      }
       if (areaId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(4, areaId_);
+          .computeUInt32Size(3, areaId_);
+      }
+      if (sceneId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(7, sceneId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -196,10 +198,10 @@ public final class AvatarChangeElementTypeReqOuterClass {
       }
       emu.grasscutter.net.proto.AvatarChangeElementTypeReqOuterClass.AvatarChangeElementTypeReq other = (emu.grasscutter.net.proto.AvatarChangeElementTypeReqOuterClass.AvatarChangeElementTypeReq) obj;
 
-      if (getAreaId()
-          != other.getAreaId()) return false;
       if (getSceneId()
           != other.getSceneId()) return false;
+      if (getAreaId()
+          != other.getAreaId()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -211,10 +213,10 @@ public final class AvatarChangeElementTypeReqOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + AREA_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getAreaId();
       hash = (37 * hash) + SCENE_ID_FIELD_NUMBER;
       hash = (53 * hash) + getSceneId();
+      hash = (37 * hash) + AREA_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getAreaId();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -312,8 +314,10 @@ public final class AvatarChangeElementTypeReqOuterClass {
     }
     /**
      * <pre>
-     * Name: FKDDKBKAMBO
+     * CmdId: 1785
-     * CmdId: 1790
+     * EnetChannelId: 0
+     * EnetIsReliable: false
+     * IsAllowClient: true
      * </pre>
      *
      * Protobuf type {@code AvatarChangeElementTypeReq}
@@ -353,10 +357,10 @@ public final class AvatarChangeElementTypeReqOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        areaId_ = 0;
-
         sceneId_ = 0;
 
+        areaId_ = 0;
+
         return this;
       }
 
@@ -383,8 +387,8 @@ public final class AvatarChangeElementTypeReqOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.AvatarChangeElementTypeReqOuterClass.AvatarChangeElementTypeReq buildPartial() {
         emu.grasscutter.net.proto.AvatarChangeElementTypeReqOuterClass.AvatarChangeElementTypeReq result = new emu.grasscutter.net.proto.AvatarChangeElementTypeReqOuterClass.AvatarChangeElementTypeReq(this);
-        result.areaId_ = areaId_;
         result.sceneId_ = sceneId_;
+        result.areaId_ = areaId_;
         onBuilt();
         return result;
       }
@@ -433,12 +437,12 @@ public final class AvatarChangeElementTypeReqOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.AvatarChangeElementTypeReqOuterClass.AvatarChangeElementTypeReq other) {
         if (other == emu.grasscutter.net.proto.AvatarChangeElementTypeReqOuterClass.AvatarChangeElementTypeReq.getDefaultInstance()) return this;
-        if (other.getAreaId() != 0) {
-          setAreaId(other.getAreaId());
-        }
         if (other.getSceneId() != 0) {
           setSceneId(other.getSceneId());
         }
+        if (other.getAreaId() != 0) {
+          setAreaId(other.getAreaId());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -468,40 +472,9 @@ public final class AvatarChangeElementTypeReqOuterClass {
         return this;
       }
 
-      private int areaId_ ;
-      /**
-       * <code>uint32 area_id = 4;</code>
-       * @return The areaId.
-       */
-      @java.lang.Override
-      public int getAreaId() {
-        return areaId_;
-      }
-      /**
-       * <code>uint32 area_id = 4;</code>
-       * @param value The areaId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setAreaId(int value) {
-        
-        areaId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 area_id = 4;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearAreaId() {
-        
-        areaId_ = 0;
-        onChanged();
-        return this;
-      }
-
       private int sceneId_ ;
       /**
-       * <code>uint32 scene_id = 2;</code>
+       * <code>uint32 scene_id = 7;</code>
        * @return The sceneId.
        */
       @java.lang.Override
@@ -509,7 +482,7 @@ public final class AvatarChangeElementTypeReqOuterClass {
         return sceneId_;
       }
       /**
-       * <code>uint32 scene_id = 2;</code>
+       * <code>uint32 scene_id = 7;</code>
        * @param value The sceneId to set.
        * @return This builder for chaining.
        */
@@ -520,7 +493,7 @@ public final class AvatarChangeElementTypeReqOuterClass {
         return this;
       }
       /**
-       * <code>uint32 scene_id = 2;</code>
+       * <code>uint32 scene_id = 7;</code>
        * @return This builder for chaining.
        */
       public Builder clearSceneId() {
@@ -529,6 +502,37 @@ public final class AvatarChangeElementTypeReqOuterClass {
         onChanged();
         return this;
       }
+
+      private int areaId_ ;
+      /**
+       * <code>uint32 area_id = 3;</code>
+       * @return The areaId.
+       */
+      @java.lang.Override
+      public int getAreaId() {
+        return areaId_;
+      }
+      /**
+       * <code>uint32 area_id = 3;</code>
+       * @param value The areaId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setAreaId(int value) {
+        
+        areaId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 area_id = 3;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearAreaId() {
+        
+        areaId_ = 0;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -597,8 +601,8 @@ public final class AvatarChangeElementTypeReqOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n AvatarChangeElementTypeReq.proto\"?\n\032Av" +
-      "atarChangeElementTypeReq\022\017\n\007area_id\030\004 \001(" +
+      "atarChangeElementTypeReq\022\020\n\010scene_id\030\007 \001" +
-      "\r\022\020\n\010scene_id\030\002 \001(\rB\033\n\031emu.grasscutter.n" +
+      "(\r\022\017\n\007area_id\030\003 \001(\rB\033\n\031emu.grasscutter.n" +
       "et.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -610,7 +614,7 @@ public final class AvatarChangeElementTypeReqOuterClass {
     internal_static_AvatarChangeElementTypeReq_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_AvatarChangeElementTypeReq_descriptor,
-        new java.lang.String[] { "AreaId", "SceneId", });
+        new java.lang.String[] { "SceneId", "AreaId", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)

src/generated/main/java/emu/grasscutter/net/proto/AvatarChangeElementTypeRspOuterClass.java

@@ -19,15 +19,17 @@ public final class AvatarChangeElementTypeRspOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>int32 retcode = 2;</code>
+     * <code>int32 retcode = 13;</code>
      * @return The retcode.
      */
     int getRetcode();
   }
   /**
    * <pre>
-   * Name: FNDGELJGDBB
+   * CmdId: 1651
-   * CmdId: 1781
+   * EnetChannelId: 0
+   * EnetIsReliable: false
+   * IsAllowClient: true
    * </pre>
    *
    * Protobuf type {@code AvatarChangeElementTypeRsp}
@@ -74,7 +76,7 @@ public final class AvatarChangeElementTypeRspOuterClass {
             case 0:
               done = true;
               break;
-            case 16: {
+            case 104: {
 
               retcode_ = input.readInt32();
               break;
@@ -111,10 +113,10 @@ public final class AvatarChangeElementTypeRspOuterClass {
               emu.grasscutter.net.proto.AvatarChangeElementTypeRspOuterClass.AvatarChangeElementTypeRsp.class, emu.grasscutter.net.proto.AvatarChangeElementTypeRspOuterClass.AvatarChangeElementTypeRsp.Builder.class);
     }
 
-    public static final int RETCODE_FIELD_NUMBER = 2;
+    public static final int RETCODE_FIELD_NUMBER = 13;
     private int retcode_;
     /**
-     * <code>int32 retcode = 2;</code>
+     * <code>int32 retcode = 13;</code>
      * @return The retcode.
      */
     @java.lang.Override
@@ -137,7 +139,7 @@ public final class AvatarChangeElementTypeRspOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (retcode_ != 0) {
-        output.writeInt32(2, retcode_);
+        output.writeInt32(13, retcode_);
       }
       unknownFields.writeTo(output);
     }
@@ -150,7 +152,7 @@ public final class AvatarChangeElementTypeRspOuterClass {
       size = 0;
       if (retcode_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(2, retcode_);
+          .computeInt32Size(13, retcode_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -279,8 +281,10 @@ public final class AvatarChangeElementTypeRspOuterClass {
     }
     /**
      * <pre>
-     * Name: FNDGELJGDBB
+     * CmdId: 1651
-     * CmdId: 1781
+     * EnetChannelId: 0
+     * EnetIsReliable: false
+     * IsAllowClient: true
      * </pre>
      *
      * Protobuf type {@code AvatarChangeElementTypeRsp}
@@ -431,7 +435,7 @@ public final class AvatarChangeElementTypeRspOuterClass {
 
       private int retcode_ ;
       /**
-       * <code>int32 retcode = 2;</code>
+       * <code>int32 retcode = 13;</code>
        * @return The retcode.
        */
       @java.lang.Override
@@ -439,7 +443,7 @@ public final class AvatarChangeElementTypeRspOuterClass {
         return retcode_;
       }
       /**
-       * <code>int32 retcode = 2;</code>
+       * <code>int32 retcode = 13;</code>
        * @param value The retcode to set.
        * @return This builder for chaining.
        */
@@ -450,7 +454,7 @@ public final class AvatarChangeElementTypeRspOuterClass {
         return this;
       }
       /**
-       * <code>int32 retcode = 2;</code>
+       * <code>int32 retcode = 13;</code>
        * @return This builder for chaining.
        */
       public Builder clearRetcode() {
@@ -527,7 +531,7 @@ public final class AvatarChangeElementTypeRspOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n AvatarChangeElementTypeRsp.proto\"-\n\032Av" +
-      "atarChangeElementTypeRsp\022\017\n\007retcode\030\002 \001(" +
+      "atarChangeElementTypeRsp\022\017\n\007retcode\030\r \001(" +
       "\005B\033\n\031emu.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor

src/generated/main/java/emu/grasscutter/net/proto/AvatarDieAnimationEndReqOuterClass.java

@@ -19,36 +19,38 @@ public final class AvatarDieAnimationEndReqOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 skill_id = 13;</code>
+     * <code>.Vector reborn_pos = 3;</code>
-     * @return The skillId.
+     * @return Whether the rebornPos field is set.
      */
-    int getSkillId();
+    boolean hasRebornPos();
+    /**
+     * <code>.Vector reborn_pos = 3;</code>
+     * @return The rebornPos.
+     */
+    emu.grasscutter.net.proto.VectorOuterClass.Vector getRebornPos();
+    /**
+     * <code>.Vector reborn_pos = 3;</code>
+     */
+    emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getRebornPosOrBuilder();
 
     /**
-     * <code>uint64 die_guid = 15;</code>
+     * <code>uint64 die_guid = 7;</code>
      * @return The dieGuid.
      */
     long getDieGuid();
 
     /**
-     * <code>.Vector reborn_pos = 2;</code>
+     * <code>uint32 skill_id = 8;</code>
-     * @return Whether the rebornPos field is set.
+     * @return The skillId.
      */
-    boolean hasRebornPos();
+    int getSkillId();
-    /**
-     * <code>.Vector reborn_pos = 2;</code>
-     * @return The rebornPos.
-     */
-    emu.grasscutter.net.proto.VectorOuterClass.Vector getRebornPos();
-    /**
-     * <code>.Vector reborn_pos = 2;</code>
-     */
-    emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getRebornPosOrBuilder();
   }
   /**
    * <pre>
-   * Name: NJJDCGNJHKF
+   * CmdId: 1610
-   * CmdId: 1665
+   * EnetChannelId: 0
+   * EnetIsReliable: false
+   * IsAllowClient: true
    * </pre>
    *
    * Protobuf type {@code AvatarDieAnimationEndReq}
@@ -95,7 +97,7 @@ public final class AvatarDieAnimationEndReqOuterClass {
             case 0:
               done = true;
               break;
-            case 18: {
+            case 26: {
               emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder subBuilder = null;
               if (rebornPos_ != null) {
                 subBuilder = rebornPos_.toBuilder();
@@ -108,16 +110,16 @@ public final class AvatarDieAnimationEndReqOuterClass {
 
               break;
             }
-            case 104: {
+            case 56: {
-
-              skillId_ = input.readUInt32();
-              break;
-            }
-            case 120: {
 
               dieGuid_ = input.readUInt64();
               break;
             }
+            case 64: {
+
+              skillId_ = input.readUInt32();
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -150,32 +152,10 @@ public final class AvatarDieAnimationEndReqOuterClass {
               emu.grasscutter.net.proto.AvatarDieAnimationEndReqOuterClass.AvatarDieAnimationEndReq.class, emu.grasscutter.net.proto.AvatarDieAnimationEndReqOuterClass.AvatarDieAnimationEndReq.Builder.class);
     }
 
-    public static final int SKILL_ID_FIELD_NUMBER = 13;
+    public static final int REBORN_POS_FIELD_NUMBER = 3;
-    private int skillId_;
-    /**
-     * <code>uint32 skill_id = 13;</code>
-     * @return The skillId.
-     */
-    @java.lang.Override
-    public int getSkillId() {
-      return skillId_;
-    }
-
-    public static final int DIE_GUID_FIELD_NUMBER = 15;
-    private long dieGuid_;
-    /**
-     * <code>uint64 die_guid = 15;</code>
-     * @return The dieGuid.
-     */
-    @java.lang.Override
-    public long getDieGuid() {
-      return dieGuid_;
-    }
-
-    public static final int REBORN_POS_FIELD_NUMBER = 2;
     private emu.grasscutter.net.proto.VectorOuterClass.Vector rebornPos_;
     /**
-     * <code>.Vector reborn_pos = 2;</code>
+     * <code>.Vector reborn_pos = 3;</code>
      * @return Whether the rebornPos field is set.
      */
     @java.lang.Override
@@ -183,7 +163,7 @@ public final class AvatarDieAnimationEndReqOuterClass {
       return rebornPos_ != null;
     }
     /**
-     * <code>.Vector reborn_pos = 2;</code>
+     * <code>.Vector reborn_pos = 3;</code>
      * @return The rebornPos.
      */
     @java.lang.Override
@@ -191,13 +171,35 @@ public final class AvatarDieAnimationEndReqOuterClass {
       return rebornPos_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : rebornPos_;
     }
     /**
-     * <code>.Vector reborn_pos = 2;</code>
+     * <code>.Vector reborn_pos = 3;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getRebornPosOrBuilder() {
       return getRebornPos();
     }
 
+    public static final int DIE_GUID_FIELD_NUMBER = 7;
+    private long dieGuid_;
+    /**
+     * <code>uint64 die_guid = 7;</code>
+     * @return The dieGuid.
+     */
+    @java.lang.Override
+    public long getDieGuid() {
+      return dieGuid_;
+    }
+
+    public static final int SKILL_ID_FIELD_NUMBER = 8;
+    private int skillId_;
+    /**
+     * <code>uint32 skill_id = 8;</code>
+     * @return The skillId.
+     */
+    @java.lang.Override
+    public int getSkillId() {
+      return skillId_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -213,13 +215,13 @@ public final class AvatarDieAnimationEndReqOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (rebornPos_ != null) {
-        output.writeMessage(2, getRebornPos());
+        output.writeMessage(3, getRebornPos());
-      }
-      if (skillId_ != 0) {
-        output.writeUInt32(13, skillId_);
       }
       if (dieGuid_ != 0L) {
-        output.writeUInt64(15, dieGuid_);
+        output.writeUInt64(7, dieGuid_);
+      }
+      if (skillId_ != 0) {
+        output.writeUInt32(8, skillId_);
       }
       unknownFields.writeTo(output);
     }
@@ -232,15 +234,15 @@ public final class AvatarDieAnimationEndReqOuterClass {
       size = 0;
       if (rebornPos_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(2, getRebornPos());
+          .computeMessageSize(3, getRebornPos());
-      }
-      if (skillId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(13, skillId_);
       }
       if (dieGuid_ != 0L) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt64Size(15, dieGuid_);
+          .computeUInt64Size(7, dieGuid_);
+      }
+      if (skillId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(8, skillId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -257,15 +259,15 @@ public final class AvatarDieAnimationEndReqOuterClass {
       }
       emu.grasscutter.net.proto.AvatarDieAnimationEndReqOuterClass.AvatarDieAnimationEndReq other = (emu.grasscutter.net.proto.AvatarDieAnimationEndReqOuterClass.AvatarDieAnimationEndReq) obj;
 
-      if (getSkillId()
-          != other.getSkillId()) return false;
-      if (getDieGuid()
-          != other.getDieGuid()) return false;
       if (hasRebornPos() != other.hasRebornPos()) return false;
       if (hasRebornPos()) {
         if (!getRebornPos()
             .equals(other.getRebornPos())) return false;
       }
+      if (getDieGuid()
+          != other.getDieGuid()) return false;
+      if (getSkillId()
+          != other.getSkillId()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -277,15 +279,15 @@ public final class AvatarDieAnimationEndReqOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + SKILL_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getSkillId();
-      hash = (37 * hash) + DIE_GUID_FIELD_NUMBER;
-      hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
-          getDieGuid());
       if (hasRebornPos()) {
         hash = (37 * hash) + REBORN_POS_FIELD_NUMBER;
         hash = (53 * hash) + getRebornPos().hashCode();
       }
+      hash = (37 * hash) + DIE_GUID_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+          getDieGuid());
+      hash = (37 * hash) + SKILL_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getSkillId();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -383,8 +385,10 @@ public final class AvatarDieAnimationEndReqOuterClass {
     }
     /**
      * <pre>
-     * Name: NJJDCGNJHKF
+     * CmdId: 1610
-     * CmdId: 1665
+     * EnetChannelId: 0
+     * EnetIsReliable: false
+     * IsAllowClient: true
      * </pre>
      *
      * Protobuf type {@code AvatarDieAnimationEndReq}
@@ -424,16 +428,16 @@ public final class AvatarDieAnimationEndReqOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        skillId_ = 0;
-
-        dieGuid_ = 0L;
-
         if (rebornPosBuilder_ == null) {
           rebornPos_ = null;
         } else {
           rebornPos_ = null;
           rebornPosBuilder_ = null;
         }
+        dieGuid_ = 0L;
+
+        skillId_ = 0;
+
         return this;
       }
 
@@ -460,13 +464,13 @@ public final class AvatarDieAnimationEndReqOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.AvatarDieAnimationEndReqOuterClass.AvatarDieAnimationEndReq buildPartial() {
         emu.grasscutter.net.proto.AvatarDieAnimationEndReqOuterClass.AvatarDieAnimationEndReq result = new emu.grasscutter.net.proto.AvatarDieAnimationEndReqOuterClass.AvatarDieAnimationEndReq(this);
-        result.skillId_ = skillId_;
-        result.dieGuid_ = dieGuid_;
         if (rebornPosBuilder_ == null) {
           result.rebornPos_ = rebornPos_;
         } else {
           result.rebornPos_ = rebornPosBuilder_.build();
         }
+        result.dieGuid_ = dieGuid_;
+        result.skillId_ = skillId_;
         onBuilt();
         return result;
       }
@@ -515,14 +519,14 @@ public final class AvatarDieAnimationEndReqOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.AvatarDieAnimationEndReqOuterClass.AvatarDieAnimationEndReq other) {
         if (other == emu.grasscutter.net.proto.AvatarDieAnimationEndReqOuterClass.AvatarDieAnimationEndReq.getDefaultInstance()) return this;
-        if (other.getSkillId() != 0) {
+        if (other.hasRebornPos()) {
-          setSkillId(other.getSkillId());
+          mergeRebornPos(other.getRebornPos());
         }
         if (other.getDieGuid() != 0L) {
           setDieGuid(other.getDieGuid());
         }
-        if (other.hasRebornPos()) {
+        if (other.getSkillId() != 0) {
-          mergeRebornPos(other.getRebornPos());
+          setSkillId(other.getSkillId());
         }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
@@ -553,80 +557,18 @@ public final class AvatarDieAnimationEndReqOuterClass {
         return this;
       }
 
-      private int skillId_ ;
-      /**
-       * <code>uint32 skill_id = 13;</code>
-       * @return The skillId.
-       */
-      @java.lang.Override
-      public int getSkillId() {
-        return skillId_;
-      }
-      /**
-       * <code>uint32 skill_id = 13;</code>
-       * @param value The skillId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setSkillId(int value) {
-        
-        skillId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 skill_id = 13;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearSkillId() {
-        
-        skillId_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private long dieGuid_ ;
-      /**
-       * <code>uint64 die_guid = 15;</code>
-       * @return The dieGuid.
-       */
-      @java.lang.Override
-      public long getDieGuid() {
-        return dieGuid_;
-      }
-      /**
-       * <code>uint64 die_guid = 15;</code>
-       * @param value The dieGuid to set.
-       * @return This builder for chaining.
-       */
-      public Builder setDieGuid(long value) {
-        
-        dieGuid_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint64 die_guid = 15;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearDieGuid() {
-        
-        dieGuid_ = 0L;
-        onChanged();
-        return this;
-      }
-
       private emu.grasscutter.net.proto.VectorOuterClass.Vector rebornPos_;
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> rebornPosBuilder_;
       /**
-       * <code>.Vector reborn_pos = 2;</code>
+       * <code>.Vector reborn_pos = 3;</code>
        * @return Whether the rebornPos field is set.
        */
       public boolean hasRebornPos() {
         return rebornPosBuilder_ != null || rebornPos_ != null;
       }
       /**
-       * <code>.Vector reborn_pos = 2;</code>
+       * <code>.Vector reborn_pos = 3;</code>
        * @return The rebornPos.
        */
       public emu.grasscutter.net.proto.VectorOuterClass.Vector getRebornPos() {
@@ -637,7 +579,7 @@ public final class AvatarDieAnimationEndReqOuterClass {
         }
       }
       /**
-       * <code>.Vector reborn_pos = 2;</code>
+       * <code>.Vector reborn_pos = 3;</code>
        */
       public Builder setRebornPos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
         if (rebornPosBuilder_ == null) {
@@ -653,7 +595,7 @@ public final class AvatarDieAnimationEndReqOuterClass {
         return this;
       }
       /**
-       * <code>.Vector reborn_pos = 2;</code>
+       * <code>.Vector reborn_pos = 3;</code>
        */
       public Builder setRebornPos(
           emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) {
@@ -667,7 +609,7 @@ public final class AvatarDieAnimationEndReqOuterClass {
         return this;
       }
       /**
-       * <code>.Vector reborn_pos = 2;</code>
+       * <code>.Vector reborn_pos = 3;</code>
        */
       public Builder mergeRebornPos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
         if (rebornPosBuilder_ == null) {
@@ -685,7 +627,7 @@ public final class AvatarDieAnimationEndReqOuterClass {
         return this;
       }
       /**
-       * <code>.Vector reborn_pos = 2;</code>
+       * <code>.Vector reborn_pos = 3;</code>
        */
       public Builder clearRebornPos() {
         if (rebornPosBuilder_ == null) {
@@ -699,7 +641,7 @@ public final class AvatarDieAnimationEndReqOuterClass {
         return this;
       }
       /**
-       * <code>.Vector reborn_pos = 2;</code>
+       * <code>.Vector reborn_pos = 3;</code>
        */
       public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getRebornPosBuilder() {
         
@@ -707,7 +649,7 @@ public final class AvatarDieAnimationEndReqOuterClass {
         return getRebornPosFieldBuilder().getBuilder();
       }
       /**
-       * <code>.Vector reborn_pos = 2;</code>
+       * <code>.Vector reborn_pos = 3;</code>
        */
       public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getRebornPosOrBuilder() {
         if (rebornPosBuilder_ != null) {
@@ -718,7 +660,7 @@ public final class AvatarDieAnimationEndReqOuterClass {
         }
       }
       /**
-       * <code>.Vector reborn_pos = 2;</code>
+       * <code>.Vector reborn_pos = 3;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> 
@@ -733,6 +675,68 @@ public final class AvatarDieAnimationEndReqOuterClass {
         }
         return rebornPosBuilder_;
       }
+
+      private long dieGuid_ ;
+      /**
+       * <code>uint64 die_guid = 7;</code>
+       * @return The dieGuid.
+       */
+      @java.lang.Override
+      public long getDieGuid() {
+        return dieGuid_;
+      }
+      /**
+       * <code>uint64 die_guid = 7;</code>
+       * @param value The dieGuid to set.
+       * @return This builder for chaining.
+       */
+      public Builder setDieGuid(long value) {
+        
+        dieGuid_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint64 die_guid = 7;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearDieGuid() {
+        
+        dieGuid_ = 0L;
+        onChanged();
+        return this;
+      }
+
+      private int skillId_ ;
+      /**
+       * <code>uint32 skill_id = 8;</code>
+       * @return The skillId.
+       */
+      @java.lang.Override
+      public int getSkillId() {
+        return skillId_;
+      }
+      /**
+       * <code>uint32 skill_id = 8;</code>
+       * @param value The skillId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setSkillId(int value) {
+        
+        skillId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 skill_id = 8;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearSkillId() {
+        
+        skillId_ = 0;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -801,9 +805,9 @@ public final class AvatarDieAnimationEndReqOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\036AvatarDieAnimationEndReq.proto\032\014Vector" +
-      ".proto\"[\n\030AvatarDieAnimationEndReq\022\020\n\010sk" +
+      ".proto\"[\n\030AvatarDieAnimationEndReq\022\033\n\nre" +
-      "ill_id\030\r \001(\r\022\020\n\010die_guid\030\017 \001(\004\022\033\n\nreborn" +
+      "born_pos\030\003 \001(\0132\007.Vector\022\020\n\010die_guid\030\007 \001(" +
-      "_pos\030\002 \001(\0132\007.VectorB\033\n\031emu.grasscutter.n" +
+      "\004\022\020\n\010skill_id\030\010 \001(\rB\033\n\031emu.grasscutter.n" +
       "et.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -816,7 +820,7 @@ public final class AvatarDieAnimationEndReqOuterClass {
     internal_static_AvatarDieAnimationEndReq_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_AvatarDieAnimationEndReq_descriptor,
-        new java.lang.String[] { "SkillId", "DieGuid", "RebornPos", });
+        new java.lang.String[] { "RebornPos", "DieGuid", "SkillId", });
     emu.grasscutter.net.proto.VectorOuterClass.getDescriptor();
   }
 

src/generated/main/java/emu/grasscutter/net/proto/AvatarDieAnimationEndRspOuterClass.java

@@ -19,27 +19,29 @@ public final class AvatarDieAnimationEndRspOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint64 die_guid = 12;</code>
+     * <code>uint32 skill_id = 13;</code>
-     * @return The dieGuid.
+     * @return The skillId.
      */
-    long getDieGuid();
+    int getSkillId();
 
     /**
-     * <code>int32 retcode = 9;</code>
+     * <code>int32 retcode = 14;</code>
      * @return The retcode.
      */
     int getRetcode();
 
     /**
-     * <code>uint32 skill_id = 7;</code>
+     * <code>uint64 die_guid = 15;</code>
-     * @return The skillId.
+     * @return The dieGuid.
      */
-    int getSkillId();
+    long getDieGuid();
   }
   /**
    * <pre>
-   * Name: FDNGCDLNAFN
+   * CmdId: 1694
-   * CmdId: 1795
+   * EnetChannelId: 0
+   * EnetIsReliable: false
+   * IsAllowClient: true
    * </pre>
    *
    * Protobuf type {@code AvatarDieAnimationEndRsp}
@@ -86,17 +88,17 @@ public final class AvatarDieAnimationEndRspOuterClass {
             case 0:
               done = true;
               break;
-            case 56: {
+            case 104: {
 
               skillId_ = input.readUInt32();
               break;
             }
-            case 72: {
+            case 112: {
 
               retcode_ = input.readInt32();
               break;
             }
-            case 96: {
+            case 120: {
 
               dieGuid_ = input.readUInt64();
               break;
@@ -133,21 +135,21 @@ public final class AvatarDieAnimationEndRspOuterClass {
               emu.grasscutter.net.proto.AvatarDieAnimationEndRspOuterClass.AvatarDieAnimationEndRsp.class, emu.grasscutter.net.proto.AvatarDieAnimationEndRspOuterClass.AvatarDieAnimationEndRsp.Builder.class);
     }
 
-    public static final int DIE_GUID_FIELD_NUMBER = 12;
+    public static final int SKILL_ID_FIELD_NUMBER = 13;
-    private long dieGuid_;
+    private int skillId_;
     /**
-     * <code>uint64 die_guid = 12;</code>
+     * <code>uint32 skill_id = 13;</code>
-     * @return The dieGuid.
+     * @return The skillId.
      */
     @java.lang.Override
-    public long getDieGuid() {
+    public int getSkillId() {
-      return dieGuid_;
+      return skillId_;
     }
 
-    public static final int RETCODE_FIELD_NUMBER = 9;
+    public static final int RETCODE_FIELD_NUMBER = 14;
     private int retcode_;
     /**
-     * <code>int32 retcode = 9;</code>
+     * <code>int32 retcode = 14;</code>
      * @return The retcode.
      */
     @java.lang.Override
@@ -155,15 +157,15 @@ public final class AvatarDieAnimationEndRspOuterClass {
       return retcode_;
     }
 
-    public static final int SKILL_ID_FIELD_NUMBER = 7;
+    public static final int DIE_GUID_FIELD_NUMBER = 15;
-    private int skillId_;
+    private long dieGuid_;
     /**
-     * <code>uint32 skill_id = 7;</code>
+     * <code>uint64 die_guid = 15;</code>
-     * @return The skillId.
+     * @return The dieGuid.
      */
     @java.lang.Override
-    public int getSkillId() {
+    public long getDieGuid() {
-      return skillId_;
+      return dieGuid_;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -181,13 +183,13 @@ public final class AvatarDieAnimationEndRspOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (skillId_ != 0) {
-        output.writeUInt32(7, skillId_);
+        output.writeUInt32(13, skillId_);
       }
       if (retcode_ != 0) {
-        output.writeInt32(9, retcode_);
+        output.writeInt32(14, retcode_);
       }
       if (dieGuid_ != 0L) {
-        output.writeUInt64(12, dieGuid_);
+        output.writeUInt64(15, dieGuid_);
       }
       unknownFields.writeTo(output);
     }
@@ -200,15 +202,15 @@ public final class AvatarDieAnimationEndRspOuterClass {
       size = 0;
       if (skillId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(7, skillId_);
+          .computeUInt32Size(13, skillId_);
       }
       if (retcode_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(9, retcode_);
+          .computeInt32Size(14, retcode_);
       }
       if (dieGuid_ != 0L) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt64Size(12, dieGuid_);
+          .computeUInt64Size(15, dieGuid_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -225,12 +227,12 @@ public final class AvatarDieAnimationEndRspOuterClass {
       }
       emu.grasscutter.net.proto.AvatarDieAnimationEndRspOuterClass.AvatarDieAnimationEndRsp other = (emu.grasscutter.net.proto.AvatarDieAnimationEndRspOuterClass.AvatarDieAnimationEndRsp) obj;
 
-      if (getDieGuid()
-          != other.getDieGuid()) return false;
-      if (getRetcode()
-          != other.getRetcode()) return false;
       if (getSkillId()
           != other.getSkillId()) return false;
+      if (getRetcode()
+          != other.getRetcode()) return false;
+      if (getDieGuid()
+          != other.getDieGuid()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -242,13 +244,13 @@ public final class AvatarDieAnimationEndRspOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
+      hash = (37 * hash) + SKILL_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getSkillId();
+      hash = (37 * hash) + RETCODE_FIELD_NUMBER;
+      hash = (53 * hash) + getRetcode();
       hash = (37 * hash) + DIE_GUID_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
           getDieGuid());
-      hash = (37 * hash) + RETCODE_FIELD_NUMBER;
-      hash = (53 * hash) + getRetcode();
-      hash = (37 * hash) + SKILL_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getSkillId();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -346,8 +348,10 @@ public final class AvatarDieAnimationEndRspOuterClass {
     }
     /**
      * <pre>
-     * Name: FDNGCDLNAFN
+     * CmdId: 1694
-     * CmdId: 1795
+     * EnetChannelId: 0
+     * EnetIsReliable: false
+     * IsAllowClient: true
      * </pre>
      *
      * Protobuf type {@code AvatarDieAnimationEndRsp}
@@ -387,11 +391,11 @@ public final class AvatarDieAnimationEndRspOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        dieGuid_ = 0L;
+        skillId_ = 0;
 
         retcode_ = 0;
 
-        skillId_ = 0;
+        dieGuid_ = 0L;
 
         return this;
       }
@@ -419,9 +423,9 @@ public final class AvatarDieAnimationEndRspOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.AvatarDieAnimationEndRspOuterClass.AvatarDieAnimationEndRsp buildPartial() {
         emu.grasscutter.net.proto.AvatarDieAnimationEndRspOuterClass.AvatarDieAnimationEndRsp result = new emu.grasscutter.net.proto.AvatarDieAnimationEndRspOuterClass.AvatarDieAnimationEndRsp(this);
-        result.dieGuid_ = dieGuid_;
-        result.retcode_ = retcode_;
         result.skillId_ = skillId_;
+        result.retcode_ = retcode_;
+        result.dieGuid_ = dieGuid_;
         onBuilt();
         return result;
       }
@@ -470,14 +474,14 @@ public final class AvatarDieAnimationEndRspOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.AvatarDieAnimationEndRspOuterClass.AvatarDieAnimationEndRsp other) {
         if (other == emu.grasscutter.net.proto.AvatarDieAnimationEndRspOuterClass.AvatarDieAnimationEndRsp.getDefaultInstance()) return this;
-        if (other.getDieGuid() != 0L) {
+        if (other.getSkillId() != 0) {
-          setDieGuid(other.getDieGuid());
+          setSkillId(other.getSkillId());
         }
         if (other.getRetcode() != 0) {
           setRetcode(other.getRetcode());
         }
-        if (other.getSkillId() != 0) {
+        if (other.getDieGuid() != 0L) {
-          setSkillId(other.getSkillId());
+          setDieGuid(other.getDieGuid());
         }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
@@ -508,71 +512,9 @@ public final class AvatarDieAnimationEndRspOuterClass {
         return this;
       }
 
-      private long dieGuid_ ;
-      /**
-       * <code>uint64 die_guid = 12;</code>
-       * @return The dieGuid.
-       */
-      @java.lang.Override
-      public long getDieGuid() {
-        return dieGuid_;
-      }
-      /**
-       * <code>uint64 die_guid = 12;</code>
-       * @param value The dieGuid to set.
-       * @return This builder for chaining.
-       */
-      public Builder setDieGuid(long value) {
-        
-        dieGuid_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint64 die_guid = 12;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearDieGuid() {
-        
-        dieGuid_ = 0L;
-        onChanged();
-        return this;
-      }
-
-      private int retcode_ ;
-      /**
-       * <code>int32 retcode = 9;</code>
-       * @return The retcode.
-       */
-      @java.lang.Override
-      public int getRetcode() {
-        return retcode_;
-      }
-      /**
-       * <code>int32 retcode = 9;</code>
-       * @param value The retcode to set.
-       * @return This builder for chaining.
-       */
-      public Builder setRetcode(int value) {
-        
-        retcode_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>int32 retcode = 9;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearRetcode() {
-        
-        retcode_ = 0;
-        onChanged();
-        return this;
-      }
-
       private int skillId_ ;
       /**
-       * <code>uint32 skill_id = 7;</code>
+       * <code>uint32 skill_id = 13;</code>
        * @return The skillId.
        */
       @java.lang.Override
@@ -580,7 +522,7 @@ public final class AvatarDieAnimationEndRspOuterClass {
         return skillId_;
       }
       /**
-       * <code>uint32 skill_id = 7;</code>
+       * <code>uint32 skill_id = 13;</code>
        * @param value The skillId to set.
        * @return This builder for chaining.
        */
@@ -591,7 +533,7 @@ public final class AvatarDieAnimationEndRspOuterClass {
         return this;
       }
       /**
-       * <code>uint32 skill_id = 7;</code>
+       * <code>uint32 skill_id = 13;</code>
        * @return This builder for chaining.
        */
       public Builder clearSkillId() {
@@ -600,6 +542,68 @@ public final class AvatarDieAnimationEndRspOuterClass {
         onChanged();
         return this;
       }
+
+      private int retcode_ ;
+      /**
+       * <code>int32 retcode = 14;</code>
+       * @return The retcode.
+       */
+      @java.lang.Override
+      public int getRetcode() {
+        return retcode_;
+      }
+      /**
+       * <code>int32 retcode = 14;</code>
+       * @param value The retcode to set.
+       * @return This builder for chaining.
+       */
+      public Builder setRetcode(int value) {
+        
+        retcode_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>int32 retcode = 14;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearRetcode() {
+        
+        retcode_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private long dieGuid_ ;
+      /**
+       * <code>uint64 die_guid = 15;</code>
+       * @return The dieGuid.
+       */
+      @java.lang.Override
+      public long getDieGuid() {
+        return dieGuid_;
+      }
+      /**
+       * <code>uint64 die_guid = 15;</code>
+       * @param value The dieGuid to set.
+       * @return This builder for chaining.
+       */
+      public Builder setDieGuid(long value) {
+        
+        dieGuid_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint64 die_guid = 15;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearDieGuid() {
+        
+        dieGuid_ = 0L;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -668,8 +672,8 @@ public final class AvatarDieAnimationEndRspOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\036AvatarDieAnimationEndRsp.proto\"O\n\030Avat" +
-      "arDieAnimationEndRsp\022\020\n\010die_guid\030\014 \001(\004\022\017" +
+      "arDieAnimationEndRsp\022\020\n\010skill_id\030\r \001(\r\022\017" +
-      "\n\007retcode\030\t \001(\005\022\020\n\010skill_id\030\007 \001(\rB\033\n\031emu" +
+      "\n\007retcode\030\016 \001(\005\022\020\n\010die_guid\030\017 \001(\004B\033\n\031emu" +
       ".grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -681,7 +685,7 @@ public final class AvatarDieAnimationEndRspOuterClass {
     internal_static_AvatarDieAnimationEndRsp_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_AvatarDieAnimationEndRsp_descriptor,
-        new java.lang.String[] { "DieGuid", "Retcode", "SkillId", });
+        new java.lang.String[] { "SkillId", "Retcode", "DieGuid", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)

src/generated/main/java/emu/grasscutter/net/proto/AvatarEquipAffixInfoOuterClass.java

@@ -31,10 +31,6 @@ public final class AvatarEquipAffixInfoOuterClass {
     int getLeftCdTime();
   }
   /**
-   * <pre>
-   * Name: JPOMNGOBDIO
-   * </pre>
-   *
    * Protobuf type {@code AvatarEquipAffixInfo}
    */
   public static final class AvatarEquipAffixInfo extends
@@ -310,10 +306,6 @@ public final class AvatarEquipAffixInfoOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Name: JPOMNGOBDIO
-     * </pre>
-     *
      * Protobuf type {@code AvatarEquipAffixInfo}
      */
     public static final class Builder extends

src/generated/main/java/emu/grasscutter/net/proto/AvatarEquipAffixStartNotifyOuterClass.java

@@ -1,755 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: AvatarEquipAffixStartNotify.proto
-
-package emu.grasscutter.net.proto;
-
-public final class AvatarEquipAffixStartNotifyOuterClass {
-  private AvatarEquipAffixStartNotifyOuterClass() {}
-  public static void registerAllExtensions(
-      com.google.protobuf.ExtensionRegistryLite registry) {
-  }
-
-  public static void registerAllExtensions(
-      com.google.protobuf.ExtensionRegistry registry) {
-    registerAllExtensions(
-        (com.google.protobuf.ExtensionRegistryLite) registry);
-  }
-  public interface AvatarEquipAffixStartNotifyOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:AvatarEquipAffixStartNotify)
-      com.google.protobuf.MessageOrBuilder {
-
-    /**
-     * <code>uint64 avatar_guid = 5;</code>
-     * @return The avatarGuid.
-     */
-    long getAvatarGuid();
-
-    /**
-     * <code>.AvatarEquipAffixInfo equip_affix_info = 10;</code>
-     * @return Whether the equipAffixInfo field is set.
-     */
-    boolean hasEquipAffixInfo();
-    /**
-     * <code>.AvatarEquipAffixInfo equip_affix_info = 10;</code>
-     * @return The equipAffixInfo.
-     */
-    emu.grasscutter.net.proto.AvatarEquipAffixInfoOuterClass.AvatarEquipAffixInfo getEquipAffixInfo();
-    /**
-     * <code>.AvatarEquipAffixInfo equip_affix_info = 10;</code>
-     */
-    emu.grasscutter.net.proto.AvatarEquipAffixInfoOuterClass.AvatarEquipAffixInfoOrBuilder getEquipAffixInfoOrBuilder();
-  }
-  /**
-   * <pre>
-   * Name: GDBEDIEBFFL
-   * CmdId: 1666
-   * </pre>
-   *
-   * Protobuf type {@code AvatarEquipAffixStartNotify}
-   */
-  public static final class AvatarEquipAffixStartNotify extends
-      com.google.protobuf.GeneratedMessageV3 implements
-      // @@protoc_insertion_point(message_implements:AvatarEquipAffixStartNotify)
-      AvatarEquipAffixStartNotifyOrBuilder {
-  private static final long serialVersionUID = 0L;
-    // Use AvatarEquipAffixStartNotify.newBuilder() to construct.
-    private AvatarEquipAffixStartNotify(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
-      super(builder);
-    }
-    private AvatarEquipAffixStartNotify() {
-    }
-
-    @java.lang.Override
-    @SuppressWarnings({"unused"})
-    protected java.lang.Object newInstance(
-        UnusedPrivateParameter unused) {
-      return new AvatarEquipAffixStartNotify();
-    }
-
-    @java.lang.Override
-    public final com.google.protobuf.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private AvatarEquipAffixStartNotify(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-          com.google.protobuf.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 40: {
-
-              avatarGuid_ = input.readUInt64();
-              break;
-            }
-            case 82: {
-              emu.grasscutter.net.proto.AvatarEquipAffixInfoOuterClass.AvatarEquipAffixInfo.Builder subBuilder = null;
-              if (equipAffixInfo_ != null) {
-                subBuilder = equipAffixInfo_.toBuilder();
-              }
-              equipAffixInfo_ = input.readMessage(emu.grasscutter.net.proto.AvatarEquipAffixInfoOuterClass.AvatarEquipAffixInfo.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(equipAffixInfo_);
-                equipAffixInfo_ = subBuilder.buildPartial();
-              }
-
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new com.google.protobuf.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return emu.grasscutter.net.proto.AvatarEquipAffixStartNotifyOuterClass.internal_static_AvatarEquipAffixStartNotify_descriptor;
-    }
-
-    @java.lang.Override
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return emu.grasscutter.net.proto.AvatarEquipAffixStartNotifyOuterClass.internal_static_AvatarEquipAffixStartNotify_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              emu.grasscutter.net.proto.AvatarEquipAffixStartNotifyOuterClass.AvatarEquipAffixStartNotify.class, emu.grasscutter.net.proto.AvatarEquipAffixStartNotifyOuterClass.AvatarEquipAffixStartNotify.Builder.class);
-    }
-
-    public static final int AVATAR_GUID_FIELD_NUMBER = 5;
-    private long avatarGuid_;
-    /**
-     * <code>uint64 avatar_guid = 5;</code>
-     * @return The avatarGuid.
-     */
-    @java.lang.Override
-    public long getAvatarGuid() {
-      return avatarGuid_;
-    }
-
-    public static final int EQUIP_AFFIX_INFO_FIELD_NUMBER = 10;
-    private emu.grasscutter.net.proto.AvatarEquipAffixInfoOuterClass.AvatarEquipAffixInfo equipAffixInfo_;
-    /**
-     * <code>.AvatarEquipAffixInfo equip_affix_info = 10;</code>
-     * @return Whether the equipAffixInfo field is set.
-     */
-    @java.lang.Override
-    public boolean hasEquipAffixInfo() {
-      return equipAffixInfo_ != null;
-    }
-    /**
-     * <code>.AvatarEquipAffixInfo equip_affix_info = 10;</code>
-     * @return The equipAffixInfo.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.AvatarEquipAffixInfoOuterClass.AvatarEquipAffixInfo getEquipAffixInfo() {
-      return equipAffixInfo_ == null ? emu.grasscutter.net.proto.AvatarEquipAffixInfoOuterClass.AvatarEquipAffixInfo.getDefaultInstance() : equipAffixInfo_;
-    }
-    /**
-     * <code>.AvatarEquipAffixInfo equip_affix_info = 10;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.AvatarEquipAffixInfoOuterClass.AvatarEquipAffixInfoOrBuilder getEquipAffixInfoOrBuilder() {
-      return getEquipAffixInfo();
-    }
-
-    private byte memoizedIsInitialized = -1;
-    @java.lang.Override
-    public final boolean isInitialized() {
-      byte isInitialized = memoizedIsInitialized;
-      if (isInitialized == 1) return true;
-      if (isInitialized == 0) return false;
-
-      memoizedIsInitialized = 1;
-      return true;
-    }
-
-    @java.lang.Override
-    public void writeTo(com.google.protobuf.CodedOutputStream output)
-                        throws java.io.IOException {
-      if (avatarGuid_ != 0L) {
-        output.writeUInt64(5, avatarGuid_);
-      }
-      if (equipAffixInfo_ != null) {
-        output.writeMessage(10, getEquipAffixInfo());
-      }
-      unknownFields.writeTo(output);
-    }
-
-    @java.lang.Override
-    public int getSerializedSize() {
-      int size = memoizedSize;
-      if (size != -1) return size;
-
-      size = 0;
-      if (avatarGuid_ != 0L) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt64Size(5, avatarGuid_);
-      }
-      if (equipAffixInfo_ != null) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(10, getEquipAffixInfo());
-      }
-      size += unknownFields.getSerializedSize();
-      memoizedSize = size;
-      return size;
-    }
-
-    @java.lang.Override
-    public boolean equals(final java.lang.Object obj) {
-      if (obj == this) {
-       return true;
-      }
-      if (!(obj instanceof emu.grasscutter.net.proto.AvatarEquipAffixStartNotifyOuterClass.AvatarEquipAffixStartNotify)) {
-        return super.equals(obj);
-      }
-      emu.grasscutter.net.proto.AvatarEquipAffixStartNotifyOuterClass.AvatarEquipAffixStartNotify other = (emu.grasscutter.net.proto.AvatarEquipAffixStartNotifyOuterClass.AvatarEquipAffixStartNotify) obj;
-
-      if (getAvatarGuid()
-          != other.getAvatarGuid()) return false;
-      if (hasEquipAffixInfo() != other.hasEquipAffixInfo()) return false;
-      if (hasEquipAffixInfo()) {
-        if (!getEquipAffixInfo()
-            .equals(other.getEquipAffixInfo())) return false;
-      }
-      if (!unknownFields.equals(other.unknownFields)) return false;
-      return true;
-    }
-
-    @java.lang.Override
-    public int hashCode() {
-      if (memoizedHashCode != 0) {
-        return memoizedHashCode;
-      }
-      int hash = 41;
-      hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + AVATAR_GUID_FIELD_NUMBER;
-      hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
-          getAvatarGuid());
-      if (hasEquipAffixInfo()) {
-        hash = (37 * hash) + EQUIP_AFFIX_INFO_FIELD_NUMBER;
-        hash = (53 * hash) + getEquipAffixInfo().hashCode();
-      }
-      hash = (29 * hash) + unknownFields.hashCode();
-      memoizedHashCode = hash;
-      return hash;
-    }
-
-    public static emu.grasscutter.net.proto.AvatarEquipAffixStartNotifyOuterClass.AvatarEquipAffixStartNotify parseFrom(
-        java.nio.ByteBuffer data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
-    }
-    public static emu.grasscutter.net.proto.AvatarEquipAffixStartNotifyOuterClass.AvatarEquipAffixStartNotify parseFrom(
-        java.nio.ByteBuffer data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
-    }
-    public static emu.grasscutter.net.proto.AvatarEquipAffixStartNotifyOuterClass.AvatarEquipAffixStartNotify parseFrom(
-        com.google.protobuf.ByteString data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
-    }
-    public static emu.grasscutter.net.proto.AvatarEquipAffixStartNotifyOuterClass.AvatarEquipAffixStartNotify parseFrom(
-        com.google.protobuf.ByteString data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
-    }
-    public static emu.grasscutter.net.proto.AvatarEquipAffixStartNotifyOuterClass.AvatarEquipAffixStartNotify parseFrom(byte[] data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
-    }
-    public static emu.grasscutter.net.proto.AvatarEquipAffixStartNotifyOuterClass.AvatarEquipAffixStartNotify parseFrom(
-        byte[] data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
-    }
-    public static emu.grasscutter.net.proto.AvatarEquipAffixStartNotifyOuterClass.AvatarEquipAffixStartNotify parseFrom(java.io.InputStream input)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input);
-    }
-    public static emu.grasscutter.net.proto.AvatarEquipAffixStartNotifyOuterClass.AvatarEquipAffixStartNotify parseFrom(
-        java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input, extensionRegistry);
-    }
-    public static emu.grasscutter.net.proto.AvatarEquipAffixStartNotifyOuterClass.AvatarEquipAffixStartNotify parseDelimitedFrom(java.io.InputStream input)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseDelimitedWithIOException(PARSER, input);
-    }
-    public static emu.grasscutter.net.proto.AvatarEquipAffixStartNotifyOuterClass.AvatarEquipAffixStartNotify parseDelimitedFrom(
-        java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-    }
-    public static emu.grasscutter.net.proto.AvatarEquipAffixStartNotifyOuterClass.AvatarEquipAffixStartNotify parseFrom(
-        com.google.protobuf.CodedInputStream input)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input);
-    }
-    public static emu.grasscutter.net.proto.AvatarEquipAffixStartNotifyOuterClass.AvatarEquipAffixStartNotify parseFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input, extensionRegistry);
-    }
-
-    @java.lang.Override
-    public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder() {
-      return DEFAULT_INSTANCE.toBuilder();
-    }
-    public static Builder newBuilder(emu.grasscutter.net.proto.AvatarEquipAffixStartNotifyOuterClass.AvatarEquipAffixStartNotify prototype) {
-      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-    }
-    @java.lang.Override
-    public Builder toBuilder() {
-      return this == DEFAULT_INSTANCE
-          ? new Builder() : new Builder().mergeFrom(this);
-    }
-
-    @java.lang.Override
-    protected Builder newBuilderForType(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-      Builder builder = new Builder(parent);
-      return builder;
-    }
-    /**
-     * <pre>
-     * Name: GDBEDIEBFFL
-     * CmdId: 1666
-     * </pre>
-     *
-     * Protobuf type {@code AvatarEquipAffixStartNotify}
-     */
-    public static final class Builder extends
-        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
-        // @@protoc_insertion_point(builder_implements:AvatarEquipAffixStartNotify)
-        emu.grasscutter.net.proto.AvatarEquipAffixStartNotifyOuterClass.AvatarEquipAffixStartNotifyOrBuilder {
-      public static final com.google.protobuf.Descriptors.Descriptor
-          getDescriptor() {
-        return emu.grasscutter.net.proto.AvatarEquipAffixStartNotifyOuterClass.internal_static_AvatarEquipAffixStartNotify_descriptor;
-      }
-
-      @java.lang.Override
-      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-          internalGetFieldAccessorTable() {
-        return emu.grasscutter.net.proto.AvatarEquipAffixStartNotifyOuterClass.internal_static_AvatarEquipAffixStartNotify_fieldAccessorTable
-            .ensureFieldAccessorsInitialized(
-                emu.grasscutter.net.proto.AvatarEquipAffixStartNotifyOuterClass.AvatarEquipAffixStartNotify.class, emu.grasscutter.net.proto.AvatarEquipAffixStartNotifyOuterClass.AvatarEquipAffixStartNotify.Builder.class);
-      }
-
-      // Construct using emu.grasscutter.net.proto.AvatarEquipAffixStartNotifyOuterClass.AvatarEquipAffixStartNotify.newBuilder()
-      private Builder() {
-        maybeForceBuilderInitialization();
-      }
-
-      private Builder(
-          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-        super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (com.google.protobuf.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-        }
-      }
-      @java.lang.Override
-      public Builder clear() {
-        super.clear();
-        avatarGuid_ = 0L;
-
-        if (equipAffixInfoBuilder_ == null) {
-          equipAffixInfo_ = null;
-        } else {
-          equipAffixInfo_ = null;
-          equipAffixInfoBuilder_ = null;
-        }
-        return this;
-      }
-
-      @java.lang.Override
-      public com.google.protobuf.Descriptors.Descriptor
-          getDescriptorForType() {
-        return emu.grasscutter.net.proto.AvatarEquipAffixStartNotifyOuterClass.internal_static_AvatarEquipAffixStartNotify_descriptor;
-      }
-
-      @java.lang.Override
-      public emu.grasscutter.net.proto.AvatarEquipAffixStartNotifyOuterClass.AvatarEquipAffixStartNotify getDefaultInstanceForType() {
-        return emu.grasscutter.net.proto.AvatarEquipAffixStartNotifyOuterClass.AvatarEquipAffixStartNotify.getDefaultInstance();
-      }
-
-      @java.lang.Override
-      public emu.grasscutter.net.proto.AvatarEquipAffixStartNotifyOuterClass.AvatarEquipAffixStartNotify build() {
-        emu.grasscutter.net.proto.AvatarEquipAffixStartNotifyOuterClass.AvatarEquipAffixStartNotify result = buildPartial();
-        if (!result.isInitialized()) {
-          throw newUninitializedMessageException(result);
-        }
-        return result;
-      }
-
-      @java.lang.Override
-      public emu.grasscutter.net.proto.AvatarEquipAffixStartNotifyOuterClass.AvatarEquipAffixStartNotify buildPartial() {
-        emu.grasscutter.net.proto.AvatarEquipAffixStartNotifyOuterClass.AvatarEquipAffixStartNotify result = new emu.grasscutter.net.proto.AvatarEquipAffixStartNotifyOuterClass.AvatarEquipAffixStartNotify(this);
-        result.avatarGuid_ = avatarGuid_;
-        if (equipAffixInfoBuilder_ == null) {
-          result.equipAffixInfo_ = equipAffixInfo_;
-        } else {
-          result.equipAffixInfo_ = equipAffixInfoBuilder_.build();
-        }
-        onBuilt();
-        return result;
-      }
-
-      @java.lang.Override
-      public Builder clone() {
-        return super.clone();
-      }
-      @java.lang.Override
-      public Builder setField(
-          com.google.protobuf.Descriptors.FieldDescriptor field,
-          java.lang.Object value) {
-        return super.setField(field, value);
-      }
-      @java.lang.Override
-      public Builder clearField(
-          com.google.protobuf.Descriptors.FieldDescriptor field) {
-        return super.clearField(field);
-      }
-      @java.lang.Override
-      public Builder clearOneof(
-          com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-        return super.clearOneof(oneof);
-      }
-      @java.lang.Override
-      public Builder setRepeatedField(
-          com.google.protobuf.Descriptors.FieldDescriptor field,
-          int index, java.lang.Object value) {
-        return super.setRepeatedField(field, index, value);
-      }
-      @java.lang.Override
-      public Builder addRepeatedField(
-          com.google.protobuf.Descriptors.FieldDescriptor field,
-          java.lang.Object value) {
-        return super.addRepeatedField(field, value);
-      }
-      @java.lang.Override
-      public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof emu.grasscutter.net.proto.AvatarEquipAffixStartNotifyOuterClass.AvatarEquipAffixStartNotify) {
-          return mergeFrom((emu.grasscutter.net.proto.AvatarEquipAffixStartNotifyOuterClass.AvatarEquipAffixStartNotify)other);
-        } else {
-          super.mergeFrom(other);
-          return this;
-        }
-      }
-
-      public Builder mergeFrom(emu.grasscutter.net.proto.AvatarEquipAffixStartNotifyOuterClass.AvatarEquipAffixStartNotify other) {
-        if (other == emu.grasscutter.net.proto.AvatarEquipAffixStartNotifyOuterClass.AvatarEquipAffixStartNotify.getDefaultInstance()) return this;
-        if (other.getAvatarGuid() != 0L) {
-          setAvatarGuid(other.getAvatarGuid());
-        }
-        if (other.hasEquipAffixInfo()) {
-          mergeEquipAffixInfo(other.getEquipAffixInfo());
-        }
-        this.mergeUnknownFields(other.unknownFields);
-        onChanged();
-        return this;
-      }
-
-      @java.lang.Override
-      public final boolean isInitialized() {
-        return true;
-      }
-
-      @java.lang.Override
-      public Builder mergeFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws java.io.IOException {
-        emu.grasscutter.net.proto.AvatarEquipAffixStartNotifyOuterClass.AvatarEquipAffixStartNotify parsedMessage = null;
-        try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (emu.grasscutter.net.proto.AvatarEquipAffixStartNotifyOuterClass.AvatarEquipAffixStartNotify) e.getUnfinishedMessage();
-          throw e.unwrapIOException();
-        } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
-        return this;
-      }
-
-      private long avatarGuid_ ;
-      /**
-       * <code>uint64 avatar_guid = 5;</code>
-       * @return The avatarGuid.
-       */
-      @java.lang.Override
-      public long getAvatarGuid() {
-        return avatarGuid_;
-      }
-      /**
-       * <code>uint64 avatar_guid = 5;</code>
-       * @param value The avatarGuid to set.
-       * @return This builder for chaining.
-       */
-      public Builder setAvatarGuid(long value) {
-        
-        avatarGuid_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint64 avatar_guid = 5;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearAvatarGuid() {
-        
-        avatarGuid_ = 0L;
-        onChanged();
-        return this;
-      }
-
-      private emu.grasscutter.net.proto.AvatarEquipAffixInfoOuterClass.AvatarEquipAffixInfo equipAffixInfo_;
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.AvatarEquipAffixInfoOuterClass.AvatarEquipAffixInfo, emu.grasscutter.net.proto.AvatarEquipAffixInfoOuterClass.AvatarEquipAffixInfo.Builder, emu.grasscutter.net.proto.AvatarEquipAffixInfoOuterClass.AvatarEquipAffixInfoOrBuilder> equipAffixInfoBuilder_;
-      /**
-       * <code>.AvatarEquipAffixInfo equip_affix_info = 10;</code>
-       * @return Whether the equipAffixInfo field is set.
-       */
-      public boolean hasEquipAffixInfo() {
-        return equipAffixInfoBuilder_ != null || equipAffixInfo_ != null;
-      }
-      /**
-       * <code>.AvatarEquipAffixInfo equip_affix_info = 10;</code>
-       * @return The equipAffixInfo.
-       */
-      public emu.grasscutter.net.proto.AvatarEquipAffixInfoOuterClass.AvatarEquipAffixInfo getEquipAffixInfo() {
-        if (equipAffixInfoBuilder_ == null) {
-          return equipAffixInfo_ == null ? emu.grasscutter.net.proto.AvatarEquipAffixInfoOuterClass.AvatarEquipAffixInfo.getDefaultInstance() : equipAffixInfo_;
-        } else {
-          return equipAffixInfoBuilder_.getMessage();
-        }
-      }
-      /**
-       * <code>.AvatarEquipAffixInfo equip_affix_info = 10;</code>
-       */
-      public Builder setEquipAffixInfo(emu.grasscutter.net.proto.AvatarEquipAffixInfoOuterClass.AvatarEquipAffixInfo value) {
-        if (equipAffixInfoBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          equipAffixInfo_ = value;
-          onChanged();
-        } else {
-          equipAffixInfoBuilder_.setMessage(value);
-        }
-
-        return this;
-      }
-      /**
-       * <code>.AvatarEquipAffixInfo equip_affix_info = 10;</code>
-       */
-      public Builder setEquipAffixInfo(
-          emu.grasscutter.net.proto.AvatarEquipAffixInfoOuterClass.AvatarEquipAffixInfo.Builder builderForValue) {
-        if (equipAffixInfoBuilder_ == null) {
-          equipAffixInfo_ = builderForValue.build();
-          onChanged();
-        } else {
-          equipAffixInfoBuilder_.setMessage(builderForValue.build());
-        }
-
-        return this;
-      }
-      /**
-       * <code>.AvatarEquipAffixInfo equip_affix_info = 10;</code>
-       */
-      public Builder mergeEquipAffixInfo(emu.grasscutter.net.proto.AvatarEquipAffixInfoOuterClass.AvatarEquipAffixInfo value) {
-        if (equipAffixInfoBuilder_ == null) {
-          if (equipAffixInfo_ != null) {
-            equipAffixInfo_ =
-              emu.grasscutter.net.proto.AvatarEquipAffixInfoOuterClass.AvatarEquipAffixInfo.newBuilder(equipAffixInfo_).mergeFrom(value).buildPartial();
-          } else {
-            equipAffixInfo_ = value;
-          }
-          onChanged();
-        } else {
-          equipAffixInfoBuilder_.mergeFrom(value);
-        }
-
-        return this;
-      }
-      /**
-       * <code>.AvatarEquipAffixInfo equip_affix_info = 10;</code>
-       */
-      public Builder clearEquipAffixInfo() {
-        if (equipAffixInfoBuilder_ == null) {
-          equipAffixInfo_ = null;
-          onChanged();
-        } else {
-          equipAffixInfo_ = null;
-          equipAffixInfoBuilder_ = null;
-        }
-
-        return this;
-      }
-      /**
-       * <code>.AvatarEquipAffixInfo equip_affix_info = 10;</code>
-       */
-      public emu.grasscutter.net.proto.AvatarEquipAffixInfoOuterClass.AvatarEquipAffixInfo.Builder getEquipAffixInfoBuilder() {
-        
-        onChanged();
-        return getEquipAffixInfoFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.AvatarEquipAffixInfo equip_affix_info = 10;</code>
-       */
-      public emu.grasscutter.net.proto.AvatarEquipAffixInfoOuterClass.AvatarEquipAffixInfoOrBuilder getEquipAffixInfoOrBuilder() {
-        if (equipAffixInfoBuilder_ != null) {
-          return equipAffixInfoBuilder_.getMessageOrBuilder();
-        } else {
-          return equipAffixInfo_ == null ?
-              emu.grasscutter.net.proto.AvatarEquipAffixInfoOuterClass.AvatarEquipAffixInfo.getDefaultInstance() : equipAffixInfo_;
-        }
-      }
-      /**
-       * <code>.AvatarEquipAffixInfo equip_affix_info = 10;</code>
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.AvatarEquipAffixInfoOuterClass.AvatarEquipAffixInfo, emu.grasscutter.net.proto.AvatarEquipAffixInfoOuterClass.AvatarEquipAffixInfo.Builder, emu.grasscutter.net.proto.AvatarEquipAffixInfoOuterClass.AvatarEquipAffixInfoOrBuilder> 
-          getEquipAffixInfoFieldBuilder() {
-        if (equipAffixInfoBuilder_ == null) {
-          equipAffixInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.AvatarEquipAffixInfoOuterClass.AvatarEquipAffixInfo, emu.grasscutter.net.proto.AvatarEquipAffixInfoOuterClass.AvatarEquipAffixInfo.Builder, emu.grasscutter.net.proto.AvatarEquipAffixInfoOuterClass.AvatarEquipAffixInfoOrBuilder>(
-                  getEquipAffixInfo(),
-                  getParentForChildren(),
-                  isClean());
-          equipAffixInfo_ = null;
-        }
-        return equipAffixInfoBuilder_;
-      }
-      @java.lang.Override
-      public final Builder setUnknownFields(
-          final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return super.setUnknownFields(unknownFields);
-      }
-
-      @java.lang.Override
-      public final Builder mergeUnknownFields(
-          final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return super.mergeUnknownFields(unknownFields);
-      }
-
-
-      // @@protoc_insertion_point(builder_scope:AvatarEquipAffixStartNotify)
-    }
-
-    // @@protoc_insertion_point(class_scope:AvatarEquipAffixStartNotify)
-    private static final emu.grasscutter.net.proto.AvatarEquipAffixStartNotifyOuterClass.AvatarEquipAffixStartNotify DEFAULT_INSTANCE;
-    static {
-      DEFAULT_INSTANCE = new emu.grasscutter.net.proto.AvatarEquipAffixStartNotifyOuterClass.AvatarEquipAffixStartNotify();
-    }
-
-    public static emu.grasscutter.net.proto.AvatarEquipAffixStartNotifyOuterClass.AvatarEquipAffixStartNotify getDefaultInstance() {
-      return DEFAULT_INSTANCE;
-    }
-
-    private static final com.google.protobuf.Parser<AvatarEquipAffixStartNotify>
-        PARSER = new com.google.protobuf.AbstractParser<AvatarEquipAffixStartNotify>() {
-      @java.lang.Override
-      public AvatarEquipAffixStartNotify parsePartialFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return new AvatarEquipAffixStartNotify(input, extensionRegistry);
-      }
-    };
-
-    public static com.google.protobuf.Parser<AvatarEquipAffixStartNotify> parser() {
-      return PARSER;
-    }
-
-    @java.lang.Override
-    public com.google.protobuf.Parser<AvatarEquipAffixStartNotify> getParserForType() {
-      return PARSER;
-    }
-
-    @java.lang.Override
-    public emu.grasscutter.net.proto.AvatarEquipAffixStartNotifyOuterClass.AvatarEquipAffixStartNotify getDefaultInstanceForType() {
-      return DEFAULT_INSTANCE;
-    }
-
-  }
-
-  private static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_AvatarEquipAffixStartNotify_descriptor;
-  private static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_AvatarEquipAffixStartNotify_fieldAccessorTable;
-
-  public static com.google.protobuf.Descriptors.FileDescriptor
-      getDescriptor() {
-    return descriptor;
-  }
-  private static  com.google.protobuf.Descriptors.FileDescriptor
-      descriptor;
-  static {
-    java.lang.String[] descriptorData = {
-      "\n!AvatarEquipAffixStartNotify.proto\032\032Ava" +
-      "tarEquipAffixInfo.proto\"c\n\033AvatarEquipAf" +
-      "fixStartNotify\022\023\n\013avatar_guid\030\005 \001(\004\022/\n\020e" +
-      "quip_affix_info\030\n \001(\0132\025.AvatarEquipAffix" +
-      "InfoB\033\n\031emu.grasscutter.net.protob\006proto" +
-      "3"
-    };
-    descriptor = com.google.protobuf.Descriptors.FileDescriptor
-      .internalBuildGeneratedFileFrom(descriptorData,
-        new com.google.protobuf.Descriptors.FileDescriptor[] {
-          emu.grasscutter.net.proto.AvatarEquipAffixInfoOuterClass.getDescriptor(),
-        });
-    internal_static_AvatarEquipAffixStartNotify_descriptor =
-      getDescriptor().getMessageTypes().get(0);
-    internal_static_AvatarEquipAffixStartNotify_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_AvatarEquipAffixStartNotify_descriptor,
-        new java.lang.String[] { "AvatarGuid", "EquipAffixInfo", });
-    emu.grasscutter.net.proto.AvatarEquipAffixInfoOuterClass.getDescriptor();
-  }
-
-  // @@protoc_insertion_point(outer_class_scope)
-}

src/generated/main/java/emu/grasscutter/net/proto/AvatarEquipChangeNotifyOuterClass.java

@@ -19,63 +19,65 @@ public final class AvatarEquipChangeNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 equip_type = 5;</code>
+     * <code>uint64 avatar_guid = 10;</code>
-     * @return The equipType.
-     */
-    int getEquipType();
-
-    /**
-     * <code>uint64 avatar_guid = 3;</code>
      * @return The avatarGuid.
      */
     long getAvatarGuid();
 
     /**
-     * <code>.SceneReliquaryInfo reliquary = 6;</code>
+     * <code>uint64 equip_guid = 13;</code>
-     * @return Whether the reliquary field is set.
-     */
-    boolean hasReliquary();
-    /**
-     * <code>.SceneReliquaryInfo reliquary = 6;</code>
-     * @return The reliquary.
-     */
-    emu.grasscutter.net.proto.SceneReliquaryInfoOuterClass.SceneReliquaryInfo getReliquary();
-    /**
-     * <code>.SceneReliquaryInfo reliquary = 6;</code>
-     */
-    emu.grasscutter.net.proto.SceneReliquaryInfoOuterClass.SceneReliquaryInfoOrBuilder getReliquaryOrBuilder();
-
-    /**
-     * <code>.SceneWeaponInfo weapon = 12;</code>
-     * @return Whether the weapon field is set.
-     */
-    boolean hasWeapon();
-    /**
-     * <code>.SceneWeaponInfo weapon = 12;</code>
-     * @return The weapon.
-     */
-    emu.grasscutter.net.proto.SceneWeaponInfoOuterClass.SceneWeaponInfo getWeapon();
-    /**
-     * <code>.SceneWeaponInfo weapon = 12;</code>
-     */
-    emu.grasscutter.net.proto.SceneWeaponInfoOuterClass.SceneWeaponInfoOrBuilder getWeaponOrBuilder();
-
-    /**
-     * <code>uint64 equip_guid = 2;</code>
      * @return The equipGuid.
      */
     long getEquipGuid();
 
     /**
-     * <code>uint32 item_id = 9;</code>
+     * <code>.SceneReliquaryInfo reliquary = 1;</code>
+     * @return Whether the reliquary field is set.
+     */
+    boolean hasReliquary();
+    /**
+     * <code>.SceneReliquaryInfo reliquary = 1;</code>
+     * @return The reliquary.
+     */
+    emu.grasscutter.net.proto.SceneReliquaryInfoOuterClass.SceneReliquaryInfo getReliquary();
+    /**
+     * <code>.SceneReliquaryInfo reliquary = 1;</code>
+     */
+    emu.grasscutter.net.proto.SceneReliquaryInfoOuterClass.SceneReliquaryInfoOrBuilder getReliquaryOrBuilder();
+
+    /**
+     * <code>.SceneWeaponInfo weapon = 15;</code>
+     * @return Whether the weapon field is set.
+     */
+    boolean hasWeapon();
+    /**
+     * <code>.SceneWeaponInfo weapon = 15;</code>
+     * @return The weapon.
+     */
+    emu.grasscutter.net.proto.SceneWeaponInfoOuterClass.SceneWeaponInfo getWeapon();
+    /**
+     * <code>.SceneWeaponInfo weapon = 15;</code>
+     */
+    emu.grasscutter.net.proto.SceneWeaponInfoOuterClass.SceneWeaponInfoOrBuilder getWeaponOrBuilder();
+
+    /**
+     * <code>uint32 item_id = 14;</code>
      * @return The itemId.
      */
     int getItemId();
+
+    /**
+     * <code>uint32 equip_type = 8;</code>
+     * @return The equipType.
+     */
+    int getEquipType();
   }
   /**
    * <pre>
-   * Name: IKNNNIGIPLE
+   * CmdId: 647
-   * CmdId: 661
+   * EnetChannelId: 0
+   * EnetIsReliable: false
+   * IsAllowClient: true
    * </pre>
    *
    * Protobuf type {@code AvatarEquipChangeNotify}
@@ -122,22 +124,7 @@ public final class AvatarEquipChangeNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 16: {
+            case 10: {
-
-              equipGuid_ = input.readUInt64();
-              break;
-            }
-            case 24: {
-
-              avatarGuid_ = input.readUInt64();
-              break;
-            }
-            case 40: {
-
-              equipType_ = input.readUInt32();
-              break;
-            }
-            case 50: {
               emu.grasscutter.net.proto.SceneReliquaryInfoOuterClass.SceneReliquaryInfo.Builder subBuilder = null;
               if (reliquary_ != null) {
                 subBuilder = reliquary_.toBuilder();
@@ -150,12 +137,27 @@ public final class AvatarEquipChangeNotifyOuterClass {
 
               break;
             }
-            case 72: {
+            case 64: {
+
+              equipType_ = input.readUInt32();
+              break;
+            }
+            case 80: {
+
+              avatarGuid_ = input.readUInt64();
+              break;
+            }
+            case 104: {
+
+              equipGuid_ = input.readUInt64();
+              break;
+            }
+            case 112: {
 
               itemId_ = input.readUInt32();
               break;
             }
-            case 98: {
+            case 122: {
               emu.grasscutter.net.proto.SceneWeaponInfoOuterClass.SceneWeaponInfo.Builder subBuilder = null;
               if (weapon_ != null) {
                 subBuilder = weapon_.toBuilder();
@@ -200,21 +202,10 @@ public final class AvatarEquipChangeNotifyOuterClass {
               emu.grasscutter.net.proto.AvatarEquipChangeNotifyOuterClass.AvatarEquipChangeNotify.class, emu.grasscutter.net.proto.AvatarEquipChangeNotifyOuterClass.AvatarEquipChangeNotify.Builder.class);
     }
 
-    public static final int EQUIP_TYPE_FIELD_NUMBER = 5;
+    public static final int AVATAR_GUID_FIELD_NUMBER = 10;
-    private int equipType_;
-    /**
-     * <code>uint32 equip_type = 5;</code>
-     * @return The equipType.
-     */
-    @java.lang.Override
-    public int getEquipType() {
-      return equipType_;
-    }
-
-    public static final int AVATAR_GUID_FIELD_NUMBER = 3;
     private long avatarGuid_;
     /**
-     * <code>uint64 avatar_guid = 3;</code>
+     * <code>uint64 avatar_guid = 10;</code>
      * @return The avatarGuid.
      */
     @java.lang.Override
@@ -222,62 +213,10 @@ public final class AvatarEquipChangeNotifyOuterClass {
       return avatarGuid_;
     }
 
-    public static final int RELIQUARY_FIELD_NUMBER = 6;
+    public static final int EQUIP_GUID_FIELD_NUMBER = 13;
-    private emu.grasscutter.net.proto.SceneReliquaryInfoOuterClass.SceneReliquaryInfo reliquary_;
-    /**
-     * <code>.SceneReliquaryInfo reliquary = 6;</code>
-     * @return Whether the reliquary field is set.
-     */
-    @java.lang.Override
-    public boolean hasReliquary() {
-      return reliquary_ != null;
-    }
-    /**
-     * <code>.SceneReliquaryInfo reliquary = 6;</code>
-     * @return The reliquary.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.SceneReliquaryInfoOuterClass.SceneReliquaryInfo getReliquary() {
-      return reliquary_ == null ? emu.grasscutter.net.proto.SceneReliquaryInfoOuterClass.SceneReliquaryInfo.getDefaultInstance() : reliquary_;
-    }
-    /**
-     * <code>.SceneReliquaryInfo reliquary = 6;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.SceneReliquaryInfoOuterClass.SceneReliquaryInfoOrBuilder getReliquaryOrBuilder() {
-      return getReliquary();
-    }
-
-    public static final int WEAPON_FIELD_NUMBER = 12;
-    private emu.grasscutter.net.proto.SceneWeaponInfoOuterClass.SceneWeaponInfo weapon_;
-    /**
-     * <code>.SceneWeaponInfo weapon = 12;</code>
-     * @return Whether the weapon field is set.
-     */
-    @java.lang.Override
-    public boolean hasWeapon() {
-      return weapon_ != null;
-    }
-    /**
-     * <code>.SceneWeaponInfo weapon = 12;</code>
-     * @return The weapon.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.SceneWeaponInfoOuterClass.SceneWeaponInfo getWeapon() {
-      return weapon_ == null ? emu.grasscutter.net.proto.SceneWeaponInfoOuterClass.SceneWeaponInfo.getDefaultInstance() : weapon_;
-    }
-    /**
-     * <code>.SceneWeaponInfo weapon = 12;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.SceneWeaponInfoOuterClass.SceneWeaponInfoOrBuilder getWeaponOrBuilder() {
-      return getWeapon();
-    }
-
-    public static final int EQUIP_GUID_FIELD_NUMBER = 2;
     private long equipGuid_;
     /**
-     * <code>uint64 equip_guid = 2;</code>
+     * <code>uint64 equip_guid = 13;</code>
      * @return The equipGuid.
      */
     @java.lang.Override
@@ -285,10 +224,62 @@ public final class AvatarEquipChangeNotifyOuterClass {
       return equipGuid_;
     }
 
-    public static final int ITEM_ID_FIELD_NUMBER = 9;
+    public static final int RELIQUARY_FIELD_NUMBER = 1;
+    private emu.grasscutter.net.proto.SceneReliquaryInfoOuterClass.SceneReliquaryInfo reliquary_;
+    /**
+     * <code>.SceneReliquaryInfo reliquary = 1;</code>
+     * @return Whether the reliquary field is set.
+     */
+    @java.lang.Override
+    public boolean hasReliquary() {
+      return reliquary_ != null;
+    }
+    /**
+     * <code>.SceneReliquaryInfo reliquary = 1;</code>
+     * @return The reliquary.
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.SceneReliquaryInfoOuterClass.SceneReliquaryInfo getReliquary() {
+      return reliquary_ == null ? emu.grasscutter.net.proto.SceneReliquaryInfoOuterClass.SceneReliquaryInfo.getDefaultInstance() : reliquary_;
+    }
+    /**
+     * <code>.SceneReliquaryInfo reliquary = 1;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.SceneReliquaryInfoOuterClass.SceneReliquaryInfoOrBuilder getReliquaryOrBuilder() {
+      return getReliquary();
+    }
+
+    public static final int WEAPON_FIELD_NUMBER = 15;
+    private emu.grasscutter.net.proto.SceneWeaponInfoOuterClass.SceneWeaponInfo weapon_;
+    /**
+     * <code>.SceneWeaponInfo weapon = 15;</code>
+     * @return Whether the weapon field is set.
+     */
+    @java.lang.Override
+    public boolean hasWeapon() {
+      return weapon_ != null;
+    }
+    /**
+     * <code>.SceneWeaponInfo weapon = 15;</code>
+     * @return The weapon.
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.SceneWeaponInfoOuterClass.SceneWeaponInfo getWeapon() {
+      return weapon_ == null ? emu.grasscutter.net.proto.SceneWeaponInfoOuterClass.SceneWeaponInfo.getDefaultInstance() : weapon_;
+    }
+    /**
+     * <code>.SceneWeaponInfo weapon = 15;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.SceneWeaponInfoOuterClass.SceneWeaponInfoOrBuilder getWeaponOrBuilder() {
+      return getWeapon();
+    }
+
+    public static final int ITEM_ID_FIELD_NUMBER = 14;
     private int itemId_;
     /**
-     * <code>uint32 item_id = 9;</code>
+     * <code>uint32 item_id = 14;</code>
      * @return The itemId.
      */
     @java.lang.Override
@@ -296,6 +287,17 @@ public final class AvatarEquipChangeNotifyOuterClass {
       return itemId_;
     }
 
+    public static final int EQUIP_TYPE_FIELD_NUMBER = 8;
+    private int equipType_;
+    /**
+     * <code>uint32 equip_type = 8;</code>
+     * @return The equipType.
+     */
+    @java.lang.Override
+    public int getEquipType() {
+      return equipType_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -310,23 +312,23 @@ public final class AvatarEquipChangeNotifyOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (equipGuid_ != 0L) {
+      if (reliquary_ != null) {
-        output.writeUInt64(2, equipGuid_);
+        output.writeMessage(1, getReliquary());
-      }
-      if (avatarGuid_ != 0L) {
-        output.writeUInt64(3, avatarGuid_);
       }
       if (equipType_ != 0) {
-        output.writeUInt32(5, equipType_);
+        output.writeUInt32(8, equipType_);
       }
-      if (reliquary_ != null) {
+      if (avatarGuid_ != 0L) {
-        output.writeMessage(6, getReliquary());
+        output.writeUInt64(10, avatarGuid_);
+      }
+      if (equipGuid_ != 0L) {
+        output.writeUInt64(13, equipGuid_);
       }
       if (itemId_ != 0) {
-        output.writeUInt32(9, itemId_);
+        output.writeUInt32(14, itemId_);
       }
       if (weapon_ != null) {
-        output.writeMessage(12, getWeapon());
+        output.writeMessage(15, getWeapon());
       }
       unknownFields.writeTo(output);
     }
@@ -337,29 +339,29 @@ public final class AvatarEquipChangeNotifyOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (equipGuid_ != 0L) {
+      if (reliquary_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt64Size(2, equipGuid_);
+          .computeMessageSize(1, getReliquary());
-      }
-      if (avatarGuid_ != 0L) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt64Size(3, avatarGuid_);
       }
       if (equipType_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(5, equipType_);
+          .computeUInt32Size(8, equipType_);
       }
-      if (reliquary_ != null) {
+      if (avatarGuid_ != 0L) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(6, getReliquary());
+          .computeUInt64Size(10, avatarGuid_);
+      }
+      if (equipGuid_ != 0L) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt64Size(13, equipGuid_);
       }
       if (itemId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(9, itemId_);
+          .computeUInt32Size(14, itemId_);
       }
       if (weapon_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(12, getWeapon());
+          .computeMessageSize(15, getWeapon());
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -376,10 +378,10 @@ public final class AvatarEquipChangeNotifyOuterClass {
       }
       emu.grasscutter.net.proto.AvatarEquipChangeNotifyOuterClass.AvatarEquipChangeNotify other = (emu.grasscutter.net.proto.AvatarEquipChangeNotifyOuterClass.AvatarEquipChangeNotify) obj;
 
-      if (getEquipType()
-          != other.getEquipType()) return false;
       if (getAvatarGuid()
           != other.getAvatarGuid()) return false;
+      if (getEquipGuid()
+          != other.getEquipGuid()) return false;
       if (hasReliquary() != other.hasReliquary()) return false;
       if (hasReliquary()) {
         if (!getReliquary()
@@ -390,10 +392,10 @@ public final class AvatarEquipChangeNotifyOuterClass {
         if (!getWeapon()
             .equals(other.getWeapon())) return false;
       }
-      if (getEquipGuid()
-          != other.getEquipGuid()) return false;
       if (getItemId()
           != other.getItemId()) return false;
+      if (getEquipType()
+          != other.getEquipType()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -405,11 +407,12 @@ public final class AvatarEquipChangeNotifyOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + EQUIP_TYPE_FIELD_NUMBER;
-      hash = (53 * hash) + getEquipType();
       hash = (37 * hash) + AVATAR_GUID_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
           getAvatarGuid());
+      hash = (37 * hash) + EQUIP_GUID_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+          getEquipGuid());
       if (hasReliquary()) {
         hash = (37 * hash) + RELIQUARY_FIELD_NUMBER;
         hash = (53 * hash) + getReliquary().hashCode();
@@ -418,11 +421,10 @@ public final class AvatarEquipChangeNotifyOuterClass {
         hash = (37 * hash) + WEAPON_FIELD_NUMBER;
         hash = (53 * hash) + getWeapon().hashCode();
       }
-      hash = (37 * hash) + EQUIP_GUID_FIELD_NUMBER;
-      hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
-          getEquipGuid());
       hash = (37 * hash) + ITEM_ID_FIELD_NUMBER;
       hash = (53 * hash) + getItemId();
+      hash = (37 * hash) + EQUIP_TYPE_FIELD_NUMBER;
+      hash = (53 * hash) + getEquipType();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -520,8 +522,10 @@ public final class AvatarEquipChangeNotifyOuterClass {
     }
     /**
      * <pre>
-     * Name: IKNNNIGIPLE
+     * CmdId: 647
-     * CmdId: 661
+     * EnetChannelId: 0
+     * EnetIsReliable: false
+     * IsAllowClient: true
      * </pre>
      *
      * Protobuf type {@code AvatarEquipChangeNotify}
@@ -561,10 +565,10 @@ public final class AvatarEquipChangeNotifyOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        equipType_ = 0;
-
         avatarGuid_ = 0L;
 
+        equipGuid_ = 0L;
+
         if (reliquaryBuilder_ == null) {
           reliquary_ = null;
         } else {
@@ -577,10 +581,10 @@ public final class AvatarEquipChangeNotifyOuterClass {
           weapon_ = null;
           weaponBuilder_ = null;
         }
-        equipGuid_ = 0L;
-
         itemId_ = 0;
 
+        equipType_ = 0;
+
         return this;
       }
 
@@ -607,8 +611,8 @@ public final class AvatarEquipChangeNotifyOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.AvatarEquipChangeNotifyOuterClass.AvatarEquipChangeNotify buildPartial() {
         emu.grasscutter.net.proto.AvatarEquipChangeNotifyOuterClass.AvatarEquipChangeNotify result = new emu.grasscutter.net.proto.AvatarEquipChangeNotifyOuterClass.AvatarEquipChangeNotify(this);
-        result.equipType_ = equipType_;
         result.avatarGuid_ = avatarGuid_;
+        result.equipGuid_ = equipGuid_;
         if (reliquaryBuilder_ == null) {
           result.reliquary_ = reliquary_;
         } else {
@@ -619,8 +623,8 @@ public final class AvatarEquipChangeNotifyOuterClass {
         } else {
           result.weapon_ = weaponBuilder_.build();
         }
-        result.equipGuid_ = equipGuid_;
         result.itemId_ = itemId_;
+        result.equipType_ = equipType_;
         onBuilt();
         return result;
       }
@@ -669,24 +673,24 @@ public final class AvatarEquipChangeNotifyOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.AvatarEquipChangeNotifyOuterClass.AvatarEquipChangeNotify other) {
         if (other == emu.grasscutter.net.proto.AvatarEquipChangeNotifyOuterClass.AvatarEquipChangeNotify.getDefaultInstance()) return this;
-        if (other.getEquipType() != 0) {
-          setEquipType(other.getEquipType());
-        }
         if (other.getAvatarGuid() != 0L) {
           setAvatarGuid(other.getAvatarGuid());
         }
+        if (other.getEquipGuid() != 0L) {
+          setEquipGuid(other.getEquipGuid());
+        }
         if (other.hasReliquary()) {
           mergeReliquary(other.getReliquary());
         }
         if (other.hasWeapon()) {
           mergeWeapon(other.getWeapon());
         }
-        if (other.getEquipGuid() != 0L) {
-          setEquipGuid(other.getEquipGuid());
-        }
         if (other.getItemId() != 0) {
           setItemId(other.getItemId());
         }
+        if (other.getEquipType() != 0) {
+          setEquipType(other.getEquipType());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -716,40 +720,9 @@ public final class AvatarEquipChangeNotifyOuterClass {
         return this;
       }
 
-      private int equipType_ ;
-      /**
-       * <code>uint32 equip_type = 5;</code>
-       * @return The equipType.
-       */
-      @java.lang.Override
-      public int getEquipType() {
-        return equipType_;
-      }
-      /**
-       * <code>uint32 equip_type = 5;</code>
-       * @param value The equipType to set.
-       * @return This builder for chaining.
-       */
-      public Builder setEquipType(int value) {
-        
-        equipType_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 equip_type = 5;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearEquipType() {
-        
-        equipType_ = 0;
-        onChanged();
-        return this;
-      }
-
       private long avatarGuid_ ;
       /**
-       * <code>uint64 avatar_guid = 3;</code>
+       * <code>uint64 avatar_guid = 10;</code>
        * @return The avatarGuid.
        */
       @java.lang.Override
@@ -757,7 +730,7 @@ public final class AvatarEquipChangeNotifyOuterClass {
         return avatarGuid_;
       }
       /**
-       * <code>uint64 avatar_guid = 3;</code>
+       * <code>uint64 avatar_guid = 10;</code>
        * @param value The avatarGuid to set.
        * @return This builder for chaining.
        */
@@ -768,7 +741,7 @@ public final class AvatarEquipChangeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>uint64 avatar_guid = 3;</code>
+       * <code>uint64 avatar_guid = 10;</code>
        * @return This builder for chaining.
        */
       public Builder clearAvatarGuid() {
@@ -778,18 +751,49 @@ public final class AvatarEquipChangeNotifyOuterClass {
         return this;
       }
 
+      private long equipGuid_ ;
+      /**
+       * <code>uint64 equip_guid = 13;</code>
+       * @return The equipGuid.
+       */
+      @java.lang.Override
+      public long getEquipGuid() {
+        return equipGuid_;
+      }
+      /**
+       * <code>uint64 equip_guid = 13;</code>
+       * @param value The equipGuid to set.
+       * @return This builder for chaining.
+       */
+      public Builder setEquipGuid(long value) {
+        
+        equipGuid_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint64 equip_guid = 13;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearEquipGuid() {
+        
+        equipGuid_ = 0L;
+        onChanged();
+        return this;
+      }
+
       private emu.grasscutter.net.proto.SceneReliquaryInfoOuterClass.SceneReliquaryInfo reliquary_;
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.SceneReliquaryInfoOuterClass.SceneReliquaryInfo, emu.grasscutter.net.proto.SceneReliquaryInfoOuterClass.SceneReliquaryInfo.Builder, emu.grasscutter.net.proto.SceneReliquaryInfoOuterClass.SceneReliquaryInfoOrBuilder> reliquaryBuilder_;
       /**
-       * <code>.SceneReliquaryInfo reliquary = 6;</code>
+       * <code>.SceneReliquaryInfo reliquary = 1;</code>
        * @return Whether the reliquary field is set.
        */
       public boolean hasReliquary() {
         return reliquaryBuilder_ != null || reliquary_ != null;
       }
       /**
-       * <code>.SceneReliquaryInfo reliquary = 6;</code>
+       * <code>.SceneReliquaryInfo reliquary = 1;</code>
        * @return The reliquary.
        */
       public emu.grasscutter.net.proto.SceneReliquaryInfoOuterClass.SceneReliquaryInfo getReliquary() {
@@ -800,7 +804,7 @@ public final class AvatarEquipChangeNotifyOuterClass {
         }
       }
       /**
-       * <code>.SceneReliquaryInfo reliquary = 6;</code>
+       * <code>.SceneReliquaryInfo reliquary = 1;</code>
        */
       public Builder setReliquary(emu.grasscutter.net.proto.SceneReliquaryInfoOuterClass.SceneReliquaryInfo value) {
         if (reliquaryBuilder_ == null) {
@@ -816,7 +820,7 @@ public final class AvatarEquipChangeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.SceneReliquaryInfo reliquary = 6;</code>
+       * <code>.SceneReliquaryInfo reliquary = 1;</code>
        */
       public Builder setReliquary(
           emu.grasscutter.net.proto.SceneReliquaryInfoOuterClass.SceneReliquaryInfo.Builder builderForValue) {
@@ -830,7 +834,7 @@ public final class AvatarEquipChangeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.SceneReliquaryInfo reliquary = 6;</code>
+       * <code>.SceneReliquaryInfo reliquary = 1;</code>
        */
       public Builder mergeReliquary(emu.grasscutter.net.proto.SceneReliquaryInfoOuterClass.SceneReliquaryInfo value) {
         if (reliquaryBuilder_ == null) {
@@ -848,7 +852,7 @@ public final class AvatarEquipChangeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.SceneReliquaryInfo reliquary = 6;</code>
+       * <code>.SceneReliquaryInfo reliquary = 1;</code>
        */
       public Builder clearReliquary() {
         if (reliquaryBuilder_ == null) {
@@ -862,7 +866,7 @@ public final class AvatarEquipChangeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.SceneReliquaryInfo reliquary = 6;</code>
+       * <code>.SceneReliquaryInfo reliquary = 1;</code>
        */
       public emu.grasscutter.net.proto.SceneReliquaryInfoOuterClass.SceneReliquaryInfo.Builder getReliquaryBuilder() {
         
@@ -870,7 +874,7 @@ public final class AvatarEquipChangeNotifyOuterClass {
         return getReliquaryFieldBuilder().getBuilder();
       }
       /**
-       * <code>.SceneReliquaryInfo reliquary = 6;</code>
+       * <code>.SceneReliquaryInfo reliquary = 1;</code>
        */
       public emu.grasscutter.net.proto.SceneReliquaryInfoOuterClass.SceneReliquaryInfoOrBuilder getReliquaryOrBuilder() {
         if (reliquaryBuilder_ != null) {
@@ -881,7 +885,7 @@ public final class AvatarEquipChangeNotifyOuterClass {
         }
       }
       /**
-       * <code>.SceneReliquaryInfo reliquary = 6;</code>
+       * <code>.SceneReliquaryInfo reliquary = 1;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.SceneReliquaryInfoOuterClass.SceneReliquaryInfo, emu.grasscutter.net.proto.SceneReliquaryInfoOuterClass.SceneReliquaryInfo.Builder, emu.grasscutter.net.proto.SceneReliquaryInfoOuterClass.SceneReliquaryInfoOrBuilder> 
@@ -901,14 +905,14 @@ public final class AvatarEquipChangeNotifyOuterClass {
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.SceneWeaponInfoOuterClass.SceneWeaponInfo, emu.grasscutter.net.proto.SceneWeaponInfoOuterClass.SceneWeaponInfo.Builder, emu.grasscutter.net.proto.SceneWeaponInfoOuterClass.SceneWeaponInfoOrBuilder> weaponBuilder_;
       /**
-       * <code>.SceneWeaponInfo weapon = 12;</code>
+       * <code>.SceneWeaponInfo weapon = 15;</code>
        * @return Whether the weapon field is set.
        */
       public boolean hasWeapon() {
         return weaponBuilder_ != null || weapon_ != null;
       }
       /**
-       * <code>.SceneWeaponInfo weapon = 12;</code>
+       * <code>.SceneWeaponInfo weapon = 15;</code>
        * @return The weapon.
        */
       public emu.grasscutter.net.proto.SceneWeaponInfoOuterClass.SceneWeaponInfo getWeapon() {
@@ -919,7 +923,7 @@ public final class AvatarEquipChangeNotifyOuterClass {
         }
       }
       /**
-       * <code>.SceneWeaponInfo weapon = 12;</code>
+       * <code>.SceneWeaponInfo weapon = 15;</code>
        */
       public Builder setWeapon(emu.grasscutter.net.proto.SceneWeaponInfoOuterClass.SceneWeaponInfo value) {
         if (weaponBuilder_ == null) {
@@ -935,7 +939,7 @@ public final class AvatarEquipChangeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.SceneWeaponInfo weapon = 12;</code>
+       * <code>.SceneWeaponInfo weapon = 15;</code>
        */
       public Builder setWeapon(
           emu.grasscutter.net.proto.SceneWeaponInfoOuterClass.SceneWeaponInfo.Builder builderForValue) {
@@ -949,7 +953,7 @@ public final class AvatarEquipChangeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.SceneWeaponInfo weapon = 12;</code>
+       * <code>.SceneWeaponInfo weapon = 15;</code>
        */
       public Builder mergeWeapon(emu.grasscutter.net.proto.SceneWeaponInfoOuterClass.SceneWeaponInfo value) {
         if (weaponBuilder_ == null) {
@@ -967,7 +971,7 @@ public final class AvatarEquipChangeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.SceneWeaponInfo weapon = 12;</code>
+       * <code>.SceneWeaponInfo weapon = 15;</code>
        */
       public Builder clearWeapon() {
         if (weaponBuilder_ == null) {
@@ -981,7 +985,7 @@ public final class AvatarEquipChangeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.SceneWeaponInfo weapon = 12;</code>
+       * <code>.SceneWeaponInfo weapon = 15;</code>
        */
       public emu.grasscutter.net.proto.SceneWeaponInfoOuterClass.SceneWeaponInfo.Builder getWeaponBuilder() {
         
@@ -989,7 +993,7 @@ public final class AvatarEquipChangeNotifyOuterClass {
         return getWeaponFieldBuilder().getBuilder();
       }
       /**
-       * <code>.SceneWeaponInfo weapon = 12;</code>
+       * <code>.SceneWeaponInfo weapon = 15;</code>
        */
       public emu.grasscutter.net.proto.SceneWeaponInfoOuterClass.SceneWeaponInfoOrBuilder getWeaponOrBuilder() {
         if (weaponBuilder_ != null) {
@@ -1000,7 +1004,7 @@ public final class AvatarEquipChangeNotifyOuterClass {
         }
       }
       /**
-       * <code>.SceneWeaponInfo weapon = 12;</code>
+       * <code>.SceneWeaponInfo weapon = 15;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.SceneWeaponInfoOuterClass.SceneWeaponInfo, emu.grasscutter.net.proto.SceneWeaponInfoOuterClass.SceneWeaponInfo.Builder, emu.grasscutter.net.proto.SceneWeaponInfoOuterClass.SceneWeaponInfoOrBuilder> 
@@ -1016,40 +1020,9 @@ public final class AvatarEquipChangeNotifyOuterClass {
         return weaponBuilder_;
       }
 
-      private long equipGuid_ ;
-      /**
-       * <code>uint64 equip_guid = 2;</code>
-       * @return The equipGuid.
-       */
-      @java.lang.Override
-      public long getEquipGuid() {
-        return equipGuid_;
-      }
-      /**
-       * <code>uint64 equip_guid = 2;</code>
-       * @param value The equipGuid to set.
-       * @return This builder for chaining.
-       */
-      public Builder setEquipGuid(long value) {
-        
-        equipGuid_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint64 equip_guid = 2;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearEquipGuid() {
-        
-        equipGuid_ = 0L;
-        onChanged();
-        return this;
-      }
-
       private int itemId_ ;
       /**
-       * <code>uint32 item_id = 9;</code>
+       * <code>uint32 item_id = 14;</code>
        * @return The itemId.
        */
       @java.lang.Override
@@ -1057,7 +1030,7 @@ public final class AvatarEquipChangeNotifyOuterClass {
         return itemId_;
       }
       /**
-       * <code>uint32 item_id = 9;</code>
+       * <code>uint32 item_id = 14;</code>
        * @param value The itemId to set.
        * @return This builder for chaining.
        */
@@ -1068,7 +1041,7 @@ public final class AvatarEquipChangeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>uint32 item_id = 9;</code>
+       * <code>uint32 item_id = 14;</code>
        * @return This builder for chaining.
        */
       public Builder clearItemId() {
@@ -1077,6 +1050,37 @@ public final class AvatarEquipChangeNotifyOuterClass {
         onChanged();
         return this;
       }
+
+      private int equipType_ ;
+      /**
+       * <code>uint32 equip_type = 8;</code>
+       * @return The equipType.
+       */
+      @java.lang.Override
+      public int getEquipType() {
+        return equipType_;
+      }
+      /**
+       * <code>uint32 equip_type = 8;</code>
+       * @param value The equipType to set.
+       * @return This builder for chaining.
+       */
+      public Builder setEquipType(int value) {
+        
+        equipType_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 equip_type = 8;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearEquipType() {
+        
+        equipType_ = 0;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -1146,11 +1150,11 @@ public final class AvatarEquipChangeNotifyOuterClass {
     java.lang.String[] descriptorData = {
       "\n\035AvatarEquipChangeNotify.proto\032\030SceneRe" +
       "liquaryInfo.proto\032\025SceneWeaponInfo.proto" +
-      "\"\261\001\n\027AvatarEquipChangeNotify\022\022\n\nequip_ty" +
+      "\"\261\001\n\027AvatarEquipChangeNotify\022\023\n\013avatar_g" +
-      "pe\030\005 \001(\r\022\023\n\013avatar_guid\030\003 \001(\004\022&\n\treliqua" +
+      "uid\030\n \001(\004\022\022\n\nequip_guid\030\r \001(\004\022&\n\treliqua" +
-      "ry\030\006 \001(\0132\023.SceneReliquaryInfo\022 \n\006weapon\030" +
+      "ry\030\001 \001(\0132\023.SceneReliquaryInfo\022 \n\006weapon\030" +
-      "\014 \001(\0132\020.SceneWeaponInfo\022\022\n\nequip_guid\030\002 " +
+      "\017 \001(\0132\020.SceneWeaponInfo\022\017\n\007item_id\030\016 \001(\r" +
-      "\001(\004\022\017\n\007item_id\030\t \001(\rB\033\n\031emu.grasscutter." +
+      "\022\022\n\nequip_type\030\010 \001(\rB\033\n\031emu.grasscutter." +
       "net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -1164,7 +1168,7 @@ public final class AvatarEquipChangeNotifyOuterClass {
     internal_static_AvatarEquipChangeNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_AvatarEquipChangeNotify_descriptor,
-        new java.lang.String[] { "EquipType", "AvatarGuid", "Reliquary", "Weapon", "EquipGuid", "ItemId", });
+        new java.lang.String[] { "AvatarGuid", "EquipGuid", "Reliquary", "Weapon", "ItemId", "EquipType", });
     emu.grasscutter.net.proto.SceneReliquaryInfoOuterClass.getDescriptor();
     emu.grasscutter.net.proto.SceneWeaponInfoOuterClass.getDescriptor();
   }