Merge unstable into development (#2173)

* Remove more scene synchronized * Fix worktop options not appearing * Format code [skip actions] * Fix delay with server tasks * Format code [skip actions] * Fully fix fairy clock (#2146) * Fix scene transition * fully fix fairy clock * Re-add call to `Player#updatePlayerGameTime` * Format code [skip actions] * Initialize the script loader in `ResourceLoader#loadAll` * Fix region removal checking * Format code [skip actions] * Use Lombok's `EqualsAndHashCode` for comparing scene regions * Format code [skip actions] * Move 'invalid gather object' to `trace` * Add more information to the 'unknown condition handler' message * Move invalid ability action to trace * Make `KcpTunnel` public * Validate the NPC being talked to * Format code [skip actions] * NPCs are not spawned server side; change logic to handle it * Format code [skip actions] * unload scene when there are no players (#2147) * unload scene when there are no players * Update src/main/java/emu/grasscutter/game/world/Scene.java Co-authored-by: Magix <27646710+KingRainbow44@users.noreply.github.com> --------- Co-authored-by: Magix <27646710+KingRainbow44@users.noreply.github.com> * Check if a command should be copied or HTTP should be used * Lint Code [skip actions] * Fix character names rendering incorrectly * Add basic troubleshooting command * Implement handbook teleporting also a few formatting changes and sort data by logical sense * Fix listener `ConcurrentModificationException` issue * Add color change to `Join the Community!` * Lint Code [skip actions] * Make clickable buttons appear clickable * Remove 'Mechanicus' entities from the list of entities * Format code [skip actions] * Fix going back returning a blank screen * Implement entity spawning * Add setting level to entity card * Add support for 'plain text' mode * Make descriptions of objects scrollable * Lint Code [skip actions] * Format code [skip actions] * Change the way existing hooks work * Format code [skip actions] * Upgrade Javalin to 5.5.0 & Fix project warnings * Upgrade logging libraries * Fix gacha mappings static file issue * Add temporary backwards compatability for `ServerHelper` * Format code [skip actions] * Remove artifact signatures from VCS * Fix forge queue data protocol definition * Run `spotlessApply` * Format code [skip actions] * Download data required for building artifacts * Add call for Facebook logins * Add the wiki page as a submodule * Format code [skip actions] * Update translation (#2150) * Update translation * Update translation * Separate the dispatch and game servers (pt. 1) gacha is still broken, handbook still needs to be done * Format code [skip actions] * Separate the dispatch and game servers (pt. 2) this commit fixes the gacha page * Add description for '/troubleshoot' * Set default avatar talent level to 10 * Separate the dispatch and game servers (pt. 3) implement handbook across servers! * Format code [skip actions] * Update GitHub Actions to use 'download-file' over 'wget' * Gm handbook lmao (#2149) * Fix font issue * Fix avatars * Fix text overflow in commands * Fix virtualized lists and items page 😭😭 * magix why 💀 * use hover style in all minicards * button * remove console.log * lint * Add icons * magix asked * Fix overflow padding issue * Fix achievement text overflow * remove icons from repo * Change command icon * Add the wiki page as a submodule * total magix moment * fix text overflow in commands * Fix discord button * Make text scale on Minicard * import icons and font from another source * Add hover effects to siebar buttons * move font and readme to submodule repo * Make data folder a submodule * import icons and font from data submodule * Update README.md * total magix moment * magix moment v2 * submodule change * Import `.webp` files * Resize `HomeButton` * Fix 'Copy Command' reappearing after changing pages --------- Co-authored-by: KingRainbow44 <kobedo11@gmail.com> * Lint Code [skip actions] * Download data for the build, not for the lint * format imports this is really just to see if build handbook works kek * Implement proper handbook authentication (pt. 1) * Implement proper handbook authentication (pt. 2) * Format code [skip actions] * Add quest data dumping for the handbook * Change colors to fit _something suitable_ * Format code [skip actions] * Fix force pushing to branches after linting * Fix logic of `SetPlayerPropReq` * Move more group loading to `trace` * Add handbook IP authentication in hybrid mode * Fix player level up not displaying on the client properly * Format code [skip actions] * Fix game time locking * Format code [skip actions] * Update player properties * Format code [skip actions] * Move `warn`s for groups to `debug` * Fix player pausing * Move more logs to `trace` * Use `removeItemById` for deleting items via quests * Clean up logger more * Pause in-game time when the world is paused * Format code [skip actions] * More player property documentation * Multi-threaded resource loading * Format code [skip actions] * Add quest widgets * Add quests page (basic impl.) * Add/fix colors also fix tailwind * Remove banned packets client modifications already perform the job of blocking malicious packets from being executed, no point in having this if self-windy is wanted * Re-add `BeginCameraSceneLookNotify` * Fix being unable to attack (#2157) * Add `PlayerOpenChestEvent` * Add methods to get players from the server * Add static methods to register an event handler * Add `PlayerEnterDungeonEvent` * Remove legacy documentation from `PlayerMoveEvent` * Add `PlayerChatEvent` * Add defaults to `Position` * Clean up `.utils` * Revert `Multi-threaded resource loading` * Fix changing target UID when talking to the server * Lint Code [skip actions] * Format code [skip actions] * fix NPC talk triggering main quest in 46101 (#2158) Make it so that only talks where the param matches the talkId are checked. * Format code [skip actions] * Partially fix Chasing Shadows (#2159) * Partially fix Chasing Shadows * Go ahead and move it before the return before Magix tells me to. * Format code [skip actions] * Bring back period lol (#2160) * Disable SNI for the HTTPS server * Add `EntityCreationEvent` * Add initial startup message this is so the server appears like its preparing to start * Format code [skip actions] * Enable debug mode for plugin loggers if enabled for the primary logger * Add documentation about `WorldAreaConfigData` * Make more fields in excels accessible * Remove deprecated fields from `GetShopRsp` * Run `spotlessApply` on definitions * Add `PlayerEnterAreaEvent` * Optimize event calls * Fix event invokes * Format code [skip actions] * Remove manual autofinish for main quests. (#2162) * Add world areas to the textmap cache * Format code [skip actions] * Don't overdefine variables in extended classes (#2163) * Add dumper for world areas * Format code [skip actions] * instantiate personalLineList (#2165) * Fix protocol definitions thank you Nazrin! (+ hiro for raw definitions) * Fix the background color leaking from the character widget * Change HTML spacing to 2 spaces * Implement hiding widgets * Change scrollbar to a vibrant color * Add _some_ scaling to the home buttons and its text * Build the handbook with Gradle * Fix the 'finer details' with the handbook UI * Lint Code [skip actions] * Fix target destination for the Gradle-built handbook * Implement fetching a player across servers & Add a chainable JsonObject useful for plugins! might be used in grasscutter eventually * Fix GitHub actions * Fix event calling & canceling * Run `spotlessApply` * Rename fields (might be wrong) * Add/update all/more protocol definitions * Add/update all/more protocol definitions * Remove outdated packet * Fix protocol definitions * Format code [skip actions] * Implement some lua variables for less console spam (#2172) * Implement some lua variables for less console spam * Add GetHostQuestState This fixes some chapter 3 stuff. * Format code [skip actions] * Fix merge import * Format code [skip actions] * Fully fix fairy clock for real this time (#2167) * Fully fix fairy clock For real this time * Make it so relogging keeps the time lock state. * Refactor out questLockTime * Per Hartie, the client packet needs to be changed too * Update src/main/java/emu/grasscutter/game/world/World.java Co-authored-by: Magix <27646710+KingRainbow44@users.noreply.github.com> * Update src/main/java/emu/grasscutter/server/packet/recv/HandlerClientLockGameTimeNotify.java * Remove all code not needed to get clock working --------- Co-authored-by: Magix <27646710+KingRainbow44@users.noreply.github.com> * Implement a proper ability system (#2166) * Apply fix `21dec2fe` * Apply fix `89d01d5f` * Apply fix `d900f154` this one was already implemented; updated to use call from previous commit * Ability changing commit TODO: change info to debug * Remove use of deprecated methods/fields * Temp commit v2 (Adding LoseHP and some fixes) * Oopsie * Probably fix monster battle * Fix issue with reflecting into fields * Fix some things * Fix ability names for 3.6 resources * Improve logging --------- Co-authored-by: StartForKiller <jesussanz2003@gmail.com> * Format code [skip actions] * Add system for sending messages between servers * Format some code * Remove protocol definitions from Spotless * Default debug to false; enable with `-debug` * Implement completely useless global value copying * HACK: Return the avatar which holds the weapon when the weapon is referred to by ID * Add properties to `AbilityModifier` * Change the way HTML is served after authentication * Use thread executors to speed up the database loading process * Format code [skip actions] * Add system for setting handbook address and port * Lint Code [skip actions] * Format code [skip actions] * Fix game-related data not saving * Format code [skip actions] * Fix handbook server details * Lint Code [skip actions] * Format code [skip actions] * Use the headers provided by a context to get the IP address should acknowledge #1975 * Format code [skip actions] * Move more logs to `trace` * Format code [skip actions] * more trace * Fix something and implement weapon entities * Format code [skip actions] * Fix `EntityWeapon` * Remove deprecated API & Fix resource checking * Fix unnecessary warning for first-time setup * Implement handbook request limiting * Format code [skip actions] * Fix new avatar weapons being null * Format code [skip actions] * Fix issue with 35303 being un-completable & Try to fix fulfilled quest conditions being met * Load activity config on server startup * Require plugins to specify an API version and match with the server * Add default open state ignore list * Format code [skip actions] * Quick fix for questing, needs more investigation This would make the questing work again * Remove existing hack for 35303 * Fix ignored open states from being set * Format code [skip actions] * fix the stupidest bug ive ever seen * Optimize player kicking on server close * Format code [skip actions] * Re-add hack to fix 35303 * Update GitHub actions * Format code [skip actions] * Potentially fix issues with regions * Download additional handbook data * Revert "Potentially fix issues with regions" This reverts commit 84e3823695. --------- Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: scooterboo <lewasite@yahoo.com> Co-authored-by: Tesutarin <105267106+Tesutarin@users.noreply.github.com> Co-authored-by: Scald <104459145+Arikatsu@users.noreply.github.com> Co-authored-by: StartForKiller <jesussanz2003@gmail.com>
2025-09-02 23:25:13 +00:00 · 2023-05-31 20:48:16 -07:00
parent f46fd372d2
commit 9e5b57a043
3839 changed files with 1841548 additions and 37533 deletions
--- a/scripts/format_whitespace.py
+++ b/scripts/format_whitespace.py
@@ -0,0 +1,72 @@
+import re
+import subprocess
+
+
+UPSTREAM = 'https://github.com/Grasscutters/Grasscutter.git'
+RATCHET = 'LintRatchet'
+RATCHET_FALLBACK = 'c517b8a2c95473811eb07e12e73c4a69e59fbbdc'
+
+
+re_leading_whitespace = re.compile(r'^[ \t]+', re.MULTILINE)  # Replace with \1.replace('\t', '    ')
+re_trailing_whitespace = re.compile(r'[ \t]+$', re.MULTILINE)  # Replace with ''
+# Replace 'for (foo){bar' with 'for (foo) {bar'
+re_bracket_space = re.compile(r'\) *\{(?!\})')  # Replace with ') {'
+# Replace 'for(foo)' with 'foo (bar)'
+re_keyword_space = re.compile(r'(?<=\b)(if|for|while|switch|try|else|catch|finally|synchronized) *(?=[\(\{])')  # Replace with '\1 '
+
+
+def get_changed_filelist():
+    # subprocess.run(['git', 'fetch', UPSTREAM, f'{RATCHET}:{RATCHET}'])  # Ensure LintRatchet ref is matched to upstream
+    # result = subprocess.run(['git', 'diff', RATCHET, '--name-only'], capture_output=True, text=True)
+    # if result.returncode != 0:
+        # print(f'{RATCHET} not found, trying fallback {RATCHET_FALLBACK}')
+    print(f'Attempting to diff against {RATCHET_FALLBACK}')
+    result = subprocess.run(['git', 'diff', RATCHET_FALLBACK, '--name-only'], capture_output=True, text=True)
+    if result.returncode != 0:
+        # print('Fallback is also missing, aborting.')
+        print(f'Could not find {RATCHET_FALLBACK}, aborting.')
+        exit(1)
+    return result.stdout.strip().split('\n')
+
+
+def format_string(data: str):
+    data = re_leading_whitespace.sub(lambda m: m.group(0).replace('\t', '    '), data)
+    data = re_trailing_whitespace.sub('', data)
+    data = re_bracket_space.sub(') {', data)
+    data = re_keyword_space.sub(r'\1 ', data)
+    if not data.endswith('\n'):  # Enforce trailing \n
+        data = data + '\n'
+    return data
+
+
+def format_file(filename: str) -> bool:
+    try:
+        with open(filename, 'r') as file:
+            data = file.read()
+        data = format_string(data)
+        with open(filename, 'w') as file:
+            file.write(data)
+        return True
+    except FileNotFoundError:
+        print(f'File not found, probably deleted: {filename}')
+        return False
+
+
+def main():
+    filelist = [f for f in get_changed_filelist() if f.endswith('.java') and not f.startswith('src/generated')]
+    replaced = 0
+    not_found = 0
+    if not filelist:
+        print('No changed files due for formatting!')
+        return
+    print('Changed files due for formatting: ', filelist)
+    for file in filelist:
+        if format_file(file):
+            replaced += 1
+        else:
+            not_found += 1
+    print(f'Format complete! {replaced} formatted, {not_found} missing.')
+
+
+if __name__ == '__main__':
+    main()
--- a/scripts/gradlew-clean.bat
+++ b/scripts/gradlew-clean.bat
@@ -0,0 +1,4 @@
+@echo off
+
+call ..\gradlew clean
+pause
--- a/scripts/gradlew-jar.bat
+++ b/scripts/gradlew-jar.bat
@@ -0,0 +1,4 @@
+@echo off
+
+call ..\gradlew jar
+pause
--- a/scripts/install/install.sh
+++ b/scripts/install/install.sh
@@ -0,0 +1,295 @@
+#!/usr/bin/env bash
+
+# Grasscutter install script for GNU/Linux
+# Made by TurtleIdiot
+
+# Stops the installer if any command has a non-zero exit status
+set -e
+
+# Checks for root
+if [ $EUID != 0 ]; then
+        echo "Please run the installer as root!"
+        exit
+fi
+
+is_command() {
+        # Checks if a given command is available
+        local check_command="$1"
+        command -v "${check_command}" > /dev/null 2>&1
+}
+
+# IP validation
+valid_ip() {
+        local ip=$1
+        local stat=1
+
+        if [[ $ip =~ ^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$ ]]; then
+                OIFS=$IFS
+                IFS="."
+                ip=($ip)
+                IFS=$OIFS
+                [[ ${ip[0]} -le 255 && ${ip[1]} -le 255 \
+                        && ${ip[2]} -le 255 && ${ip[3]} -le 255 ]]
+                stat=$?
+        fi
+        return $stat
+}
+
+# Checks for supported installer(s) (only apt-get and pacman right now, might add more in the future)
+if is_command apt-get ; then
+        echo -e "Supported package manager found (apt-get)\n"
+
+        GC_DEPS="mongodb openjdk-17-jre"
+        INSTALLER_DEPS="wget openssl unzip git"
+        SYSTEM="deb" # Debian-based (debian, ubuntu)
+elif is_command pacman ; then
+        echo -e "supported package manager found (pacman)\n"
+
+        GC_DEPS="jre17-openjdk"
+        INSTALLER_DEPS="curl wget openssl unzip git base-devel" # curl is still a dependency here in order to successfully build mongodb
+        SYSTEM="arch" # Arch for the elitists :P
+else
+        echo "No supported package manager found"
+        exit
+fi
+
+BRANCH="stable" # Stable by default
+# Allows choice between stable and dev branch
+echo "Please select the branch you wish to install"
+echo -e "!!NOTE!!: stable is the recommended branch.\nDo *NOT* use development unless you have a reason to and know what you're doing"
+select branch in "stable" "development" ; do
+        case $branch in
+                stable )
+                        BRANCH="stable"
+                        break;;
+                development )
+                        BRANCH="development"
+                        break;;
+        esac
+done
+
+echo "The following packages will have to be installed in order to INSTALL grasscutter:"
+echo -e "$INSTALLER_DEPS \n"
+echo "The following packages will have to be installed to RUN grasscutter:"
+echo -e "$GC_DEPS \n"
+
+echo "Do you wish to proceed and install grasscutter?"
+select yn in "Yes" "No" ; do
+        case $yn in
+                Yes ) break;;
+                No ) exit;;
+        esac
+done
+
+echo "Updating package cache..."
+case $SYSTEM in # More concise than if
+        deb ) apt-get update -qq;;
+        arch ) pacman -Syy;;
+esac
+
+# Starts installing dependencies
+echo "Installing setup dependencies..."
+case $SYSTEM in # These are one-liners anyways
+        deb ) apt-get -qq install $INSTALLER_DEPS -y;;
+        arch ) pacman -Sq --noconfirm --needed $INSTALLER_DEPS > /dev/null;;
+esac
+echo "Done"
+
+echo "Installing grasscutter dependencies..."
+case $SYSTEM in
+        deb) apt-get -qq install $GC_DEPS -y > /dev/null;;
+        arch ) pacman -Sq --noconfirm --needed $GC_DEPS > /dev/null;;
+esac
+# *sighs* here we go...
+INST_ARCH_MONGO="no"
+if [ $SYSTEM = "arch" ]; then
+        echo -e "-=-=-=-=-=--- !! IMPORTANT !! ---=-=-=-=-=-\n"
+        echo -e "    Due to licensing issues with mongodb,\n    it is no longer available on the official arch repositiries."
+        echo -e "    In order to install mongodb,\n    it needs to be fetched from the Arch User Repository.\n"
+        echo -e "    As this script is running as root,\n    a temporary user will need to be created to run makepkg."
+        echo -e "    The temporary user will be deleted once\n    makepkg has finished.\n"
+        echo -e "    This will be handled automatically.\n"
+        echo -e "-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-\n"
+        echo -e "!!NOTE!!: Only select \"Skip\" if mongodb is already installed on this system"
+        echo "Do you want to continue?"
+        select yn in "Yes" "Skip" "No" ; do
+                case $yn in
+                        Yes )
+                                INST_ARCH_MONGO="yes"
+                                break;;
+                        No ) exit;;
+                        Skip )
+                                INST_ARCH_MONGO="no"
+                                break;;
+                esac
+        done
+fi
+
+if [ $INST_ARCH_MONGO = "yes" ]; then
+        DIR=$(pwd)
+        # Make temp user
+        echo "Creating temporary user..."
+        TEMPUSER="gctempuser"
+        TEMPHOME="/home/$TEMPUSER"
+        useradd -m $TEMPUSER
+        cd $TEMPHOME
+
+        # Do the actual makepkg shenanigans
+        echo "Building mongodb... (this will take a moment)"
+        su $TEMPUSER<<EOF
+                mkdir temp
+                cd temp
+                git clone https://aur.archlinux.org/mongodb-bin.git -q
+                cd mongodb-bin
+                makepkg -s > /dev/null
+                exit
+EOF
+        mv "$(find -name "mongodb-bin*.pkg.tar.zst" -type f)" ./mongodb-bin.pkg.tar.zst
+        cd $DIR
+
+        # Snatch the file to current working directory
+        mv "$TEMPHOME/mongodb-bin.pkg.tar.zst" ./mongodb-bin.pkg.tar.zst
+        chown root ./mongodb-bin.pkg.tar.zst
+        chgrp root ./mongodb-bin.pkg.tar.zst
+        chmod 775 ./mongodb-bin.pkg.tar.zst
+
+        echo "Installing mongodb..."
+        pacman -U mongodb-bin.pkg.tar.zst --noconfirm > /dev/null
+        rm mongodb-bin.pkg.tar.zst
+
+        echo "Starting mongodb..."
+        systemctl enable mongodb
+        systemctl start mongodb
+
+        echo "Removing temporary account..."
+        userdel -r $TEMPUSER
+fi
+echo "Done"
+
+echo "Getting grasscutter..."
+
+# Download and rename jar
+wget -q --show-progress "https://nightly.link/Grasscutters/Grasscutter/workflows/build/$BRANCH/Grasscutter.zip"
+echo "unzipping"
+unzip -qq Grasscutter.zip
+mv $(find -name "grasscutter*.jar" -type f) grasscutter.jar
+
+# Download resources
+echo "Downloading resources... (this will take a moment)"
+wget -q --show-progress https://github.com/Koko-boya/Grasscutter_Resources/archive/refs/heads/main.zip -O resources.zip
+echo "Extracting..."
+unzip -qq resources.zip
+mv ./Grasscutter_Resources-main/Resources ./resources
+
+# Here we do a sparse checkout to only pull /data and /keys
+echo "Downloading keys and data..."
+mkdir repo
+cd repo
+git init -q
+git remote add origin https://github.com/Grasscutters/Grasscutter.git
+git fetch -q
+git config core.sparseCheckout true
+echo "data/" >> .git/info/sparse-checkout
+echo "keys/" >> .git/info/sparse-checkout
+git pull origin stable -q
+cd ../
+mv ./repo/data ./data
+mv ./repo/keys ./keys
+
+# Generate handbook/config
+echo "Please enter language when *NEXT* prompted (press enter/return to continue to language select)"
+read
+java -jar grasscutter.jar -handbook
+
+# Prompt IP address for config.json and for generating new keystore.p12 file
+echo "Please enter the IP address that will be used to connect to the server"
+echo "This can be a local or a public IP address"
+echo "This IP address will be used to generate SSL certificates so it is important it is correct"
+
+while : ; do
+        read -p "Enter IP: " SERVER_IP
+        if valid_ip $SERVER_IP; then
+                break;
+        else
+                echo "Invalid IP address. Try again."
+        fi
+done
+
+# Replaces "127.0.0.1" with given IP
+sed -i "s/127.0.0.1/$SERVER_IP/g" config.json
+
+# Generates new keystore.p12 with the server's IP address
+# This is done to prevent a "Connection Timed Out" error from appearing
+#       after clicking to enter the door in the main menu/title screen
+# This issue only exists when connecting to a server *other* than localhost
+#       since the default keystore.p12 has only been made for localhost
+
+mkdir certs
+cd certs
+echo "Generating CA key and certificate pair..."
+openssl req -x509 -nodes -days 25202 -newkey rsa:2048 -subj "/C=GB/ST=Essex/L=London/O=Grasscutters/OU=Grasscutters/CN=$SERVER_IP" -keyout CAkey.key -out CAcert.crt
+echo "Generating SSL key and certificate pair..."
+
+openssl genpkey -out ssl.key -algorithm rsa
+
+# Creates a conf file in order to generate a csr
+cat > csr.conf <<EOF
+[ req ]
+default_bits = 2048
+prompt = no
+default_md = sha256
+req_extensions = req_ext
+distinguished_name = dn
+
+[ dn ]
+C = GB
+ST = Essex
+L = London
+O = Grasscutters
+OU = Grasscutters
+CN = $SERVER_IP
+
+[ req_ext ]
+subjectAltName = @alt_names
+
+[ alt_names ]
+IP.1 = $SERVER_IP
+EOF
+
+# Creates csr using key and conf
+openssl req -new -key ssl.key -out ssl.csr -config csr.conf
+
+# Creates conf to finalise creation of certificate
+cat > cert.conf <<EOF
+
+authorityKeyIdentifier=keyid,issuer
+basicConstraints=CA:FALSE
+keyUsage = digitalSignature, nonRepudiation, keyEncipherment, keyAgreement, dataEncipherment
+subjectAltName = @alt_names
+
+[alt_names]
+IP.1 = $SERVER_IP
+
+EOF
+
+# Creates ssl cert
+openssl x509 -req -in ssl.csr -CA CAcert.crt -CAkey CAkey.key -CAcreateserial -out ssl.crt -days 25202 -sha256 -extfile cert.conf
+
+echo "Generating keystore.p12 from key and certificate..."
+openssl pkcs12 -export -out keystore.p12 -inkey ssl.key -in ssl.crt -certfile CAcert.crt -passout pass:123456
+
+cd ../
+mv ./certs/keystore.p12 ./keystore.p12
+echo "Done"
+
+echo -e "Asking Noelle to clean up...\n"
+rm -rf Grasscutter.zip resources.zip ./certs ./Grasscutter_Resources-main ./repo
+echo -e "All done!\n"
+echo -e "You can now uninstall the following packages if you wish:\n$INSTALLER_DEPS"
+echo -e "-=-=-=-=-=--- !! IMPORTANT !! ---=-=-=-=-=-\n"
+echo "Please make sure that ports 443 and 22102 are OPEN (both tcp and udp)"
+echo -e "In order to run the server, run the following command:\nsudo java -jar grasscutter.jar"
+echo "You must run it using sudo as port 443 is a privileged port"
+echo "To play, use the IP you provided earlier ($SERVER_IP) via GrassClipper or Fiddler"
+
+exit
--- a/scripts/install/install_without_dependencies.sh
+++ b/scripts/install/install_without_dependencies.sh
@@ -0,0 +1,220 @@
+#!/usr/bin/env bash
+
+# Grasscutter install script for GNU/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)
+
+# Stops the installer if any command has a non-zero exit status
+set -e
+
+# Checks for root
+if [ $EUID != 0 ]; then
+    echo "Please run the installer as root (sudo)!"
+    exit
+fi
+
+is_command() {
+    # Checks if given command is available
+    local check_command="$1"
+    command -v "${check_command}" > /dev/null 2>&1
+}
+
+# IP validation
+valid_ip() {
+    local ip=$1
+    local stat=1
+
+    if [[ $ip =~ ^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$ ]]; then
+        OIFS=$IFS
+        IFS="."
+        ip=($ip)
+        IFS=$OIFS
+        [[ ${ip[0]} -le 255 && ${ip[1]} -le 255 \
+            && ${ip[2]} -le 255 && ${ip[3]} -le 255 ]]
+        stat=$?
+    fi
+    return $stat
+}
+echo "#################################"
+echo ""
+echo "This script will take for granted that you have all dependencies installed (mongodb, openjdk-17-jre/jre17-openjdk, wget, openssl, unzip, git, curl, base-devel), in fact, this script is recommended to update your current server installation, and it should run from the same folder as grasscutter.jar"
+echo "#################################"
+echo ""
+echo "If you are using version > 2.8 of the client, make sure to use the patched metadata if you don't use Cultivation."
+echo "Search for METADATA here: https://discord.gg/grasscutter."
+echo ""
+echo "#################################"
+echo "You can find plugins here: https://discord.com/channels/965284035985305680/970830969919664218"
+echo ""
+echo "Grasscutter will be installed to script's running directory"
+echo "Do you wish to proceed and install Grasscutter?"
+select yn in "Yes" "No" ; do
+    case $yn in
+        Yes ) break;;
+        No )
+			echo "Aborting..."
+			exit;;
+    esac
+done
+
+if [ -d "./resources" ]
+then
+    echo "It's recommended to remove resources folder"
+    echo "Remove resources folder?"
+    select yn in "Yes" "No" ; do
+        case $yn in
+            Yes ) 
+                rm -rf resources
+                break;;
+            No )
+                echo "Aborting..."
+                exit;;
+        esac
+    done
+echo "You may need to remove data folder and config.json to apply some updates"
+echo "#################################"
+fi
+
+
+
+# Allows choice between stable and dev branch
+echo "Please select the branch you wish to install"
+echo -e "!!NOTE!!: stable is the recommended branch.\nDo *NOT* use development unless you have a reason to and know what you're doing"
+select branch in "stable" "development" ; do
+    case $branch in
+        stable )
+            break;;
+        development )
+            break;;
+    esac
+done
+
+echo -e "Using $branch branch for installing server \n"
+
+# Prompt IP address for config.json and for generating new keystore.p12 file
+echo "Please enter the IP address that will be used to connect to the server"
+echo "This can be a local or a public IP address"
+echo "This IP address will be used to generate SSL certificates, so it is important it is correct!"
+
+while : ; do
+    read -p "Enter server IP: " SERVER_IP
+    if valid_ip $SERVER_IP; then
+        break;
+    else
+        echo "Invalid IP address. Try again."
+    fi
+done
+
+echo "Beginning Grasscutter installation..."
+
+
+# Download resources
+echo "Downloading Grasscutter BinOutputs..."
+git clone --single-branch https://github.com/Koko-boya/Grasscutter_Resources.git Grasscutter-bins
+mv ./Grasscutter-bins/Resources ./resources
+rm -rf Grasscutter-bins # takes ~350M of drive space after moving BinOutputs... :sob:
+
+# Download and build jar
+echo "Downloading Grasscutter source code..."
+git clone --single-branch -b $branch https://github.com/Grasscutters/Grasscutter.git Grasscutter-src #change this to download a fork
+
+echo "Building grasscutter.jar..."
+cd Grasscutter-src
+chmod +x ./gradlew #just in case
+./gradlew --no-daemon jar
+mv $(find -name "grasscutter*.jar" -type f) ../grasscutter.jar
+echo "Building grasscutter.jar done!"
+cd ..
+
+# Generate handbook/config
+echo "Grasscutter will be started to generate data files"
+java -jar grasscutter.jar -version
+
+# Replaces "127.0.0.1" with given IP
+echo "Replacing IP address in server config..."
+sed -i "s/127.0.0.1/$SERVER_IP/g" config.json
+# Generates new keystore.p12 with the server's IP address
+# This is done to prevent a "Connection Timed Out" error from appearing
+#	   after clicking to enter the door in the main menu/title screen
+# This issue only exists when connecting to a server *other* than localhost
+#	   since the default keystore.p12 has only been made for localhost
+
+mkdir certs
+cd certs
+echo "Generating CA key and certificate pair..."
+openssl req -x509 -nodes -days 25202 -newkey rsa:2048 -subj "/C=GB/ST=Essex/L=London/O=Grasscutters/OU=Grasscutters/CN=$SERVER_IP" -keyout CAkey.key -out CAcert.crt
+
+echo "Generating SSL key and certificate pair..."
+openssl genpkey -out ssl.key -algorithm rsa
+
+# Creates a conf file in order to generate a csr
+cat > csr.conf <<EOF
+[ req ]
+default_bits = 2048
+prompt = no
+default_md = sha256
+req_extensions = req_ext
+distinguished_name = dn
+
+[ dn ]
+C = GB
+ST = Essex
+L = London
+O = Grasscutters
+OU = Grasscutters
+CN = $SERVER_IP
+
+[ req_ext ]
+subjectAltName = @alt_names
+
+[ alt_names ]
+IP.1 = $SERVER_IP
+EOF
+
+# Creates csr using key and conf
+openssl req -new -key ssl.key -out ssl.csr -config csr.conf
+
+# Creates conf to finalise creation of certificate
+cat > cert.conf <<EOF
+
+authorityKeyIdentifier=keyid,issuer
+basicConstraints=CA:FALSE
+keyUsage = digitalSignature, nonRepudiation, keyEncipherment, keyAgreement, dataEncipherment
+subjectAltName = @alt_names
+
+[alt_names]
+IP.1 = $SERVER_IP
+
+EOF
+
+# Creates SSL cert
+openssl x509 -req -in ssl.csr -CA CAcert.crt -CAkey CAkey.key -CAcreateserial -out ssl.crt -days 25202 -sha256 -extfile cert.conf
+
+echo "Generating keystore.p12 from key and certificate..."
+openssl pkcs12 -export -out keystore.p12 -inkey ssl.key -in ssl.crt -certfile CAcert.crt -passout pass:123456
+
+cd ../
+mv ./certs/keystore.p12 ./keystore.p12
+echo "Done!"
+
+# Running scripts as sudo makes all Grasscutter files to be owned by root
+# which may cause problems editing .jsons...
+if [ $SUDO_USER ]; then
+	echo "Changing Grasscutter files owner to current user..."
+	chown -R $SUDO_USER:$SUDO_USER ./*
+fi
+
+echo "Removing unnecessary files..."
+rm -rf ./certs ./Grasscutter-src
+
+echo "All done!"
+echo "-=-=-=-=-=--- !! IMPORTANT !! ---=-=-=-=-=-"
+echo "Please make sure that ports 80, 443, 8888 and 22102 are OPEN (both tcp and udp)"
+echo "In order to run the server, run the following command:"
+echo "    sudo java -jar grasscutter.jar"
+echo "The GM Handbook of all supported languages will be generated automatically when you start the server for the first time."
+echo "You must run it using sudo as port 443 is a privileged port"
+echo "To play, use the IP you provided earlier ($SERVER_IP) via GrassClipper or Fiddler"
+echo ""
+
+exit
--- a/scripts/manage_languages.py
+++ b/scripts/manage_languages.py
@@ -0,0 +1,325 @@
+# Written for Python 3.6+
+# Older versions don't retain insertion order of regular dicts
+import argparse
+import cmd
+import json
+import os
+import re
+from pprint import pprint
+
+INDENT = 2
+PRIMARY_LANGUAGE = 'en-US.json'
+PRIMARY_FALLBACK_PREFIX = '🇺🇸'  # This is invisible in-game, terminal emulators might render it
+LANGUAGE_FOLDER = 'src/main/resources/languages/'
+LANGUAGE_FILENAMES = sorted(os.listdir(LANGUAGE_FOLDER), key=lambda x: 'AAA' if x == PRIMARY_LANGUAGE else x)
+SOURCE_FOLDER = 'src/'
+SOURCE_EXTENSIONS = ('java')
+
+
+def ppprint(data):
+    pprint(data, width=130, sort_dicts=False, compact=True)
+
+
+class JsonHelpers:
+    @staticmethod
+    def load(filename: str) -> dict:
+        with open(filename, 'r', encoding='utf-8') as file:
+            return json.load(file)
+
+    @staticmethod
+    def save(filename: str, data: dict) -> None:
+        with open(filename, 'w', encoding='utf-8', newline='\n') as file:
+            json.dump(data, file, ensure_ascii=False, indent=INDENT)
+            file.write('\n')  # json.dump doesn't terminate last line
+
+    @staticmethod
+    def flatten(data: dict, prefix='') -> dict:
+        output = {}
+        for key, value in data.items():
+            if isinstance(value, dict):
+                for k,v in JsonHelpers.flatten(value, f'{prefix}{key}.').items():
+                    output[k] = v
+            else:
+                output[f'{prefix}{key}'] = value
+        return output
+
+    @staticmethod
+    def unflatten(data: dict) -> dict:
+        output = {}
+        def add_key(k: list, value, d: dict):
+            if len(k) == 1:
+                d[k[0]] = value
+            else:
+                d[k[0]] = d.get(k[0], {})
+                add_key(k[1:], value, d[k[0]])
+        for key, value in data.items():
+            add_key(key.split('.'), value, output)
+        return output
+
+    @staticmethod
+    def pprint_keys(keys, indent=4) -> str:
+        # Only strip down to one level
+        padding = ' ' * indent
+        roots = {}
+        for key in keys:
+            root, _, k = key.rpartition('.')
+            roots[root] = roots.get(root, [])
+            roots[root].append(k)
+        lines = []
+        for root, ks in roots.items():
+            if len(ks) > 1:
+                lines.append(f'{padding}{root}.[{", ".join(ks)}]')
+            else:
+                lines.append(f'{padding}{root}.{ks[0]}')
+        return ',\n'.join(lines)
+
+    @staticmethod
+    def deep_clone_and_fill(d1: dict, d2: dict, fallback_prefix=PRIMARY_FALLBACK_PREFIX) -> dict:
+        out = {}
+        for key, value in d1.items():
+            if isinstance(value, dict):
+                out[key] = JsonHelpers.deep_clone_and_fill(value, d2.get(key, {}), fallback_prefix)
+            else:
+                v2 = d2.get(key, value)
+                if type(value) == str and v2 == value:
+                    out[key] = fallback_prefix + value
+                else:
+                    out[key] = v2
+        return out
+
+
+class LanguageManager:
+    TRANSLATION_KEY = re.compile(r'[Tt]ranslate.*"(\w+\.[\w\.]+)"')
+    POTENTIAL_KEY = re.compile(r'"(\w+\.[\w\.]+)"')
+    COMMAND_LABEL = re.compile(r'@Command\s*\([\W\w]*?label\s*=\s*"(\w+)"', re.MULTILINE)  # [\W\w] is a cheeky way to match everything including \n
+
+    def __init__(self):
+        self.load_jsons()
+
+    def load_jsons(self):
+        self.language_jsons = [JsonHelpers.load(LANGUAGE_FOLDER + filename) for filename in LANGUAGE_FILENAMES]
+        self.flattened_jsons = [JsonHelpers.flatten(j) for j in self.language_jsons]
+        self.update_keys()
+
+    def update_keys(self):
+        self.key_sets = [set(j.keys()) for j in self.flattened_jsons]
+        self.common_keys = set.intersection(*self.key_sets)
+        self.all_keys = set.union(*self.key_sets)
+        self.used_keys = self.find_all_used_keys(self.all_keys)
+        self.missing_keys = self.used_keys - self.common_keys
+        self.unused_keys = self.all_keys - self.used_keys
+
+    def find_all_used_keys(self, expected_keys=[]) -> set:
+        # Note that this will only find string literals passed to the translate() or sendTranslatedMessage() methods!
+        # String variables passed to them can be checked against expected_keys
+        used = set()
+        potential = set()
+        for root, dirs, files in os.walk(SOURCE_FOLDER):
+            for file in files:
+                if file.rpartition('.')[-1] in SOURCE_EXTENSIONS:
+                    filename = os.path.join(root, file)
+                    with open(filename, 'r', encoding='utf-8') as f:
+                        data = f.read()  # Loads in entire file at once
+                        for k in self.TRANSLATION_KEY.findall(data):
+                            used.add(k)
+                        for k in self.POTENTIAL_KEY.findall(data):
+                            potential.add(k)
+                        for label in self.COMMAND_LABEL.findall(data):
+                            used.add(f'commands.{label}.description')
+        return used | (potential & expected_keys)
+
+    def _lint_report_language(self, lang: str, keys: set, flattened: dict, primary_language_flattened: dict) -> None:
+        missing = self.used_keys - keys
+        unused = keys - self.used_keys
+        identical_keys = set() if (lang == PRIMARY_LANGUAGE) else {key for key in keys if primary_language_flattened.get(key, None) == flattened.get(key)}
+        placeholder_keys = {key for key in keys if flattened.get(key).startswith(PRIMARY_FALLBACK_PREFIX)}
+        p1 = f'Language {lang} has {len(missing)} missing keys and {len(unused)} unused keys.'
+        p2 = 'This is the primary language.' if (lang == PRIMARY_LANGUAGE) else f'{len(identical_keys)} match {PRIMARY_LANGUAGE}, {len(placeholder_keys)} have the placeholder mark.'
+        print(f'{p1} {p2}')
+
+        lint_categories = {
+            'Missing': missing,
+            'Unused': unused,
+            f'Matches {PRIMARY_LANGUAGE}': identical_keys,
+            'Placeholder': placeholder_keys,
+        }
+        for name, category in lint_categories.items():
+            if len(category) > 0:
+                print(name + ':')
+                print(JsonHelpers.pprint_keys(sorted(category)))
+
+    def lint_report(self) -> None:
+        print(f'There are {len(self.missing_keys)} translation keys in use that are missing from one or more language files.')
+        print(f'There are {len(self.unused_keys)} translation keys in language files that are not used.')
+        primary_language_flattened = self.flattened_jsons[LANGUAGE_FILENAMES.index(PRIMARY_LANGUAGE)]
+        for lang, keys, flattened in zip(LANGUAGE_FILENAMES, self.key_sets, self.flattened_jsons):
+            print('')
+            self._lint_report_language(lang, keys, flattened, primary_language_flattened)
+
+    def rename_keys(self, key_remappings: dict) -> None:
+        # Unfortunately we can't rename keys in-place preserving insertion order, so we have to make new dicts
+        for i in range(len(self.flattened_jsons)):
+            self.flattened_jsons[i] = {key_remappings.get(k,k):v for k,v in self.flattened_jsons[i].items()}
+
+    def update_secondary_languages(self):
+        # Push en_US fallback
+        primary_language_json = self.language_jsons[LANGUAGE_FILENAMES.index(PRIMARY_LANGUAGE)]
+        for filename, lang in zip(LANGUAGE_FILENAMES, self.language_jsons):
+            if filename != PRIMARY_LANGUAGE:
+                js = JsonHelpers.deep_clone_and_fill(primary_language_json, lang)
+                JsonHelpers.save(LANGUAGE_FOLDER + filename, js)
+
+    def update_all_languages_from_flattened(self):
+        for filename, flat in zip(LANGUAGE_FILENAMES, self.flattened_jsons):
+            JsonHelpers.save(LANGUAGE_FOLDER + filename, JsonHelpers.unflatten(flat))
+
+    def save_flattened_languages(self, prefix='flat_'):
+        for filename, flat in zip(LANGUAGE_FILENAMES, self.flattened_jsons):
+            JsonHelpers.save(prefix + filename, flat)
+
+
+class InteractiveRename(cmd.Cmd):
+    intro = 'Welcome to the interactive rename shell.   Type help or ? to list commands.\n'
+    prompt = '(rename) '
+    file = None
+
+    def __init__(self, language_manager: LanguageManager) -> None:
+        super().__init__()
+        self.language_manager = language_manager
+        self.flat_keys = [key for key in language_manager.flattened_jsons[LANGUAGE_FILENAMES.index(PRIMARY_LANGUAGE)].keys()]
+        self.mappings = {}
+
+    def do_add(self, arg):
+        '''
+        Prepare to rename an existing translation key. Will not actually rename anything until you confirm all your pending changes with 'rename'.
+        e.g. a single string:  add commands.execution.argument_error commands.generic.invalid.argument
+        e.g. a group:          add commands.enter_dungeon commands.new_enter_dungeon
+        '''
+        args = arg.split()
+        if len(args) < 2:
+            self.do_help('add')
+            return
+        old, new = args[:2]
+        if old in self.flat_keys:
+            self.mappings[old] = new
+        else:
+            # Check if we are renaming a higher level
+            if not old.endswith('.'):
+                old = old + '.'
+            results = [key for key in self.flat_keys if key.startswith(old)]
+            if len(results) > 0:
+                if not new.endswith('.'):
+                    new = new + '.'
+                new_mappings = {key: key.replace(old, new) for key in results}
+                # Ask for confirmation
+                print('Will add the following mappings:')
+                ppprint(new_mappings)
+                print('Add these mappings? [y/N]')
+                if self.prompt_yn():
+                    for k,v in new_mappings.items():
+                        self.mappings[k] = v
+            else:
+                print('No translation keys matched!')
+    
+    def complete_add(self, text: str, line: str, begidx: int, endidx: int) -> list:
+        if text == '':
+            return [k for k in {key.partition('.')[0] for key in self.flat_keys}]
+        results = [key for key in self.flat_keys if key.startswith(text)]
+        if len(results) > 40:
+            # Collapse categories
+            if text[-1] != '.':
+                text = text + '.'
+            level = text.count('.') + 1
+            new_results = {'.'.join(key.split('.')[:level]) for key in results}
+            return list(new_results)
+        return results
+
+    def do_remove(self, arg):
+        '''
+        Remove a pending rename mapping. Takes the old name of the key, not the new one.
+        e.g. a single key:  remove commands.execution.argument_error
+        e.g. a group:       remove commands.enter_dungeon
+        '''
+        old = arg.split()[0]
+        if old in self.mappings:
+            self.mappings.pop(old)
+        else:
+            # Check if we are renaming a higher level
+            if not old.endswith('.'):
+                old = old + '.'
+            results = [key for key in self.mappings if key.startswith(old)]
+            if len(results) > 0:
+                # Ask for confirmation
+                print('Will remove the following pending mappings:')
+                print(JsonHelpers.pprint_keys(results))
+                print('Delete these mappings? [y/N]')
+                if self.prompt_yn():
+                    for key in results:
+                        self.mappings.pop(key)
+            else:
+                print('No pending rename mappings matched!')
+    
+    def complete_remove(self, text: str, line: str, begidx: int, endidx: int) -> list:
+        return [key for key in self.mappings if key.startswith(text)]
+
+    def do_rename(self, _arg):
+        'Applies pending renames and overwrites language jsons.'
+        # Ask for confirmation
+        print('Will perform the following mappings:')
+        ppprint(self.mappings)
+        print('Perform and save these rename mappings? [y/N]')
+        if self.prompt_yn():
+            self.language_manager.rename_keys(self.mappings)
+            self.language_manager.update_all_languages_from_flattened()
+            print('Renamed keys, closing')
+            return True
+        else:
+            print('Do you instead wish to quit without saving? [yes/N]')
+            if self.prompt_yn(True):
+                print('Left rename shell without renaming')
+                return True
+
+    def prompt_yn(self, strict_yes=False):
+        if strict_yes:
+            return input('(yes/N) ').lower() == 'yes'
+        return input('(y/N) ').lower()[0] == 'y'
+
+
+def main(args: argparse.Namespace):
+    # print(args)
+    language_manager = LanguageManager()
+    errors = None
+    if args.lint_report:
+        language_manager.lint_report()
+        missing = language_manager.used_keys - language_manager.key_sets[LANGUAGE_FILENAMES.index(PRIMARY_LANGUAGE)]
+        if len(missing) > 0:
+            errors = f'[ERROR] {len(missing)} keys missing from primary language json!\n{JsonHelpers.pprint_keys(missing)}'
+    if prefix := args.save_flattened:
+        language_manager.save_flattened_languages(prefix)
+    if args.update:
+        print('Updating secondary languages')
+        language_manager.update_secondary_languages()
+    if args.interactive_rename:
+        language_manager.load_jsons()  # Previous actions may have changed them on-disk
+        try:
+            InteractiveRename(language_manager).cmdloop()
+        except KeyboardInterrupt:
+            print('Left rename shell without renaming')
+    if errors:
+        print(errors)
+        exit(1)
+
+
+
+if __name__ == "__main__":
+    parser = argparse.ArgumentParser(description="Manage Grasscutter's language json files.")
+    parser.add_argument('-u', '--update', action='store_true',
+        help=f'Update secondary language files to conform to the layout of the primary language file ({PRIMARY_LANGUAGE}) and contain any new keys from it.')
+    parser.add_argument('-l', '--lint-report', action='store_true',
+        help='Prints a lint report, listing unused, missing, and untranslated keys among all language jsons.')
+    parser.add_argument('-f', '--save-flattened', const='./flat_', metavar='prefix', nargs='?',
+        help='Save copies of all the language jsons in a flattened key form.')
+    parser.add_argument('-i', '--interactive-rename', action='store_true',
+        help='Enter interactive rename mode, in which you can specify keys in flattened form to be renamed.')
+    args = parser.parse_args()
+    main(args)
--- a/scripts/proxy.py
+++ b/scripts/proxy.py
@@ -0,0 +1,155 @@
+##
+#
+#   Copyright (C) 2002-2022 MlgmXyysd All Rights Reserved.
+#
+##
+
+##
+#
+#   Animation Company script for mitmproxy
+#
+#   https://github.com/MlgmXyysd/
+#
+#   *Original fiddler script from https://github.lunatic.moe/fiddlerscript
+#
+#   Environment requirement:
+#     - mitmdump from mitmproxy
+#
+#   @author MlgmXyysd
+#   @version 1.1
+#
+##
+
+import collections
+import random
+from mitmproxy import http, connection, ctx, tls
+from abc import ABC, abstractmethod
+from enum import Enum
+from mitmproxy.utils import human
+from proxy_config import USE_SSL
+from proxy_config import REMOTE_HOST
+from proxy_config import REMOTE_PORT
+
+class MlgmXyysd_Animation_Company_Proxy:
+
+    LIST_DOMAINS = [
+        "api-os-takumi.mihoyo.com",
+        "hk4e-api-os-static.mihoyo.com",
+        "hk4e-sdk-os.mihoyo.com",
+        "dispatchosglobal.yuanshen.com",
+        "osusadispatch.yuanshen.com",
+        "account.mihoyo.com",
+        "log-upload-os.mihoyo.com",
+        "dispatchcntest.yuanshen.com",
+        "devlog-upload.mihoyo.com",
+        "webstatic.mihoyo.com",
+        "log-upload.mihoyo.com",
+        "hk4e-sdk.mihoyo.com",
+        "api-beta-sdk.mihoyo.com",
+        "api-beta-sdk-os.mihoyo.com",
+        "cnbeta01dispatch.yuanshen.com",
+        "dispatchcnglobal.yuanshen.com",
+        "cnbeta02dispatch.yuanshen.com",
+        "sdk-os-static.mihoyo.com",
+        "webstatic-sea.mihoyo.com",
+        "webstatic-sea.hoyoverse.com",
+        "hk4e-sdk-os-static.hoyoverse.com",
+        "sdk-os-static.hoyoverse.com",
+        "api-account-os.hoyoverse.com",
+        "hk4e-sdk-os.hoyoverse.com",
+        "overseauspider.yuanshen.com",
+        "gameapi-account.mihoyo.com",
+        "minor-api.mihoyo.com",
+        "public-data-api.mihoyo.com",
+        "uspider.yuanshen.com",
+        "sdk-static.mihoyo.com",
+        "abtest-api-data-sg.hoyoverse.com",
+        "log-upload-os.hoyoverse.com"
+    ]
+
+    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
+
+class InterceptionResult(Enum):
+    SUCCESS = 1
+    FAILURE = 2
+    SKIPPED = 3
+
+
+class TlsStrategy(ABC):
+    def __init__(self):
+        self.history = collections.defaultdict(lambda: collections.deque(maxlen=200))
+
+    @abstractmethod
+    def should_intercept(self, server_address: connection.Address) -> bool:
+        raise NotImplementedError()
+
+    def record_success(self, server_address):
+        self.history[server_address].append(InterceptionResult.SUCCESS)
+
+    def record_failure(self, server_address):
+        self.history[server_address].append(InterceptionResult.FAILURE)
+
+    def record_skipped(self, server_address):
+        self.history[server_address].append(InterceptionResult.SKIPPED)
+
+
+class ConservativeStrategy(TlsStrategy):
+    def should_intercept(self, server_address: connection.Address) -> bool:
+        return InterceptionResult.FAILURE not in self.history[server_address]
+
+
+class ProbabilisticStrategy(TlsStrategy):
+    def __init__(self, p: float):
+        self.p = p
+        super().__init__()
+
+    def should_intercept(self, server_address: connection.Address) -> bool:
+        return random.uniform(0, 1) < self.p
+
+
+class MaybeTls:
+    strategy: TlsStrategy
+
+    def load(self, l):
+        l.add_option(
+            "tls_strategy", int, 0,
+            "TLS passthrough strategy. If set to 0, connections will be passed through after the first unsuccessful "
+            "handshake. If set to 0 < p <= 100, connections with be passed through with probability p.",
+        )
+
+    def configure(self, updated):
+        if "tls_strategy" not in updated:
+            return
+        if ctx.options.tls_strategy > 0:
+            self.strategy = ProbabilisticStrategy(ctx.options.tls_strategy / 100)
+        else:
+            self.strategy = ConservativeStrategy()
+
+    def tls_clienthello(self, data: tls.ClientHelloData):
+        server_address = data.context.server.peername
+        if not self.strategy.should_intercept(server_address):
+            ctx.log(f"TLS passthrough: {human.format_address(server_address)}.")
+            data.ignore_connection = True
+            self.strategy.record_skipped(server_address)
+
+    def tls_established_client(self, data: tls.TlsData):
+        server_address = data.context.server.peername
+        ctx.log(f"TLS handshake successful: {human.format_address(server_address)}")
+        self.strategy.record_success(server_address)
+
+    def tls_failed_client(self, data: tls.TlsData):
+        server_address = data.context.server.peername
+        ctx.log(f"TLS handshake failed: {human.format_address(server_address)}")
+        self.strategy.record_failure(server_address)
+        
+addons = [
+	MlgmXyysd_Animation_Company_Proxy(),
+    MaybeTls()
+]
--- a/scripts/proxy_config.py
+++ b/scripts/proxy_config.py
@@ -0,0 +1,17 @@
+import os
+
+# This can also be replaced with another IP address.
+USE_SSL = True
+REMOTE_HOST = "localhost"
+REMOTE_PORT = 443
+
+if os.getenv('MITM_REMOTE_HOST') != None:
+    REMOTE_HOST = os.getenv('MITM_REMOTE_HOST')
+if os.getenv('MITM_REMOTE_PORT') != None:
+    REMOTE_PORT = int(os.getenv('MITM_REMOTE_PORT'))
+if os.getenv('MITM_USE_SSL') != None:
+    USE_SSL = bool(os.getenv('MITM_USE_SSL'))
+
+print('MITM Remote Host: ' + REMOTE_HOST)
+print('MITM Remote Port: ' + str(REMOTE_PORT))
+print('MITM Use SSL ' + str(USE_SSL))