Merge branch 'Grasscutters:development' into development

.github/workflows/build.yml

@@ -3,9 +3,14 @@ on:
   push:
     branches:
       - "stable"
+  pull_request:
+    types:
+      - opened
+      - synchronize
+      - reopened
 jobs:
   Build-Server-Jar:
-    runs-on: windows-latest
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -13,12 +18,11 @@ jobs:
         uses: actions/setup-java@v3
         with:
           distribution: temurin
-          java-version: '8'
+          java-version: '16'
       - name: Run Gradle
-        run: .\gradlew.bat && .\gradlew jar
+        run: ./gradlew && ./gradlew jar
       - name: Upload build
         uses: actions/upload-artifact@v3
         with:
           name: Grasscutter
           path: grasscutter.jar
-      

README.md

@@ -10,10 +10,10 @@ A WIP server reimplementation for *some anime game* 2.3-2.6
 * Inventory features (recieving items/characters, upgrading items/characters, etc)
 * Gacha system
 * Friends list
-* Co-op *partially* work
+* Co-op *partially* works
 # Quick setup guide
 ### Note
-* If you update from an older version, delete `config.json` for regeneration
+* If you updated from an older version, delete `config.json` to regenerate it.
 
 ### Prerequisites
 * Java 16
@@ -21,15 +21,15 @@ A WIP server reimplementation for *some anime game* 2.3-2.6
 * Proxy daemon: mitmproxy (mitmdump, recommended), Fiddler Classic, etc.
 
 ### Starting up Grasscutter server (Assuming you are on Windows)
-1. Setup compile environment `gradlew.bat`
+1. Setup the compile environment with `gradlew.bat`
 2. Compile Grasscutter with `gradlew jar`
-3. Create a folder named `resources` in your Grasscutter directory, bring your `BinOutput` and `ExcelBinOutput` folders into it *(Check the wiki for more details how to get those.)*
+3. Create a folder named `resources` in your Grasscutter directory, move your `BinOutput` and `ExcelBinOutput` folders there *(Check the wiki for more details on how to get those.)*
 4. Run Grasscutter with `java -jar grasscutter.jar`. Make sure mongodb service is running as well.
 
 ### Connecting with the client
 ½. Create an account using *server console command* below
 1. Run a proxy daemon: (choose either one)
-	- mitmdump: `mitmdump -s proxy.py -k`
+	- mitmdump: `mitmdump -s proxy.py -k --allow-hosts ".*\.yuanshen\.com|.*\.mihoyo\.com|.*\.hoyoverse\.com"`
 	- Fiddler Classic: Run Fiddler Classic, turn on `Decrypt https traffic` in setting and change the default port there (Tools -> Options -> Connections) to anything other than `8888`, and load [this script](https://github.lunatic.moe/fiddlerscript).
 	- [Hosts file](https://github.com/Melledy/Grasscutter/wiki/Running#traffic-route-map)
 2. Trust CA certificate:
@@ -54,26 +54,26 @@ There is a dummy user named "Server" in every player's friends list that you can
 
 `killall`
 
-`setworldlevel [level]` - Relog to see effects properly
+`setworldlevel [level]` - Changes your world level, relog to see effects properly
 
 `godmode` - Prevents you from taking damage
 
-`resetconst` - Resets the constellation level on your current active character, will need to relog after using the command to see any changes.
+`resetconst` - Resets the constellation level on your currently selected character, will need to relog after using the command to see any changes.
 
-`setstats [stats] [amount]` - Changes the current character's specified stat.
+`setstats [stats] [amount]` - Changes the currently selected character's specified stat.
 
-`clearartifacts` - Deletes all unequipped and unlocked level 0 artifacts, **including yellow rarity ones** from your inventory
+`clearartifacts` - Deletes all unequipped and unlocked level 0 artifacts, **including 5-star rarity ones** from your inventory
 
-`pos` - Gets your current coordinate.
+`pos` - Gets your current coordinates.
 
 `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.
+When you want to teleport somewhere, use the in-game marking function on the Map, click Confirm. You will see your character falling from a very high spot at the exact location 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
+* My client doesn't connect, doesn't login, 4206, etc... - Mostly your proxy daemon setup is *the issue*, if you're using Fiddler make sure it's running on a port other than 8888
 * Startup sequence: Mongodb > Grasscutter > Proxy daemon (mitmdump, fiddler, etc.) > Client

src/main/java/emu/grasscutter/command/commands/PositionCommand.java

@@ -17,6 +17,7 @@ public final class PositionCommand implements CommandHandler {
             return;
         }
 
-        sender.dropMessage(String.format("Coord: %.3f, %.3f, %.3f", sender.getPos().getX(), sender.getPos().getY(), sender.getPos().getZ()));
+        sender.dropMessage(String.format("Coord: %.3f, %.3f, %.3f\nScene id: %d",
+                sender.getPos().getX(), sender.getPos().getY(), sender.getPos().getZ(), sender.getSceneId()));
     }
 }

src/main/java/emu/grasscutter/command/commands/TelePortCommand.java

+package emu.grasscutter.command.commands;
+
+import emu.grasscutter.command.Command;
+import emu.grasscutter.command.CommandHandler;
+import emu.grasscutter.game.GenshinPlayer;
+import emu.grasscutter.utils.Position;
+
+import java.util.List;
+
+@Command(label = "teleport", usage = "teleport <x> <y> <z>", aliases = {"tp"},
+        description = "Change the player's position.", permission = "player.teleport")
+public class TelePortCommand implements CommandHandler {
+
+    @Override
+    public void execute(GenshinPlayer sender, List<String> args) {
+        if (sender == null) {
+            CommandHandler.sendMessage(null, "Run this command in-game.");
+            return;
+        }
+
+        if (args.size() < 3){
+            CommandHandler.sendMessage(sender, "Usage: /tp <x> <y> <z> [scene id]");
+            return;
+        }
+
+        try {
+            float x = Float.parseFloat(args.get(0));
+            float y = Float.parseFloat(args.get(1));
+            float z = Float.parseFloat(args.get(2));
+            int sceneId = sender.getSceneId();
+            if (args.size() == 4){
+                sceneId = Integer.parseInt(args.get(3));
+            }
+            Position target = new Position(x, y, z);
+            boolean result = sender.getWorld().transferPlayerToScene(sender, sceneId, target);
+            if (!result) {
+                CommandHandler.sendMessage(sender, "Invalid position.");
+            }
+        } catch (NumberFormatException ignored) {
+            CommandHandler.sendMessage(sender, "Invalid position.");
+        }
+    }
+}

start.cmd

@@ -74,10 +74,11 @@ for /f "tokens=2*" %%a in ('reg query "HKCU\Software\Microsoft\Windows\CurrentVe
 
 @rem TODO: External proxy when ORIG_PROXY_ENABLE == 0x1
 echo set ws = createobject("wscript.shell") > "%temp%\proxy.vbs"
+
 if not "%MITMDUMP_PATH%" == "" (
 	echo ws.currentdirectory = "%MITMDUMP_PATH%" >> "%temp%\proxy.vbs"
 )
-echo ws.run "cmd /c mitmdump.exe -s "^&chr(34)^&"%CUR_PATH%%PROXY_SCRIPT_NAME%"^&chr(34)^&" -k",0 >> "%temp%\proxy.vbs"
+echo ws.run "cmd /c mitmdump.exe -s "^&chr(34)^&"%CUR_PATH%%PROXY_SCRIPT_NAME%"^&chr(34)^&" -k --allow-hosts "^&chr(34)^&".*\.yuanshen\.com|.*\.mihoyo\.com|.*\.hoyoverse\.com"^&chr(34),0 >> "%temp%\proxy.vbs"
 "%temp%\proxy.vbs"
 del /f /q "%temp%\proxy.vbs" >nul 2>nul