Code cleanup

This commit is contained in:
TheMode 2021-04-07 18:35:19 +02:00
parent 5b98fbeb8b
commit 4c495f401d
62 changed files with 34 additions and 130 deletions

View File

@ -139,8 +139,7 @@ public class EnumGenerator implements CodeGenerator {
// constructor // constructor
MethodSpec.Builder constructorBuilder = MethodSpec.constructorBuilder(); MethodSpec.Builder constructorBuilder = MethodSpec.constructorBuilder();
for (int i = 0; i < parameters.length; i++) { for (ParameterSpec param : parameters) {
ParameterSpec param = parameters[i];
constructorBuilder.addParameter(param); constructorBuilder.addParameter(param);
// property assignment // property assignment

View File

@ -1,7 +1,6 @@
package net.minestom.codegen.enchantment; package net.minestom.codegen.enchantment;
import net.minestom.codegen.BasicEnumGenerator; import net.minestom.codegen.BasicEnumGenerator;
import net.minestom.codegen.stats.StatsEnumGenerator;
import net.minestom.server.registry.ResourceGatherer; import net.minestom.server.registry.ResourceGatherer;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;

View File

@ -1,7 +1,6 @@
package net.minestom.codegen.fluids; package net.minestom.codegen.fluids;
import net.minestom.codegen.BasicEnumGenerator; import net.minestom.codegen.BasicEnumGenerator;
import net.minestom.codegen.stats.StatsEnumGenerator;
import net.minestom.server.registry.ResourceGatherer; import net.minestom.server.registry.ResourceGatherer;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;

View File

@ -1,7 +1,6 @@
package net.minestom.codegen.potions; package net.minestom.codegen.potions;
import net.minestom.codegen.BasicEnumGenerator; import net.minestom.codegen.BasicEnumGenerator;
import net.minestom.codegen.stats.StatsEnumGenerator;
import net.minestom.server.registry.ResourceGatherer; import net.minestom.server.registry.ResourceGatherer;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;

View File

@ -12,7 +12,6 @@ import java.io.InputStreamReader;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import static org.lwjgl.opengl.GL11.*;
import static org.lwjgl.opengl.GL20.*; import static org.lwjgl.opengl.GL20.*;
public final class OpenGLRendering { public final class OpenGLRendering {

View File

@ -7,8 +7,6 @@ import javax.imageio.ImageIO;
import java.awt.image.BufferedImage; import java.awt.image.BufferedImage;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
public class PaletteGenerator { public class PaletteGenerator {

View File

@ -14,7 +14,6 @@ import org.lwjgl.system.MemoryStack;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import static org.lwjgl.glfw.GLFW.*; import static org.lwjgl.glfw.GLFW.*;
import static org.lwjgl.glfw.GLFW.glfwTerminate;
import static org.lwjgl.opengl.GL11.*; import static org.lwjgl.opengl.GL11.*;
public abstract class GLFWCapableBuffer { public abstract class GLFWCapableBuffer {

View File

@ -167,7 +167,7 @@ public class MapColorRenderer implements Runnable {
glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, screenQuadIndices); glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, screenQuadIndices);
glDrawElements(GL_TRIANGLES, 6, GL_UNSIGNED_INT, 0); glDrawElements(GL_TRIANGLES, 6, GL_UNSIGNED_INT, 0);
}; }
glUseProgram(0); glUseProgram(0);
glBindBuffer(GL_ARRAY_BUFFER, 0); glBindBuffer(GL_ARRAY_BUFFER, 0);

View File

@ -7,7 +7,6 @@ import net.minestom.server.network.packet.server.ServerPacket;
import net.minestom.server.utils.PacketUtils; import net.minestom.server.utils.PacketUtils;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import java.util.Collections;
import java.util.Set; import java.util.Set;
/** /**

View File

@ -1,7 +1,6 @@
package net.minestom.server.advancements; package net.minestom.server.advancements;
import net.kyori.adventure.text.Component; import net.kyori.adventure.text.Component;
import net.minestom.server.chat.ColoredText;
import net.minestom.server.chat.JsonMessage; import net.minestom.server.chat.JsonMessage;
import net.minestom.server.item.ItemStack; import net.minestom.server.item.ItemStack;
import net.minestom.server.item.Material; import net.minestom.server.item.Material;

View File

@ -2,13 +2,10 @@ package net.minestom.server.adventure;
import it.unimi.dsi.fastutil.objects.Object2IntArrayMap; import it.unimi.dsi.fastutil.objects.Object2IntArrayMap;
import it.unimi.dsi.fastutil.objects.Object2IntMap; import it.unimi.dsi.fastutil.objects.Object2IntMap;
import net.kyori.adventure.audience.MessageType;
import net.kyori.adventure.bossbar.BossBar; import net.kyori.adventure.bossbar.BossBar;
import net.kyori.adventure.sound.Sound; import net.kyori.adventure.sound.Sound;
import net.kyori.adventure.sound.SoundStop; import net.kyori.adventure.sound.SoundStop;
import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.format.NamedTextColor; 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.entity.Entity;
import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.network.packet.server.ServerPacket;
import net.minestom.server.network.packet.server.play.EntitySoundEffectPacket; import net.minestom.server.network.packet.server.play.EntitySoundEffectPacket;

View File

@ -4,9 +4,7 @@ import it.unimi.dsi.fastutil.chars.Char2ObjectMap;
import it.unimi.dsi.fastutil.chars.Char2ObjectOpenHashMap; import it.unimi.dsi.fastutil.chars.Char2ObjectOpenHashMap;
import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap; import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
import net.kyori.adventure.text.ComponentBuilder;
import net.kyori.adventure.text.format.*; 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.Color;
import net.minestom.server.color.DyeColor; import net.minestom.server.color.DyeColor;
import net.minestom.server.utils.validate.Check; import net.minestom.server.utils.validate.Check;

View File

@ -1,6 +1,5 @@
package net.minestom.server.chat; package net.minestom.server.chat;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject; import com.google.gson.JsonObject;
import com.google.gson.JsonPrimitive; import com.google.gson.JsonPrimitive;
import net.kyori.adventure.text.Component; import net.kyori.adventure.text.Component;

View File

@ -1,6 +1,5 @@
package net.minestom.server.color; package net.minestom.server.color;
import net.kyori.adventure.text.format.TextColor;
import net.kyori.adventure.util.RGBLike; import net.kyori.adventure.util.RGBLike;
import net.minestom.server.chat.ChatColor; import net.minestom.server.chat.ChatColor;
import org.apache.commons.lang3.Validate; import org.apache.commons.lang3.Validate;

View File

@ -2,7 +2,6 @@ package net.minestom.server.command;
import net.minestom.server.command.builder.CommandContext; import net.minestom.server.command.builder.CommandContext;
import net.kyori.adventure.audience.Audience; import net.kyori.adventure.audience.Audience;
import net.minestom.server.command.builder.Arguments;
import net.minestom.server.permission.Permission; import net.minestom.server.permission.Permission;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;

View File

@ -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.NamedTextColor;
import net.kyori.adventure.text.format.Style; 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.NodeMaker;
import net.minestom.server.command.builder.arguments.Argument; import net.minestom.server.command.builder.arguments.Argument;
import net.minestom.server.command.builder.exception.ArgumentSyntaxException; import net.minestom.server.command.builder.exception.ArgumentSyntaxException;

View File

@ -1538,10 +1538,7 @@ public class Entity implements Viewable, EventHandler, DataContainer, Permission
} }
private UpdateOption getSynchronizationCooldown() { private UpdateOption getSynchronizationCooldown() {
if (this.customSynchronizationCooldown != null) { return Objects.requireNonNullElse(this.customSynchronizationCooldown, SYNCHRONIZATION_COOLDOWN);
return this.customSynchronizationCooldown;
}
return SYNCHRONIZATION_COOLDOWN;
} }
public enum Pose { public enum Pose {

View File

@ -1,15 +1,14 @@
package net.minestom.server.entity; package net.minestom.server.entity;
import net.kyori.adventure.text.Component; import net.kyori.adventure.text.Component;
import net.minestom.server.adventure.AdventureSerializer;
import net.minestom.server.MinecraftServer; import net.minestom.server.MinecraftServer;
import net.minestom.server.adventure.AdventureSerializer;
import net.minestom.server.chat.ColoredText; import net.minestom.server.chat.ColoredText;
import net.minestom.server.chat.JsonMessage; import net.minestom.server.chat.JsonMessage;
import net.minestom.server.item.ItemStack; import net.minestom.server.item.ItemStack;
import net.minestom.server.network.packet.server.play.EntityMetaDataPacket; import net.minestom.server.network.packet.server.play.EntityMetaDataPacket;
import net.minestom.server.utils.BlockPosition; import net.minestom.server.utils.BlockPosition;
import net.minestom.server.utils.Direction; import net.minestom.server.utils.Direction;
import net.minestom.server.utils.Position;
import net.minestom.server.utils.Vector; import net.minestom.server.utils.Vector;
import net.minestom.server.utils.binary.BinaryReader; import net.minestom.server.utils.binary.BinaryReader;
import net.minestom.server.utils.binary.BinaryWriter; 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.NBTEnd;
import org.jglrxavpok.hephaistos.nbt.NBTException; import org.jglrxavpok.hephaistos.nbt.NBTException;
import java.util.*;
import java.io.IOException; import java.io.IOException;
import java.util.*;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
import java.util.function.Consumer; import java.util.function.Consumer;
import java.util.function.Function; import java.util.function.Function;
@ -61,14 +60,14 @@ public class Metadata {
writer.writeSizedString(value.toString()); writer.writeSizedString(value.toString());
} }
}, },
reader -> { reader -> {
boolean present = reader.readBoolean(); boolean present = reader.readBoolean();
if(present) { if (present) {
return reader.readJsonMessage(Integer.MAX_VALUE); return reader.readJsonMessage(Integer.MAX_VALUE);
} else { } else {
return null; return null;
} }
}); });
} }
public static Value<Component> Chat(@NotNull Component value) { public static Value<Component> Chat(@NotNull Component value) {
@ -84,7 +83,7 @@ public class Metadata {
} }
}, reader -> { }, reader -> {
boolean present = reader.readBoolean(); boolean present = reader.readBoolean();
if(present) { if (present) {
return reader.readComponent(Integer.MAX_VALUE); return reader.readComponent(Integer.MAX_VALUE);
} }
return null; return null;
@ -120,7 +119,7 @@ public class Metadata {
} }
}, reader -> { }, reader -> {
boolean present = reader.readBoolean(); boolean present = reader.readBoolean();
if(present) { if (present) {
return reader.readBlockPosition(); return reader.readBlockPosition();
} else { } else {
return null; return null;
@ -141,7 +140,7 @@ public class Metadata {
} }
}, reader -> { }, reader -> {
boolean present = reader.readBoolean(); boolean present = reader.readBoolean();
if(present) { if (present) {
return reader.readUuid(); return reader.readUuid();
} else { } else {
return null; return null;
@ -155,7 +154,7 @@ public class Metadata {
writer.writeVarInt(present ? value : 0); writer.writeVarInt(present ? value : 0);
}, reader -> { }, reader -> {
boolean present = reader.readBoolean(); boolean present = reader.readBoolean();
if(present) { if (present) {
return reader.readVarInt(); return reader.readVarInt();
} else { } else {
return null; return null;
@ -164,9 +163,8 @@ public class Metadata {
} }
public static Value<NBT> NBT(@NotNull NBT nbt) { public static Value<NBT> NBT(@NotNull NBT nbt) {
return new Value<>(TYPE_NBT, nbt, writer -> { return new Value<>(TYPE_NBT, nbt, writer ->
writer.writeNBT("", nbt); writer.writeNBT("", nbt), reader -> {
}, reader -> {
try { try {
return reader.readTag(); return reader.readTag();
} catch (IOException | NBTException e) { } catch (IOException | NBTException e) {
@ -183,7 +181,7 @@ public class Metadata {
writer.writeVarInt(villagerType); writer.writeVarInt(villagerType);
writer.writeVarInt(villagerProfession); writer.writeVarInt(villagerProfession);
writer.writeVarInt(level); writer.writeVarInt(level);
}, reader -> new int[] { }, reader -> new int[]{
reader.readVarInt(), reader.readVarInt(),
reader.readVarInt(), reader.readVarInt(),
reader.readVarInt() reader.readVarInt()
@ -196,7 +194,7 @@ public class Metadata {
writer.writeVarInt(present ? value + 1 : 0); writer.writeVarInt(present ? value + 1 : 0);
}, reader -> { }, reader -> {
boolean present = reader.readBoolean(); boolean present = reader.readBoolean();
if(present) { if (present) {
return reader.readVarInt(); return reader.readVarInt();
} else { } else {
return null; return null;
@ -331,7 +329,7 @@ public class Metadata {
} }
private static <T> Value<T> getCorrespondingNewEmptyValue(int type) { private static <T> Value<T> getCorrespondingNewEmptyValue(int type) {
switch(type) { switch (type) {
case TYPE_BYTE: case TYPE_BYTE:
return (Value<T>) Byte((byte) 0); return (Value<T>) Byte((byte) 0);
case TYPE_VARINT: case TYPE_VARINT:
@ -351,7 +349,7 @@ public class Metadata {
case TYPE_ROTATION: case TYPE_ROTATION:
return (Value<T>) Rotation(new Vector()); return (Value<T>) Rotation(new Vector());
case TYPE_POSITION: case TYPE_POSITION:
return (Value<T>) Position(new BlockPosition(0,0,0)); return (Value<T>) Position(new BlockPosition(0, 0, 0));
case TYPE_OPTPOSITION: case TYPE_OPTPOSITION:
return (Value<T>) OptPosition(null); return (Value<T>) OptPosition(null);
case TYPE_DIRECTION: case TYPE_DIRECTION:
@ -365,7 +363,7 @@ public class Metadata {
case TYPE_PARTICLE: case TYPE_PARTICLE:
throw new UnsupportedOperationException(); throw new UnsupportedOperationException();
case TYPE_VILLAGERDATA: case TYPE_VILLAGERDATA:
return (Value<T>) VillagerData(0,0,0); return (Value<T>) VillagerData(0, 0, 0);
case TYPE_OPTVARINT: case TYPE_OPTVARINT:
return (Value<T>) OptVarInt(null); return (Value<T>) OptVarInt(null);
case TYPE_POSE: case TYPE_POSE:

View File

@ -59,8 +59,8 @@ import net.minestom.server.recipe.RecipeManager;
import net.minestom.server.resourcepack.ResourcePack; import net.minestom.server.resourcepack.ResourcePack;
import net.minestom.server.scoreboard.BelowNameTag; import net.minestom.server.scoreboard.BelowNameTag;
import net.minestom.server.scoreboard.Team; import net.minestom.server.scoreboard.Team;
import net.minestom.server.sound.SoundEvent;
import net.minestom.server.sound.SoundCategory; import net.minestom.server.sound.SoundCategory;
import net.minestom.server.sound.SoundEvent;
import net.minestom.server.stat.PlayerStatistic; import net.minestom.server.stat.PlayerStatistic;
import net.minestom.server.utils.*; import net.minestom.server.utils.*;
import net.minestom.server.utils.callback.OptionalCallback; import net.minestom.server.utils.callback.OptionalCallback;
@ -2715,8 +2715,6 @@ public class Player extends LivingEntity implements CommandSender, Localizable,
private byte displayedSkinParts; private byte displayedSkinParts;
private MainHand mainHand; private MainHand mainHand;
private boolean firstRefresh = true;
/** /**
* The player game language. * The player game language.
* *
@ -2792,8 +2790,6 @@ public class Player extends LivingEntity implements CommandSender, Localizable,
metadata.setIndex((byte) 16, Metadata.Byte(displayedSkinParts)); metadata.setIndex((byte) 16, Metadata.Byte(displayedSkinParts));
this.firstRefresh = false;
// Client changed his view distance in the settings // Client changed his view distance in the settings
if (viewDistanceChanged) { if (viewDistanceChanged) {
refreshVisibleChunks(); refreshVisibleChunks();

View File

@ -1,11 +1,7 @@
package net.minestom.server.entity.damage; package net.minestom.server.entity.damage;
import com.google.gson.stream.JsonReader;
import net.kyori.adventure.text.Component; 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.JsonMessage;
import net.minestom.server.chat.RichMessage;
import net.minestom.server.data.Data; import net.minestom.server.data.Data;
import net.minestom.server.data.DataContainer; import net.minestom.server.data.DataContainer;
import net.minestom.server.entity.Entity; import net.minestom.server.entity.Entity;

View File

@ -2,7 +2,6 @@ package net.minestom.server.entity.hologram;
import net.kyori.adventure.text.Component; import net.kyori.adventure.text.Component;
import net.minestom.server.Viewable; import net.minestom.server.Viewable;
import net.minestom.server.chat.ColoredText;
import net.minestom.server.chat.JsonMessage; import net.minestom.server.chat.JsonMessage;
import net.minestom.server.entity.Player; import net.minestom.server.entity.Player;
import net.minestom.server.entity.type.decoration.EntityArmorStand; import net.minestom.server.entity.type.decoration.EntityArmorStand;

View File

@ -23,7 +23,7 @@ public class MooshroomMeta extends CowMeta {
public enum Variant { public enum Variant {
RED, RED,
BROWN; BROWN
} }
} }

View File

@ -1,7 +1,6 @@
package net.minestom.server.entity.metadata.minecart; package net.minestom.server.entity.metadata.minecart;
import net.kyori.adventure.text.Component; import net.kyori.adventure.text.Component;
import net.minestom.server.chat.ColoredText;
import net.minestom.server.chat.JsonMessage; import net.minestom.server.chat.JsonMessage;
import net.minestom.server.entity.Entity; import net.minestom.server.entity.Entity;
import net.minestom.server.entity.Metadata; import net.minestom.server.entity.Metadata;

View File

@ -2,7 +2,6 @@ package net.minestom.server.entity.type.animal;
import net.minestom.server.entity.EntityCreature; import net.minestom.server.entity.EntityCreature;
import net.minestom.server.entity.EntityType; import net.minestom.server.entity.EntityType;
import net.minestom.server.entity.Metadata;
import net.minestom.server.instance.Instance; import net.minestom.server.instance.Instance;
import net.minestom.server.utils.Position; import net.minestom.server.utils.Position;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;

View File

@ -13,7 +13,6 @@ import org.jetbrains.annotations.NotNull;
import java.util.Collection; import java.util.Collection;
import java.util.Map; import java.util.Map;
import java.util.Optional;
import java.util.concurrent.CopyOnWriteArraySet; import java.util.concurrent.CopyOnWriteArraySet;
import java.util.stream.Stream; import java.util.stream.Stream;
@ -52,7 +51,7 @@ public interface EventHandler extends IExtensionObserver {
if(extensionSource != null) { if(extensionSource != null) {
MinecraftServer.getExtensionManager().getExtension(extensionSource).observe(this); MinecraftServer.getExtensionManager().getExtension(extensionSource).observe(this);
getExtensionCallbacks(extensionSource).add(eventCallback); getExtensionCallbacks(extensionSource).add(eventCallback);
}; }
Collection<EventCallback> callbacks = getEventCallbacks(eventClass); Collection<EventCallback> callbacks = getEventCallbacks(eventClass);
return callbacks.add(eventCallback); return callbacks.add(eventCallback);
@ -71,7 +70,7 @@ public interface EventHandler extends IExtensionObserver {
String extensionSource = MinestomRootClassLoader.findExtensionObjectOwner(eventCallback); String extensionSource = MinestomRootClassLoader.findExtensionObjectOwner(eventCallback);
if(extensionSource != null) { if(extensionSource != null) {
getExtensionCallbacks(extensionSource).remove(eventCallback); getExtensionCallbacks(extensionSource).remove(eventCallback);
}; }
return callbacks.remove(eventCallback); return callbacks.remove(eventCallback);
} }

View File

@ -1,6 +1,5 @@
package net.minestom.server.event.player; package net.minestom.server.event.player;
import com.google.gson.stream.JsonReader;
import net.kyori.adventure.text.Component; import net.kyori.adventure.text.Component;
import net.minestom.server.chat.JsonMessage; import net.minestom.server.chat.JsonMessage;
import net.minestom.server.entity.Player; import net.minestom.server.entity.Player;

View File

@ -42,7 +42,7 @@ public class StairsPlacementRule extends BlockPlacementRule {
OUTER_LEFT, OUTER_LEFT,
OUTER_RIGHT, OUTER_RIGHT,
INNER_LEFT, INNER_LEFT,
INNER_RIGHT; INNER_RIGHT
} }
private enum Facing { private enum Facing {

View File

@ -10,8 +10,6 @@ import net.minestom.server.utils.clone.PublicCloneable;
import net.minestom.server.utils.validate.Check; import net.minestom.server.utils.validate.Check;
import org.jetbrains.annotations.NotNull; 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_COUNT;
import static net.minestom.server.instance.Chunk.CHUNK_SECTION_SIZE; import static net.minestom.server.instance.Chunk.CHUNK_SECTION_SIZE;

View File

@ -1,12 +1,8 @@
package net.minestom.server.item; package net.minestom.server.item;
import com.google.gson.JsonNull;
import com.google.gson.stream.JsonReader;
import net.kyori.adventure.text.Component; import net.kyori.adventure.text.Component;
import net.minestom.server.chat.JsonMessage; import net.minestom.server.chat.JsonMessage;
import java.util.stream.Stream;
public class ItemDisplay { public class ItemDisplay {
private Component displayName; private Component displayName;

View File

@ -1,6 +1,5 @@
package net.minestom.server.item.firework; package net.minestom.server.item.firework;
import net.kyori.adventure.text.format.TextColor;
import net.minestom.server.chat.ChatColor; import net.minestom.server.chat.ChatColor;
import net.minestom.server.color.Color; import net.minestom.server.color.Color;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;

View File

@ -1,10 +1,8 @@
package net.minestom.server.item.metadata; package net.minestom.server.item.metadata;
import net.kyori.adventure.text.format.TextColor;
import net.minestom.server.MinecraftServer; import net.minestom.server.MinecraftServer;
import net.minestom.server.chat.ChatColor; import net.minestom.server.chat.ChatColor;
import net.minestom.server.color.Color; 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.CloneUtils;
import net.minestom.server.utils.clone.PublicCloneable; import net.minestom.server.utils.clone.PublicCloneable;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;

View File

@ -1,6 +1,5 @@
package net.minestom.server.item.metadata; package net.minestom.server.item.metadata;
import net.kyori.adventure.text.format.TextColor;
import net.minestom.server.chat.ChatColor; import net.minestom.server.chat.ChatColor;
import net.minestom.server.color.Color; import net.minestom.server.color.Color;
import net.minestom.server.potion.CustomPotionEffect; import net.minestom.server.potion.CustomPotionEffect;

View File

@ -1,7 +1,6 @@
package net.minestom.server.listener; package net.minestom.server.listener;
import net.minestom.server.entity.Player; 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.PlayerItemAnimationEvent;
import net.minestom.server.event.player.PlayerPreEatEvent; import net.minestom.server.event.player.PlayerPreEatEvent;
import net.minestom.server.event.player.PlayerUseItemEvent; import net.minestom.server.event.player.PlayerUseItemEvent;

View File

@ -2,12 +2,10 @@ package net.minestom.server.network;
import io.netty.channel.Channel; import io.netty.channel.Channel;
import net.kyori.adventure.audience.Audience; import net.kyori.adventure.audience.Audience;
import net.kyori.adventure.audience.ForwardingAudience;
import net.kyori.adventure.text.Component; import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.format.NamedTextColor; import net.kyori.adventure.text.format.NamedTextColor;
import net.minestom.server.MinecraftServer; import net.minestom.server.MinecraftServer;
import net.minestom.server.adventure.audience.Audiences; import net.minestom.server.adventure.audience.Audiences;
import net.minestom.server.adventure.audience.PacketGroupingAudience;
import net.minestom.server.chat.JsonMessage; import net.minestom.server.chat.JsonMessage;
import net.minestom.server.entity.Player; import net.minestom.server.entity.Player;
import net.minestom.server.entity.fakeplayer.FakePlayer; import net.minestom.server.entity.fakeplayer.FakePlayer;

View File

@ -6,8 +6,6 @@ import net.minestom.server.utils.binary.Readable;
import net.minestom.server.utils.binary.Writeable; import net.minestom.server.utils.binary.Writeable;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import java.nio.CharBuffer;
/** /**
* Represents a packet which can be sent to a player using {@link PlayerConnection#sendPacket(ServerPacket)}. * Represents a packet which can be sent to a player using {@link PlayerConnection#sendPacket(ServerPacket)}.
*/ */

View File

@ -2,8 +2,6 @@ package net.minestom.server.network.packet.server.play;
import net.kyori.adventure.text.Component; import net.kyori.adventure.text.Component;
import net.minestom.server.advancements.FrameType; 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.item.ItemStack;
import net.minestom.server.network.packet.server.ComponentHoldingServerPacket; import net.minestom.server.network.packet.server.ComponentHoldingServerPacket;
import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.network.packet.server.ServerPacket;

View File

@ -37,7 +37,7 @@ public class BlockEntityDataPacket implements ServerPacket {
@Override @Override
public void read(@NotNull BinaryReader reader) { public void read(@NotNull BinaryReader reader) {
blockPosition = reader.readBlockPosition();; blockPosition = reader.readBlockPosition();
action = reader.readByte(); action = reader.readByte();
try { try {
NBT tag = reader.readTag(); NBT tag = reader.readTag();

View File

@ -24,7 +24,6 @@ import net.minestom.server.utils.chunk.ChunkUtils;
import net.minestom.server.world.biomes.Biome; import net.minestom.server.world.biomes.Biome;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import org.jglrxavpok.hephaistos.nbt.NBT;
import org.jglrxavpok.hephaistos.nbt.NBTCompound; import org.jglrxavpok.hephaistos.nbt.NBTCompound;
import org.jglrxavpok.hephaistos.nbt.NBTException; import org.jglrxavpok.hephaistos.nbt.NBTException;

View File

@ -8,8 +8,6 @@ import net.minestom.server.utils.binary.Readable;
import net.minestom.server.utils.binary.Writeable; import net.minestom.server.utils.binary.Writeable;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import java.util.function.Consumer;
public class DeclareCommandsPacket implements ServerPacket { public class DeclareCommandsPacket implements ServerPacket {
public Node[] nodes = new Node[0]; public Node[] nodes = new Node[0];

View File

@ -43,7 +43,7 @@ public class EntityMetaDataPacket implements ServerPacket {
break; break;
} }
entries.add(new Metadata.Entry<Object>(reader)); entries.add(new Metadata.Entry<>(reader));
} }
} }

View File

@ -4,7 +4,6 @@ import net.kyori.adventure.sound.Sound;
import net.minestom.server.adventure.AdventurePacketConvertor; import net.minestom.server.adventure.AdventurePacketConvertor;
import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.network.packet.server.ServerPacket;
import net.minestom.server.network.packet.server.ServerPacketIdentifier; 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.BinaryReader;
import net.minestom.server.utils.binary.BinaryWriter; import net.minestom.server.utils.binary.BinaryWriter;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;

View File

@ -17,7 +17,8 @@ public class MultiBlockChangePacket implements ServerPacket {
public boolean suppressLightUpdates = true; public boolean suppressLightUpdates = true;
public BlockChange[] blockChanges = new BlockChange[0]; public BlockChange[] blockChanges = new BlockChange[0];
public MultiBlockChangePacket() {} public MultiBlockChangePacket() {
}
@Override @Override
public void write(@NotNull BinaryWriter writer) { public void write(@NotNull BinaryWriter writer) {
@ -27,7 +28,7 @@ public class MultiBlockChangePacket implements ServerPacket {
final int length = blockChanges.length; final int length = blockChanges.length;
writer.writeVarInt(length); writer.writeVarInt(length);
for (final BlockChange blockChange : blockChanges) { 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 { } else {
writer.writeVarInt(0); writer.writeVarInt(0);

View File

@ -4,7 +4,6 @@ import net.kyori.adventure.sound.Sound.Source;
import net.minestom.server.adventure.AdventurePacketConvertor; import net.minestom.server.adventure.AdventurePacketConvertor;
import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.network.packet.server.ServerPacket;
import net.minestom.server.network.packet.server.ServerPacketIdentifier; 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.BinaryReader;
import net.minestom.server.utils.binary.BinaryWriter; import net.minestom.server.utils.binary.BinaryWriter;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;

View File

@ -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.ServerPacket;
import net.minestom.server.network.packet.server.ServerPacketIdentifier; import net.minestom.server.network.packet.server.ServerPacketIdentifier;
import net.minestom.server.utils.BlockPosition; 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.BinaryReader;
import net.minestom.server.utils.binary.BinaryWriter; import net.minestom.server.utils.binary.BinaryWriter;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;

View File

@ -6,8 +6,6 @@ import net.minestom.server.utils.binary.BinaryReader;
import net.minestom.server.utils.binary.BinaryWriter; import net.minestom.server.utils.binary.BinaryWriter;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import java.util.function.Consumer;
public class ParticlePacket implements ServerPacket { public class ParticlePacket implements ServerPacket {
public int particleId; public int particleId;

View File

@ -7,8 +7,6 @@ import net.minestom.server.utils.binary.BinaryReader;
import net.minestom.server.utils.binary.BinaryWriter; import net.minestom.server.utils.binary.BinaryWriter;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import java.io.IOException;
public class PluginMessagePacket implements ServerPacket { public class PluginMessagePacket implements ServerPacket {
public String channel = "none"; public String channel = "none";

View File

@ -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.ServerPacket;
import net.minestom.server.network.packet.server.ServerPacketIdentifier; 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.Position;
import net.minestom.server.utils.binary.BinaryReader; import net.minestom.server.utils.binary.BinaryReader;
import net.minestom.server.utils.binary.BinaryWriter; import net.minestom.server.utils.binary.BinaryWriter;

View File

@ -10,7 +10,6 @@ import net.minestom.server.utils.binary.BinaryReader;
import net.minestom.server.utils.binary.BinaryWriter; import net.minestom.server.utils.binary.BinaryWriter;
import net.minestom.server.utils.validate.Check; import net.minestom.server.utils.validate.Check;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.Collection; import java.util.Collection;
import java.util.Collections; import java.util.Collections;

View File

@ -11,7 +11,6 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.LinkedList;
import java.util.List; import java.util.List;
import java.util.UUID; import java.util.UUID;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;

View File

@ -1,7 +1,6 @@
package net.minestom.server.resourcepack; package net.minestom.server.resourcepack;
import net.minestom.server.entity.Player; import net.minestom.server.entity.Player;
import net.minestom.server.utils.validate.Check;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;

View File

@ -1,7 +1,5 @@
package net.minestom.server.scoreboard; 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.kyori.adventure.text.Component;
import net.minestom.server.Viewable; import net.minestom.server.Viewable;
import net.minestom.server.adventure.audience.PacketGroupingAudience; import net.minestom.server.adventure.audience.PacketGroupingAudience;

View File

@ -1,8 +1,6 @@
package net.minestom.server.scoreboard; package net.minestom.server.scoreboard;
import com.google.common.collect.MapMaker; 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.Component;
import net.kyori.adventure.text.format.NamedTextColor; import net.kyori.adventure.text.format.NamedTextColor;
import net.minestom.server.MinecraftServer; import net.minestom.server.MinecraftServer;

View File

@ -1,6 +1,5 @@
package net.minestom.server.sound; package net.minestom.server.sound;
import net.kyori.adventure.sound.Sound;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import static net.kyori.adventure.sound.Sound.*; import static net.kyori.adventure.sound.Sound.*;

View File

@ -1,6 +1,5 @@
package net.minestom.server.utils.location; package net.minestom.server.utils.location;
import net.minestom.server.entity.Entity;
import net.minestom.server.utils.BlockPosition; import net.minestom.server.utils.BlockPosition;
import net.minestom.server.utils.Position; import net.minestom.server.utils.Position;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;

View File

@ -1,6 +1,5 @@
package net.minestom.server.utils.location; package net.minestom.server.utils.location;
import net.minestom.server.entity.Entity;
import net.minestom.server.utils.Position; import net.minestom.server.utils.Position;
import net.minestom.server.utils.Vector; import net.minestom.server.utils.Vector;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;

View File

@ -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.ArgumentType;
import net.minestom.server.command.builder.arguments.minecraft.ArgumentEntity; import net.minestom.server.command.builder.arguments.minecraft.ArgumentEntity;
import net.minestom.server.entity.Entity; import net.minestom.server.entity.Entity;
import net.minestom.server.instance.Instance;
import net.minestom.server.utils.entity.EntityFinder; import net.minestom.server.utils.entity.EntityFinder;
import java.util.List; import java.util.List;

View File

@ -5,7 +5,6 @@ import net.minestom.server.MinecraftServer;
import net.minestom.server.command.CommandSender; import net.minestom.server.command.CommandSender;
import net.minestom.server.command.builder.Command; import net.minestom.server.command.builder.Command;
import net.minestom.server.command.builder.CommandContext; 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.ArgumentString;
import net.minestom.server.command.builder.arguments.ArgumentType; import net.minestom.server.command.builder.arguments.ArgumentType;
import net.minestom.server.command.builder.exception.ArgumentSyntaxException; import net.minestom.server.command.builder.exception.ArgumentSyntaxException;

View File

@ -4,7 +4,6 @@ import net.minestom.server.command.CommandSender;
import net.minestom.server.command.builder.Command; import net.minestom.server.command.builder.Command;
import net.minestom.server.command.builder.CommandContext; import net.minestom.server.command.builder.CommandContext;
import net.minestom.server.command.builder.arguments.ArgumentType; 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.minecraft.registry.ArgumentEntityType;
import net.minestom.server.command.builder.arguments.relative.ArgumentRelativeVec3; import net.minestom.server.command.builder.arguments.relative.ArgumentRelativeVec3;
import net.minestom.server.command.builder.condition.Conditions; import net.minestom.server.command.builder.condition.Conditions;

View File

@ -5,13 +5,11 @@ import net.minestom.server.MinecraftServer;
import net.minestom.server.command.CommandSender; import net.minestom.server.command.CommandSender;
import net.minestom.server.command.builder.Command; import net.minestom.server.command.builder.Command;
import net.minestom.server.command.builder.CommandContext; 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.ArgumentString;
import net.minestom.server.command.builder.arguments.ArgumentType; import net.minestom.server.command.builder.arguments.ArgumentType;
import net.minestom.server.command.builder.exception.ArgumentSyntaxException; import net.minestom.server.command.builder.exception.ArgumentSyntaxException;
import net.minestom.server.extensions.Extension; import net.minestom.server.extensions.Extension;
import net.minestom.server.extensions.ExtensionManager; import net.minestom.server.extensions.ExtensionManager;
import org.apache.commons.lang3.StringUtils;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;
import java.io.IOException; import java.io.IOException;

View File

@ -1,20 +1,9 @@
package improveextensions.unloadextensiononstop; package improveextensions.unloadextensiononstop;
import net.minestom.server.MinecraftServer; 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.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 net.minestom.server.utils.time.TimeUnit;
import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Assertions;
import org.opentest4j.AssertionFailedError;
import java.util.concurrent.atomic.AtomicBoolean;
public class UnloadExtensionOnStop extends Extension { public class UnloadExtensionOnStop extends Extension {

View File

@ -1,8 +1,6 @@
package testextension; package testextension;
import net.minestom.server.Bootstrap; import net.minestom.server.Bootstrap;
import org.spongepowered.asm.launch.MixinBootstrap;
import org.spongepowered.asm.mixin.Mixins;
// To launch with VM arguments: // To launch with VM arguments:
// -Dminestom.extension.indevfolder.classes=build/classes/java/test/ -Dminestom.extension.indevfolder.resources=build/resources/test/ // -Dminestom.extension.indevfolder.classes=build/classes/java/test/ -Dminestom.extension.indevfolder.resources=build/resources/test/

View File

@ -1,13 +1,9 @@
package testextension.mixins; package testextension.mixins;
import net.minestom.server.data.Data;
import net.minestom.server.instance.InstanceContainer; 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.Mixin;
import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.ModifyVariable;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
@Mixin(InstanceContainer.class) @Mixin(InstanceContainer.class)