Run formatter & update protocol

src/main/java/emu/grasscutter/utils/Crypto.java

@@ -2,20 +2,14 @@ package emu.grasscutter.utils;
 
 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.server.http.objects.QueryCurRegionRspJson;
+
+import javax.crypto.Cipher;
 import java.io.ByteArrayOutputStream;
 import java.nio.file.Path;
-import java.security.KeyFactory;
-import java.security.PrivateKey;
-import java.security.PublicKey;
-import java.security.SecureRandom;
-import java.security.Signature;
-import java.security.spec.PKCS8EncodedKeySpec;
-import java.security.spec.X509EncodedKeySpec;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Map;
+import java.security.*;
+import java.security.spec.*;
+import java.util.*;
 import java.util.regex.Pattern;
-import javax.crypto.Cipher;
 
 public final class Crypto {
 

src/main/java/emu/grasscutter/utils/DispatchUtils.java

@@ -1,23 +1,20 @@
 package emu.grasscutter.utils;
 
-import static emu.grasscutter.config.Configuration.DISPATCH_INFO;
-
 import com.google.gson.JsonObject;
 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.auth.AuthenticationSystem.AuthenticationRequest;
 import emu.grasscutter.database.DatabaseHelper;
-import emu.grasscutter.game.Account;
-import emu.grasscutter.game.HandbookActions;
-import emu.grasscutter.server.dispatch.IDispatcher;
-import emu.grasscutter.server.dispatch.PacketIds;
+import emu.grasscutter.game.*;
+import emu.grasscutter.server.dispatch.*;
 import emu.grasscutter.server.http.handlers.GachaHandler;
 import emu.grasscutter.server.http.objects.LoginTokenRequestJson;
-import emu.grasscutter.utils.objects.HandbookBody;
+import emu.grasscutter.utils.objects.*;
 import emu.grasscutter.utils.objects.HandbookBody.*;
-import emu.grasscutter.utils.objects.JObject;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.TimeUnit;
+
 import javax.annotation.Nullable;
+import java.util.concurrent.*;
+
+import static emu.grasscutter.config.Configuration.DISPATCH_INFO;
 
 public interface DispatchUtils {
     /**

src/main/java/emu/grasscutter/utils/FileUtils.java

@@ -1,20 +1,15 @@
 package emu.grasscutter.utils;
 
 import emu.grasscutter.Grasscutter;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
+import lombok.val;
+
+import java.io.*;
 import java.net.URISyntaxException;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.FileSystem;
-import java.nio.file.FileSystems;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-import lombok.val;
+import java.nio.file.*;
+import java.util.*;
+import java.util.stream.*;
 
 public final class FileUtils {
     private static final Path DATA_DEFAULT_PATH;

src/main/java/emu/grasscutter/utils/JsonAdapters.java

@@ -7,10 +7,11 @@ import emu.grasscutter.data.common.DynamicFloat;
 import emu.grasscutter.game.world.*;
 import it.unimi.dsi.fastutil.floats.FloatArrayList;
 import it.unimi.dsi.fastutil.ints.*;
+import lombok.val;
+
 import java.io.IOException;
 import java.lang.reflect.Field;
 import java.util.*;
-import lombok.val;
 
 public interface JsonAdapters {
     class DynamicFloatAdapter extends TypeAdapter<DynamicFloat> {

src/main/java/emu/grasscutter/utils/JsonUtils.java

@@ -3,21 +3,16 @@ package emu.grasscutter.utils;
 import com.google.gson.*;
 import com.google.gson.reflect.TypeToken;
 import emu.grasscutter.data.common.DynamicFloat;
-import emu.grasscutter.game.world.GridPosition;
-import emu.grasscutter.game.world.Position;
+import emu.grasscutter.game.world.*;
 import emu.grasscutter.utils.JsonAdapters.*;
 import emu.grasscutter.utils.objects.JObject;
 import it.unimi.dsi.fastutil.ints.IntList;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.Reader;
+
+import java.io.*;
 import java.lang.reflect.Type;
 import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.List;
-import java.util.Map;
+import java.nio.file.*;
+import java.util.*;
 
 public final class JsonUtils {
     static final Gson gson =

src/main/java/emu/grasscutter/utils/StartupArguments.java

@@ -1,19 +1,16 @@
 package emu.grasscutter.utils;
 
-import static emu.grasscutter.config.Configuration.*;
-
-import ch.qos.logback.classic.Level;
-import ch.qos.logback.classic.Logger;
-import emu.grasscutter.BuildConfig;
-import emu.grasscutter.GameConstants;
-import emu.grasscutter.Grasscutter;
+import ch.qos.logback.classic.*;
+import emu.grasscutter.*;
 import emu.grasscutter.net.packet.PacketOpcodesUtils;
 import emu.grasscutter.tools.Dumpers;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.function.Function;
 import org.slf4j.LoggerFactory;
 
+import java.util.*;
+import java.util.function.Function;
+
+import static emu.grasscutter.config.Configuration.*;
+
 /** A parser for start-up arguments. */
 public interface StartupArguments {
     /* A map of parameter -> argument handler. */

src/main/java/emu/grasscutter/utils/TsvUtils.java

@@ -1,25 +1,22 @@
 package emu.grasscutter.utils;
 
-import static emu.grasscutter.utils.Utils.nonRegexSplit;
-
 import com.google.gson.*;
 import com.google.gson.annotations.SerializedName;
 import emu.grasscutter.Grasscutter;
 import it.unimi.dsi.fastutil.Pair;
-import it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap;
-import it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap;
+import it.unimi.dsi.fastutil.ints.*;
 import it.unimi.dsi.fastutil.objects.Object2IntArrayMap;
+import lombok.val;
+
 import java.io.IOException;
 import java.lang.reflect.*;
 import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.NoSuchFileException;
-import java.nio.file.Path;
+import java.nio.file.*;
 import java.util.*;
 import java.util.function.Function;
-import java.util.stream.IntStream;
-import java.util.stream.Stream;
-import lombok.val;
+import java.util.stream.*;
+
+import static emu.grasscutter.utils.Utils.nonRegexSplit;
 
 // Throughout this file, commented System.out.println debug log calls are left in.
 // This is because the default logger will deadlock when operating on parallel streams.

src/main/java/emu/grasscutter/utils/Utils.java

@@ -1,8 +1,5 @@
 package emu.grasscutter.utils;
 
-import static emu.grasscutter.utils.FileUtils.getResourcePath;
-import static emu.grasscutter.utils.lang.Language.translate;
-
 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.config.ConfigContainer;
 import emu.grasscutter.data.DataLoader;
@@ -11,6 +8,9 @@ import emu.grasscutter.utils.objects.Returnable;
 import io.javalin.http.Context;
 import io.netty.buffer.*;
 import it.unimi.dsi.fastutil.ints.*;
+import org.slf4j.Logger;
+
+import javax.annotation.Nullable;
 import java.io.*;
 import java.lang.reflect.Field;
 import java.nio.charset.StandardCharsets;
@@ -19,8 +19,9 @@ import java.time.*;
 import java.time.temporal.TemporalAdjusters;
 import java.util.*;
 import java.util.concurrent.ThreadLocalRandom;
-import javax.annotation.Nullable;
-import org.slf4j.Logger;
+
+import static emu.grasscutter.utils.FileUtils.getResourcePath;
+import static emu.grasscutter.utils.lang.Language.translate;
 
 @SuppressWarnings({"UnusedReturnValue", "BooleanMethodIsAlwaysInverted"})
 public final class Utils {

src/main/java/emu/grasscutter/utils/helpers/DateHelper.java

@@ -1,7 +1,6 @@
 package emu.grasscutter.utils.helpers;
 
-import java.util.Calendar;
-import java.util.Date;
+import java.util.*;
 
 public interface DateHelper {
     static Date onlyYearMonthDay(Date now) {

src/main/java/emu/grasscutter/utils/lang/Language.java

@@ -1,8 +1,5 @@
 package emu.grasscutter.utils.lang;
 
-import static emu.grasscutter.config.Configuration.FALLBACK_LANGUAGE;
-import static emu.grasscutter.utils.FileUtils.*;
-
 import com.google.gson.*;
 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.data.*;
@@ -11,6 +8,8 @@ import emu.grasscutter.game.player.Player;
 import emu.grasscutter.utils.*;
 import it.unimi.dsi.fastutil.ints.*;
 import it.unimi.dsi.fastutil.objects.*;
+import lombok.EqualsAndHashCode;
+
 import java.io.*;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.*;
@@ -18,7 +17,9 @@ import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.regex.*;
 import java.util.stream.*;
-import lombok.EqualsAndHashCode;
+
+import static emu.grasscutter.config.Configuration.FALLBACK_LANGUAGE;
+import static emu.grasscutter.utils.FileUtils.*;
 
 public final class Language {
     private static final Map<String, Language> cachedLanguages = new ConcurrentHashMap<>();

src/main/java/emu/grasscutter/utils/objects/FieldFetch.java

@@ -3,8 +3,9 @@ package emu.grasscutter.utils.objects;
 import com.google.gson.*;
 import emu.grasscutter.server.dispatch.IDispatcher;
 import emu.grasscutter.utils.Utils;
+
 import java.lang.reflect.Field;
-import java.util.*;
+import java.util.HashMap;
 
 public interface FieldFetch {
     /**

src/main/java/emu/grasscutter/utils/objects/HandbookBody.java

@@ -1,7 +1,6 @@
 package emu.grasscutter.utils.objects;
 
-import lombok.Builder;
-import lombok.Getter;
+import lombok.*;
 
 /** HTTP request object for handbook controls. */
 @SuppressWarnings("FieldMayBeFinal")

src/main/java/emu/grasscutter/utils/objects/JLineLogbackAppender.java

@@ -3,6 +3,7 @@ package emu.grasscutter.utils.objects;
 import ch.qos.logback.classic.spi.ILoggingEvent;
 import ch.qos.logback.core.ConsoleAppender;
 import emu.grasscutter.Grasscutter;
+
 import java.util.Arrays;
 
 public final class JLineLogbackAppender extends ConsoleAppender<ILoggingEvent> {

src/main/java/emu/grasscutter/utils/objects/JObject.java

@@ -2,9 +2,9 @@ package emu.grasscutter.utils.objects;
 
 import com.google.gson.*;
 import com.google.gson.internal.LinkedTreeMap;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
+import com.google.gson.stream.*;
 import emu.grasscutter.utils.JsonUtils;
+
 import java.io.IOException;
 
 /* Replica of JsonObject. Includes chaining. */

src/main/java/emu/grasscutter/utils/objects/KahnsSort.java

@@ -1,10 +1,6 @@
 package emu.grasscutter.utils.objects;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Stack;
+import java.util.*;
 
 public class KahnsSort {
     public static class Node {

src/main/java/emu/grasscutter/utils/objects/ServerLogEventAppender.java

@@ -4,6 +4,7 @@ import ch.qos.logback.classic.spi.ILoggingEvent;
 import ch.qos.logback.core.AppenderBase;
 import ch.qos.logback.core.encoder.Encoder;
 import emu.grasscutter.server.event.internal.ServerLogEvent;
+
 import java.nio.charset.StandardCharsets;
 
 public final class ServerLogEventAppender<E> extends AppenderBase<E> {

src/main/java/emu/grasscutter/utils/objects/SparseSet.java

@@ -1,9 +1,6 @@
 package emu.grasscutter.utils.objects;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-import java.util.TreeSet;
+import java.util.*;
 
 public final class SparseSet {
     private final List<Range> rangeEntries;

src/main/java/emu/grasscutter/utils/objects/WeightedList.java

@@ -1,7 +1,6 @@
 package emu.grasscutter.utils.objects;
 
-import java.util.NavigableMap;
-import java.util.TreeMap;
+import java.util.*;
 import java.util.concurrent.ThreadLocalRandom;
 
 public class WeightedList<E> {

src/main/java/emu/grasscutter/utils/objects/text/Style.java

@@ -1,10 +1,9 @@
 package emu.grasscutter.utils.objects.text;
 
+import lombok.*;
+
 import java.awt.*;
-import java.util.HashMap;
-import java.util.Map;
-import lombok.Builder;
-import lombok.Data;
+import java.util.*;
 
 /* Text style container. */
 @Builder

src/main/java/emu/grasscutter/utils/objects/text/Text.java

@@ -1,8 +1,8 @@
 package emu.grasscutter.utils.objects.text;
 
+import lombok.*;
+
 import java.awt.*;
-import lombok.Getter;
-import lombok.Setter;
 
 /* An instance of text. */
 public final class Text {