Format code [skip actions]

This commit is contained in:
github-actions
2023-05-15 07:39:29 +00:00
parent 8ecb890fbe
commit 44003f4ee6
8 changed files with 91 additions and 114 deletions

View File

@@ -1,5 +1,7 @@
package emu.grasscutter.server.dispatch;
import static emu.grasscutter.config.Configuration.DISPATCH_INFO;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import emu.grasscutter.Grasscutter;
@@ -10,12 +12,6 @@ import emu.grasscutter.utils.Crypto;
import emu.grasscutter.utils.DispatchUtils;
import emu.grasscutter.utils.JsonUtils;
import emu.grasscutter.utils.objects.HandbookBody;
import lombok.Getter;
import org.java_websocket.WebSocket;
import org.java_websocket.client.WebSocketClient;
import org.java_websocket.handshake.ServerHandshake;
import org.slf4j.Logger;
import java.net.ConnectException;
import java.net.URI;
import java.nio.ByteBuffer;
@@ -25,8 +21,11 @@ import java.util.List;
import java.util.Map;
import java.util.function.BiConsumer;
import java.util.function.Consumer;
import static emu.grasscutter.config.Configuration.DISPATCH_INFO;
import lombok.Getter;
import org.java_websocket.WebSocket;
import org.java_websocket.client.WebSocketClient;
import org.java_websocket.handshake.ServerHandshake;
import org.slf4j.Logger;
public final class DispatchClient extends WebSocketClient implements IDispatcher {
@Getter private final Logger logger = Grasscutter.getLogger();
@@ -89,12 +88,15 @@ public final class DispatchClient extends WebSocketClient implements IDispatcher
var action = HandbookBody.Action.valueOf(actionStr);
// Produce a handbook response.
var response = DispatchUtils.performHandbookAction(action, switch (action) {
case GRANT_AVATAR -> JsonUtils.decode(data, HandbookBody.GrantAvatar.class);
case GIVE_ITEM -> JsonUtils.decode(data, HandbookBody.GiveItem.class);
case TELEPORT_TO -> JsonUtils.decode(data, HandbookBody.TeleportTo.class);
case SPAWN_ENTITY -> JsonUtils.decode(data, HandbookBody.SpawnEntity.class);
});
var response =
DispatchUtils.performHandbookAction(
action,
switch (action) {
case GRANT_AVATAR -> JsonUtils.decode(data, HandbookBody.GrantAvatar.class);
case GIVE_ITEM -> JsonUtils.decode(data, HandbookBody.GiveItem.class);
case TELEPORT_TO -> JsonUtils.decode(data, HandbookBody.TeleportTo.class);
case SPAWN_ENTITY -> JsonUtils.decode(data, HandbookBody.SpawnEntity.class);
});
// Check if the response's status is '1'.
if (response.getStatus() == 1) return;

View File

@@ -1,22 +1,21 @@
package emu.grasscutter.server.dispatch;
import static emu.grasscutter.config.Configuration.DISPATCH_INFO;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import emu.grasscutter.utils.Crypto;
import emu.grasscutter.utils.JsonAdapters.ByteArrayAdapter;
import org.java_websocket.WebSocket;
import org.slf4j.Logger;
import java.nio.charset.StandardCharsets;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.function.BiConsumer;
import java.util.function.Consumer;
import static emu.grasscutter.config.Configuration.DISPATCH_INFO;
import org.java_websocket.WebSocket;
import org.slf4j.Logger;
public interface IDispatcher {
Gson JSON =

View File

@@ -1,5 +1,7 @@
package emu.grasscutter.server.http.documentation;
import static emu.grasscutter.config.Configuration.HANDBOOK;
import emu.grasscutter.server.http.Router;
import emu.grasscutter.utils.DispatchUtils;
import emu.grasscutter.utils.FileUtils;
@@ -8,8 +10,6 @@ import emu.grasscutter.utils.objects.HandbookBody.Action;
import io.javalin.Javalin;
import io.javalin.http.Context;
import static emu.grasscutter.config.Configuration.HANDBOOK;
/** Handles requests for the new GM Handbook. */
public final class HandbookHandler implements Router {
private final byte[] handbook;
@@ -74,11 +74,9 @@ public final class HandbookHandler implements Router {
// Parse the request body into a class.
var request = ctx.bodyAsClass(HandbookBody.GrantAvatar.class);
// Get the response.
var response = DispatchUtils.performHandbookAction(
Action.GRANT_AVATAR, request);
var response = DispatchUtils.performHandbookAction(Action.GRANT_AVATAR, request);
// Send the response.
ctx.status(response.getStatus() > 100 ?
response.getStatus() : 500).json(response);
ctx.status(response.getStatus() > 100 ? response.getStatus() : 500).json(response);
}
/**
@@ -96,11 +94,9 @@ public final class HandbookHandler implements Router {
// Parse the request body into a class.
var request = ctx.bodyAsClass(HandbookBody.GiveItem.class);
// Get the response.
var response = DispatchUtils.performHandbookAction(
Action.GIVE_ITEM, request);
var response = DispatchUtils.performHandbookAction(Action.GIVE_ITEM, request);
// Send the response.
ctx.status(response.getStatus() > 100 ?
response.getStatus() : 500).json(response);
ctx.status(response.getStatus() > 100 ? response.getStatus() : 500).json(response);
}
/**
@@ -118,11 +114,9 @@ public final class HandbookHandler implements Router {
// Parse the request body into a class.
var request = ctx.bodyAsClass(HandbookBody.TeleportTo.class);
// Get the response.
var response = DispatchUtils.performHandbookAction(
Action.TELEPORT_TO, request);
var response = DispatchUtils.performHandbookAction(Action.TELEPORT_TO, request);
// Send the response.
ctx.status(response.getStatus() > 100 ?
response.getStatus() : 500).json(response);
ctx.status(response.getStatus() > 100 ? response.getStatus() : 500).json(response);
}
/**
@@ -138,13 +132,10 @@ public final class HandbookHandler implements Router {
}
// Parse the request body into a class.
var request = ctx.bodyAsClass(
HandbookBody.SpawnEntity.class);
var request = ctx.bodyAsClass(HandbookBody.SpawnEntity.class);
// Get the response.
var response = DispatchUtils.performHandbookAction(
Action.SPAWN_ENTITY, request);
var response = DispatchUtils.performHandbookAction(Action.SPAWN_ENTITY, request);
// Send the response.
ctx.status(response.getStatus() > 100 ?
response.getStatus() : 500).json(response);
ctx.status(response.getStatus() > 100 ? response.getStatus() : 500).json(response);
}
}

View File

@@ -1,5 +1,7 @@
package emu.grasscutter.server.http.handlers;
import static emu.grasscutter.utils.Language.translate;
import com.google.gson.JsonObject;
import emu.grasscutter.Grasscutter;
import emu.grasscutter.database.DatabaseHelper;
@@ -11,16 +13,13 @@ import emu.grasscutter.utils.Utils;
import io.javalin.Javalin;
import io.javalin.http.ContentType;
import io.javalin.http.Context;
import lombok.Getter;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.Arrays;
import java.util.LinkedHashSet;
import static emu.grasscutter.utils.Language.translate;
import lombok.Getter;
/** Handles all gacha-related HTTP requests. */
public final class GachaHandler implements Router {
@@ -164,7 +163,6 @@ public final class GachaHandler implements Router {
public void applyRoutes(Javalin javalin) {
javalin.get("/gacha", GachaHandler::gachaRecords);
javalin.get("/gacha/details", GachaHandler::gachaDetails);
javalin.get("/gacha/mappings", ctx ->
ctx.result(FileUtils.read(gachaMappingsPath.toString())));
javalin.get("/gacha/mappings", ctx -> ctx.result(FileUtils.read(gachaMappingsPath.toString())));
}
}