Clean up .utils

This commit is contained in:
KingRainbow44
2023-05-20 02:25:49 -04:00
Unverified
parent 51c5cb5c62
commit 1a6fa43367
147 changed files with 623 additions and 291 deletions
@@ -1,6 +1,6 @@
package emu.grasscutter.command;
import static emu.grasscutter.utils.Language.translate;
import static emu.grasscutter.utils.lang.Language.translate;
import emu.grasscutter.Grasscutter;
import emu.grasscutter.game.player.Player;
@@ -1,6 +1,6 @@
package emu.grasscutter.command.commands;
import static emu.grasscutter.utils.Language.translate;
import static emu.grasscutter.utils.lang.Language.translate;
import at.favre.lib.crypto.bcrypt.BCrypt;
import emu.grasscutter.Grasscutter;
@@ -1,6 +1,6 @@
package emu.grasscutter.command.commands;
import static emu.grasscutter.utils.Language.translate;
import static emu.grasscutter.utils.lang.Language.translate;
import emu.grasscutter.Grasscutter;
import emu.grasscutter.command.Command;
@@ -1,6 +1,6 @@
package emu.grasscutter.command.commands;
import static emu.grasscutter.utils.Language.translate;
import static emu.grasscutter.utils.lang.Language.translate;
import emu.grasscutter.command.Command;
import emu.grasscutter.command.CommandHandler;
@@ -1,7 +1,7 @@
package emu.grasscutter.command.commands;
import static emu.grasscutter.command.CommandHelpers.*;
import static emu.grasscutter.utils.Language.translate;
import static emu.grasscutter.utils.lang.Language.translate;
import emu.grasscutter.command.Command;
import emu.grasscutter.command.CommandHandler;
@@ -1,6 +1,6 @@
package emu.grasscutter.command.commands;
import static emu.grasscutter.utils.Language.translate;
import static emu.grasscutter.utils.lang.Language.translate;
import emu.grasscutter.command.Command;
import emu.grasscutter.command.CommandHandler;
@@ -1,6 +1,6 @@
package emu.grasscutter.command.commands;
import static emu.grasscutter.utils.Language.translate;
import static emu.grasscutter.utils.lang.Language.translate;
import emu.grasscutter.command.Command;
import emu.grasscutter.command.CommandHandler;
@@ -1,6 +1,6 @@
package emu.grasscutter.command.commands;
import static emu.grasscutter.utils.Language.translate;
import static emu.grasscutter.utils.lang.Language.translate;
import emu.grasscutter.command.Command;
import emu.grasscutter.command.CommandHandler;
@@ -1,15 +1,16 @@
package emu.grasscutter.command.commands;
import static emu.grasscutter.utils.Language.translate;
import emu.grasscutter.command.Command;
import emu.grasscutter.command.CommandHandler;
import emu.grasscutter.game.entity.EntityMonster;
import emu.grasscutter.game.entity.GameEntity;
import emu.grasscutter.game.player.Player;
import emu.grasscutter.game.world.Scene;
import java.util.List;
import static emu.grasscutter.utils.lang.Language.translate;
@Command(
label = "killall",
usage = {"[<sceneId>]"},
@@ -1,6 +1,6 @@
package emu.grasscutter.command.commands;
import static emu.grasscutter.utils.Language.translate;
import static emu.grasscutter.utils.lang.Language.translate;
import emu.grasscutter.command.Command;
import emu.grasscutter.command.CommandHandler;
@@ -1,6 +1,6 @@
package emu.grasscutter.command.commands;
import static emu.grasscutter.utils.Language.translate;
import static emu.grasscutter.utils.lang.Language.translate;
import emu.grasscutter.Grasscutter;
import emu.grasscutter.command.Command;
@@ -1,6 +1,6 @@
package emu.grasscutter.command.commands;
import static emu.grasscutter.utils.Language.translate;
import static emu.grasscutter.utils.lang.Language.translate;
import emu.grasscutter.Grasscutter;
import emu.grasscutter.command.Command;
@@ -1,6 +1,6 @@
package emu.grasscutter.command.commands;
import static emu.grasscutter.utils.Language.translate;
import static emu.grasscutter.utils.lang.Language.translate;
import emu.grasscutter.Grasscutter;
import emu.grasscutter.command.Command;
@@ -3,7 +3,7 @@ package emu.grasscutter.command.commands;
import emu.grasscutter.command.Command;
import emu.grasscutter.command.CommandHandler;
import emu.grasscutter.game.player.Player;
import emu.grasscutter.utils.Position;
import emu.grasscutter.game.world.Position;
import java.util.List;
@Command(
@@ -1,6 +1,6 @@
package emu.grasscutter.command.commands;
import static emu.grasscutter.utils.Language.translate;
import static emu.grasscutter.utils.lang.Language.translate;
import emu.grasscutter.command.Command;
import emu.grasscutter.command.CommandHandler;
@@ -1,6 +1,6 @@
package emu.grasscutter.command.commands;
import static emu.grasscutter.utils.Language.translate;
import static emu.grasscutter.utils.lang.Language.translate;
import emu.grasscutter.Grasscutter;
import emu.grasscutter.command.Command;
@@ -1,6 +1,6 @@
package emu.grasscutter.command.commands;
import static emu.grasscutter.utils.Language.translate;
import static emu.grasscutter.utils.lang.Language.translate;
import emu.grasscutter.command.Command;
import emu.grasscutter.command.CommandHandler;
@@ -1,6 +1,6 @@
package emu.grasscutter.command.commands;
import static emu.grasscutter.utils.Language.translate;
import static emu.grasscutter.utils.lang.Language.translate;
import emu.grasscutter.command.Command;
import emu.grasscutter.command.CommandHandler;
@@ -1,6 +1,6 @@
package emu.grasscutter.command.commands;
import static emu.grasscutter.utils.Language.translate;
import static emu.grasscutter.utils.lang.Language.translate;
import emu.grasscutter.Grasscutter;
import emu.grasscutter.command.Command;
@@ -8,7 +8,7 @@ import emu.grasscutter.game.player.Player;
import emu.grasscutter.game.world.Scene;
import emu.grasscutter.game.world.World;
import emu.grasscutter.server.packet.send.PacketSceneEntityAppearNotify;
import emu.grasscutter.utils.Position;
import emu.grasscutter.game.world.Position;
import java.util.List;
@Command(
@@ -1,6 +1,6 @@
package emu.grasscutter.command.commands;
import static emu.grasscutter.utils.Language.translate;
import static emu.grasscutter.utils.lang.Language.translate;
import emu.grasscutter.command.Command;
import emu.grasscutter.command.CommandHandler;
@@ -1,12 +1,12 @@
package emu.grasscutter.command.commands;
import static emu.grasscutter.utils.Language.translate;
import static emu.grasscutter.utils.lang.Language.translate;
import emu.grasscutter.command.Command;
import emu.grasscutter.command.CommandHandler;
import emu.grasscutter.game.player.Player;
import emu.grasscutter.server.packet.send.PacketScenePlayerSoundNotify;
import emu.grasscutter.utils.Position;
import emu.grasscutter.game.world.Position;
import java.util.List;
import lombok.val;
@@ -2,7 +2,7 @@ package emu.grasscutter.command.commands;
import static emu.grasscutter.command.CommandHelpers.*;
import static emu.grasscutter.config.Configuration.GAME_OPTIONS;
import static emu.grasscutter.utils.Language.translate;
import static emu.grasscutter.utils.lang.Language.translate;
import emu.grasscutter.command.Command;
import emu.grasscutter.command.CommandHandler;
@@ -15,7 +15,7 @@ import emu.grasscutter.game.player.Player;
import emu.grasscutter.game.props.EntityType;
import emu.grasscutter.game.props.FightProperty;
import emu.grasscutter.game.world.Scene;
import emu.grasscutter.utils.Position;
import emu.grasscutter.game.world.Position;
import java.util.List;
import java.util.Map;
import java.util.function.BiConsumer;
@@ -1,6 +1,6 @@
package emu.grasscutter.command.commands;
import static emu.grasscutter.utils.Language.translate;
import static emu.grasscutter.utils.lang.Language.translate;
import emu.grasscutter.Grasscutter;
import emu.grasscutter.command.Command;
@@ -6,7 +6,7 @@ import emu.grasscutter.data.GameData;
import emu.grasscutter.data.excels.avatar.AvatarSkillDepotData;
import emu.grasscutter.game.avatar.Avatar;
import emu.grasscutter.game.player.Player;
import emu.grasscutter.utils.Language;
import emu.grasscutter.utils.lang.Language;
import java.util.List;
@Command(
@@ -1,6 +1,6 @@
package emu.grasscutter.command.commands;
import static emu.grasscutter.utils.Language.translate;
import static emu.grasscutter.utils.lang.Language.translate;
import emu.grasscutter.command.Command;
import emu.grasscutter.command.CommandHandler;
@@ -1,12 +1,12 @@
package emu.grasscutter.command.commands;
import static emu.grasscutter.utils.Language.translate;
import static emu.grasscutter.utils.lang.Language.translate;
import emu.grasscutter.command.Command;
import emu.grasscutter.command.CommandHandler;
import emu.grasscutter.game.player.Player;
import emu.grasscutter.server.event.player.PlayerTeleportEvent.TeleportType;
import emu.grasscutter.utils.Position;
import emu.grasscutter.game.world.Position;
import java.util.List;
@Command(
@@ -1,6 +1,6 @@
package emu.grasscutter.command.commands;
import static emu.grasscutter.utils.Language.translate;
import static emu.grasscutter.utils.lang.Language.translate;
import emu.grasscutter.command.Command;
import emu.grasscutter.command.CommandHandler;
@@ -1,6 +1,6 @@
package emu.grasscutter.command.commands;
import static emu.grasscutter.utils.Language.translate;
import static emu.grasscutter.utils.lang.Language.translate;
import emu.grasscutter.command.Command;
import emu.grasscutter.command.CommandHandler;