diff --git a/src/main/java/com/awakenedredstone/neoskies/SkylandsMain.java b/src/main/java/com/awakenedredstone/neoskies/SkylandsMain.java index f844475..393c0ad 100644 --- a/src/main/java/com/awakenedredstone/neoskies/SkylandsMain.java +++ b/src/main/java/com/awakenedredstone/neoskies/SkylandsMain.java @@ -1,6 +1,11 @@ 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; @@ -8,11 +13,6 @@ 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 index b8ce1fa..3042174 100644 --- 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 index e39ac13..97203cf 100644 --- 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 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 index dbb8152..ec83eca 100644 --- 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 index 6bbd9a9..9a3e043 100644 --- 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 index 043690b..07b7b28 100644 --- a/src/main/java/com/awakenedredstone/neoskies/command/SkylandsCommands.java +++ b/src/main/java/com/awakenedredstone/neoskies/command/SkylandsCommands.java @@ -1,6 +1,8 @@ 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; @@ -8,9 +10,6 @@ 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 index b18587c..fda6293 100644 --- 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 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 index 475857f..a2194dd 100644 --- 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 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 index 9012c20..8a19904 100644 --- 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 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 index 36bc0b3..9e13777 100644 --- 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 index d5293f3..3ffa4e7 100644 --- 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 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 index 60ee9d2..4402dbb 100644 --- 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 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 index 9251636..f61dee1 100644 --- 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 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 index 6c284d7..943c4b7 100644 --- 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 index edc9bd6..e2e912d 100644 --- 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 index a31a9b2..9d01934 100644 --- 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 index b9507af..431f1a6 100644 --- 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 index 8073717..1f3e6dd 100644 --- 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 index e3bfa06..2971640 100644 --- 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 { diff --git a/src/main/java/com/awakenedredstone/neoskies/command/island/LevelCommand.java b/src/main/java/com/awakenedredstone/neoskies/command/island/LevelCommand.java index 97479ec..fb04c09 100644 --- a/src/main/java/com/awakenedredstone/neoskies/command/island/LevelCommand.java +++ b/src/main/java/com/awakenedredstone/neoskies/command/island/LevelCommand.java @@ -1,7 +1,15 @@ package com.awakenedredstone.neoskies.command.island; +import com.awakenedredstone.neoskies.api.SkylandsAPI; +import com.awakenedredstone.neoskies.duck.ExtendedChunk; import com.awakenedredstone.neoskies.gui.PagedGui; +import com.awakenedredstone.neoskies.logic.Island; +import com.awakenedredstone.neoskies.logic.Skylands; +import com.awakenedredstone.neoskies.logic.util.ChunkScanQueue; +import com.awakenedredstone.neoskies.util.FontUtils; import com.awakenedredstone.neoskies.util.MapBuilder; +import com.awakenedredstone.neoskies.util.Texts; +import com.awakenedredstone.neoskies.util.UnitConvertions; import com.mojang.brigadier.CommandDispatcher; import eu.pb4.polymer.virtualentity.api.ElementHolder; import eu.pb4.polymer.virtualentity.api.attachment.ChunkAttachment; @@ -9,7 +17,6 @@ import eu.pb4.polymer.virtualentity.api.elements.InteractionElement; import eu.pb4.polymer.virtualentity.api.elements.TextDisplayElement; import eu.pb4.polymer.virtualentity.api.elements.VirtualElement; -import eu.pb4.sgui.api.elements.GuiElement; import eu.pb4.sgui.api.elements.GuiElementBuilder; import eu.pb4.sgui.api.elements.GuiElementInterface; import eu.pb4.sgui.api.gui.SimpleGui; @@ -37,15 +44,6 @@ import net.minecraft.world.chunk.PalettedContainer; import net.minecraft.world.chunk.WorldChunk; import org.jetbrains.annotations.Nullable; -import com.awakenedredstone.neoskies.SkylandsMain; -import com.awakenedredstone.neoskies.api.SkylandsAPI; -import com.awakenedredstone.neoskies.duck.ExtendedChunk; -import com.awakenedredstone.neoskies.logic.Island; -import com.awakenedredstone.neoskies.logic.Skylands; -import com.awakenedredstone.neoskies.logic.util.ChunkScanQueue; -import com.awakenedredstone.neoskies.util.FontUtils; -import com.awakenedredstone.neoskies.util.Texts; -import com.awakenedredstone.neoskies.util.UnitConvertions; import java.util.*; import java.util.concurrent.atomic.AtomicInteger; @@ -53,11 +51,7 @@ import java.util.function.BiConsumer; import java.util.function.Consumer; -import static com.awakenedredstone.neoskies.command.utils.CommandUtils.assertIsland; -import static com.awakenedredstone.neoskies.command.utils.CommandUtils.assertPlayer; -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 LevelCommand { diff --git a/src/main/java/com/awakenedredstone/neoskies/command/island/MemberCommands.java b/src/main/java/com/awakenedredstone/neoskies/command/island/MemberCommands.java index 5a14356..493881b 100644 --- a/src/main/java/com/awakenedredstone/neoskies/command/island/MemberCommands.java +++ b/src/main/java/com/awakenedredstone/neoskies/command/island/MemberCommands.java @@ -1,5 +1,8 @@ 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 com.mojang.brigadier.arguments.StringArgumentType; import net.minecraft.command.argument.EntityArgumentType; @@ -8,16 +11,12 @@ import net.minecraft.text.ClickEvent; import net.minecraft.text.HoverEvent; import net.minecraft.text.Style; -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 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 MemberCommands { diff --git a/src/main/java/com/awakenedredstone/neoskies/command/island/MenuCommand.java b/src/main/java/com/awakenedredstone/neoskies/command/island/MenuCommand.java index acad819..168de29 100644 --- a/src/main/java/com/awakenedredstone/neoskies/command/island/MenuCommand.java +++ b/src/main/java/com/awakenedredstone/neoskies/command/island/MenuCommand.java @@ -1,7 +1,13 @@ package com.awakenedredstone.neoskies.command.island; +import com.awakenedredstone.neoskies.SkylandsMain; +import com.awakenedredstone.neoskies.api.SkylandsAPI; +import com.awakenedredstone.neoskies.gui.IslandSettingsGui; import com.awakenedredstone.neoskies.gui.polymer.CBGuiElementBuilder; import com.awakenedredstone.neoskies.gui.polymer.CBSimpleGuiBuilder; +import com.awakenedredstone.neoskies.logic.Island; +import com.awakenedredstone.neoskies.logic.Skylands; +import com.awakenedredstone.neoskies.util.Texts; import com.awakenedredstone.neoskies.util.UIUtils; import com.mojang.brigadier.CommandDispatcher; import eu.pb4.sgui.api.SlotHolder; @@ -16,20 +22,14 @@ import net.minecraft.sound.SoundCategory; import net.minecraft.sound.SoundEvents; import net.minecraft.text.Text; -import com.awakenedredstone.neoskies.SkylandsMain; -import com.awakenedredstone.neoskies.api.SkylandsAPI; -import com.awakenedredstone.neoskies.gui.IslandSettingsGui; -import com.awakenedredstone.neoskies.logic.Island; -import com.awakenedredstone.neoskies.logic.Skylands; -import com.awakenedredstone.neoskies.util.Texts; import java.util.Optional; import java.util.Set; import java.util.function.Consumer; -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 MenuCommand { public static void init(CommandDispatcher dispatcher) { diff --git a/src/main/java/com/awakenedredstone/neoskies/command/island/SettingCommands.java b/src/main/java/com/awakenedredstone/neoskies/command/island/SettingCommands.java index a681bb1..c28720c 100644 --- a/src/main/java/com/awakenedredstone/neoskies/command/island/SettingCommands.java +++ b/src/main/java/com/awakenedredstone/neoskies/command/island/SettingCommands.java @@ -1,5 +1,10 @@ package com.awakenedredstone.neoskies.command.island; +import com.awakenedredstone.neoskies.api.SkylandsAPI; +import com.awakenedredstone.neoskies.gui.IslandSettingsGui; +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.command.argument.BlockPosArgumentType; import net.minecraft.server.command.ServerCommandSource; @@ -8,11 +13,6 @@ import net.minecraft.sound.SoundEvents; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Vec3d; -import com.awakenedredstone.neoskies.api.SkylandsAPI; -import com.awakenedredstone.neoskies.gui.IslandSettingsGui; -import com.awakenedredstone.neoskies.logic.Island; -import com.awakenedredstone.neoskies.logic.Skylands; -import com.awakenedredstone.neoskies.util.Texts; import java.util.Optional; @@ -20,7 +20,6 @@ import static net.minecraft.command.argument.BlockPosArgumentType.blockPos; 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 SettingCommands { diff --git a/src/main/java/com/awakenedredstone/neoskies/command/island/VisitCommand.java b/src/main/java/com/awakenedredstone/neoskies/command/island/VisitCommand.java index 85251ed..95e05d8 100644 --- a/src/main/java/com/awakenedredstone/neoskies/command/island/VisitCommand.java +++ b/src/main/java/com/awakenedredstone/neoskies/command/island/VisitCommand.java @@ -1,19 +1,19 @@ package com.awakenedredstone.neoskies.command.island; +import com.awakenedredstone.neoskies.SkylandsMain; 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.EntityArgumentType; import net.minecraft.server.command.ServerCommandSource; import net.minecraft.server.network.ServerPlayerEntity; -import com.awakenedredstone.neoskies.SkylandsMain; -import com.awakenedredstone.neoskies.util.Texts; +import static com.awakenedredstone.neoskies.command.utils.CommandUtils.node; +import static com.awakenedredstone.neoskies.command.utils.CommandUtils.register; 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 com.awakenedredstone.neoskies.command.utils.CommandUtils.node; -import static com.awakenedredstone.neoskies.command.utils.CommandUtils.register; public class VisitCommand { diff --git a/src/main/java/com/awakenedredstone/neoskies/command/utils/CommandUtils.java b/src/main/java/com/awakenedredstone/neoskies/command/utils/CommandUtils.java index f512685..da74b77 100644 --- a/src/main/java/com/awakenedredstone/neoskies/command/utils/CommandUtils.java +++ b/src/main/java/com/awakenedredstone/neoskies/command/utils/CommandUtils.java @@ -1,5 +1,9 @@ package com.awakenedredstone.neoskies.command.utils; +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 com.mojang.brigadier.builder.LiteralArgumentBuilder; import com.mojang.brigadier.suggestion.SuggestionProvider; @@ -9,11 +13,6 @@ import net.minecraft.server.command.ServerCommandSource; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -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 java.util.List; import java.util.function.Predicate; diff --git a/src/main/java/com/awakenedredstone/neoskies/config/MainConfig.java b/src/main/java/com/awakenedredstone/neoskies/config/MainConfig.java index 548b68e..c8ed5e6 100644 --- a/src/main/java/com/awakenedredstone/neoskies/config/MainConfig.java +++ b/src/main/java/com/awakenedredstone/neoskies/config/MainConfig.java @@ -1,12 +1,15 @@ package com.awakenedredstone.neoskies.config; import blue.endless.jankson.Comment; +import com.awakenedredstone.neoskies.config.source.Config; import com.awakenedredstone.neoskies.config.source.JanksonBuilder; import net.minecraft.util.Identifier; import net.minecraft.util.math.Vec3d; -import com.awakenedredstone.neoskies.config.source.Config; -import java.util.*; +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; public class MainConfig extends Config { public MainConfig() { diff --git a/src/main/java/com/awakenedredstone/neoskies/data/PlayerComponent.java b/src/main/java/com/awakenedredstone/neoskies/data/PlayerComponent.java index 4aa0f0d..dfefcb3 100644 --- a/src/main/java/com/awakenedredstone/neoskies/data/PlayerComponent.java +++ b/src/main/java/com/awakenedredstone/neoskies/data/PlayerComponent.java @@ -1,9 +1,9 @@ package com.awakenedredstone.neoskies.data; -import net.minecraft.registry.RegistryWrapper; -import org.ladysnake.cca.api.v3.component.ComponentV3; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.nbt.NbtCompound; +import net.minecraft.registry.RegistryWrapper; +import org.ladysnake.cca.api.v3.component.ComponentV3; import java.util.ArrayList; diff --git a/src/main/java/com/awakenedredstone/neoskies/data/SkylandComponents.java b/src/main/java/com/awakenedredstone/neoskies/data/SkylandComponents.java index 9b2e57e..06d58bf 100644 --- a/src/main/java/com/awakenedredstone/neoskies/data/SkylandComponents.java +++ b/src/main/java/com/awakenedredstone/neoskies/data/SkylandComponents.java @@ -1,10 +1,10 @@ package com.awakenedredstone.neoskies.data; +import com.awakenedredstone.neoskies.SkylandsMain; import org.ladysnake.cca.api.v3.component.ComponentKey; import org.ladysnake.cca.api.v3.component.ComponentRegistryV3; import org.ladysnake.cca.api.v3.world.WorldComponentFactoryRegistry; import org.ladysnake.cca.api.v3.world.WorldComponentInitializer; -import com.awakenedredstone.neoskies.SkylandsMain; public class SkylandComponents implements WorldComponentInitializer/*, EntityComponentInitializer*/ { public static final ComponentKey WORLD_DATA = ComponentRegistryV3.INSTANCE.getOrCreate(SkylandsMain.id("world_data"), WorldComponent.class); diff --git a/src/main/java/com/awakenedredstone/neoskies/data/WorldComponent.java b/src/main/java/com/awakenedredstone/neoskies/data/WorldComponent.java index aba8403..f19a851 100644 --- a/src/main/java/com/awakenedredstone/neoskies/data/WorldComponent.java +++ b/src/main/java/com/awakenedredstone/neoskies/data/WorldComponent.java @@ -1,11 +1,11 @@ package com.awakenedredstone.neoskies.data; -import net.minecraft.registry.RegistryWrapper; -import org.ladysnake.cca.api.v3.component.ComponentV3; +import com.awakenedredstone.neoskies.logic.Skylands; import net.minecraft.nbt.NbtCompound; +import net.minecraft.registry.RegistryWrapper; import net.minecraft.world.World; import org.jetbrains.annotations.NotNull; -import com.awakenedredstone.neoskies.logic.Skylands; +import org.ladysnake.cca.api.v3.component.ComponentV3; public record WorldComponent(World world) implements ComponentV3 { diff --git a/src/main/java/com/awakenedredstone/neoskies/datagen/NeoSkiesBlockTagProvider.java b/src/main/java/com/awakenedredstone/neoskies/datagen/NeoSkiesBlockTagProvider.java index 768319a..62a50fe 100644 --- a/src/main/java/com/awakenedredstone/neoskies/datagen/NeoSkiesBlockTagProvider.java +++ b/src/main/java/com/awakenedredstone/neoskies/datagen/NeoSkiesBlockTagProvider.java @@ -6,9 +6,6 @@ import net.minecraft.block.Block; import net.minecraft.block.Blocks; import net.minecraft.block.Oxidizable; -import net.minecraft.data.DataProvider; -import net.minecraft.item.Item; -import net.minecraft.item.MinecartItem; import net.minecraft.registry.Registries; import net.minecraft.registry.RegistryWrapper; import net.minecraft.registry.tag.BlockTags; diff --git a/src/main/java/com/awakenedredstone/neoskies/datagen/NeoSkiesItemTagProvider.java b/src/main/java/com/awakenedredstone/neoskies/datagen/NeoSkiesItemTagProvider.java index e06c7b9..e6fc221 100644 --- a/src/main/java/com/awakenedredstone/neoskies/datagen/NeoSkiesItemTagProvider.java +++ b/src/main/java/com/awakenedredstone/neoskies/datagen/NeoSkiesItemTagProvider.java @@ -2,7 +2,10 @@ import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; import net.fabricmc.fabric.api.datagen.v1.provider.FabricTagProvider; -import net.minecraft.item.*; +import net.minecraft.item.Item; +import net.minecraft.item.Items; +import net.minecraft.item.MinecartItem; +import net.minecraft.item.SpawnEggItem; import net.minecraft.registry.Registries; import net.minecraft.registry.RegistryWrapper; import net.minecraft.registry.tag.ItemTags; diff --git a/src/main/java/com/awakenedredstone/neoskies/event/PlayerConnectEvent.java b/src/main/java/com/awakenedredstone/neoskies/event/PlayerConnectEvent.java index 4ad0f0c..18f53e8 100644 --- a/src/main/java/com/awakenedredstone/neoskies/event/PlayerConnectEvent.java +++ b/src/main/java/com/awakenedredstone/neoskies/event/PlayerConnectEvent.java @@ -1,12 +1,11 @@ package com.awakenedredstone.neoskies.event; -import net.minecraft.server.MinecraftServer; -import net.minecraft.server.network.ServerPlayerEntity; -//import nota.player.SongPlayer; 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 net.minecraft.server.MinecraftServer; +import net.minecraft.server.network.ServerPlayerEntity; @SuppressWarnings("unused") public class PlayerConnectEvent { diff --git a/src/main/java/com/awakenedredstone/neoskies/event/ServerEventListener.java b/src/main/java/com/awakenedredstone/neoskies/event/ServerEventListener.java index 4b6b658..8623dc3 100644 --- a/src/main/java/com/awakenedredstone/neoskies/event/ServerEventListener.java +++ b/src/main/java/com/awakenedredstone/neoskies/event/ServerEventListener.java @@ -1,14 +1,14 @@ package com.awakenedredstone.neoskies.event; -import eu.pb4.common.economy.api.CommonEconomy; -import eu.pb4.placeholders.api.PlaceholderResult; -import eu.pb4.placeholders.api.Placeholders; -import net.minecraft.server.MinecraftServer; import com.awakenedredstone.neoskies.SkylandsMain; import com.awakenedredstone.neoskies.logic.Island; import com.awakenedredstone.neoskies.logic.Skylands; import com.awakenedredstone.neoskies.util.PreInitData; import com.awakenedredstone.neoskies.util.Texts; +import eu.pb4.common.economy.api.CommonEconomy; +import eu.pb4.placeholders.api.PlaceholderResult; +import eu.pb4.placeholders.api.Placeholders; +import net.minecraft.server.MinecraftServer; import java.time.ZoneId; import java.time.format.DateTimeFormatter; diff --git a/src/main/java/com/awakenedredstone/neoskies/font/FontManager.java b/src/main/java/com/awakenedredstone/neoskies/font/FontManager.java index 3ab5349..56ee767 100644 --- a/src/main/java/com/awakenedredstone/neoskies/font/FontManager.java +++ b/src/main/java/com/awakenedredstone/neoskies/font/FontManager.java @@ -1,5 +1,7 @@ package com.awakenedredstone.neoskies.font; +import com.awakenedredstone.neoskies.SkylandsMain; +import com.awakenedredstone.neoskies.util.PreInitData; import com.google.gson.JsonElement; import com.mojang.serialization.JsonOps; import net.fabricmc.fabric.api.resource.ResourceManagerHelper; @@ -8,8 +10,6 @@ import net.minecraft.resource.ResourceType; import net.minecraft.util.Identifier; import org.jetbrains.annotations.ApiStatus; -import com.awakenedredstone.neoskies.SkylandsMain; -import com.awakenedredstone.neoskies.util.PreInitData; import java.io.InputStream; import java.io.InputStreamReader; diff --git a/src/main/java/com/awakenedredstone/neoskies/font/FontProvider.java b/src/main/java/com/awakenedredstone/neoskies/font/FontProvider.java index 9849505..64c1011 100644 --- a/src/main/java/com/awakenedredstone/neoskies/font/FontProvider.java +++ b/src/main/java/com/awakenedredstone/neoskies/font/FontProvider.java @@ -1,12 +1,12 @@ package com.awakenedredstone.neoskies.font; +import com.awakenedredstone.neoskies.SkylandsMain; +import com.awakenedredstone.neoskies.logic.Skylands; import com.mojang.serialization.Codec; import com.mojang.serialization.codecs.RecordCodecBuilder; import net.minecraft.util.Identifier; import org.apache.commons.lang3.StringUtils; import org.jetbrains.annotations.Nullable; -import com.awakenedredstone.neoskies.SkylandsMain; -import com.awakenedredstone.neoskies.logic.Skylands; import java.io.IOException; import java.io.InputStream; diff --git a/src/main/java/com/awakenedredstone/neoskies/gui/polymer/CBGuiElementBuilder.java b/src/main/java/com/awakenedredstone/neoskies/gui/polymer/CBGuiElementBuilder.java index 48dda94..b9f3ffe 100644 --- a/src/main/java/com/awakenedredstone/neoskies/gui/polymer/CBGuiElementBuilder.java +++ b/src/main/java/com/awakenedredstone/neoskies/gui/polymer/CBGuiElementBuilder.java @@ -26,7 +26,6 @@ import java.util.List; import java.util.Optional; import java.util.UUID; -import java.util.function.Consumer; public class CBGuiElementBuilder extends GuiElementBuilder { diff --git a/src/main/java/com/awakenedredstone/neoskies/logic/Invites.java b/src/main/java/com/awakenedredstone/neoskies/logic/Invites.java index 640738a..be2a438 100644 --- a/src/main/java/com/awakenedredstone/neoskies/logic/Invites.java +++ b/src/main/java/com/awakenedredstone/neoskies/logic/Invites.java @@ -1,8 +1,8 @@ package com.awakenedredstone.neoskies.logic; +import com.awakenedredstone.neoskies.util.Texts; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.server.MinecraftServer; -import com.awakenedredstone.neoskies.util.Texts; import java.util.ArrayList; import java.util.Optional; diff --git a/src/main/java/com/awakenedredstone/neoskies/logic/IslandStuck.java b/src/main/java/com/awakenedredstone/neoskies/logic/IslandStuck.java index 52d494f..bcf90ec 100644 --- a/src/main/java/com/awakenedredstone/neoskies/logic/IslandStuck.java +++ b/src/main/java/com/awakenedredstone/neoskies/logic/IslandStuck.java @@ -1,11 +1,11 @@ package com.awakenedredstone.neoskies.logic; +import com.awakenedredstone.neoskies.duck.ExtendedPlayerManager; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.nbt.NbtCompound; import net.minecraft.server.MinecraftServer; import net.minecraft.server.PlayerManager; import net.minecraft.server.network.ServerPlayerEntity; -import com.awakenedredstone.neoskies.duck.ExtendedPlayerManager; import java.nio.file.Path; import java.util.ArrayList; diff --git a/src/main/java/com/awakenedredstone/neoskies/logic/Skylands.java b/src/main/java/com/awakenedredstone/neoskies/logic/Skylands.java index d92ced5..83adf18 100644 --- a/src/main/java/com/awakenedredstone/neoskies/logic/Skylands.java +++ b/src/main/java/com/awakenedredstone/neoskies/logic/Skylands.java @@ -1,17 +1,17 @@ package com.awakenedredstone.neoskies.logic; +import com.awakenedredstone.neoskies.SkylandsMain; import com.awakenedredstone.neoskies.config.IslandRanking; import com.awakenedredstone.neoskies.config.MainConfig; -import eu.pb4.common.protection.api.CommonProtection; -import net.minecraft.nbt.NbtCompound; -import net.minecraft.resource.ResourceManager; -import net.minecraft.server.MinecraftServer; -import com.awakenedredstone.neoskies.SkylandsMain; import com.awakenedredstone.neoskies.logic.economy.Economy; import com.awakenedredstone.neoskies.logic.protection.SkylandsProtectionProvider; import com.awakenedredstone.neoskies.util.NbtMigrator; import com.awakenedredstone.neoskies.util.PreInitData; import com.awakenedredstone.neoskies.util.Scheduler; +import eu.pb4.common.protection.api.CommonProtection; +import net.minecraft.nbt.NbtCompound; +import net.minecraft.resource.ResourceManager; +import net.minecraft.server.MinecraftServer; import xyz.nucleoid.fantasy.Fantasy; public class Skylands { diff --git a/src/main/java/com/awakenedredstone/neoskies/logic/SkylandsEventListeners.java b/src/main/java/com/awakenedredstone/neoskies/logic/SkylandsEventListeners.java index 29878cc..e4a7cad 100644 --- a/src/main/java/com/awakenedredstone/neoskies/logic/SkylandsEventListeners.java +++ b/src/main/java/com/awakenedredstone/neoskies/logic/SkylandsEventListeners.java @@ -1,7 +1,10 @@ package com.awakenedredstone.neoskies.logic; import com.awakenedredstone.neoskies.api.SkylandsAPI; -import com.awakenedredstone.neoskies.event.*; +import com.awakenedredstone.neoskies.event.GenericEntityDamageEvent; +import com.awakenedredstone.neoskies.event.PlayerConnectEvent; +import com.awakenedredstone.neoskies.event.PlayerEvents; +import com.awakenedredstone.neoskies.event.ServerEventListener; import com.awakenedredstone.neoskies.logic.registry.NeoSkiesIslandSettings; import com.awakenedredstone.neoskies.logic.settings.IslandSettings; import com.awakenedredstone.neoskies.logic.tags.NeoSkiesItemTags; @@ -11,30 +14,25 @@ import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents; import net.fabricmc.fabric.api.event.lifecycle.v1.ServerTickEvents; import net.fabricmc.fabric.api.networking.v1.ServerPlayConnectionEvents; -import net.minecraft.block.Block; -import net.minecraft.block.BlockState; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityType; -import net.minecraft.entity.LivingEntity; import net.minecraft.entity.Ownable; import net.minecraft.entity.damage.DamageSource; import net.minecraft.entity.mob.Monster; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; -import net.minecraft.item.Items; import net.minecraft.network.packet.s2c.play.ScreenHandlerSlotUpdateS2CPacket; import net.minecraft.registry.tag.TagKey; import net.minecraft.util.ActionResult; import net.minecraft.util.Hand; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.Vec3d; -import net.minecraft.world.World; import xyz.nucleoid.stimuli.Stimuli; -import xyz.nucleoid.stimuli.event.block.*; -import xyz.nucleoid.stimuli.event.entity.EntityDamageEvent; +import xyz.nucleoid.stimuli.event.block.BlockBreakEvent; +import xyz.nucleoid.stimuli.event.block.BlockPlaceEvent; +import xyz.nucleoid.stimuli.event.block.BlockTrampleEvent; +import xyz.nucleoid.stimuli.event.block.FlowerPotModifyEvent; import xyz.nucleoid.stimuli.event.entity.EntityShearEvent; import xyz.nucleoid.stimuli.event.entity.EntityUseEvent; -import xyz.nucleoid.stimuli.event.player.PlayerAttackEntityEvent; import java.util.Map; diff --git a/src/main/java/com/awakenedredstone/neoskies/logic/economy/Economy.java b/src/main/java/com/awakenedredstone/neoskies/logic/economy/Economy.java index 7a66c56..8257284 100644 --- a/src/main/java/com/awakenedredstone/neoskies/logic/economy/Economy.java +++ b/src/main/java/com/awakenedredstone/neoskies/logic/economy/Economy.java @@ -1,9 +1,9 @@ package com.awakenedredstone.neoskies.logic.economy; +import com.awakenedredstone.neoskies.SkylandsMain; import eu.pb4.common.economy.api.CommonEconomy; import eu.pb4.common.economy.api.EconomyCurrency; import net.minecraft.util.Identifier; -import com.awakenedredstone.neoskies.SkylandsMain; public class Economy { public Economy() { diff --git a/src/main/java/com/awakenedredstone/neoskies/logic/economy/SkylandsEconomyAccount.java b/src/main/java/com/awakenedredstone/neoskies/logic/economy/SkylandsEconomyAccount.java index fdbf8c5..6f9772c 100644 --- a/src/main/java/com/awakenedredstone/neoskies/logic/economy/SkylandsEconomyAccount.java +++ b/src/main/java/com/awakenedredstone/neoskies/logic/economy/SkylandsEconomyAccount.java @@ -1,12 +1,12 @@ package com.awakenedredstone.neoskies.logic.economy; +import com.awakenedredstone.neoskies.logic.Skylands; import eu.pb4.common.economy.api.EconomyAccount; import eu.pb4.common.economy.api.EconomyCurrency; import eu.pb4.common.economy.api.EconomyProvider; import eu.pb4.common.economy.api.EconomyTransaction; import net.minecraft.text.Text; import net.minecraft.util.Identifier; -import com.awakenedredstone.neoskies.logic.Skylands; import java.math.BigInteger; import java.util.UUID; diff --git a/src/main/java/com/awakenedredstone/neoskies/logic/economy/SkylandsEconomyCurrency.java b/src/main/java/com/awakenedredstone/neoskies/logic/economy/SkylandsEconomyCurrency.java index be4ecb3..a5d6f8b 100644 --- a/src/main/java/com/awakenedredstone/neoskies/logic/economy/SkylandsEconomyCurrency.java +++ b/src/main/java/com/awakenedredstone/neoskies/logic/economy/SkylandsEconomyCurrency.java @@ -1,10 +1,10 @@ package com.awakenedredstone.neoskies.logic.economy; +import com.awakenedredstone.neoskies.logic.Skylands; import eu.pb4.common.economy.api.EconomyCurrency; import eu.pb4.common.economy.api.EconomyProvider; import net.minecraft.text.Text; import net.minecraft.util.Identifier; -import com.awakenedredstone.neoskies.logic.Skylands; @SuppressWarnings("ClassCanBeRecord") public class SkylandsEconomyCurrency implements EconomyCurrency { diff --git a/src/main/java/com/awakenedredstone/neoskies/logic/economy/SkylandsEconomyProvider.java b/src/main/java/com/awakenedredstone/neoskies/logic/economy/SkylandsEconomyProvider.java index 319efcd..e40fa0b 100644 --- a/src/main/java/com/awakenedredstone/neoskies/logic/economy/SkylandsEconomyProvider.java +++ b/src/main/java/com/awakenedredstone/neoskies/logic/economy/SkylandsEconomyProvider.java @@ -1,5 +1,8 @@ package com.awakenedredstone.neoskies.logic.economy; +import com.awakenedredstone.neoskies.api.SkylandsAPI; +import com.awakenedredstone.neoskies.logic.Island; +import com.awakenedredstone.neoskies.logic.Skylands; import com.mojang.authlib.GameProfile; import eu.pb4.common.economy.api.EconomyAccount; import eu.pb4.common.economy.api.EconomyCurrency; @@ -7,9 +10,6 @@ import net.minecraft.server.MinecraftServer; import net.minecraft.text.Text; import org.jetbrains.annotations.Nullable; -import com.awakenedredstone.neoskies.api.SkylandsAPI; -import com.awakenedredstone.neoskies.logic.Island; -import com.awakenedredstone.neoskies.logic.Skylands; import java.util.*; diff --git a/src/main/java/com/awakenedredstone/neoskies/logic/protection/SkylandsProtectionProvider.java b/src/main/java/com/awakenedredstone/neoskies/logic/protection/SkylandsProtectionProvider.java index 02fa434..1022338 100644 --- a/src/main/java/com/awakenedredstone/neoskies/logic/protection/SkylandsProtectionProvider.java +++ b/src/main/java/com/awakenedredstone/neoskies/logic/protection/SkylandsProtectionProvider.java @@ -1,24 +1,21 @@ package com.awakenedredstone.neoskies.logic.protection; +import com.awakenedredstone.neoskies.api.SkylandsAPI; import com.awakenedredstone.neoskies.logic.registry.NeoSkiesIslandSettings; import com.awakenedredstone.neoskies.logic.settings.IslandSettings; -import com.awakenedredstone.neoskies.util.ServerUtils; +import com.awakenedredstone.neoskies.util.WorldProtection; import com.mojang.authlib.GameProfile; import eu.pb4.common.protection.api.ProtectionProvider; -import net.minecraft.block.*; +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityType; import net.minecraft.entity.mob.Monster; import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.network.packet.s2c.play.ScreenHandlerSlotUpdateS2CPacket; import net.minecraft.registry.tag.TagKey; -import net.minecraft.util.ActionResult; -import net.minecraft.util.Hand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Box; import net.minecraft.world.World; -import com.awakenedredstone.neoskies.api.SkylandsAPI; -import com.awakenedredstone.neoskies.util.WorldProtection; import java.util.Map; diff --git a/src/main/java/com/awakenedredstone/neoskies/logic/registry/SkylandsPermissionLevels.java b/src/main/java/com/awakenedredstone/neoskies/logic/registry/SkylandsPermissionLevels.java index d1f2fb5..1e96f8c 100644 --- a/src/main/java/com/awakenedredstone/neoskies/logic/registry/SkylandsPermissionLevels.java +++ b/src/main/java/com/awakenedredstone/neoskies/logic/registry/SkylandsPermissionLevels.java @@ -1,10 +1,9 @@ package com.awakenedredstone.neoskies.logic.registry; import com.awakenedredstone.neoskies.SkylandsMain; -import net.minecraft.registry.Registry; import com.awakenedredstone.neoskies.api.island.DefaultPermissionLevel; import com.awakenedredstone.neoskies.api.island.PermissionLevel; -import com.awakenedredstone.neoskies.logic.SkylandsRegistries; +import net.minecraft.registry.Registry; import java.lang.reflect.Field; import java.lang.reflect.Modifier; diff --git a/src/main/java/com/awakenedredstone/neoskies/logic/SkylandsRegistries.java b/src/main/java/com/awakenedredstone/neoskies/logic/registry/SkylandsRegistries.java similarity index 94% rename from src/main/java/com/awakenedredstone/neoskies/logic/SkylandsRegistries.java rename to src/main/java/com/awakenedredstone/neoskies/logic/registry/SkylandsRegistries.java index be07daf..0ad631e 100644 --- a/src/main/java/com/awakenedredstone/neoskies/logic/SkylandsRegistries.java +++ b/src/main/java/com/awakenedredstone/neoskies/logic/registry/SkylandsRegistries.java @@ -1,12 +1,12 @@ -package com.awakenedredstone.neoskies.logic; +package com.awakenedredstone.neoskies.logic.registry; +import com.awakenedredstone.neoskies.SkylandsMain; +import com.awakenedredstone.neoskies.api.island.PermissionLevel; +import com.awakenedredstone.neoskies.logic.settings.IslandSettings; import net.fabricmc.fabric.api.event.registry.FabricRegistryBuilder; import net.minecraft.registry.RegistryKey; import net.minecraft.registry.SimpleRegistry; import net.minecraft.util.Identifier; -import com.awakenedredstone.neoskies.SkylandsMain; -import com.awakenedredstone.neoskies.api.island.PermissionLevel; -import com.awakenedredstone.neoskies.logic.settings.IslandSettings; public class SkylandsRegistries { public static final SimpleRegistry ISLAND_SETTINGS = createRegistry(SkylandsMain.id("island_settings")); diff --git a/src/main/java/com/awakenedredstone/neoskies/mixin/block/EndPortalBlockMixin.java b/src/main/java/com/awakenedredstone/neoskies/mixin/block/EndPortalBlockMixin.java index 71d3714..ce44426 100644 --- a/src/main/java/com/awakenedredstone/neoskies/mixin/block/EndPortalBlockMixin.java +++ b/src/main/java/com/awakenedredstone/neoskies/mixin/block/EndPortalBlockMixin.java @@ -1,5 +1,7 @@ package com.awakenedredstone.neoskies.mixin.block; +import com.awakenedredstone.neoskies.api.SkylandsAPI; +import com.awakenedredstone.neoskies.logic.Island; import com.awakenedredstone.neoskies.logic.Skylands; import net.minecraft.block.BlockState; import net.minecraft.block.EndPortalBlock; @@ -12,9 +14,6 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import org.spongepowered.asm.mixin.injection.callback.LocalCapture; -import com.awakenedredstone.neoskies.SkylandsMain; -import com.awakenedredstone.neoskies.api.SkylandsAPI; -import com.awakenedredstone.neoskies.logic.Island; import java.util.Optional; diff --git a/src/main/java/com/awakenedredstone/neoskies/mixin/block/FireBlockMixin.java b/src/main/java/com/awakenedredstone/neoskies/mixin/block/FireBlockMixin.java index 269e579..7bf1ad6 100644 --- a/src/main/java/com/awakenedredstone/neoskies/mixin/block/FireBlockMixin.java +++ b/src/main/java/com/awakenedredstone/neoskies/mixin/block/FireBlockMixin.java @@ -1,12 +1,12 @@ package com.awakenedredstone.neoskies.mixin.block; +import com.awakenedredstone.neoskies.util.Constants; import net.minecraft.block.AbstractFireBlock; import net.minecraft.world.World; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; -import com.awakenedredstone.neoskies.util.Constants; @Mixin(AbstractFireBlock.class) public class FireBlockMixin { diff --git a/src/main/java/com/awakenedredstone/neoskies/mixin/block/entity/EndGatewayBlockEntityMixin.java b/src/main/java/com/awakenedredstone/neoskies/mixin/block/entity/EndGatewayBlockEntityMixin.java index 03e5c75..8f75160 100644 --- a/src/main/java/com/awakenedredstone/neoskies/mixin/block/entity/EndGatewayBlockEntityMixin.java +++ b/src/main/java/com/awakenedredstone/neoskies/mixin/block/entity/EndGatewayBlockEntityMixin.java @@ -1,12 +1,12 @@ package com.awakenedredstone.neoskies.mixin.block.entity; +import com.awakenedredstone.neoskies.util.Worlds; import net.minecraft.block.entity.EndGatewayBlockEntity; import net.minecraft.registry.RegistryKey; import net.minecraft.world.World; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Redirect; -import com.awakenedredstone.neoskies.util.Worlds; @Mixin(EndGatewayBlockEntity.class) public class EndGatewayBlockEntityMixin { diff --git a/src/main/java/com/awakenedredstone/neoskies/mixin/entity/EntityMixin.java b/src/main/java/com/awakenedredstone/neoskies/mixin/entity/EntityMixin.java index d022a13..d343204 100644 --- a/src/main/java/com/awakenedredstone/neoskies/mixin/entity/EntityMixin.java +++ b/src/main/java/com/awakenedredstone/neoskies/mixin/entity/EntityMixin.java @@ -1,5 +1,8 @@ package com.awakenedredstone.neoskies.mixin.entity; +import com.awakenedredstone.neoskies.api.SkylandsAPI; +import com.awakenedredstone.neoskies.logic.Island; +import com.awakenedredstone.neoskies.util.Worlds; import net.minecraft.entity.Entity; import net.minecraft.registry.RegistryKey; import net.minecraft.server.world.ServerWorld; @@ -16,9 +19,6 @@ import org.spongepowered.asm.mixin.injection.Redirect; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; import org.spongepowered.asm.mixin.injection.callback.LocalCapture; -import com.awakenedredstone.neoskies.api.SkylandsAPI; -import com.awakenedredstone.neoskies.logic.Island; -import com.awakenedredstone.neoskies.util.Worlds; import java.util.Optional; diff --git a/src/main/java/com/awakenedredstone/neoskies/mixin/entity/PlayerManagerMixin.java b/src/main/java/com/awakenedredstone/neoskies/mixin/entity/PlayerManagerMixin.java index 10c35b5..d79201c 100644 --- a/src/main/java/com/awakenedredstone/neoskies/mixin/entity/PlayerManagerMixin.java +++ b/src/main/java/com/awakenedredstone/neoskies/mixin/entity/PlayerManagerMixin.java @@ -1,5 +1,10 @@ package com.awakenedredstone.neoskies.mixin.entity; +import com.awakenedredstone.neoskies.api.SkylandsAPI; +import com.awakenedredstone.neoskies.duck.ExtendedPlayerManager; +import com.awakenedredstone.neoskies.duck.ExtendedServerPlayerEntity; +import com.awakenedredstone.neoskies.logic.Island; +import com.awakenedredstone.neoskies.logic.Skylands; import com.llamalad7.mixinextras.sugar.Local; import net.minecraft.advancement.AdvancementProgress; import net.minecraft.entity.Entity; @@ -24,11 +29,6 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.Redirect; -import com.awakenedredstone.neoskies.api.SkylandsAPI; -import com.awakenedredstone.neoskies.duck.ExtendedPlayerManager; -import com.awakenedredstone.neoskies.duck.ExtendedServerPlayerEntity; -import com.awakenedredstone.neoskies.logic.Island; -import com.awakenedredstone.neoskies.logic.Skylands; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import java.util.List; diff --git a/src/main/java/com/awakenedredstone/neoskies/mixin/entity/ServerPlayerEntityMixin.java b/src/main/java/com/awakenedredstone/neoskies/mixin/entity/ServerPlayerEntityMixin.java index a0dffaf..3d4a947 100644 --- a/src/main/java/com/awakenedredstone/neoskies/mixin/entity/ServerPlayerEntityMixin.java +++ b/src/main/java/com/awakenedredstone/neoskies/mixin/entity/ServerPlayerEntityMixin.java @@ -1,5 +1,9 @@ package com.awakenedredstone.neoskies.mixin.entity; +import com.awakenedredstone.neoskies.api.SkylandsAPI; +import com.awakenedredstone.neoskies.duck.ExtendedServerPlayerEntity; +import com.awakenedredstone.neoskies.event.PlayerEvents; +import com.awakenedredstone.neoskies.util.Worlds; import com.llamalad7.mixinextras.injector.ModifyExpressionValue; import com.mojang.authlib.GameProfile; import net.minecraft.entity.damage.DamageSource; @@ -19,10 +23,6 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.Redirect; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import com.awakenedredstone.neoskies.api.SkylandsAPI; -import com.awakenedredstone.neoskies.duck.ExtendedServerPlayerEntity; -import com.awakenedredstone.neoskies.event.PlayerEvents; -import com.awakenedredstone.neoskies.util.Worlds; @Mixin(ServerPlayerEntity.class) public abstract class ServerPlayerEntityMixin extends PlayerEntity implements ExtendedServerPlayerEntity { diff --git a/src/main/java/com/awakenedredstone/neoskies/mixin/item/BoneMealItemMixin.java b/src/main/java/com/awakenedredstone/neoskies/mixin/item/BoneMealItemMixin.java index e07d5ea..ee19024 100644 --- a/src/main/java/com/awakenedredstone/neoskies/mixin/item/BoneMealItemMixin.java +++ b/src/main/java/com/awakenedredstone/neoskies/mixin/item/BoneMealItemMixin.java @@ -2,6 +2,7 @@ import com.awakenedredstone.neoskies.logic.registry.NeoSkiesIslandSettings; import com.awakenedredstone.neoskies.util.ServerUtils; +import com.awakenedredstone.neoskies.util.WorldProtection; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.BoneMealItem; import net.minecraft.item.ItemStack; @@ -15,7 +16,6 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; -import com.awakenedredstone.neoskies.util.WorldProtection; @Mixin(BoneMealItem.class) public class BoneMealItemMixin { diff --git a/src/main/java/com/awakenedredstone/neoskies/mixin/item/ItemStackMixin.java b/src/main/java/com/awakenedredstone/neoskies/mixin/item/ItemStackMixin.java index 2be4931..1421630 100644 --- a/src/main/java/com/awakenedredstone/neoskies/mixin/item/ItemStackMixin.java +++ b/src/main/java/com/awakenedredstone/neoskies/mixin/item/ItemStackMixin.java @@ -3,9 +3,12 @@ import com.awakenedredstone.neoskies.logic.registry.NeoSkiesIslandSettings; import com.awakenedredstone.neoskies.logic.settings.IslandSettings; import com.awakenedredstone.neoskies.util.ServerUtils; -import net.minecraft.block.Block; +import com.awakenedredstone.neoskies.util.WorldProtection; import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.*; +import net.minecraft.item.BlockItem; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.item.ItemUsageContext; import net.minecraft.network.packet.s2c.play.ScreenHandlerSlotUpdateS2CPacket; import net.minecraft.registry.tag.TagKey; import net.minecraft.server.network.ServerPlayerEntity; @@ -18,7 +21,6 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; -import com.awakenedredstone.neoskies.util.WorldProtection; import java.util.Map; diff --git a/src/main/java/com/awakenedredstone/neoskies/mixin/world/ChunkMixin.java b/src/main/java/com/awakenedredstone/neoskies/mixin/world/ChunkMixin.java index a4b4e80..030a3d3 100644 --- a/src/main/java/com/awakenedredstone/neoskies/mixin/world/ChunkMixin.java +++ b/src/main/java/com/awakenedredstone/neoskies/mixin/world/ChunkMixin.java @@ -1,10 +1,10 @@ package com.awakenedredstone.neoskies.mixin.world; +import com.awakenedredstone.neoskies.duck.ExtendedChunk; import net.minecraft.world.chunk.Chunk; import net.minecraft.world.chunk.ChunkSection; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; -import com.awakenedredstone.neoskies.duck.ExtendedChunk; import java.util.HashSet; import java.util.Set; diff --git a/src/main/java/com/awakenedredstone/neoskies/mixin/world/PlayerEntityMixin.java b/src/main/java/com/awakenedredstone/neoskies/mixin/world/PlayerEntityMixin.java index d08e5c2..f96621a 100644 --- a/src/main/java/com/awakenedredstone/neoskies/mixin/world/PlayerEntityMixin.java +++ b/src/main/java/com/awakenedredstone/neoskies/mixin/world/PlayerEntityMixin.java @@ -1,5 +1,9 @@ package com.awakenedredstone.neoskies.mixin.world; +import com.awakenedredstone.neoskies.api.SkylandsAPI; +import com.awakenedredstone.neoskies.logic.Island; +import com.awakenedredstone.neoskies.mixin.block.accessor.WorldBorderAccessor; +import com.awakenedredstone.neoskies.util.Worlds; import net.minecraft.entity.EntityType; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.player.PlayerEntity; @@ -14,10 +18,6 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import com.awakenedredstone.neoskies.api.SkylandsAPI; -import com.awakenedredstone.neoskies.logic.Island; -import com.awakenedredstone.neoskies.mixin.block.accessor.WorldBorderAccessor; -import com.awakenedredstone.neoskies.util.Worlds; @Mixin(PlayerEntity.class) public abstract class PlayerEntityMixin extends LivingEntity { diff --git a/src/main/java/com/awakenedredstone/neoskies/mixin/world/PortalForcerMixin.java b/src/main/java/com/awakenedredstone/neoskies/mixin/world/PortalForcerMixin.java index 948e4ff..4a37185 100644 --- a/src/main/java/com/awakenedredstone/neoskies/mixin/world/PortalForcerMixin.java +++ b/src/main/java/com/awakenedredstone/neoskies/mixin/world/PortalForcerMixin.java @@ -1,5 +1,7 @@ package com.awakenedredstone.neoskies.mixin.world; +import com.awakenedredstone.neoskies.api.SkylandsAPI; +import com.awakenedredstone.neoskies.logic.Island; import net.minecraft.server.world.ServerWorld; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; @@ -11,8 +13,6 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; -import com.awakenedredstone.neoskies.api.SkylandsAPI; -import com.awakenedredstone.neoskies.logic.Island; import java.util.Optional; diff --git a/src/main/java/com/awakenedredstone/neoskies/mixin/world/ServerWorldMixin.java b/src/main/java/com/awakenedredstone/neoskies/mixin/world/ServerWorldMixin.java index 367763c..7be663b 100644 --- a/src/main/java/com/awakenedredstone/neoskies/mixin/world/ServerWorldMixin.java +++ b/src/main/java/com/awakenedredstone/neoskies/mixin/world/ServerWorldMixin.java @@ -1,6 +1,8 @@ package com.awakenedredstone.neoskies.mixin.world; +import com.awakenedredstone.neoskies.api.SkylandsAPI; import com.awakenedredstone.neoskies.logic.Skylands; +import com.awakenedredstone.neoskies.util.WorldProtection; import com.google.common.collect.ImmutableList; import com.llamalad7.mixinextras.injector.ModifyExpressionValue; import net.minecraft.entity.Entity; @@ -36,8 +38,6 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; -import com.awakenedredstone.neoskies.api.SkylandsAPI; -import com.awakenedredstone.neoskies.util.WorldProtection; import java.util.List; import java.util.concurrent.Executor; diff --git a/src/main/java/com/awakenedredstone/neoskies/mixin/world/protection/PotionEntityMixin.java b/src/main/java/com/awakenedredstone/neoskies/mixin/world/protection/PotionEntityMixin.java index 7e70492..2c2bdde 100644 --- a/src/main/java/com/awakenedredstone/neoskies/mixin/world/protection/PotionEntityMixin.java +++ b/src/main/java/com/awakenedredstone/neoskies/mixin/world/protection/PotionEntityMixin.java @@ -3,21 +3,18 @@ import com.awakenedredstone.neoskies.logic.registry.NeoSkiesIslandSettings; import com.awakenedredstone.neoskies.logic.tags.NeoSkiesBlockTags; import com.awakenedredstone.neoskies.util.ServerUtils; -import net.minecraft.block.AbstractCandleBlock; +import com.awakenedredstone.neoskies.util.WorldProtection; import net.minecraft.block.BlockState; -import net.minecraft.block.CampfireBlock; import net.minecraft.entity.EntityType; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.projectile.thrown.PotionEntity; import net.minecraft.entity.projectile.thrown.ThrownItemEntity; -import net.minecraft.registry.tag.BlockTags; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import com.awakenedredstone.neoskies.util.WorldProtection; @Mixin(PotionEntity.class) public abstract class PotionEntityMixin extends ThrownItemEntity { diff --git a/src/main/java/com/awakenedredstone/neoskies/mixin/world/protection/VibrationListenerMixin.java b/src/main/java/com/awakenedredstone/neoskies/mixin/world/protection/VibrationListenerMixin.java index 1242d32..84fdc4f 100644 --- a/src/main/java/com/awakenedredstone/neoskies/mixin/world/protection/VibrationListenerMixin.java +++ b/src/main/java/com/awakenedredstone/neoskies/mixin/world/protection/VibrationListenerMixin.java @@ -1,6 +1,7 @@ package com.awakenedredstone.neoskies.mixin.world.protection; import com.awakenedredstone.neoskies.logic.registry.NeoSkiesIslandSettings; +import com.awakenedredstone.neoskies.util.WorldProtection; import net.minecraft.entity.Entity; import net.minecraft.entity.Ownable; import net.minecraft.entity.player.PlayerEntity; @@ -17,7 +18,6 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; -import com.awakenedredstone.neoskies.util.WorldProtection; import java.util.Optional; diff --git a/src/main/java/com/awakenedredstone/neoskies/mixin/world/protection/block/AbstractCandleBlockMixin.java b/src/main/java/com/awakenedredstone/neoskies/mixin/world/protection/block/AbstractCandleBlockMixin.java index 5e8e644..8bc977b 100644 --- a/src/main/java/com/awakenedredstone/neoskies/mixin/world/protection/block/AbstractCandleBlockMixin.java +++ b/src/main/java/com/awakenedredstone/neoskies/mixin/world/protection/block/AbstractCandleBlockMixin.java @@ -2,6 +2,7 @@ import com.awakenedredstone.neoskies.logic.registry.NeoSkiesIslandSettings; import com.awakenedredstone.neoskies.util.ServerUtils; +import com.awakenedredstone.neoskies.util.WorldProtection; import net.minecraft.block.AbstractCandleBlock; import net.minecraft.block.BlockState; import net.minecraft.entity.player.PlayerEntity; @@ -13,7 +14,6 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import com.awakenedredstone.neoskies.util.WorldProtection; @Mixin(AbstractCandleBlock.class) public class AbstractCandleBlockMixin { diff --git a/src/main/java/com/awakenedredstone/neoskies/mixin/world/protection/block/CampfireBlockMixin.java b/src/main/java/com/awakenedredstone/neoskies/mixin/world/protection/block/CampfireBlockMixin.java index d5566bd..b643ab5 100644 --- a/src/main/java/com/awakenedredstone/neoskies/mixin/world/protection/block/CampfireBlockMixin.java +++ b/src/main/java/com/awakenedredstone/neoskies/mixin/world/protection/block/CampfireBlockMixin.java @@ -2,26 +2,18 @@ import com.awakenedredstone.neoskies.logic.registry.NeoSkiesIslandSettings; import com.awakenedredstone.neoskies.util.ServerUtils; +import com.awakenedredstone.neoskies.util.WorldProtection; import net.minecraft.block.BlockState; import net.minecraft.block.CampfireBlock; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.projectile.ProjectileEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.state.property.BooleanProperty; -import net.minecraft.util.ActionResult; -import net.minecraft.util.Hand; -import net.minecraft.util.ItemActionResult; import net.minecraft.util.hit.BlockHitResult; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; -import com.awakenedredstone.neoskies.util.WorldProtection; @Mixin(CampfireBlock.class) public class CampfireBlockMixin { diff --git a/src/main/java/com/awakenedredstone/neoskies/mixin/world/protection/block/CauldronBlockMixin.java b/src/main/java/com/awakenedredstone/neoskies/mixin/world/protection/block/CauldronBlockMixin.java index c78b767..0a636b9 100644 --- a/src/main/java/com/awakenedredstone/neoskies/mixin/world/protection/block/CauldronBlockMixin.java +++ b/src/main/java/com/awakenedredstone/neoskies/mixin/world/protection/block/CauldronBlockMixin.java @@ -2,12 +2,12 @@ import com.awakenedredstone.neoskies.logic.registry.NeoSkiesIslandSettings; import com.awakenedredstone.neoskies.util.ServerUtils; +import com.awakenedredstone.neoskies.util.WorldProtection; import net.minecraft.block.AbstractCauldronBlock; import net.minecraft.block.BlockState; import net.minecraft.block.cauldron.CauldronBehavior; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; -import net.minecraft.util.ActionResult; import net.minecraft.util.Hand; import net.minecraft.util.ItemActionResult; import net.minecraft.util.hit.BlockHitResult; @@ -19,7 +19,6 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; -import com.awakenedredstone.neoskies.util.WorldProtection; @Mixin(AbstractCauldronBlock.class) public class CauldronBlockMixin { diff --git a/src/main/java/com/awakenedredstone/neoskies/mixin/world/protection/block/SculkCatalystBlockEntityMixin.java b/src/main/java/com/awakenedredstone/neoskies/mixin/world/protection/block/SculkCatalystBlockEntityMixin.java index bb5b3cc..b7c79ab 100644 --- a/src/main/java/com/awakenedredstone/neoskies/mixin/world/protection/block/SculkCatalystBlockEntityMixin.java +++ b/src/main/java/com/awakenedredstone/neoskies/mixin/world/protection/block/SculkCatalystBlockEntityMixin.java @@ -1,6 +1,7 @@ package com.awakenedredstone.neoskies.mixin.world.protection.block; import com.awakenedredstone.neoskies.logic.registry.NeoSkiesIslandSettings; +import com.awakenedredstone.neoskies.util.WorldProtection; import net.minecraft.block.entity.SculkCatalystBlockEntity; import net.minecraft.entity.Entity; import net.minecraft.entity.LivingEntity; @@ -11,15 +12,10 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Vec3d; import net.minecraft.world.event.GameEvent; -import net.minecraft.world.event.PositionSource; import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; -import com.awakenedredstone.neoskies.util.WorldProtection; - -import java.util.Optional; @Mixin(SculkCatalystBlockEntity.Listener.class) public abstract class SculkCatalystBlockEntityMixin { diff --git a/src/main/java/com/awakenedredstone/neoskies/mixin/world/protection/block/SculkSensorBlockEntityMixin.java b/src/main/java/com/awakenedredstone/neoskies/mixin/world/protection/block/SculkSensorBlockEntityMixin.java index a26872e..5863568 100644 --- a/src/main/java/com/awakenedredstone/neoskies/mixin/world/protection/block/SculkSensorBlockEntityMixin.java +++ b/src/main/java/com/awakenedredstone/neoskies/mixin/world/protection/block/SculkSensorBlockEntityMixin.java @@ -1,6 +1,7 @@ package com.awakenedredstone.neoskies.mixin.world.protection.block; import com.awakenedredstone.neoskies.logic.registry.NeoSkiesIslandSettings; +import com.awakenedredstone.neoskies.util.WorldProtection; import net.minecraft.block.entity.SculkSensorBlockEntity; import net.minecraft.entity.Entity; import net.minecraft.entity.Ownable; @@ -14,7 +15,6 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import com.awakenedredstone.neoskies.util.WorldProtection; @Mixin(SculkSensorBlockEntity.VibrationCallback.class) public class SculkSensorBlockEntityMixin { diff --git a/src/main/java/com/awakenedredstone/neoskies/mixin/world/protection/block/SculkSensorBlockMixin.java b/src/main/java/com/awakenedredstone/neoskies/mixin/world/protection/block/SculkSensorBlockMixin.java index 678eae5..4e41375 100644 --- a/src/main/java/com/awakenedredstone/neoskies/mixin/world/protection/block/SculkSensorBlockMixin.java +++ b/src/main/java/com/awakenedredstone/neoskies/mixin/world/protection/block/SculkSensorBlockMixin.java @@ -1,6 +1,7 @@ package com.awakenedredstone.neoskies.mixin.world.protection.block; import com.awakenedredstone.neoskies.logic.registry.NeoSkiesIslandSettings; +import com.awakenedredstone.neoskies.util.WorldProtection; import net.minecraft.block.BlockState; import net.minecraft.block.SculkSensorBlock; import net.minecraft.entity.Entity; @@ -12,7 +13,6 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import com.awakenedredstone.neoskies.util.WorldProtection; @Mixin(SculkSensorBlock.class) public class SculkSensorBlockMixin { diff --git a/src/main/java/com/awakenedredstone/neoskies/mixin/world/protection/block/SculkShriekerBlockEntityMixin.java b/src/main/java/com/awakenedredstone/neoskies/mixin/world/protection/block/SculkShriekerBlockEntityMixin.java index 9261095..1864c90 100644 --- a/src/main/java/com/awakenedredstone/neoskies/mixin/world/protection/block/SculkShriekerBlockEntityMixin.java +++ b/src/main/java/com/awakenedredstone/neoskies/mixin/world/protection/block/SculkShriekerBlockEntityMixin.java @@ -1,6 +1,7 @@ package com.awakenedredstone.neoskies.mixin.world.protection.block; import com.awakenedredstone.neoskies.logic.registry.NeoSkiesIslandSettings; +import com.awakenedredstone.neoskies.util.WorldProtection; import net.minecraft.block.entity.SculkShriekerBlockEntity; import net.minecraft.entity.Entity; import net.minecraft.entity.Ownable; @@ -14,7 +15,6 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import com.awakenedredstone.neoskies.util.WorldProtection; @Mixin(SculkShriekerBlockEntity.VibrationCallback.class) public class SculkShriekerBlockEntityMixin { diff --git a/src/main/java/com/awakenedredstone/neoskies/mixin/world/protection/block/SculkShriekerBlockMixin.java b/src/main/java/com/awakenedredstone/neoskies/mixin/world/protection/block/SculkShriekerBlockMixin.java index 58248f3..eee6178 100644 --- a/src/main/java/com/awakenedredstone/neoskies/mixin/world/protection/block/SculkShriekerBlockMixin.java +++ b/src/main/java/com/awakenedredstone/neoskies/mixin/world/protection/block/SculkShriekerBlockMixin.java @@ -1,6 +1,7 @@ package com.awakenedredstone.neoskies.mixin.world.protection.block; import com.awakenedredstone.neoskies.logic.registry.NeoSkiesIslandSettings; +import com.awakenedredstone.neoskies.util.WorldProtection; import net.minecraft.block.BlockState; import net.minecraft.block.SculkShriekerBlock; import net.minecraft.entity.Entity; @@ -12,7 +13,6 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import com.awakenedredstone.neoskies.util.WorldProtection; @Mixin(SculkShriekerBlock.class) public class SculkShriekerBlockMixin { diff --git a/src/main/java/com/awakenedredstone/neoskies/mixin/world/protection/item/AxeItemMixin.java b/src/main/java/com/awakenedredstone/neoskies/mixin/world/protection/item/AxeItemMixin.java index 5a6ad9b..c095ac4 100644 --- a/src/main/java/com/awakenedredstone/neoskies/mixin/world/protection/item/AxeItemMixin.java +++ b/src/main/java/com/awakenedredstone/neoskies/mixin/world/protection/item/AxeItemMixin.java @@ -2,6 +2,7 @@ import com.awakenedredstone.neoskies.logic.registry.NeoSkiesIslandSettings; import com.awakenedredstone.neoskies.util.ServerUtils; +import com.awakenedredstone.neoskies.util.WorldProtection; import com.llamalad7.mixinextras.injector.ModifyExpressionValue; import com.llamalad7.mixinextras.sugar.Local; import net.minecraft.block.BlockState; @@ -16,7 +17,6 @@ import net.minecraft.world.World; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; -import com.awakenedredstone.neoskies.util.WorldProtection; import java.util.Optional; diff --git a/src/main/java/com/awakenedredstone/neoskies/mixin/world/protection/item/BucketItemMixin.java b/src/main/java/com/awakenedredstone/neoskies/mixin/world/protection/item/BucketItemMixin.java index ead4d98..5597d3c 100644 --- a/src/main/java/com/awakenedredstone/neoskies/mixin/world/protection/item/BucketItemMixin.java +++ b/src/main/java/com/awakenedredstone/neoskies/mixin/world/protection/item/BucketItemMixin.java @@ -3,8 +3,7 @@ import com.awakenedredstone.neoskies.logic.registry.NeoSkiesIslandSettings; import com.awakenedredstone.neoskies.logic.settings.IslandSettings; import com.awakenedredstone.neoskies.util.ServerUtils; -import com.llamalad7.mixinextras.injector.ModifyExpressionValue; -import com.llamalad7.mixinextras.sugar.Local; +import com.awakenedredstone.neoskies.util.WorldProtection; import net.minecraft.block.BlockState; import net.minecraft.block.FluidDrainable; import net.minecraft.entity.player.PlayerEntity; @@ -17,7 +16,6 @@ import net.minecraft.util.Hand; import net.minecraft.util.TypedActionResult; import net.minecraft.util.hit.BlockHitResult; -import net.minecraft.util.hit.HitResult; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import org.spongepowered.asm.mixin.Final; @@ -27,7 +25,6 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; import org.spongepowered.asm.mixin.injection.callback.LocalCapture; -import com.awakenedredstone.neoskies.util.WorldProtection; @Mixin(BucketItem.class) public class BucketItemMixin { diff --git a/src/main/java/com/awakenedredstone/neoskies/mixin/world/protection/item/ShearsItemMixin.java b/src/main/java/com/awakenedredstone/neoskies/mixin/world/protection/item/ShearsItemMixin.java index 28cf476..fbb1f10 100644 --- a/src/main/java/com/awakenedredstone/neoskies/mixin/world/protection/item/ShearsItemMixin.java +++ b/src/main/java/com/awakenedredstone/neoskies/mixin/world/protection/item/ShearsItemMixin.java @@ -2,6 +2,7 @@ import com.awakenedredstone.neoskies.logic.registry.NeoSkiesIslandSettings; import com.awakenedredstone.neoskies.util.ServerUtils; +import com.awakenedredstone.neoskies.util.WorldProtection; import com.llamalad7.mixinextras.sugar.Local; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; @@ -17,7 +18,6 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; -import com.awakenedredstone.neoskies.util.WorldProtection; @Mixin(ShearsItem.class) public class ShearsItemMixin { diff --git a/src/main/java/com/awakenedredstone/neoskies/mixin/world/protection/item/ShovelItemMixin.java b/src/main/java/com/awakenedredstone/neoskies/mixin/world/protection/item/ShovelItemMixin.java index 3e481bc..54d7b80 100644 --- a/src/main/java/com/awakenedredstone/neoskies/mixin/world/protection/item/ShovelItemMixin.java +++ b/src/main/java/com/awakenedredstone/neoskies/mixin/world/protection/item/ShovelItemMixin.java @@ -2,6 +2,7 @@ import com.awakenedredstone.neoskies.logic.registry.NeoSkiesIslandSettings; import com.awakenedredstone.neoskies.util.ServerUtils; +import com.awakenedredstone.neoskies.util.WorldProtection; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.item.ItemUsageContext; @@ -15,7 +16,6 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; -import com.awakenedredstone.neoskies.util.WorldProtection; @Mixin(ShovelItem.class) public class ShovelItemMixin { diff --git a/src/main/java/com/awakenedredstone/neoskies/util/DynamicPlaceholders.java b/src/main/java/com/awakenedredstone/neoskies/util/DynamicPlaceholders.java index c9d8c72..9f1f0d7 100644 --- a/src/main/java/com/awakenedredstone/neoskies/util/DynamicPlaceholders.java +++ b/src/main/java/com/awakenedredstone/neoskies/util/DynamicPlaceholders.java @@ -1,11 +1,11 @@ package com.awakenedredstone.neoskies.util; +import com.awakenedredstone.neoskies.logic.Skylands; import eu.pb4.placeholders.api.PlaceholderContext; import eu.pb4.placeholders.api.PlaceholderHandler; import eu.pb4.placeholders.api.PlaceholderResult; import eu.pb4.placeholders.api.Placeholders; import net.minecraft.text.Text; -import com.awakenedredstone.neoskies.logic.Skylands; import java.util.Map; diff --git a/src/main/java/com/awakenedredstone/neoskies/util/IslandUtils.java b/src/main/java/com/awakenedredstone/neoskies/util/IslandUtils.java index c2608b8..829d28c 100644 --- a/src/main/java/com/awakenedredstone/neoskies/util/IslandUtils.java +++ b/src/main/java/com/awakenedredstone/neoskies/util/IslandUtils.java @@ -1,7 +1,7 @@ package com.awakenedredstone.neoskies.util; -import net.minecraft.entity.player.PlayerEntity; import com.awakenedredstone.neoskies.logic.Island; +import net.minecraft.entity.player.PlayerEntity; public class IslandUtils { diff --git a/src/main/java/com/awakenedredstone/neoskies/util/Players.java b/src/main/java/com/awakenedredstone/neoskies/util/Players.java index cf2c157..df04192 100644 --- a/src/main/java/com/awakenedredstone/neoskies/util/Players.java +++ b/src/main/java/com/awakenedredstone/neoskies/util/Players.java @@ -1,8 +1,8 @@ package com.awakenedredstone.neoskies.util; +import com.awakenedredstone.neoskies.logic.Skylands; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.server.MinecraftServer; -import com.awakenedredstone.neoskies.logic.Skylands; import java.util.Optional; diff --git a/src/main/java/com/awakenedredstone/neoskies/util/Scheduler.java b/src/main/java/com/awakenedredstone/neoskies/util/Scheduler.java index cbd6786..7f82b42 100644 --- a/src/main/java/com/awakenedredstone/neoskies/util/Scheduler.java +++ b/src/main/java/com/awakenedredstone/neoskies/util/Scheduler.java @@ -1,8 +1,8 @@ package com.awakenedredstone.neoskies.util; +import com.awakenedredstone.neoskies.logic.Skylands; import net.minecraft.server.MinecraftServer; import net.minecraft.util.Identifier; -import com.awakenedredstone.neoskies.logic.Skylands; import java.util.Comparator; import java.util.PriorityQueue; diff --git a/src/main/java/com/awakenedredstone/neoskies/util/Texts.java b/src/main/java/com/awakenedredstone/neoskies/util/Texts.java index 95c638e..0e42c6c 100644 --- a/src/main/java/com/awakenedredstone/neoskies/util/Texts.java +++ b/src/main/java/com/awakenedredstone/neoskies/util/Texts.java @@ -4,7 +4,6 @@ import eu.pb4.placeholders.api.TextParserUtils; import net.minecraft.text.Text; import net.minecraft.text.TranslatableTextContent; -import com.awakenedredstone.neoskies.SkylandsMain; import xyz.nucleoid.server.translations.api.Localization; import xyz.nucleoid.server.translations.api.language.ServerLanguage; diff --git a/src/main/java/com/awakenedredstone/neoskies/util/WorldProtection.java b/src/main/java/com/awakenedredstone/neoskies/util/WorldProtection.java index b17f7e4..da27379 100644 --- a/src/main/java/com/awakenedredstone/neoskies/util/WorldProtection.java +++ b/src/main/java/com/awakenedredstone/neoskies/util/WorldProtection.java @@ -1,9 +1,5 @@ package com.awakenedredstone.neoskies.util; -import me.lucko.fabric.api.permissions.v0.Permissions; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; import com.awakenedredstone.neoskies.SkylandsMain; import com.awakenedredstone.neoskies.api.SkylandsAPI; import com.awakenedredstone.neoskies.api.island.PermissionLevel; @@ -11,6 +7,10 @@ import com.awakenedredstone.neoskies.logic.Skylands; import com.awakenedredstone.neoskies.logic.registry.SkylandsPermissionLevels; import com.awakenedredstone.neoskies.logic.settings.IslandSettings; +import me.lucko.fabric.api.permissions.v0.Permissions; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; import org.jetbrains.annotations.NotNull; import java.util.Optional; diff --git a/src/main/java/com/awakenedredstone/neoskies/util/Worlds.java b/src/main/java/com/awakenedredstone/neoskies/util/Worlds.java index 8ab08d2..495001f 100644 --- a/src/main/java/com/awakenedredstone/neoskies/util/Worlds.java +++ b/src/main/java/com/awakenedredstone/neoskies/util/Worlds.java @@ -1,16 +1,15 @@ package com.awakenedredstone.neoskies.util; +import com.awakenedredstone.neoskies.api.SkylandsAPI; +import com.awakenedredstone.neoskies.logic.Hub; +import com.awakenedredstone.neoskies.logic.Island; +import com.awakenedredstone.neoskies.logic.Skylands; import net.fabricmc.fabric.api.dimension.v1.FabricDimensions; import net.minecraft.registry.RegistryKey; import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.util.math.Vec3d; import net.minecraft.world.TeleportTarget; import net.minecraft.world.World; -import com.awakenedredstone.neoskies.SkylandsMain; -import com.awakenedredstone.neoskies.api.SkylandsAPI; -import com.awakenedredstone.neoskies.logic.Hub; -import com.awakenedredstone.neoskies.logic.Island; -import com.awakenedredstone.neoskies.logic.Skylands; import java.util.Optional;