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 fc73a01e..1b95b7d9 100644 --- a/leaves-server/src/main/java/org/leavesmc/leaves/LeavesConfig.java +++ b/leaves-server/src/main/java/org/leavesmc/leaves/LeavesConfig.java @@ -3,9 +3,7 @@ package org.leavesmc.leaves; import com.destroystokyo.paper.util.SneakyThrow; import io.papermc.paper.configuration.GlobalConfiguration; import net.minecraft.server.MinecraftServer; -import net.minecraft.server.level.ServerLevel; import net.minecraft.server.level.ServerPlayer; -import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.player.Player; import org.bukkit.command.Command; import org.bukkit.configuration.file.YamlConfiguration; @@ -30,18 +28,15 @@ import org.leavesmc.leaves.protocol.CarpetServerProtocol.CarpetRules; import org.leavesmc.leaves.protocol.bladeren.BladerenProtocol.LeavesFeature; import org.leavesmc.leaves.protocol.bladeren.BladerenProtocol.LeavesFeatureSet; import org.leavesmc.leaves.region.RegionFileFormat; -import org.leavesmc.leaves.util.ForcePeacefulModeSwitchType; 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; import java.util.Locale; import java.util.Random; -import java.util.Set; import java.util.function.Predicate; public final class LeavesConfig { diff --git a/leaves-server/src/main/java/org/leavesmc/leaves/bot/BotList.java b/leaves-server/src/main/java/org/leavesmc/leaves/bot/BotList.java index 93a065bd..9ee4dfb8 100644 --- a/leaves-server/src/main/java/org/leavesmc/leaves/bot/BotList.java +++ b/leaves-server/src/main/java/org/leavesmc/leaves/bot/BotList.java @@ -17,7 +17,6 @@ import net.minecraft.server.level.ServerPlayer; import net.minecraft.util.ProblemReporter; import net.minecraft.world.entity.Entity; import net.minecraft.world.level.Level; -import net.minecraft.world.level.storage.TagValueInput; import net.minecraft.world.level.storage.ValueInput; import org.bukkit.Bukkit; import org.bukkit.Location; @@ -31,7 +30,6 @@ import org.leavesmc.leaves.event.bot.BotJoinEvent; import org.leavesmc.leaves.event.bot.BotLoadEvent; import org.leavesmc.leaves.event.bot.BotRemoveEvent; import org.leavesmc.leaves.event.bot.BotSpawnLocationEvent; -import org.leavesmc.leaves.util.TagFactory; import org.slf4j.Logger; import java.util.List; diff --git a/leaves-server/src/main/java/org/leavesmc/leaves/bot/ServerBotPacketListenerImpl.java b/leaves-server/src/main/java/org/leavesmc/leaves/bot/ServerBotPacketListenerImpl.java index 6961241a..35fb17ff 100644 --- a/leaves-server/src/main/java/org/leavesmc/leaves/bot/ServerBotPacketListenerImpl.java +++ b/leaves-server/src/main/java/org/leavesmc/leaves/bot/ServerBotPacketListenerImpl.java @@ -3,13 +3,11 @@ package org.leavesmc.leaves.bot; import io.netty.channel.ChannelFutureListener; import net.minecraft.network.Connection; import net.minecraft.network.DisconnectionDetails; -import net.minecraft.network.PacketSendListener; import net.minecraft.network.protocol.Packet; import net.minecraft.network.protocol.PacketFlow; import net.minecraft.server.MinecraftServer; import net.minecraft.server.network.CommonListenerCookie; import net.minecraft.server.network.ServerGamePacketListenerImpl; -import org.bukkit.event.player.PlayerKickEvent; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/leaves-server/src/main/java/org/leavesmc/leaves/bot/subcommands/BotActionCommand.java b/leaves-server/src/main/java/org/leavesmc/leaves/bot/subcommands/BotActionCommand.java index 29d13645..b5366566 100644 --- a/leaves-server/src/main/java/org/leavesmc/leaves/bot/subcommands/BotActionCommand.java +++ b/leaves-server/src/main/java/org/leavesmc/leaves/bot/subcommands/BotActionCommand.java @@ -21,7 +21,6 @@ import java.util.Arrays; import java.util.HashSet; import java.util.List; import java.util.Set; -import java.util.concurrent.atomic.AtomicInteger; import static net.kyori.adventure.text.Component.text; 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 d4e0a28a..88f80546 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 @@ -1,6 +1,5 @@ package org.leavesmc.leaves.entity; -import com.google.common.base.Function; import com.google.common.collect.Lists; import net.minecraft.server.MinecraftServer; import org.bukkit.Location; diff --git a/leaves-server/src/main/java/org/leavesmc/leaves/protocol/PcaSyncProtocol.java b/leaves-server/src/main/java/org/leavesmc/leaves/protocol/PcaSyncProtocol.java index f04c1a31..5a8483f1 100644 --- a/leaves-server/src/main/java/org/leavesmc/leaves/protocol/PcaSyncProtocol.java +++ b/leaves-server/src/main/java/org/leavesmc/leaves/protocol/PcaSyncProtocol.java @@ -31,7 +31,6 @@ import org.leavesmc.leaves.protocol.core.LeavesCustomPayload; import org.leavesmc.leaves.protocol.core.LeavesProtocol; import org.leavesmc.leaves.protocol.core.ProtocolHandler; import org.leavesmc.leaves.protocol.core.ProtocolUtils; -import org.leavesmc.leaves.util.TagFactory; import org.leavesmc.leaves.util.TagUtil; import java.util.HashMap; diff --git a/leaves-server/src/main/java/org/leavesmc/leaves/protocol/core/invoker/MinecraftRegisterInvokerHolder.java b/leaves-server/src/main/java/org/leavesmc/leaves/protocol/core/invoker/MinecraftRegisterInvokerHolder.java index caa18b77..5960042d 100644 --- a/leaves-server/src/main/java/org/leavesmc/leaves/protocol/core/invoker/MinecraftRegisterInvokerHolder.java +++ b/leaves-server/src/main/java/org/leavesmc/leaves/protocol/core/invoker/MinecraftRegisterInvokerHolder.java @@ -1,7 +1,6 @@ package org.leavesmc.leaves.protocol.core.invoker; import net.minecraft.resources.ResourceLocation; -import net.minecraft.server.level.ServerPlayer; import org.leavesmc.leaves.protocol.core.IdentifierSelector; import org.leavesmc.leaves.protocol.core.LeavesProtocol; import org.leavesmc.leaves.protocol.core.ProtocolHandler; diff --git a/leaves-server/src/main/java/org/leavesmc/leaves/protocol/servux/litematics/utils/SchematicPlacingUtils.java b/leaves-server/src/main/java/org/leavesmc/leaves/protocol/servux/litematics/utils/SchematicPlacingUtils.java index d42d7700..1ecd8e59 100644 --- a/leaves-server/src/main/java/org/leavesmc/leaves/protocol/servux/litematics/utils/SchematicPlacingUtils.java +++ b/leaves-server/src/main/java/org/leavesmc/leaves/protocol/servux/litematics/utils/SchematicPlacingUtils.java @@ -5,7 +5,6 @@ import net.minecraft.core.Direction; import net.minecraft.core.Vec3i; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.ListTag; -import net.minecraft.server.MinecraftServer; import net.minecraft.server.level.ServerLevel; import net.minecraft.world.Container; import net.minecraft.world.entity.Display; diff --git a/leaves-server/src/main/java/org/leavesmc/leaves/replay/Recorder.java b/leaves-server/src/main/java/org/leavesmc/leaves/replay/Recorder.java index cf5c3d1a..8ab96394 100644 --- a/leaves-server/src/main/java/org/leavesmc/leaves/replay/Recorder.java +++ b/leaves-server/src/main/java/org/leavesmc/leaves/replay/Recorder.java @@ -10,7 +10,6 @@ import net.minecraft.nbt.NbtOps; import net.minecraft.nbt.Tag; import net.minecraft.network.Connection; import net.minecraft.network.ConnectionProtocol; -import net.minecraft.network.PacketSendListener; import net.minecraft.network.protocol.BundlePacket; import net.minecraft.network.protocol.Packet; import net.minecraft.network.protocol.PacketFlow; diff --git a/leaves-server/src/main/java/org/leavesmc/leaves/util/ForcePeacefulModeSwitchType.java b/leaves-server/src/main/java/org/leavesmc/leaves/util/ForcePeacefulModeSwitchType.java deleted file mode 100644 index d8d577dc..00000000 --- a/leaves-server/src/main/java/org/leavesmc/leaves/util/ForcePeacefulModeSwitchType.java +++ /dev/null @@ -1,61 +0,0 @@ -package org.leavesmc.leaves.util; - -import net.minecraft.world.entity.Entity; -import net.minecraft.world.entity.monster.*; -import net.minecraft.world.entity.monster.breeze.Breeze; -import net.minecraft.world.entity.monster.hoglin.Hoglin; -import net.minecraft.world.entity.monster.piglin.Piglin; -import net.minecraft.world.entity.monster.piglin.PiglinBrute; -import net.minecraft.world.entity.monster.warden.Warden; -import net.minecraft.world.entity.boss.wither.WitherBoss; - -public enum ForcePeacefulModeSwitchType { - BLAZE(Blaze.class), - CREEPER(Creeper.class), - DROWNED(Drowned.class), - ELDER_GUARDIAN(ElderGuardian.class), - ENDERMAN(EnderMan.class), - ENDERMITE(Endermite.class), - EVOKER(Evoker.class), - GHAST(Ghast.class), - GIANT(Giant.class), - GUARDIAN(Guardian.class), - HOGLIN(Hoglin.class), - HUSK(Husk.class), - ILLUSIONER(Illusioner.class), - MAGMA_CUBE(MagmaCube.class), - PHANTOM(Phantom.class), - PIGLIN(Piglin.class), - PIGLIN_BRUTE(PiglinBrute.class), - PILLAGER(Pillager.class), - RAVAGER(Ravager.class), - SHULKER(Shulker.class), - SILVERFISH(Silverfish.class), - SKELETON(Skeleton.class), - SLIME(Slime.class), - SPIDER(Spider.class), - STRAY(Stray.class), - VEX(Vex.class), - VINDICATOR(Vindicator.class), - WARDEN(Warden.class), - WITCH(Witch.class), - WITHER_SKELETON(WitherSkeleton.class), - ZOGLIN(Zoglin.class), - ZOMBIE(Zombie.class), - ZOMBIE_VILLAGER(ZombieVillager.class), - ZOMBIFIED_PIGLIN(ZombifiedPiglin.class), - WITHER(WitherBoss.class), - CAVE_SPIDER(CaveSpider.class), - BREEZE(Breeze.class), - BOGGED(Bogged.class); - - private final Class entityClass; - - ForcePeacefulModeSwitchType(Class entityClass) { - this.entityClass = entityClass; - } - - public Class getEntityClass() { - return entityClass; - } -}