Adapt upstream breaking changes

Thanks @liaomsn for helping me test on the latest grasscutter

Co-Authored-By: liaomsn <37428863+liaomsn@users.noreply.github.com>
This commit is contained in:
mingjun97 2022-07-23 17:54:21 -07:00
parent aafb6b1430
commit f3fb552a8d
4 changed files with 15 additions and 8 deletions

View File

@ -6,8 +6,9 @@ MojoConsolePlus(MCP) is a [Grasscutter](https://github.com/Grasscutters/Grasscut
| Grasscutter version | MojoConsole version | | Grasscutter version | MojoConsole version |
| ------------------- | ------------------- | | ------------------- | ------------------- |
| 1.2.1-dev | 1.2.0-dev | | 1.2.1-dev | [1.2.0-dev](https://github.com/gc-mojoconsole/gc-mojoconsole-backend/releases/tag/dev-1.2.0) |
| 1.2.2-dev | 1.3.0-dev | | 1.2.2-dev | [1.3.0-dev](https://github.com/gc-mojoconsole/gc-mojoconsole-backend/releases/tag/dev-1.3.0) |
| 1.2.3-dev | [1.4.0-dev](https://github.com/gc-mojoconsole/gc-mojoconsole-backend/releases/tag/dev-1.4.0) |
## Currently Features: ## Currently Features:
- [x] Send console link in game - [x] Send console link in game

View File

@ -19,7 +19,7 @@ plugins {
sourceCompatibility = 17 sourceCompatibility = 17
targetCompatibility = 17 targetCompatibility = 17
def version_tag = "dev-1.3.0" def version_tag = "dev-1.4.0"
repositories { repositories {
mavenCentral() mavenCentral()

View File

@ -14,8 +14,8 @@ import com.mojo.consoleplus.command.PluginCommand;
import io.javalin.http.staticfiles.Location; import io.javalin.http.staticfiles.Location;
import emu.grasscutter.plugin.PluginConfig; import emu.grasscutter.plugin.PluginConfig;
import static emu.grasscutter.Configuration.PLUGIN; import static emu.grasscutter.config.Configuration.PLUGIN;
import static emu.grasscutter.Configuration.HTTP_POLICIES; import static emu.grasscutter.config.Configuration.HTTP_POLICIES;
import com.mojo.consoleplus.config.MojoConfig; import com.mojo.consoleplus.config.MojoConfig;

View File

@ -10,14 +10,20 @@ import emu.grasscutter.command.Command;
import emu.grasscutter.command.CommandHandler; import emu.grasscutter.command.CommandHandler;
import emu.grasscutter.game.mail.Mail; import emu.grasscutter.game.mail.Mail;
import emu.grasscutter.game.player.Player; import emu.grasscutter.game.player.Player;
import static emu.grasscutter.Configuration.*; import static emu.grasscutter.config.Configuration.*;
import com.mojo.consoleplus.ConsolePlus; import com.mojo.consoleplus.ConsolePlus;
import com.google.gson.Gson; import com.google.gson.Gson;
import emu.grasscutter.BuildConfig; import emu.grasscutter.BuildConfig;
@Command(label = "mojoconsole", usage = "mojoconsole", description = "Send Mojoconsole link via mail (by default it's in-game webview, but you may use argument `o` for popping out external browser)", aliases = { @Command(label = "mojoconsole",
"mojo" }, permission = "mojo.console") usage = {
"",
"o"
},
aliases = {"mojo" },
permission = "mojo.console"
)
public class PluginCommand implements CommandHandler { public class PluginCommand implements CommandHandler {
static class HashParams{ static class HashParams{
public String k2; // session key public String k2; // session key