From 3fca89bd0e34dd8718aa2dacad37081ae3e5e37d Mon Sep 17 00:00:00 2001 From: Flemmli97 Date: Tue, 8 Jun 2021 23:06:01 +0200 Subject: [PATCH] import fix --- .../io/github/flemmli97/flan/claim/Claim.java | 12 +++++----- .../flemmli97/flan/claim/ClaimStorage.java | 10 ++++----- .../flemmli97/flan/commands/CommandClaim.java | 22 +++++++++---------- .../flemmli97/flan/commands/CommandHelp.java | 4 ++-- .../github/flemmli97/flan/config/Config.java | 4 ++-- .../flemmli97/flan/config/LangConfig.java | 4 ++-- .../flan/event/ItemInteractEvents.java | 4 ++-- .../flan/gui/GroupPlayerScreenHandler.java | 2 +- .../gunpowder/CommandCurrency.java | 8 +++---- .../flan/player/IPlayerClaimImpl.java | 1 - .../flan/player/OfflinePlayerData.java | 2 +- .../flan/player/PlayerClaimData.java | 2 +- 12 files changed, 37 insertions(+), 38 deletions(-) diff --git a/src/main/java/io/github/flemmli97/flan/claim/Claim.java b/src/main/java/io/github/flemmli97/flan/claim/Claim.java index 0173a35..459987b 100644 --- a/src/main/java/io/github/flemmli97/flan/claim/Claim.java +++ b/src/main/java/io/github/flemmli97/flan/claim/Claim.java @@ -1,17 +1,17 @@ package io.github.flemmli97.flan.claim; -import io.github.flemmli97.flan.Flan; -import io.github.flemmli97.flan.api.ClaimPermission; -import io.github.flemmli97.flan.api.ClaimPermissionEvent; -import io.github.flemmli97.flan.api.PermissionRegistry; -import io.github.flemmli97.flan.config.ConfigHandler; -import io.github.flemmli97.flan.player.PlayerClaimData; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; import com.google.gson.JsonArray; import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.mojang.authlib.GameProfile; +import io.github.flemmli97.flan.Flan; +import io.github.flemmli97.flan.api.ClaimPermission; +import io.github.flemmli97.flan.api.ClaimPermissionEvent; +import io.github.flemmli97.flan.api.PermissionRegistry; +import io.github.flemmli97.flan.config.ConfigHandler; +import io.github.flemmli97.flan.player.PlayerClaimData; import net.minecraft.server.MinecraftServer; import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.server.world.ServerWorld; diff --git a/src/main/java/io/github/flemmli97/flan/claim/ClaimStorage.java b/src/main/java/io/github/flemmli97/flan/claim/ClaimStorage.java index 67daf72..bc9f104 100644 --- a/src/main/java/io/github/flemmli97/flan/claim/ClaimStorage.java +++ b/src/main/java/io/github/flemmli97/flan/claim/ClaimStorage.java @@ -1,5 +1,10 @@ package io.github.flemmli97.flan.claim; +import com.google.common.collect.ImmutableSet; +import com.google.common.collect.Lists; +import com.google.common.collect.Sets; +import com.google.gson.JsonArray; +import com.google.gson.JsonObject; import io.github.flemmli97.flan.Flan; import io.github.flemmli97.flan.api.ClaimPermission; import io.github.flemmli97.flan.api.PermissionRegistry; @@ -7,11 +12,6 @@ import io.github.flemmli97.flan.config.ConfigHandler; import io.github.flemmli97.flan.player.EnumDisplayType; import io.github.flemmli97.flan.player.EnumEditMode; import io.github.flemmli97.flan.player.PlayerClaimData; -import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Lists; -import com.google.common.collect.Sets; -import com.google.gson.JsonArray; -import com.google.gson.JsonObject; import it.unimi.dsi.fastutil.longs.Long2ObjectArrayMap; import net.minecraft.server.MinecraftServer; import net.minecraft.server.command.ServerCommandSource; diff --git a/src/main/java/io/github/flemmli97/flan/commands/CommandClaim.java b/src/main/java/io/github/flemmli97/flan/commands/CommandClaim.java index e97bb81..bda000c 100644 --- a/src/main/java/io/github/flemmli97/flan/commands/CommandClaim.java +++ b/src/main/java/io/github/flemmli97/flan/commands/CommandClaim.java @@ -1,5 +1,16 @@ package io.github.flemmli97.flan.commands; +import com.mojang.authlib.GameProfile; +import com.mojang.brigadier.Command; +import com.mojang.brigadier.CommandDispatcher; +import com.mojang.brigadier.arguments.BoolArgumentType; +import com.mojang.brigadier.arguments.IntegerArgumentType; +import com.mojang.brigadier.arguments.StringArgumentType; +import com.mojang.brigadier.builder.LiteralArgumentBuilder; +import com.mojang.brigadier.context.CommandContext; +import com.mojang.brigadier.exceptions.CommandSyntaxException; +import com.mojang.brigadier.suggestion.Suggestions; +import com.mojang.brigadier.suggestion.SuggestionsBuilder; import io.github.flemmli97.flan.api.ClaimPermission; import io.github.flemmli97.flan.api.PermissionRegistry; import io.github.flemmli97.flan.claim.Claim; @@ -14,17 +25,6 @@ import io.github.flemmli97.flan.player.EnumDisplayType; import io.github.flemmli97.flan.player.EnumEditMode; import io.github.flemmli97.flan.player.OfflinePlayerData; import io.github.flemmli97.flan.player.PlayerClaimData; -import com.mojang.authlib.GameProfile; -import com.mojang.brigadier.Command; -import com.mojang.brigadier.CommandDispatcher; -import com.mojang.brigadier.arguments.BoolArgumentType; -import com.mojang.brigadier.arguments.IntegerArgumentType; -import com.mojang.brigadier.arguments.StringArgumentType; -import com.mojang.brigadier.builder.LiteralArgumentBuilder; -import com.mojang.brigadier.context.CommandContext; -import com.mojang.brigadier.exceptions.CommandSyntaxException; -import com.mojang.brigadier.suggestion.Suggestions; -import com.mojang.brigadier.suggestion.SuggestionsBuilder; import net.minecraft.command.argument.BlockPosArgumentType; import net.minecraft.command.argument.GameProfileArgumentType; import net.minecraft.server.MinecraftServer; diff --git a/src/main/java/io/github/flemmli97/flan/commands/CommandHelp.java b/src/main/java/io/github/flemmli97/flan/commands/CommandHelp.java index 7550eac..5428eef 100644 --- a/src/main/java/io/github/flemmli97/flan/commands/CommandHelp.java +++ b/src/main/java/io/github/flemmli97/flan/commands/CommandHelp.java @@ -1,11 +1,11 @@ package io.github.flemmli97.flan.commands; -import io.github.flemmli97.flan.claim.PermHelper; -import io.github.flemmli97.flan.config.ConfigHandler; import com.mojang.brigadier.Command; import com.mojang.brigadier.arguments.IntegerArgumentType; import com.mojang.brigadier.context.CommandContext; import com.mojang.brigadier.tree.CommandNode; +import io.github.flemmli97.flan.claim.PermHelper; +import io.github.flemmli97.flan.config.ConfigHandler; import net.minecraft.server.command.ServerCommandSource; import net.minecraft.text.ClickEvent; import net.minecraft.text.MutableText; diff --git a/src/main/java/io/github/flemmli97/flan/config/Config.java b/src/main/java/io/github/flemmli97/flan/config/Config.java index 083b4f7..aff9c38 100644 --- a/src/main/java/io/github/flemmli97/flan/config/Config.java +++ b/src/main/java/io/github/flemmli97/flan/config/Config.java @@ -1,10 +1,10 @@ package io.github.flemmli97.flan.config; +import com.google.gson.JsonArray; +import com.google.gson.JsonObject; import io.github.flemmli97.flan.Flan; import io.github.flemmli97.flan.api.ClaimPermission; import io.github.flemmli97.flan.api.PermissionRegistry; -import com.google.gson.JsonArray; -import com.google.gson.JsonObject; import net.fabricmc.loader.api.FabricLoader; import net.minecraft.item.Item; import net.minecraft.item.Items; diff --git a/src/main/java/io/github/flemmli97/flan/config/LangConfig.java b/src/main/java/io/github/flemmli97/flan/config/LangConfig.java index 70efcc9..cf45274 100644 --- a/src/main/java/io/github/flemmli97/flan/config/LangConfig.java +++ b/src/main/java/io/github/flemmli97/flan/config/LangConfig.java @@ -1,11 +1,11 @@ package io.github.flemmli97.flan.config; -import io.github.flemmli97.flan.api.ClaimPermission; -import io.github.flemmli97.flan.api.PermissionRegistry; import com.google.gson.JsonArray; import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonParseException; +import io.github.flemmli97.flan.api.ClaimPermission; +import io.github.flemmli97.flan.api.PermissionRegistry; import net.fabricmc.loader.api.FabricLoader; import net.minecraft.server.MinecraftServer; diff --git a/src/main/java/io/github/flemmli97/flan/event/ItemInteractEvents.java b/src/main/java/io/github/flemmli97/flan/event/ItemInteractEvents.java index 9751677..480341c 100644 --- a/src/main/java/io/github/flemmli97/flan/event/ItemInteractEvents.java +++ b/src/main/java/io/github/flemmli97/flan/event/ItemInteractEvents.java @@ -1,5 +1,7 @@ package io.github.flemmli97.flan.event; +import com.google.common.collect.Sets; +import com.mojang.authlib.GameProfile; import io.github.flemmli97.flan.api.ClaimPermission; import io.github.flemmli97.flan.api.PermissionRegistry; import io.github.flemmli97.flan.claim.Claim; @@ -12,8 +14,6 @@ import io.github.flemmli97.flan.integration.permissionapi.CommandPermission; import io.github.flemmli97.flan.player.EnumDisplayType; import io.github.flemmli97.flan.player.EnumEditMode; import io.github.flemmli97.flan.player.PlayerClaimData; -import com.google.common.collect.Sets; -import com.mojang.authlib.GameProfile; import net.minecraft.block.BlockState; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.BlockItem; diff --git a/src/main/java/io/github/flemmli97/flan/gui/GroupPlayerScreenHandler.java b/src/main/java/io/github/flemmli97/flan/gui/GroupPlayerScreenHandler.java index 500e9ef..fb4123f 100644 --- a/src/main/java/io/github/flemmli97/flan/gui/GroupPlayerScreenHandler.java +++ b/src/main/java/io/github/flemmli97/flan/gui/GroupPlayerScreenHandler.java @@ -1,9 +1,9 @@ package io.github.flemmli97.flan.gui; +import com.mojang.authlib.GameProfile; import io.github.flemmli97.flan.claim.Claim; import io.github.flemmli97.flan.claim.PermHelper; import io.github.flemmli97.flan.config.ConfigHandler; -import com.mojang.authlib.GameProfile; import net.minecraft.block.entity.SkullBlockEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; diff --git a/src/main/java/io/github/flemmli97/flan/integration/gunpowder/CommandCurrency.java b/src/main/java/io/github/flemmli97/flan/integration/gunpowder/CommandCurrency.java index 4a8c8dc..cb917cf 100644 --- a/src/main/java/io/github/flemmli97/flan/integration/gunpowder/CommandCurrency.java +++ b/src/main/java/io/github/flemmli97/flan/integration/gunpowder/CommandCurrency.java @@ -1,13 +1,13 @@ package io.github.flemmli97.flan.integration.gunpowder; -import io.github.flemmli97.flan.Flan; -import io.github.flemmli97.flan.claim.PermHelper; -import io.github.flemmli97.flan.config.ConfigHandler; -import io.github.flemmli97.flan.player.PlayerClaimData; import com.mojang.brigadier.Command; import com.mojang.brigadier.arguments.IntegerArgumentType; import com.mojang.brigadier.context.CommandContext; import com.mojang.brigadier.exceptions.CommandSyntaxException; +import io.github.flemmli97.flan.Flan; +import io.github.flemmli97.flan.claim.PermHelper; +import io.github.flemmli97.flan.config.ConfigHandler; +import io.github.flemmli97.flan.player.PlayerClaimData; import io.github.gunpowder.api.GunpowderMod; import io.github.gunpowder.api.module.currency.dataholders.StoredBalance; import io.github.gunpowder.api.module.currency.modelhandlers.BalanceHandler; diff --git a/src/main/java/io/github/flemmli97/flan/player/IPlayerClaimImpl.java b/src/main/java/io/github/flemmli97/flan/player/IPlayerClaimImpl.java index 8fe77cc..e2e4749 100644 --- a/src/main/java/io/github/flemmli97/flan/player/IPlayerClaimImpl.java +++ b/src/main/java/io/github/flemmli97/flan/player/IPlayerClaimImpl.java @@ -1,6 +1,5 @@ package io.github.flemmli97.flan.player; -import com.flemmli97.flan.claim.Claim; import io.github.flemmli97.flan.claim.Claim; public interface IPlayerClaimImpl { diff --git a/src/main/java/io/github/flemmli97/flan/player/OfflinePlayerData.java b/src/main/java/io/github/flemmli97/flan/player/OfflinePlayerData.java index fbcb1b4..de0ea84 100644 --- a/src/main/java/io/github/flemmli97/flan/player/OfflinePlayerData.java +++ b/src/main/java/io/github/flemmli97/flan/player/OfflinePlayerData.java @@ -1,9 +1,9 @@ package io.github.flemmli97.flan.player; +import com.google.gson.JsonObject; import io.github.flemmli97.flan.claim.Claim; import io.github.flemmli97.flan.claim.ClaimStorage; import io.github.flemmli97.flan.config.ConfigHandler; -import com.google.gson.JsonObject; import net.minecraft.server.MinecraftServer; import net.minecraft.server.world.ServerWorld; import net.minecraft.util.WorldSavePath; diff --git a/src/main/java/io/github/flemmli97/flan/player/PlayerClaimData.java b/src/main/java/io/github/flemmli97/flan/player/PlayerClaimData.java index 54dd7fa..14e6e4a 100644 --- a/src/main/java/io/github/flemmli97/flan/player/PlayerClaimData.java +++ b/src/main/java/io/github/flemmli97/flan/player/PlayerClaimData.java @@ -1,5 +1,6 @@ package io.github.flemmli97.flan.player; +import com.google.gson.JsonObject; import io.github.flemmli97.flan.Flan; import io.github.flemmli97.flan.api.ClaimPermission; import io.github.flemmli97.flan.api.PermissionRegistry; @@ -9,7 +10,6 @@ import io.github.flemmli97.flan.claim.IPermissionContainer; import io.github.flemmli97.flan.claim.ParticleIndicators; import io.github.flemmli97.flan.claim.PermHelper; import io.github.flemmli97.flan.config.ConfigHandler; -import com.google.gson.JsonObject; import net.minecraft.block.BlockState; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.network.packet.s2c.play.ParticleS2CPacket;