From 016eae9b4476e99fbadb2b7ba6fdcfd1b82a99f5 Mon Sep 17 00:00:00 2001 From: Colleiflower <123335166+thecutefinder@users.noreply.github.com> Date: Wed, 19 Apr 2023 20:08:54 -0700 Subject: [PATCH 1/2] Update the README (#2126) * Update the README 1. GNUify to maintain consistency 2. Update troubleshooting * Per Magix --- README.md | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 07e4dbeb8..560e73b9a 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ ## Quick setup guide -**Note:** For support please join our [Discord](https://discord.gg/T5vZU6UyeG). +**Note**: For support please join our [Discord](https://discord.gg/T5vZU6UyeG). ### Requirements @@ -86,7 +86,7 @@ cd Grasscutter .\gradlew jar # Compile ``` -##### Linux +##### Linux (GNU) ```bash git clone https://github.com/Grasscutters/Grasscutter.git @@ -97,10 +97,6 @@ chmod +x gradlew 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)! +### Troubleshooting -# 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 +For a list of common issues and solutions and to ask for help, please join [our Discord server](https://discord.gg/T5vZU6UyeG) and go to the support channel. From 60e8106b018d8acc4412c9326975cdf36eb9bfd2 Mon Sep 17 00:00:00 2001 From: Moistcrafter <63527712+Moistcrafter@users.noreply.github.com> Date: Mon, 24 Apr 2023 17:55:08 -0700 Subject: [PATCH 2/2] use intstream instead of silly list in prop cmd (#2128) --- .../java/emu/grasscutter/command/commands/SetPropCommand.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/emu/grasscutter/command/commands/SetPropCommand.java b/src/main/java/emu/grasscutter/command/commands/SetPropCommand.java index ed494caa0..04d29031b 100644 --- a/src/main/java/emu/grasscutter/command/commands/SetPropCommand.java +++ b/src/main/java/emu/grasscutter/command/commands/SetPropCommand.java @@ -3,6 +3,7 @@ package emu.grasscutter.command.commands; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.stream.IntStream; import emu.grasscutter.command.Command; import emu.grasscutter.command.CommandHandler; @@ -231,7 +232,7 @@ public final class SetPropCommand implements CommandHandler { } // List of map areas. Unfortunately, there is no readily available source for them in excels or bins. - final static private List sceneAreas = List.of(1,2,3,4,5,6,7,8,9,10,11,12,13,14,17,18,19,20,21,22,23,24,25,26,27,28,29,32,100,101,102,103,200,210,300,400,401,402,403); + final static private List sceneAreas = IntStream.range(1, 1000).boxed().toList(); private boolean unlockMap(Player targetPlayer) { // Unlock. GameData.getScenePointsPerScene().forEach((sceneId, scenePoints) -> {