Merge branch 'development' into main

README.md

@@ -60,12 +60,19 @@ There is a dummy user named "Server" in every player's friends list that you can
 
 `!resetconst` - Resets the constellation level on your current active character, will need to relog after using the command to see any changes.
 
-`!setstats [stat] [value]`
+`!setstats [stats] [amount]` - Changes the current character's specified stat.
 
 `!clearartifacts` - Deletes all unequipped and unlocked level 0 artifacts, **including yellow rarity ones** from your inventory
 
+`!pos` - Gets your current coordinate.
+
+`!weather [weather id] [climate id]` - Changes the current weather.
+
 *More commands will be updated in the [wiki](https://github.com/Melledy/Grasscutter/wiki/).*
 
+### Bonus
+When you want to teleport to somewhere, use the ingame marking function on Map, click Confirm. You will see your character falling from a very high destination, exact location that you marked.
+
 # Quick Troubleshooting
 * If compiling wasn't successful, please check your JDK installation (must be JDK 8 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 using Fiddler make sure it running on another port except 8888

build.gradle

@@ -23,19 +23,21 @@ repositories {
 }
 
 dependencies {
-    compile fileTree(dir: 'lib', include: '*.jar')
+    implementation fileTree(dir: 'lib', include: ['*.jar'])
 
-	compile group: 'org.slf4j', name: 'slf4j-api', version: '1.7.32'
-	compile group: 'ch.qos.logback', name: 'logback-core', version: '1.2.6'
-    compile group: 'ch.qos.logback', name: 'logback-classic', version: '1.2.6'
-    compile group: 'io.netty', name: 'netty-all', version: '4.1.69.Final'
+	implementation group: 'org.slf4j', name: 'slf4j-api', version: '1.7.32'
+	implementation group: 'ch.qos.logback', name: 'logback-core', version: '1.2.6'
+    implementation group: 'ch.qos.logback', name: 'logback-classic', version: '1.2.6'
+    implementation group: 'io.netty', name: 'netty-all', version: '4.1.69.Final'
 
-	compile group: 'com.google.code.gson', name: 'gson', version: '2.8.8'
-	compile group: 'com.google.protobuf', name: 'protobuf-java', version: '3.18.1'
+	implementation group: 'com.google.code.gson', name: 'gson', version: '2.8.8'
+	implementation group: 'com.google.protobuf', name: 'protobuf-java', version: '3.18.1'
 
-	compile group: 'org.reflections', name: 'reflections', version: '0.9.12'
+	implementation group: 'org.reflections', name: 'reflections', version: '0.9.12'
 
-	compile group: 'dev.morphia.morphia', name: 'core', version: '1.6.1'
+	implementation group: 'dev.morphia.morphia', name: 'core', version: '1.6.1'
+
+    implementation group: 'org.greenrobot', name: 'eventbus-java', version: '3.3.1'
 }
 
 application {
@@ -51,9 +53,11 @@ jar {
     jar.baseName = 'grasscutter'
 
     from {
-        configurations.compile.collect { it.isDirectory() ? it : zipTree(it) }
+        configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) }
     }
 
+    duplicatesStrategy = DuplicatesStrategy.INCLUDE
+
     from('src/main/java') {
 		include '*.xml'
 	}

data/Banners.json

@@ -19,7 +19,7 @@
 		"bannerType": "EVENT",
 		"prefabPath": "GachaShowPanel_A079",
 		"previewPrefabPath": "UI_Tab_GachaShowPanel_A079",
-		"titlePath": "UI_GACHA_SHOW_PANEL_A079_TITLE",
+		"titlePath": "UI_GACHA_SHOW_PANEL_A048_TITLE",
 		"costItem": 223,
 		"beginTime": 0,
 		"endTime": 1924992000,
@@ -34,7 +34,7 @@
 		"bannerType": "WEAPON",
 		"prefabPath": "GachaShowPanel_A080",
 		"previewPrefabPath": "UI_Tab_GachaShowPanel_A080",
-		"titlePath": "UI_GACHA_SHOW_PANEL_A080_TITLE",
+		"titlePath": "UI_GACHA_SHOW_PANEL_A021_TITLE",
 		"costItem": 223,
 		"beginTime": 0,
 		"endTime": 1924992000,

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

proxy.py

@@ -16,12 +16,14 @@
 #     - mitmdump from mitmproxy
 #
 #   @author MlgmXyysd
-#   @version 1.0
+#   @version 1.1
 #
 ##
 
 from mitmproxy import http
+from proxy_config import USE_SSL
 from proxy_config import REMOTE_HOST
+from proxy_config import REMOTE_PORT
 
 class MlgmXyysd_Genshin_Impact_Proxy:
 
@@ -60,7 +62,12 @@ class MlgmXyysd_Genshin_Impact_Proxy:
 
     def request(self, flow: http.HTTPFlow) -> None:
         if flow.request.host in self.LIST_DOMAINS:
+            if USE_SSL:
+                flow.request.scheme = "https"
+            else:
+                flow.request.scheme = "http"
             flow.request.host = REMOTE_HOST
+            flow.request.port = REMOTE_PORT
 
 addons = [
 	MlgmXyysd_Genshin_Impact_Proxy()

proxy_config.py

@@ -1,2 +1,4 @@
 # This can also be replaced with another IP address.
-REMOTE_HOST = "localhost"
+USE_SSL = True
+REMOTE_HOST = "127.0.0.1"
+REMOTE_PORT = 443