diff --git a/sources/src/main/java/io/akarin/server/mixin/core/MixinMinecraftServer.java b/sources/src/main/java/io/akarin/server/mixin/core/MixinMinecraftServer.java index d08f8fe62..35c589e1f 100644 --- a/sources/src/main/java/io/akarin/server/mixin/core/MixinMinecraftServer.java +++ b/sources/src/main/java/io/akarin/server/mixin/core/MixinMinecraftServer.java @@ -28,7 +28,6 @@ import net.minecraft.server.BlockPosition; import net.minecraft.server.CrashReport; import net.minecraft.server.CustomFunctionData; import net.minecraft.server.ITickable; -import net.minecraft.server.MCUtil; import net.minecraft.server.MinecraftServer; import net.minecraft.server.MojangStatisticsGenerator; import net.minecraft.server.PlayerList; diff --git a/sources/src/main/java/io/akarin/server/mixin/realtime/MixinEntityPlayer.java b/sources/src/main/java/io/akarin/server/mixin/realtime/MixinEntityPlayer.java index 927cc5757..81999a088 100644 --- a/sources/src/main/java/io/akarin/server/mixin/realtime/MixinEntityPlayer.java +++ b/sources/src/main/java/io/akarin/server/mixin/realtime/MixinEntityPlayer.java @@ -34,7 +34,7 @@ import net.minecraft.server.Entity; import net.minecraft.server.EntityPlayer; import net.minecraft.server.World; -@Mixin(value = EntityPlayer.class, remap = false, priority = 1001) +@Mixin(value = EntityPlayer.class, remap = false) public abstract class MixinEntityPlayer extends Entity { private static final String ENTITY_PLAYER_MP_PORTAL_COOLDOWN_FIELD = "Lnet/minecraft/entity/player/EntityPlayer;portalCooldown:I"; diff --git a/sources/src/main/java/net/minecraft/server/Chunk.java b/sources/src/main/java/net/minecraft/server/Chunk.java index b7fb0bd89..5d243d212 100644 --- a/sources/src/main/java/net/minecraft/server/Chunk.java +++ b/sources/src/main/java/net/minecraft/server/Chunk.java @@ -2,7 +2,6 @@ package net.minecraft.server; import com.destroystokyo.paper.exception.ServerInternalException; import com.google.common.base.Predicate; -import com.google.common.collect.Maps; import com.google.common.collect.Queues; import java.util.Arrays; import java.util.Collection; diff --git a/sources/src/main/java/net/minecraft/server/EntityPlayer.java b/sources/src/main/java/net/minecraft/server/EntityPlayer.java index c9a4de550..4c5cf0cbf 100644 --- a/sources/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/sources/src/main/java/net/minecraft/server/EntityPlayer.java @@ -3,7 +3,6 @@ package net.minecraft.server; import com.google.common.collect.Lists; import com.mojang.authlib.GameProfile; -import io.akarin.api.internal.Akari; import io.netty.buffer.Unpooled; import java.util.ArrayDeque; // Paper import java.util.ArrayList; diff --git a/sources/src/main/java/net/minecraft/server/EntityTrackerEntry.java b/sources/src/main/java/net/minecraft/server/EntityTrackerEntry.java index 7b50e27b0..66a9c2625 100644 --- a/sources/src/main/java/net/minecraft/server/EntityTrackerEntry.java +++ b/sources/src/main/java/net/minecraft/server/EntityTrackerEntry.java @@ -1,6 +1,5 @@ package net.minecraft.server; -import com.google.common.collect.Sets; import java.util.Collection; import java.util.Collections; import java.util.Iterator; diff --git a/sources/src/main/java/net/minecraft/server/MinecraftServer.java b/sources/src/main/java/net/minecraft/server/MinecraftServer.java index 7feb41951..e9bf949cd 100644 --- a/sources/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/sources/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1,7 +1,6 @@ package net.minecraft.server; import com.google.common.collect.Lists; -import com.google.common.collect.Queues; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListenableFutureTask; @@ -23,11 +22,9 @@ import java.net.URLEncoder; import java.nio.charset.StandardCharsets; import java.security.KeyPair; import java.text.SimpleDateFormat; -import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; import java.util.Date; -import java.util.Iterator; import java.util.List; import java.util.Queue; import java.util.Random; @@ -35,7 +32,6 @@ import java.util.UUID; import java.util.concurrent.Callable; import java.util.concurrent.Executors; import java.util.concurrent.FutureTask; -import java.util.function.Supplier; import javax.annotation.Nullable; import javax.imageio.ImageIO; import org.apache.commons.lang3.Validate; @@ -43,9 +39,6 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; // CraftBukkit start import joptsimple.OptionSet; -import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.CraftServer; -import org.bukkit.craftbukkit.Main; // CraftBukkit end import org.spigotmc.SlackActivityAccountant; // Spigot import co.aikar.timings.MinecraftTimings; // Paper