diff --git a/src/main/java/emu/grasscutter/auth/DefaultAuthenticators.java b/src/main/java/emu/grasscutter/auth/DefaultAuthenticators.java index c53854471..372b0267f 100644 --- a/src/main/java/emu/grasscutter/auth/DefaultAuthenticators.java +++ b/src/main/java/emu/grasscutter/auth/DefaultAuthenticators.java @@ -6,13 +6,9 @@ import emu.grasscutter.Grasscutter.ServerRunMode; import emu.grasscutter.auth.AuthenticationSystem.AuthenticationRequest; import emu.grasscutter.database.DatabaseHelper; import emu.grasscutter.game.Account; -import emu.grasscutter.server.dispatch.IDispatcher; -import emu.grasscutter.server.dispatch.PacketIds; -import emu.grasscutter.server.http.objects.ComboTokenResJson; -import emu.grasscutter.server.http.objects.LoginResultJson; -import emu.grasscutter.utils.DispatchUtils; -import emu.grasscutter.utils.FileUtils; -import emu.grasscutter.utils.Utils; +import emu.grasscutter.server.dispatch.*; +import emu.grasscutter.server.http.objects.*; +import emu.grasscutter.utils.*; import io.javalin.http.ContentType; import javax.crypto.Cipher; @@ -20,8 +16,7 @@ import java.nio.charset.StandardCharsets; import java.security.KeyFactory; import java.security.interfaces.RSAPrivateKey; import java.security.spec.PKCS8EncodedKeySpec; -import java.util.concurrent.CompletableFuture; -import java.util.concurrent.TimeUnit; +import java.util.concurrent.*; import static emu.grasscutter.config.Configuration.ACCOUNT; import static emu.grasscutter.utils.lang.Language.translate; diff --git a/src/main/java/emu/grasscutter/game/ability/AbilityManager.java b/src/main/java/emu/grasscutter/game/ability/AbilityManager.java index a63e405b2..30cd8bedb 100644 --- a/src/main/java/emu/grasscutter/game/ability/AbilityManager.java +++ b/src/main/java/emu/grasscutter/game/ability/AbilityManager.java @@ -1,20 +1,14 @@ package emu.grasscutter.game.ability; -import com.google.protobuf.ByteString; -import com.google.protobuf.InvalidProtocolBufferException; +import com.google.protobuf.*; import emu.grasscutter.Grasscutter; import emu.grasscutter.data.GameData; -import emu.grasscutter.data.binout.AbilityData; -import emu.grasscutter.data.binout.AbilityMixinData; -import emu.grasscutter.data.binout.AbilityModifier; +import emu.grasscutter.data.binout.*; import emu.grasscutter.data.binout.AbilityModifier.AbilityModifierAction; -import emu.grasscutter.game.ability.actions.AbilityAction; -import emu.grasscutter.game.ability.actions.AbilityActionHandler; -import emu.grasscutter.game.ability.mixins.AbilityMixin; -import emu.grasscutter.game.ability.mixins.AbilityMixinHandler; +import emu.grasscutter.game.ability.actions.*; +import emu.grasscutter.game.ability.mixins.*; import emu.grasscutter.game.entity.GameEntity; -import emu.grasscutter.game.player.BasePlayerManager; -import emu.grasscutter.game.player.Player; +import emu.grasscutter.game.player.*; import emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry; import emu.grasscutter.net.proto.AbilityMetaAddAbilityOuterClass.AbilityMetaAddAbility; import emu.grasscutter.net.proto.AbilityMetaModifierChangeOuterClass.AbilityMetaModifierChange; @@ -27,10 +21,7 @@ import lombok.Getter; import org.reflections.Reflections; import java.util.HashMap; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.LinkedBlockingDeque; -import java.util.concurrent.ThreadPoolExecutor; -import java.util.concurrent.TimeUnit; +import java.util.concurrent.*; public final class AbilityManager extends BasePlayerManager { diff --git a/src/main/java/emu/grasscutter/game/ability/actions/ActionCreateGadget.java b/src/main/java/emu/grasscutter/game/ability/actions/ActionCreateGadget.java index b7e4dab49..54ab52ca7 100644 --- a/src/main/java/emu/grasscutter/game/ability/actions/ActionCreateGadget.java +++ b/src/main/java/emu/grasscutter/game/ability/actions/ActionCreateGadget.java @@ -45,7 +45,7 @@ public class ActionCreateGadget extends AbilityActionHandler { entity.getScene().addEntity(entityCreated); Grasscutter.getLogger() - .info( + .trace( "Gadget {} created at pos {} rot {}", action.gadgetID, entityCreated.getPosition(),