Mirror/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2025-12-21 11:24:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Clean up .utils

Browse Source
This commit is contained in:
KingRainbow44
2023-05-20 02:25:49 -04:00
parent 51c5cb5c62
commit 1a6fa43367
147 changed files with 623 additions and 291 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/emu/grasscutter/server/event/EventHandler.java
View File

@@ -2,7 +2,7 @@ package emu.grasscutter.server.event;
import emu.grasscutter.Grasscutter;
import emu.grasscutter.plugin.Plugin;
import emu.grasscutter.utils.EventConsumer;
import emu.grasscutter.utils.objects.EventConsumer;
public final class EventHandler<T extends Event> {
/**

2
src/main/java/emu/grasscutter/server/event/entity/EntityDeathEvent.java
View File

@@ -2,7 +2,7 @@ package emu.grasscutter.server.event.entity;
import emu.grasscutter.game.entity.GameEntity;
import emu.grasscutter.server.event.types.EntityEvent;
import emu.grasscutter.utils.Location;
import emu.grasscutter.game.world.Location;
import javax.annotation.Nullable;
import lombok.Getter;

2
src/main/java/emu/grasscutter/server/event/entity/EntityMoveEvent.java
View File

@@ -3,7 +3,7 @@ package emu.grasscutter.server.event.entity;
import emu.grasscutter.game.entity.GameEntity;
import emu.grasscutter.net.proto.MotionStateOuterClass.MotionState;
import emu.grasscutter.server.event.types.EntityEvent;
import emu.grasscutter.utils.Position;
import emu.grasscutter.game.world.Position;
public final class EntityMoveEvent extends EntityEvent {
private final Position position, rotation;

2
src/main/java/emu/grasscutter/server/event/player/PlayerMoveEvent.java
View File

@@ -2,7 +2,7 @@ package emu.grasscutter.server.event.player;
import emu.grasscutter.game.player.Player;
import emu.grasscutter.server.event.types.PlayerEvent;
import emu.grasscutter.utils.Position;
import emu.grasscutter.game.world.Position;
public final class PlayerMoveEvent extends PlayerEvent {
private final MoveType type;

2
src/main/java/emu/grasscutter/server/event/player/PlayerTeleportEvent.java
View File

@@ -4,7 +4,7 @@ import emu.grasscutter.game.player.Player;
import emu.grasscutter.game.world.data.TeleportProperties;
import emu.grasscutter.server.event.Cancellable;
import emu.grasscutter.server.event.types.PlayerEvent;
import emu.grasscutter.utils.Position;
import emu.grasscutter.game.world.Position;
public final class PlayerTeleportEvent extends PlayerEvent implements Cancellable {
private final TeleportProperties properties;

2
src/main/java/emu/grasscutter/server/game/GameServer.java
View File

@@ -54,7 +54,7 @@ import java.util.concurrent.ConcurrentHashMap;
import static emu.grasscutter.config.Configuration.DISPATCH_INFO;
import static emu.grasscutter.config.Configuration.GAME_INFO;
import static emu.grasscutter.utils.Language.translate;
import static emu.grasscutter.utils.lang.Language.translate;
@Getter
public final class GameServer extends KcpServer implements Iterable<Player> {

2
src/main/java/emu/grasscutter/server/game/GameSession.java
View File

@@ -22,7 +22,7 @@ import java.nio.file.Path;
import static emu.grasscutter.config.Configuration.GAME_INFO;
import static emu.grasscutter.config.Configuration.SERVER;
import static emu.grasscutter.utils.Language.translate;
import static emu.grasscutter.utils.lang.Language.translate;
public class GameSession implements GameSessionManager.KcpChannel {
private final GameServer server;

2
src/main/java/emu/grasscutter/server/http/HttpServer.java
View File

@@ -15,7 +15,7 @@ import java.io.UnsupportedEncodingException;
import java.util.Arrays;
import static emu.grasscutter.config.Configuration.*;
import static emu.grasscutter.utils.Language.translate;
import static emu.grasscutter.utils.lang.Language.translate;
/**
* Manages all HTTP-related classes.

2
src/main/java/emu/grasscutter/server/http/dispatch/AuthenticationHandler.java
View File

@@ -1,6 +1,6 @@
package emu.grasscutter.server.http.dispatch;
import static emu.grasscutter.utils.Language.translate;
import static emu.grasscutter.utils.lang.Language.translate;
import emu.grasscutter.Grasscutter;
import emu.grasscutter.auth.AuthenticationSystem;

7
src/main/java/emu/grasscutter/server/http/documentation/GachaMappingRequestHandler.java
View File

@@ -1,13 +1,14 @@
package emu.grasscutter.server.http.documentation;
import static emu.grasscutter.config.Configuration.DOCUMENT_LANGUAGE;
import emu.grasscutter.tools.Tools;
import emu.grasscutter.utils.Language;
import emu.grasscutter.utils.lang.Language;
import io.javalin.http.ContentType;
import io.javalin.http.Context;
import java.util.List;
import static emu.grasscutter.config.Configuration.DOCUMENT_LANGUAGE;
final class GachaMappingRequestHandler implements DocumentationHandler {
private final List<String> gachaJsons;

2
src/main/java/emu/grasscutter/server/http/documentation/HandbookRequestHandler.java
View File

@@ -8,7 +8,7 @@ import emu.grasscutter.data.excels.SceneData;
import emu.grasscutter.data.excels.avatar.AvatarData;
import emu.grasscutter.data.excels.monster.MonsterData;
import emu.grasscutter.utils.FileUtils;
import emu.grasscutter.utils.Language;
import emu.grasscutter.utils.lang.Language;
import io.javalin.http.ContentType;
import io.javalin.http.Context;
import it.unimi.dsi.fastutil.ints.Int2ObjectMap;

2
src/main/java/emu/grasscutter/server/http/documentation/RootRequestHandler.java
View File

@@ -1,6 +1,6 @@
package emu.grasscutter.server.http.documentation;
import static emu.grasscutter.utils.Language.translate;
import static emu.grasscutter.utils.lang.Language.translate;
import emu.grasscutter.Grasscutter;
import emu.grasscutter.utils.FileUtils;

2
src/main/java/emu/grasscutter/server/http/handlers/GachaHandler.java
View File

@@ -1,6 +1,6 @@
package emu.grasscutter.server.http.handlers;
import static emu.grasscutter.utils.Language.translate;
import static emu.grasscutter.utils.lang.Language.translate;
import com.google.gson.JsonObject;
import emu.grasscutter.Grasscutter;

2
src/main/java/emu/grasscutter/server/http/objects/HttpJsonResponse.java
View File

@@ -1,7 +1,7 @@
package emu.grasscutter.server.http.objects;
import static emu.grasscutter.config.Configuration.DISPATCH_INFO;
import static emu.grasscutter.utils.Language.translate;
import static emu.grasscutter.utils.lang.Language.translate;
import emu.grasscutter.Grasscutter;
import emu.grasscutter.Grasscutter.ServerDebugMode;

2
src/main/java/emu/grasscutter/server/packet/recv/HandlerCombatInvocationsNotify.java
View File

@@ -19,7 +19,7 @@ import emu.grasscutter.net.proto.PlayerDieTypeOuterClass;
import emu.grasscutter.server.event.entity.EntityMoveEvent;
import emu.grasscutter.server.game.GameSession;
import emu.grasscutter.server.packet.send.PacketEntityFightPropUpdateNotify;
import emu.grasscutter.utils.Position;
import emu.grasscutter.game.world.Position;
@Opcodes(PacketOpcodes.CombatInvocationsNotify)
public class HandlerCombatInvocationsNotify extends PacketHandler {

2
src/main/java/emu/grasscutter/server/packet/recv/HandlerCreateVehicleReq.java
View File

@@ -6,7 +6,7 @@ import emu.grasscutter.net.packet.PacketOpcodes;
import emu.grasscutter.net.proto.CreateVehicleReqOuterClass;
import emu.grasscutter.server.game.GameSession;
import emu.grasscutter.server.packet.send.PacketCreateVehicleRsp;
import emu.grasscutter.utils.Position;
import emu.grasscutter.game.world.Position;
@Opcodes(PacketOpcodes.CreateVehicleReq)
public class HandlerCreateVehicleReq extends PacketHandler {

2
src/main/java/emu/grasscutter/server/packet/recv/HandlerGetPlayerTokenReq.java
View File

@@ -13,7 +13,7 @@ import emu.grasscutter.server.event.game.PlayerCreationEvent;
import emu.grasscutter.server.game.GameSession;
import emu.grasscutter.server.game.GameSession.SessionState;
import emu.grasscutter.server.packet.send.PacketGetPlayerTokenRsp;
import emu.grasscutter.utils.ByteHelper;
import emu.grasscutter.utils.helpers.ByteHelper;
import emu.grasscutter.utils.Crypto;
import emu.grasscutter.utils.DispatchUtils;
import emu.grasscutter.utils.Utils;

2
src/main/java/emu/grasscutter/server/packet/recv/HandlerHomeChangeModuleReq.java
View File

@@ -10,7 +10,7 @@ import emu.grasscutter.server.game.GameSession;
import emu.grasscutter.server.packet.send.PacketHomeChangeModuleRsp;
import emu.grasscutter.server.packet.send.PacketHomeComfortInfoNotify;
import emu.grasscutter.server.packet.send.PacketPlayerHomeCompInfoNotify;
import emu.grasscutter.utils.Position;
import emu.grasscutter.game.world.Position;
@Opcodes(PacketOpcodes.HomeChangeModuleReq)
public class HandlerHomeChangeModuleReq extends PacketHandler {

2
src/main/java/emu/grasscutter/server/packet/recv/HandlerHomeSceneJumpReq.java
View File

@@ -7,7 +7,7 @@ import emu.grasscutter.net.packet.PacketOpcodes;
import emu.grasscutter.net.proto.HomeSceneJumpReqOuterClass;
import emu.grasscutter.server.game.GameSession;
import emu.grasscutter.server.packet.send.PacketHomeSceneJumpRsp;
import emu.grasscutter.utils.Position;
import emu.grasscutter.game.world.Position;
@Opcodes(PacketOpcodes.HomeSceneJumpReq)
public class HandlerHomeSceneJumpReq extends PacketHandler {

2
src/main/java/emu/grasscutter/server/packet/recv/HandlerPersonalSceneJumpReq.java
View File

@@ -8,7 +8,7 @@ import emu.grasscutter.net.packet.PacketOpcodes;
import emu.grasscutter.net.proto.PersonalSceneJumpReqOuterClass.PersonalSceneJumpReq;
import emu.grasscutter.server.game.GameSession;
import emu.grasscutter.server.packet.send.PacketPersonalSceneJumpRsp;
import emu.grasscutter.utils.Position;
import emu.grasscutter.game.world.Position;
@Opcodes(PacketOpcodes.PersonalSceneJumpReq)
public class HandlerPersonalSceneJumpReq extends PacketHandler {

2
src/main/java/emu/grasscutter/server/packet/recv/HandlerQuestCreateEntityReq.java
View File

@@ -11,7 +11,7 @@ import emu.grasscutter.net.packet.PacketOpcodes;
import emu.grasscutter.net.proto.QuestCreateEntityReqOuterClass.QuestCreateEntityReq;
import emu.grasscutter.server.game.GameSession;
import emu.grasscutter.server.packet.send.PacketQuestCreateEntityRsp;
import emu.grasscutter.utils.Position;
import emu.grasscutter.game.world.Position;
import lombok.val;
@Opcodes(PacketOpcodes.QuestCreateEntityReq)

2
src/main/java/emu/grasscutter/server/packet/recv/HandlerQuestTransmitReq.java
View File

@@ -7,7 +7,7 @@ import emu.grasscutter.net.packet.PacketOpcodes;
import emu.grasscutter.net.proto.QuestTransmitReqOuterClass.QuestTransmitReq;
import emu.grasscutter.server.game.GameSession;
import emu.grasscutter.server.packet.send.PacketQuestTransmitRsp;
import emu.grasscutter.utils.Position;
import emu.grasscutter.game.world.Position;
import java.util.ArrayList;
@Opcodes(PacketOpcodes.QuestTransmitReq)

2
src/main/java/emu/grasscutter/server/packet/recv/HandlerTryEnterHomeReq.java
View File

@@ -11,7 +11,7 @@ import emu.grasscutter.net.proto.TryEnterHomeReqOuterClass;
import emu.grasscutter.server.event.player.PlayerTeleportEvent.TeleportType;
import emu.grasscutter.server.game.GameSession;
import emu.grasscutter.server.packet.send.PacketTryEnterHomeRsp;
import emu.grasscutter.utils.Position;
import emu.grasscutter.game.world.Position;
@Opcodes(PacketOpcodes.TryEnterHomeReq)
public class HandlerTryEnterHomeReq extends PacketHandler {

2
src/main/java/emu/grasscutter/server/packet/recv/HandlerWidgetDoBagReq.java
View File

@@ -9,7 +9,7 @@ import emu.grasscutter.server.game.GameSession;
import emu.grasscutter.server.packet.send.PacketWidgetCoolDownNotify;
import emu.grasscutter.server.packet.send.PacketWidgetDoBagRsp;
import emu.grasscutter.server.packet.send.PacketWidgetGadgetDataNotify;
import emu.grasscutter.utils.Position;
import emu.grasscutter.game.world.Position;
@Opcodes(PacketOpcodes.WidgetDoBagReq)
public class HandlerWidgetDoBagReq extends PacketHandler {

2
src/main/java/emu/grasscutter/server/packet/send/PacketActivityScheduleInfoNotify.java
View File

@@ -5,7 +5,7 @@ import emu.grasscutter.net.packet.BasePacket;
import emu.grasscutter.net.packet.PacketOpcodes;
import emu.grasscutter.net.proto.ActivityScheduleInfoNotifyOuterClass;
import emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass;
import emu.grasscutter.utils.DateHelper;
import emu.grasscutter.utils.helpers.DateHelper;
import java.util.Collection;
public class PacketActivityScheduleInfoNotify extends BasePacket {

2
src/main/java/emu/grasscutter/server/packet/send/PacketBeginCameraSceneLookNotify.java
View File

@@ -3,7 +3,7 @@ package emu.grasscutter.server.packet.send;
import emu.grasscutter.net.packet.BasePacket;
import emu.grasscutter.net.packet.PacketOpcodes;
import emu.grasscutter.net.proto.BeginCameraSceneLookNotifyOuterClass.BeginCameraSceneLookNotify;
import emu.grasscutter.utils.Position;
import emu.grasscutter.game.world.Position;
import lombok.Data;
import lombok.NoArgsConstructor;

2
src/main/java/emu/grasscutter/server/packet/send/PacketCreateVehicleRsp.java
View File

@@ -8,7 +8,7 @@ import emu.grasscutter.net.packet.PacketOpcodes;
import emu.grasscutter.net.proto.CreateVehicleRspOuterClass.CreateVehicleRsp;
import emu.grasscutter.net.proto.VehicleInteractTypeOuterClass;
import emu.grasscutter.net.proto.VehicleMemberOuterClass.VehicleMember;
import emu.grasscutter.utils.Position;
import emu.grasscutter.game.world.Position;
import java.util.List;
public class PacketCreateVehicleRsp extends BasePacket {

2
src/main/java/emu/grasscutter/server/packet/send/PacketPersonalSceneJumpRsp.java
View File

@@ -3,7 +3,7 @@ package emu.grasscutter.server.packet.send;
import emu.grasscutter.net.packet.BasePacket;
import emu.grasscutter.net.packet.PacketOpcodes;
import emu.grasscutter.net.proto.PersonalSceneJumpRspOuterClass.PersonalSceneJumpRsp;
import emu.grasscutter.utils.Position;
import emu.grasscutter.game.world.Position;
public class PacketPersonalSceneJumpRsp extends BasePacket {

2
src/main/java/emu/grasscutter/server/packet/send/PacketPlayerEnterSceneNotify.java
View File

@@ -8,7 +8,7 @@ import emu.grasscutter.net.packet.BasePacket;
import emu.grasscutter.net.packet.PacketOpcodes;
import emu.grasscutter.net.proto.EnterTypeOuterClass.EnterType;
import emu.grasscutter.net.proto.PlayerEnterSceneNotifyOuterClass.PlayerEnterSceneNotify;
import emu.grasscutter.utils.Position;
import emu.grasscutter.game.world.Position;
import emu.grasscutter.utils.Utils;
public class PacketPlayerEnterSceneNotify extends BasePacket {

2
src/main/java/emu/grasscutter/server/packet/send/PacketPlayerPropNotify.java
View File

@@ -5,7 +5,7 @@ import emu.grasscutter.game.props.PlayerProperty;
import emu.grasscutter.net.packet.BasePacket;
import emu.grasscutter.net.packet.PacketOpcodes;
import emu.grasscutter.net.proto.PlayerPropNotifyOuterClass.PlayerPropNotify;
import emu.grasscutter.utils.ProtoHelper;
import emu.grasscutter.utils.helpers.ProtoHelper;
public class PacketPlayerPropNotify extends BasePacket {

2
src/main/java/emu/grasscutter/server/packet/send/PacketScenePlayerSoundNotify.java
View File

@@ -5,7 +5,7 @@ import emu.grasscutter.net.packet.PacketOpcodes;
import emu.grasscutter.net.proto.ScenePlayerSoundNotifyOuterClass.ScenePlayerSoundNotify;
import emu.grasscutter.net.proto.ScenePlayerSoundNotifyOuterClass.ScenePlayerSoundNotify.PlaySoundType;
import emu.grasscutter.net.proto.VectorOuterClass.Vector;
import emu.grasscutter.utils.Position;
import emu.grasscutter.game.world.Position;
import java.util.Objects;
public class PacketScenePlayerSoundNotify extends BasePacket {

2
src/main/java/emu/grasscutter/server/packet/send/PacketTowerAllDataRsp.java
View File

@@ -8,7 +8,7 @@ import emu.grasscutter.net.proto.TowerAllDataRspOuterClass.TowerAllDataRsp;
import emu.grasscutter.net.proto.TowerCurLevelRecordOuterClass.TowerCurLevelRecord;
import emu.grasscutter.net.proto.TowerFloorRecordOuterClass.TowerFloorRecord;
import emu.grasscutter.net.proto.TowerLevelRecordOuterClass;
import emu.grasscutter.utils.DateHelper;
import emu.grasscutter.utils.helpers.DateHelper;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;