From 90eccf9f03f1dfe953ccfdd7b59eea5586084415 Mon Sep 17 00:00:00 2001 From: violetc <58360096+s-yh-china@users.noreply.github.com> Date: Wed, 19 Mar 2025 14:10:08 +0800 Subject: [PATCH] [ci skip] import clear --- .../src/main/java/org/leavesmc/leaves/LeavesConfig.java | 1 - .../src/main/java/org/leavesmc/leaves/bot/ServerBot.java | 2 +- .../leaves/bot/agent/actions/CraftBotAction.java | 2 +- .../leaves/bot/agent/configs/AlwaysSendDataConfig.java | 1 - .../java/org/leavesmc/leaves/bytebuf/WrappedBytebuf.java | 2 +- .../leaves/bytebuf/internal/InternalBytebufHandler.java | 3 ++- .../leaves/command/subcommands/ReloadCommand.java | 1 - .../leaves/command/subcommands/ReportCommand.java | 1 - .../java/org/leavesmc/leaves/entity/CraftBotManager.java | 2 +- .../leavesmc/leaves/entity/CraftPhotographerManager.java | 2 -- .../lithium/common/world/chunk/LithiumHashPalette.java | 9 ++++----- .../org/leavesmc/leaves/protocol/jade/JadeProtocol.java | 2 +- .../leaves/protocol/jade/accessor/BlockAccessorImpl.java | 8 +++----- .../protocol/jade/payload/ServerHandshakePayload.java | 1 - .../protocol/jade/provider/StreamServerDataProvider.java | 3 --- .../org/leavesmc/leaves/util/LeavesUpdateHelper.java | 6 +----- 16 files changed, 15 insertions(+), 31 deletions(-) diff --git a/leaves-server/src/main/java/org/leavesmc/leaves/LeavesConfig.java b/leaves-server/src/main/java/org/leavesmc/leaves/LeavesConfig.java index f672f2ff..a2c4953c 100644 --- a/leaves-server/src/main/java/org/leavesmc/leaves/LeavesConfig.java +++ b/leaves-server/src/main/java/org/leavesmc/leaves/LeavesConfig.java @@ -30,7 +30,6 @@ import org.leavesmc.leaves.util.MathUtils; import java.io.File; import java.io.IOException; -import java.util.ArrayList; import java.util.Collections; import java.util.HashSet; import java.util.List; diff --git a/leaves-server/src/main/java/org/leavesmc/leaves/bot/ServerBot.java b/leaves-server/src/main/java/org/leavesmc/leaves/bot/ServerBot.java index c73f9032..fad636d8 100644 --- a/leaves-server/src/main/java/org/leavesmc/leaves/bot/ServerBot.java +++ b/leaves-server/src/main/java/org/leavesmc/leaves/bot/ServerBot.java @@ -47,9 +47,9 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.leavesmc.leaves.LeavesConfig; import org.leavesmc.leaves.LeavesLogger; -import org.leavesmc.leaves.bot.agent.Actions; import org.leavesmc.leaves.bot.agent.AbstractBotAction; import org.leavesmc.leaves.bot.agent.AbstractBotConfig; +import org.leavesmc.leaves.bot.agent.Actions; import org.leavesmc.leaves.bot.agent.Configs; import org.leavesmc.leaves.entity.CraftBot; import org.leavesmc.leaves.event.bot.BotActionScheduleEvent; diff --git a/leaves-server/src/main/java/org/leavesmc/leaves/bot/agent/actions/CraftBotAction.java b/leaves-server/src/main/java/org/leavesmc/leaves/bot/agent/actions/CraftBotAction.java index 6dff4297..51c939d3 100644 --- a/leaves-server/src/main/java/org/leavesmc/leaves/bot/agent/actions/CraftBotAction.java +++ b/leaves-server/src/main/java/org/leavesmc/leaves/bot/agent/actions/CraftBotAction.java @@ -3,8 +3,8 @@ package org.leavesmc.leaves.bot.agent.actions; import org.bukkit.craftbukkit.entity.CraftPlayer; import org.jetbrains.annotations.Contract; import org.jetbrains.annotations.NotNull; -import org.leavesmc.leaves.bot.agent.Actions; import org.leavesmc.leaves.bot.agent.AbstractBotAction; +import org.leavesmc.leaves.bot.agent.Actions; import org.leavesmc.leaves.entity.botaction.BotActionType; import org.leavesmc.leaves.entity.botaction.LeavesBotAction; diff --git a/leaves-server/src/main/java/org/leavesmc/leaves/bot/agent/configs/AlwaysSendDataConfig.java b/leaves-server/src/main/java/org/leavesmc/leaves/bot/agent/configs/AlwaysSendDataConfig.java index b174ef19..5058ff92 100644 --- a/leaves-server/src/main/java/org/leavesmc/leaves/bot/agent/configs/AlwaysSendDataConfig.java +++ b/leaves-server/src/main/java/org/leavesmc/leaves/bot/agent/configs/AlwaysSendDataConfig.java @@ -3,7 +3,6 @@ package org.leavesmc.leaves.bot.agent.configs; import net.minecraft.nbt.CompoundTag; import org.jetbrains.annotations.NotNull; import org.leavesmc.leaves.LeavesConfig; - import org.leavesmc.leaves.bot.agent.AbstractBotConfig; import org.leavesmc.leaves.command.CommandArgument; import org.leavesmc.leaves.command.CommandArgumentType; diff --git a/leaves-server/src/main/java/org/leavesmc/leaves/bytebuf/WrappedBytebuf.java b/leaves-server/src/main/java/org/leavesmc/leaves/bytebuf/WrappedBytebuf.java index 9601eb5a..e9b185b6 100644 --- a/leaves-server/src/main/java/org/leavesmc/leaves/bytebuf/WrappedBytebuf.java +++ b/leaves-server/src/main/java/org/leavesmc/leaves/bytebuf/WrappedBytebuf.java @@ -8,8 +8,8 @@ import net.minecraft.network.RegistryFriendlyByteBuf; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.ComponentSerialization; import net.minecraft.server.MinecraftServer; -import org.bukkit.inventory.ItemStack; import org.bukkit.craftbukkit.inventory.CraftItemStack; +import org.bukkit.inventory.ItemStack; import java.util.List; import java.util.UUID; diff --git a/leaves-server/src/main/java/org/leavesmc/leaves/bytebuf/internal/InternalBytebufHandler.java b/leaves-server/src/main/java/org/leavesmc/leaves/bytebuf/internal/InternalBytebufHandler.java index 04dbb4cb..a3b35500 100644 --- a/leaves-server/src/main/java/org/leavesmc/leaves/bytebuf/internal/InternalBytebufHandler.java +++ b/leaves-server/src/main/java/org/leavesmc/leaves/bytebuf/internal/InternalBytebufHandler.java @@ -14,7 +14,8 @@ import net.minecraft.network.codec.StreamCodec; import net.minecraft.network.protocol.BundleDelimiterPacket; import net.minecraft.network.protocol.BundlePacket; import net.minecraft.network.protocol.common.ClientboundCustomPayloadPacket; -import net.minecraft.network.protocol.game.*; +import net.minecraft.network.protocol.game.ClientboundMoveEntityPacket; +import net.minecraft.network.protocol.game.ServerboundMovePlayerPacket; import net.minecraft.server.MinecraftServer; import net.minecraft.server.level.ServerPlayer; import org.bukkit.entity.Player; diff --git a/leaves-server/src/main/java/org/leavesmc/leaves/command/subcommands/ReloadCommand.java b/leaves-server/src/main/java/org/leavesmc/leaves/command/subcommands/ReloadCommand.java index 11af3e58..168307a5 100644 --- a/leaves-server/src/main/java/org/leavesmc/leaves/command/subcommands/ReloadCommand.java +++ b/leaves-server/src/main/java/org/leavesmc/leaves/command/subcommands/ReloadCommand.java @@ -4,7 +4,6 @@ import org.bukkit.command.CommandSender; import org.leavesmc.leaves.LeavesConfig; import org.leavesmc.leaves.command.LeavesSubcommand; - import static net.kyori.adventure.text.Component.text; import static net.kyori.adventure.text.format.NamedTextColor.GREEN; diff --git a/leaves-server/src/main/java/org/leavesmc/leaves/command/subcommands/ReportCommand.java b/leaves-server/src/main/java/org/leavesmc/leaves/command/subcommands/ReportCommand.java index a6eed520..d5197cb1 100644 --- a/leaves-server/src/main/java/org/leavesmc/leaves/command/subcommands/ReportCommand.java +++ b/leaves-server/src/main/java/org/leavesmc/leaves/command/subcommands/ReportCommand.java @@ -23,7 +23,6 @@ import org.leavesmc.leaves.command.LeavesCommandUtil; import org.leavesmc.leaves.command.LeavesSubcommand; import org.leavesmc.leaves.plugin.MinecraftInternalPlugin; import org.leavesmc.leaves.plugin.provider.configuration.LeavesPluginMeta; -import org.leavesmc.leaves.util.LeavesVersionFetcher; import java.net.URLEncoder; import java.nio.charset.StandardCharsets; diff --git a/leaves-server/src/main/java/org/leavesmc/leaves/entity/CraftBotManager.java b/leaves-server/src/main/java/org/leavesmc/leaves/entity/CraftBotManager.java index cae7749d..ee9b7708 100644 --- a/leaves-server/src/main/java/org/leavesmc/leaves/entity/CraftBotManager.java +++ b/leaves-server/src/main/java/org/leavesmc/leaves/entity/CraftBotManager.java @@ -9,8 +9,8 @@ import org.jetbrains.annotations.Nullable; import org.leavesmc.leaves.bot.BotCreateState; import org.leavesmc.leaves.bot.BotList; import org.leavesmc.leaves.bot.ServerBot; -import org.leavesmc.leaves.bot.agent.Actions; import org.leavesmc.leaves.bot.agent.AbstractBotAction; +import org.leavesmc.leaves.bot.agent.Actions; import org.leavesmc.leaves.bot.agent.actions.CraftCustomBotAction; import org.leavesmc.leaves.entity.botaction.CustomBotAction; import org.leavesmc.leaves.event.bot.BotCreateEvent; diff --git a/leaves-server/src/main/java/org/leavesmc/leaves/entity/CraftPhotographerManager.java b/leaves-server/src/main/java/org/leavesmc/leaves/entity/CraftPhotographerManager.java index 202e1694..e87d1e72 100644 --- a/leaves-server/src/main/java/org/leavesmc/leaves/entity/CraftPhotographerManager.java +++ b/leaves-server/src/main/java/org/leavesmc/leaves/entity/CraftPhotographerManager.java @@ -2,10 +2,8 @@ package org.leavesmc.leaves.entity; import com.google.common.collect.Lists; import org.bukkit.Location; -import org.bukkit.util.Consumer; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.leavesmc.leaves.bot.ServerBot; import org.leavesmc.leaves.replay.BukkitRecorderOption; import org.leavesmc.leaves.replay.RecorderOption; import org.leavesmc.leaves.replay.ServerPhotographer; diff --git a/leaves-server/src/main/java/org/leavesmc/leaves/lithium/common/world/chunk/LithiumHashPalette.java b/leaves-server/src/main/java/org/leavesmc/leaves/lithium/common/world/chunk/LithiumHashPalette.java index da32fdd8..549cc9f4 100644 --- a/leaves-server/src/main/java/org/leavesmc/leaves/lithium/common/world/chunk/LithiumHashPalette.java +++ b/leaves-server/src/main/java/org/leavesmc/leaves/lithium/common/world/chunk/LithiumHashPalette.java @@ -4,11 +4,6 @@ import com.google.common.collect.ImmutableList; import it.unimi.dsi.fastutil.HashCommon; import it.unimi.dsi.fastutil.objects.Reference2IntMap; import it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap; - -import java.util.Arrays; -import java.util.List; -import java.util.function.Predicate; - import net.minecraft.core.IdMap; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.network.VarInt; @@ -16,6 +11,10 @@ import net.minecraft.world.level.chunk.Palette; import net.minecraft.world.level.chunk.PaletteResize; import org.jetbrains.annotations.NotNull; +import java.util.Arrays; +import java.util.List; +import java.util.function.Predicate; + import static it.unimi.dsi.fastutil.Hash.FAST_LOAD_FACTOR; // Powered by Gale(https://github.com/GaleMC/Gale) diff --git a/leaves-server/src/main/java/org/leavesmc/leaves/protocol/jade/JadeProtocol.java b/leaves-server/src/main/java/org/leavesmc/leaves/protocol/jade/JadeProtocol.java index 0d3a81fc..ed91e1c5 100644 --- a/leaves-server/src/main/java/org/leavesmc/leaves/protocol/jade/JadeProtocol.java +++ b/leaves-server/src/main/java/org/leavesmc/leaves/protocol/jade/JadeProtocol.java @@ -53,6 +53,7 @@ import org.leavesmc.leaves.protocol.jade.provider.IJadeProvider; import org.leavesmc.leaves.protocol.jade.provider.IServerDataProvider; import org.leavesmc.leaves.protocol.jade.provider.IServerExtensionProvider; import org.leavesmc.leaves.protocol.jade.provider.ItemStorageExtensionProvider; +import org.leavesmc.leaves.protocol.jade.provider.ItemStorageProvider; import org.leavesmc.leaves.protocol.jade.provider.block.BeehiveProvider; import org.leavesmc.leaves.protocol.jade.provider.block.BrewingStandProvider; import org.leavesmc.leaves.protocol.jade.provider.block.CampfireProvider; @@ -60,7 +61,6 @@ import org.leavesmc.leaves.protocol.jade.provider.block.ChiseledBookshelfProvide import org.leavesmc.leaves.protocol.jade.provider.block.CommandBlockProvider; import org.leavesmc.leaves.protocol.jade.provider.block.FurnaceProvider; import org.leavesmc.leaves.protocol.jade.provider.block.HopperLockProvider; -import org.leavesmc.leaves.protocol.jade.provider.ItemStorageProvider; import org.leavesmc.leaves.protocol.jade.provider.block.JukeboxProvider; import org.leavesmc.leaves.protocol.jade.provider.block.LecternProvider; import org.leavesmc.leaves.protocol.jade.provider.block.MobSpawnerCooldownProvider; diff --git a/leaves-server/src/main/java/org/leavesmc/leaves/protocol/jade/accessor/BlockAccessorImpl.java b/leaves-server/src/main/java/org/leavesmc/leaves/protocol/jade/accessor/BlockAccessorImpl.java index 9e4a321b..8cd6c09a 100644 --- a/leaves-server/src/main/java/org/leavesmc/leaves/protocol/jade/accessor/BlockAccessorImpl.java +++ b/leaves-server/src/main/java/org/leavesmc/leaves/protocol/jade/accessor/BlockAccessorImpl.java @@ -1,11 +1,6 @@ package org.leavesmc.leaves.protocol.jade.accessor; -import java.util.function.Supplier; - -import org.jetbrains.annotations.Nullable; - import com.google.common.base.Suppliers; - import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.network.FriendlyByteBuf; @@ -21,6 +16,9 @@ import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.phys.BlockHitResult; +import org.jetbrains.annotations.Nullable; + +import java.util.function.Supplier; /** * Class to get information of block target and context. diff --git a/leaves-server/src/main/java/org/leavesmc/leaves/protocol/jade/payload/ServerHandshakePayload.java b/leaves-server/src/main/java/org/leavesmc/leaves/protocol/jade/payload/ServerHandshakePayload.java index 0fba9c36..9608dc99 100644 --- a/leaves-server/src/main/java/org/leavesmc/leaves/protocol/jade/payload/ServerHandshakePayload.java +++ b/leaves-server/src/main/java/org/leavesmc/leaves/protocol/jade/payload/ServerHandshakePayload.java @@ -10,7 +10,6 @@ import net.minecraft.network.codec.ByteBufCodecs; import net.minecraft.network.codec.StreamCodec; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.level.block.Block; -import org.jetbrains.annotations.NotNull; import org.leavesmc.leaves.protocol.core.LeavesCustomPayload; import org.leavesmc.leaves.protocol.core.ProtocolUtils; import org.leavesmc.leaves.protocol.jade.JadeProtocol; diff --git a/leaves-server/src/main/java/org/leavesmc/leaves/protocol/jade/provider/StreamServerDataProvider.java b/leaves-server/src/main/java/org/leavesmc/leaves/protocol/jade/provider/StreamServerDataProvider.java index 52887edb..fde7c8e6 100644 --- a/leaves-server/src/main/java/org/leavesmc/leaves/protocol/jade/provider/StreamServerDataProvider.java +++ b/leaves-server/src/main/java/org/leavesmc/leaves/protocol/jade/provider/StreamServerDataProvider.java @@ -1,14 +1,11 @@ package org.leavesmc.leaves.protocol.jade.provider; import net.minecraft.nbt.CompoundTag; -import net.minecraft.nbt.Tag; import net.minecraft.network.RegistryFriendlyByteBuf; import net.minecraft.network.codec.StreamCodec; import org.jetbrains.annotations.Nullable; import org.leavesmc.leaves.protocol.jade.accessor.Accessor; -import java.util.Optional; - public interface StreamServerDataProvider, D> extends IServerDataProvider { @Override diff --git a/leaves-server/src/main/java/org/leavesmc/leaves/util/LeavesUpdateHelper.java b/leaves-server/src/main/java/org/leavesmc/leaves/util/LeavesUpdateHelper.java index 07070242..e99c1d62 100644 --- a/leaves-server/src/main/java/org/leavesmc/leaves/util/LeavesUpdateHelper.java +++ b/leaves-server/src/main/java/org/leavesmc/leaves/util/LeavesUpdateHelper.java @@ -22,7 +22,6 @@ import java.io.InputStreamReader; import java.net.HttpURLConnection; import java.net.URI; import java.net.URISyntaxException; -import java.net.URL; import java.nio.channels.Channels; import java.nio.channels.FileChannel; import java.nio.channels.ReadableByteChannel; @@ -31,15 +30,12 @@ import java.nio.file.Path; import java.security.MessageDigest; import java.time.Duration; import java.time.LocalTime; -import java.util.Map; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; import java.util.concurrent.locks.ReentrantLock; -import static java.nio.file.StandardOpenOption.CREATE; -import static java.nio.file.StandardOpenOption.TRUNCATE_EXISTING; -import static java.nio.file.StandardOpenOption.WRITE; +import static java.nio.file.StandardOpenOption.*; public class LeavesUpdateHelper {