grasscutter3.6

update GC 3.6

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,7 +1,7 @@
 ## Description
 
 Please carefully read the [Contributing note](https://github.com/Grasscutters/Grasscutter/blob/stable/CONTRIBUTING.md) and [Code of conduct](https://github.com/Grasscutters/Grasscutter/blob/development/CODE_OF_CONDUCT.md) before making any pull requests.
-And, **Do not make a pull request to merge into stable unless it is a hotfix. Use the development branch instead.**
+
 ## Issues fixed by this PR
 
 <!--- Put the links of issues that may be fixed by this PR here (if any). -->
@@ -19,4 +19,4 @@ And, **Do not make a pull request to merge into stable unless it is a hotfix. Us
 - [ ] My code follows the style guidelines of this project
 - [ ] My pull request is unique and no other pull requests have been opened for these changes
 - [ ] I have read the [Contributing note](https://github.com/Grasscutters/Grasscutter/blob/stable/CONTRIBUTING.md) and [Code of conduct](https://github.com/Grasscutters/Grasscutter/blob/development/CODE_OF_CONDUCT.md)
-- [ ] I am responsible for any copyright issues with my code if it occurs in the future.
+- [ ] I am responsible for any copyright issues with my code if it occurs in the future.

LICENSE

@@ -633,8 +633,8 @@ the "copyright" line and a pointer to where the full notice is found.
     Copyright (C) <year>  <name of author>
 
     This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published
-    by the Free Software Foundation, either version 3 of the License, or
+    it under the terms of the GNU Affero General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,

README.md

@@ -1,106 +1,11 @@
-![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>
+# Anime Game Protos 3.6 (For Grasscutters)
+This repository contains the [ProtoBuf](https://github.com/google/protobuf) `.proto` files for Anime Game API.<br/>
 
-<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>
+## NOTE
+At least you can log in and see, gacha not fixed yet so please help me.
 
-[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)
-
-**Attention:** We always welcome contributors to the project. Before adding your contribution, please carefully read our [Code of Conduct](https://github.com/Grasscutters/Grasscutter/blob/stable/CONTRIBUTING.md).
-
-## Current features
-
-* Logging in
-* Combat
-* Friends list
-* Teleportation
-* Gacha system
-* Co-op *partially* works
-* Spawning monsters via console
-* Inventory features (receiving items/characters, upgrading items/characters, etc)
-
-## Quick setup guide
-
-**Note:** For support please join our [Discord](https://discord.gg/T5vZU6UyeG).
-
-### Requirements
-
-* [Java SE - 17](https://www.oracle.com/java/technologies/javase/jdk17-archive-downloads.html) or higher
-
-  **Note:** If you just want to **run it**, then **jre** only is fine.
-
-* [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
-
-**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).
-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]).
-
-1. Redirect traffic: (choose one only)
-    - mitmdump: `mitmdump -s proxy.py -k`
-
-        - 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...
-
-          - Via command line *(needs administration privileges)*
-
-             ```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`, 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.
-
-    - [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` environment and configure the `start_config.cmd` file.**
-
-### Building
-
-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
-- [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
-```
-
-##### Linux
-
-```bash
-git clone https://github.com/Grasscutters/Grasscutter.git
-cd Grasscutter
-chmod +x gradlew
-./gradlew jar # Compile
-```
-
-You can find the output jar in the root of the project folder.
-
-### Commands have moved to the [wiki](https://github.com/Grasscutters/Grasscutter/wiki/Commands)!
-
-# Quick Troubleshooting
-
-* If compiling wasn't successful, please check your JDK installation (Make sure its JDK 17 or higher 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.
-* Startup sequence: MongoDB > Grasscutter > Proxy Daemon (mitmdump, fiddler, etc.) > Game
+## Source 
+ - [Crepe & kyoko](https://git.crepe.moe/crepe-inc/crepe-protos) (3.6) <br/>
+ - [CloudyPS](https://github.com/CloudyPS/protos/) (3.6) (Mirrored from Crepe) <br/>
+ - [NickTheHuy (Hiro)](https://github.com/NickTheHuy/3.5_protos) (3.5) <br/>
+ - [Sorapointa Team](https://github.com/Sorapointa/Sorapointa-Protos) (<3.3)

build.gradle

@@ -34,6 +34,9 @@ plugins {
     // Maven
     id 'maven-publish'
     id 'signing'
+
+    // Lombok for delombok'ification
+    id "io.freefair.lombok" version "6.6.1"
 }
 
 compileJava.options.encoding = "UTF-8"
@@ -43,7 +46,7 @@ sourceCompatibility = JavaVersion.VERSION_17
 targetCompatibility = JavaVersion.VERSION_17
 
 group = 'xyz.grasscutters'
-version = '1.5.1-dev'
+version = '1.4.8'
 
 sourceCompatibility = 17
 targetCompatibility = 17
@@ -76,7 +79,7 @@ dependencies {
     implementation group: 'io.netty', name: 'netty-transport-native-kqueue', version: '4.1.79.Final'
 
     implementation group: 'com.google.code.gson', name: 'gson', version: '2.9.0'
-    implementation group: 'com.google.protobuf', name: 'protobuf-java', version: '3.21.10'
+    implementation group: 'com.google.protobuf', name: 'protobuf-java', version: '3.18.2'
 
     implementation group: 'org.reflections', name: 'reflections', version: '0.10.2'
 
@@ -90,8 +93,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.github.davidmoten', name : 'rtree-multi', version: '0.1'
+    implementation group: 'com.esotericsoftware', name: 'reflectasm', version: '1.11.9'
+    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'
@@ -113,7 +116,6 @@ application {
     getMainClass().set('emu.grasscutter.Grasscutter')
 }
 
-
 jar {
     exclude '*.proto'
 
@@ -123,7 +125,7 @@ jar {
 
     archiveBaseName = 'grasscutter'
     if (project.hasProperty('jarFilename')) {
-        archiveFileName = "${jarFilename}.${extension}"
+        archiveFileName = "${jarFilename}.${archiveExtension}"
     }
 
     from {
@@ -179,16 +181,16 @@ publishing {
     }
     repositories {
         maven {
-            if(version.endsWith('-dev')) {
-                println ("Publishing to 4benj-maven")
+            if (version.endsWith('-dev')) {
+                println("Publishing to 4benj-maven")
                 url 'https://repo.4benj.com/releases'
                 name '4benj-maven'
                 credentials {
                     username System.getenv('benj_maven_username')
                     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
@@ -209,7 +211,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/"
 }
 
@@ -220,7 +222,7 @@ sourceSets {
             srcDir 'src/generated'
         }
         java {
-            srcDir 'src/java'
+            srcDir 'src/generated/main/java'
         }
     }
 }
@@ -236,23 +238,25 @@ 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 {
@@ -264,8 +268,7 @@ 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}\";
@@ -277,3 +280,16 @@ public final class BuildConfig {
 processResources {
     dependsOn "generateProto"
 }
+
+sourcesJar {
+    dependsOn "generateProto"
+}
+
+delombok {
+    dependsOn "generateProto"
+}
+
+// For terminal interacting in IDEA running
+run {
+    standardInput = System.in
+}