Run formatter & update protocol

This commit is contained in:
KingRainbow44
2023-08-31 23:46:55 -04:00
Unverified
parent 541433c01b
commit e04df0526a
1175 changed files with 3512 additions and 5070 deletions
@@ -10,8 +10,7 @@ import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.ServerConnector;
import org.eclipse.jetty.util.ssl.SslContextFactory;
import java.io.File;
import java.io.UnsupportedEncodingException;
import java.io.*;
import java.util.Arrays;
import static emu.grasscutter.config.Configuration.*;
@@ -153,12 +152,10 @@ public final class HttpServer {
/**
* Starts listening on the HTTP server.
*
* @throws UnsupportedEncodingException
*/
public void start() throws UnsupportedEncodingException {
// Attempt to start the HTTP server.
if (HTTP_INFO.bindAddress.equals("")) {
if (HTTP_INFO.bindAddress.isEmpty()) {
this.javalin.start(HTTP_INFO.bindPort);
} else {
this.javalin.start(HTTP_INFO.bindAddress, HTTP_INFO.bindPort);
@@ -1,7 +1,5 @@
package emu.grasscutter.server.http.dispatch;
import static emu.grasscutter.utils.lang.Language.translate;
import emu.grasscutter.Grasscutter;
import emu.grasscutter.auth.AuthenticationSystem;
import emu.grasscutter.auth.OAuthAuthenticator.ClientType;
@@ -12,6 +10,8 @@ import emu.grasscutter.utils.*;
import io.javalin.Javalin;
import io.javalin.http.Context;
import static emu.grasscutter.utils.lang.Language.translate;
/** Handles requests related to authentication. */
public final class AuthenticationHandler implements Router {
/**
@@ -1,7 +1,5 @@
package emu.grasscutter.server.http.dispatch;
import static emu.grasscutter.config.Configuration.*;
import com.google.gson.*;
import com.google.protobuf.ByteString;
import emu.grasscutter.*;
@@ -18,11 +16,14 @@ import emu.grasscutter.server.http.objects.QueryCurRegionRspJson;
import emu.grasscutter.utils.*;
import io.javalin.Javalin;
import io.javalin.http.Context;
import org.slf4j.Logger;
import java.time.Instant;
import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
import java.util.regex.Pattern;
import org.slf4j.Logger;
import static emu.grasscutter.config.Configuration.*;
/** Handles requests related to region queries. */
public final class RegionHandler implements Router {
@@ -1,13 +1,13 @@
package emu.grasscutter.server.http.documentation;
import static emu.grasscutter.config.Configuration.DOCUMENT_LANGUAGE;
import emu.grasscutter.tools.Tools;
import emu.grasscutter.utils.lang.Language;
import io.javalin.http.ContentType;
import io.javalin.http.Context;
import io.javalin.http.*;
import java.util.List;
import static emu.grasscutter.config.Configuration.DOCUMENT_LANGUAGE;
final class GachaMappingRequestHandler implements DocumentationHandler {
private final List<String> gachaJsons;
@@ -1,7 +1,5 @@
package emu.grasscutter.server.http.documentation;
import static emu.grasscutter.config.Configuration.HANDBOOK;
import emu.grasscutter.Grasscutter;
import emu.grasscutter.auth.AuthenticationSystem.AuthenticationRequest;
import emu.grasscutter.server.http.Router;
@@ -10,9 +8,12 @@ import emu.grasscutter.utils.objects.*;
import emu.grasscutter.utils.objects.HandbookBody.Action;
import io.javalin.Javalin;
import io.javalin.http.*;
import java.util.*;
import java.util.concurrent.*;
import static emu.grasscutter.config.Configuration.HANDBOOK;
/** Handles requests for the new GM Handbook. */
public final class HandbookHandler implements Router {
private String handbook;
@@ -1,14 +1,14 @@
package emu.grasscutter.server.http.documentation;
import static emu.grasscutter.utils.lang.Language.translate;
import emu.grasscutter.Grasscutter;
import emu.grasscutter.utils.FileUtils;
import io.javalin.http.ContentType;
import io.javalin.http.Context;
import io.javalin.http.*;
import java.io.IOException;
import java.nio.file.Files;
import static emu.grasscutter.utils.lang.Language.translate;
final class RootRequestHandler implements DocumentationHandler {
private final String template;
@@ -1,19 +1,17 @@
package emu.grasscutter.server.http.handlers;
import static emu.grasscutter.config.Configuration.*;
import emu.grasscutter.Grasscutter;
import emu.grasscutter.data.DataLoader;
import emu.grasscutter.server.http.Router;
import emu.grasscutter.server.http.objects.HttpJsonResponse;
import emu.grasscutter.utils.FileUtils;
import io.javalin.Javalin;
import io.javalin.http.ContentType;
import io.javalin.http.Context;
import java.io.IOException;
import java.io.InputStream;
import java.util.Objects;
import java.util.StringJoiner;
import io.javalin.http.*;
import java.io.*;
import java.util.*;
import static emu.grasscutter.config.Configuration.*;
/** Handles requests related to the announcements page. */
public final class AnnouncementsHandler implements Router {
@@ -1,7 +1,5 @@
package emu.grasscutter.server.http.handlers;
import static emu.grasscutter.utils.lang.Language.translate;
import com.google.gson.JsonObject;
import emu.grasscutter.Grasscutter;
import emu.grasscutter.database.DatabaseHelper;
@@ -10,11 +8,14 @@ import emu.grasscutter.server.http.Router;
import emu.grasscutter.utils.*;
import io.javalin.Javalin;
import io.javalin.http.*;
import lombok.Getter;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.nio.file.*;
import java.util.*;
import lombok.Getter;
import static emu.grasscutter.utils.lang.Language.translate;
/** Handles all gacha-related HTTP requests. */
public final class GachaHandler implements Router {
@@ -1,15 +1,13 @@
package emu.grasscutter.server.http.handlers;
import static emu.grasscutter.config.Configuration.ACCOUNT;
import emu.grasscutter.GameConstants;
import emu.grasscutter.Grasscutter;
import emu.grasscutter.*;
import emu.grasscutter.server.http.Router;
import emu.grasscutter.server.http.objects.HttpJsonResponse;
import emu.grasscutter.server.http.objects.WebStaticVersionResponse;
import emu.grasscutter.server.http.objects.*;
import io.javalin.Javalin;
import io.javalin.http.Context;
import static emu.grasscutter.config.Configuration.ACCOUNT;
/** Handles all generic, hard-coded responses. */
public final class GenericHandler implements Router {
private static void serverStatus(Context ctx) {
@@ -1,17 +1,16 @@
package emu.grasscutter.server.http.objects;
import static emu.grasscutter.config.Configuration.DISPATCH_INFO;
import static emu.grasscutter.utils.lang.Language.translate;
import emu.grasscutter.Grasscutter;
import emu.grasscutter.Grasscutter.ServerDebugMode;
import emu.grasscutter.utils.Utils;
import io.javalin.http.Context;
import io.javalin.http.Handler;
import java.util.Arrays;
import java.util.Objects;
import io.javalin.http.*;
import org.jetbrains.annotations.NotNull;
import java.util.*;
import static emu.grasscutter.config.Configuration.DISPATCH_INFO;
import static emu.grasscutter.utils.lang.Language.translate;
public final class HttpJsonResponse implements Handler {
private final String response;
private final String[]
@@ -1,14 +1,12 @@
package emu.grasscutter.server.http.objects;
import static emu.grasscutter.config.Configuration.DISPATCH_INFO;
import emu.grasscutter.Grasscutter;
import emu.grasscutter.utils.FileUtils;
import io.javalin.http.ContentType;
import io.javalin.http.Context;
import io.javalin.http.Handler;
import java.io.IOException;
import java.io.InputStream;
import io.javalin.http.*;
import java.io.*;
import static emu.grasscutter.config.Configuration.DISPATCH_INFO;
public class WebStaticVersionResponse implements Handler {