chore: Optimize imports

Signed-off-by: Awakened-Redstone <[email protected]>
Awakened-Redstone · May 14, 2024 · abb4bda · abb4bda
1 parent 68cd497
commit abb4bda
Show file tree

Hide file tree

Showing 80 changed files with 200 additions and 251 deletions.
diff --git a/src/main/java/com/awakenedredstone/neoskies/SkylandsMain.java b/src/main/java/com/awakenedredstone/neoskies/SkylandsMain.java
@@ -1,18 +1,18 @@
 package com.awakenedredstone.neoskies;
 
+import com.awakenedredstone.neoskies.command.SkylandsCommands;
+import com.awakenedredstone.neoskies.font.FontManager;
 import com.awakenedredstone.neoskies.logic.Skylands;
+import com.awakenedredstone.neoskies.logic.SkylandsEventListeners;
+import com.awakenedredstone.neoskies.logic.registry.NeoSkiesIslandSettings;
+import com.awakenedredstone.neoskies.logic.registry.SkylandsPermissionLevels;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import net.fabricmc.api.ModInitializer;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.util.Identifier;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import com.awakenedredstone.neoskies.command.SkylandsCommands;
-import com.awakenedredstone.neoskies.font.FontManager;
-import com.awakenedredstone.neoskies.logic.SkylandsEventListeners;
-import com.awakenedredstone.neoskies.logic.registry.NeoSkiesIslandSettings;
-import com.awakenedredstone.neoskies.logic.registry.SkylandsPermissionLevels;
 
 import java.util.HashSet;
 import java.util.Set;

diff --git a/src/main/java/com/awakenedredstone/neoskies/api/SkylandsAPI.java b/src/main/java/com/awakenedredstone/neoskies/api/SkylandsAPI.java
@@ -1,14 +1,13 @@
 package com.awakenedredstone.neoskies.api;
 
+import com.awakenedredstone.neoskies.logic.Island;
+import com.awakenedredstone.neoskies.logic.Skylands;
+import com.awakenedredstone.neoskies.util.Constants;
 import eu.pb4.common.economy.api.EconomyAccount;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.registry.RegistryKey;
 import net.minecraft.world.World;
 import org.jetbrains.annotations.Nullable;
-import com.awakenedredstone.neoskies.SkylandsMain;
-import com.awakenedredstone.neoskies.logic.Island;
-import com.awakenedredstone.neoskies.logic.Skylands;
-import com.awakenedredstone.neoskies.util.Constants;
 
 import java.util.Optional;
 import java.util.UUID;

diff --git a/src/main/java/com/awakenedredstone/neoskies/api/events/IslandEvents.java b/src/main/java/com/awakenedredstone/neoskies/api/events/IslandEvents.java
@@ -1,10 +1,10 @@
 package com.awakenedredstone.neoskies.api.events;
 
+import com.awakenedredstone.neoskies.logic.Island;
 import net.fabricmc.fabric.api.event.Event;
 import net.fabricmc.fabric.api.event.EventFactory;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.world.World;
-import com.awakenedredstone.neoskies.logic.Island;
 
 public interface IslandEvents {
     Event<HubVisitEvent> ON_HUB_VISIT = EventFactory.createArrayBacked(HubVisitEvent.class, callbacks -> (player, world) -> {

diff --git a/src/main/java/com/awakenedredstone/neoskies/api/island/DefaultPermissionLevel.java b/src/main/java/com/awakenedredstone/neoskies/api/island/DefaultPermissionLevel.java
@@ -1,7 +1,6 @@
 package com.awakenedredstone.neoskies.api.island;
 
 public class DefaultPermissionLevel extends PermissionLevel {
-
     public DefaultPermissionLevel(int level) {
         super(level);
     }

diff --git a/src/main/java/com/awakenedredstone/neoskies/api/island/PermissionLevel.java b/src/main/java/com/awakenedredstone/neoskies/api/island/PermissionLevel.java
@@ -1,6 +1,6 @@
 package com.awakenedredstone.neoskies.api.island;
 
-import com.awakenedredstone.neoskies.logic.SkylandsRegistries;
+import com.awakenedredstone.neoskies.logic.registry.SkylandsRegistries;
 import net.minecraft.util.Identifier;
 
 import java.util.concurrent.atomic.AtomicReference;

diff --git a/src/main/java/com/awakenedredstone/neoskies/command/SkylandsCommands.java b/src/main/java/com/awakenedredstone/neoskies/command/SkylandsCommands.java
@@ -1,16 +1,15 @@
 package com.awakenedredstone.neoskies.command;
 
-import com.awakenedredstone.neoskies.config.MainConfig;
+import com.awakenedredstone.neoskies.SkylandsMain;
+import com.awakenedredstone.neoskies.command.admin.*;
+import com.awakenedredstone.neoskies.command.island.*;
 import com.awakenedredstone.neoskies.logic.Skylands;
 import com.awakenedredstone.neoskies.util.Texts;
 import com.mojang.brigadier.CommandDispatcher;
 import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.server.command.CommandManager;
 import net.minecraft.server.command.ServerCommandSource;
-import com.awakenedredstone.neoskies.SkylandsMain;
-import com.awakenedredstone.neoskies.command.admin.*;
-import com.awakenedredstone.neoskies.command.island.*;
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.text.Text;
 

diff --git a/src/main/java/com/awakenedredstone/neoskies/command/admin/BallanceCommand.java b/src/main/java/com/awakenedredstone/neoskies/command/admin/BallanceCommand.java
@@ -1,6 +1,10 @@
 package com.awakenedredstone.neoskies.command.admin;
 
+import com.awakenedredstone.neoskies.api.SkylandsAPI;
+import com.awakenedredstone.neoskies.command.utils.CommandUtils;
+import com.awakenedredstone.neoskies.logic.Island;
 import com.awakenedredstone.neoskies.util.MapBuilder;
+import com.awakenedredstone.neoskies.util.Texts;
 import com.mojang.brigadier.CommandDispatcher;
 import com.mojang.brigadier.arguments.LongArgumentType;
 import com.mojang.brigadier.arguments.StringArgumentType;
@@ -9,17 +13,13 @@
 import me.lucko.fabric.api.permissions.v0.Permissions;
 import net.minecraft.server.command.ServerCommandSource;
 import org.jetbrains.annotations.Nullable;
-import com.awakenedredstone.neoskies.api.SkylandsAPI;
-import com.awakenedredstone.neoskies.command.utils.CommandUtils;
-import com.awakenedredstone.neoskies.logic.Island;
-import com.awakenedredstone.neoskies.util.Texts;
 
 import java.util.UUID;
 
-import static net.minecraft.server.command.CommandManager.argument;
-import static net.minecraft.server.command.CommandManager.literal;
 import static com.awakenedredstone.neoskies.command.utils.CommandUtils.adminNode;
 import static com.awakenedredstone.neoskies.command.utils.CommandUtils.registerAdmin;
+import static net.minecraft.server.command.CommandManager.argument;
+import static net.minecraft.server.command.CommandManager.literal;
 
 public class BallanceCommand {
     public static void init(CommandDispatcher<ServerCommandSource> dispatcher) {

diff --git a/src/main/java/com/awakenedredstone/neoskies/command/admin/DeleteIslandCommand.java b/src/main/java/com/awakenedredstone/neoskies/command/admin/DeleteIslandCommand.java
@@ -1,17 +1,17 @@
 package com.awakenedredstone.neoskies.command.admin;
 
+import com.awakenedredstone.neoskies.logic.Skylands;
+import com.awakenedredstone.neoskies.util.Texts;
 import com.mojang.brigadier.CommandDispatcher;
 import com.mojang.brigadier.arguments.StringArgumentType;
 import me.lucko.fabric.api.permissions.v0.Permissions;
 import net.minecraft.server.command.ServerCommandSource;
-import com.awakenedredstone.neoskies.logic.Skylands;
-import com.awakenedredstone.neoskies.util.Texts;
 
+import static com.awakenedredstone.neoskies.command.utils.CommandUtils.adminNode;
+import static com.awakenedredstone.neoskies.command.utils.CommandUtils.registerAdmin;
 import static com.mojang.brigadier.arguments.StringArgumentType.word;
 import static net.minecraft.server.command.CommandManager.argument;
 import static net.minecraft.server.command.CommandManager.literal;
-import static com.awakenedredstone.neoskies.command.utils.CommandUtils.adminNode;
-import static com.awakenedredstone.neoskies.command.utils.CommandUtils.registerAdmin;
 
 public class DeleteIslandCommand {
     public static void init(CommandDispatcher<ServerCommandSource> dispatcher) {

diff --git a/src/main/java/com/awakenedredstone/neoskies/command/admin/IslandDataCommand.java b/src/main/java/com/awakenedredstone/neoskies/command/admin/IslandDataCommand.java
@@ -1,25 +1,25 @@
 package com.awakenedredstone.neoskies.command.admin;
 
+import com.awakenedredstone.neoskies.api.SkylandsAPI;
+import com.awakenedredstone.neoskies.command.utils.CommandUtils;
+import com.awakenedredstone.neoskies.logic.Island;
+import com.awakenedredstone.neoskies.logic.Skylands;
 import com.awakenedredstone.neoskies.util.MapBuilder;
+import com.awakenedredstone.neoskies.util.Texts;
 import com.mojang.brigadier.CommandDispatcher;
 import com.mojang.brigadier.arguments.StringArgumentType;
 import me.lucko.fabric.api.permissions.v0.Permissions;
 import net.minecraft.server.command.ServerCommandSource;
 import org.jetbrains.annotations.Nullable;
-import com.awakenedredstone.neoskies.api.SkylandsAPI;
-import com.awakenedredstone.neoskies.command.utils.CommandUtils;
-import com.awakenedredstone.neoskies.logic.Island;
-import com.awakenedredstone.neoskies.logic.Skylands;
-import com.awakenedredstone.neoskies.util.Texts;
 
 import java.util.List;
 import java.util.Optional;
 import java.util.UUID;
 
-import static net.minecraft.server.command.CommandManager.argument;
-import static net.minecraft.server.command.CommandManager.literal;
 import static com.awakenedredstone.neoskies.command.utils.CommandUtils.adminNode;
 import static com.awakenedredstone.neoskies.command.utils.CommandUtils.registerAdmin;
+import static net.minecraft.server.command.CommandManager.argument;
+import static net.minecraft.server.command.CommandManager.literal;
 
 public class IslandDataCommand {
     public static void init(CommandDispatcher<ServerCommandSource> dispatcher) {

diff --git a/src/main/java/com/awakenedredstone/neoskies/command/admin/ModifyCommand.java b/src/main/java/com/awakenedredstone/neoskies/command/admin/ModifyCommand.java
@@ -12,14 +12,12 @@
 import com.mojang.brigadier.context.CommandContext;
 import me.lucko.fabric.api.permissions.v0.Permissions;
 import net.minecraft.server.command.CommandManager;
-import net.minecraft.server.command.GameRuleCommand;
 import net.minecraft.server.command.ServerCommandSource;
 import net.minecraft.server.world.ServerWorld;
 import net.minecraft.text.Text;
 import net.minecraft.world.GameRules;
 import org.jetbrains.annotations.Nullable;
 
-import java.io.IOException;
 import java.util.UUID;
 
 import static com.awakenedredstone.neoskies.command.utils.CommandUtils.*;

diff --git a/src/main/java/com/awakenedredstone/neoskies/command/admin/SettingsCommand.java b/src/main/java/com/awakenedredstone/neoskies/command/admin/SettingsCommand.java
@@ -1,15 +1,14 @@
 package com.awakenedredstone.neoskies.command.admin;
 
+import com.awakenedredstone.neoskies.util.Texts;
 import com.mojang.brigadier.CommandDispatcher;
 import me.lucko.fabric.api.permissions.v0.Permissions;
 import net.minecraft.server.command.ServerCommandSource;
-import com.awakenedredstone.neoskies.SkylandsMain;
-import com.awakenedredstone.neoskies.util.Texts;
 import net.minecraft.text.Text;
 
-import static net.minecraft.server.command.CommandManager.literal;
 import static com.awakenedredstone.neoskies.command.utils.CommandUtils.adminNode;
 import static com.awakenedredstone.neoskies.command.utils.CommandUtils.registerAdmin;
+import static net.minecraft.server.command.CommandManager.literal;
 
 public class SettingsCommand {
     public static void init(CommandDispatcher<ServerCommandSource> dispatcher) {

diff --git a/src/main/java/com/awakenedredstone/neoskies/command/island/AcceptCommand.java b/src/main/java/com/awakenedredstone/neoskies/command/island/AcceptCommand.java
@@ -1,18 +1,17 @@
 package com.awakenedredstone.neoskies.command.island;
 
+import com.awakenedredstone.neoskies.logic.Skylands;
+import com.awakenedredstone.neoskies.util.Players;
+import com.awakenedredstone.neoskies.util.Texts;
 import com.mojang.brigadier.CommandDispatcher;
 import com.mojang.brigadier.arguments.StringArgumentType;
 import net.minecraft.server.command.ServerCommandSource;
 import net.minecraft.server.network.ServerPlayerEntity;
-import com.awakenedredstone.neoskies.logic.Skylands;
-import com.awakenedredstone.neoskies.util.Players;
-import com.awakenedredstone.neoskies.util.Texts;
 
 import static com.awakenedredstone.neoskies.command.utils.CommandUtils.*;
 import static com.mojang.brigadier.arguments.StringArgumentType.word;
 import static net.minecraft.server.command.CommandManager.argument;
 import static net.minecraft.server.command.CommandManager.literal;
-import static net.minecraft.server.command.CommandManager.literal;
 
 public class AcceptCommand {
     public static void init(CommandDispatcher<ServerCommandSource> dispatcher) {

diff --git a/src/main/java/com/awakenedredstone/neoskies/command/island/BanCommands.java b/src/main/java/com/awakenedredstone/neoskies/command/island/BanCommands.java
@@ -1,22 +1,21 @@
 package com.awakenedredstone.neoskies.command.island;
 
+import com.awakenedredstone.neoskies.api.SkylandsAPI;
+import com.awakenedredstone.neoskies.logic.Member;
+import com.awakenedredstone.neoskies.logic.Skylands;
+import com.awakenedredstone.neoskies.util.Texts;
 import com.mojang.brigadier.CommandDispatcher;
 import com.mojang.brigadier.arguments.StringArgumentType;
 import me.lucko.fabric.api.permissions.v0.Permissions;
 import net.minecraft.command.argument.EntityArgumentType;
 import net.minecraft.server.command.ServerCommandSource;
 import net.minecraft.server.network.ServerPlayerEntity;
-import com.awakenedredstone.neoskies.api.SkylandsAPI;
-import com.awakenedredstone.neoskies.logic.Member;
-import com.awakenedredstone.neoskies.logic.Skylands;
-import com.awakenedredstone.neoskies.util.Texts;
 
 import static com.awakenedredstone.neoskies.command.utils.CommandUtils.*;
 import static com.mojang.brigadier.arguments.StringArgumentType.word;
 import static net.minecraft.command.argument.EntityArgumentType.player;
 import static net.minecraft.server.command.CommandManager.argument;
 import static net.minecraft.server.command.CommandManager.literal;
-import static net.minecraft.server.command.CommandManager.literal;
 
 public class BanCommands {
     public static void init(CommandDispatcher<ServerCommandSource> dispatcher) {

diff --git a/src/main/java/com/awakenedredstone/neoskies/command/island/CreateCommand.java b/src/main/java/com/awakenedredstone/neoskies/command/island/CreateCommand.java
@@ -1,16 +1,14 @@
 package com.awakenedredstone.neoskies.command.island;
 
-import com.mojang.brigadier.CommandDispatcher;
-import net.minecraft.server.command.ServerCommandSource;
-import net.minecraft.server.network.ServerPlayerEntity;
 import com.awakenedredstone.neoskies.logic.Island;
 import com.awakenedredstone.neoskies.logic.IslandStuck;
 import com.awakenedredstone.neoskies.logic.Skylands;
 import com.awakenedredstone.neoskies.util.Texts;
+import com.mojang.brigadier.CommandDispatcher;
+import net.minecraft.server.command.ServerCommandSource;
+import net.minecraft.server.network.ServerPlayerEntity;
 
-import static com.awakenedredstone.neoskies.command.utils.CommandUtils.node;
-import static com.awakenedredstone.neoskies.command.utils.CommandUtils.register;
-import static com.awakenedredstone.neoskies.command.utils.CommandUtils.requiresNoIsland;
+import static com.awakenedredstone.neoskies.command.utils.CommandUtils.*;
 import static net.minecraft.server.command.CommandManager.literal;
 
 public class CreateCommand {

diff --git a/src/main/java/com/awakenedredstone/neoskies/command/island/DeleteCommand.java b/src/main/java/com/awakenedredstone/neoskies/command/island/DeleteCommand.java
@@ -1,20 +1,17 @@
 package com.awakenedredstone.neoskies.command.island;
 
-import com.awakenedredstone.neoskies.command.utils.CommandUtils;
+import com.awakenedredstone.neoskies.logic.IslandStuck;
+import com.awakenedredstone.neoskies.logic.Skylands;
+import com.awakenedredstone.neoskies.util.Texts;
 import com.mojang.brigadier.CommandDispatcher;
 import com.mojang.brigadier.arguments.StringArgumentType;
 import net.minecraft.server.command.ServerCommandSource;
 import net.minecraft.server.network.ServerPlayerEntity;
-import com.awakenedredstone.neoskies.logic.IslandStuck;
-import com.awakenedredstone.neoskies.logic.Skylands;
-import com.awakenedredstone.neoskies.util.Texts;
 
 import java.time.Instant;
 import java.time.temporal.ChronoUnit;
 
-import static com.awakenedredstone.neoskies.command.utils.CommandUtils.mustBeIslandOwner;
-import static com.awakenedredstone.neoskies.command.utils.CommandUtils.node;
-import static com.awakenedredstone.neoskies.command.utils.CommandUtils.register;
+import static com.awakenedredstone.neoskies.command.utils.CommandUtils.*;
 import static com.mojang.brigadier.arguments.StringArgumentType.word;
 import static net.minecraft.server.command.CommandManager.argument;
 import static net.minecraft.server.command.CommandManager.literal;

diff --git a/src/main/java/com/awakenedredstone/neoskies/command/island/HelpCommand.java b/src/main/java/com/awakenedredstone/neoskies/command/island/HelpCommand.java
@@ -7,9 +7,9 @@
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.util.Language;
 
-import static net.minecraft.server.command.CommandManager.literal;
 import static com.awakenedredstone.neoskies.command.utils.CommandUtils.node;
 import static com.awakenedredstone.neoskies.command.utils.CommandUtils.register;
+import static net.minecraft.server.command.CommandManager.literal;
 
 public class HelpCommand {
 

diff --git a/src/main/java/com/awakenedredstone/neoskies/command/island/HomeCommand.java b/src/main/java/com/awakenedredstone/neoskies/command/island/HomeCommand.java
@@ -1,20 +1,17 @@
 package com.awakenedredstone.neoskies.command.island;
 
+import com.awakenedredstone.neoskies.SkylandsMain;
 import com.awakenedredstone.neoskies.api.SkylandsAPI;
 import com.awakenedredstone.neoskies.logic.Island;
 import com.awakenedredstone.neoskies.logic.Skylands;
+import com.awakenedredstone.neoskies.util.Texts;
 import com.mojang.brigadier.CommandDispatcher;
 import net.minecraft.server.command.ServerCommandSource;
 import net.minecraft.server.network.ServerPlayerEntity;
-import com.awakenedredstone.neoskies.SkylandsMain;
-import com.awakenedredstone.neoskies.util.Texts;
 
 import java.util.Optional;
 
-import static net.minecraft.server.command.CommandManager.literal;
-import static com.awakenedredstone.neoskies.command.utils.CommandUtils.node;
-import static com.awakenedredstone.neoskies.command.utils.CommandUtils.register;
-import static com.awakenedredstone.neoskies.command.utils.CommandUtils.requiresIsland;
+import static com.awakenedredstone.neoskies.command.utils.CommandUtils.*;
 import static net.minecraft.server.command.CommandManager.literal;
 
 public class HomeCommand {

diff --git a/src/main/java/com/awakenedredstone/neoskies/command/island/HubCommands.java b/src/main/java/com/awakenedredstone/neoskies/command/island/HubCommands.java
@@ -1,5 +1,7 @@
 package com.awakenedredstone.neoskies.command.island;
 
+import com.awakenedredstone.neoskies.logic.Skylands;
+import com.awakenedredstone.neoskies.util.Texts;
 import com.mojang.brigadier.CommandDispatcher;
 import me.lucko.fabric.api.permissions.v0.Permissions;
 import net.minecraft.command.argument.BlockPosArgumentType;
@@ -8,8 +10,6 @@
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Vec3d;
-import com.awakenedredstone.neoskies.logic.Skylands;
-import com.awakenedredstone.neoskies.util.Texts;
 
 import static com.awakenedredstone.neoskies.command.utils.CommandUtils.*;
 import static net.minecraft.command.argument.BlockPosArgumentType.blockPos;

diff --git a/src/main/java/com/awakenedredstone/neoskies/command/island/KickCommand.java b/src/main/java/com/awakenedredstone/neoskies/command/island/KickCommand.java
@@ -1,18 +1,17 @@
 package com.awakenedredstone.neoskies.command.island;
 
+import com.awakenedredstone.neoskies.api.SkylandsAPI;
+import com.awakenedredstone.neoskies.logic.Skylands;
+import com.awakenedredstone.neoskies.util.Texts;
 import com.mojang.brigadier.CommandDispatcher;
 import net.minecraft.command.argument.EntityArgumentType;
 import net.minecraft.server.command.ServerCommandSource;
 import net.minecraft.server.network.ServerPlayerEntity;
-import com.awakenedredstone.neoskies.api.SkylandsAPI;
-import com.awakenedredstone.neoskies.logic.Skylands;
-import com.awakenedredstone.neoskies.util.Texts;
 
 import static com.awakenedredstone.neoskies.command.utils.CommandUtils.*;
 import static net.minecraft.command.argument.EntityArgumentType.player;
 import static net.minecraft.server.command.CommandManager.argument;
 import static net.minecraft.server.command.CommandManager.literal;
-import static net.minecraft.server.command.CommandManager.literal;
 
 public class KickCommand {