From 4c495f401d643a23e4e1b5ff9bdefa8e46a0d3be Mon Sep 17 00:00:00 2001 From: TheMode Date: Wed, 7 Apr 2021 18:35:19 +0200 Subject: [PATCH] Code cleanup --- .../net/minestom/codegen/EnumGenerator.java | 3 +- .../enchantment/EnchantmentEnumGenerator.java | 1 - .../codegen/fluids/FluidEnumGenerator.java | 1 - .../codegen/potions/PotionEnumGenerator.java | 1 - .../largeframebuffers/OpenGLRendering.java | 1 - .../minestom/server/map/PaletteGenerator.java | 2 - .../map/framebuffers/GLFWCapableBuffer.java | 1 - .../map/framebuffers/MapColorRenderer.java | 2 +- .../java/net/minestom/server/Viewable.java | 1 - .../server/advancements/AdvancementRoot.java | 1 - .../adventure/AdventurePacketConvertor.java | 3 -- .../net/minestom/server/chat/ChatColor.java | 2 - .../minestom/server/chat/ChatHoverEvent.java | 1 - .../java/net/minestom/server/color/Color.java | 1 - .../minestom/server/command/ServerSender.java | 1 - .../arguments/minecraft/ArgumentColor.java | 1 - .../net/minestom/server/entity/Entity.java | 5 +-- .../net/minestom/server/entity/Metadata.java | 44 +++++++++---------- .../net/minestom/server/entity/Player.java | 6 +-- .../server/entity/damage/DamageType.java | 4 -- .../server/entity/hologram/Hologram.java | 1 - .../entity/metadata/animal/MooshroomMeta.java | 2 +- .../minecart/CommandBlockMinecartMeta.java | 1 - .../entity/type/animal/EntityLlama.java | 1 - .../server/event/handler/EventHandler.java | 5 +-- .../server/event/player/PlayerDeathEvent.java | 1 - .../rule/vanilla/StairsPlacementRule.java | 2 +- .../instance/palette/PaletteStorage.java | 2 - .../net/minestom/server/item/ItemDisplay.java | 4 -- .../server/item/firework/FireworkEffect.java | 1 - .../server/item/metadata/MapMeta.java | 2 - .../server/item/metadata/PotionMeta.java | 1 - .../server/listener/UseItemListener.java | 1 - .../server/network/ConnectionManager.java | 2 - .../network/packet/server/ServerPacket.java | 2 - .../server/play/AdvancementsPacket.java | 2 - .../server/play/BlockEntityDataPacket.java | 2 +- .../packet/server/play/ChunkDataPacket.java | 1 - .../server/play/DeclareCommandsPacket.java | 2 - .../server/play/EntityMetaDataPacket.java | 2 +- .../server/play/EntitySoundEffectPacket.java | 1 - .../server/play/MultiBlockChangePacket.java | 5 ++- .../server/play/NamedSoundEffectPacket.java | 1 - .../server/play/OpenSignEditorPacket.java | 1 - .../packet/server/play/ParticlePacket.java | 2 - .../server/play/PluginMessagePacket.java | 2 - .../packet/server/play/SpawnPlayerPacket.java | 1 - .../packet/server/play/TeamsPacket.java | 1 - .../packet/server/play/UpdateLightPacket.java | 1 - .../server/resourcepack/ResourcePack.java | 1 - .../server/scoreboard/Scoreboard.java | 2 - .../net/minestom/server/scoreboard/Team.java | 2 - .../minestom/server/sound/SoundCategory.java | 1 - .../utils/location/RelativeBlockPosition.java | 1 - .../server/utils/location/RelativeVec.java | 1 - .../demo/commands/EntitySelectorCommand.java | 1 - .../demo/commands/ReloadExtensionCommand.java | 1 - .../java/demo/commands/SummonCommand.java | 1 - .../demo/commands/UnloadExtensionCommand.java | 2 - .../UnloadExtensionOnStop.java | 11 ----- .../TestExtensionLauncherNoSetup.java | 2 - .../mixins/InstanceContainerMixin.java | 4 -- 62 files changed, 34 insertions(+), 130 deletions(-) diff --git a/src/generators/java/net/minestom/codegen/EnumGenerator.java b/src/generators/java/net/minestom/codegen/EnumGenerator.java index c61f4d21d..60c2d193b 100644 --- a/src/generators/java/net/minestom/codegen/EnumGenerator.java +++ b/src/generators/java/net/minestom/codegen/EnumGenerator.java @@ -139,8 +139,7 @@ public class EnumGenerator implements CodeGenerator { // constructor MethodSpec.Builder constructorBuilder = MethodSpec.constructorBuilder(); - for (int i = 0; i < parameters.length; i++) { - ParameterSpec param = parameters[i]; + for (ParameterSpec param : parameters) { constructorBuilder.addParameter(param); // property assignment diff --git a/src/generators/java/net/minestom/codegen/enchantment/EnchantmentEnumGenerator.java b/src/generators/java/net/minestom/codegen/enchantment/EnchantmentEnumGenerator.java index a7d1a9455..b39c56679 100644 --- a/src/generators/java/net/minestom/codegen/enchantment/EnchantmentEnumGenerator.java +++ b/src/generators/java/net/minestom/codegen/enchantment/EnchantmentEnumGenerator.java @@ -1,7 +1,6 @@ package net.minestom.codegen.enchantment; import net.minestom.codegen.BasicEnumGenerator; -import net.minestom.codegen.stats.StatsEnumGenerator; import net.minestom.server.registry.ResourceGatherer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/generators/java/net/minestom/codegen/fluids/FluidEnumGenerator.java b/src/generators/java/net/minestom/codegen/fluids/FluidEnumGenerator.java index 086ca3abe..72086a33b 100644 --- a/src/generators/java/net/minestom/codegen/fluids/FluidEnumGenerator.java +++ b/src/generators/java/net/minestom/codegen/fluids/FluidEnumGenerator.java @@ -1,7 +1,6 @@ package net.minestom.codegen.fluids; import net.minestom.codegen.BasicEnumGenerator; -import net.minestom.codegen.stats.StatsEnumGenerator; import net.minestom.server.registry.ResourceGatherer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/generators/java/net/minestom/codegen/potions/PotionEnumGenerator.java b/src/generators/java/net/minestom/codegen/potions/PotionEnumGenerator.java index 36f784bc1..4fe388658 100644 --- a/src/generators/java/net/minestom/codegen/potions/PotionEnumGenerator.java +++ b/src/generators/java/net/minestom/codegen/potions/PotionEnumGenerator.java @@ -1,7 +1,6 @@ package net.minestom.codegen.potions; import net.minestom.codegen.BasicEnumGenerator; -import net.minestom.codegen.stats.StatsEnumGenerator; import net.minestom.server.registry.ResourceGatherer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/lwjgl/java/net/minestom/demo/largeframebuffers/OpenGLRendering.java b/src/lwjgl/java/net/minestom/demo/largeframebuffers/OpenGLRendering.java index 6e7b3f6d9..3b2d5780a 100644 --- a/src/lwjgl/java/net/minestom/demo/largeframebuffers/OpenGLRendering.java +++ b/src/lwjgl/java/net/minestom/demo/largeframebuffers/OpenGLRendering.java @@ -12,7 +12,6 @@ import java.io.InputStreamReader; import java.nio.ByteBuffer; import java.util.stream.Collectors; -import static org.lwjgl.opengl.GL11.*; import static org.lwjgl.opengl.GL20.*; public final class OpenGLRendering { diff --git a/src/lwjgl/java/net/minestom/server/map/PaletteGenerator.java b/src/lwjgl/java/net/minestom/server/map/PaletteGenerator.java index cb3de987b..317caf92b 100644 --- a/src/lwjgl/java/net/minestom/server/map/PaletteGenerator.java +++ b/src/lwjgl/java/net/minestom/server/map/PaletteGenerator.java @@ -7,8 +7,6 @@ import javax.imageio.ImageIO; import java.awt.image.BufferedImage; import java.io.File; import java.io.IOException; -import java.util.HashMap; -import java.util.Map; public class PaletteGenerator { diff --git a/src/lwjgl/java/net/minestom/server/map/framebuffers/GLFWCapableBuffer.java b/src/lwjgl/java/net/minestom/server/map/framebuffers/GLFWCapableBuffer.java index fed4ede7b..1ab0676f7 100644 --- a/src/lwjgl/java/net/minestom/server/map/framebuffers/GLFWCapableBuffer.java +++ b/src/lwjgl/java/net/minestom/server/map/framebuffers/GLFWCapableBuffer.java @@ -14,7 +14,6 @@ import org.lwjgl.system.MemoryStack; import java.nio.ByteBuffer; import static org.lwjgl.glfw.GLFW.*; -import static org.lwjgl.glfw.GLFW.glfwTerminate; import static org.lwjgl.opengl.GL11.*; public abstract class GLFWCapableBuffer { diff --git a/src/lwjgl/java/net/minestom/server/map/framebuffers/MapColorRenderer.java b/src/lwjgl/java/net/minestom/server/map/framebuffers/MapColorRenderer.java index fb6bc3284..2115f1dc5 100644 --- a/src/lwjgl/java/net/minestom/server/map/framebuffers/MapColorRenderer.java +++ b/src/lwjgl/java/net/minestom/server/map/framebuffers/MapColorRenderer.java @@ -167,7 +167,7 @@ public class MapColorRenderer implements Runnable { glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, screenQuadIndices); glDrawElements(GL_TRIANGLES, 6, GL_UNSIGNED_INT, 0); - }; + } glUseProgram(0); glBindBuffer(GL_ARRAY_BUFFER, 0); diff --git a/src/main/java/net/minestom/server/Viewable.java b/src/main/java/net/minestom/server/Viewable.java index 53a229dbc..de5324cc1 100644 --- a/src/main/java/net/minestom/server/Viewable.java +++ b/src/main/java/net/minestom/server/Viewable.java @@ -7,7 +7,6 @@ import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.utils.PacketUtils; import org.jetbrains.annotations.NotNull; -import java.util.Collections; import java.util.Set; /** diff --git a/src/main/java/net/minestom/server/advancements/AdvancementRoot.java b/src/main/java/net/minestom/server/advancements/AdvancementRoot.java index 3aa224d30..f298d9fb6 100644 --- a/src/main/java/net/minestom/server/advancements/AdvancementRoot.java +++ b/src/main/java/net/minestom/server/advancements/AdvancementRoot.java @@ -1,7 +1,6 @@ package net.minestom.server.advancements; import net.kyori.adventure.text.Component; -import net.minestom.server.chat.ColoredText; import net.minestom.server.chat.JsonMessage; import net.minestom.server.item.ItemStack; import net.minestom.server.item.Material; diff --git a/src/main/java/net/minestom/server/adventure/AdventurePacketConvertor.java b/src/main/java/net/minestom/server/adventure/AdventurePacketConvertor.java index 592b440f9..e4e4cf5ea 100644 --- a/src/main/java/net/minestom/server/adventure/AdventurePacketConvertor.java +++ b/src/main/java/net/minestom/server/adventure/AdventurePacketConvertor.java @@ -2,13 +2,10 @@ package net.minestom.server.adventure; import it.unimi.dsi.fastutil.objects.Object2IntArrayMap; import it.unimi.dsi.fastutil.objects.Object2IntMap; -import net.kyori.adventure.audience.MessageType; import net.kyori.adventure.bossbar.BossBar; import net.kyori.adventure.sound.Sound; import net.kyori.adventure.sound.SoundStop; -import net.kyori.adventure.text.Component; import net.kyori.adventure.text.format.NamedTextColor; -import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer; import net.minestom.server.entity.Entity; import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.network.packet.server.play.EntitySoundEffectPacket; diff --git a/src/main/java/net/minestom/server/chat/ChatColor.java b/src/main/java/net/minestom/server/chat/ChatColor.java index 9451b22c2..8788af914 100644 --- a/src/main/java/net/minestom/server/chat/ChatColor.java +++ b/src/main/java/net/minestom/server/chat/ChatColor.java @@ -4,9 +4,7 @@ import it.unimi.dsi.fastutil.chars.Char2ObjectMap; import it.unimi.dsi.fastutil.chars.Char2ObjectOpenHashMap; import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap; -import net.kyori.adventure.text.ComponentBuilder; import net.kyori.adventure.text.format.*; -import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer; import net.minestom.server.color.Color; import net.minestom.server.color.DyeColor; import net.minestom.server.utils.validate.Check; diff --git a/src/main/java/net/minestom/server/chat/ChatHoverEvent.java b/src/main/java/net/minestom/server/chat/ChatHoverEvent.java index 963338dea..4d499e391 100644 --- a/src/main/java/net/minestom/server/chat/ChatHoverEvent.java +++ b/src/main/java/net/minestom/server/chat/ChatHoverEvent.java @@ -1,6 +1,5 @@ package net.minestom.server.chat; -import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonPrimitive; import net.kyori.adventure.text.Component; diff --git a/src/main/java/net/minestom/server/color/Color.java b/src/main/java/net/minestom/server/color/Color.java index 72f69d637..9fc613792 100644 --- a/src/main/java/net/minestom/server/color/Color.java +++ b/src/main/java/net/minestom/server/color/Color.java @@ -1,6 +1,5 @@ package net.minestom.server.color; -import net.kyori.adventure.text.format.TextColor; import net.kyori.adventure.util.RGBLike; import net.minestom.server.chat.ChatColor; import org.apache.commons.lang3.Validate; diff --git a/src/main/java/net/minestom/server/command/ServerSender.java b/src/main/java/net/minestom/server/command/ServerSender.java index 235630771..663c57d7d 100644 --- a/src/main/java/net/minestom/server/command/ServerSender.java +++ b/src/main/java/net/minestom/server/command/ServerSender.java @@ -2,7 +2,6 @@ package net.minestom.server.command; import net.minestom.server.command.builder.CommandContext; import net.kyori.adventure.audience.Audience; -import net.minestom.server.command.builder.Arguments; import net.minestom.server.permission.Permission; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/net/minestom/server/command/builder/arguments/minecraft/ArgumentColor.java b/src/main/java/net/minestom/server/command/builder/arguments/minecraft/ArgumentColor.java index 0fc2363bb..91fcc6c4e 100644 --- a/src/main/java/net/minestom/server/command/builder/arguments/minecraft/ArgumentColor.java +++ b/src/main/java/net/minestom/server/command/builder/arguments/minecraft/ArgumentColor.java @@ -2,7 +2,6 @@ package net.minestom.server.command.builder.arguments.minecraft; import net.kyori.adventure.text.format.NamedTextColor; import net.kyori.adventure.text.format.Style; -import net.kyori.adventure.text.format.TextDecoration; import net.minestom.server.command.builder.NodeMaker; import net.minestom.server.command.builder.arguments.Argument; import net.minestom.server.command.builder.exception.ArgumentSyntaxException; diff --git a/src/main/java/net/minestom/server/entity/Entity.java b/src/main/java/net/minestom/server/entity/Entity.java index cf44f6850..13ec16f05 100644 --- a/src/main/java/net/minestom/server/entity/Entity.java +++ b/src/main/java/net/minestom/server/entity/Entity.java @@ -1538,10 +1538,7 @@ public class Entity implements Viewable, EventHandler, DataContainer, Permission } private UpdateOption getSynchronizationCooldown() { - if (this.customSynchronizationCooldown != null) { - return this.customSynchronizationCooldown; - } - return SYNCHRONIZATION_COOLDOWN; + return Objects.requireNonNullElse(this.customSynchronizationCooldown, SYNCHRONIZATION_COOLDOWN); } public enum Pose { diff --git a/src/main/java/net/minestom/server/entity/Metadata.java b/src/main/java/net/minestom/server/entity/Metadata.java index 5e64f841b..f0591c2bb 100644 --- a/src/main/java/net/minestom/server/entity/Metadata.java +++ b/src/main/java/net/minestom/server/entity/Metadata.java @@ -1,15 +1,14 @@ package net.minestom.server.entity; import net.kyori.adventure.text.Component; -import net.minestom.server.adventure.AdventureSerializer; import net.minestom.server.MinecraftServer; +import net.minestom.server.adventure.AdventureSerializer; import net.minestom.server.chat.ColoredText; import net.minestom.server.chat.JsonMessage; import net.minestom.server.item.ItemStack; import net.minestom.server.network.packet.server.play.EntityMetaDataPacket; import net.minestom.server.utils.BlockPosition; import net.minestom.server.utils.Direction; -import net.minestom.server.utils.Position; import net.minestom.server.utils.Vector; import net.minestom.server.utils.binary.BinaryReader; import net.minestom.server.utils.binary.BinaryWriter; @@ -21,8 +20,8 @@ import org.jglrxavpok.hephaistos.nbt.NBT; import org.jglrxavpok.hephaistos.nbt.NBTEnd; import org.jglrxavpok.hephaistos.nbt.NBTException; -import java.util.*; import java.io.IOException; +import java.util.*; import java.util.concurrent.ConcurrentHashMap; import java.util.function.Consumer; import java.util.function.Function; @@ -61,14 +60,14 @@ public class Metadata { writer.writeSizedString(value.toString()); } }, - reader -> { - boolean present = reader.readBoolean(); - if(present) { - return reader.readJsonMessage(Integer.MAX_VALUE); - } else { - return null; - } - }); + reader -> { + boolean present = reader.readBoolean(); + if (present) { + return reader.readJsonMessage(Integer.MAX_VALUE); + } else { + return null; + } + }); } public static Value Chat(@NotNull Component value) { @@ -84,7 +83,7 @@ public class Metadata { } }, reader -> { boolean present = reader.readBoolean(); - if(present) { + if (present) { return reader.readComponent(Integer.MAX_VALUE); } return null; @@ -120,7 +119,7 @@ public class Metadata { } }, reader -> { boolean present = reader.readBoolean(); - if(present) { + if (present) { return reader.readBlockPosition(); } else { return null; @@ -141,7 +140,7 @@ public class Metadata { } }, reader -> { boolean present = reader.readBoolean(); - if(present) { + if (present) { return reader.readUuid(); } else { return null; @@ -155,7 +154,7 @@ public class Metadata { writer.writeVarInt(present ? value : 0); }, reader -> { boolean present = reader.readBoolean(); - if(present) { + if (present) { return reader.readVarInt(); } else { return null; @@ -164,9 +163,8 @@ public class Metadata { } public static Value NBT(@NotNull NBT nbt) { - return new Value<>(TYPE_NBT, nbt, writer -> { - writer.writeNBT("", nbt); - }, reader -> { + return new Value<>(TYPE_NBT, nbt, writer -> + writer.writeNBT("", nbt), reader -> { try { return reader.readTag(); } catch (IOException | NBTException e) { @@ -183,7 +181,7 @@ public class Metadata { writer.writeVarInt(villagerType); writer.writeVarInt(villagerProfession); writer.writeVarInt(level); - }, reader -> new int[] { + }, reader -> new int[]{ reader.readVarInt(), reader.readVarInt(), reader.readVarInt() @@ -196,7 +194,7 @@ public class Metadata { writer.writeVarInt(present ? value + 1 : 0); }, reader -> { boolean present = reader.readBoolean(); - if(present) { + if (present) { return reader.readVarInt(); } else { return null; @@ -331,7 +329,7 @@ public class Metadata { } private static Value getCorrespondingNewEmptyValue(int type) { - switch(type) { + switch (type) { case TYPE_BYTE: return (Value) Byte((byte) 0); case TYPE_VARINT: @@ -351,7 +349,7 @@ public class Metadata { case TYPE_ROTATION: return (Value) Rotation(new Vector()); case TYPE_POSITION: - return (Value) Position(new BlockPosition(0,0,0)); + return (Value) Position(new BlockPosition(0, 0, 0)); case TYPE_OPTPOSITION: return (Value) OptPosition(null); case TYPE_DIRECTION: @@ -365,7 +363,7 @@ public class Metadata { case TYPE_PARTICLE: throw new UnsupportedOperationException(); case TYPE_VILLAGERDATA: - return (Value) VillagerData(0,0,0); + return (Value) VillagerData(0, 0, 0); case TYPE_OPTVARINT: return (Value) OptVarInt(null); case TYPE_POSE: diff --git a/src/main/java/net/minestom/server/entity/Player.java b/src/main/java/net/minestom/server/entity/Player.java index 7fdf91880..e5c1b9795 100644 --- a/src/main/java/net/minestom/server/entity/Player.java +++ b/src/main/java/net/minestom/server/entity/Player.java @@ -59,8 +59,8 @@ import net.minestom.server.recipe.RecipeManager; import net.minestom.server.resourcepack.ResourcePack; import net.minestom.server.scoreboard.BelowNameTag; import net.minestom.server.scoreboard.Team; -import net.minestom.server.sound.SoundEvent; import net.minestom.server.sound.SoundCategory; +import net.minestom.server.sound.SoundEvent; import net.minestom.server.stat.PlayerStatistic; import net.minestom.server.utils.*; import net.minestom.server.utils.callback.OptionalCallback; @@ -2715,8 +2715,6 @@ public class Player extends LivingEntity implements CommandSender, Localizable, private byte displayedSkinParts; private MainHand mainHand; - private boolean firstRefresh = true; - /** * The player game language. * @@ -2792,8 +2790,6 @@ public class Player extends LivingEntity implements CommandSender, Localizable, metadata.setIndex((byte) 16, Metadata.Byte(displayedSkinParts)); - this.firstRefresh = false; - // Client changed his view distance in the settings if (viewDistanceChanged) { refreshVisibleChunks(); diff --git a/src/main/java/net/minestom/server/entity/damage/DamageType.java b/src/main/java/net/minestom/server/entity/damage/DamageType.java index ae42bb111..711469936 100644 --- a/src/main/java/net/minestom/server/entity/damage/DamageType.java +++ b/src/main/java/net/minestom/server/entity/damage/DamageType.java @@ -1,11 +1,7 @@ package net.minestom.server.entity.damage; -import com.google.gson.stream.JsonReader; import net.kyori.adventure.text.Component; -import net.kyori.adventure.text.format.NamedTextColor; -import net.minestom.server.chat.ColoredText; import net.minestom.server.chat.JsonMessage; -import net.minestom.server.chat.RichMessage; import net.minestom.server.data.Data; import net.minestom.server.data.DataContainer; import net.minestom.server.entity.Entity; diff --git a/src/main/java/net/minestom/server/entity/hologram/Hologram.java b/src/main/java/net/minestom/server/entity/hologram/Hologram.java index 9f7fa0e12..22d4c7596 100644 --- a/src/main/java/net/minestom/server/entity/hologram/Hologram.java +++ b/src/main/java/net/minestom/server/entity/hologram/Hologram.java @@ -2,7 +2,6 @@ package net.minestom.server.entity.hologram; import net.kyori.adventure.text.Component; import net.minestom.server.Viewable; -import net.minestom.server.chat.ColoredText; import net.minestom.server.chat.JsonMessage; import net.minestom.server.entity.Player; import net.minestom.server.entity.type.decoration.EntityArmorStand; diff --git a/src/main/java/net/minestom/server/entity/metadata/animal/MooshroomMeta.java b/src/main/java/net/minestom/server/entity/metadata/animal/MooshroomMeta.java index ee580ed2a..badbae55f 100644 --- a/src/main/java/net/minestom/server/entity/metadata/animal/MooshroomMeta.java +++ b/src/main/java/net/minestom/server/entity/metadata/animal/MooshroomMeta.java @@ -23,7 +23,7 @@ public class MooshroomMeta extends CowMeta { public enum Variant { RED, - BROWN; + BROWN } } diff --git a/src/main/java/net/minestom/server/entity/metadata/minecart/CommandBlockMinecartMeta.java b/src/main/java/net/minestom/server/entity/metadata/minecart/CommandBlockMinecartMeta.java index fdb994154..6d55b3e6c 100644 --- a/src/main/java/net/minestom/server/entity/metadata/minecart/CommandBlockMinecartMeta.java +++ b/src/main/java/net/minestom/server/entity/metadata/minecart/CommandBlockMinecartMeta.java @@ -1,7 +1,6 @@ package net.minestom.server.entity.metadata.minecart; import net.kyori.adventure.text.Component; -import net.minestom.server.chat.ColoredText; import net.minestom.server.chat.JsonMessage; import net.minestom.server.entity.Entity; import net.minestom.server.entity.Metadata; diff --git a/src/main/java/net/minestom/server/entity/type/animal/EntityLlama.java b/src/main/java/net/minestom/server/entity/type/animal/EntityLlama.java index be1c1b66b..da945b483 100644 --- a/src/main/java/net/minestom/server/entity/type/animal/EntityLlama.java +++ b/src/main/java/net/minestom/server/entity/type/animal/EntityLlama.java @@ -2,7 +2,6 @@ package net.minestom.server.entity.type.animal; import net.minestom.server.entity.EntityCreature; import net.minestom.server.entity.EntityType; -import net.minestom.server.entity.Metadata; import net.minestom.server.instance.Instance; import net.minestom.server.utils.Position; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/net/minestom/server/event/handler/EventHandler.java b/src/main/java/net/minestom/server/event/handler/EventHandler.java index 5bb0bf40a..2b8a1b4ad 100644 --- a/src/main/java/net/minestom/server/event/handler/EventHandler.java +++ b/src/main/java/net/minestom/server/event/handler/EventHandler.java @@ -13,7 +13,6 @@ import org.jetbrains.annotations.NotNull; import java.util.Collection; import java.util.Map; -import java.util.Optional; import java.util.concurrent.CopyOnWriteArraySet; import java.util.stream.Stream; @@ -52,7 +51,7 @@ public interface EventHandler extends IExtensionObserver { if(extensionSource != null) { MinecraftServer.getExtensionManager().getExtension(extensionSource).observe(this); getExtensionCallbacks(extensionSource).add(eventCallback); - }; + } Collection callbacks = getEventCallbacks(eventClass); return callbacks.add(eventCallback); @@ -71,7 +70,7 @@ public interface EventHandler extends IExtensionObserver { String extensionSource = MinestomRootClassLoader.findExtensionObjectOwner(eventCallback); if(extensionSource != null) { getExtensionCallbacks(extensionSource).remove(eventCallback); - }; + } return callbacks.remove(eventCallback); } diff --git a/src/main/java/net/minestom/server/event/player/PlayerDeathEvent.java b/src/main/java/net/minestom/server/event/player/PlayerDeathEvent.java index 477e8deca..466c26d62 100644 --- a/src/main/java/net/minestom/server/event/player/PlayerDeathEvent.java +++ b/src/main/java/net/minestom/server/event/player/PlayerDeathEvent.java @@ -1,6 +1,5 @@ package net.minestom.server.event.player; -import com.google.gson.stream.JsonReader; import net.kyori.adventure.text.Component; import net.minestom.server.chat.JsonMessage; import net.minestom.server.entity.Player; diff --git a/src/main/java/net/minestom/server/instance/block/rule/vanilla/StairsPlacementRule.java b/src/main/java/net/minestom/server/instance/block/rule/vanilla/StairsPlacementRule.java index efc86fb2a..4a53096f2 100644 --- a/src/main/java/net/minestom/server/instance/block/rule/vanilla/StairsPlacementRule.java +++ b/src/main/java/net/minestom/server/instance/block/rule/vanilla/StairsPlacementRule.java @@ -42,7 +42,7 @@ public class StairsPlacementRule extends BlockPlacementRule { OUTER_LEFT, OUTER_RIGHT, INNER_LEFT, - INNER_RIGHT; + INNER_RIGHT } private enum Facing { diff --git a/src/main/java/net/minestom/server/instance/palette/PaletteStorage.java b/src/main/java/net/minestom/server/instance/palette/PaletteStorage.java index af753fba5..0591a85a8 100644 --- a/src/main/java/net/minestom/server/instance/palette/PaletteStorage.java +++ b/src/main/java/net/minestom/server/instance/palette/PaletteStorage.java @@ -10,8 +10,6 @@ import net.minestom.server.utils.clone.PublicCloneable; import net.minestom.server.utils.validate.Check; import org.jetbrains.annotations.NotNull; -import java.util.Arrays; - import static net.minestom.server.instance.Chunk.CHUNK_SECTION_COUNT; import static net.minestom.server.instance.Chunk.CHUNK_SECTION_SIZE; diff --git a/src/main/java/net/minestom/server/item/ItemDisplay.java b/src/main/java/net/minestom/server/item/ItemDisplay.java index b88013b33..c927059a9 100644 --- a/src/main/java/net/minestom/server/item/ItemDisplay.java +++ b/src/main/java/net/minestom/server/item/ItemDisplay.java @@ -1,12 +1,8 @@ package net.minestom.server.item; -import com.google.gson.JsonNull; -import com.google.gson.stream.JsonReader; import net.kyori.adventure.text.Component; import net.minestom.server.chat.JsonMessage; -import java.util.stream.Stream; - public class ItemDisplay { private Component displayName; diff --git a/src/main/java/net/minestom/server/item/firework/FireworkEffect.java b/src/main/java/net/minestom/server/item/firework/FireworkEffect.java index 59c8a3c7c..c9aad763c 100644 --- a/src/main/java/net/minestom/server/item/firework/FireworkEffect.java +++ b/src/main/java/net/minestom/server/item/firework/FireworkEffect.java @@ -1,6 +1,5 @@ package net.minestom.server.item.firework; -import net.kyori.adventure.text.format.TextColor; import net.minestom.server.chat.ChatColor; import net.minestom.server.color.Color; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/net/minestom/server/item/metadata/MapMeta.java b/src/main/java/net/minestom/server/item/metadata/MapMeta.java index f29e25e97..7fef87752 100644 --- a/src/main/java/net/minestom/server/item/metadata/MapMeta.java +++ b/src/main/java/net/minestom/server/item/metadata/MapMeta.java @@ -1,10 +1,8 @@ package net.minestom.server.item.metadata; -import net.kyori.adventure.text.format.TextColor; import net.minestom.server.MinecraftServer; import net.minestom.server.chat.ChatColor; import net.minestom.server.color.Color; -import net.minestom.server.color.DyeColor; import net.minestom.server.utils.clone.CloneUtils; import net.minestom.server.utils.clone.PublicCloneable; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/net/minestom/server/item/metadata/PotionMeta.java b/src/main/java/net/minestom/server/item/metadata/PotionMeta.java index b7ac76db9..cc5d2df24 100644 --- a/src/main/java/net/minestom/server/item/metadata/PotionMeta.java +++ b/src/main/java/net/minestom/server/item/metadata/PotionMeta.java @@ -1,6 +1,5 @@ package net.minestom.server.item.metadata; -import net.kyori.adventure.text.format.TextColor; import net.minestom.server.chat.ChatColor; import net.minestom.server.color.Color; import net.minestom.server.potion.CustomPotionEffect; diff --git a/src/main/java/net/minestom/server/listener/UseItemListener.java b/src/main/java/net/minestom/server/listener/UseItemListener.java index 13f1d9526..20214ede1 100644 --- a/src/main/java/net/minestom/server/listener/UseItemListener.java +++ b/src/main/java/net/minestom/server/listener/UseItemListener.java @@ -1,7 +1,6 @@ package net.minestom.server.listener; import net.minestom.server.entity.Player; -import net.minestom.server.event.item.ArmorEquipEvent; import net.minestom.server.event.player.PlayerItemAnimationEvent; import net.minestom.server.event.player.PlayerPreEatEvent; import net.minestom.server.event.player.PlayerUseItemEvent; diff --git a/src/main/java/net/minestom/server/network/ConnectionManager.java b/src/main/java/net/minestom/server/network/ConnectionManager.java index c141b2384..0e7fdce47 100644 --- a/src/main/java/net/minestom/server/network/ConnectionManager.java +++ b/src/main/java/net/minestom/server/network/ConnectionManager.java @@ -2,12 +2,10 @@ package net.minestom.server.network; import io.netty.channel.Channel; import net.kyori.adventure.audience.Audience; -import net.kyori.adventure.audience.ForwardingAudience; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.format.NamedTextColor; import net.minestom.server.MinecraftServer; import net.minestom.server.adventure.audience.Audiences; -import net.minestom.server.adventure.audience.PacketGroupingAudience; import net.minestom.server.chat.JsonMessage; import net.minestom.server.entity.Player; import net.minestom.server.entity.fakeplayer.FakePlayer; diff --git a/src/main/java/net/minestom/server/network/packet/server/ServerPacket.java b/src/main/java/net/minestom/server/network/packet/server/ServerPacket.java index 4c48415cf..eb94d671b 100644 --- a/src/main/java/net/minestom/server/network/packet/server/ServerPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/ServerPacket.java @@ -6,8 +6,6 @@ import net.minestom.server.utils.binary.Readable; import net.minestom.server.utils.binary.Writeable; import org.jetbrains.annotations.NotNull; -import java.nio.CharBuffer; - /** * Represents a packet which can be sent to a player using {@link PlayerConnection#sendPacket(ServerPacket)}. */ diff --git a/src/main/java/net/minestom/server/network/packet/server/play/AdvancementsPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/AdvancementsPacket.java index 0f9936ef0..cd4f6a365 100644 --- a/src/main/java/net/minestom/server/network/packet/server/play/AdvancementsPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/AdvancementsPacket.java @@ -2,8 +2,6 @@ package net.minestom.server.network.packet.server.play; import net.kyori.adventure.text.Component; import net.minestom.server.advancements.FrameType; -import net.minestom.server.chat.ColoredText; -import net.minestom.server.chat.JsonMessage; import net.minestom.server.item.ItemStack; import net.minestom.server.network.packet.server.ComponentHoldingServerPacket; import net.minestom.server.network.packet.server.ServerPacket; diff --git a/src/main/java/net/minestom/server/network/packet/server/play/BlockEntityDataPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/BlockEntityDataPacket.java index 4ae249b53..181355a69 100644 --- a/src/main/java/net/minestom/server/network/packet/server/play/BlockEntityDataPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/BlockEntityDataPacket.java @@ -37,7 +37,7 @@ public class BlockEntityDataPacket implements ServerPacket { @Override public void read(@NotNull BinaryReader reader) { - blockPosition = reader.readBlockPosition();; + blockPosition = reader.readBlockPosition(); action = reader.readByte(); try { NBT tag = reader.readTag(); diff --git a/src/main/java/net/minestom/server/network/packet/server/play/ChunkDataPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/ChunkDataPacket.java index 18d1f6fb6..8a5a206fa 100644 --- a/src/main/java/net/minestom/server/network/packet/server/play/ChunkDataPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/ChunkDataPacket.java @@ -24,7 +24,6 @@ import net.minestom.server.utils.chunk.ChunkUtils; import net.minestom.server.world.biomes.Biome; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jglrxavpok.hephaistos.nbt.NBT; import org.jglrxavpok.hephaistos.nbt.NBTCompound; import org.jglrxavpok.hephaistos.nbt.NBTException; diff --git a/src/main/java/net/minestom/server/network/packet/server/play/DeclareCommandsPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/DeclareCommandsPacket.java index a92a39b63..47972539c 100644 --- a/src/main/java/net/minestom/server/network/packet/server/play/DeclareCommandsPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/DeclareCommandsPacket.java @@ -8,8 +8,6 @@ import net.minestom.server.utils.binary.Readable; import net.minestom.server.utils.binary.Writeable; import org.jetbrains.annotations.NotNull; -import java.util.function.Consumer; - public class DeclareCommandsPacket implements ServerPacket { public Node[] nodes = new Node[0]; diff --git a/src/main/java/net/minestom/server/network/packet/server/play/EntityMetaDataPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/EntityMetaDataPacket.java index 8d8ea85e9..158ee1baf 100644 --- a/src/main/java/net/minestom/server/network/packet/server/play/EntityMetaDataPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/EntityMetaDataPacket.java @@ -43,7 +43,7 @@ public class EntityMetaDataPacket implements ServerPacket { break; } - entries.add(new Metadata.Entry(reader)); + entries.add(new Metadata.Entry<>(reader)); } } diff --git a/src/main/java/net/minestom/server/network/packet/server/play/EntitySoundEffectPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/EntitySoundEffectPacket.java index 90f1f2533..a697e1de6 100644 --- a/src/main/java/net/minestom/server/network/packet/server/play/EntitySoundEffectPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/EntitySoundEffectPacket.java @@ -4,7 +4,6 @@ import net.kyori.adventure.sound.Sound; import net.minestom.server.adventure.AdventurePacketConvertor; import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.network.packet.server.ServerPacketIdentifier; -import net.minestom.server.sound.SoundCategory; import net.minestom.server.utils.binary.BinaryReader; import net.minestom.server.utils.binary.BinaryWriter; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/net/minestom/server/network/packet/server/play/MultiBlockChangePacket.java b/src/main/java/net/minestom/server/network/packet/server/play/MultiBlockChangePacket.java index 92d4ffadd..14954d844 100644 --- a/src/main/java/net/minestom/server/network/packet/server/play/MultiBlockChangePacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/MultiBlockChangePacket.java @@ -17,7 +17,8 @@ public class MultiBlockChangePacket implements ServerPacket { public boolean suppressLightUpdates = true; public BlockChange[] blockChanges = new BlockChange[0]; - public MultiBlockChangePacket() {} + public MultiBlockChangePacket() { + } @Override public void write(@NotNull BinaryWriter writer) { @@ -27,7 +28,7 @@ public class MultiBlockChangePacket implements ServerPacket { final int length = blockChanges.length; writer.writeVarInt(length); for (final BlockChange blockChange : blockChanges) { - writer.writeVarLong(blockChange.newBlockId << 12 | getLocalBlockPosAsShort(blockChange.positionX, blockChange.positionY, blockChange.positionZ)); + writer.writeVarLong((long) blockChange.newBlockId << 12 | getLocalBlockPosAsShort(blockChange.positionX, blockChange.positionY, blockChange.positionZ)); } } else { writer.writeVarInt(0); diff --git a/src/main/java/net/minestom/server/network/packet/server/play/NamedSoundEffectPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/NamedSoundEffectPacket.java index 8f83cfce8..2a4f5ca5a 100644 --- a/src/main/java/net/minestom/server/network/packet/server/play/NamedSoundEffectPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/NamedSoundEffectPacket.java @@ -4,7 +4,6 @@ import net.kyori.adventure.sound.Sound.Source; import net.minestom.server.adventure.AdventurePacketConvertor; import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.network.packet.server.ServerPacketIdentifier; -import net.minestom.server.sound.SoundCategory; import net.minestom.server.utils.binary.BinaryReader; import net.minestom.server.utils.binary.BinaryWriter; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/net/minestom/server/network/packet/server/play/OpenSignEditorPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/OpenSignEditorPacket.java index 7bb4fd571..44454f589 100644 --- a/src/main/java/net/minestom/server/network/packet/server/play/OpenSignEditorPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/OpenSignEditorPacket.java @@ -3,7 +3,6 @@ package net.minestom.server.network.packet.server.play; import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.network.packet.server.ServerPacketIdentifier; import net.minestom.server.utils.BlockPosition; -import net.minestom.server.utils.Position; import net.minestom.server.utils.binary.BinaryReader; import net.minestom.server.utils.binary.BinaryWriter; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/net/minestom/server/network/packet/server/play/ParticlePacket.java b/src/main/java/net/minestom/server/network/packet/server/play/ParticlePacket.java index 2c9ca4441..005ca13c8 100644 --- a/src/main/java/net/minestom/server/network/packet/server/play/ParticlePacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/ParticlePacket.java @@ -6,8 +6,6 @@ import net.minestom.server.utils.binary.BinaryReader; import net.minestom.server.utils.binary.BinaryWriter; import org.jetbrains.annotations.NotNull; -import java.util.function.Consumer; - public class ParticlePacket implements ServerPacket { public int particleId; diff --git a/src/main/java/net/minestom/server/network/packet/server/play/PluginMessagePacket.java b/src/main/java/net/minestom/server/network/packet/server/play/PluginMessagePacket.java index 17cac62c5..96d8de55c 100644 --- a/src/main/java/net/minestom/server/network/packet/server/play/PluginMessagePacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/PluginMessagePacket.java @@ -7,8 +7,6 @@ import net.minestom.server.utils.binary.BinaryReader; import net.minestom.server.utils.binary.BinaryWriter; import org.jetbrains.annotations.NotNull; -import java.io.IOException; - public class PluginMessagePacket implements ServerPacket { public String channel = "none"; diff --git a/src/main/java/net/minestom/server/network/packet/server/play/SpawnPlayerPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/SpawnPlayerPacket.java index 31537a767..f1702983a 100644 --- a/src/main/java/net/minestom/server/network/packet/server/play/SpawnPlayerPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/SpawnPlayerPacket.java @@ -2,7 +2,6 @@ package net.minestom.server.network.packet.server.play; import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.network.packet.server.ServerPacketIdentifier; -import net.minestom.server.utils.BlockPosition; import net.minestom.server.utils.Position; import net.minestom.server.utils.binary.BinaryReader; import net.minestom.server.utils.binary.BinaryWriter; diff --git a/src/main/java/net/minestom/server/network/packet/server/play/TeamsPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/TeamsPacket.java index 86bd295aa..b46d15ab7 100644 --- a/src/main/java/net/minestom/server/network/packet/server/play/TeamsPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/TeamsPacket.java @@ -10,7 +10,6 @@ import net.minestom.server.utils.binary.BinaryReader; import net.minestom.server.utils.binary.BinaryWriter; import net.minestom.server.utils.validate.Check; import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; import java.util.Collection; import java.util.Collections; diff --git a/src/main/java/net/minestom/server/network/packet/server/play/UpdateLightPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/UpdateLightPacket.java index 55ff304be..3adc315db 100644 --- a/src/main/java/net/minestom/server/network/packet/server/play/UpdateLightPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/UpdateLightPacket.java @@ -11,7 +11,6 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import java.util.ArrayList; -import java.util.LinkedList; import java.util.List; import java.util.UUID; import java.util.concurrent.TimeUnit; diff --git a/src/main/java/net/minestom/server/resourcepack/ResourcePack.java b/src/main/java/net/minestom/server/resourcepack/ResourcePack.java index f0837c540..dab2418ee 100644 --- a/src/main/java/net/minestom/server/resourcepack/ResourcePack.java +++ b/src/main/java/net/minestom/server/resourcepack/ResourcePack.java @@ -1,7 +1,6 @@ package net.minestom.server.resourcepack; import net.minestom.server.entity.Player; -import net.minestom.server.utils.validate.Check; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/net/minestom/server/scoreboard/Scoreboard.java b/src/main/java/net/minestom/server/scoreboard/Scoreboard.java index 01831e231..eaa042e9a 100644 --- a/src/main/java/net/minestom/server/scoreboard/Scoreboard.java +++ b/src/main/java/net/minestom/server/scoreboard/Scoreboard.java @@ -1,7 +1,5 @@ package net.minestom.server.scoreboard; -import net.kyori.adventure.audience.Audience; -import net.kyori.adventure.audience.ForwardingAudience; import net.kyori.adventure.text.Component; import net.minestom.server.Viewable; import net.minestom.server.adventure.audience.PacketGroupingAudience; diff --git a/src/main/java/net/minestom/server/scoreboard/Team.java b/src/main/java/net/minestom/server/scoreboard/Team.java index e851aad54..83e3ef4f5 100644 --- a/src/main/java/net/minestom/server/scoreboard/Team.java +++ b/src/main/java/net/minestom/server/scoreboard/Team.java @@ -1,8 +1,6 @@ package net.minestom.server.scoreboard; import com.google.common.collect.MapMaker; -import net.kyori.adventure.audience.Audience; -import net.kyori.adventure.audience.ForwardingAudience; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.format.NamedTextColor; import net.minestom.server.MinecraftServer; diff --git a/src/main/java/net/minestom/server/sound/SoundCategory.java b/src/main/java/net/minestom/server/sound/SoundCategory.java index 15c4d62d2..4b650a2ee 100644 --- a/src/main/java/net/minestom/server/sound/SoundCategory.java +++ b/src/main/java/net/minestom/server/sound/SoundCategory.java @@ -1,6 +1,5 @@ package net.minestom.server.sound; -import net.kyori.adventure.sound.Sound; import org.jetbrains.annotations.NotNull; import static net.kyori.adventure.sound.Sound.*; diff --git a/src/main/java/net/minestom/server/utils/location/RelativeBlockPosition.java b/src/main/java/net/minestom/server/utils/location/RelativeBlockPosition.java index 372597b95..b1b183e77 100644 --- a/src/main/java/net/minestom/server/utils/location/RelativeBlockPosition.java +++ b/src/main/java/net/minestom/server/utils/location/RelativeBlockPosition.java @@ -1,6 +1,5 @@ package net.minestom.server.utils.location; -import net.minestom.server.entity.Entity; import net.minestom.server.utils.BlockPosition; import net.minestom.server.utils.Position; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/net/minestom/server/utils/location/RelativeVec.java b/src/main/java/net/minestom/server/utils/location/RelativeVec.java index ad3e838a9..42d948c84 100644 --- a/src/main/java/net/minestom/server/utils/location/RelativeVec.java +++ b/src/main/java/net/minestom/server/utils/location/RelativeVec.java @@ -1,6 +1,5 @@ package net.minestom.server.utils.location; -import net.minestom.server.entity.Entity; import net.minestom.server.utils.Position; import net.minestom.server.utils.Vector; import org.jetbrains.annotations.Nullable; diff --git a/src/test/java/demo/commands/EntitySelectorCommand.java b/src/test/java/demo/commands/EntitySelectorCommand.java index 178d63931..35e044f81 100644 --- a/src/test/java/demo/commands/EntitySelectorCommand.java +++ b/src/test/java/demo/commands/EntitySelectorCommand.java @@ -6,7 +6,6 @@ import net.minestom.server.command.builder.CommandContext; import net.minestom.server.command.builder.arguments.ArgumentType; import net.minestom.server.command.builder.arguments.minecraft.ArgumentEntity; import net.minestom.server.entity.Entity; -import net.minestom.server.instance.Instance; import net.minestom.server.utils.entity.EntityFinder; import java.util.List; diff --git a/src/test/java/demo/commands/ReloadExtensionCommand.java b/src/test/java/demo/commands/ReloadExtensionCommand.java index 898251957..dfadd78b3 100644 --- a/src/test/java/demo/commands/ReloadExtensionCommand.java +++ b/src/test/java/demo/commands/ReloadExtensionCommand.java @@ -5,7 +5,6 @@ import net.minestom.server.MinecraftServer; import net.minestom.server.command.CommandSender; import net.minestom.server.command.builder.Command; import net.minestom.server.command.builder.CommandContext; -import net.minestom.server.command.builder.arguments.Argument; import net.minestom.server.command.builder.arguments.ArgumentString; import net.minestom.server.command.builder.arguments.ArgumentType; import net.minestom.server.command.builder.exception.ArgumentSyntaxException; diff --git a/src/test/java/demo/commands/SummonCommand.java b/src/test/java/demo/commands/SummonCommand.java index 3ee4dd736..0e03ef215 100644 --- a/src/test/java/demo/commands/SummonCommand.java +++ b/src/test/java/demo/commands/SummonCommand.java @@ -4,7 +4,6 @@ import net.minestom.server.command.CommandSender; import net.minestom.server.command.builder.Command; import net.minestom.server.command.builder.CommandContext; import net.minestom.server.command.builder.arguments.ArgumentType; -import net.minestom.server.command.builder.arguments.minecraft.ArgumentEntity; import net.minestom.server.command.builder.arguments.minecraft.registry.ArgumentEntityType; import net.minestom.server.command.builder.arguments.relative.ArgumentRelativeVec3; import net.minestom.server.command.builder.condition.Conditions; diff --git a/src/test/java/demo/commands/UnloadExtensionCommand.java b/src/test/java/demo/commands/UnloadExtensionCommand.java index 115242638..3c856b007 100644 --- a/src/test/java/demo/commands/UnloadExtensionCommand.java +++ b/src/test/java/demo/commands/UnloadExtensionCommand.java @@ -5,13 +5,11 @@ import net.minestom.server.MinecraftServer; import net.minestom.server.command.CommandSender; import net.minestom.server.command.builder.Command; import net.minestom.server.command.builder.CommandContext; -import net.minestom.server.command.builder.arguments.Argument; import net.minestom.server.command.builder.arguments.ArgumentString; import net.minestom.server.command.builder.arguments.ArgumentType; import net.minestom.server.command.builder.exception.ArgumentSyntaxException; import net.minestom.server.extensions.Extension; import net.minestom.server.extensions.ExtensionManager; -import org.apache.commons.lang3.StringUtils; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/src/test/java/improveextensions/unloadextensiononstop/UnloadExtensionOnStop.java b/src/test/java/improveextensions/unloadextensiononstop/UnloadExtensionOnStop.java index 7491c2e8a..f2e3c6358 100644 --- a/src/test/java/improveextensions/unloadextensiononstop/UnloadExtensionOnStop.java +++ b/src/test/java/improveextensions/unloadextensiononstop/UnloadExtensionOnStop.java @@ -1,20 +1,9 @@ package improveextensions.unloadextensiononstop; import net.minestom.server.MinecraftServer; -import net.minestom.server.entity.type.monster.EntityZombie; -import net.minestom.server.event.EventCallback; -import net.minestom.server.event.GlobalEventHandler; -import net.minestom.server.event.entity.EntityTickEvent; -import net.minestom.server.event.instance.InstanceTickEvent; import net.minestom.server.extensions.Extension; -import net.minestom.server.extras.selfmodification.MinestomRootClassLoader; -import net.minestom.server.instance.Instance; -import net.minestom.server.utils.Position; import net.minestom.server.utils.time.TimeUnit; import org.junit.jupiter.api.Assertions; -import org.opentest4j.AssertionFailedError; - -import java.util.concurrent.atomic.AtomicBoolean; public class UnloadExtensionOnStop extends Extension { diff --git a/src/test/java/testextension/TestExtensionLauncherNoSetup.java b/src/test/java/testextension/TestExtensionLauncherNoSetup.java index ef4b757fe..16e2d5e66 100644 --- a/src/test/java/testextension/TestExtensionLauncherNoSetup.java +++ b/src/test/java/testextension/TestExtensionLauncherNoSetup.java @@ -1,8 +1,6 @@ package testextension; import net.minestom.server.Bootstrap; -import org.spongepowered.asm.launch.MixinBootstrap; -import org.spongepowered.asm.mixin.Mixins; // To launch with VM arguments: // -Dminestom.extension.indevfolder.classes=build/classes/java/test/ -Dminestom.extension.indevfolder.resources=build/resources/test/ diff --git a/src/test/java/testextension/mixins/InstanceContainerMixin.java b/src/test/java/testextension/mixins/InstanceContainerMixin.java index b3299afbd..7bed56a2c 100644 --- a/src/test/java/testextension/mixins/InstanceContainerMixin.java +++ b/src/test/java/testextension/mixins/InstanceContainerMixin.java @@ -1,13 +1,9 @@ package testextension.mixins; -import net.minestom.server.data.Data; import net.minestom.server.instance.InstanceContainer; -import net.minestom.server.instance.block.Block; -import net.minestom.server.instance.block.CustomBlock; 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.ModifyVariable; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; @Mixin(InstanceContainer.class)