From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Bud Gidiere Date: Sat, 8 Aug 2020 18:07:00 -0500 Subject: [PATCH] IntellaJ Optimize Imports Do not try to update this. Just rebuild it. diff --git a/src/main/java/app/akarin/server/Config.java b/src/main/java/app/akarin/server/Config.java index 358ac3361c814b7cf5f9650a6a49c6efce7dd56a..90408487112519791540f9d7968e7e0b1f541472 100644 --- a/src/main/java/app/akarin/server/Config.java +++ b/src/main/java/app/akarin/server/Config.java @@ -1,15 +1,13 @@ package app.akarin.server; +import dev.tr7zw.yatopia.YatopiaConfig; import org.bukkit.Bukkit; import org.bukkit.configuration.ConfigurationSection; import org.bukkit.configuration.file.YamlConfiguration; -import dev.tr7zw.yatopia.YatopiaConfig; - import java.io.File; import java.lang.reflect.Method; import java.lang.reflect.Modifier; -import java.util.List; import java.util.logging.Level; public final class Config { diff --git a/src/main/java/co/aikar/timings/MinecraftTimings.java b/src/main/java/co/aikar/timings/MinecraftTimings.java index 85b25eace786fa0d7694afa405f9d2bdf4937b6e..6c65b2fddf70d51735ecf7fab4548f4279e13a5d 100644 --- a/src/main/java/co/aikar/timings/MinecraftTimings.java +++ b/src/main/java/co/aikar/timings/MinecraftTimings.java @@ -2,11 +2,10 @@ package co.aikar.timings; import com.google.common.collect.MapMaker; import net.minecraft.server.*; +import org.bukkit.craftbukkit.scheduler.CraftTask; import org.bukkit.plugin.Plugin; import org.bukkit.scheduler.BukkitTask; -import org.bukkit.craftbukkit.scheduler.CraftTask; - import java.util.Map; // TODO: Re-implement missing timers diff --git a/src/main/java/co/aikar/timings/TimingsExport.java b/src/main/java/co/aikar/timings/TimingsExport.java index 6a110318441a16cc3ff7dfa2364768279b16358f..25418d5de822c5ce31380c1b8ae0fb43883e0ac6 100644 --- a/src/main/java/co/aikar/timings/TimingsExport.java +++ b/src/main/java/co/aikar/timings/TimingsExport.java @@ -53,12 +53,7 @@ import java.util.logging.Level; import java.util.zip.GZIPOutputStream; import static co.aikar.timings.TimingsManager.HISTORY; -import static co.aikar.util.JSONUtil.appendObjectData; -import static co.aikar.util.JSONUtil.createObject; -import static co.aikar.util.JSONUtil.pair; -import static co.aikar.util.JSONUtil.toArray; -import static co.aikar.util.JSONUtil.toArrayMapper; -import static co.aikar.util.JSONUtil.toObjectMapper; +import static co.aikar.util.JSONUtil.*; @SuppressWarnings({"rawtypes", "SuppressionAnnotation"}) public class TimingsExport extends Thread { diff --git a/src/main/java/com/destroystokyo/paper/PaperCommand.java b/src/main/java/com/destroystokyo/paper/PaperCommand.java index 98a898f8b8469969e5eb388edb818e519ff68681..27c863ea9d6a91ef7298da5fbd85135b66ff4e73 100644 --- a/src/main/java/com/destroystokyo/paper/PaperCommand.java +++ b/src/main/java/com/destroystokyo/paper/PaperCommand.java @@ -1,7 +1,7 @@ package com.destroystokyo.paper; -import com.destroystokyo.paper.io.chunk.ChunkTaskManager; import com.destroystokyo.paper.io.SyncLoadFinder; +import com.destroystokyo.paper.io.chunk.ChunkTaskManager; import com.google.common.base.Functions; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; @@ -32,7 +32,6 @@ import java.io.StringWriter; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; import java.util.*; -import java.util.stream.Collectors; public class PaperCommand extends Command { diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java index 1febe2aff4eab2f15e9bc4b21e6d0c350f122c87..fd1e9518ff6555a347b3d14eb510d7be896c9f94 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -1,8 +1,20 @@ package com.destroystokyo.paper; +import co.aikar.timings.Timings; +import co.aikar.timings.TimingsManager; import com.destroystokyo.paper.io.chunk.ChunkTaskManager; import com.google.common.base.Strings; import com.google.common.base.Throwables; +import com.google.common.collect.Lists; +import net.minecraft.server.MinecraftServer; +import org.bukkit.Bukkit; +import org.bukkit.ChatColor; +import org.bukkit.command.Command; +import org.bukkit.configuration.ConfigurationSection; +import org.bukkit.configuration.InvalidConfigurationException; +import org.bukkit.configuration.file.YamlConfiguration; +import org.spigotmc.SpigotConfig; +import org.spigotmc.WatchdogThread; import java.io.File; import java.io.IOException; @@ -17,19 +29,6 @@ import java.util.concurrent.TimeUnit; import java.util.logging.Level; import java.util.regex.Pattern; -import com.google.common.collect.Lists; -import net.minecraft.server.MinecraftServer; -import org.bukkit.Bukkit; -import org.bukkit.ChatColor; -import org.bukkit.command.Command; -import org.bukkit.configuration.ConfigurationSection; -import org.bukkit.configuration.InvalidConfigurationException; -import org.bukkit.configuration.file.YamlConfiguration; -import co.aikar.timings.Timings; -import co.aikar.timings.TimingsManager; -import org.spigotmc.SpigotConfig; -import org.spigotmc.WatchdogThread; - public class PaperConfig { private static File CONFIG_FILE; diff --git a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java index 60d6469b8115f57a0b117aaef56c8192b7621104..1a0cfc3b768f0b7ccd6b73c1759764ef960a8135 100644 --- a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java +++ b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java @@ -3,11 +3,15 @@ package com.destroystokyo.paper; import com.destroystokyo.paper.util.VersionFetcher; import com.google.common.base.Charsets; import com.google.common.io.Resources; -import com.google.gson.*; +import com.google.gson.Gson; +import com.google.gson.JsonObject; +import com.google.gson.JsonSyntaxException; import javax.annotation.Nonnull; import javax.annotation.Nullable; -import java.io.*; +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStreamReader; import java.net.HttpURLConnection; import java.net.URL; diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java index c2d5f7d22beb4c4829dfcb55fa842eaf727e906c..b8f3e91d17d2e260401f3a06ef0fb7327d42f059 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -1,11 +1,5 @@ package com.destroystokyo.paper; -import java.util.Arrays; -import java.util.EnumMap; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - import com.destroystokyo.paper.antixray.ChunkPacketBlockControllerAntiXray.EngineMode; import org.bukkit.Bukkit; import org.bukkit.Material; @@ -13,6 +7,8 @@ import org.bukkit.configuration.ConfigurationSection; import org.bukkit.configuration.file.YamlConfiguration; import org.spigotmc.SpigotWorldConfig; +import java.util.*; + import static com.destroystokyo.paper.PaperConfig.log; import static com.destroystokyo.paper.PaperConfig.logError; diff --git a/src/main/java/com/destroystokyo/paper/ServerSchedulerReportingWrapper.java b/src/main/java/com/destroystokyo/paper/ServerSchedulerReportingWrapper.java index f699ce18ca044f813e194ef2786b7ea853ea86e7..033c1339ad70de046c54b2efc1736f8783c147c2 100644 --- a/src/main/java/com/destroystokyo/paper/ServerSchedulerReportingWrapper.java +++ b/src/main/java/com/destroystokyo/paper/ServerSchedulerReportingWrapper.java @@ -1,9 +1,9 @@ package com.destroystokyo.paper; -import com.google.common.base.Preconditions; -import org.bukkit.craftbukkit.scheduler.CraftTask; import com.destroystokyo.paper.event.server.ServerExceptionEvent; import com.destroystokyo.paper.exception.ServerSchedulerException; +import com.google.common.base.Preconditions; +import org.bukkit.craftbukkit.scheduler.CraftTask; /** * Reporting wrapper to catch exceptions not natively diff --git a/src/main/java/com/destroystokyo/paper/VersionHistoryManager.java b/src/main/java/com/destroystokyo/paper/VersionHistoryManager.java index aac3f66cb23d260729c2a48d8710a9de2346aa22..0a2520e4372baa98b91398a1818fccafbe006746 100644 --- a/src/main/java/com/destroystokyo/paper/VersionHistoryManager.java +++ b/src/main/java/com/destroystokyo/paper/VersionHistoryManager.java @@ -3,6 +3,10 @@ package com.destroystokyo.paper; import com.google.common.base.MoreObjects; import com.google.gson.Gson; import com.google.gson.JsonSyntaxException; +import org.bukkit.Bukkit; + +import javax.annotation.Nonnull; +import javax.annotation.Nullable; import java.io.BufferedReader; import java.io.BufferedWriter; import java.io.IOException; @@ -14,10 +18,6 @@ import java.nio.file.StandardOpenOption; import java.util.Objects; import java.util.logging.Level; import java.util.logging.Logger; -import org.bukkit.Bukkit; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; public enum VersionHistoryManager { INSTANCE; diff --git a/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketBlockController.java b/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketBlockController.java index df7e4183d8842f5be8ae9d0698f8fa90742ff43c..87483f14d546d3557b3add5fde30672eab0690c2 100644 --- a/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketBlockController.java +++ b/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketBlockController.java @@ -1,14 +1,6 @@ package com.destroystokyo.paper.antixray; -import net.minecraft.server.BlockPosition; -import net.minecraft.server.Chunk; -import net.minecraft.server.ChunkSection; -import net.minecraft.server.EnumDirection; -import net.minecraft.server.IBlockData; -import net.minecraft.server.IChunkAccess; -import net.minecraft.server.PacketPlayOutMapChunk; -import net.minecraft.server.PlayerInteractManager; -import net.minecraft.server.World; +import net.minecraft.server.*; public class ChunkPacketBlockController { diff --git a/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketBlockControllerAntiXray.java b/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketBlockControllerAntiXray.java index c0d7767adb996edf9f645be591e4eee1d1dddf97..604c3811ee915f1624e7098cccead7b9f703aa78 100644 --- a/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketBlockControllerAntiXray.java +++ b/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketBlockControllerAntiXray.java @@ -1,17 +1,16 @@ package com.destroystokyo.paper.antixray; +import com.destroystokyo.paper.PaperWorldConfig; +import net.minecraft.server.*; +import org.bukkit.Bukkit; +import org.bukkit.World.Environment; + import java.util.ArrayList; import java.util.HashSet; import java.util.List; import java.util.Set; import java.util.concurrent.Executor; -import net.minecraft.server.*; -import org.bukkit.Bukkit; -import org.bukkit.World.Environment; - -import com.destroystokyo.paper.PaperWorldConfig; - public final class ChunkPacketBlockControllerAntiXray extends ChunkPacketBlockController { private final Executor executor; diff --git a/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java b/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java index 7b12014db0abd9c4b89f58ceaaa7d9dd032b027a..6e72904dfd1ead41ddfaf81abfe589216d9dddeb 100644 --- a/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java +++ b/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java @@ -1,24 +1,15 @@ package com.destroystokyo.paper.entity.ai; -import com.google.common.collect.BiMap; -import com.google.common.collect.HashBiMap; - import com.destroystokyo.paper.entity.RangedEntity; -import com.destroystokyo.paper.entity.ai.GoalKey; -import com.destroystokyo.paper.entity.ai.GoalType; import com.destroystokyo.paper.util.set.OptimizedSmallEnumSet; - -import net.minecraft.server.*; // intentional star import +import com.google.common.collect.BiMap; +import com.google.common.collect.HashBiMap; +import net.minecraft.server.*; +import org.bukkit.NamespacedKey; +import org.bukkit.entity.*; import java.lang.reflect.Constructor; -import java.util.EnumSet; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Map; -import java.util.Set; - -import org.bukkit.NamespacedKey; -import org.bukkit.entity.*; // intentional star import +import java.util.*; public class MobGoalHelper { diff --git a/src/main/java/com/destroystokyo/paper/entity/ai/PaperCustomGoal.java b/src/main/java/com/destroystokyo/paper/entity/ai/PaperCustomGoal.java index 5720feaaf92fc8b6a70e7f6e2d25163c42d231c1..ab9103b239cd79c05a697ca50104412b7f266115 100644 --- a/src/main/java/com/destroystokyo/paper/entity/ai/PaperCustomGoal.java +++ b/src/main/java/com/destroystokyo/paper/entity/ai/PaperCustomGoal.java @@ -1,7 +1,6 @@ package com.destroystokyo.paper.entity.ai; import net.minecraft.server.PathfinderGoal; - import org.bukkit.entity.Mob; /** diff --git a/src/main/java/com/destroystokyo/paper/entity/ai/PaperMobGoals.java b/src/main/java/com/destroystokyo/paper/entity/ai/PaperMobGoals.java index 45b383f4d118d076e41c42b5b158b2a3713341a8..5d04c63384729b697e5f72aa0bd69c5237595504 100644 --- a/src/main/java/com/destroystokyo/paper/entity/ai/PaperMobGoals.java +++ b/src/main/java/com/destroystokyo/paper/entity/ai/PaperMobGoals.java @@ -3,19 +3,11 @@ package com.destroystokyo.paper.entity.ai; import net.minecraft.server.PathfinderGoal; import net.minecraft.server.PathfinderGoalSelector; import net.minecraft.server.PathfinderGoalWrapped; - -import java.util.Collection; -import java.util.EnumSet; -import java.util.HashMap; -import java.util.HashSet; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Set; - import org.bukkit.craftbukkit.entity.CraftMob; import org.bukkit.entity.Mob; +import java.util.*; + public class PaperMobGoals implements MobGoals { private final Map> instanceCache = new HashMap<>(); diff --git a/src/main/java/com/destroystokyo/paper/entity/ai/PaperVanillaGoal.java b/src/main/java/com/destroystokyo/paper/entity/ai/PaperVanillaGoal.java index 2988e3d1b37d73b6d1ef514acd237e88a5cc079e..57ed9276dea3ff001e864ef467733ea7e63fbea3 100644 --- a/src/main/java/com/destroystokyo/paper/entity/ai/PaperVanillaGoal.java +++ b/src/main/java/com/destroystokyo/paper/entity/ai/PaperVanillaGoal.java @@ -1,11 +1,10 @@ package com.destroystokyo.paper.entity.ai; import net.minecraft.server.PathfinderGoal; +import org.bukkit.entity.Mob; import java.util.EnumSet; -import org.bukkit.entity.Mob; - /** * Wraps vanilla in api */ diff --git a/src/main/java/com/destroystokyo/paper/gui/GraphColor.java b/src/main/java/com/destroystokyo/paper/gui/GraphColor.java index a4e641fdcccd3efcd1a2865dc6dc28d50671b995..b91edf034a0efe3659b104180cf3f20c64142df7 100644 --- a/src/main/java/com/destroystokyo/paper/gui/GraphColor.java +++ b/src/main/java/com/destroystokyo/paper/gui/GraphColor.java @@ -1,6 +1,6 @@ package com.destroystokyo.paper.gui; -import java.awt.Color; +import java.awt.*; public class GraphColor { private static final Color[] colorLine = new Color[101]; diff --git a/src/main/java/com/destroystokyo/paper/gui/GraphData.java b/src/main/java/com/destroystokyo/paper/gui/GraphData.java index 186fc722965e403f76b1480e1c2381fc34e29049..3ec7a1ac40aee54854a662540ecb5726c5773acc 100644 --- a/src/main/java/com/destroystokyo/paper/gui/GraphData.java +++ b/src/main/java/com/destroystokyo/paper/gui/GraphData.java @@ -1,6 +1,6 @@ package com.destroystokyo.paper.gui; -import java.awt.Color; +import java.awt.*; public class GraphData { private long total; diff --git a/src/main/java/com/destroystokyo/paper/gui/GuiStatsComponent.java b/src/main/java/com/destroystokyo/paper/gui/GuiStatsComponent.java index 0f29ad583e798c09b2fe3f568ed50cbc719e40e2..4c8c46f59d48f7658a344c4f53c64eb4a2effd87 100644 --- a/src/main/java/com/destroystokyo/paper/gui/GuiStatsComponent.java +++ b/src/main/java/com/destroystokyo/paper/gui/GuiStatsComponent.java @@ -2,10 +2,8 @@ package com.destroystokyo.paper.gui; import net.minecraft.server.MinecraftServer; -import javax.swing.JPanel; -import javax.swing.Timer; -import java.awt.BorderLayout; -import java.awt.Dimension; +import javax.swing.*; +import java.awt.*; public class GuiStatsComponent extends JPanel { private final Timer timer; diff --git a/src/main/java/com/destroystokyo/paper/gui/RAMDetails.java b/src/main/java/com/destroystokyo/paper/gui/RAMDetails.java index e463a86a6ad6c4f2885f4df159411bad294e1208..689330cc46cc83ff4500334e7d8108ec85bf4a86 100644 --- a/src/main/java/com/destroystokyo/paper/gui/RAMDetails.java +++ b/src/main/java/com/destroystokyo/paper/gui/RAMDetails.java @@ -2,13 +2,10 @@ package com.destroystokyo.paper.gui; import net.minecraft.server.MinecraftServer; import net.minecraft.server.SystemUtils; -import org.bukkit.Bukkit; -import javax.swing.DefaultListCellRenderer; -import javax.swing.DefaultListSelectionModel; -import javax.swing.JList; +import javax.swing.*; import javax.swing.border.EmptyBorder; -import java.awt.Dimension; +import java.awt.*; import java.text.DecimalFormat; import java.text.DecimalFormatSymbols; import java.util.Locale; diff --git a/src/main/java/com/destroystokyo/paper/gui/RAMGraph.java b/src/main/java/com/destroystokyo/paper/gui/RAMGraph.java index c3e54da4ab6440811aab2f9dd1e218802ac13285..9461f95941957f7956e939aa3c8a68d8f9e12d77 100644 --- a/src/main/java/com/destroystokyo/paper/gui/RAMGraph.java +++ b/src/main/java/com/destroystokyo/paper/gui/RAMGraph.java @@ -1,15 +1,7 @@ package com.destroystokyo.paper.gui; -import javax.swing.JComponent; -import javax.swing.SwingUtilities; -import javax.swing.Timer; -import javax.swing.ToolTipManager; -import java.awt.Color; -import java.awt.Dimension; -import java.awt.Graphics; -import java.awt.MouseInfo; -import java.awt.Point; -import java.awt.PointerInfo; +import javax.swing.*; +import java.awt.*; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.text.SimpleDateFormat; diff --git a/src/main/java/com/destroystokyo/paper/io/PaperFileIOThread.java b/src/main/java/com/destroystokyo/paper/io/PaperFileIOThread.java index 1917d7be7dfddc93c95b9fd864cf13f9a24c8f96..6962d0874d2b91ccec06f27acc2e99c822a86ac8 100644 --- a/src/main/java/com/destroystokyo/paper/io/PaperFileIOThread.java +++ b/src/main/java/com/destroystokyo/paper/io/PaperFileIOThread.java @@ -1,10 +1,6 @@ package com.destroystokyo.paper.io; -import net.minecraft.server.ChunkCoordIntPair; -import net.minecraft.server.MinecraftServer; -import net.minecraft.server.NBTTagCompound; -import net.minecraft.server.RegionFile; -import net.minecraft.server.WorldServer; +import net.minecraft.server.*; import org.apache.logging.log4j.Logger; import java.io.IOException; diff --git a/src/main/java/com/destroystokyo/paper/io/SyncLoadFinder.java b/src/main/java/com/destroystokyo/paper/io/SyncLoadFinder.java index 6ccaf3491923f3092819f71c362045bba4952093..f4288b0ae09ca3a8bc8412093a73d01937ddb544 100644 --- a/src/main/java/com/destroystokyo/paper/io/SyncLoadFinder.java +++ b/src/main/java/com/destroystokyo/paper/io/SyncLoadFinder.java @@ -5,7 +5,6 @@ import com.google.gson.JsonObject; import com.mojang.datafixers.util.Pair; import it.unimi.dsi.fastutil.longs.Long2IntMap; import it.unimi.dsi.fastutil.longs.Long2IntOpenHashMap; -import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap; import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap; import net.minecraft.server.World; diff --git a/src/main/java/com/destroystokyo/paper/io/chunk/ChunkLoadTask.java b/src/main/java/com/destroystokyo/paper/io/chunk/ChunkLoadTask.java index 6367092663a213793367ccb65733afc119e4883c..7d697662b7777bfb200c0efb3f69b9c9cbc2b022 100644 --- a/src/main/java/com/destroystokyo/paper/io/chunk/ChunkLoadTask.java +++ b/src/main/java/com/destroystokyo/paper/io/chunk/ChunkLoadTask.java @@ -1,8 +1,8 @@ package com.destroystokyo.paper.io.chunk; import co.aikar.timings.Timing; -import com.destroystokyo.paper.io.PaperFileIOThread; import com.destroystokyo.paper.io.IOUtil; +import com.destroystokyo.paper.io.PaperFileIOThread; import net.minecraft.server.ChunkCoordIntPair; import net.minecraft.server.ChunkRegionLoader; import net.minecraft.server.PlayerChunkMap; diff --git a/src/main/java/com/destroystokyo/paper/io/chunk/ChunkSaveTask.java b/src/main/java/com/destroystokyo/paper/io/chunk/ChunkSaveTask.java index 60312b85f9e7070378458f29afee0ebb7850d8a5..df83cd02ed3c47754063af86b2a214709b0373d0 100644 --- a/src/main/java/com/destroystokyo/paper/io/chunk/ChunkSaveTask.java +++ b/src/main/java/com/destroystokyo/paper/io/chunk/ChunkSaveTask.java @@ -1,11 +1,10 @@ package com.destroystokyo.paper.io.chunk; import co.aikar.timings.Timing; -import com.destroystokyo.paper.io.PaperFileIOThread; import com.destroystokyo.paper.io.IOUtil; +import com.destroystokyo.paper.io.PaperFileIOThread; import com.destroystokyo.paper.io.PrioritizedTaskQueue; import net.minecraft.server.ChunkRegionLoader; -import net.minecraft.server.IAsyncTaskHandler; import net.minecraft.server.IChunkAccess; import net.minecraft.server.NBTTagCompound; import net.minecraft.server.WorldServer; diff --git a/src/main/java/com/destroystokyo/paper/io/chunk/ChunkTaskManager.java b/src/main/java/com/destroystokyo/paper/io/chunk/ChunkTaskManager.java index bcb7ce2692c5bc1a6214c3a384949666107864fb..815b630a01c91af0cb7738a0c4f9bb0604d94ecc 100644 --- a/src/main/java/com/destroystokyo/paper/io/chunk/ChunkTaskManager.java +++ b/src/main/java/com/destroystokyo/paper/io/chunk/ChunkTaskManager.java @@ -1,19 +1,10 @@ package com.destroystokyo.paper.io.chunk; -import com.destroystokyo.paper.io.PaperFileIOThread; import com.destroystokyo.paper.io.IOUtil; +import com.destroystokyo.paper.io.PaperFileIOThread; import com.destroystokyo.paper.io.PrioritizedTaskQueue; import com.destroystokyo.paper.io.QueueExecutorThread; -import it.unimi.dsi.fastutil.longs.Long2ObjectMap; -import net.minecraft.server.ChunkCoordIntPair; -import net.minecraft.server.ChunkRegionLoader; -import net.minecraft.server.ChunkStatus; -import net.minecraft.server.IAsyncTaskHandler; -import net.minecraft.server.IChunkAccess; -import net.minecraft.server.MinecraftServer; -import net.minecraft.server.NBTTagCompound; -import net.minecraft.server.PlayerChunk; -import net.minecraft.server.WorldServer; +import net.minecraft.server.*; import org.apache.commons.lang.StringUtils; import org.apache.logging.log4j.Level; import org.bukkit.Bukkit; diff --git a/src/main/java/com/destroystokyo/paper/loottable/PaperLootableInventoryData.java b/src/main/java/com/destroystokyo/paper/loottable/PaperLootableInventoryData.java index b5401eaf974857455c17c3f9cfdedf2eb4bde321..faa835b79d4e668b973ccc2a543d7928f8db93ab 100644 --- a/src/main/java/com/destroystokyo/paper/loottable/PaperLootableInventoryData.java +++ b/src/main/java/com/destroystokyo/paper/loottable/PaperLootableInventoryData.java @@ -1,7 +1,9 @@ package com.destroystokyo.paper.loottable; import com.destroystokyo.paper.PaperWorldConfig; -import net.minecraft.server.*; +import net.minecraft.server.EntityHuman; +import net.minecraft.server.NBTTagCompound; +import net.minecraft.server.NBTTagList; import org.bukkit.entity.Player; import org.bukkit.loot.LootTable; diff --git a/src/main/java/com/destroystokyo/paper/loottable/PaperMinecartLootableInventory.java b/src/main/java/com/destroystokyo/paper/loottable/PaperMinecartLootableInventory.java index 8c1fa60a55570be91ab5ea63cb2005caa09e3600..2d7cd434374c904e6621110d617da5655002118a 100644 --- a/src/main/java/com/destroystokyo/paper/loottable/PaperMinecartLootableInventory.java +++ b/src/main/java/com/destroystokyo/paper/loottable/PaperMinecartLootableInventory.java @@ -2,7 +2,6 @@ package com.destroystokyo.paper.loottable; import net.minecraft.server.Entity; import net.minecraft.server.EntityMinecartContainer; -import net.minecraft.server.MinecraftKey; import net.minecraft.server.World; import org.bukkit.Bukkit; import org.bukkit.craftbukkit.util.CraftNamespacedKey; diff --git a/src/main/java/com/destroystokyo/paper/loottable/PaperTileEntityLootableInventory.java b/src/main/java/com/destroystokyo/paper/loottable/PaperTileEntityLootableInventory.java index a1923aff2b5e2e867670a5a064a767915fc1cc2a..f75042e7b7a00bd4da3c56c4ddf65d27fac2c119 100644 --- a/src/main/java/com/destroystokyo/paper/loottable/PaperTileEntityLootableInventory.java +++ b/src/main/java/com/destroystokyo/paper/loottable/PaperTileEntityLootableInventory.java @@ -1,7 +1,6 @@ package com.destroystokyo.paper.loottable; import net.minecraft.server.MCUtil; -import net.minecraft.server.MinecraftKey; import net.minecraft.server.TileEntityLootable; import net.minecraft.server.World; import org.bukkit.Bukkit; diff --git a/src/main/java/com/destroystokyo/paper/network/PaperLegacyStatusClient.java b/src/main/java/com/destroystokyo/paper/network/PaperLegacyStatusClient.java index 74c012fd40491f1d870fbc1aa8c318a2197eb106..4306de5611c488fa7ac7f3ed5a68afcb628f60d8 100644 --- a/src/main/java/com/destroystokyo/paper/network/PaperLegacyStatusClient.java +++ b/src/main/java/com/destroystokyo/paper/network/PaperLegacyStatusClient.java @@ -5,9 +5,8 @@ import net.minecraft.server.MinecraftServer; import org.apache.commons.lang3.StringUtils; import org.bukkit.ChatColor; -import java.net.InetSocketAddress; - import javax.annotation.Nullable; +import java.net.InetSocketAddress; public final class PaperLegacyStatusClient implements StatusClient { diff --git a/src/main/java/com/destroystokyo/paper/network/PaperNetworkClient.java b/src/main/java/com/destroystokyo/paper/network/PaperNetworkClient.java index 5caca6439d2135e34880d501397fe2ea197d7249..2295f22d78971147443e8a7b8ecee64dfc7eb937 100644 --- a/src/main/java/com/destroystokyo/paper/network/PaperNetworkClient.java +++ b/src/main/java/com/destroystokyo/paper/network/PaperNetworkClient.java @@ -2,9 +2,8 @@ package com.destroystokyo.paper.network; import net.minecraft.server.NetworkManager; -import java.net.InetSocketAddress; - import javax.annotation.Nullable; +import java.net.InetSocketAddress; public class PaperNetworkClient implements NetworkClient { diff --git a/src/main/java/com/destroystokyo/paper/network/StandardPaperServerListPingEventImpl.java b/src/main/java/com/destroystokyo/paper/network/StandardPaperServerListPingEventImpl.java index 26ddf92f86fccc2b2562f7abf4788d1ed6b73205..dfec5882598f09492e9a17de25774a4c6c04da7a 100644 --- a/src/main/java/com/destroystokyo/paper/network/StandardPaperServerListPingEventImpl.java +++ b/src/main/java/com/destroystokyo/paper/network/StandardPaperServerListPingEventImpl.java @@ -11,11 +11,10 @@ import net.minecraft.server.PacketStatusOutServerInfo; import net.minecraft.server.ServerPing; import org.bukkit.craftbukkit.util.CraftChatMessage; +import javax.annotation.Nonnull; import java.util.List; import java.util.UUID; -import javax.annotation.Nonnull; - public final class StandardPaperServerListPingEventImpl extends PaperServerListPingEventImpl { private static final GameProfile[] EMPTY_PROFILES = new GameProfile[0]; diff --git a/src/main/java/com/destroystokyo/paper/profile/CraftPlayerProfile.java b/src/main/java/com/destroystokyo/paper/profile/CraftPlayerProfile.java index 0c5f2a010f30eb32bea273d7e65b0741016480e5..1152644a390decd48395f6b2e60887aafaf66ac4 100644 --- a/src/main/java/com/destroystokyo/paper/profile/CraftPlayerProfile.java +++ b/src/main/java/com/destroystokyo/paper/profile/CraftPlayerProfile.java @@ -5,24 +5,17 @@ import com.google.common.base.Charsets; import com.mojang.authlib.GameProfile; import com.mojang.authlib.properties.Property; import com.mojang.authlib.properties.PropertyMap; - import dev.tr7zw.yatopia.events.GameProfileLookupEvent; import net.minecraft.server.MinecraftServer; import net.minecraft.server.UserCache; import org.apache.commons.lang3.Validate; - import org.bukkit.Bukkit; import org.bukkit.craftbukkit.entity.CraftPlayer; import org.spigotmc.SpigotConfig; import javax.annotation.Nonnull; import javax.annotation.Nullable; -import java.util.AbstractSet; -import java.util.Collection; -import java.util.Iterator; -import java.util.Objects; -import java.util.Set; -import java.util.UUID; +import java.util.*; public class CraftPlayerProfile implements PlayerProfile { diff --git a/src/main/java/com/destroystokyo/paper/profile/PaperMinecraftSessionService.java b/src/main/java/com/destroystokyo/paper/profile/PaperMinecraftSessionService.java index 5c7d2ee19243d0911a3a00af3ae42078a2ccba94..f3c8fc22bd1bfce1d40608de17dafc854c907171 100644 --- a/src/main/java/com/destroystokyo/paper/profile/PaperMinecraftSessionService.java +++ b/src/main/java/com/destroystokyo/paper/profile/PaperMinecraftSessionService.java @@ -1,8 +1,8 @@ package com.destroystokyo.paper.profile; -import com.mojang.authlib.Environment; import com.destroystokyo.paper.event.profile.FillProfileEvent; import com.destroystokyo.paper.event.profile.PreFillProfileEvent; +import com.mojang.authlib.Environment; import com.mojang.authlib.GameProfile; import com.mojang.authlib.minecraft.MinecraftProfileTexture; import com.mojang.authlib.yggdrasil.YggdrasilAuthenticationService; diff --git a/src/main/java/com/destroystokyo/paper/proxy/VelocityProxy.java b/src/main/java/com/destroystokyo/paper/proxy/VelocityProxy.java index fdd8708f974700c7cde6e436c2f189d94d336f1f..2f6d79f8ce9e3392b98286b9568bcda4bc7d88aa 100644 --- a/src/main/java/com/destroystokyo/paper/proxy/VelocityProxy.java +++ b/src/main/java/com/destroystokyo/paper/proxy/VelocityProxy.java @@ -7,14 +7,13 @@ import com.mojang.authlib.properties.Property; import net.minecraft.server.MinecraftKey; import net.minecraft.server.PacketDataSerializer; +import javax.crypto.Mac; +import javax.crypto.spec.SecretKeySpec; import java.net.InetAddress; import java.security.InvalidKeyException; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; -import javax.crypto.Mac; -import javax.crypto.spec.SecretKeySpec; - public class VelocityProxy { private static final int SUPPORTED_FORWARDING_VERSION = 1; public static final MinecraftKey PLAYER_INFO_CHANNEL = new MinecraftKey("velocity", "player_info"); diff --git a/src/main/java/com/destroystokyo/paper/server/ticklist/PaperTickList.java b/src/main/java/com/destroystokyo/paper/server/ticklist/PaperTickList.java index 253b73cfc597d4c7106d969be7b18c68166128ae..62403feec70ca2aedcd0928bd22b8d05d08b2d7e 100644 --- a/src/main/java/com/destroystokyo/paper/server/ticklist/PaperTickList.java +++ b/src/main/java/com/destroystokyo/paper/server/ticklist/PaperTickList.java @@ -1,30 +1,11 @@ package com.destroystokyo.paper.server.ticklist; -import net.minecraft.server.MCUtil; -import net.minecraft.server.MinecraftServer; import it.unimi.dsi.fastutil.longs.Long2ObjectMap; import it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap; import it.unimi.dsi.fastutil.objects.ObjectRBTreeSet; -import net.minecraft.server.BlockPosition; -import net.minecraft.server.ChunkCoordIntPair; -import net.minecraft.server.ChunkProviderServer; -import net.minecraft.server.CrashReport; -import net.minecraft.server.CrashReportSystemDetails; -import net.minecraft.server.IBlockData; -import net.minecraft.server.MinecraftKey; -import net.minecraft.server.NBTTagList; -import net.minecraft.server.NextTickListEntry; -import net.minecraft.server.ReportedException; -import net.minecraft.server.StructureBoundingBox; -import net.minecraft.server.TickListPriority; -import net.minecraft.server.TickListServer; -import net.minecraft.server.WorldServer; -import java.util.ArrayDeque; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Comparator; -import java.util.Iterator; -import java.util.List; +import net.minecraft.server.*; + +import java.util.*; import java.util.function.Consumer; import java.util.function.Function; import java.util.function.Predicate; diff --git a/src/main/java/com/destroystokyo/paper/server/ticklist/TickListServerInterval.java b/src/main/java/com/destroystokyo/paper/server/ticklist/TickListServerInterval.java index 13cf1a55a9babbffccbca1acfbe1c496e8925521..ffba88a3dbf78052e4b9314fae8c67d07bd55b9f 100644 --- a/src/main/java/com/destroystokyo/paper/server/ticklist/TickListServerInterval.java +++ b/src/main/java/com/destroystokyo/paper/server/ticklist/TickListServerInterval.java @@ -3,6 +3,7 @@ package com.destroystokyo.paper.server.ticklist; import com.destroystokyo.paper.util.set.LinkedSortedSet; import net.minecraft.server.NextTickListEntry; import net.minecraft.server.TickListPriority; + import java.util.Comparator; // represents a set of entries to tick at a specified time diff --git a/src/main/java/com/destroystokyo/paper/util/PlayerMobDistanceMap.java b/src/main/java/com/destroystokyo/paper/util/PlayerMobDistanceMap.java index 9ebd7ecb7a0ac73ccacf34c097056598bb5d26e8..bb1e0b6c8d98a221a2f60cba454f9d5fe81c39ab 100644 --- a/src/main/java/com/destroystokyo/paper/util/PlayerMobDistanceMap.java +++ b/src/main/java/com/destroystokyo/paper/util/PlayerMobDistanceMap.java @@ -7,10 +7,10 @@ import net.minecraft.server.ChunkCoordIntPair; import net.minecraft.server.EntityPlayer; import net.minecraft.server.SectionPosition; import org.spigotmc.AsyncCatcher; + import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.Set; /** @author Spottedleaf */ public final class PlayerMobDistanceMap { diff --git a/src/main/java/com/destroystokyo/paper/util/PooledHashSets.java b/src/main/java/com/destroystokyo/paper/util/PooledHashSets.java index 4f13d3ff8391793a99f067189f854078334499c6..132f8d476620e03388f4f2d9e31cf0d9d0d77ac0 100644 --- a/src/main/java/com/destroystokyo/paper/util/PooledHashSets.java +++ b/src/main/java/com/destroystokyo/paper/util/PooledHashSets.java @@ -2,6 +2,7 @@ package com.destroystokyo.paper.util; import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap; import it.unimi.dsi.fastutil.objects.ObjectLinkedOpenHashSet; + import java.lang.ref.WeakReference; import java.util.Iterator; diff --git a/src/main/java/com/destroystokyo/paper/util/RedstoneWireTurbo.java b/src/main/java/com/destroystokyo/paper/util/RedstoneWireTurbo.java index b69803cbf2db2781aa050b145bf88468254880ae..9989cf178c781b3a8651b828870b3983018e2251 100644 --- a/src/main/java/com/destroystokyo/paper/util/RedstoneWireTurbo.java +++ b/src/main/java/com/destroystokyo/paper/util/RedstoneWireTurbo.java @@ -1,21 +1,13 @@ package com.destroystokyo.paper.util; -import java.util.List; -import java.util.Map; -import java.util.concurrent.ThreadLocalRandom; - -import org.bukkit.event.block.BlockRedstoneEvent; - import com.google.common.collect.Lists; import com.google.common.collect.Maps; +import net.minecraft.server.*; +import org.bukkit.event.block.BlockRedstoneEvent; -import net.minecraft.server.Block; -import net.minecraft.server.BlockPosition; -import net.minecraft.server.BlockRedstoneWire; -import net.minecraft.server.IBlockData; -import net.minecraft.server.Items; -import net.minecraft.server.ItemStack; -import net.minecraft.server.World; +import java.util.List; +import java.util.Map; +import java.util.concurrent.ThreadLocalRandom; /** * Used for the faster redstone algorithm. diff --git a/src/main/java/com/destroystokyo/paper/util/map/QueuedChangesMapLong2Object.java b/src/main/java/com/destroystokyo/paper/util/map/QueuedChangesMapLong2Object.java index 7bab31a312463cc963d9621cdc543a281459bd32..f6b1059a67d48a8326dfd3b84016610873dc1b49 100644 --- a/src/main/java/com/destroystokyo/paper/util/map/QueuedChangesMapLong2Object.java +++ b/src/main/java/com/destroystokyo/paper/util/map/QueuedChangesMapLong2Object.java @@ -4,6 +4,7 @@ import com.destroystokyo.paper.util.concurrent.WeakSeqLock; import it.unimi.dsi.fastutil.longs.Long2ObjectLinkedOpenHashMap; import it.unimi.dsi.fastutil.longs.Long2ObjectMap; import it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator; + import java.util.ArrayList; import java.util.Collection; import java.util.List; diff --git a/src/main/java/com/destroystokyo/paper/util/maplist/ChunkList.java b/src/main/java/com/destroystokyo/paper/util/maplist/ChunkList.java index 4eac0577862450e0e3299f5579f9ff6759b0256d..98d958544c03c35b8a9388a23c67ab695ef4a90a 100644 --- a/src/main/java/com/destroystokyo/paper/util/maplist/ChunkList.java +++ b/src/main/java/com/destroystokyo/paper/util/maplist/ChunkList.java @@ -2,7 +2,7 @@ package com.destroystokyo.paper.util.maplist; import it.unimi.dsi.fastutil.longs.Long2IntOpenHashMap; import net.minecraft.server.Chunk; -import net.minecraft.server.MCUtil; + import java.util.Arrays; import java.util.Iterator; import java.util.NoSuchElementException; diff --git a/src/main/java/com/destroystokyo/paper/util/maplist/EntityList.java b/src/main/java/com/destroystokyo/paper/util/maplist/EntityList.java index cdda74564ced196ae577a64782236c2bfe36e433..66f84c6ab08221b8db3be382df4372301c9bd8e9 100644 --- a/src/main/java/com/destroystokyo/paper/util/maplist/EntityList.java +++ b/src/main/java/com/destroystokyo/paper/util/maplist/EntityList.java @@ -2,6 +2,7 @@ package com.destroystokyo.paper.util.maplist; import it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap; import net.minecraft.server.Entity; + import java.util.Arrays; import java.util.Iterator; import java.util.NoSuchElementException; diff --git a/src/main/java/com/destroystokyo/paper/util/maplist/IBlockDataList.java b/src/main/java/com/destroystokyo/paper/util/maplist/IBlockDataList.java index 84ef8d9ecab4745a90504718f803110b9e2dbf65..79da166d52ccc9eaf557592178d3a2d150730e8f 100644 --- a/src/main/java/com/destroystokyo/paper/util/maplist/IBlockDataList.java +++ b/src/main/java/com/destroystokyo/paper/util/maplist/IBlockDataList.java @@ -5,6 +5,7 @@ import it.unimi.dsi.fastutil.shorts.Short2LongOpenHashMap; import net.minecraft.server.ChunkSection; import net.minecraft.server.DataPaletteGlobal; import net.minecraft.server.IBlockData; + import java.util.Arrays; /** diff --git a/src/main/java/com/destroystokyo/paper/util/misc/AreaMap.java b/src/main/java/com/destroystokyo/paper/util/misc/AreaMap.java index 1330df2c1d3c4f52dad0adeb169409eb412814ab..53e14a76629bc349a93adb558d6c8818f574c7d4 100644 --- a/src/main/java/com/destroystokyo/paper/util/misc/AreaMap.java +++ b/src/main/java/com/destroystokyo/paper/util/misc/AreaMap.java @@ -8,6 +8,7 @@ import it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap; import net.minecraft.server.ChunkCoordIntPair; import net.minecraft.server.MCUtil; import net.minecraft.server.MinecraftServer; + import javax.annotation.Nullable; import java.util.Iterator; diff --git a/src/main/java/com/destroystokyo/paper/util/misc/PooledLinkedHashSets.java b/src/main/java/com/destroystokyo/paper/util/misc/PooledLinkedHashSets.java index e51104e65a07b6ea7bbbcbb6afb066ef6401cc5b..3a317dbd9ff86c943ab97116f3e9c05b445a61b0 100644 --- a/src/main/java/com/destroystokyo/paper/util/misc/PooledLinkedHashSets.java +++ b/src/main/java/com/destroystokyo/paper/util/misc/PooledLinkedHashSets.java @@ -2,6 +2,7 @@ package com.destroystokyo.paper.util.misc; import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap; import it.unimi.dsi.fastutil.objects.ObjectOpenHashSet; + import java.lang.ref.WeakReference; /** @author Spottedleaf */ diff --git a/src/main/java/com/mojang/authlib/yggdrasil/YggdrasilGameProfileRepository.java b/src/main/java/com/mojang/authlib/yggdrasil/YggdrasilGameProfileRepository.java index 8e182fdd69dba6e1c52e2f6a893534d77fb3bfaa..cfddb85b5321e0fe5808e9bf52c9f8981983d443 100644 --- a/src/main/java/com/mojang/authlib/yggdrasil/YggdrasilGameProfileRepository.java +++ b/src/main/java/com/mojang/authlib/yggdrasil/YggdrasilGameProfileRepository.java @@ -3,12 +3,7 @@ package com.mojang.authlib.yggdrasil; import com.google.common.base.Strings; import com.google.common.collect.Iterables; import com.google.common.collect.Sets; -import com.mojang.authlib.Agent; -import com.mojang.authlib.Environment; -import com.mojang.authlib.GameProfile; -import com.mojang.authlib.GameProfileRepository; -import com.mojang.authlib.HttpAuthenticationService; -import com.mojang.authlib.ProfileLookupCallback; +import com.mojang.authlib.*; import com.mojang.authlib.exceptions.AuthenticationException; import com.mojang.authlib.yggdrasil.response.ProfileSearchResultsResponse; import org.apache.logging.log4j.LogManager; diff --git a/src/main/java/com/mojang/brigadier/tree/CommandNode.java b/src/main/java/com/mojang/brigadier/tree/CommandNode.java index ca0d664487a65a4768f0e65af6a320fd1875de8f..debd9ee0ec1af6481dbe7d0e732c7b2c8cc979ac 100644 --- a/src/main/java/com/mojang/brigadier/tree/CommandNode.java +++ b/src/main/java/com/mojang/brigadier/tree/CommandNode.java @@ -1,6 +1,7 @@ package com.mojang.brigadier.tree; // CHECKSTYLE:OFF + import com.google.common.collect.ComparisonChain; import com.google.common.collect.Maps; import com.google.common.collect.Sets; @@ -14,17 +15,14 @@ import com.mojang.brigadier.context.CommandContextBuilder; import com.mojang.brigadier.exceptions.CommandSyntaxException; import com.mojang.brigadier.suggestion.Suggestions; import com.mojang.brigadier.suggestion.SuggestionsBuilder; +import net.minecraft.server.CommandListenerWrapper; import java.util.Collection; import java.util.Collections; -import java.util.LinkedHashMap; import java.util.Map; import java.util.Set; import java.util.concurrent.CompletableFuture; import java.util.function.Predicate; -import java.util.stream.Collectors; - -import net.minecraft.server.CommandListenerWrapper; // CraftBukkit public abstract class CommandNode implements Comparable> { private Map> children = Maps.newTreeMap(); //Paper - Switch to tree map for automatic sorting diff --git a/src/main/java/com/mojang/datafixers/util/Either.java b/src/main/java/com/mojang/datafixers/util/Either.java index 3f65fe71024928e35111fc6719a290aab9a6859e..9f4f02d96b872d49237ddd062d902b9928de1fc9 100644 --- a/src/main/java/com/mojang/datafixers/util/Either.java +++ b/src/main/java/com/mojang/datafixers/util/Either.java @@ -2,11 +2,7 @@ // Licensed under the MIT license. package com.mojang.datafixers.util; -import com.mojang.datafixers.kinds.App; -import com.mojang.datafixers.kinds.Applicative; -import com.mojang.datafixers.kinds.CocartesianLike; -import com.mojang.datafixers.kinds.K1; -import com.mojang.datafixers.kinds.Traversable; +import com.mojang.datafixers.kinds.*; import java.util.Objects; import java.util.Optional; diff --git a/src/main/java/com/proximyst/rainforest/RainforestCommand.java b/src/main/java/com/proximyst/rainforest/RainforestCommand.java index 9e26fa3bff387e362a6748266df8742cf5682af6..86550dfcc77dce295ecdffee6f83e9eb697fdf3b 100644 --- a/src/main/java/com/proximyst/rainforest/RainforestCommand.java +++ b/src/main/java/com/proximyst/rainforest/RainforestCommand.java @@ -1,10 +1,6 @@ package com.proximyst.rainforest; import com.destroystokyo.paper.PaperCommand; -import java.io.File; -import java.util.Collections; -import java.util.List; -import java.util.Locale; import net.md_5.bungee.api.ChatColor; import net.md_5.bungee.api.chat.ComponentBuilder; import net.minecraft.server.MinecraftServer; @@ -13,6 +9,11 @@ import org.bukkit.Location; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; +import java.io.File; +import java.util.Collections; +import java.util.List; +import java.util.Locale; + public class RainforestCommand extends Command { public RainforestCommand(String name) { super(name); diff --git a/src/main/java/com/proximyst/rainforest/RainforestConfig.java b/src/main/java/com/proximyst/rainforest/RainforestConfig.java index 04f5751f7972ed04f97c3f911277a30f14344801..5855bb241841ea1295cf97dac97413213442550a 100644 --- a/src/main/java/com/proximyst/rainforest/RainforestConfig.java +++ b/src/main/java/com/proximyst/rainforest/RainforestConfig.java @@ -1,24 +1,22 @@ package com.proximyst.rainforest; import com.google.common.base.Throwables; +import dev.tr7zw.yatopia.YatopiaConfig; +import net.minecraft.server.MinecraftServer; +import org.bukkit.Bukkit; +import org.bukkit.command.Command; +import org.bukkit.configuration.file.YamlConfiguration; + import java.io.File; import java.io.IOException; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.lang.reflect.Modifier; -import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.concurrent.TimeUnit; import java.util.logging.Level; import java.util.regex.Pattern; -import net.minecraft.server.MinecraftServer; -import org.bukkit.Bukkit; -import org.bukkit.command.Command; -import org.bukkit.configuration.InvalidConfigurationException; -import org.bukkit.configuration.file.YamlConfiguration; - -import dev.tr7zw.yatopia.YatopiaConfig; // Based on PaperConfig public final class RainforestConfig { diff --git a/src/main/java/com/proximyst/rainforest/RainforestWorldConfig.java b/src/main/java/com/proximyst/rainforest/RainforestWorldConfig.java index 22d920686418e86aec8be37f125123682af023a3..9a9fe8f4e440b7bc66fd19a4915fc4360146c225 100644 --- a/src/main/java/com/proximyst/rainforest/RainforestWorldConfig.java +++ b/src/main/java/com/proximyst/rainforest/RainforestWorldConfig.java @@ -1,11 +1,12 @@ package com.proximyst.rainforest; -import static com.proximyst.rainforest.RainforestConfig.log; - import com.destroystokyo.paper.PaperWorldConfig; -import java.util.List; import org.bukkit.configuration.file.YamlConfiguration; +import java.util.List; + +import static com.proximyst.rainforest.RainforestConfig.log; + // Based on PaperWorldConfig public final class RainforestWorldConfig { private final String worldName; diff --git a/src/main/java/com/tuinity/tuinity/chunk/SingleThreadChunkRegionManager.java b/src/main/java/com/tuinity/tuinity/chunk/SingleThreadChunkRegionManager.java index f599725e17d2ec6020e9fff0ec55f4d14a5c0844..5fb61b126428a12166bc3453a83a802093e1f43a 100644 --- a/src/main/java/com/tuinity/tuinity/chunk/SingleThreadChunkRegionManager.java +++ b/src/main/java/com/tuinity/tuinity/chunk/SingleThreadChunkRegionManager.java @@ -2,13 +2,13 @@ package com.tuinity.tuinity.chunk; import co.aikar.timings.MinecraftTimings; import co.aikar.timings.Timing; -import com.google.common.collect.Iterators; import com.tuinity.tuinity.util.maplist.IteratorSafeOrderedReferenceSet; import it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap; import it.unimi.dsi.fastutil.objects.ReferenceLinkedOpenHashSet; import it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet; import net.minecraft.server.MCUtil; import net.minecraft.server.WorldServer; + import java.util.ArrayList; import java.util.EnumMap; import java.util.Iterator; diff --git a/src/main/java/com/tuinity/tuinity/config/TuinityConfig.java b/src/main/java/com/tuinity/tuinity/config/TuinityConfig.java index 1c7b858ed53f853541724e8d3fdae4e0e82e5d4f..26959488c92193c30fa9992a705e61103ccfd322 100644 --- a/src/main/java/com/tuinity/tuinity/config/TuinityConfig.java +++ b/src/main/java/com/tuinity/tuinity/config/TuinityConfig.java @@ -5,10 +5,10 @@ import net.minecraft.server.TicketType; import org.bukkit.Bukkit; import org.bukkit.configuration.ConfigurationSection; import org.bukkit.configuration.file.YamlConfiguration; + import java.io.File; import java.lang.reflect.Method; import java.lang.reflect.Modifier; -import java.util.List; import java.util.logging.Level; public final class TuinityConfig { diff --git a/src/main/java/com/tuinity/tuinity/util/CachedLists.java b/src/main/java/com/tuinity/tuinity/util/CachedLists.java index a54f516ba72806c0470259436f889faa8f6e7586..59e0dcac498a6ca1f761aa00cf5fbb660a454a33 100644 --- a/src/main/java/com/tuinity/tuinity/util/CachedLists.java +++ b/src/main/java/com/tuinity/tuinity/util/CachedLists.java @@ -4,6 +4,7 @@ import net.minecraft.server.AxisAlignedBB; import net.minecraft.server.Entity; import org.bukkit.Bukkit; import org.bukkit.craftbukkit.util.UnsafeList; + import java.util.List; public class CachedLists { diff --git a/src/main/java/com/tuinity/tuinity/util/maplist/IteratorSafeOrderedReferenceSet.java b/src/main/java/com/tuinity/tuinity/util/maplist/IteratorSafeOrderedReferenceSet.java index b0f1e21e6e34f2a339fdec5f0f951a103599ac2d..f4aba8398bdf49a94061955821e8562fe60c4564 100644 --- a/src/main/java/com/tuinity/tuinity/util/maplist/IteratorSafeOrderedReferenceSet.java +++ b/src/main/java/com/tuinity/tuinity/util/maplist/IteratorSafeOrderedReferenceSet.java @@ -3,6 +3,7 @@ package com.tuinity.tuinity.util.maplist; import it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap; import it.unimi.dsi.fastutil.objects.Reference2IntMap; import it.unimi.dsi.fastutil.objects.ReferenceLinkedOpenHashSet; + import java.util.Arrays; import java.util.NoSuchElementException; diff --git a/src/main/java/com/tuinity/tuinity/voxel/AABBVoxelShape.java b/src/main/java/com/tuinity/tuinity/voxel/AABBVoxelShape.java index 76593df295e5f462adcbc223d791316a849fffeb..2fb99e8626b962184854c2850d0507f7606617a5 100644 --- a/src/main/java/com/tuinity/tuinity/voxel/AABBVoxelShape.java +++ b/src/main/java/com/tuinity/tuinity/voxel/AABBVoxelShape.java @@ -6,6 +6,7 @@ import net.minecraft.server.AxisAlignedBB; import net.minecraft.server.EnumDirection; import net.minecraft.server.VoxelShape; import net.minecraft.server.VoxelShapes; + import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/de/minebench/origami/OrigamiConfig.java b/src/main/java/de/minebench/origami/OrigamiConfig.java index 1c1d624065162ef5b97ed5ff3d0a24b73975ed2e..d022cf1498ed371eaad779b849aac4bc1065f7a8 100644 --- a/src/main/java/de/minebench/origami/OrigamiConfig.java +++ b/src/main/java/de/minebench/origami/OrigamiConfig.java @@ -1,14 +1,11 @@ package de.minebench.origami; -import org.bukkit.Bukkit; -import org.bukkit.configuration.file.YamlConfiguration; - import dev.tr7zw.yatopia.YatopiaConfig; +import org.bukkit.configuration.file.YamlConfiguration; import java.io.File; import java.lang.reflect.Method; import java.lang.reflect.Modifier; -import java.util.logging.Level; public final class OrigamiConfig { diff --git a/src/main/java/dev/tr7zw/yatopia/YatopiaCommand.java b/src/main/java/dev/tr7zw/yatopia/YatopiaCommand.java index 1e88bc1a89eada5008ffe88f7ed32e107b2fb10c..c58ab7f9030bb2a3f6af3a7f327a5e7654972c9f 100644 --- a/src/main/java/dev/tr7zw/yatopia/YatopiaCommand.java +++ b/src/main/java/dev/tr7zw/yatopia/YatopiaCommand.java @@ -1,26 +1,18 @@ package dev.tr7zw.yatopia; -import java.io.File; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.Iterator; -import java.util.List; -import java.util.Locale; - +import com.google.common.base.Functions; +import com.google.common.collect.Iterables; +import com.google.common.collect.Lists; +import net.minecraft.server.MinecraftKey; +import net.minecraft.server.MinecraftServer; import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.Location; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; -import com.google.common.base.Functions; -import com.google.common.collect.Iterables; -import com.google.common.collect.Lists; - -import net.minecraft.server.MinecraftKey; -import net.minecraft.server.MinecraftServer; +import java.io.File; +import java.util.*; public class YatopiaCommand extends Command { diff --git a/src/main/java/dev/tr7zw/yatopia/YatopiaConfig.java b/src/main/java/dev/tr7zw/yatopia/YatopiaConfig.java index 40f0bc601f0d11b0bfb15162fce17aaa70991f14..55282c0eab3d60b7c83c5772ba266b697248c711 100644 --- a/src/main/java/dev/tr7zw/yatopia/YatopiaConfig.java +++ b/src/main/java/dev/tr7zw/yatopia/YatopiaConfig.java @@ -1,36 +1,24 @@ package dev.tr7zw.yatopia; -import com.destroystokyo.paper.io.chunk.ChunkTaskManager; -import com.google.common.base.Strings; import com.google.common.base.Throwables; +import net.minecraft.server.MinecraftServer; +import org.bukkit.Bukkit; +import org.bukkit.command.Command; +import org.bukkit.configuration.InvalidConfigurationException; +import org.bukkit.configuration.file.YamlConfiguration; import java.io.File; import java.io.IOException; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.lang.reflect.Modifier; -import java.nio.charset.StandardCharsets; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.Set; import java.util.concurrent.TimeUnit; import java.util.logging.Level; import java.util.regex.Pattern; -import com.google.common.collect.Lists; -import net.minecraft.server.MinecraftServer; -import org.bukkit.Bukkit; -import org.bukkit.ChatColor; -import org.bukkit.command.Command; -import org.bukkit.configuration.ConfigurationSection; -import org.bukkit.configuration.InvalidConfigurationException; -import org.bukkit.configuration.file.YamlConfiguration; -import co.aikar.timings.Timings; -import co.aikar.timings.TimingsManager; -import org.spigotmc.SpigotConfig; -import org.spigotmc.WatchdogThread; - public class YatopiaConfig { public static File CONFIG_FILE; diff --git a/src/main/java/dev/tr7zw/yatopia/YatopiaVersionFetcher.java b/src/main/java/dev/tr7zw/yatopia/YatopiaVersionFetcher.java index 523e3b50d535e91afe8b14fdb53966da030963dc..a2c92daeab053dd3785b8389a101c21fcfb73eef 100644 --- a/src/main/java/dev/tr7zw/yatopia/YatopiaVersionFetcher.java +++ b/src/main/java/dev/tr7zw/yatopia/YatopiaVersionFetcher.java @@ -1,9 +1,9 @@ package dev.tr7zw.yatopia; -import javax.annotation.Nonnull; - import com.destroystokyo.paper.util.VersionFetcher; +import javax.annotation.Nonnull; + public class YatopiaVersionFetcher implements VersionFetcher { @Override diff --git a/src/main/java/me/jellysquid/mods/lithium/common/world/noise/SimplexNoiseCache.java b/src/main/java/me/jellysquid/mods/lithium/common/world/noise/SimplexNoiseCache.java index 167498cfab7aed0deb32232082ae06a123b7a039..a28486e5ad4a86bd02219f1db696d8049b6955bf 100644 --- a/src/main/java/me/jellysquid/mods/lithium/common/world/noise/SimplexNoiseCache.java +++ b/src/main/java/me/jellysquid/mods/lithium/common/world/noise/SimplexNoiseCache.java @@ -1,12 +1,12 @@ package me.jellysquid.mods.lithium.common.world.noise; -import java.util.Arrays; - import it.unimi.dsi.fastutil.HashCommon; import net.minecraft.server.ChunkCoordIntPair; import net.minecraft.server.MathHelper; import net.minecraft.server.NoiseGenerator3Handler; +import java.util.Arrays; + /** * A cache for the End's noise generator that caches computed values. Through the caching, we can eliminate a large * amount of overhead in computing the noise values several hundred thousand times per chunk. This code uses the same diff --git a/src/main/java/net/minecraft/server/Advancement.java b/src/main/java/net/minecraft/server/Advancement.java index 315a03cf5e64264523ce95ce7b9ffe7c450e1e5b..9f48cfb84cd3fccc408d908db37d27f1bad6368d 100644 --- a/src/main/java/net/minecraft/server/Advancement.java +++ b/src/main/java/net/minecraft/server/Advancement.java @@ -6,6 +6,9 @@ import com.google.common.collect.Sets; import com.google.gson.JsonArray; import com.google.gson.JsonObject; import com.google.gson.JsonSyntaxException; +import org.apache.commons.lang3.ArrayUtils; + +import javax.annotation.Nullable; import java.util.Arrays; import java.util.Iterator; import java.util.Map; @@ -13,8 +16,6 @@ import java.util.Map.Entry; import java.util.Set; import java.util.function.Consumer; import java.util.function.Function; -import javax.annotation.Nullable; -import org.apache.commons.lang3.ArrayUtils; public class Advancement { diff --git a/src/main/java/net/minecraft/server/AdvancementDataPlayer.java b/src/main/java/net/minecraft/server/AdvancementDataPlayer.java index 5442c28c56f933c63bd611f579d0392876ecc2ef..2a2b7a1d6a2813740cc9aae6bc911cea659543e6 100644 --- a/src/main/java/net/minecraft/server/AdvancementDataPlayer.java +++ b/src/main/java/net/minecraft/server/AdvancementDataPlayer.java @@ -15,25 +15,18 @@ import com.google.gson.stream.JsonReader; import com.mojang.datafixers.DataFixer; import com.mojang.serialization.Dynamic; import com.mojang.serialization.JsonOps; -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.OutputStreamWriter; -import java.io.StringReader; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +import javax.annotation.Nullable; +import java.io.*; import java.nio.charset.StandardCharsets; -import java.util.Comparator; -import java.util.Iterator; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.Map.Entry; -import java.util.Set; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.annotation.Nullable; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; public class AdvancementDataPlayer { diff --git a/src/main/java/net/minecraft/server/AdvancementDataWorld.java b/src/main/java/net/minecraft/server/AdvancementDataWorld.java index a70e42f2d5055fde4b39f990f76f5e89ef707d4c..e1192141d802509ace1fc2c7d11a3c24a0c36e37 100644 --- a/src/main/java/net/minecraft/server/AdvancementDataWorld.java +++ b/src/main/java/net/minecraft/server/AdvancementDataWorld.java @@ -1,19 +1,16 @@ package net.minecraft.server; import com.google.common.collect.Maps; -import com.google.gson.Gson; -import com.google.gson.GsonBuilder; -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; -import com.google.gson.JsonParseException; -import java.util.Collection; -import java.util.Iterator; -import java.util.Map; -import javax.annotation.Nullable; +import com.google.gson.*; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.spigotmc.SpigotConfig; +import javax.annotation.Nullable; +import java.util.Collection; +import java.util.Iterator; +import java.util.Map; + public class AdvancementDataWorld extends ResourceDataJson { private static final Logger LOGGER = LogManager.getLogger(); diff --git a/src/main/java/net/minecraft/server/Advancements.java b/src/main/java/net/minecraft/server/Advancements.java index 2fed42a5aec165a67a1480e822376e66244c31c8..b1adbc542936a6d30759123d72e23eabb39fb48c 100644 --- a/src/main/java/net/minecraft/server/Advancements.java +++ b/src/main/java/net/minecraft/server/Advancements.java @@ -4,14 +4,15 @@ import com.google.common.base.Function; import com.google.common.base.Functions; import com.google.common.collect.Maps; import com.google.common.collect.Sets; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +import javax.annotation.Nullable; import java.util.Collection; import java.util.Iterator; import java.util.Map; import java.util.Map.Entry; import java.util.Set; -import javax.annotation.Nullable; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; public class Advancements { diff --git a/src/main/java/net/minecraft/server/ArgumentBlock.java b/src/main/java/net/minecraft/server/ArgumentBlock.java index e1894fe66911adb991989ff5322d2a9e9446fce7..9bd7ded6e5682991ba62e10d54f9f0d2b21e7279 100644 --- a/src/main/java/net/minecraft/server/ArgumentBlock.java +++ b/src/main/java/net/minecraft/server/ArgumentBlock.java @@ -3,13 +3,11 @@ package net.minecraft.server; import com.google.common.collect.Maps; import com.google.common.collect.UnmodifiableIterator; import com.mojang.brigadier.StringReader; -import com.mojang.brigadier.exceptions.CommandSyntaxException; -import com.mojang.brigadier.exceptions.Dynamic2CommandExceptionType; -import com.mojang.brigadier.exceptions.Dynamic3CommandExceptionType; -import com.mojang.brigadier.exceptions.DynamicCommandExceptionType; -import com.mojang.brigadier.exceptions.SimpleCommandExceptionType; +import com.mojang.brigadier.exceptions.*; import com.mojang.brigadier.suggestion.Suggestions; import com.mojang.brigadier.suggestion.SuggestionsBuilder; + +import javax.annotation.Nullable; import java.util.Iterator; import java.util.Locale; import java.util.Map; @@ -17,7 +15,6 @@ import java.util.Map.Entry; import java.util.Optional; import java.util.concurrent.CompletableFuture; import java.util.function.BiFunction; -import javax.annotation.Nullable; public class ArgumentBlock { diff --git a/src/main/java/net/minecraft/server/ArgumentEntity.java b/src/main/java/net/minecraft/server/ArgumentEntity.java index 1194f91a51f87bc461af039fe0819aaf3e5c8bdd..af275a63b2ba583f6a07d606a1b66fca409efd61 100644 --- a/src/main/java/net/minecraft/server/ArgumentEntity.java +++ b/src/main/java/net/minecraft/server/ArgumentEntity.java @@ -9,6 +9,7 @@ import com.mojang.brigadier.exceptions.CommandSyntaxException; import com.mojang.brigadier.exceptions.SimpleCommandExceptionType; import com.mojang.brigadier.suggestion.Suggestions; import com.mojang.brigadier.suggestion.SuggestionsBuilder; + import java.util.Arrays; import java.util.Collection; import java.util.List; diff --git a/src/main/java/net/minecraft/server/ArgumentParserSelector.java b/src/main/java/net/minecraft/server/ArgumentParserSelector.java index 0b222c8be84d28280a08c79b98484220a8727f7d..f1c630da24dfad324bb439e647948434f0c61e39 100644 --- a/src/main/java/net/minecraft/server/ArgumentParserSelector.java +++ b/src/main/java/net/minecraft/server/ArgumentParserSelector.java @@ -7,17 +7,13 @@ import com.mojang.brigadier.exceptions.DynamicCommandExceptionType; import com.mojang.brigadier.exceptions.SimpleCommandExceptionType; import com.mojang.brigadier.suggestion.Suggestions; import com.mojang.brigadier.suggestion.SuggestionsBuilder; + +import javax.annotation.Nullable; import java.util.Collections; import java.util.List; import java.util.UUID; import java.util.concurrent.CompletableFuture; -import java.util.function.BiConsumer; -import java.util.function.BiFunction; -import java.util.function.Consumer; -import java.util.function.Function; -import java.util.function.Predicate; -import java.util.function.ToDoubleFunction; -import javax.annotation.Nullable; +import java.util.function.*; public class ArgumentParserSelector { diff --git a/src/main/java/net/minecraft/server/ArraySetSorted.java b/src/main/java/net/minecraft/server/ArraySetSorted.java index 7db6b5850b91588eb4d91f0d7e8b5dbbcb95b7cb..1a099dcdda23f9f64316e9f3a986ba1e93360deb 100644 --- a/src/main/java/net/minecraft/server/ArraySetSorted.java +++ b/src/main/java/net/minecraft/server/ArraySetSorted.java @@ -1,11 +1,8 @@ package net.minecraft.server; import it.unimi.dsi.fastutil.objects.ObjectArrays; -import java.util.AbstractSet; -import java.util.Arrays; -import java.util.Comparator; -import java.util.Iterator; -import java.util.NoSuchElementException; + +import java.util.*; public class ArraySetSorted extends AbstractSet { diff --git a/src/main/java/net/minecraft/server/AxisAlignedBB.java b/src/main/java/net/minecraft/server/AxisAlignedBB.java index 661331bc005ba1c6ba6c6a4df22e0205bfd2b660..7b391d5694e6531adabb0a843e4563ad045bb64c 100644 --- a/src/main/java/net/minecraft/server/AxisAlignedBB.java +++ b/src/main/java/net/minecraft/server/AxisAlignedBB.java @@ -1,8 +1,8 @@ package net.minecraft.server; +import javax.annotation.Nullable; import java.util.Iterator; import java.util.Optional; -import javax.annotation.Nullable; public class AxisAlignedBB { diff --git a/src/main/java/net/minecraft/server/BaseBlockPosition.java b/src/main/java/net/minecraft/server/BaseBlockPosition.java index e69b7dbc7a954374f9e2374ffe7faebfed2b0644..e4b62eab1262f035395366cc5a5d0893975596d6 100644 --- a/src/main/java/net/minecraft/server/BaseBlockPosition.java +++ b/src/main/java/net/minecraft/server/BaseBlockPosition.java @@ -2,8 +2,9 @@ package net.minecraft.server; import com.google.common.base.MoreObjects; import com.mojang.serialization.Codec; -import java.util.stream.IntStream; + import javax.annotation.concurrent.Immutable; +import java.util.stream.IntStream; @Immutable public class BaseBlockPosition implements Comparable { diff --git a/src/main/java/net/minecraft/server/BehaviorAttackTargetForget.java b/src/main/java/net/minecraft/server/BehaviorAttackTargetForget.java index 51203fd30bfee57ef8d52d0360a64a7e1d6c65a3..0b8fa6dafa6e8cab5cb5bfdb657b3e8d92285450 100644 --- a/src/main/java/net/minecraft/server/BehaviorAttackTargetForget.java +++ b/src/main/java/net/minecraft/server/BehaviorAttackTargetForget.java @@ -1,12 +1,11 @@ package net.minecraft.server; import com.google.common.collect.ImmutableMap; -import java.util.Optional; -import java.util.function.Predicate; -// CraftBukkit start -import org.bukkit.craftbukkit.entity.CraftLivingEntity; import org.bukkit.craftbukkit.event.CraftEventFactory; import org.bukkit.event.entity.EntityTargetEvent; + +import java.util.Optional; +import java.util.function.Predicate; // CraftBukkit end public class BehaviorAttackTargetForget extends Behavior { diff --git a/src/main/java/net/minecraft/server/BehaviorAttackTargetSet.java b/src/main/java/net/minecraft/server/BehaviorAttackTargetSet.java index f75b17e7174888cec8d9e1b6adc760c715e25a05..c6fbe5c1f6c627c1fe6da557fd1b21504893035e 100644 --- a/src/main/java/net/minecraft/server/BehaviorAttackTargetSet.java +++ b/src/main/java/net/minecraft/server/BehaviorAttackTargetSet.java @@ -1,13 +1,13 @@ package net.minecraft.server; import com.google.common.collect.ImmutableMap; -import java.util.Optional; -import java.util.function.Function; -import java.util.function.Predicate; -// CraftBukkit start import org.bukkit.craftbukkit.entity.CraftLivingEntity; import org.bukkit.craftbukkit.event.CraftEventFactory; import org.bukkit.event.entity.EntityTargetEvent; + +import java.util.Optional; +import java.util.function.Function; +import java.util.function.Predicate; // CraftBukkit end public class BehaviorAttackTargetSet extends Behavior { diff --git a/src/main/java/net/minecraft/server/BehaviorCareer.java b/src/main/java/net/minecraft/server/BehaviorCareer.java index 2bc482b2bfcfa0b5188d7edad9896536f3e0e91f..cee88035cc54a50da7a586cbdb7dfd62595716ec 100644 --- a/src/main/java/net/minecraft/server/BehaviorCareer.java +++ b/src/main/java/net/minecraft/server/BehaviorCareer.java @@ -1,11 +1,11 @@ package net.minecraft.server; import com.google.common.collect.ImmutableMap; -import java.util.Optional; -// CraftBukkit start import org.bukkit.craftbukkit.entity.CraftVillager; import org.bukkit.craftbukkit.event.CraftEventFactory; import org.bukkit.event.entity.VillagerCareerChangeEvent; + +import java.util.Optional; // CraftBukkit end public class BehaviorCareer extends Behavior { diff --git a/src/main/java/net/minecraft/server/BehaviorFarm.java b/src/main/java/net/minecraft/server/BehaviorFarm.java index 54a555509e3d83e9749609dc35897ad151bca681..9f2350c5b20f9e611c1ccadc01b7acb6815880bc 100644 --- a/src/main/java/net/minecraft/server/BehaviorFarm.java +++ b/src/main/java/net/minecraft/server/BehaviorFarm.java @@ -2,8 +2,9 @@ package net.minecraft.server; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; -import java.util.List; + import javax.annotation.Nullable; +import java.util.List; public class BehaviorFarm extends Behavior { diff --git a/src/main/java/net/minecraft/server/BehaviorGate.java b/src/main/java/net/minecraft/server/BehaviorGate.java index 46e910581210421c8699637431804dc2f43eb4a6..f6e60fc77cfe40dd3824abb9aaa4d8e76d8edd97 100644 --- a/src/main/java/net/minecraft/server/BehaviorGate.java +++ b/src/main/java/net/minecraft/server/BehaviorGate.java @@ -1,6 +1,7 @@ package net.minecraft.server; import com.mojang.datafixers.util.Pair; + import java.util.List; import java.util.Map; import java.util.Set; diff --git a/src/main/java/net/minecraft/server/BehaviorMakeLove.java b/src/main/java/net/minecraft/server/BehaviorMakeLove.java index d9a4d88408eb522fe1463c5adf105b002d14bb49..498a4fca2b21e04dc329a74d85a6dce9a4e4937f 100644 --- a/src/main/java/net/minecraft/server/BehaviorMakeLove.java +++ b/src/main/java/net/minecraft/server/BehaviorMakeLove.java @@ -1,6 +1,7 @@ package net.minecraft.server; import com.google.common.collect.ImmutableMap; + import java.util.Optional; public class BehaviorMakeLove extends Behavior { diff --git a/src/main/java/net/minecraft/server/BehaviorProfession.java b/src/main/java/net/minecraft/server/BehaviorProfession.java index f502b5b71d35cb755a8f13b81c0c33551e291225..35258f55f26a960b1cd1b4a53cacfebba99c5c8e 100644 --- a/src/main/java/net/minecraft/server/BehaviorProfession.java +++ b/src/main/java/net/minecraft/server/BehaviorProfession.java @@ -1,7 +1,6 @@ package net.minecraft.server; import com.google.common.collect.ImmutableMap; -// CraftBukkit start import org.bukkit.craftbukkit.entity.CraftVillager; import org.bukkit.craftbukkit.event.CraftEventFactory; import org.bukkit.event.entity.VillagerCareerChangeEvent; diff --git a/src/main/java/net/minecraft/server/BehaviorSleep.java b/src/main/java/net/minecraft/server/BehaviorSleep.java index 615a06497588e07fa2b71194a5836ef6360bf0ca..d219c4fcdcff31aa1dc2d471262d7fafe4cd5b5e 100644 --- a/src/main/java/net/minecraft/server/BehaviorSleep.java +++ b/src/main/java/net/minecraft/server/BehaviorSleep.java @@ -2,6 +2,7 @@ package net.minecraft.server; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; + import java.util.List; import java.util.Optional; diff --git a/src/main/java/net/minecraft/server/BehaviorWork.java b/src/main/java/net/minecraft/server/BehaviorWork.java index 3418d5463192d5f2763ad5dad9442e66827cbdf7..de2a448764e02e3a3434fdf4c1a36921ef411607 100644 --- a/src/main/java/net/minecraft/server/BehaviorWork.java +++ b/src/main/java/net/minecraft/server/BehaviorWork.java @@ -1,6 +1,7 @@ package net.minecraft.server; import com.google.common.collect.ImmutableMap; + import java.util.Optional; public class BehaviorWork extends Behavior { diff --git a/src/main/java/net/minecraft/server/BehaviorWorkComposter.java b/src/main/java/net/minecraft/server/BehaviorWorkComposter.java index cedd2a26cd373c10835df104206defdc50405a62..eba9f9a401a40ac4ad964e8f9fffb973a0022a82 100644 --- a/src/main/java/net/minecraft/server/BehaviorWorkComposter.java +++ b/src/main/java/net/minecraft/server/BehaviorWorkComposter.java @@ -1,6 +1,7 @@ package net.minecraft.server; import com.google.common.collect.ImmutableList; + import java.util.List; import java.util.Optional; diff --git a/src/main/java/net/minecraft/server/BiomeBase.java b/src/main/java/net/minecraft/server/BiomeBase.java index bfaba96eb56dd98a67d2c2179335ae48dcbe3849..d78b5cc7075a37bcf572c2043fa252bb624861a7 100644 --- a/src/main/java/net/minecraft/server/BiomeBase.java +++ b/src/main/java/net/minecraft/server/BiomeBase.java @@ -8,14 +8,12 @@ import com.mojang.serialization.Codec; import com.mojang.serialization.codecs.RecordCodecBuilder; import it.unimi.dsi.fastutil.longs.Long2FloatLinkedOpenHashMap; import me.jellysquid.mods.lithium.common.util.collections.HashedList; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import javax.annotation.Nullable; import java.util.*; -import java.util.function.Function; -import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.annotation.Nullable; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; public class BiomeBase { diff --git a/src/main/java/net/minecraft/server/BiomeStorage.java b/src/main/java/net/minecraft/server/BiomeStorage.java index 49114864e3cd7ef48b827220939c5069d3b8ca3a..11b47ebc3a49927f4c704b111254b6b1e67dd1d0 100644 --- a/src/main/java/net/minecraft/server/BiomeStorage.java +++ b/src/main/java/net/minecraft/server/BiomeStorage.java @@ -1,9 +1,10 @@ package net.minecraft.server; -import javax.annotation.Nullable; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import javax.annotation.Nullable; + public class BiomeStorage implements BiomeManager.Provider { private static final Logger LOGGER = LogManager.getLogger(); diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java index 09bb2f8b8d2451a41a1b1e77b8dfb6417748c20d..c16b64b30066bdff4e93c2b728c1825d11457daf 100644 --- a/src/main/java/net/minecraft/server/Block.java +++ b/src/main/java/net/minecraft/server/Block.java @@ -4,12 +4,13 @@ import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; import it.unimi.dsi.fastutil.objects.Object2ByteLinkedOpenHashMap; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +import javax.annotation.Nullable; import java.util.Iterator; import java.util.List; import java.util.stream.Stream; -import javax.annotation.Nullable; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; public class Block extends BlockBase implements IMaterial { diff --git a/src/main/java/net/minecraft/server/BlockBamboo.java b/src/main/java/net/minecraft/server/BlockBamboo.java index 14790c1674fd4fa6baca8f0d694e9b02e6b3d0a0..53eb9241dd7a36506261401aec0b1ed91e97ced3 100644 --- a/src/main/java/net/minecraft/server/BlockBamboo.java +++ b/src/main/java/net/minecraft/server/BlockBamboo.java @@ -1,7 +1,7 @@ package net.minecraft.server; -import java.util.Random; import javax.annotation.Nullable; +import java.util.Random; public class BlockBamboo extends Block implements IBlockFragilePlantElement { diff --git a/src/main/java/net/minecraft/server/BlockBase.java b/src/main/java/net/minecraft/server/BlockBase.java index 93e33a5418ab11a6e968b2c05e7a9f9dc616e2dc..809ec5f8fba12929a62a7a0fab843f5a4ed6b461 100644 --- a/src/main/java/net/minecraft/server/BlockBase.java +++ b/src/main/java/net/minecraft/server/BlockBase.java @@ -2,14 +2,14 @@ package net.minecraft.server; import com.google.common.collect.ImmutableMap; import com.mojang.serialization.MapCodec; -import java.util.Arrays; + +import javax.annotation.Nullable; import java.util.Collections; import java.util.List; import java.util.Random; import java.util.function.Function; import java.util.function.Predicate; import java.util.function.ToIntFunction; -import javax.annotation.Nullable; public abstract class BlockBase { diff --git a/src/main/java/net/minecraft/server/BlockBed.java b/src/main/java/net/minecraft/server/BlockBed.java index e7bd9061cceba284443b75cc5506e1b9f2ef42e8..f0a622585124cb149aa031c64757b34894bf1d44 100644 --- a/src/main/java/net/minecraft/server/BlockBed.java +++ b/src/main/java/net/minecraft/server/BlockBed.java @@ -1,9 +1,9 @@ package net.minecraft.server; +import javax.annotation.Nullable; import java.util.List; import java.util.Optional; import java.util.stream.Stream; -import javax.annotation.Nullable; public class BlockBed extends BlockFacingHorizontal implements ITileEntity { diff --git a/src/main/java/net/minecraft/server/BlockBeehive.java b/src/main/java/net/minecraft/server/BlockBeehive.java index 7e2c63e4731ac2d234d5f90eb80d314cdede07ca..6a4d63139ebce442b3dc9f89c05cf17430e40e1e 100644 --- a/src/main/java/net/minecraft/server/BlockBeehive.java +++ b/src/main/java/net/minecraft/server/BlockBeehive.java @@ -1,9 +1,9 @@ package net.minecraft.server; +import javax.annotation.Nullable; import java.util.Iterator; import java.util.List; import java.util.Random; -import javax.annotation.Nullable; public class BlockBeehive extends BlockTileEntity { diff --git a/src/main/java/net/minecraft/server/BlockButtonAbstract.java b/src/main/java/net/minecraft/server/BlockButtonAbstract.java index da6b90cbe6caaf19b98670feb731511dd7dcf904..1dba8e8c34005f9e9b28a32b24647cc538da06be 100644 --- a/src/main/java/net/minecraft/server/BlockButtonAbstract.java +++ b/src/main/java/net/minecraft/server/BlockButtonAbstract.java @@ -1,12 +1,11 @@ package net.minecraft.server; -import java.util.List; -import java.util.Random; -import javax.annotation.Nullable; - -// CraftBukkit start import org.bukkit.event.block.BlockRedstoneEvent; import org.bukkit.event.entity.EntityInteractEvent; + +import javax.annotation.Nullable; +import java.util.List; +import java.util.Random; // CraftBukkit end public abstract class BlockButtonAbstract extends BlockAttachable { diff --git a/src/main/java/net/minecraft/server/BlockCactus.java b/src/main/java/net/minecraft/server/BlockCactus.java index 13e4517bd04096001ca1caf32b9949abb3cf9c7f..ce0797fdc43bbb7b5a2bd67632db04209be40124 100644 --- a/src/main/java/net/minecraft/server/BlockCactus.java +++ b/src/main/java/net/minecraft/server/BlockCactus.java @@ -1,10 +1,10 @@ package net.minecraft.server; +import org.bukkit.craftbukkit.event.CraftEventFactory; + import java.util.Iterator; import java.util.Random; -import org.bukkit.craftbukkit.event.CraftEventFactory; // CraftBukkit - public class BlockCactus extends Block { public static final BlockStateInteger AGE = BlockProperties.aj; diff --git a/src/main/java/net/minecraft/server/BlockCampfire.java b/src/main/java/net/minecraft/server/BlockCampfire.java index 11e02ffdaaec2203b83125ff28cddf2784237d7c..e7581cc1a41fb5dd85a7d56c62bb73792dde931c 100644 --- a/src/main/java/net/minecraft/server/BlockCampfire.java +++ b/src/main/java/net/minecraft/server/BlockCampfire.java @@ -1,8 +1,8 @@ package net.minecraft.server; +import javax.annotation.Nullable; import java.util.Optional; import java.util.Random; -import javax.annotation.Nullable; public class BlockCampfire extends BlockTileEntity implements IBlockWaterlogged { diff --git a/src/main/java/net/minecraft/server/BlockCauldron.java b/src/main/java/net/minecraft/server/BlockCauldron.java index 9fed3883828e7d6ca917a5eca7a7a3e37582f983..f7eaeb70aff716665e2da84eab5da6657adeade7 100644 --- a/src/main/java/net/minecraft/server/BlockCauldron.java +++ b/src/main/java/net/minecraft/server/BlockCauldron.java @@ -1,6 +1,6 @@ package net.minecraft.server; -import org.bukkit.event.block.CauldronLevelChangeEvent; // CraftBukkit +import org.bukkit.event.block.CauldronLevelChangeEvent; public class BlockCauldron extends Block { diff --git a/src/main/java/net/minecraft/server/BlockChest.java b/src/main/java/net/minecraft/server/BlockChest.java index dba774018ccd88d75f3a69ceee10fd4691fcfdb6..80b46fe0841c694f2de6fb912d646f3bcdd86a40 100644 --- a/src/main/java/net/minecraft/server/BlockChest.java +++ b/src/main/java/net/minecraft/server/BlockChest.java @@ -1,11 +1,11 @@ package net.minecraft.server; +import javax.annotation.Nullable; import java.util.Iterator; import java.util.List; import java.util.Optional; import java.util.function.BiPredicate; import java.util.function.Supplier; -import javax.annotation.Nullable; public class BlockChest extends BlockChestAbstract implements IBlockWaterlogged { diff --git a/src/main/java/net/minecraft/server/BlockChorusFlower.java b/src/main/java/net/minecraft/server/BlockChorusFlower.java index c6cb947d2bd53501e4779537f3ccdd926433fe76..5bc4726f9aaa7eb27d107053ad48880bc2e3c36c 100644 --- a/src/main/java/net/minecraft/server/BlockChorusFlower.java +++ b/src/main/java/net/minecraft/server/BlockChorusFlower.java @@ -1,10 +1,10 @@ package net.minecraft.server; +import org.bukkit.craftbukkit.event.CraftEventFactory; + +import javax.annotation.Nullable; import java.util.Iterator; import java.util.Random; -import javax.annotation.Nullable; - -import org.bukkit.craftbukkit.event.CraftEventFactory; // CraftBukkit public class BlockChorusFlower extends Block { diff --git a/src/main/java/net/minecraft/server/BlockCocoa.java b/src/main/java/net/minecraft/server/BlockCocoa.java index 5f00a69d4e596886a44c953900f36c991d43d6b6..4b3bbbba66b86a63d9fbd913f1c3a3fb765a0429 100644 --- a/src/main/java/net/minecraft/server/BlockCocoa.java +++ b/src/main/java/net/minecraft/server/BlockCocoa.java @@ -1,9 +1,9 @@ package net.minecraft.server; -import java.util.Random; -import javax.annotation.Nullable; +import org.bukkit.craftbukkit.event.CraftEventFactory; -import org.bukkit.craftbukkit.event.CraftEventFactory; // CraftBukkit +import javax.annotation.Nullable; +import java.util.Random; public class BlockCocoa extends BlockFacingHorizontal implements IBlockFragilePlantElement { diff --git a/src/main/java/net/minecraft/server/BlockCommand.java b/src/main/java/net/minecraft/server/BlockCommand.java index 6b353a99c04e0312f520f8559c05ddaf51c26aaf..0d69bdee165b37c88bcdd8e19160e3d4b1c253f1 100644 --- a/src/main/java/net/minecraft/server/BlockCommand.java +++ b/src/main/java/net/minecraft/server/BlockCommand.java @@ -1,10 +1,10 @@ package net.minecraft.server; -import java.util.Random; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.bukkit.event.block.BlockRedstoneEvent; -import org.bukkit.event.block.BlockRedstoneEvent; // CraftBukkit +import java.util.Random; public class BlockCommand extends BlockTileEntity { diff --git a/src/main/java/net/minecraft/server/BlockComposter.java b/src/main/java/net/minecraft/server/BlockComposter.java index c4e3a306446163903a269cdb1b1d65480f7d1dce..0a7137b096db1807950f0b6754ff2644df97892d 100644 --- a/src/main/java/net/minecraft/server/BlockComposter.java +++ b/src/main/java/net/minecraft/server/BlockComposter.java @@ -2,11 +2,11 @@ package net.minecraft.server; import it.unimi.dsi.fastutil.objects.Object2FloatMap; import it.unimi.dsi.fastutil.objects.Object2FloatOpenHashMap; -import java.util.Random; -import javax.annotation.Nullable; -// CraftBukkit start import org.bukkit.craftbukkit.inventory.CraftBlockInventoryHolder; import org.bukkit.craftbukkit.util.DummyGeneratorAccess; + +import javax.annotation.Nullable; +import java.util.Random; // CraftBukkit end public class BlockComposter extends Block implements IInventoryHolder { diff --git a/src/main/java/net/minecraft/server/BlockCoral.java b/src/main/java/net/minecraft/server/BlockCoral.java index 4611577966e19836311098d5b1a2d1e596327466..ead4fa9c767e07cac7e031c2f2c5ed18cdbd723f 100644 --- a/src/main/java/net/minecraft/server/BlockCoral.java +++ b/src/main/java/net/minecraft/server/BlockCoral.java @@ -1,7 +1,7 @@ package net.minecraft.server; -import java.util.Random; import javax.annotation.Nullable; +import java.util.Random; public class BlockCoral extends Block { diff --git a/src/main/java/net/minecraft/server/BlockCrops.java b/src/main/java/net/minecraft/server/BlockCrops.java index a9897d4c8b3ef864b050b20eb7d1cee2c889aafb..45f8f1b9fb05f5598d0ae493d6394b314c01a0d1 100644 --- a/src/main/java/net/minecraft/server/BlockCrops.java +++ b/src/main/java/net/minecraft/server/BlockCrops.java @@ -1,8 +1,8 @@ package net.minecraft.server; -import java.util.Random; +import org.bukkit.craftbukkit.event.CraftEventFactory; -import org.bukkit.craftbukkit.event.CraftEventFactory; // CraftBukkit +import java.util.Random; public class BlockCrops extends BlockPlant implements IBlockFragilePlantElement { diff --git a/src/main/java/net/minecraft/server/BlockDiodeAbstract.java b/src/main/java/net/minecraft/server/BlockDiodeAbstract.java index 682e3222435e68c38d91f430f224cae1b52db8cf..4dc2546db159ea770b07295962e11315f255fc37 100644 --- a/src/main/java/net/minecraft/server/BlockDiodeAbstract.java +++ b/src/main/java/net/minecraft/server/BlockDiodeAbstract.java @@ -1,8 +1,8 @@ package net.minecraft.server; -import java.util.Random; +import org.bukkit.craftbukkit.event.CraftEventFactory; -import org.bukkit.craftbukkit.event.CraftEventFactory; // CraftBukkit +import java.util.Random; public abstract class BlockDiodeAbstract extends BlockFacingHorizontal { diff --git a/src/main/java/net/minecraft/server/BlockDispenser.java b/src/main/java/net/minecraft/server/BlockDispenser.java index 34f33777258ae4c3e9c15b236d329b2c89d2bc69..65e41ce3363638d7b7062a3de974527e1e7ea692 100644 --- a/src/main/java/net/minecraft/server/BlockDispenser.java +++ b/src/main/java/net/minecraft/server/BlockDispenser.java @@ -1,6 +1,7 @@ package net.minecraft.server; import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap; + import java.util.Map; import java.util.Random; diff --git a/src/main/java/net/minecraft/server/BlockDoor.java b/src/main/java/net/minecraft/server/BlockDoor.java index 9d28c00cb1c1e6aff0a4a3c5201b1aae7f887d9f..c32cdc4856e1a0062796f7b25402357418d85a44 100644 --- a/src/main/java/net/minecraft/server/BlockDoor.java +++ b/src/main/java/net/minecraft/server/BlockDoor.java @@ -1,8 +1,8 @@ package net.minecraft.server; -import javax.annotation.Nullable; +import org.bukkit.event.block.BlockRedstoneEvent; -import org.bukkit.event.block.BlockRedstoneEvent; // CraftBukkit +import javax.annotation.Nullable; public class BlockDoor extends Block { diff --git a/src/main/java/net/minecraft/server/BlockDragonEgg.java b/src/main/java/net/minecraft/server/BlockDragonEgg.java index ee397cb7fd4160da31efd200ad3db19644abc494..7ea9155c4bf91516fd555c64253daeb8b3e9a42a 100644 --- a/src/main/java/net/minecraft/server/BlockDragonEgg.java +++ b/src/main/java/net/minecraft/server/BlockDragonEgg.java @@ -1,6 +1,6 @@ package net.minecraft.server; -import org.bukkit.event.block.BlockFromToEvent; // CraftBukkit +import org.bukkit.event.block.BlockFromToEvent; public class BlockDragonEgg extends BlockFalling { diff --git a/src/main/java/net/minecraft/server/BlockFire.java b/src/main/java/net/minecraft/server/BlockFire.java index a8875a9a5fa6b285b41f3de1bc81c44f35ea5cce..41bbb8d9d2f9da2a71a95e00b0048aa62deb0429 100644 --- a/src/main/java/net/minecraft/server/BlockFire.java +++ b/src/main/java/net/minecraft/server/BlockFire.java @@ -1,16 +1,15 @@ package net.minecraft.server; +import com.destroystokyo.paper.event.block.TNTPrimeEvent; import it.unimi.dsi.fastutil.objects.Object2IntMap; import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap; -import com.destroystokyo.paper.event.block.TNTPrimeEvent; // Paper - TNTPrimeEvent -import java.util.Map; -import java.util.Random; - -// CraftBukkit start import org.bukkit.craftbukkit.block.CraftBlockState; import org.bukkit.craftbukkit.event.CraftEventFactory; import org.bukkit.event.block.BlockBurnEvent; import org.bukkit.event.block.BlockFadeEvent; + +import java.util.Map; +import java.util.Random; // CraftBukkit end public class BlockFire extends BlockFireAbstract { diff --git a/src/main/java/net/minecraft/server/BlockFluids.java b/src/main/java/net/minecraft/server/BlockFluids.java index a28ac8b00b22a8c7afc2b64f9720a4e32b653e5f..335750d4a247c8898ffec3512f3b3453b4e84340 100644 --- a/src/main/java/net/minecraft/server/BlockFluids.java +++ b/src/main/java/net/minecraft/server/BlockFluids.java @@ -1,6 +1,7 @@ package net.minecraft.server; import com.google.common.collect.Lists; + import java.util.Collections; import java.util.List; import java.util.Random; diff --git a/src/main/java/net/minecraft/server/BlockIce.java b/src/main/java/net/minecraft/server/BlockIce.java index aba5c6b8713c04302632bd1d289fd968c9e0607a..7b74d7f6fe8d198664d09463b0c28bce076075c6 100644 --- a/src/main/java/net/minecraft/server/BlockIce.java +++ b/src/main/java/net/minecraft/server/BlockIce.java @@ -1,7 +1,7 @@ package net.minecraft.server; -import java.util.Random; import javax.annotation.Nullable; +import java.util.Random; public class BlockIce extends BlockHalfTransparent { diff --git a/src/main/java/net/minecraft/server/BlockLeaves.java b/src/main/java/net/minecraft/server/BlockLeaves.java index 468d0bf193f9a90e734ff413b223e83d431113e7..03d0c9ca4facbac2c573e86938cece0942b2369d 100644 --- a/src/main/java/net/minecraft/server/BlockLeaves.java +++ b/src/main/java/net/minecraft/server/BlockLeaves.java @@ -1,8 +1,8 @@ package net.minecraft.server; -import java.util.Random; +import org.bukkit.event.block.LeavesDecayEvent; -import org.bukkit.event.block.LeavesDecayEvent; // CraftBukkit +import java.util.Random; public class BlockLeaves extends Block { diff --git a/src/main/java/net/minecraft/server/BlockLectern.java b/src/main/java/net/minecraft/server/BlockLectern.java index 87bdc49f90eee5c45ffee1d8fd5085198339fe9c..7e5d3384b7fbb1be218bbb1259e9b5ec55ed69c0 100644 --- a/src/main/java/net/minecraft/server/BlockLectern.java +++ b/src/main/java/net/minecraft/server/BlockLectern.java @@ -1,7 +1,7 @@ package net.minecraft.server; -import java.util.Random; import javax.annotation.Nullable; +import java.util.Random; public class BlockLectern extends BlockTileEntity { diff --git a/src/main/java/net/minecraft/server/BlockLever.java b/src/main/java/net/minecraft/server/BlockLever.java index 641c543c5d177ee4a4644609a89982953075270f..f1e38e4f1d95b07f45f4201b6093adf0ed7e0b55 100644 --- a/src/main/java/net/minecraft/server/BlockLever.java +++ b/src/main/java/net/minecraft/server/BlockLever.java @@ -1,6 +1,6 @@ package net.minecraft.server; -import org.bukkit.event.block.BlockRedstoneEvent; // CraftBukkit +import org.bukkit.event.block.BlockRedstoneEvent; public class BlockLever extends BlockAttachable { diff --git a/src/main/java/net/minecraft/server/BlockMinecartDetector.java b/src/main/java/net/minecraft/server/BlockMinecartDetector.java index b8e91fca957c8a39c9fbf4f87c089c4ce710c8e0..f8a91f5e3cb75ac2fbee6f2cb951ade66006a93e 100644 --- a/src/main/java/net/minecraft/server/BlockMinecartDetector.java +++ b/src/main/java/net/minecraft/server/BlockMinecartDetector.java @@ -1,12 +1,12 @@ package net.minecraft.server; +import org.bukkit.event.block.BlockRedstoneEvent; + +import javax.annotation.Nullable; import java.util.Iterator; import java.util.List; import java.util.Random; import java.util.function.Predicate; -import javax.annotation.Nullable; - -import org.bukkit.event.block.BlockRedstoneEvent; // CraftBukkit public class BlockMinecartDetector extends BlockMinecartTrackAbstract { diff --git a/src/main/java/net/minecraft/server/BlockMonsterEggs.java b/src/main/java/net/minecraft/server/BlockMonsterEggs.java index 159416e307daac88dfe85fcb8cc9292ef7fb92d4..a8d48e3e9be1ed0a7bc61d73795a8c8ae5dfacfc 100644 --- a/src/main/java/net/minecraft/server/BlockMonsterEggs.java +++ b/src/main/java/net/minecraft/server/BlockMonsterEggs.java @@ -1,9 +1,9 @@ package net.minecraft.server; import com.google.common.collect.Maps; -import java.util.Map; +import org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason; -import org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason; // CraftBukkit +import java.util.Map; public class BlockMonsterEggs extends Block { diff --git a/src/main/java/net/minecraft/server/BlockMushroom.java b/src/main/java/net/minecraft/server/BlockMushroom.java index a52444463f527ec402d6b975f322782a6864d5bb..45c721e59c8d2639b154c948b9f6a540a88da83e 100644 --- a/src/main/java/net/minecraft/server/BlockMushroom.java +++ b/src/main/java/net/minecraft/server/BlockMushroom.java @@ -1,10 +1,9 @@ package net.minecraft.server; +import org.bukkit.TreeType; + import java.util.Iterator; import java.util.Random; - -// CraftBukkit start -import org.bukkit.TreeType; // CraftBukkit end public class BlockMushroom extends BlockPlant implements IBlockFragilePlantElement { diff --git a/src/main/java/net/minecraft/server/BlockObserver.java b/src/main/java/net/minecraft/server/BlockObserver.java index 7dfe632523f7fc4426a035b6bf23917b2ea80389..595851324fc06ebb5b590b67b53ba7437665a794 100644 --- a/src/main/java/net/minecraft/server/BlockObserver.java +++ b/src/main/java/net/minecraft/server/BlockObserver.java @@ -1,8 +1,8 @@ package net.minecraft.server; -import java.util.Random; +import org.bukkit.craftbukkit.event.CraftEventFactory; -import org.bukkit.craftbukkit.event.CraftEventFactory; // CraftBukkit +import java.util.Random; public class BlockObserver extends BlockDirectional { diff --git a/src/main/java/net/minecraft/server/BlockPiston.java b/src/main/java/net/minecraft/server/BlockPiston.java index 3d6f8d948d293ca57bf158bcd1f58e289d937fb5..c03d519d937bca13e9c4750de3a56603c44e72df 100644 --- a/src/main/java/net/minecraft/server/BlockPiston.java +++ b/src/main/java/net/minecraft/server/BlockPiston.java @@ -1,18 +1,17 @@ package net.minecraft.server; +import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; import com.google.common.collect.Maps; +import org.bukkit.craftbukkit.block.CraftBlock; +import org.bukkit.event.block.BlockPistonExtendEvent; +import org.bukkit.event.block.BlockPistonRetractEvent; + +import java.util.AbstractList; import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Map.Entry; - -// CraftBukkit start -import com.google.common.collect.ImmutableList; -import java.util.AbstractList; -import org.bukkit.craftbukkit.block.CraftBlock; -import org.bukkit.event.block.BlockPistonRetractEvent; -import org.bukkit.event.block.BlockPistonExtendEvent; // CraftBukkit end public class BlockPiston extends BlockDirectional { diff --git a/src/main/java/net/minecraft/server/BlockPistonMoving.java b/src/main/java/net/minecraft/server/BlockPistonMoving.java index bf76615d720911fa3f31efb05fa49f2a1ec239ac..29ea9b650b3fbed4d2f4bc9332ce26d92ce2e01e 100644 --- a/src/main/java/net/minecraft/server/BlockPistonMoving.java +++ b/src/main/java/net/minecraft/server/BlockPistonMoving.java @@ -1,8 +1,8 @@ package net.minecraft.server; +import javax.annotation.Nullable; import java.util.Collections; import java.util.List; -import javax.annotation.Nullable; public class BlockPistonMoving extends BlockTileEntity { diff --git a/src/main/java/net/minecraft/server/BlockPortal.java b/src/main/java/net/minecraft/server/BlockPortal.java index 77f8d5e6662fa75e622f07b3e6efae04c38735fe..f044de840b24055b24f0a039e18331c13161511d 100644 --- a/src/main/java/net/minecraft/server/BlockPortal.java +++ b/src/main/java/net/minecraft/server/BlockPortal.java @@ -1,14 +1,13 @@ package net.minecraft.server; import com.google.common.cache.LoadingCache; -import java.util.Random; -import javax.annotation.Nullable; - -// CraftBukkit start import org.bukkit.craftbukkit.block.CraftBlock; import org.bukkit.craftbukkit.block.CraftBlockState; import org.bukkit.event.entity.EntityPortalEnterEvent; import org.bukkit.event.world.PortalCreateEvent; + +import javax.annotation.Nullable; +import java.util.Random; // CraftBukkit end public class BlockPortal extends Block { diff --git a/src/main/java/net/minecraft/server/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java index c77f71b6de87757900b3734feda819754e9408b1..ea42b2a0ebfabe57055785f95b018e2d2c2bfa7a 100644 --- a/src/main/java/net/minecraft/server/BlockPosition.java +++ b/src/main/java/net/minecraft/server/BlockPosition.java @@ -2,15 +2,16 @@ package net.minecraft.server; import com.google.common.collect.AbstractIterator; import com.mojang.serialization.Codec; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +import javax.annotation.concurrent.Immutable; import java.util.Optional; import java.util.Random; import java.util.function.Predicate; import java.util.stream.IntStream; import java.util.stream.Stream; import java.util.stream.StreamSupport; -import javax.annotation.concurrent.Immutable; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; @Immutable public class BlockPosition extends BaseBlockPosition { diff --git a/src/main/java/net/minecraft/server/BlockPoweredRail.java b/src/main/java/net/minecraft/server/BlockPoweredRail.java index d39b87b17694290b5f62191e59e5c1098c4f0a37..3b5c097defd83e3f82b695312fae3ded536f1f55 100644 --- a/src/main/java/net/minecraft/server/BlockPoweredRail.java +++ b/src/main/java/net/minecraft/server/BlockPoweredRail.java @@ -1,6 +1,6 @@ package net.minecraft.server; -import org.bukkit.craftbukkit.event.CraftEventFactory; // CraftBukkit +import org.bukkit.craftbukkit.event.CraftEventFactory; public class BlockPoweredRail extends BlockMinecartTrackAbstract { diff --git a/src/main/java/net/minecraft/server/BlockPressurePlateAbstract.java b/src/main/java/net/minecraft/server/BlockPressurePlateAbstract.java index 2878c5aa7f9f90859d8a661664765fa62e68ee2e..d163ec51b5477be2fa94767835962ab341b61b6f 100644 --- a/src/main/java/net/minecraft/server/BlockPressurePlateAbstract.java +++ b/src/main/java/net/minecraft/server/BlockPressurePlateAbstract.java @@ -1,8 +1,8 @@ package net.minecraft.server; -import java.util.Random; +import org.bukkit.event.block.BlockRedstoneEvent; -import org.bukkit.event.block.BlockRedstoneEvent; // CraftBukkit +import java.util.Random; public abstract class BlockPressurePlateAbstract extends Block { diff --git a/src/main/java/net/minecraft/server/BlockPressurePlateBinary.java b/src/main/java/net/minecraft/server/BlockPressurePlateBinary.java index ef79fbb628c4eaffe9d34de6129d6e833aac7c76..af29ceacd6d57d955dcca7b0a11559d97ffc9d96 100644 --- a/src/main/java/net/minecraft/server/BlockPressurePlateBinary.java +++ b/src/main/java/net/minecraft/server/BlockPressurePlateBinary.java @@ -1,10 +1,10 @@ package net.minecraft.server; +import org.bukkit.event.entity.EntityInteractEvent; + import java.util.Iterator; import java.util.List; -import org.bukkit.event.entity.EntityInteractEvent; // CraftBukkit - public class BlockPressurePlateBinary extends BlockPressurePlateAbstract { public static final BlockStateBoolean POWERED = BlockProperties.w; diff --git a/src/main/java/net/minecraft/server/BlockPressurePlateWeighted.java b/src/main/java/net/minecraft/server/BlockPressurePlateWeighted.java index e358cce6fad4b71c199bcd432dfcd6e393a7ad3c..f76dd0f7f2d6a68aad2f19b2e926138c9c0c0ad0 100644 --- a/src/main/java/net/minecraft/server/BlockPressurePlateWeighted.java +++ b/src/main/java/net/minecraft/server/BlockPressurePlateWeighted.java @@ -1,6 +1,6 @@ package net.minecraft.server; -import org.bukkit.event.entity.EntityInteractEvent; // CraftBukkit +import org.bukkit.event.entity.EntityInteractEvent; public class BlockPressurePlateWeighted extends BlockPressurePlateAbstract { diff --git a/src/main/java/net/minecraft/server/BlockPumpkinCarved.java b/src/main/java/net/minecraft/server/BlockPumpkinCarved.java index c8ef631e1e77ea534e782b35027c2ca5ea57aaa3..f07d09348145f795c3788ffb4577c30a7b2e5bb6 100644 --- a/src/main/java/net/minecraft/server/BlockPumpkinCarved.java +++ b/src/main/java/net/minecraft/server/BlockPumpkinCarved.java @@ -1,13 +1,11 @@ package net.minecraft.server; -import java.util.Iterator; -import java.util.function.Predicate; -import javax.annotation.Nullable; - -// CraftBukkit start import org.bukkit.craftbukkit.util.BlockStateListPopulator; -import org.bukkit.event.block.BlockRedstoneEvent; import org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason; + +import javax.annotation.Nullable; +import java.util.Iterator; +import java.util.function.Predicate; // CraftBukkit end public class BlockPumpkinCarved extends BlockFacingHorizontal implements ItemWearable { diff --git a/src/main/java/net/minecraft/server/BlockRedstoneComparator.java b/src/main/java/net/minecraft/server/BlockRedstoneComparator.java index 3e771f6d770932b8b71b9e13c3adf71ac9249709..70595d2a00fef8664224060865adb7cc6fc89c0e 100644 --- a/src/main/java/net/minecraft/server/BlockRedstoneComparator.java +++ b/src/main/java/net/minecraft/server/BlockRedstoneComparator.java @@ -1,10 +1,10 @@ package net.minecraft.server; +import org.bukkit.craftbukkit.event.CraftEventFactory; + +import javax.annotation.Nullable; import java.util.List; import java.util.Random; -import javax.annotation.Nullable; - -import org.bukkit.craftbukkit.event.CraftEventFactory; // CraftBukkit public class BlockRedstoneComparator extends BlockDiodeAbstract implements ITileEntity { diff --git a/src/main/java/net/minecraft/server/BlockRedstoneLamp.java b/src/main/java/net/minecraft/server/BlockRedstoneLamp.java index 22a1863ca88ce41ff5f899821c252ca7f2e87f63..154d217a27c490542e36f41b547e4905e728fb8f 100644 --- a/src/main/java/net/minecraft/server/BlockRedstoneLamp.java +++ b/src/main/java/net/minecraft/server/BlockRedstoneLamp.java @@ -1,9 +1,9 @@ package net.minecraft.server; -import java.util.Random; -import javax.annotation.Nullable; +import org.bukkit.craftbukkit.event.CraftEventFactory; -import org.bukkit.craftbukkit.event.CraftEventFactory; // CraftBukkit +import javax.annotation.Nullable; +import java.util.Random; public class BlockRedstoneLamp extends Block { diff --git a/src/main/java/net/minecraft/server/BlockRedstoneOre.java b/src/main/java/net/minecraft/server/BlockRedstoneOre.java index e31a3890df554552c9db72396ef43de7af428388..7a4a481135e1457716bbe606571d143da27e654b 100644 --- a/src/main/java/net/minecraft/server/BlockRedstoneOre.java +++ b/src/main/java/net/minecraft/server/BlockRedstoneOre.java @@ -1,10 +1,9 @@ package net.minecraft.server; -import java.util.Random; - -// CraftBukkit start import org.bukkit.craftbukkit.event.CraftEventFactory; import org.bukkit.event.entity.EntityInteractEvent; + +import java.util.Random; // CraftBukkit end public class BlockRedstoneOre extends Block { diff --git a/src/main/java/net/minecraft/server/BlockRedstoneTorch.java b/src/main/java/net/minecraft/server/BlockRedstoneTorch.java index a63a60348fe45f63deec6fcb27b6be09cd2f088c..520a34550f58f35eeaf6cb62a3f0edc64abb1451 100644 --- a/src/main/java/net/minecraft/server/BlockRedstoneTorch.java +++ b/src/main/java/net/minecraft/server/BlockRedstoneTorch.java @@ -1,12 +1,8 @@ package net.minecraft.server; -import com.google.common.collect.Lists; -import java.util.List; -import java.util.Map; -import java.util.Random; -import java.util.WeakHashMap; +import org.bukkit.event.block.BlockRedstoneEvent; -import org.bukkit.event.block.BlockRedstoneEvent; // CraftBukkit +import java.util.Random; public class BlockRedstoneTorch extends BlockTorch { diff --git a/src/main/java/net/minecraft/server/BlockRedstoneWire.java b/src/main/java/net/minecraft/server/BlockRedstoneWire.java index 6abc3d4cfbe8f5cc1dbe83031d90ee8df3b2f914..f9cb85492078aec72eae938af8db2c371e9e489c 100644 --- a/src/main/java/net/minecraft/server/BlockRedstoneWire.java +++ b/src/main/java/net/minecraft/server/BlockRedstoneWire.java @@ -1,17 +1,16 @@ package net.minecraft.server; -import com.destroystokyo.paper.PaperConfig; import com.destroystokyo.paper.util.RedstoneWireTurbo; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Maps; import com.google.common.collect.Sets; import com.google.common.collect.UnmodifiableIterator; +import org.bukkit.event.block.BlockRedstoneEvent; + +import javax.annotation.Nullable; import java.util.Iterator; import java.util.Map; import java.util.Set; -import javax.annotation.Nullable; - -import org.bukkit.event.block.BlockRedstoneEvent; // CraftBukkit public class BlockRedstoneWire extends Block { diff --git a/src/main/java/net/minecraft/server/BlockSapling.java b/src/main/java/net/minecraft/server/BlockSapling.java index e08af2850f2da35b62cbf1203f3f5ffcf759565a..de5ee6c9af67b7ce82c5b3699120f649fdd69652 100644 --- a/src/main/java/net/minecraft/server/BlockSapling.java +++ b/src/main/java/net/minecraft/server/BlockSapling.java @@ -1,12 +1,11 @@ package net.minecraft.server; -import java.util.Random; - -// CraftBukkit start import org.bukkit.Location; import org.bukkit.TreeType; import org.bukkit.block.BlockState; import org.bukkit.event.world.StructureGrowEvent; + +import java.util.Random; // CraftBukkit end public class BlockSapling extends BlockPlant implements IBlockFragilePlantElement { diff --git a/src/main/java/net/minecraft/server/BlockSnow.java b/src/main/java/net/minecraft/server/BlockSnow.java index 66f188c9eb6431eedfd655a1dd4a35b5141e7196..fd254e83a2a18a45a1f3fef65d08d3a1e3e2116a 100644 --- a/src/main/java/net/minecraft/server/BlockSnow.java +++ b/src/main/java/net/minecraft/server/BlockSnow.java @@ -1,7 +1,7 @@ package net.minecraft.server; -import java.util.Random; import javax.annotation.Nullable; +import java.util.Random; public class BlockSnow extends Block { diff --git a/src/main/java/net/minecraft/server/BlockSoil.java b/src/main/java/net/minecraft/server/BlockSoil.java index a315e2628c35ee713b68741c6e52c4b140c05f27..f80e60c924228f84a785840bc9da75a016787d65 100644 --- a/src/main/java/net/minecraft/server/BlockSoil.java +++ b/src/main/java/net/minecraft/server/BlockSoil.java @@ -1,11 +1,10 @@ package net.minecraft.server; +import org.bukkit.craftbukkit.event.CraftEventFactory; +import org.bukkit.event.entity.EntityInteractEvent; + import java.util.Iterator; import java.util.Random; - -// CraftBukkit start -import org.bukkit.event.entity.EntityInteractEvent; -import org.bukkit.craftbukkit.event.CraftEventFactory; // CraftBukkit end public class BlockSoil extends Block { diff --git a/src/main/java/net/minecraft/server/BlockSponge.java b/src/main/java/net/minecraft/server/BlockSponge.java index 362750bd85bc65c304f5fece344ecdeddebaf4ee..9407c67c2b21473d5a7456f074a9860829d88393 100644 --- a/src/main/java/net/minecraft/server/BlockSponge.java +++ b/src/main/java/net/minecraft/server/BlockSponge.java @@ -1,12 +1,12 @@ package net.minecraft.server; import com.google.common.collect.Lists; -import java.util.Queue; -// CraftBukkit start -import java.util.List; import org.bukkit.craftbukkit.block.CraftBlockState; import org.bukkit.craftbukkit.util.BlockStateListPopulator; import org.bukkit.event.block.SpongeAbsorbEvent; + +import java.util.List; +import java.util.Queue; // CraftBukkit end public class BlockSponge extends Block { diff --git a/src/main/java/net/minecraft/server/BlockStateBoolean.java b/src/main/java/net/minecraft/server/BlockStateBoolean.java index 4ca8db630434915de4eaeac6c4ecd60714d7f5d9..bbaed354286c2233373f13edfd2574316b5d5434 100644 --- a/src/main/java/net/minecraft/server/BlockStateBoolean.java +++ b/src/main/java/net/minecraft/server/BlockStateBoolean.java @@ -1,6 +1,7 @@ package net.minecraft.server; import com.google.common.collect.ImmutableSet; + import java.util.Collection; import java.util.Optional; diff --git a/src/main/java/net/minecraft/server/BlockStateEnum.java b/src/main/java/net/minecraft/server/BlockStateEnum.java index 7eeb71accaae99d4398b6f24b1e9ef5a2b95b00a..71b594ccc2a68e5f0a3066b6daa9ec6e879aec01 100644 --- a/src/main/java/net/minecraft/server/BlockStateEnum.java +++ b/src/main/java/net/minecraft/server/BlockStateEnum.java @@ -7,7 +7,6 @@ import com.google.common.collect.Maps; import java.util.*; import java.util.function.Predicate; -import java.util.stream.Collectors; public class BlockStateEnum & INamable> extends IBlockState { diff --git a/src/main/java/net/minecraft/server/BlockStateInteger.java b/src/main/java/net/minecraft/server/BlockStateInteger.java index 36b84446e96faefad3b783f73df74e0f3bce8255..0d8f485ff910b8aa54b45b60453bc871d3441543 100644 --- a/src/main/java/net/minecraft/server/BlockStateInteger.java +++ b/src/main/java/net/minecraft/server/BlockStateInteger.java @@ -2,6 +2,7 @@ package net.minecraft.server; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; + import java.util.Collection; import java.util.Optional; import java.util.Set; diff --git a/src/main/java/net/minecraft/server/BlockStem.java b/src/main/java/net/minecraft/server/BlockStem.java index c6b8c37f076c0a5ce11d5187b059ea1ab5c03369..ce99f308689c8073bf4b6dd65604016aa0102f60 100644 --- a/src/main/java/net/minecraft/server/BlockStem.java +++ b/src/main/java/net/minecraft/server/BlockStem.java @@ -1,8 +1,8 @@ package net.minecraft.server; -import java.util.Random; +import org.bukkit.craftbukkit.event.CraftEventFactory; -import org.bukkit.craftbukkit.event.CraftEventFactory; // CraftBukkit +import java.util.Random; public class BlockStem extends BlockPlant implements IBlockFragilePlantElement { diff --git a/src/main/java/net/minecraft/server/BlockSweetBerryBush.java b/src/main/java/net/minecraft/server/BlockSweetBerryBush.java index 3aa46479dcc462b62026195eb6f5abe8a193c443..679d4dd446efad0a8927f66cf3cd84802a3b08af 100644 --- a/src/main/java/net/minecraft/server/BlockSweetBerryBush.java +++ b/src/main/java/net/minecraft/server/BlockSweetBerryBush.java @@ -1,12 +1,12 @@ package net.minecraft.server; -import java.util.Random; -// CraftBukkit start -import java.util.Collections; import org.bukkit.craftbukkit.block.CraftBlock; import org.bukkit.craftbukkit.event.CraftEventFactory; import org.bukkit.craftbukkit.inventory.CraftItemStack; import org.bukkit.event.player.PlayerHarvestBlockEvent; + +import java.util.Collections; +import java.util.Random; // CraftBukkit end public class BlockSweetBerryBush extends BlockPlant implements IBlockFragilePlantElement { diff --git a/src/main/java/net/minecraft/server/BlockTNT.java b/src/main/java/net/minecraft/server/BlockTNT.java index 7b601955f3fd36f06c838b896b455a606954d980..1f54c5e97adc0de5db11d7ec0708f5796fedd453 100644 --- a/src/main/java/net/minecraft/server/BlockTNT.java +++ b/src/main/java/net/minecraft/server/BlockTNT.java @@ -1,7 +1,8 @@ package net.minecraft.server; +import com.destroystokyo.paper.event.block.TNTPrimeEvent; + import javax.annotation.Nullable; -import com.destroystokyo.paper.event.block.TNTPrimeEvent; // Paper - TNTPrimeEvent public class BlockTNT extends Block { diff --git a/src/main/java/net/minecraft/server/BlockTrapdoor.java b/src/main/java/net/minecraft/server/BlockTrapdoor.java index 313b1bdd2cb78564e09ba7fa05ccfc8d7ab1c373..49b3f24162067a28f7886c3ab3bde8c031371350 100644 --- a/src/main/java/net/minecraft/server/BlockTrapdoor.java +++ b/src/main/java/net/minecraft/server/BlockTrapdoor.java @@ -1,7 +1,8 @@ package net.minecraft.server; +import org.bukkit.event.block.BlockRedstoneEvent; + import javax.annotation.Nullable; -import org.bukkit.event.block.BlockRedstoneEvent; // CraftBukkit public class BlockTrapdoor extends BlockFacingHorizontal implements IBlockWaterlogged { diff --git a/src/main/java/net/minecraft/server/BlockTripwire.java b/src/main/java/net/minecraft/server/BlockTripwire.java index 5c401f28191c83b1a121d8cef4a5d8b2e681de49..e04bf62581a5d0fca29bf2d49bab7c3d37fe7cfa 100644 --- a/src/main/java/net/minecraft/server/BlockTripwire.java +++ b/src/main/java/net/minecraft/server/BlockTripwire.java @@ -1,12 +1,12 @@ package net.minecraft.server; +import org.bukkit.event.entity.EntityInteractEvent; + import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Random; -import org.bukkit.event.entity.EntityInteractEvent; // CraftBukkit - public class BlockTripwire extends Block { public static final BlockStateBoolean POWERED = BlockProperties.w; diff --git a/src/main/java/net/minecraft/server/BlockTripwireHook.java b/src/main/java/net/minecraft/server/BlockTripwireHook.java index dd30810569325096d35a367c4348e09f1463b2a9..fabc713798e7292d376db4ba74d2820ed18bd4e8 100644 --- a/src/main/java/net/minecraft/server/BlockTripwireHook.java +++ b/src/main/java/net/minecraft/server/BlockTripwireHook.java @@ -1,10 +1,10 @@ package net.minecraft.server; import com.google.common.base.MoreObjects; -import java.util.Random; -import javax.annotation.Nullable; +import org.bukkit.event.block.BlockRedstoneEvent; -import org.bukkit.event.block.BlockRedstoneEvent; // CraftBukkit +import javax.annotation.Nullable; +import java.util.Random; public class BlockTripwireHook extends Block { diff --git a/src/main/java/net/minecraft/server/BlockTurtleEgg.java b/src/main/java/net/minecraft/server/BlockTurtleEgg.java index 553c8affab6228cb187549deb5b34f79ba8f912c..77478d89afd0dcaef3b726b1e320a72bbd30e04e 100644 --- a/src/main/java/net/minecraft/server/BlockTurtleEgg.java +++ b/src/main/java/net/minecraft/server/BlockTurtleEgg.java @@ -1,12 +1,11 @@ package net.minecraft.server; -import java.util.Random; -import javax.annotation.Nullable; import org.bukkit.craftbukkit.block.CraftBlock; - -// CraftBukkit start -import org.bukkit.event.entity.EntityInteractEvent; import org.bukkit.craftbukkit.event.CraftEventFactory; +import org.bukkit.event.entity.EntityInteractEvent; + +import javax.annotation.Nullable; +import java.util.Random; // CraftBukkit end public class BlockTurtleEgg extends Block { diff --git a/src/main/java/net/minecraft/server/BlockVine.java b/src/main/java/net/minecraft/server/BlockVine.java index b580caace70428b079fdc35b4e96ad87c9a1c057..48bbf6d3b5dcbe6c188066dd2ef9219dc903f19c 100644 --- a/src/main/java/net/minecraft/server/BlockVine.java +++ b/src/main/java/net/minecraft/server/BlockVine.java @@ -1,11 +1,11 @@ package net.minecraft.server; +import org.bukkit.craftbukkit.event.CraftEventFactory; + +import javax.annotation.Nullable; import java.util.Iterator; import java.util.Map; import java.util.Random; -import javax.annotation.Nullable; - -import org.bukkit.craftbukkit.event.CraftEventFactory; // CraftBukkit public class BlockVine extends Block { diff --git a/src/main/java/net/minecraft/server/BlockWitherSkull.java b/src/main/java/net/minecraft/server/BlockWitherSkull.java index 5551da3bebeb87bc4037f0d4d59aaf4f05351760..c17ec61f589b7177af7ae44aa1f018d6e9f9aa1a 100644 --- a/src/main/java/net/minecraft/server/BlockWitherSkull.java +++ b/src/main/java/net/minecraft/server/BlockWitherSkull.java @@ -1,11 +1,10 @@ package net.minecraft.server; -import java.util.Iterator; -import javax.annotation.Nullable; - -// CraftBukkit start import org.bukkit.craftbukkit.util.BlockStateListPopulator; import org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason; + +import javax.annotation.Nullable; +import java.util.Iterator; // CraftBukkit end public class BlockWitherSkull extends BlockSkull { diff --git a/src/main/java/net/minecraft/server/BossBattleCustom.java b/src/main/java/net/minecraft/server/BossBattleCustom.java index 00b1d1bd873c6fe5e1c26973e2b09dd688e4b150..722a2b229a2ecea9da0d59ab6c471b24394a1996 100644 --- a/src/main/java/net/minecraft/server/BossBattleCustom.java +++ b/src/main/java/net/minecraft/server/BossBattleCustom.java @@ -1,14 +1,13 @@ package net.minecraft.server; import com.google.common.collect.Sets; +import org.bukkit.boss.KeyedBossBar; +import org.bukkit.craftbukkit.boss.CraftKeyedBossbar; + import java.util.Collection; import java.util.Iterator; import java.util.Set; import java.util.UUID; - -// CraftBukkit start -import org.bukkit.boss.KeyedBossBar; -import org.bukkit.craftbukkit.boss.CraftKeyedBossbar; // CraftBukkit end public class BossBattleCustom extends BossBattleServer { diff --git a/src/main/java/net/minecraft/server/ChatHexColor.java b/src/main/java/net/minecraft/server/ChatHexColor.java index 3cb6ad020da3018f4392b0791e50e6c2ebee869a..5e7f063f5e7a4f41554d13042726fb8b981365e3 100644 --- a/src/main/java/net/minecraft/server/ChatHexColor.java +++ b/src/main/java/net/minecraft/server/ChatHexColor.java @@ -1,11 +1,12 @@ package net.minecraft.server; import com.google.common.collect.ImmutableMap; + +import javax.annotation.Nullable; import java.util.Map; import java.util.Objects; import java.util.function.Function; import java.util.stream.Stream; -import javax.annotation.Nullable; public final class ChatHexColor { diff --git a/src/main/java/net/minecraft/server/ChatModifier.java b/src/main/java/net/minecraft/server/ChatModifier.java index 9ce4fb103daaf71d399edc6abe422ef6580f3987..84d773375bedda460ba5da09e66cfb176f8a73e6 100644 --- a/src/main/java/net/minecraft/server/ChatModifier.java +++ b/src/main/java/net/minecraft/server/ChatModifier.java @@ -1,16 +1,10 @@ package net.minecraft.server; -import com.google.gson.JsonDeserializationContext; -import com.google.gson.JsonDeserializer; -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; -import com.google.gson.JsonParseException; -import com.google.gson.JsonSerializationContext; -import com.google.gson.JsonSerializer; -import com.google.gson.JsonSyntaxException; +import com.google.gson.*; + +import javax.annotation.Nullable; import java.lang.reflect.Type; import java.util.Objects; -import javax.annotation.Nullable; public class ChatModifier { diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java index 9d313fdefef21fca61a6ba58a5d2feb3251ffc09..d1d3ed44bf3ad0dc44d268b66df77051aa195fb8 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java @@ -7,21 +7,17 @@ import it.unimi.dsi.fastutil.longs.LongOpenHashSet; import it.unimi.dsi.fastutil.longs.LongSet; import it.unimi.dsi.fastutil.shorts.ShortList; import it.unimi.dsi.fastutil.shorts.ShortListIterator; -import java.util.Collection; -import java.util.Collections; -import java.util.Iterator; -import java.util.List; -import java.util.Map; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +import javax.annotation.Nullable; +import java.util.*; import java.util.Map.Entry; -import java.util.Set; import java.util.function.Consumer; import java.util.function.Predicate; import java.util.function.Supplier; import java.util.stream.Stream; import java.util.stream.StreamSupport; -import javax.annotation.Nullable; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; public class Chunk implements IChunkAccess { diff --git a/src/main/java/net/minecraft/server/ChunkCache.java b/src/main/java/net/minecraft/server/ChunkCache.java index 8eecdcde510661ec3a13a25a04ba394f6b6dc012..e49bdf51a50ef368d11f4436acad81b0360b2129 100644 --- a/src/main/java/net/minecraft/server/ChunkCache.java +++ b/src/main/java/net/minecraft/server/ChunkCache.java @@ -1,8 +1,8 @@ package net.minecraft.server; +import javax.annotation.Nullable; import java.util.function.Predicate; import java.util.stream.Stream; -import javax.annotation.Nullable; public class ChunkCache implements IBlockAccess, ICollisionAccess { diff --git a/src/main/java/net/minecraft/server/ChunkConverter.java b/src/main/java/net/minecraft/server/ChunkConverter.java index 5366314e5f889b5b8d7740bbd0f024d9b7b9d643..c52ff505f31036c00a67d4bf85302d73b3fd923e 100644 --- a/src/main/java/net/minecraft/server/ChunkConverter.java +++ b/src/main/java/net/minecraft/server/ChunkConverter.java @@ -5,15 +5,11 @@ import com.google.common.collect.Sets; import it.unimi.dsi.fastutil.objects.ObjectIterator; import it.unimi.dsi.fastutil.objects.ObjectOpenHashSet; import it.unimi.dsi.fastutil.objects.ObjectSet; -import java.util.EnumSet; -import java.util.IdentityHashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Set; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import java.util.*; + public class ChunkConverter { private static final Logger LOGGER = LogManager.getLogger(); diff --git a/src/main/java/net/minecraft/server/ChunkCoordIntPair.java b/src/main/java/net/minecraft/server/ChunkCoordIntPair.java index b7093f1682d152988a54ffc5e5579d2f0ce10ad4..939551c5a8dd3272723f164fc3bf6336fee78171 100644 --- a/src/main/java/net/minecraft/server/ChunkCoordIntPair.java +++ b/src/main/java/net/minecraft/server/ChunkCoordIntPair.java @@ -1,10 +1,10 @@ package net.minecraft.server; +import javax.annotation.Nullable; import java.util.Spliterators.AbstractSpliterator; import java.util.function.Consumer; import java.util.stream.Stream; import java.util.stream.StreamSupport; -import javax.annotation.Nullable; public class ChunkCoordIntPair { diff --git a/src/main/java/net/minecraft/server/ChunkEmpty.java b/src/main/java/net/minecraft/server/ChunkEmpty.java index fd49438961451987bd102a85484be24b341d946b..46f7f64edb26345118da9112bd6f85cf4f7e76b2 100644 --- a/src/main/java/net/minecraft/server/ChunkEmpty.java +++ b/src/main/java/net/minecraft/server/ChunkEmpty.java @@ -1,9 +1,9 @@ package net.minecraft.server; +import javax.annotation.Nullable; import java.util.Arrays; import java.util.List; import java.util.function.Predicate; -import javax.annotation.Nullable; public class ChunkEmpty extends Chunk { diff --git a/src/main/java/net/minecraft/server/ChunkGenerator.java b/src/main/java/net/minecraft/server/ChunkGenerator.java index ee6726e5c664115417c6397aa153315c8eb835a9..43b80b6667839a2769c14508fcdef71d829dc949 100644 --- a/src/main/java/net/minecraft/server/ChunkGenerator.java +++ b/src/main/java/net/minecraft/server/ChunkGenerator.java @@ -2,13 +2,10 @@ package net.minecraft.server; import com.google.common.collect.Lists; import com.mojang.serialization.Codec; -import java.util.BitSet; -import java.util.Iterator; -import java.util.List; -import java.util.ListIterator; -import java.util.Random; -import java.util.function.Function; + import javax.annotation.Nullable; +import java.util.*; +import java.util.function.Function; public abstract class ChunkGenerator { diff --git a/src/main/java/net/minecraft/server/ChunkGeneratorAbstract.java b/src/main/java/net/minecraft/server/ChunkGeneratorAbstract.java index 448745b9e499b86f3ce6938c0f0fb0fbb222a781..e6eb96017bfda10971708f59b0fd009b8905837e 100644 --- a/src/main/java/net/minecraft/server/ChunkGeneratorAbstract.java +++ b/src/main/java/net/minecraft/server/ChunkGeneratorAbstract.java @@ -7,12 +7,12 @@ import it.unimi.dsi.fastutil.objects.ObjectList; import it.unimi.dsi.fastutil.objects.ObjectListIterator; import me.jellysquid.mods.lithium.common.world.noise.SimplexNoiseCache; +import javax.annotation.Nullable; import java.util.Iterator; import java.util.List; import java.util.Random; import java.util.function.Predicate; import java.util.stream.IntStream; -import javax.annotation.Nullable; public final class ChunkGeneratorAbstract extends ChunkGenerator { diff --git a/src/main/java/net/minecraft/server/ChunkMapDistance.java b/src/main/java/net/minecraft/server/ChunkMapDistance.java index 46fc70bd9878ca089c446619f97b997c9bb27eec..eabc303195f6cc560a4c3ad33e07bcd3abb3bce7 100644 --- a/src/main/java/net/minecraft/server/ChunkMapDistance.java +++ b/src/main/java/net/minecraft/server/ChunkMapDistance.java @@ -1,29 +1,19 @@ package net.minecraft.server; import com.google.common.collect.ImmutableList; -import com.google.common.collect.Sets; import com.mojang.datafixers.util.Either; -import it.unimi.dsi.fastutil.longs.Long2ByteMap; -import it.unimi.dsi.fastutil.longs.Long2ByteOpenHashMap; -import it.unimi.dsi.fastutil.longs.Long2IntMap; -import it.unimi.dsi.fastutil.longs.Long2IntMaps; -import it.unimi.dsi.fastutil.longs.Long2IntOpenHashMap; -import it.unimi.dsi.fastutil.longs.Long2ObjectMap; +import it.unimi.dsi.fastutil.longs.*; import it.unimi.dsi.fastutil.longs.Long2ObjectMap.Entry; -import it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap; -import it.unimi.dsi.fastutil.longs.LongIterator; -import it.unimi.dsi.fastutil.longs.LongOpenHashSet; -import it.unimi.dsi.fastutil.longs.LongSet; import it.unimi.dsi.fastutil.objects.ObjectIterator; import it.unimi.dsi.fastutil.objects.ObjectOpenHashSet; import it.unimi.dsi.fastutil.objects.ObjectSet; -import java.util.Set; -import java.util.concurrent.CompletableFuture; -import java.util.concurrent.Executor; -import javax.annotation.Nullable; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.spigotmc.AsyncCatcher; // Paper +import org.spigotmc.AsyncCatcher; + +import javax.annotation.Nullable; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.Executor; public abstract class ChunkMapDistance { diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java index c12f4326f68020fbb140e97f0ef43ddcf5a71072..22f96def107223b07dd4b3b89b65cb103a061741 100644 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java @@ -1,13 +1,13 @@ package net.minecraft.server; import com.google.common.annotations.VisibleForTesting; -import com.google.common.collect.Lists; import com.mojang.datafixers.DataFixer; import com.mojang.datafixers.util.Either; + +import javax.annotation.Nullable; import java.io.File; import java.io.IOException; import java.util.Arrays; -import java.util.Collections; import java.util.List; import java.util.Optional; import java.util.concurrent.CompletableFuture; @@ -16,10 +16,6 @@ import java.util.function.BooleanSupplier; import java.util.function.Consumer; import java.util.function.Function; import java.util.function.Supplier; -import javax.annotation.Nullable; -import com.destroystokyo.paper.exception.ServerInternalException; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; public class ChunkProviderServer extends IChunkProvider { diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java index 8a7296f691008dc35502165ec694c70a145247df..6c117070ba321a1a59c97fd638c54b9126a48333 100644 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java @@ -1,25 +1,18 @@ package net.minecraft.server; -import co.aikar.timings.Timings; import com.google.common.collect.Maps; import it.unimi.dsi.fastutil.longs.LongOpenHashSet; import it.unimi.dsi.fastutil.longs.LongSet; import it.unimi.dsi.fastutil.shorts.ShortList; import it.unimi.dsi.fastutil.shorts.ShortListIterator; -import java.util.ArrayDeque; // Paper -import java.util.Arrays; -import java.util.BitSet; -import java.util.EnumSet; -import java.util.Iterator; -import java.util.Locale; -import java.util.Map; -import java.util.Map.Entry; -import java.util.Objects; -import java.util.function.Function; -import javax.annotation.Nullable; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import javax.annotation.Nullable; +import java.util.*; +import java.util.Map.Entry; +import java.util.function.Function; + public class ChunkRegionLoader { private static final Logger LOGGER = LogManager.getLogger(); diff --git a/src/main/java/net/minecraft/server/ChunkSection.java b/src/main/java/net/minecraft/server/ChunkSection.java index cf54336b8618071056ab8bf1ac13bbe6d29ced0e..bdfbd1c51aa25b06ecb4abfc0012712cbbcafaa7 100644 --- a/src/main/java/net/minecraft/server/ChunkSection.java +++ b/src/main/java/net/minecraft/server/ChunkSection.java @@ -1,8 +1,9 @@ package net.minecraft.server; -import java.util.function.Predicate; -import com.destroystokyo.paper.antixray.ChunkPacketInfo; // Paper - Anti-Xray - Add chunk packet info +import com.destroystokyo.paper.antixray.ChunkPacketInfo; + import javax.annotation.Nullable; +import java.util.function.Predicate; public class ChunkSection { diff --git a/src/main/java/net/minecraft/server/ChunkStatus.java b/src/main/java/net/minecraft/server/ChunkStatus.java index 7e32a2eab92500857e8cc07837f106dc28b371ea..aa4c400e214775fb1e6bfefd11713c1ff9418ddf 100644 --- a/src/main/java/net/minecraft/server/ChunkStatus.java +++ b/src/main/java/net/minecraft/server/ChunkStatus.java @@ -5,12 +5,13 @@ import com.google.common.collect.Lists; import com.mojang.datafixers.util.Either; import it.unimi.dsi.fastutil.ints.IntArrayList; import it.unimi.dsi.fastutil.ints.IntList; + +import javax.annotation.Nullable; import java.util.Collections; import java.util.EnumSet; import java.util.List; import java.util.concurrent.CompletableFuture; import java.util.function.Function; -import javax.annotation.Nullable; public class ChunkStatus { diff --git a/src/main/java/net/minecraft/server/CombatTracker.java b/src/main/java/net/minecraft/server/CombatTracker.java index 7f3401d5d7878e4a0f407e92bf110dbe7c7868a6..75818cd3f54dcd362f78842a640ce17f4c5913ef 100644 --- a/src/main/java/net/minecraft/server/CombatTracker.java +++ b/src/main/java/net/minecraft/server/CombatTracker.java @@ -1,10 +1,11 @@ package net.minecraft.server; import com.google.common.collect.Lists; + +import javax.annotation.Nullable; import java.util.Iterator; import java.util.List; import java.util.Optional; -import javax.annotation.Nullable; public class CombatTracker { diff --git a/src/main/java/net/minecraft/server/CommandBlockListenerAbstract.java b/src/main/java/net/minecraft/server/CommandBlockListenerAbstract.java index 3820acd65f3cd488dba964e6d9c458852570f4a0..1a802f7f8b6842858e936b73421240cf67fa38b9 100644 --- a/src/main/java/net/minecraft/server/CommandBlockListenerAbstract.java +++ b/src/main/java/net/minecraft/server/CommandBlockListenerAbstract.java @@ -1,10 +1,11 @@ package net.minecraft.server; +import org.bukkit.command.CommandSender; + +import javax.annotation.Nullable; import java.text.SimpleDateFormat; import java.util.Date; import java.util.UUID; -import javax.annotation.Nullable; -import org.bukkit.command.CommandSender; public abstract class CommandBlockListenerAbstract implements ICommandListener { diff --git a/src/main/java/net/minecraft/server/CommandDispatcher.java b/src/main/java/net/minecraft/server/CommandDispatcher.java index 4e2a5a5b152b9d0eeba39bb4073d28890df0e757..c11ba2f1c4cfea9d32a432e473a2a82f06a1356a 100644 --- a/src/main/java/net/minecraft/server/CommandDispatcher.java +++ b/src/main/java/net/minecraft/server/CommandDispatcher.java @@ -1,5 +1,6 @@ package net.minecraft.server; +import com.google.common.base.Joiner; import com.google.common.collect.Maps; import com.mojang.brigadier.ParseResults; import com.mojang.brigadier.StringReader; @@ -10,19 +11,17 @@ import com.mojang.brigadier.builder.RequiredArgumentBuilder; import com.mojang.brigadier.exceptions.CommandSyntaxException; import com.mojang.brigadier.tree.CommandNode; import com.mojang.brigadier.tree.RootCommandNode; -import java.util.Iterator; -import java.util.Map; -import java.util.function.Predicate; -import javax.annotation.Nullable; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.bukkit.event.player.PlayerCommandSendEvent; +import org.bukkit.event.server.ServerCommandEvent; -// CraftBukkit start -import com.google.common.base.Joiner; +import javax.annotation.Nullable; import java.util.Collection; +import java.util.Iterator; import java.util.LinkedHashSet; -import org.bukkit.event.player.PlayerCommandSendEvent; -import org.bukkit.event.server.ServerCommandEvent; +import java.util.Map; +import java.util.function.Predicate; // CraftBukkit end public class CommandDispatcher { diff --git a/src/main/java/net/minecraft/server/CommandEffect.java b/src/main/java/net/minecraft/server/CommandEffect.java index ee1e642b22736b2b9b9f59cc7f2c3e9edc98796b..ddb9948d3f729dff5daa039f6fba099d46333012 100644 --- a/src/main/java/net/minecraft/server/CommandEffect.java +++ b/src/main/java/net/minecraft/server/CommandEffect.java @@ -8,9 +8,10 @@ import com.mojang.brigadier.builder.LiteralArgumentBuilder; import com.mojang.brigadier.builder.RequiredArgumentBuilder; import com.mojang.brigadier.exceptions.CommandSyntaxException; import com.mojang.brigadier.exceptions.SimpleCommandExceptionType; + +import javax.annotation.Nullable; import java.util.Collection; import java.util.Iterator; -import javax.annotation.Nullable; public class CommandEffect { diff --git a/src/main/java/net/minecraft/server/CommandGamemode.java b/src/main/java/net/minecraft/server/CommandGamemode.java index 8400fa356dd2c5a76ac7741d114bf066af8043c5..9ae005dbce25bc1abf5ee6c60aff7707c77691c7 100644 --- a/src/main/java/net/minecraft/server/CommandGamemode.java +++ b/src/main/java/net/minecraft/server/CommandGamemode.java @@ -3,6 +3,7 @@ package net.minecraft.server; import com.mojang.brigadier.arguments.ArgumentType; import com.mojang.brigadier.builder.LiteralArgumentBuilder; import com.mojang.brigadier.context.CommandContext; + import java.util.Collection; import java.util.Collections; import java.util.Iterator; diff --git a/src/main/java/net/minecraft/server/CommandListenerWrapper.java b/src/main/java/net/minecraft/server/CommandListenerWrapper.java index a4995ddc82100bc460cd2021dcfa8389769d5da0..2829ea1b689286314c1d0c5579abd0c553aca405 100644 --- a/src/main/java/net/minecraft/server/CommandListenerWrapper.java +++ b/src/main/java/net/minecraft/server/CommandListenerWrapper.java @@ -8,13 +8,14 @@ import com.mojang.brigadier.exceptions.SimpleCommandExceptionType; import com.mojang.brigadier.suggestion.Suggestions; import com.mojang.brigadier.suggestion.SuggestionsBuilder; import com.mojang.brigadier.tree.CommandNode; + +import javax.annotation.Nullable; import java.util.Collection; import java.util.Iterator; import java.util.Set; import java.util.concurrent.CompletableFuture; import java.util.function.BinaryOperator; import java.util.stream.Stream; -import javax.annotation.Nullable; public class CommandListenerWrapper implements ICompletionProvider, com.destroystokyo.paper.brigadier.BukkitBrigadierCommandSource { // Paper diff --git a/src/main/java/net/minecraft/server/CommandReload.java b/src/main/java/net/minecraft/server/CommandReload.java index 2e215558e862b4ddd8262b754cd4c51ba7e52946..0767395f07990f88d88ca1a8d9666ed7181c65f8 100644 --- a/src/main/java/net/minecraft/server/CommandReload.java +++ b/src/main/java/net/minecraft/server/CommandReload.java @@ -2,11 +2,12 @@ package net.minecraft.server; import com.google.common.collect.Lists; import com.mojang.brigadier.builder.LiteralArgumentBuilder; -import java.util.Collection; -import java.util.Iterator; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import java.util.Collection; +import java.util.Iterator; + public class CommandReload { private static final Logger LOGGER = LogManager.getLogger(); diff --git a/src/main/java/net/minecraft/server/CommandSpreadPlayers.java b/src/main/java/net/minecraft/server/CommandSpreadPlayers.java index c9f4b69874e693c8e5c3346f09db7b5014dcfb63..2a1baa58de9a1061e45dea46486ea8696d95d7d2 100644 --- a/src/main/java/net/minecraft/server/CommandSpreadPlayers.java +++ b/src/main/java/net/minecraft/server/CommandSpreadPlayers.java @@ -10,12 +10,8 @@ import com.mojang.brigadier.builder.LiteralArgumentBuilder; import com.mojang.brigadier.builder.RequiredArgumentBuilder; import com.mojang.brigadier.exceptions.CommandSyntaxException; import com.mojang.brigadier.exceptions.Dynamic4CommandExceptionType; -import java.util.Collection; -import java.util.Iterator; -import java.util.Locale; -import java.util.Map; -import java.util.Random; -import java.util.Set; + +import java.util.*; public class CommandSpreadPlayers { diff --git a/src/main/java/net/minecraft/server/CommandTeleport.java b/src/main/java/net/minecraft/server/CommandTeleport.java index 203373c3bb97d331ff6c6b9e21ae4cbc8b173fe6..c0934df435089d020c2e637ec6329d9bf9276c0f 100644 --- a/src/main/java/net/minecraft/server/CommandTeleport.java +++ b/src/main/java/net/minecraft/server/CommandTeleport.java @@ -6,16 +6,12 @@ import com.mojang.brigadier.builder.RequiredArgumentBuilder; import com.mojang.brigadier.exceptions.CommandSyntaxException; import com.mojang.brigadier.exceptions.SimpleCommandExceptionType; import com.mojang.brigadier.tree.LiteralCommandNode; -import java.util.Collection; -import java.util.Collections; -import java.util.EnumSet; -import java.util.Iterator; -import java.util.Set; -import javax.annotation.Nullable; -// CraftBukkit start import org.bukkit.Location; import org.bukkit.craftbukkit.CraftWorld; import org.bukkit.event.entity.EntityTeleportEvent; + +import javax.annotation.Nullable; +import java.util.*; // CraftBukkit end public class CommandTeleport { diff --git a/src/main/java/net/minecraft/server/CommandTime.java b/src/main/java/net/minecraft/server/CommandTime.java index b1fe8d51dc78ad4d8c08108c5bd8f95eefe2f953..97ea1e66ed7d5d85cf52b8eecc93abfc5c807166 100644 --- a/src/main/java/net/minecraft/server/CommandTime.java +++ b/src/main/java/net/minecraft/server/CommandTime.java @@ -3,10 +3,10 @@ package net.minecraft.server; import com.mojang.brigadier.arguments.ArgumentType; import com.mojang.brigadier.arguments.IntegerArgumentType; import com.mojang.brigadier.builder.LiteralArgumentBuilder; -import java.util.Iterator; -// CraftBukkit start import org.bukkit.Bukkit; import org.bukkit.event.world.TimeSkipEvent; + +import java.util.Iterator; // CrafBukkit end public class CommandTime { diff --git a/src/main/java/net/minecraft/server/Container.java b/src/main/java/net/minecraft/server/Container.java index 44db4851e2e6901e816b34c2037d00948c0a2008..bd6e5f85f7cab597f1e7e076fe4305efbdf598b8 100644 --- a/src/main/java/net/minecraft/server/Container.java +++ b/src/main/java/net/minecraft/server/Container.java @@ -1,22 +1,17 @@ package net.minecraft.server; +import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import com.google.common.collect.Sets; -import java.util.Iterator; -import java.util.List; -import java.util.Set; -import javax.annotation.Nullable; - -// CraftBukkit start -import com.google.common.base.Preconditions; -import java.util.HashMap; -import java.util.Map; import org.bukkit.craftbukkit.inventory.CraftInventory; import org.bukkit.craftbukkit.inventory.CraftItemStack; import org.bukkit.event.Event.Result; import org.bukkit.event.inventory.InventoryDragEvent; import org.bukkit.event.inventory.InventoryType; import org.bukkit.inventory.InventoryView; + +import javax.annotation.Nullable; +import java.util.*; // CraftBukkit end public abstract class Container { diff --git a/src/main/java/net/minecraft/server/ContainerAnvil.java b/src/main/java/net/minecraft/server/ContainerAnvil.java index fc2038df89f25c07f6f853f6df41fe9b203c3585..2b55aa0f3444c3c5c3233083cb3693e4ccac3b6d 100644 --- a/src/main/java/net/minecraft/server/ContainerAnvil.java +++ b/src/main/java/net/minecraft/server/ContainerAnvil.java @@ -1,13 +1,12 @@ package net.minecraft.server; -import java.util.Iterator; -import java.util.Map; import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; - -// CraftBukkit start import org.bukkit.craftbukkit.inventory.CraftInventoryView; + +import java.util.Iterator; +import java.util.Map; // CraftBukkit end public class ContainerAnvil extends ContainerAnvilAbstract { diff --git a/src/main/java/net/minecraft/server/ContainerBeacon.java b/src/main/java/net/minecraft/server/ContainerBeacon.java index 288390bf9210f0fcc7c85e3093a4924614dc1573..15e2f03d11ec35477401daa5e104ea76fd5de82b 100644 --- a/src/main/java/net/minecraft/server/ContainerBeacon.java +++ b/src/main/java/net/minecraft/server/ContainerBeacon.java @@ -1,6 +1,6 @@ package net.minecraft.server; -import org.bukkit.craftbukkit.inventory.CraftInventoryView; // CraftBukkit +import org.bukkit.craftbukkit.inventory.CraftInventoryView; public class ContainerBeacon extends Container { diff --git a/src/main/java/net/minecraft/server/ContainerEnchantTable.java b/src/main/java/net/minecraft/server/ContainerEnchantTable.java index 6b0e2c7fe0386b97b513be84d22bbcae7bb57ae8..3722c14e2491cd929cad00f9bd971a1fc2f56694 100644 --- a/src/main/java/net/minecraft/server/ContainerEnchantTable.java +++ b/src/main/java/net/minecraft/server/ContainerEnchantTable.java @@ -1,11 +1,5 @@ package net.minecraft.server; -import java.util.List; -import java.util.Random; - -// CraftBukkit start -import java.util.Collections; -import java.util.Map; import org.bukkit.Location; import org.bukkit.NamespacedKey; import org.bukkit.craftbukkit.inventory.CraftInventoryEnchanting; @@ -13,9 +7,13 @@ import org.bukkit.craftbukkit.inventory.CraftInventoryView; import org.bukkit.craftbukkit.inventory.CraftItemStack; import org.bukkit.craftbukkit.util.CraftNamespacedKey; import org.bukkit.enchantments.EnchantmentOffer; +import org.bukkit.entity.Player; import org.bukkit.event.enchantment.EnchantItemEvent; import org.bukkit.event.enchantment.PrepareItemEnchantEvent; -import org.bukkit.entity.Player; + +import java.util.List; +import java.util.Map; +import java.util.Random; // CraftBukkit end public class ContainerEnchantTable extends Container { diff --git a/src/main/java/net/minecraft/server/ContainerGrindstone.java b/src/main/java/net/minecraft/server/ContainerGrindstone.java index 869353bdcda753f90872a5fbad7adfa9d25447a7..667099bb130038b88bc2e1c4be076e8d725a5601 100644 --- a/src/main/java/net/minecraft/server/ContainerGrindstone.java +++ b/src/main/java/net/minecraft/server/ContainerGrindstone.java @@ -1,15 +1,14 @@ package net.minecraft.server; -import java.util.HashMap; -import java.util.Iterator; -import java.util.Map; -import java.util.Map.Entry; -import java.util.stream.Collectors; -// CraftBukkit start import org.bukkit.Location; import org.bukkit.craftbukkit.inventory.CraftInventoryGrindstone; import org.bukkit.craftbukkit.inventory.CraftInventoryView; import org.bukkit.entity.Player; + +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; +import java.util.Map.Entry; // CraftBukkit end public class ContainerGrindstone extends Container { diff --git a/src/main/java/net/minecraft/server/ContainerMerchant.java b/src/main/java/net/minecraft/server/ContainerMerchant.java index a63446048d9930ea017e417618012239df354a31..d7f3f1dabf5cef892ff51566bbacd286bc18fd1e 100644 --- a/src/main/java/net/minecraft/server/ContainerMerchant.java +++ b/src/main/java/net/minecraft/server/ContainerMerchant.java @@ -1,6 +1,6 @@ package net.minecraft.server; -import org.bukkit.craftbukkit.inventory.CraftInventoryView; // CraftBukkit +import org.bukkit.craftbukkit.inventory.CraftInventoryView; public class ContainerMerchant extends Container { diff --git a/src/main/java/net/minecraft/server/ContainerSmithing.java b/src/main/java/net/minecraft/server/ContainerSmithing.java index 38fb4717e7f52bb41a58e74207fc828c58a3c14c..b541ee24b5bf4b5fb5cd1a6e197fa76b3e3596c3 100644 --- a/src/main/java/net/minecraft/server/ContainerSmithing.java +++ b/src/main/java/net/minecraft/server/ContainerSmithing.java @@ -1,9 +1,9 @@ package net.minecraft.server; -import java.util.List; -import javax.annotation.Nullable; +import org.bukkit.craftbukkit.inventory.CraftInventoryView; -import org.bukkit.craftbukkit.inventory.CraftInventoryView; // CraftBukkit +import javax.annotation.Nullable; +import java.util.List; public class ContainerSmithing extends ContainerAnvilAbstract { diff --git a/src/main/java/net/minecraft/server/ContainerStonecutter.java b/src/main/java/net/minecraft/server/ContainerStonecutter.java index a235f6406dc06ceafea6fbe429bf595da2fea07c..0e1630424aa112df9e602f782cc430c8ffb95d4a 100644 --- a/src/main/java/net/minecraft/server/ContainerStonecutter.java +++ b/src/main/java/net/minecraft/server/ContainerStonecutter.java @@ -1,11 +1,11 @@ package net.minecraft.server; import com.google.common.collect.Lists; -import java.util.List; -// CraftBukkit start import org.bukkit.craftbukkit.inventory.CraftInventoryStonecutter; import org.bukkit.craftbukkit.inventory.CraftInventoryView; import org.bukkit.entity.Player; + +import java.util.List; // CraftBukkit end public class ContainerStonecutter extends Container { diff --git a/src/main/java/net/minecraft/server/ContainerWorkbench.java b/src/main/java/net/minecraft/server/ContainerWorkbench.java index 0700af8f1141eab1a996c5aea78c1aaa19484514..7d6a2cc31e9082c33ac8fab99721639c280c54be 100644 --- a/src/main/java/net/minecraft/server/ContainerWorkbench.java +++ b/src/main/java/net/minecraft/server/ContainerWorkbench.java @@ -1,9 +1,9 @@ package net.minecraft.server; -import java.util.Optional; -// CraftBukkit start import org.bukkit.craftbukkit.inventory.CraftInventoryCrafting; import org.bukkit.craftbukkit.inventory.CraftInventoryView; + +import java.util.Optional; // CraftBukkit end public class ContainerWorkbench extends ContainerRecipeBook { diff --git a/src/main/java/net/minecraft/server/Convertable.java b/src/main/java/net/minecraft/server/Convertable.java index 079304e8b1abb2c37febef536b1dd9f76e5ad47d..c0f2e44c6c54e22f32d5df6cbc9e926387749383 100644 --- a/src/main/java/net/minecraft/server/Convertable.java +++ b/src/main/java/net/minecraft/server/Convertable.java @@ -9,12 +9,11 @@ import com.mojang.serialization.DataResult; import com.mojang.serialization.Dynamic; import com.mojang.serialization.DynamicOps; import com.mojang.serialization.Lifecycle; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +import javax.annotation.Nullable; +import java.io.*; import java.nio.file.Files; import java.nio.file.LinkOption; import java.time.format.DateTimeFormatter; @@ -24,9 +23,6 @@ import java.time.temporal.ChronoField; import java.util.Map; import java.util.Optional; import java.util.function.BiFunction; -import javax.annotation.Nullable; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; public class Convertable { diff --git a/src/main/java/net/minecraft/server/CraftingManager.java b/src/main/java/net/minecraft/server/CraftingManager.java index 7de6e116a7e301754c637b68be39c30f610a04d7..83b8f9a7419db0dd7b9ffb36652290fbdafb3d8d 100644 --- a/src/main/java/net/minecraft/server/CraftingManager.java +++ b/src/main/java/net/minecraft/server/CraftingManager.java @@ -1,23 +1,16 @@ package net.minecraft.server; import com.google.common.collect.ImmutableMap; -import com.google.common.collect.ImmutableMap.Builder; import com.google.common.collect.Maps; -import com.google.gson.Gson; -import com.google.gson.GsonBuilder; -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; -import com.google.gson.JsonParseException; -import com.google.gson.JsonSyntaxException; +import com.google.gson.*; +import it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenHashMap; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import java.util.*; import java.util.Map.Entry; import java.util.stream.Collectors; import java.util.stream.Stream; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; - -import it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenHashMap; // CraftBukkit public class CraftingManager extends ResourceDataJson { diff --git a/src/main/java/net/minecraft/server/CrashReport.java b/src/main/java/net/minecraft/server/CrashReport.java index 7b5b8fcac615ab517b4dd8ad9fab17d635f716bc..8e48cbf130d1033f8ea65bbbe90384782b04f283 100644 --- a/src/main/java/net/minecraft/server/CrashReport.java +++ b/src/main/java/net/minecraft/server/CrashReport.java @@ -1,11 +1,12 @@ package net.minecraft.server; import com.google.common.collect.Lists; -import java.io.File; -import java.io.FileOutputStream; -import java.io.OutputStreamWriter; -import java.io.PrintWriter; -import java.io.StringWriter; +import org.apache.commons.io.IOUtils; +import org.apache.commons.lang3.ArrayUtils; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +import java.io.*; import java.nio.charset.StandardCharsets; import java.text.SimpleDateFormat; import java.util.Date; @@ -14,10 +15,6 @@ import java.util.List; import java.util.StringJoiner; import java.util.concurrent.CompletionException; import java.util.stream.Collectors; -import org.apache.commons.io.IOUtils; -import org.apache.commons.lang3.ArrayUtils; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; public class CrashReport { diff --git a/src/main/java/net/minecraft/server/CriterionTriggerAbstract.java b/src/main/java/net/minecraft/server/CriterionTriggerAbstract.java index 5fd81933f8ba30d165fb3fdf25aaf94917637539..3d9054b44fcaac45f3d37ec1b3b7cd66a55aaccc 100644 --- a/src/main/java/net/minecraft/server/CriterionTriggerAbstract.java +++ b/src/main/java/net/minecraft/server/CriterionTriggerAbstract.java @@ -1,12 +1,11 @@ package net.minecraft.server; import com.google.common.collect.Lists; -import com.google.common.collect.Maps; import com.google.common.collect.Sets; import com.google.gson.JsonObject; + import java.util.Iterator; import java.util.List; -import java.util.Map; import java.util.Set; import java.util.function.Predicate; diff --git a/src/main/java/net/minecraft/server/CustomFunction.java b/src/main/java/net/minecraft/server/CustomFunction.java index 67e1b153a6f2ff9547dd03fcf4abcbea851e69f9..759dbd50d584ed2e1ff836c90526d50d59d15691 100644 --- a/src/main/java/net/minecraft/server/CustomFunction.java +++ b/src/main/java/net/minecraft/server/CustomFunction.java @@ -4,10 +4,11 @@ import com.google.common.collect.Lists; import com.mojang.brigadier.ParseResults; import com.mojang.brigadier.StringReader; import com.mojang.brigadier.exceptions.CommandSyntaxException; + +import javax.annotation.Nullable; import java.util.ArrayDeque; import java.util.List; import java.util.Optional; -import javax.annotation.Nullable; public class CustomFunction { diff --git a/src/main/java/net/minecraft/server/CustomFunctionData.java b/src/main/java/net/minecraft/server/CustomFunctionData.java index ddfd127d0e618d373086caf2c0ce6ca218a0b021..52150f3b71552ecbd721e464be1533a759309d25 100644 --- a/src/main/java/net/minecraft/server/CustomFunctionData.java +++ b/src/main/java/net/minecraft/server/CustomFunctionData.java @@ -1,11 +1,8 @@ package net.minecraft.server; import com.google.common.collect.Lists; -import java.util.ArrayDeque; -import java.util.Collection; -import java.util.Iterator; -import java.util.List; -import java.util.Optional; + +import java.util.*; public class CustomFunctionData { diff --git a/src/main/java/net/minecraft/server/DataBits.java b/src/main/java/net/minecraft/server/DataBits.java index ed817893e6955059d026b0466c2fcd20a879769b..d109499e811123d623bed4315201bcfd71ea77fe 100644 --- a/src/main/java/net/minecraft/server/DataBits.java +++ b/src/main/java/net/minecraft/server/DataBits.java @@ -1,9 +1,10 @@ package net.minecraft.server; -import java.util.function.IntConsumer; -import javax.annotation.Nullable; import org.apache.commons.lang3.Validate; +import javax.annotation.Nullable; +import java.util.function.IntConsumer; + public class DataBits { private static final int[] a = new int[]{-1, -1, 0, Integer.MIN_VALUE, 0, 0, 1431655765, 1431655765, 0, Integer.MIN_VALUE, 0, 1, 858993459, 858993459, 0, 715827882, 715827882, 0, 613566756, 613566756, 0, Integer.MIN_VALUE, 0, 2, 477218588, 477218588, 0, 429496729, 429496729, 0, 390451572, 390451572, 0, 357913941, 357913941, 0, 330382099, 330382099, 0, 306783378, 306783378, 0, 286331153, 286331153, 0, Integer.MIN_VALUE, 0, 3, 252645135, 252645135, 0, 238609294, 238609294, 0, 226050910, 226050910, 0, 214748364, 214748364, 0, 204522252, 204522252, 0, 195225786, 195225786, 0, 186737708, 186737708, 0, 178956970, 178956970, 0, 171798691, 171798691, 0, 165191049, 165191049, 0, 159072862, 159072862, 0, 153391689, 153391689, 0, 148102320, 148102320, 0, 143165576, 143165576, 0, 138547332, 138547332, 0, Integer.MIN_VALUE, 0, 4, 130150524, 130150524, 0, 126322567, 126322567, 0, 122713351, 122713351, 0, 119304647, 119304647, 0, 116080197, 116080197, 0, 113025455, 113025455, 0, 110127366, 110127366, 0, 107374182, 107374182, 0, 104755299, 104755299, 0, 102261126, 102261126, 0, 99882960, 99882960, 0, 97612893, 97612893, 0, 95443717, 95443717, 0, 93368854, 93368854, 0, 91382282, 91382282, 0, 89478485, 89478485, 0, 87652393, 87652393, 0, 85899345, 85899345, 0, 84215045, 84215045, 0, 82595524, 82595524, 0, 81037118, 81037118, 0, 79536431, 79536431, 0, 78090314, 78090314, 0, 76695844, 76695844, 0, 75350303, 75350303, 0, 74051160, 74051160, 0, 72796055, 72796055, 0, 71582788, 71582788, 0, 70409299, 70409299, 0, 69273666, 69273666, 0, 68174084, 68174084, 0, Integer.MIN_VALUE, 0, 5}; diff --git a/src/main/java/net/minecraft/server/DataConverterFlatten.java b/src/main/java/net/minecraft/server/DataConverterFlatten.java index a68829e2c671632fa0c642cf14b4e7c4e5e50c92..8d1f58aa2601fa79f68731b68e9a8e09629efeb7 100644 --- a/src/main/java/net/minecraft/server/DataConverterFlatten.java +++ b/src/main/java/net/minecraft/server/DataConverterFlatten.java @@ -2,23 +2,17 @@ package net.minecraft.server; import com.google.common.collect.Maps; import com.google.common.collect.Sets; -import com.mojang.datafixers.DSL; -import com.mojang.datafixers.DataFix; -import com.mojang.datafixers.DataFixUtils; -import com.mojang.datafixers.OpticFinder; -import com.mojang.datafixers.TypeRewriteRule; -import com.mojang.datafixers.Typed; +import com.mojang.datafixers.*; import com.mojang.datafixers.schemas.Schema; import com.mojang.datafixers.types.Type; import com.mojang.datafixers.util.Pair; import com.mojang.serialization.Dynamic; +import javax.annotation.Nullable; import java.util.HashSet; import java.util.Map; import java.util.Optional; import java.util.Set; -import java.util.stream.Collectors; -import javax.annotation.Nullable; public class DataConverterFlatten extends DataFix { diff --git a/src/main/java/net/minecraft/server/DataConverterMap.java b/src/main/java/net/minecraft/server/DataConverterMap.java index 2a3bcf8066047ba0b54d6de4d6988fba33773a0b..85bb4850b79f15f07fdf723e79a236d755b8b330 100644 --- a/src/main/java/net/minecraft/server/DataConverterMap.java +++ b/src/main/java/net/minecraft/server/DataConverterMap.java @@ -1,14 +1,11 @@ package net.minecraft.server; -import com.mojang.datafixers.DSL; -import com.mojang.datafixers.DataFix; -import com.mojang.datafixers.OpticFinder; -import com.mojang.datafixers.TypeRewriteRule; -import com.mojang.datafixers.Typed; +import com.mojang.datafixers.*; import com.mojang.datafixers.schemas.Schema; import com.mojang.datafixers.types.Type; import com.mojang.datafixers.util.Pair; import com.mojang.serialization.Dynamic; + import java.util.Objects; import java.util.Optional; diff --git a/src/main/java/net/minecraft/server/DataConverterRegistry.java b/src/main/java/net/minecraft/server/DataConverterRegistry.java index 5d807082281527c78a08d01430e42b3ecee6d2cf..6953ca641f8a7a8481254cadda2ad83cd809767a 100644 --- a/src/main/java/net/minecraft/server/DataConverterRegistry.java +++ b/src/main/java/net/minecraft/server/DataConverterRegistry.java @@ -6,6 +6,7 @@ import com.mojang.datafixers.DataFixer; import com.mojang.datafixers.DataFixerBuilder; import com.mojang.datafixers.Typed; import com.mojang.datafixers.schemas.Schema; + import java.util.Map; import java.util.Objects; import java.util.function.BiFunction; diff --git a/src/main/java/net/minecraft/server/DataPalette.java b/src/main/java/net/minecraft/server/DataPalette.java index 75b721933ccbe8edc1cd7ea5cc4562214e26b66d..f37489d87afe759664152d76de03cca08e2cfe7d 100644 --- a/src/main/java/net/minecraft/server/DataPalette.java +++ b/src/main/java/net/minecraft/server/DataPalette.java @@ -1,7 +1,7 @@ package net.minecraft.server; -import java.util.function.Predicate; import javax.annotation.Nullable; +import java.util.function.Predicate; public interface DataPalette { diff --git a/src/main/java/net/minecraft/server/DataPaletteBlock.java b/src/main/java/net/minecraft/server/DataPaletteBlock.java index 52948a84b89554646c9ec1fd13d6d3c9e7cbf996..eada694a8e57284bdda477ccca2c250285c34fcd 100644 --- a/src/main/java/net/minecraft/server/DataPaletteBlock.java +++ b/src/main/java/net/minecraft/server/DataPaletteBlock.java @@ -1,14 +1,12 @@ package net.minecraft.server; +import com.destroystokyo.paper.antixray.ChunkPacketInfo; import it.unimi.dsi.fastutil.ints.Int2IntMap; import it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap; -import com.destroystokyo.paper.antixray.ChunkPacketInfo; // Paper - Anti-Xray - Add chunk packet info -import java.util.Arrays; -import java.util.Objects; + import java.util.concurrent.locks.ReentrantLock; import java.util.function.Function; import java.util.function.Predicate; -import java.util.stream.Collectors; public class DataPaletteBlock implements DataPaletteExpandable { diff --git a/src/main/java/net/minecraft/server/DataWatcher.java b/src/main/java/net/minecraft/server/DataWatcher.java index d8147567b4dfdc48b86f6349fca084fdb4381c42..d3105bf3dd35ad26d3df64c03174cedcdfaca178 100644 --- a/src/main/java/net/minecraft/server/DataWatcher.java +++ b/src/main/java/net/minecraft/server/DataWatcher.java @@ -4,19 +4,14 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import io.netty.handler.codec.DecoderException; import io.netty.handler.codec.EncoderException; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.concurrent.locks.ReadWriteLock; -import java.util.concurrent.locks.ReentrantReadWriteLock; -import javax.annotation.Nullable; import org.apache.commons.lang3.ObjectUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import javax.annotation.Nullable; +import java.io.IOException; +import java.util.*; + public class DataWatcher { private static final Logger LOGGER = LogManager.getLogger(); diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java index 73f4d52f24d042e287dab351edd4bfa4e22046b4..7ae538a6a7a9766f8443c0dd7cf908a028d3f9bb 100644 --- a/src/main/java/net/minecraft/server/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/DedicatedServer.java @@ -1,38 +1,28 @@ package net.minecraft.server; +import co.aikar.timings.MinecraftTimings; import com.google.common.base.Strings; -import com.google.common.collect.Lists; import com.mojang.authlib.GameProfile; import com.mojang.authlib.GameProfileRepository; import com.mojang.authlib.minecraft.MinecraftSessionService; import com.mojang.datafixers.DataFixer; -import java.io.BufferedReader; +import org.apache.logging.log4j.Level; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.bukkit.command.CommandSender; +import org.bukkit.craftbukkit.util.Waitable; +import org.bukkit.event.server.RemoteServerCommandEvent; +import org.bukkit.event.server.ServerCommandEvent; + +import javax.annotation.Nullable; import java.io.File; import java.io.IOException; -import java.io.InputStreamReader; import java.net.InetAddress; import java.net.Proxy; -import java.nio.charset.StandardCharsets; -import java.util.Collections; -import java.util.List; import java.util.Locale; import java.util.Optional; import java.util.function.BooleanSupplier; import java.util.regex.Pattern; -import javax.annotation.Nullable; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; - -// CraftBukkit start -import java.io.PrintStream; -import org.apache.logging.log4j.Level; - -import org.bukkit.command.CommandSender; -import org.bukkit.craftbukkit.LoggerOutputStream; -import co.aikar.timings.MinecraftTimings; // Paper -import org.bukkit.event.server.ServerCommandEvent; -import org.bukkit.craftbukkit.util.Waitable; -import org.bukkit.event.server.RemoteServerCommandEvent; // CraftBukkit end public class DedicatedServer extends MinecraftServer implements IMinecraftServer { diff --git a/src/main/java/net/minecraft/server/DedicatedServerProperties.java b/src/main/java/net/minecraft/server/DedicatedServerProperties.java index 6786fd0947724069366a2375c710ec518a92f2b1..addfec76b34a0af11e70d74ca8540155ba7254a3 100644 --- a/src/main/java/net/minecraft/server/DedicatedServerProperties.java +++ b/src/main/java/net/minecraft/server/DedicatedServerProperties.java @@ -1,8 +1,9 @@ package net.minecraft.server; +import joptsimple.OptionSet; + import java.util.Properties; import java.util.concurrent.TimeUnit; -import joptsimple.OptionSet; // CraftBukkit public class DedicatedServerProperties extends PropertyManager { diff --git a/src/main/java/net/minecraft/server/DedicatedServerSettings.java b/src/main/java/net/minecraft/server/DedicatedServerSettings.java index 34f2ba53dadd69b48077db6da1aada32cb65bb70..659b302de68d8c5ec598aa499955aa05275d76a9 100644 --- a/src/main/java/net/minecraft/server/DedicatedServerSettings.java +++ b/src/main/java/net/minecraft/server/DedicatedServerSettings.java @@ -1,9 +1,9 @@ package net.minecraft.server; -import java.util.function.UnaryOperator; -// CraftBukkit start -import java.io.File; import joptsimple.OptionSet; + +import java.io.File; +import java.util.function.UnaryOperator; // CraftBukkit end public class DedicatedServerSettings { diff --git a/src/main/java/net/minecraft/server/DefinedStructure.java b/src/main/java/net/minecraft/server/DefinedStructure.java index 25323eccfe0cffd6e6d17dab111d9a473e11333f..4bc8c48576ca91bd4efe02c94eaa4b8f1f740b2c 100644 --- a/src/main/java/net/minecraft/server/DefinedStructure.java +++ b/src/main/java/net/minecraft/server/DefinedStructure.java @@ -4,9 +4,8 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.mojang.datafixers.util.Pair; -import java.util.*; -import java.util.stream.Collectors; import javax.annotation.Nullable; +import java.util.*; public class DefinedStructure { diff --git a/src/main/java/net/minecraft/server/DefinedStructureManager.java b/src/main/java/net/minecraft/server/DefinedStructureManager.java index 595789d2ba8571f8375a17cabd26a06040523849..162b6989ff3b2ab0513910ad86b84dc6d29bad81 100644 --- a/src/main/java/net/minecraft/server/DefinedStructureManager.java +++ b/src/main/java/net/minecraft/server/DefinedStructureManager.java @@ -2,19 +2,15 @@ package net.minecraft.server; import com.google.common.collect.Maps; import com.mojang.datafixers.DataFixer; -import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +import javax.annotation.Nullable; +import java.io.*; import java.nio.file.Files; import java.nio.file.InvalidPathException; import java.nio.file.LinkOption; import java.util.Map; -import javax.annotation.Nullable; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; public class DefinedStructureManager { diff --git a/src/main/java/net/minecraft/server/DispenseBehaviorShears.java b/src/main/java/net/minecraft/server/DispenseBehaviorShears.java index fbd961f6d306c9173839412f48ac0698a65a3461..db743d81ea4cda5cafcccd01f3f120da9449dca4 100644 --- a/src/main/java/net/minecraft/server/DispenseBehaviorShears.java +++ b/src/main/java/net/minecraft/server/DispenseBehaviorShears.java @@ -1,11 +1,11 @@ package net.minecraft.server; -import java.util.Iterator; -import java.util.List; -// CraftBukkit start import org.bukkit.craftbukkit.event.CraftEventFactory; import org.bukkit.craftbukkit.inventory.CraftItemStack; import org.bukkit.event.block.BlockDispenseEvent; + +import java.util.Iterator; +import java.util.List; // CraftBukkit end public class DispenseBehaviorShears extends DispenseBehaviorMaybe { diff --git a/src/main/java/net/minecraft/server/DispenserRegistry.java b/src/main/java/net/minecraft/server/DispenserRegistry.java index fdb11cfc423f64a358a0ba7a828b338c11388cae..8aabda32c5bd474e6ff6e2c08d97063ac44c5ce9 100644 --- a/src/main/java/net/minecraft/server/DispenserRegistry.java +++ b/src/main/java/net/minecraft/server/DispenserRegistry.java @@ -1,20 +1,12 @@ package net.minecraft.server; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + import java.io.PrintStream; import java.util.Set; import java.util.TreeSet; import java.util.function.Function; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; - -// CraftBukkit start -import java.util.List; -import org.bukkit.Location; -import org.bukkit.TreeType; -import org.bukkit.craftbukkit.inventory.CraftItemStack; -import org.bukkit.craftbukkit.util.DummyGeneratorAccess; -import org.bukkit.event.block.BlockDispenseEvent; -import org.bukkit.event.world.StructureGrowEvent; // CraftBukkit end public class DispenserRegistry { diff --git a/src/main/java/net/minecraft/server/DragonControllerManager.java b/src/main/java/net/minecraft/server/DragonControllerManager.java index 551387dc06a42bf7e45fe09f59fd92133edcad89..504761ac9fde42edb4cbaf28136d6f6e41c7a843 100644 --- a/src/main/java/net/minecraft/server/DragonControllerManager.java +++ b/src/main/java/net/minecraft/server/DragonControllerManager.java @@ -2,7 +2,6 @@ package net.minecraft.server; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -// CraftBukkit start import org.bukkit.craftbukkit.entity.CraftEnderDragon; import org.bukkit.event.entity.EnderDragonChangePhaseEvent; // CraftBukkit end diff --git a/src/main/java/net/minecraft/server/DragonControllerStrafe.java b/src/main/java/net/minecraft/server/DragonControllerStrafe.java index ac546ff959510a2d0120c24c90bf13ff83873161..892be05e196ffed7c8bd59fff0cba89a614f5d66 100644 --- a/src/main/java/net/minecraft/server/DragonControllerStrafe.java +++ b/src/main/java/net/minecraft/server/DragonControllerStrafe.java @@ -1,9 +1,10 @@ package net.minecraft.server; -import javax.annotation.Nullable; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import javax.annotation.Nullable; + public class DragonControllerStrafe extends AbstractDragonController { private static final Logger LOGGER = LogManager.getLogger(); diff --git a/src/main/java/net/minecraft/server/EULA.java b/src/main/java/net/minecraft/server/EULA.java index e70da06948abf2aa2223a037aeb5f58fb0a466e3..30921ef96de4e98316634e2a55307b13b0c28f65 100644 --- a/src/main/java/net/minecraft/server/EULA.java +++ b/src/main/java/net/minecraft/server/EULA.java @@ -1,14 +1,14 @@ package net.minecraft.server; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + import java.io.File; import java.io.InputStream; import java.io.OutputStream; import java.nio.file.Files; import java.util.Properties; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; - public class EULA { private static final Logger LOGGER = LogManager.getLogger(); diff --git a/src/main/java/net/minecraft/server/EnchantmentFrostWalker.java b/src/main/java/net/minecraft/server/EnchantmentFrostWalker.java index 176be2e4d0d23d3e7967b6e0e99d060a96b3d976..4d769a513216c56ae93944cd99d091fa3ad97e51 100644 --- a/src/main/java/net/minecraft/server/EnchantmentFrostWalker.java +++ b/src/main/java/net/minecraft/server/EnchantmentFrostWalker.java @@ -1,9 +1,6 @@ package net.minecraft.server; import java.util.Iterator; -// CraftBukkit start -import org.bukkit.craftbukkit.util.CraftMagicNumbers; -import org.bukkit.event.block.EntityBlockFormEvent; // CraftBukkit end public class EnchantmentFrostWalker extends Enchantment { diff --git a/src/main/java/net/minecraft/server/EnchantmentManager.java b/src/main/java/net/minecraft/server/EnchantmentManager.java index 7a4768c32c426ef3cf16904e0f565a7f8fdc753f..ed7692c65b54e7b0f37794f6bd07141e32122d67 100644 --- a/src/main/java/net/minecraft/server/EnchantmentManager.java +++ b/src/main/java/net/minecraft/server/EnchantmentManager.java @@ -2,17 +2,14 @@ package net.minecraft.server; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import java.util.Collection; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; -import java.util.Random; -import java.util.function.Predicate; -import javax.annotation.Nullable; import org.apache.commons.lang3.mutable.MutableFloat; import org.apache.commons.lang3.mutable.MutableInt; +import javax.annotation.Nullable; +import java.util.*; +import java.util.Map.Entry; +import java.util.function.Predicate; + public class EnchantmentManager { public static int getEnchantmentLevel(Enchantment enchantment, ItemStack itemstack) { diff --git a/src/main/java/net/minecraft/server/EnderDragonBattle.java b/src/main/java/net/minecraft/server/EnderDragonBattle.java index e2c1de7ab246f1b4c8add06c513afc2eca97d796..589f00d27255aa1b227fea7c19a27862321c83ef 100644 --- a/src/main/java/net/minecraft/server/EnderDragonBattle.java +++ b/src/main/java/net/minecraft/server/EnderDragonBattle.java @@ -1,21 +1,13 @@ package net.minecraft.server; -import com.google.common.collect.ContiguousSet; -import com.google.common.collect.DiscreteDomain; -import com.google.common.collect.Lists; -import com.google.common.collect.Range; -import com.google.common.collect.Sets; -import java.util.Collections; -import java.util.Iterator; -import java.util.List; -import java.util.Random; -import java.util.Set; -import java.util.UUID; -import java.util.function.Predicate; -import javax.annotation.Nullable; +import com.google.common.collect.*; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import javax.annotation.Nullable; +import java.util.*; +import java.util.function.Predicate; + public class EnderDragonBattle { private static final Logger LOGGER = LogManager.getLogger(); diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java index de745c8678f5dca0a939afcd45f2cab5fae3c4f1..1779f7756a7093b558bcfc7ce96559558b911a92 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -2,11 +2,10 @@ package net.minecraft.server; import co.aikar.timings.MinecraftTimings; import co.aikar.timings.Timing; -import dev.tr7zw.yatopia.YatopiaConfig; - import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import com.google.common.collect.Sets; +import dev.tr7zw.yatopia.YatopiaConfig; import it.unimi.dsi.fastutil.objects.Object2DoubleArrayMap; import it.unimi.dsi.fastutil.objects.Object2DoubleMap; import org.apache.logging.log4j.LogManager; @@ -23,12 +22,7 @@ import org.bukkit.entity.Hanging; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Pose; import org.bukkit.entity.Vehicle; -import org.bukkit.event.entity.EntityAirChangeEvent; -import org.bukkit.event.entity.EntityCombustByEntityEvent; -import org.bukkit.event.entity.EntityCombustEvent; -import org.bukkit.event.entity.EntityDropItemEvent; -import org.bukkit.event.entity.EntityPortalEvent; -import org.bukkit.event.entity.EntityPoseChangeEvent; +import org.bukkit.event.entity.*; import org.bukkit.event.hanging.HangingBreakByEntityEvent; import org.bukkit.event.player.PlayerTeleportEvent; import org.bukkit.event.vehicle.VehicleBlockCollisionEvent; @@ -37,16 +31,7 @@ import org.bukkit.event.vehicle.VehicleExitEvent; import org.bukkit.plugin.PluginManager; import javax.annotation.Nullable; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.Iterator; -import java.util.List; -import java.util.Locale; -import java.util.Optional; -import java.util.Random; -import java.util.Set; -import java.util.UUID; +import java.util.*; import java.util.concurrent.atomic.AtomicInteger; import java.util.stream.Stream; diff --git a/src/main/java/net/minecraft/server/EntityAnimal.java b/src/main/java/net/minecraft/server/EntityAnimal.java index b1a41ca53462e50dc0d5cabfcd91579908c07b62..2b7caab9e4b150b260603b0d2481f3d2e94f6fea 100644 --- a/src/main/java/net/minecraft/server/EntityAnimal.java +++ b/src/main/java/net/minecraft/server/EntityAnimal.java @@ -1,11 +1,11 @@ package net.minecraft.server; -import java.util.Random; -import java.util.UUID; -import javax.annotation.Nullable; -// CraftBukkit start import org.bukkit.craftbukkit.event.CraftEventFactory; import org.bukkit.event.entity.EntityEnterLoveModeEvent; + +import javax.annotation.Nullable; +import java.util.Random; +import java.util.UUID; // CraftBukkit end public abstract class EntityAnimal extends EntityAgeable { diff --git a/src/main/java/net/minecraft/server/EntityAreaEffectCloud.java b/src/main/java/net/minecraft/server/EntityAreaEffectCloud.java index a6721a8872a5aae52eb39118bc490b2d2ea0a980..5a9157697e9b3b9dbd78aa20561c030957fd1243 100644 --- a/src/main/java/net/minecraft/server/EntityAreaEffectCloud.java +++ b/src/main/java/net/minecraft/server/EntityAreaEffectCloud.java @@ -4,18 +4,14 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.mojang.brigadier.StringReader; import com.mojang.brigadier.exceptions.CommandSyntaxException; -import java.util.Collection; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; -import java.util.UUID; -import javax.annotation.Nullable; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -// CraftBukkit start import org.bukkit.craftbukkit.entity.CraftLivingEntity; import org.bukkit.entity.LivingEntity; + +import javax.annotation.Nullable; +import java.util.*; +import java.util.Map.Entry; // CraftBukkit end public class EntityAreaEffectCloud extends Entity { diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java index 98b0f1efb506803dfd213ad45a48adb365094a83..c4257b33f28a8cb6c99ad34d9226422e5ef4bfc0 100644 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java @@ -1,17 +1,16 @@ package net.minecraft.server; -import java.util.Iterator; -import java.util.List; -import java.util.function.Predicate; -import javax.annotation.Nullable; - -// CraftBukkit start -import org.bukkit.inventory.EquipmentSlot; import org.bukkit.craftbukkit.CraftEquipmentSlot; import org.bukkit.craftbukkit.inventory.CraftItemStack; import org.bukkit.entity.ArmorStand; import org.bukkit.entity.Player; import org.bukkit.event.player.PlayerArmorStandManipulateEvent; +import org.bukkit.inventory.EquipmentSlot; + +import javax.annotation.Nullable; +import java.util.Iterator; +import java.util.List; +import java.util.function.Predicate; // CraftBukkit end public class EntityArmorStand extends EntityLiving { diff --git a/src/main/java/net/minecraft/server/EntityArrow.java b/src/main/java/net/minecraft/server/EntityArrow.java index 0d43eb8e1712d1b98888db7579bc343ccb1e8989..2a659eb7bc7766663828a6547da9c1b3944a90a2 100644 --- a/src/main/java/net/minecraft/server/EntityArrow.java +++ b/src/main/java/net/minecraft/server/EntityArrow.java @@ -2,15 +2,14 @@ package net.minecraft.server; import com.google.common.collect.Lists; import it.unimi.dsi.fastutil.ints.IntOpenHashSet; +import org.bukkit.event.entity.EntityCombustByEntityEvent; +import org.bukkit.event.player.PlayerPickupArrowEvent; + +import javax.annotation.Nullable; import java.util.Arrays; import java.util.Collection; import java.util.Iterator; import java.util.List; -import javax.annotation.Nullable; - -// CraftBukkit start -import org.bukkit.event.entity.EntityCombustByEntityEvent; -import org.bukkit.event.player.PlayerPickupArrowEvent; // CraftBukkit end public abstract class EntityArrow extends IProjectile { diff --git a/src/main/java/net/minecraft/server/EntityBat.java b/src/main/java/net/minecraft/server/EntityBat.java index 3dd3b8913e345471f971c4ef55bb91200eb50a33..781cadf1471cf8aa405af406bc9ae8db01d6eb8f 100644 --- a/src/main/java/net/minecraft/server/EntityBat.java +++ b/src/main/java/net/minecraft/server/EntityBat.java @@ -1,10 +1,11 @@ package net.minecraft.server; +import org.bukkit.craftbukkit.event.CraftEventFactory; + +import javax.annotation.Nullable; import java.time.LocalDate; import java.time.temporal.ChronoField; import java.util.Random; -import javax.annotation.Nullable; -import org.bukkit.craftbukkit.event.CraftEventFactory; // CraftBukkit public class EntityBat extends EntityAmbient { diff --git a/src/main/java/net/minecraft/server/EntityBee.java b/src/main/java/net/minecraft/server/EntityBee.java index c4c3ef500b9b8465644a0b7712f43ba35ad3acc1..776f4df79ac8ffad2e876e400df131f5c5691faf 100644 --- a/src/main/java/net/minecraft/server/EntityBee.java +++ b/src/main/java/net/minecraft/server/EntityBee.java @@ -1,16 +1,12 @@ package net.minecraft.server; import com.google.common.collect.Lists; -import java.util.Comparator; -import java.util.EnumSet; -import java.util.Iterator; -import java.util.List; -import java.util.Optional; -import java.util.UUID; + +import javax.annotation.Nullable; +import java.util.*; import java.util.function.Predicate; import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.annotation.Nullable; public class EntityBee extends EntityAnimal implements IEntityAngerable, EntityBird { diff --git a/src/main/java/net/minecraft/server/EntityBoat.java b/src/main/java/net/minecraft/server/EntityBoat.java index 409e0ac0a2aaccda29f7cc146dbccdd45de80e9f..e762b4db13286bd7d973d240ca3da95b9bbab57f 100644 --- a/src/main/java/net/minecraft/server/EntityBoat.java +++ b/src/main/java/net/minecraft/server/EntityBoat.java @@ -1,16 +1,15 @@ package net.minecraft.server; import com.google.common.collect.UnmodifiableIterator; -import java.util.List; -import javax.annotation.Nullable; - -// CraftBukkit start import org.bukkit.Location; import org.bukkit.entity.Vehicle; import org.bukkit.event.vehicle.VehicleDamageEvent; import org.bukkit.event.vehicle.VehicleDestroyEvent; import org.bukkit.event.vehicle.VehicleEntityCollisionEvent; import org.bukkit.event.vehicle.VehicleMoveEvent; + +import javax.annotation.Nullable; +import java.util.List; // CraftBukkit end public class EntityBoat extends Entity { diff --git a/src/main/java/net/minecraft/server/EntityCat.java b/src/main/java/net/minecraft/server/EntityCat.java index 20497c3962a2d025b11f66b4659402c9217825cf..2fad3a1ae884726f431d8e5f5106134dec322309 100644 --- a/src/main/java/net/minecraft/server/EntityCat.java +++ b/src/main/java/net/minecraft/server/EntityCat.java @@ -1,12 +1,13 @@ package net.minecraft.server; import com.google.common.collect.Maps; + +import javax.annotation.Nullable; import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Random; import java.util.function.Predicate; -import javax.annotation.Nullable; public class EntityCat extends EntityTameableAnimal { diff --git a/src/main/java/net/minecraft/server/EntityCreeper.java b/src/main/java/net/minecraft/server/EntityCreeper.java index 5e7f3af37b7cb068183fc2a7637b4c770fd5f936..46c64aa6b0676635a48452818a99322a396f0441 100644 --- a/src/main/java/net/minecraft/server/EntityCreeper.java +++ b/src/main/java/net/minecraft/server/EntityCreeper.java @@ -1,11 +1,11 @@ package net.minecraft.server; -import java.util.Collection; -import java.util.Iterator; -// CraftBukkit start import org.bukkit.craftbukkit.event.CraftEventFactory; import org.bukkit.event.entity.CreatureSpawnEvent; import org.bukkit.event.entity.ExplosionPrimeEvent; + +import java.util.Collection; +import java.util.Iterator; // CraftBukkit end public class EntityCreeper extends EntityMonster { diff --git a/src/main/java/net/minecraft/server/EntityDolphin.java b/src/main/java/net/minecraft/server/EntityDolphin.java index 053ca43e5089b098be1aaf48519848ecb04428bc..f0adab12020fa8adb2483cad7f945c4b66763cba 100644 --- a/src/main/java/net/minecraft/server/EntityDolphin.java +++ b/src/main/java/net/minecraft/server/EntityDolphin.java @@ -1,10 +1,10 @@ package net.minecraft.server; +import javax.annotation.Nullable; import java.util.EnumSet; import java.util.List; import java.util.Random; import java.util.function.Predicate; -import javax.annotation.Nullable; public class EntityDolphin extends EntityWaterAnimal { diff --git a/src/main/java/net/minecraft/server/EntityDrowned.java b/src/main/java/net/minecraft/server/EntityDrowned.java index e6425bdf1a85e773f5555db1aebe7e159f7cd37c..d8a8c62daa9bceb98ec70f745c351e6d162d35d8 100644 --- a/src/main/java/net/minecraft/server/EntityDrowned.java +++ b/src/main/java/net/minecraft/server/EntityDrowned.java @@ -1,8 +1,8 @@ package net.minecraft.server; +import javax.annotation.Nullable; import java.util.EnumSet; import java.util.Random; -import javax.annotation.Nullable; public class EntityDrowned extends EntityZombie implements IRangedEntity { diff --git a/src/main/java/net/minecraft/server/EntityEnderCrystal.java b/src/main/java/net/minecraft/server/EntityEnderCrystal.java index 21dfe7f4251300873f2c305c1a02467b86d1bcfe..be5c79102e6dcb60061267c3d9a5a97386d09ccc 100644 --- a/src/main/java/net/minecraft/server/EntityEnderCrystal.java +++ b/src/main/java/net/minecraft/server/EntityEnderCrystal.java @@ -1,11 +1,10 @@ package net.minecraft.server; -import java.util.Optional; -import javax.annotation.Nullable; - -// CraftBukkit start import org.bukkit.craftbukkit.event.CraftEventFactory; import org.bukkit.event.entity.ExplosionPrimeEvent; + +import javax.annotation.Nullable; +import java.util.Optional; // CraftBukkit end public class EntityEnderCrystal extends Entity { diff --git a/src/main/java/net/minecraft/server/EntityEnderDragon.java b/src/main/java/net/minecraft/server/EntityEnderDragon.java index e7f897c1fb5f45c5b22ca315874a2cd8d8d2c838..c1d52acec510ea20273fc7dc83ae6453ea42990e 100644 --- a/src/main/java/net/minecraft/server/EntityEnderDragon.java +++ b/src/main/java/net/minecraft/server/EntityEnderDragon.java @@ -1,17 +1,16 @@ package net.minecraft.server; +import com.destroystokyo.paper.event.block.TNTPrimeEvent; import com.google.common.collect.Lists; -import java.util.Iterator; -import java.util.List; -import javax.annotation.Nullable; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -// CraftBukkit start import org.bukkit.craftbukkit.block.CraftBlock; import org.bukkit.event.entity.EntityExplodeEvent; import org.bukkit.event.entity.EntityRegainHealthEvent; -// CraftBukkit end -import com.destroystokyo.paper.event.block.TNTPrimeEvent; // Paper - TNTPrimeEvent + +import javax.annotation.Nullable; +import java.util.Iterator; +import java.util.List; // PAIL: Fixme public class EntityEnderDragon extends EntityInsentient implements IMonster { diff --git a/src/main/java/net/minecraft/server/EntityEnderPearl.java b/src/main/java/net/minecraft/server/EntityEnderPearl.java index 12f18a971e50a63cc527ec56faf389beba4c23c5..290e1e198ec76c3fc08e273371e9d7ab3375df9f 100644 --- a/src/main/java/net/minecraft/server/EntityEnderPearl.java +++ b/src/main/java/net/minecraft/server/EntityEnderPearl.java @@ -1,11 +1,11 @@ package net.minecraft.server; -import javax.annotation.Nullable; -// CraftBukkit start import org.bukkit.Bukkit; import org.bukkit.craftbukkit.event.CraftEventFactory; import org.bukkit.event.entity.CreatureSpawnEvent; import org.bukkit.event.player.PlayerTeleportEvent; + +import javax.annotation.Nullable; // CraftBukkit end public class EntityEnderPearl extends EntityProjectileThrowable { diff --git a/src/main/java/net/minecraft/server/EntityEnderman.java b/src/main/java/net/minecraft/server/EntityEnderman.java index b61de33513989a9097e2729f0bd733dda687644d..e3f0067ca9981257279d0288c878ccb7786dcb82 100644 --- a/src/main/java/net/minecraft/server/EntityEnderman.java +++ b/src/main/java/net/minecraft/server/EntityEnderman.java @@ -1,12 +1,13 @@ package net.minecraft.server; +import com.destroystokyo.paper.event.entity.EndermanEscapeEvent; + +import javax.annotation.Nullable; import java.util.EnumSet; import java.util.Optional; -import com.destroystokyo.paper.event.entity.EndermanEscapeEvent; // Paper import java.util.Random; import java.util.UUID; import java.util.function.Predicate; -import javax.annotation.Nullable; public class EntityEnderman extends EntityMonster implements IEntityAngerable { diff --git a/src/main/java/net/minecraft/server/EntityEvokerFangs.java b/src/main/java/net/minecraft/server/EntityEvokerFangs.java index 31dbd21db0ba92cba3bc7816147f41d5eb53c57b..8f68721caa79fbc7ac517e24688be6bfc09b953b 100644 --- a/src/main/java/net/minecraft/server/EntityEvokerFangs.java +++ b/src/main/java/net/minecraft/server/EntityEvokerFangs.java @@ -1,9 +1,9 @@ package net.minecraft.server; +import javax.annotation.Nullable; import java.util.Iterator; import java.util.List; import java.util.UUID; -import javax.annotation.Nullable; public class EntityEvokerFangs extends Entity { diff --git a/src/main/java/net/minecraft/server/EntityExperienceOrb.java b/src/main/java/net/minecraft/server/EntityExperienceOrb.java index f01a8743ab1220052d5dafac679b9381679f632c..1e69d270c9a13a9d34e6a9abd4f1c9715d96a447 100644 --- a/src/main/java/net/minecraft/server/EntityExperienceOrb.java +++ b/src/main/java/net/minecraft/server/EntityExperienceOrb.java @@ -1,10 +1,10 @@ package net.minecraft.server; -import java.util.Map.Entry; -// CraftBukkit start import org.bukkit.craftbukkit.event.CraftEventFactory; -import org.bukkit.event.entity.EntityTargetLivingEntityEvent; import org.bukkit.event.entity.EntityTargetEvent; +import org.bukkit.event.entity.EntityTargetLivingEntityEvent; + +import java.util.Map.Entry; // CraftBukkit end public class EntityExperienceOrb extends Entity { diff --git a/src/main/java/net/minecraft/server/EntityFallingBlock.java b/src/main/java/net/minecraft/server/EntityFallingBlock.java index 6697b94550054ebbc8d4b3761bd9f36eb7e4ba8a..9c6ee54e4efd7c6f49cb179c4fa57b10895eb96a 100644 --- a/src/main/java/net/minecraft/server/EntityFallingBlock.java +++ b/src/main/java/net/minecraft/server/EntityFallingBlock.java @@ -1,11 +1,11 @@ package net.minecraft.server; import com.google.common.collect.Lists; +import org.bukkit.craftbukkit.event.CraftEventFactory; + import java.util.Iterator; import java.util.List; -import org.bukkit.craftbukkit.event.CraftEventFactory; // CraftBukkit - public class EntityFallingBlock extends Entity { private IBlockData block; diff --git a/src/main/java/net/minecraft/server/EntityFireball.java b/src/main/java/net/minecraft/server/EntityFireball.java index 5c737d605219bcb0c509f10e62550981f7cdb03f..e54df71af1420e275e13960de621e79c073c2708 100644 --- a/src/main/java/net/minecraft/server/EntityFireball.java +++ b/src/main/java/net/minecraft/server/EntityFireball.java @@ -1,6 +1,6 @@ package net.minecraft.server; -import org.bukkit.craftbukkit.event.CraftEventFactory; // CraftBukkit +import org.bukkit.craftbukkit.event.CraftEventFactory; public abstract class EntityFireball extends IProjectile { diff --git a/src/main/java/net/minecraft/server/EntityFireworks.java b/src/main/java/net/minecraft/server/EntityFireworks.java index 451f0544513bdeeca24755f9dafe6604dd944a28..a6e55a9754cd1970a928732f85f6b88315ce6620 100644 --- a/src/main/java/net/minecraft/server/EntityFireworks.java +++ b/src/main/java/net/minecraft/server/EntityFireworks.java @@ -1,10 +1,11 @@ package net.minecraft.server; +import org.bukkit.craftbukkit.event.CraftEventFactory; + +import javax.annotation.Nullable; import java.util.Iterator; import java.util.List; import java.util.OptionalInt; -import javax.annotation.Nullable; -import org.bukkit.craftbukkit.event.CraftEventFactory; // CraftBukkit public class EntityFireworks extends IProjectile { diff --git a/src/main/java/net/minecraft/server/EntityFishingHook.java b/src/main/java/net/minecraft/server/EntityFishingHook.java index 93aea1a9cd484271c61f7818f16488d2d3924898..a9602613fa80a4ba65ce749c6780b202392457ab 100644 --- a/src/main/java/net/minecraft/server/EntityFishingHook.java +++ b/src/main/java/net/minecraft/server/EntityFishingHook.java @@ -1,15 +1,11 @@ package net.minecraft.server; -import java.util.Collection; -import java.util.Collections; -import java.util.Iterator; -import java.util.List; -import java.util.Random; -import javax.annotation.Nullable; -// CraftBukkit start -import org.bukkit.entity.Player; import org.bukkit.entity.FishHook; +import org.bukkit.entity.Player; import org.bukkit.event.player.PlayerFishEvent; + +import javax.annotation.Nullable; +import java.util.*; // CraftBukkit end public class EntityFishingHook extends IProjectile { diff --git a/src/main/java/net/minecraft/server/EntityFox.java b/src/main/java/net/minecraft/server/EntityFox.java index 3b1d958d12025ec42c904e17b25c0c179fc2182b..1ee54cc1d2ef08d05e89e1289c7f232f460d1ac3 100644 --- a/src/main/java/net/minecraft/server/EntityFox.java +++ b/src/main/java/net/minecraft/server/EntityFox.java @@ -2,10 +2,9 @@ package net.minecraft.server; import com.google.common.collect.Lists; +import javax.annotation.Nullable; import java.util.*; import java.util.function.Predicate; -import java.util.stream.Collectors; -import javax.annotation.Nullable; public class EntityFox extends EntityAnimal { diff --git a/src/main/java/net/minecraft/server/EntityHanging.java b/src/main/java/net/minecraft/server/EntityHanging.java index 06cf11af972f7762de43dc1df18a431a62787111..ace78adfb5baf462d4b511d84f17beb11607ce62 100644 --- a/src/main/java/net/minecraft/server/EntityHanging.java +++ b/src/main/java/net/minecraft/server/EntityHanging.java @@ -1,13 +1,12 @@ package net.minecraft.server; -import java.util.function.Predicate; -import javax.annotation.Nullable; import org.apache.commons.lang3.Validate; - -// CraftBukkit start import org.bukkit.entity.Hanging; import org.bukkit.event.hanging.HangingBreakByEntityEvent; import org.bukkit.event.hanging.HangingBreakEvent; + +import javax.annotation.Nullable; +import java.util.function.Predicate; // CraftBukkit end public abstract class EntityHanging extends Entity { diff --git a/src/main/java/net/minecraft/server/EntityHoglin.java b/src/main/java/net/minecraft/server/EntityHoglin.java index 97570b4521758a84c36e41f80653a17789ad4b60..9f47392e115e20e307e2e79fc3ec5bf03c2d90cd 100644 --- a/src/main/java/net/minecraft/server/EntityHoglin.java +++ b/src/main/java/net/minecraft/server/EntityHoglin.java @@ -2,9 +2,10 @@ package net.minecraft.server; import com.google.common.collect.ImmutableList; import com.mojang.serialization.Dynamic; + +import javax.annotation.Nullable; import java.util.Collection; import java.util.Random; -import javax.annotation.Nullable; public class EntityHoglin extends EntityAnimal implements IMonster, IOglin { diff --git a/src/main/java/net/minecraft/server/EntityHorseAbstract.java b/src/main/java/net/minecraft/server/EntityHorseAbstract.java index 364697e0155012c300219ad94a3995809e6c2f8f..8de9b17292bc69e603d5e3ef1f5e82d594f08804 100644 --- a/src/main/java/net/minecraft/server/EntityHorseAbstract.java +++ b/src/main/java/net/minecraft/server/EntityHorseAbstract.java @@ -1,12 +1,13 @@ package net.minecraft.server; import com.google.common.collect.UnmodifiableIterator; +import org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason; + +import javax.annotation.Nullable; import java.util.Iterator; import java.util.Optional; import java.util.UUID; import java.util.function.Predicate; -import javax.annotation.Nullable; -import org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason; // CraftBukkit public abstract class EntityHorseAbstract extends EntityAnimal implements IInventoryListener, IJumpable, ISaddleable { diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java index 3966bf7160ef5a7ec6944397ffbf51f583875860..c6bc8dda20d4789499184b651092199de0c0c333 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java @@ -5,18 +5,6 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; import com.mojang.authlib.GameProfile; import com.mojang.datafixers.util.Either; -import java.nio.charset.StandardCharsets; -import java.util.Collection; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import java.util.OptionalInt; -import java.util.UUID; -import java.util.function.Predicate; -import javax.annotation.Nullable; - -// CraftBukkit start import org.bukkit.craftbukkit.entity.CraftHumanEntity; import org.bukkit.craftbukkit.util.CraftVector; import org.bukkit.entity.Item; @@ -26,7 +14,11 @@ import org.bukkit.event.entity.EntityCombustByEntityEvent; import org.bukkit.event.player.PlayerBedLeaveEvent; import org.bukkit.event.player.PlayerDropItemEvent; import org.bukkit.event.player.PlayerVelocityEvent; -import org.bukkit.util.Vector; + +import javax.annotation.Nullable; +import java.nio.charset.StandardCharsets; +import java.util.*; +import java.util.function.Predicate; // CraftBukkit end public abstract class EntityHuman extends EntityLiving { diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java index 7c9bb358c9967e6c7c02b96e17764f2418df7979..e65447a0867abbd60dd2ebf6b9961cb9a5216bb7 100644 --- a/src/main/java/net/minecraft/server/EntityInsentient.java +++ b/src/main/java/net/minecraft/server/EntityInsentient.java @@ -1,25 +1,13 @@ package net.minecraft.server; import com.google.common.collect.Maps; -import java.util.Arrays; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import java.util.Random; -import java.util.UUID; -import javax.annotation.Nullable; - -// CraftBukkit start -import org.bukkit.craftbukkit.event.CraftEventFactory; import org.bukkit.craftbukkit.entity.CraftLivingEntity; -import org.bukkit.event.entity.CreatureSpawnEvent; -import org.bukkit.event.entity.EntityCombustByEntityEvent; -import org.bukkit.event.entity.EntityTargetLivingEntityEvent; -import org.bukkit.event.entity.EntityTargetEvent; -import org.bukkit.event.entity.EntityTransformEvent; -import org.bukkit.event.entity.EntityUnleashEvent; +import org.bukkit.craftbukkit.event.CraftEventFactory; +import org.bukkit.event.entity.*; import org.bukkit.event.entity.EntityUnleashEvent.UnleashReason; + +import javax.annotation.Nullable; +import java.util.*; // CraftBukkit end public abstract class EntityInsentient extends EntityLiving { diff --git a/src/main/java/net/minecraft/server/EntityIronGolem.java b/src/main/java/net/minecraft/server/EntityIronGolem.java index e38a675be7e6a4cbb1f2f7606bf84ac570bb5985..a7373a63cb11822ca83728d6740f39180833856e 100644 --- a/src/main/java/net/minecraft/server/EntityIronGolem.java +++ b/src/main/java/net/minecraft/server/EntityIronGolem.java @@ -1,12 +1,13 @@ package net.minecraft.server; import com.google.common.collect.ImmutableList; + +import javax.annotation.Nullable; import java.util.Comparator; import java.util.Iterator; import java.util.List; import java.util.UUID; import java.util.stream.Stream; -import javax.annotation.Nullable; public class EntityIronGolem extends EntityGolem implements IEntityAngerable { diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java index 6869b688810cc72da01f164db1f0853d59752597..ebedb11ad7f281601abb26da6b035f1103e1fc98 100644 --- a/src/main/java/net/minecraft/server/EntityItem.java +++ b/src/main/java/net/minecraft/server/EntityItem.java @@ -1,16 +1,15 @@ package net.minecraft.server; +import org.bukkit.Material; +import org.bukkit.event.entity.EntityPickupItemEvent; +import org.bukkit.event.player.PlayerAttemptPickupItemEvent; +import org.bukkit.event.player.PlayerPickupItemEvent; + +import javax.annotation.Nullable; import java.util.Iterator; import java.util.List; import java.util.Objects; import java.util.UUID; -import javax.annotation.Nullable; -// CraftBukkit start -import org.bukkit.Material; // Paper -import org.bukkit.event.entity.EntityPickupItemEvent; -import org.bukkit.event.player.PlayerPickupItemEvent; -// CraftBukkit end -import org.bukkit.event.player.PlayerAttemptPickupItemEvent; // Paper public class EntityItem extends Entity { diff --git a/src/main/java/net/minecraft/server/EntityItemFrame.java b/src/main/java/net/minecraft/server/EntityItemFrame.java index e20915578720f6d18955a4ddc6fb436af807acb3..e38f5d1ab2764e85aefc3398d29170c806250148 100644 --- a/src/main/java/net/minecraft/server/EntityItemFrame.java +++ b/src/main/java/net/minecraft/server/EntityItemFrame.java @@ -1,10 +1,11 @@ package net.minecraft.server; -import javax.annotation.Nullable; import org.apache.commons.lang3.Validate; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import javax.annotation.Nullable; + public class EntityItemFrame extends EntityHanging { private static final Logger LOGGER = LogManager.getLogger(); diff --git a/src/main/java/net/minecraft/server/EntityLargeFireball.java b/src/main/java/net/minecraft/server/EntityLargeFireball.java index b4b0dfbc70f91f74f9792b835ec2f8d5af41c311..0ff812f8da4db0ca9cf65792805d8e61ab99ba57 100644 --- a/src/main/java/net/minecraft/server/EntityLargeFireball.java +++ b/src/main/java/net/minecraft/server/EntityLargeFireball.java @@ -1,6 +1,6 @@ package net.minecraft.server; -import org.bukkit.event.entity.ExplosionPrimeEvent; // CraftBukkit +import org.bukkit.event.entity.ExplosionPrimeEvent; public class EntityLargeFireball extends EntityFireballFireball { diff --git a/src/main/java/net/minecraft/server/EntityLeash.java b/src/main/java/net/minecraft/server/EntityLeash.java index 34b41ab9cf65ac8a7a29f1d3d23c86f6707a436a..99052f026f2d24300ab0a1b7c6b8b134d6800995 100644 --- a/src/main/java/net/minecraft/server/EntityLeash.java +++ b/src/main/java/net/minecraft/server/EntityLeash.java @@ -1,10 +1,10 @@ package net.minecraft.server; +import org.bukkit.craftbukkit.event.CraftEventFactory; + +import javax.annotation.Nullable; import java.util.Iterator; import java.util.List; -import javax.annotation.Nullable; - -import org.bukkit.craftbukkit.event.CraftEventFactory; // CraftBukkit public class EntityLeash extends EntityHanging { diff --git a/src/main/java/net/minecraft/server/EntityLightning.java b/src/main/java/net/minecraft/server/EntityLightning.java index b1b8748fa95aab25562c2f5397cb6454737fa508..71cc6953091119dda28003a8199e981440483c72 100644 --- a/src/main/java/net/minecraft/server/EntityLightning.java +++ b/src/main/java/net/minecraft/server/EntityLightning.java @@ -1,11 +1,11 @@ package net.minecraft.server; +import org.bukkit.craftbukkit.event.CraftEventFactory; + +import javax.annotation.Nullable; import java.util.Collection; import java.util.Iterator; import java.util.List; -import javax.annotation.Nullable; - -import org.bukkit.craftbukkit.event.CraftEventFactory; // CraftBukkit public class EntityLightning extends Entity { diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java index ef77e7864e7e49684a9bd2a7c9f07717800e3e89..a37badcd92afd03a4b622048921618dbca2db8b4 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -1,6 +1,7 @@ package net.minecraft.server; -import com.destroystokyo.paper.event.player.PlayerArmorChangeEvent; // Paper +import com.destroystokyo.paper.event.player.PlayerArmorChangeEvent; +import com.google.common.base.Function; import com.google.common.base.Objects; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; @@ -10,39 +11,20 @@ import com.mojang.datafixers.util.Pair; import com.mojang.serialization.DataResult; import com.mojang.serialization.Dynamic; import com.mojang.serialization.DynamicOps; -import java.util.Collection; -import java.util.ConcurrentModificationException; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import java.util.Random; -import java.util.UUID; -import java.util.function.Predicate; -import javax.annotation.Nullable; import org.apache.logging.log4j.Logger; - -// CraftBukkit start -import java.util.ArrayList; -import java.util.HashSet; -import java.util.Set; -import com.google.common.base.Function; import org.bukkit.Location; import org.bukkit.craftbukkit.attribute.CraftAttributeMap; import org.bukkit.craftbukkit.event.CraftEventFactory; import org.bukkit.craftbukkit.inventory.CraftItemStack; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; -import org.bukkit.event.entity.EntityDamageEvent; +import org.bukkit.event.entity.*; import org.bukkit.event.entity.EntityDamageEvent.DamageModifier; -import org.bukkit.event.entity.EntityPotionEffectEvent; -import org.bukkit.event.entity.EntityRegainHealthEvent; -import org.bukkit.event.entity.EntityResurrectEvent; -import org.bukkit.event.entity.EntityTeleportEvent; import org.bukkit.event.player.PlayerItemConsumeEvent; -// CraftBukkit end -import co.aikar.timings.MinecraftTimings; // Paper +import javax.annotation.Nullable; +import java.util.*; +import java.util.function.Predicate; public abstract class EntityLiving extends Entity { diff --git a/src/main/java/net/minecraft/server/EntityLlama.java b/src/main/java/net/minecraft/server/EntityLlama.java index 4fe769c761949c40bbb923cde5dfe1709843921f..039a74ee15bc1bf562f782b46f797dddccf9e04e 100644 --- a/src/main/java/net/minecraft/server/EntityLlama.java +++ b/src/main/java/net/minecraft/server/EntityLlama.java @@ -1,7 +1,7 @@ package net.minecraft.server; -import java.util.Iterator; import javax.annotation.Nullable; +import java.util.Iterator; public class EntityLlama extends EntityHorseChestedAbstract implements IRangedEntity { diff --git a/src/main/java/net/minecraft/server/EntityLlamaTrader.java b/src/main/java/net/minecraft/server/EntityLlamaTrader.java index 11008c4323d16fc989c0e68978741113b3b57268..45661626586674b35d81bc92b268549aa9b50f1f 100644 --- a/src/main/java/net/minecraft/server/EntityLlamaTrader.java +++ b/src/main/java/net/minecraft/server/EntityLlamaTrader.java @@ -1,7 +1,7 @@ package net.minecraft.server; -import java.util.EnumSet; import javax.annotation.Nullable; +import java.util.EnumSet; public class EntityLlamaTrader extends EntityLlama { diff --git a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java index 6e038905ea6e5245190e5970481195ba668f3247..0f57985d9b4fc8d31e87b50284200aead6b4dd7e 100644 --- a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java +++ b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java @@ -5,18 +5,17 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.Maps; import com.google.common.collect.UnmodifiableIterator; import com.mojang.datafixers.util.Pair; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import javax.annotation.Nullable; - -// CraftBukkit start import org.bukkit.Location; import org.bukkit.entity.Vehicle; import org.bukkit.event.vehicle.VehicleDamageEvent; import org.bukkit.event.vehicle.VehicleDestroyEvent; import org.bukkit.event.vehicle.VehicleEntityCollisionEvent; import org.bukkit.util.Vector; + +import javax.annotation.Nullable; +import java.util.Iterator; +import java.util.List; +import java.util.Map; // CraftBukkit end public abstract class EntityMinecartAbstract extends Entity { diff --git a/src/main/java/net/minecraft/server/EntityMinecartContainer.java b/src/main/java/net/minecraft/server/EntityMinecartContainer.java index ca4b142f9a62a14c6fa9b2f865fa0c9f7b2ecbed..ff7763a62a57a1f73d385ca161efd5a26c6d8711 100644 --- a/src/main/java/net/minecraft/server/EntityMinecartContainer.java +++ b/src/main/java/net/minecraft/server/EntityMinecartContainer.java @@ -1,13 +1,13 @@ package net.minecraft.server; -import java.util.Iterator; -import javax.annotation.Nullable; -// CraftBukkit start -import java.util.List; import org.bukkit.Location; import org.bukkit.craftbukkit.entity.CraftHumanEntity; import org.bukkit.entity.HumanEntity; import org.bukkit.inventory.InventoryHolder; + +import javax.annotation.Nullable; +import java.util.Iterator; +import java.util.List; // CraftBukkit end public abstract class EntityMinecartContainer extends EntityMinecartAbstract implements IInventory, ITileInventory { diff --git a/src/main/java/net/minecraft/server/EntityMushroomCow.java b/src/main/java/net/minecraft/server/EntityMushroomCow.java index 23ef033067e388b7b7b2a981df8655e240a30594..6b66c54d6f45fb9034e13576e383bf3a0009e99a 100644 --- a/src/main/java/net/minecraft/server/EntityMushroomCow.java +++ b/src/main/java/net/minecraft/server/EntityMushroomCow.java @@ -1,12 +1,12 @@ package net.minecraft.server; -import java.util.Optional; -import java.util.Random; -import java.util.UUID; import org.apache.commons.lang3.tuple.Pair; -// CraftBukkit start import org.bukkit.craftbukkit.event.CraftEventFactory; import org.bukkit.event.entity.EntityTransformEvent; + +import java.util.Optional; +import java.util.Random; +import java.util.UUID; // CraftBukkit end public class EntityMushroomCow extends EntityCow implements IShearable { diff --git a/src/main/java/net/minecraft/server/EntityOcelot.java b/src/main/java/net/minecraft/server/EntityOcelot.java index 9c1f019f911a1b91bbfa431e1558dec790624050..ea4da16de36a1680bcc8eae06c59899d607976a1 100644 --- a/src/main/java/net/minecraft/server/EntityOcelot.java +++ b/src/main/java/net/minecraft/server/EntityOcelot.java @@ -1,8 +1,7 @@ package net.minecraft.server; -import java.util.Random; -import java.util.function.Predicate; import javax.annotation.Nullable; +import java.util.Random; public class EntityOcelot extends EntityAnimal { diff --git a/src/main/java/net/minecraft/server/EntityPainting.java b/src/main/java/net/minecraft/server/EntityPainting.java index ce9d414f2ad92d1392057827fff6dad631b5fd10..53dd219b0ee41090ac7ab417301d7098783e5fee 100644 --- a/src/main/java/net/minecraft/server/EntityPainting.java +++ b/src/main/java/net/minecraft/server/EntityPainting.java @@ -1,9 +1,10 @@ package net.minecraft.server; import com.google.common.collect.Lists; + +import javax.annotation.Nullable; import java.util.Iterator; import java.util.List; -import javax.annotation.Nullable; public class EntityPainting extends EntityHanging { diff --git a/src/main/java/net/minecraft/server/EntityPanda.java b/src/main/java/net/minecraft/server/EntityPanda.java index 5697761087f6661e4d63fcbfeadfe9a8c56a17b5..12f7020ec7abbefaa876dc8b0a424603c0605687 100644 --- a/src/main/java/net/minecraft/server/EntityPanda.java +++ b/src/main/java/net/minecraft/server/EntityPanda.java @@ -1,10 +1,10 @@ package net.minecraft.server; +import org.bukkit.event.entity.EntityTargetEvent; + +import javax.annotation.Nullable; import java.util.*; import java.util.function.Predicate; -import javax.annotation.Nullable; - -import org.bukkit.event.entity.EntityTargetEvent; // CraftBukkit public class EntityPanda extends EntityAnimal { diff --git a/src/main/java/net/minecraft/server/EntityParrot.java b/src/main/java/net/minecraft/server/EntityParrot.java index 2172fcefbc0d1c41cf2715a63015659a706e57ec..6d313783838103c848b3375ac29ccd8b33a27430 100644 --- a/src/main/java/net/minecraft/server/EntityParrot.java +++ b/src/main/java/net/minecraft/server/EntityParrot.java @@ -3,12 +3,13 @@ package net.minecraft.server; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Sets; + +import javax.annotation.Nullable; import java.util.List; import java.util.Map; import java.util.Random; import java.util.Set; import java.util.function.Predicate; -import javax.annotation.Nullable; public class EntityParrot extends EntityPerchable implements EntityBird { diff --git a/src/main/java/net/minecraft/server/EntityPhantom.java b/src/main/java/net/minecraft/server/EntityPhantom.java index 3cb78924daa48c3a0a3e5c9c64ef6e726d79a798..1d6fd36a0ea06db7dd74f6d14ac2effe93b9ac74 100644 --- a/src/main/java/net/minecraft/server/EntityPhantom.java +++ b/src/main/java/net/minecraft/server/EntityPhantom.java @@ -1,10 +1,10 @@ package net.minecraft.server; +import javax.annotation.Nullable; import java.util.Comparator; import java.util.EnumSet; import java.util.Iterator; import java.util.List; -import javax.annotation.Nullable; public class EntityPhantom extends EntityFlying implements IMonster { diff --git a/src/main/java/net/minecraft/server/EntityPig.java b/src/main/java/net/minecraft/server/EntityPig.java index cd0a94794e8969937f7f8408e0fb46c1684abc00..13b95af73c1f7f09b8d41cb4350792e9300fda1a 100644 --- a/src/main/java/net/minecraft/server/EntityPig.java +++ b/src/main/java/net/minecraft/server/EntityPig.java @@ -1,10 +1,9 @@ package net.minecraft.server; import com.google.common.collect.UnmodifiableIterator; -import javax.annotation.Nullable; - -// CraftBukkit start import org.bukkit.craftbukkit.event.CraftEventFactory; + +import javax.annotation.Nullable; // CraftBukkit end public class EntityPig extends EntityAnimal implements ISteerable, ISaddleable { diff --git a/src/main/java/net/minecraft/server/EntityPigZombie.java b/src/main/java/net/minecraft/server/EntityPigZombie.java index e97997c28667ee4d3110df2b47a851aa37f0d4bc..c5dcaabdcf701c0dac3660562512d0c5c869b726 100644 --- a/src/main/java/net/minecraft/server/EntityPigZombie.java +++ b/src/main/java/net/minecraft/server/EntityPigZombie.java @@ -2,9 +2,9 @@ package net.minecraft.server; import org.bukkit.event.entity.EntityTargetEvent; +import javax.annotation.Nullable; import java.util.Random; import java.util.UUID; -import javax.annotation.Nullable; public class EntityPigZombie extends EntityZombie implements IEntityAngerable { diff --git a/src/main/java/net/minecraft/server/EntityPiglin.java b/src/main/java/net/minecraft/server/EntityPiglin.java index a8e3e3e4b0b4f9af2f5ac551072a0e2caa644d07..f6e58838b5008fe091cff4eb3bf08f5026dd7880 100644 --- a/src/main/java/net/minecraft/server/EntityPiglin.java +++ b/src/main/java/net/minecraft/server/EntityPiglin.java @@ -2,11 +2,12 @@ package net.minecraft.server; import com.google.common.collect.ImmutableList; import com.mojang.serialization.Dynamic; + +import javax.annotation.Nullable; import java.util.Collection; import java.util.List; import java.util.Random; import java.util.UUID; -import javax.annotation.Nullable; public class EntityPiglin extends EntityMonster implements ICrossbow { diff --git a/src/main/java/net/minecraft/server/EntityPillager.java b/src/main/java/net/minecraft/server/EntityPillager.java index f73c30ae49e6a80004ead1a134b4457a3c2a48fc..f0cc1d75d91064c5bf8c0655067bd34ccf6d4dba 100644 --- a/src/main/java/net/minecraft/server/EntityPillager.java +++ b/src/main/java/net/minecraft/server/EntityPillager.java @@ -1,8 +1,9 @@ package net.minecraft.server; import com.google.common.collect.Maps; -import java.util.Map; + import javax.annotation.Nullable; +import java.util.Map; public class EntityPillager extends EntityIllagerAbstract implements ICrossbow { diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java index 597419c23721059378943970b55d7a0dcb535037..69db19af3246ec61b710ab273c5a9fe5b172ed93 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -1,26 +1,13 @@ package net.minecraft.server; import com.destroystokyo.paper.event.entity.PlayerNaturallySpawnCreaturesEvent; +import com.destroystokyo.paper.event.player.PlayerClientOptionsChangeEvent; import com.google.common.collect.Lists; -import com.destroystokyo.paper.event.player.PlayerClientOptionsChangeEvent; // Paper import com.mojang.authlib.GameProfile; import com.mojang.datafixers.util.Either; import com.mojang.serialization.DataResult; -import java.util.ArrayDeque; // Paper -import java.util.Collection; -import java.util.Deque; // Paper -import java.util.Iterator; -import java.util.List; -import java.util.OptionalInt; -import java.util.Random; -import java.util.UUID; -import java.util.concurrent.CompletableFuture; -import javax.annotation.Nullable; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; - -// CraftBukkit start -import com.google.common.base.Preconditions; import org.bukkit.Bukkit; import org.bukkit.GameMode; import org.bukkit.Location; @@ -30,14 +17,13 @@ import org.bukkit.craftbukkit.entity.CraftPlayer; import org.bukkit.craftbukkit.event.CraftEventFactory; import org.bukkit.craftbukkit.inventory.CraftItemStack; import org.bukkit.event.inventory.InventoryType; -import org.bukkit.event.player.PlayerChangedMainHandEvent; -import org.bukkit.event.player.PlayerChangedWorldEvent; -import org.bukkit.event.player.PlayerGameModeChangeEvent; -import org.bukkit.event.player.PlayerLocaleChangeEvent; -import org.bukkit.event.player.PlayerPortalEvent; -import org.bukkit.event.player.PlayerTeleportEvent; +import org.bukkit.event.player.*; import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; import org.bukkit.inventory.MainHand; + +import javax.annotation.Nullable; +import java.util.*; +import java.util.concurrent.CompletableFuture; // CraftBukkit end public class EntityPlayer extends EntityHuman implements ICrafting { diff --git a/src/main/java/net/minecraft/server/EntityPotion.java b/src/main/java/net/minecraft/server/EntityPotion.java index c7416602c19c6a0675c414b5af4452ed5df3827b..cc5a362346427070980b4cbf8ab18313d82aa669 100644 --- a/src/main/java/net/minecraft/server/EntityPotion.java +++ b/src/main/java/net/minecraft/server/EntityPotion.java @@ -1,15 +1,15 @@ package net.minecraft.server; -import java.util.Iterator; -import java.util.List; -import java.util.function.Predicate; -import javax.annotation.Nullable; -// CraftBukkit start -import java.util.HashMap; -import java.util.Map; import org.bukkit.craftbukkit.entity.CraftLivingEntity; import org.bukkit.craftbukkit.event.CraftEventFactory; import org.bukkit.entity.LivingEntity; + +import javax.annotation.Nullable; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.function.Predicate; // CraftBukkit end public class EntityPotion extends EntityProjectileThrowable { diff --git a/src/main/java/net/minecraft/server/EntityRabbit.java b/src/main/java/net/minecraft/server/EntityRabbit.java index baf4405380c70581a3ed457cb8d12153160f8d1d..911182863c171c8e2faeb9375d1515d4be353b42 100644 --- a/src/main/java/net/minecraft/server/EntityRabbit.java +++ b/src/main/java/net/minecraft/server/EntityRabbit.java @@ -1,7 +1,7 @@ package net.minecraft.server; -import java.util.Random; import javax.annotation.Nullable; +import java.util.Random; public class EntityRabbit extends EntityAnimal { diff --git a/src/main/java/net/minecraft/server/EntityRaider.java b/src/main/java/net/minecraft/server/EntityRaider.java index 751873c20ef74daa1e1f7278e8364a22be18504c..42f8d85c460a74f7f7c3277c44ed4648cd56a013 100644 --- a/src/main/java/net/minecraft/server/EntityRaider.java +++ b/src/main/java/net/minecraft/server/EntityRaider.java @@ -1,13 +1,10 @@ package net.minecraft.server; import com.google.common.collect.Lists; -import java.util.EnumSet; -import java.util.Iterator; -import java.util.List; -import java.util.Objects; -import java.util.Optional; -import java.util.function.Predicate; + import javax.annotation.Nullable; +import java.util.*; +import java.util.function.Predicate; public abstract class EntityRaider extends EntityMonsterPatrolling { diff --git a/src/main/java/net/minecraft/server/EntityRavager.java b/src/main/java/net/minecraft/server/EntityRavager.java index 9734845c16ab9ebbd3c5db089f782c2775ea428e..6bdf90f43a1b683bbbb188cbb4a03f522b138c8e 100644 --- a/src/main/java/net/minecraft/server/EntityRavager.java +++ b/src/main/java/net/minecraft/server/EntityRavager.java @@ -1,9 +1,9 @@ package net.minecraft.server; +import javax.annotation.Nullable; import java.util.Iterator; import java.util.List; import java.util.function.Predicate; -import javax.annotation.Nullable; public class EntityRavager extends EntityRaider { diff --git a/src/main/java/net/minecraft/server/EntitySelector.java b/src/main/java/net/minecraft/server/EntitySelector.java index c5d1dfa0660ba94412664974adae56ecffda0b45..0d0dd4f580ec6a5f3c49e619ed6a53f5dc94b735 100644 --- a/src/main/java/net/minecraft/server/EntitySelector.java +++ b/src/main/java/net/minecraft/server/EntitySelector.java @@ -2,6 +2,8 @@ package net.minecraft.server; import com.google.common.collect.Lists; import com.mojang.brigadier.exceptions.CommandSyntaxException; + +import javax.annotation.Nullable; import java.util.Collections; import java.util.Iterator; import java.util.List; @@ -9,7 +11,6 @@ import java.util.UUID; import java.util.function.BiConsumer; import java.util.function.Function; import java.util.function.Predicate; -import javax.annotation.Nullable; public class EntitySelector { diff --git a/src/main/java/net/minecraft/server/EntitySheep.java b/src/main/java/net/minecraft/server/EntitySheep.java index bb8183ce9fd62178c4941ed0ff885eb717e3c8e9..a41d55ba3f3ae8a3f62f152ac178e114e72cb6a4 100644 --- a/src/main/java/net/minecraft/server/EntitySheep.java +++ b/src/main/java/net/minecraft/server/EntitySheep.java @@ -1,15 +1,15 @@ package net.minecraft.server; import com.google.common.collect.Maps; - -import java.util.*; -import java.util.stream.Collectors; -import javax.annotation.Nullable; - -// CraftBukkit start import org.bukkit.craftbukkit.event.CraftEventFactory; import org.bukkit.event.entity.SheepRegrowWoolEvent; import org.bukkit.inventory.InventoryView; + +import javax.annotation.Nullable; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; +import java.util.Random; // CraftBukkit end public class EntitySheep extends EntityAnimal implements IShearable { diff --git a/src/main/java/net/minecraft/server/EntityShulker.java b/src/main/java/net/minecraft/server/EntityShulker.java index afc4cf4960ed2aaf17121209fec89ab9eb365083..75541b1c1515f4d008038d41c886b02c3c89bd49 100644 --- a/src/main/java/net/minecraft/server/EntityShulker.java +++ b/src/main/java/net/minecraft/server/EntityShulker.java @@ -1,14 +1,10 @@ package net.minecraft.server; -import java.util.EnumSet; -import java.util.Iterator; -import java.util.List; -import java.util.Optional; -import java.util.UUID; -import javax.annotation.Nullable; -// CraftBukkit start import org.bukkit.Location; import org.bukkit.event.entity.EntityTeleportEvent; + +import javax.annotation.Nullable; +import java.util.*; // CraftBukkit end public class EntityShulker extends EntityGolem implements IMonster { diff --git a/src/main/java/net/minecraft/server/EntityShulkerBullet.java b/src/main/java/net/minecraft/server/EntityShulkerBullet.java index ff5a3fdd5ce601967b10c1056302e3a4555a9a40..64a127f3d51ba34996e40eec72c0911f64394e98 100644 --- a/src/main/java/net/minecraft/server/EntityShulkerBullet.java +++ b/src/main/java/net/minecraft/server/EntityShulkerBullet.java @@ -1,9 +1,10 @@ package net.minecraft.server; import com.google.common.collect.Lists; + +import javax.annotation.Nullable; import java.util.List; import java.util.UUID; -import javax.annotation.Nullable; public class EntityShulkerBullet extends IProjectile { diff --git a/src/main/java/net/minecraft/server/EntitySkeletonAbstract.java b/src/main/java/net/minecraft/server/EntitySkeletonAbstract.java index 84f83d48a8c41a26289ce0995aa9f5fd332c0ccb..531ff5246e1f2a0862617752bdf0707d33970227 100644 --- a/src/main/java/net/minecraft/server/EntitySkeletonAbstract.java +++ b/src/main/java/net/minecraft/server/EntitySkeletonAbstract.java @@ -1,8 +1,8 @@ package net.minecraft.server; +import javax.annotation.Nullable; import java.time.LocalDate; import java.time.temporal.ChronoField; -import javax.annotation.Nullable; public abstract class EntitySkeletonAbstract extends EntityMonster implements IRangedEntity { diff --git a/src/main/java/net/minecraft/server/EntitySlime.java b/src/main/java/net/minecraft/server/EntitySlime.java index a4642cc7390b08580d00689a853d59e3e1ef6496..58d811d75fa12d4f37fb0309787b9c136c79ad09 100644 --- a/src/main/java/net/minecraft/server/EntitySlime.java +++ b/src/main/java/net/minecraft/server/EntitySlime.java @@ -1,22 +1,20 @@ package net.minecraft.server; -import java.util.EnumSet; -import java.util.Random; -import javax.annotation.Nullable; -// Paper start import com.destroystokyo.paper.event.entity.SlimeChangeDirectionEvent; import com.destroystokyo.paper.event.entity.SlimeSwimEvent; import com.destroystokyo.paper.event.entity.SlimeTargetLivingEntityEvent; import com.destroystokyo.paper.event.entity.SlimeWanderEvent; +import org.bukkit.craftbukkit.event.CraftEventFactory; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Slime; -// Paper end -// CraftBukkit start -import java.util.ArrayList; -import java.util.List; -import org.bukkit.craftbukkit.event.CraftEventFactory; import org.bukkit.event.entity.EntityTransformEvent; import org.bukkit.event.entity.SlimeSplitEvent; + +import javax.annotation.Nullable; +import java.util.ArrayList; +import java.util.EnumSet; +import java.util.List; +import java.util.Random; // CraftBukkit end public class EntitySlime extends EntityInsentient implements IMonster { diff --git a/src/main/java/net/minecraft/server/EntitySmallFireball.java b/src/main/java/net/minecraft/server/EntitySmallFireball.java index 92efb29534243ffb4c5bdd944d54037710358e20..8c006ba920e4ae89c9534b16f3b11042036ce936 100644 --- a/src/main/java/net/minecraft/server/EntitySmallFireball.java +++ b/src/main/java/net/minecraft/server/EntitySmallFireball.java @@ -1,6 +1,6 @@ package net.minecraft.server; -import org.bukkit.event.entity.EntityCombustByEntityEvent; // CraftBukkit +import org.bukkit.event.entity.EntityCombustByEntityEvent; public class EntitySmallFireball extends EntityFireballFireball { diff --git a/src/main/java/net/minecraft/server/EntitySnowman.java b/src/main/java/net/minecraft/server/EntitySnowman.java index 15b886d9b399f534779ec72057b66134047ec85f..f391889deddc248b06b7e4e20b9208f98aab91bc 100644 --- a/src/main/java/net/minecraft/server/EntitySnowman.java +++ b/src/main/java/net/minecraft/server/EntitySnowman.java @@ -1,8 +1,8 @@ package net.minecraft.server; -import javax.annotation.Nullable; -// CraftBukkit start import org.bukkit.craftbukkit.event.CraftEventFactory; + +import javax.annotation.Nullable; // CraftBukkit end public class EntitySnowman extends EntityGolem implements IShearable, IRangedEntity { diff --git a/src/main/java/net/minecraft/server/EntitySpider.java b/src/main/java/net/minecraft/server/EntitySpider.java index f6a677200210ea5035ab6d2c1022cc737c8fd1c4..53405c4479ad8787a4222008011aaf4d8dccdca7 100644 --- a/src/main/java/net/minecraft/server/EntitySpider.java +++ b/src/main/java/net/minecraft/server/EntitySpider.java @@ -1,7 +1,7 @@ package net.minecraft.server; -import java.util.Random; import javax.annotation.Nullable; +import java.util.Random; public class EntitySpider extends EntityMonster { diff --git a/src/main/java/net/minecraft/server/EntityStrider.java b/src/main/java/net/minecraft/server/EntityStrider.java index c123e9fe97f1c0da0c6807e17df497a31749c1b3..f6bf51c17ae158e2d65ea65e885ecebe11037ba8 100644 --- a/src/main/java/net/minecraft/server/EntityStrider.java +++ b/src/main/java/net/minecraft/server/EntityStrider.java @@ -2,10 +2,11 @@ package net.minecraft.server; import com.google.common.collect.Sets; import com.google.common.collect.UnmodifiableIterator; + +import javax.annotation.Nullable; import java.util.Iterator; import java.util.Random; import java.util.Set; -import javax.annotation.Nullable; public class EntityStrider extends EntityAnimal implements ISteerable, ISaddleable { diff --git a/src/main/java/net/minecraft/server/EntityTNTPrimed.java b/src/main/java/net/minecraft/server/EntityTNTPrimed.java index 57ac6469ecdf3d89a538f01ecde5f3bd5a28c18f..d85139e4acd58eb0c521f9942cbe13541b2db490 100644 --- a/src/main/java/net/minecraft/server/EntityTNTPrimed.java +++ b/src/main/java/net/minecraft/server/EntityTNTPrimed.java @@ -1,7 +1,8 @@ package net.minecraft.server; +import org.bukkit.event.entity.ExplosionPrimeEvent; + import javax.annotation.Nullable; -import org.bukkit.event.entity.ExplosionPrimeEvent; // CraftBukkit public class EntityTNTPrimed extends Entity { diff --git a/src/main/java/net/minecraft/server/EntityTippedArrow.java b/src/main/java/net/minecraft/server/EntityTippedArrow.java index 85d5b68cfe9aee258a2331788b133a92911a9c11..2828cf35df63cf4d8478aab74ef7e7a1e7d57d9d 100644 --- a/src/main/java/net/minecraft/server/EntityTippedArrow.java +++ b/src/main/java/net/minecraft/server/EntityTippedArrow.java @@ -1,6 +1,7 @@ package net.minecraft.server; import com.google.common.collect.Sets; + import java.util.Collection; import java.util.Iterator; import java.util.Set; diff --git a/src/main/java/net/minecraft/server/EntityTrackerEntry.java b/src/main/java/net/minecraft/server/EntityTrackerEntry.java index f148bc2bb8fdb7e76c8c42a29017a0c62a222990..ea0890a8c8f2c575fca384f909ce15dfe4ddf9f7 100644 --- a/src/main/java/net/minecraft/server/EntityTrackerEntry.java +++ b/src/main/java/net/minecraft/server/EntityTrackerEntry.java @@ -2,19 +2,13 @@ package net.minecraft.server; import com.google.common.collect.Lists; import com.mojang.datafixers.util.Pair; -import java.util.Collection; -import java.util.Collections; -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; -import java.util.Set; -import java.util.function.Consumer; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; - -// CraftBukkit start import org.bukkit.entity.Player; import org.bukkit.event.player.PlayerVelocityEvent; + +import java.util.*; +import java.util.function.Consumer; // CraftBukkit end public class EntityTrackerEntry { diff --git a/src/main/java/net/minecraft/server/EntityTurtle.java b/src/main/java/net/minecraft/server/EntityTurtle.java index 06333b69539a86b14b6b1efa5fee19b5bdfacfdf..1959155080fe2a2fb19227c884d598719528b140 100644 --- a/src/main/java/net/minecraft/server/EntityTurtle.java +++ b/src/main/java/net/minecraft/server/EntityTurtle.java @@ -1,11 +1,12 @@ package net.minecraft.server; import com.google.common.collect.Sets; + +import javax.annotation.Nullable; import java.util.EnumSet; import java.util.Random; import java.util.Set; import java.util.function.Predicate; -import javax.annotation.Nullable; public class EntityTurtle extends EntityAnimal { diff --git a/src/main/java/net/minecraft/server/EntityTypes.java b/src/main/java/net/minecraft/server/EntityTypes.java index 18a806ebbf092b904983691529ce5edf2da4e6db..85c784ceea900d65de136da8c7ac718f26127456 100644 --- a/src/main/java/net/minecraft/server/EntityTypes.java +++ b/src/main/java/net/minecraft/server/EntityTypes.java @@ -1,15 +1,15 @@ package net.minecraft.server; import com.google.common.collect.ImmutableSet; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +import javax.annotation.Nullable; import java.util.Optional; -import java.util.Set; // Paper -import java.util.Map; // Paper +import java.util.Set; import java.util.UUID; import java.util.function.Function; import java.util.stream.Stream; -import javax.annotation.Nullable; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; public class EntityTypes { diff --git a/src/main/java/net/minecraft/server/EntityVex.java b/src/main/java/net/minecraft/server/EntityVex.java index 99a98e37ebd292f8fb1c3613348bd6dd51e9191b..3af1ad56464ee6d0c43f8a2fcba993e398036829 100644 --- a/src/main/java/net/minecraft/server/EntityVex.java +++ b/src/main/java/net/minecraft/server/EntityVex.java @@ -1,9 +1,10 @@ package net.minecraft.server; -import java.util.EnumSet; -import javax.annotation.Nullable; import org.bukkit.event.entity.EntityTargetEvent; +import javax.annotation.Nullable; +import java.util.EnumSet; + public class EntityVex extends EntityMonster { protected static final DataWatcherObject b = DataWatcher.a(EntityVex.class, DataWatcherRegistry.a); diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java index 2fb7f23275acad54d2f5e2ecd57d5bbb333facbe..52bab44807674a5f7aee105d015f639b8aef9829 100644 --- a/src/main/java/net/minecraft/server/EntityVillager.java +++ b/src/main/java/net/minecraft/server/EntityVillager.java @@ -7,24 +7,18 @@ import com.mojang.datafixers.util.Pair; import com.mojang.serialization.DataResult; import com.mojang.serialization.Dynamic; import com.mojang.serialization.DynamicOps; - import dev.tr7zw.yatopia.YatopiaConfig; import it.unimi.dsi.fastutil.ints.Int2ObjectMap; - -import java.util.*; -import java.util.function.BiPredicate; -import java.util.stream.Collectors; -import javax.annotation.Nullable; import org.apache.logging.log4j.Logger; -// CraftBukkit start import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.entity.CraftVillager; import org.bukkit.craftbukkit.event.CraftEventFactory; -import org.bukkit.craftbukkit.inventory.CraftMerchantRecipe; import org.bukkit.entity.Villager; import org.bukkit.event.entity.EntityTransformEvent; -import org.bukkit.event.entity.VillagerAcquireTradeEvent; import org.bukkit.event.entity.VillagerReplenishTradeEvent; + +import javax.annotation.Nullable; +import java.util.*; +import java.util.function.BiPredicate; // CraftBukkit end public class EntityVillager extends EntityVillagerAbstract implements ReputationHandler, VillagerDataHolder { diff --git a/src/main/java/net/minecraft/server/EntityVillagerAbstract.java b/src/main/java/net/minecraft/server/EntityVillagerAbstract.java index 81823b5d5ef17479583fda0121c95091175fdf1e..c15feba3c54c5b8610f16cceada91cf9077a8701 100644 --- a/src/main/java/net/minecraft/server/EntityVillagerAbstract.java +++ b/src/main/java/net/minecraft/server/EntityVillagerAbstract.java @@ -1,15 +1,15 @@ package net.minecraft.server; import com.google.common.collect.Sets; -import java.util.Iterator; -import java.util.Set; -import javax.annotation.Nullable; -// CraftBukkit start import org.bukkit.Bukkit; import org.bukkit.craftbukkit.inventory.CraftMerchant; import org.bukkit.craftbukkit.inventory.CraftMerchantRecipe; import org.bukkit.entity.AbstractVillager; import org.bukkit.event.entity.VillagerAcquireTradeEvent; + +import javax.annotation.Nullable; +import java.util.Iterator; +import java.util.Set; // CraftBukkit end public abstract class EntityVillagerAbstract extends EntityAgeable implements NPC, IMerchant { diff --git a/src/main/java/net/minecraft/server/EntityVillagerTrader.java b/src/main/java/net/minecraft/server/EntityVillagerTrader.java index a0841cfaf950508b73b43a5fadbc1796015e5dbb..3116488509862fc82b0b9172957af812d96bcf80 100644 --- a/src/main/java/net/minecraft/server/EntityVillagerTrader.java +++ b/src/main/java/net/minecraft/server/EntityVillagerTrader.java @@ -1,12 +1,12 @@ package net.minecraft.server; -import java.util.EnumSet; -import javax.annotation.Nullable; -// CraftBukkit start import org.bukkit.Bukkit; import org.bukkit.craftbukkit.inventory.CraftMerchantRecipe; import org.bukkit.entity.AbstractVillager; import org.bukkit.event.entity.VillagerAcquireTradeEvent; + +import javax.annotation.Nullable; +import java.util.EnumSet; // CraftBukkit end public class EntityVillagerTrader extends EntityVillagerAbstract { diff --git a/src/main/java/net/minecraft/server/EntityVindicator.java b/src/main/java/net/minecraft/server/EntityVindicator.java index 58315906b641ba46ce73b6fefc43ea333bb0a088..66851778820759547f17288dc82ec58114592257 100644 --- a/src/main/java/net/minecraft/server/EntityVindicator.java +++ b/src/main/java/net/minecraft/server/EntityVindicator.java @@ -1,10 +1,11 @@ package net.minecraft.server; import com.google.common.collect.Maps; + +import javax.annotation.Nullable; import java.util.EnumSet; import java.util.Map; import java.util.function.Predicate; -import javax.annotation.Nullable; public class EntityVindicator extends EntityIllagerAbstract { diff --git a/src/main/java/net/minecraft/server/EntityWitch.java b/src/main/java/net/minecraft/server/EntityWitch.java index e8d8935b8ef2db0d4405ee1ff8e2f0f2e17a91b3..32ff8f7dbe910ae9457e73fa75aaa749103cb6cb 100644 --- a/src/main/java/net/minecraft/server/EntityWitch.java +++ b/src/main/java/net/minecraft/server/EntityWitch.java @@ -1,10 +1,10 @@ package net.minecraft.server; // Paper start + import com.destroystokyo.paper.event.entity.WitchReadyPotionEvent; import org.bukkit.craftbukkit.inventory.CraftItemStack; import org.bukkit.entity.Witch; -// Paper end import java.util.Iterator; import java.util.List; diff --git a/src/main/java/net/minecraft/server/EntityWither.java b/src/main/java/net/minecraft/server/EntityWither.java index 1074995e8c8a83f6cdb94019123fbffa309d5e08..8c7bfe19f95cc757397bc496087df8dcd88351c4 100644 --- a/src/main/java/net/minecraft/server/EntityWither.java +++ b/src/main/java/net/minecraft/server/EntityWither.java @@ -1,16 +1,15 @@ package net.minecraft.server; import com.google.common.collect.ImmutableList; -import java.util.EnumSet; -import java.util.List; -import java.util.function.Predicate; -import javax.annotation.Nullable; - -// CraftBukkit start import org.bukkit.craftbukkit.event.CraftEventFactory; import org.bukkit.event.entity.EntityRegainHealthEvent; import org.bukkit.event.entity.EntityTargetEvent; import org.bukkit.event.entity.ExplosionPrimeEvent; + +import javax.annotation.Nullable; +import java.util.EnumSet; +import java.util.List; +import java.util.function.Predicate; // CraftBukkit end public class EntityWither extends EntityMonster implements IRangedEntity { diff --git a/src/main/java/net/minecraft/server/EntityWitherSkull.java b/src/main/java/net/minecraft/server/EntityWitherSkull.java index 72d59adce78943ce47e91301fe17e96ec3579fa6..3839e63b7981f7d6225e9ade7f0be21427ffa8e9 100644 --- a/src/main/java/net/minecraft/server/EntityWitherSkull.java +++ b/src/main/java/net/minecraft/server/EntityWitherSkull.java @@ -1,6 +1,6 @@ package net.minecraft.server; -import org.bukkit.event.entity.ExplosionPrimeEvent; // CraftBukkit +import org.bukkit.event.entity.ExplosionPrimeEvent; public class EntityWitherSkull extends EntityFireball { diff --git a/src/main/java/net/minecraft/server/EntityWolf.java b/src/main/java/net/minecraft/server/EntityWolf.java index 5b519fa394707f6f21b241689daa6d2abf360df7..5f8a74a433fe69eb5eb528663e290279cf3239f4 100644 --- a/src/main/java/net/minecraft/server/EntityWolf.java +++ b/src/main/java/net/minecraft/server/EntityWolf.java @@ -1,12 +1,11 @@ package net.minecraft.server; -import java.util.UUID; -import java.util.function.Predicate; -import javax.annotation.Nullable; - -// CraftBukkit start import org.bukkit.craftbukkit.event.CraftEventFactory; import org.bukkit.event.entity.EntityTargetEvent.TargetReason; + +import javax.annotation.Nullable; +import java.util.UUID; +import java.util.function.Predicate; // CraftBukkit end public class EntityWolf extends EntityTameableAnimal implements IEntityAngerable { diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java index 8784da7ca664b93c4ce1d3e63bb841229f4616df..e18a2b7b25bd6b30e73ce675849520c1250833dd 100644 --- a/src/main/java/net/minecraft/server/EntityZombie.java +++ b/src/main/java/net/minecraft/server/EntityZombie.java @@ -1,21 +1,20 @@ package net.minecraft.server; import com.mojang.serialization.DynamicOps; -import java.time.LocalDate; -import java.time.temporal.ChronoField; -import java.util.List; -import java.util.Random; -import java.util.UUID; -import java.util.function.Predicate; -import javax.annotation.Nullable; - -// CraftBukkit start import org.bukkit.craftbukkit.event.CraftEventFactory; import org.bukkit.entity.Zombie; import org.bukkit.event.entity.CreatureSpawnEvent; import org.bukkit.event.entity.EntityCombustByEntityEvent; import org.bukkit.event.entity.EntityTargetEvent; import org.bukkit.event.entity.EntityTransformEvent; + +import javax.annotation.Nullable; +import java.time.LocalDate; +import java.time.temporal.ChronoField; +import java.util.List; +import java.util.Random; +import java.util.UUID; +import java.util.function.Predicate; // CraftBukkit end public class EntityZombie extends EntityMonster { diff --git a/src/main/java/net/minecraft/server/EntityZombieVillager.java b/src/main/java/net/minecraft/server/EntityZombieVillager.java index 9b920332bd397f9711f0c99702245d54b9d3841b..c3acf82e8396a554c4e56df33731c8f891117879 100644 --- a/src/main/java/net/minecraft/server/EntityZombieVillager.java +++ b/src/main/java/net/minecraft/server/EntityZombieVillager.java @@ -2,13 +2,13 @@ package net.minecraft.server; import com.mojang.serialization.DataResult; import com.mojang.serialization.Dynamic; -import java.util.UUID; -import javax.annotation.Nullable; import org.apache.logging.log4j.Logger; -// CraftBukkit start import org.bukkit.craftbukkit.event.CraftEventFactory; import org.bukkit.entity.ZombieVillager; import org.bukkit.event.entity.EntityTransformEvent; + +import javax.annotation.Nullable; +import java.util.UUID; // CraftBukkit end public class EntityZombieVillager extends EntityZombie implements VillagerDataHolder { diff --git a/src/main/java/net/minecraft/server/EnumDirection.java b/src/main/java/net/minecraft/server/EnumDirection.java index 1aa9d9fd074c186b209696ee46e0dda181372f4b..a02f87750d8a0dc617bebd8c7f4db33f1d050b3d 100644 --- a/src/main/java/net/minecraft/server/EnumDirection.java +++ b/src/main/java/net/minecraft/server/EnumDirection.java @@ -4,16 +4,12 @@ import com.google.common.collect.Iterators; import com.mojang.serialization.Codec; import it.unimi.dsi.fastutil.longs.Long2ObjectMap; import it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap; -import java.util.Arrays; -import java.util.Comparator; -import java.util.Iterator; -import java.util.Locale; -import java.util.Map; -import java.util.Random; + +import javax.annotation.Nullable; +import java.util.*; import java.util.function.Predicate; import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.annotation.Nullable; public enum EnumDirection implements INamable { diff --git a/src/main/java/net/minecraft/server/EnumProtocol.java b/src/main/java/net/minecraft/server/EnumProtocol.java index ec3c8ec6a7c0a835d0bab9872d0ead68b2ff54df..4e856e3bccf667bdfb426331e3c3b3b68119a9ad 100644 --- a/src/main/java/net/minecraft/server/EnumProtocol.java +++ b/src/main/java/net/minecraft/server/EnumProtocol.java @@ -5,11 +5,12 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import it.unimi.dsi.fastutil.objects.Object2IntMap; import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap; +import org.apache.logging.log4j.LogManager; + +import javax.annotation.Nullable; import java.util.List; import java.util.Map; import java.util.function.Supplier; -import javax.annotation.Nullable; -import org.apache.logging.log4j.LogManager; public enum EnumProtocol { diff --git a/src/main/java/net/minecraft/server/ExpirableListEntry.java b/src/main/java/net/minecraft/server/ExpirableListEntry.java index 8aa38f805dec83f8ba07d0b78d64c9c9d066ace1..749f85cadadb662bea70fc89d2b41988d7b6ebde 100644 --- a/src/main/java/net/minecraft/server/ExpirableListEntry.java +++ b/src/main/java/net/minecraft/server/ExpirableListEntry.java @@ -1,10 +1,11 @@ package net.minecraft.server; import com.google.gson.JsonObject; + +import javax.annotation.Nullable; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.Date; -import javax.annotation.Nullable; public abstract class ExpirableListEntry extends JsonListEntry { diff --git a/src/main/java/net/minecraft/server/Explosion.java b/src/main/java/net/minecraft/server/Explosion.java index 35f5be9ef91f8d91ca66c52640719b2fdf52bbfd..15224fc323b66c4f33f487a994590df043db4f52 100644 --- a/src/main/java/net/minecraft/server/Explosion.java +++ b/src/main/java/net/minecraft/server/Explosion.java @@ -6,20 +6,13 @@ import com.google.common.collect.Sets; import com.mojang.datafixers.util.Pair; import it.unimi.dsi.fastutil.objects.ObjectArrayList; import it.unimi.dsi.fastutil.objects.ObjectListIterator; -import java.util.Collections; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import java.util.Random; -import java.util.Set; -import javax.annotation.Nullable; - -// CraftBukkit start -import org.bukkit.craftbukkit.event.CraftEventFactory; -import org.bukkit.event.entity.EntityExplodeEvent; import org.bukkit.Location; +import org.bukkit.craftbukkit.event.CraftEventFactory; import org.bukkit.event.block.BlockExplodeEvent; +import org.bukkit.event.entity.EntityExplodeEvent; + +import javax.annotation.Nullable; +import java.util.*; // CraftBukkit end public class Explosion { diff --git a/src/main/java/net/minecraft/server/Fluid.java b/src/main/java/net/minecraft/server/Fluid.java index 8ffc5db509867c585e90ea12d8509dcd0b1435e0..2189477e59e4695278c891ce14ec3f6797249caa 100644 --- a/src/main/java/net/minecraft/server/Fluid.java +++ b/src/main/java/net/minecraft/server/Fluid.java @@ -3,6 +3,7 @@ package net.minecraft.server; import com.google.common.collect.ImmutableMap; import com.mojang.serialization.Codec; import com.mojang.serialization.MapCodec; + import java.util.Random; public final class Fluid extends IBlockDataHolder { diff --git a/src/main/java/net/minecraft/server/FluidTypeFlowing.java b/src/main/java/net/minecraft/server/FluidTypeFlowing.java index d72a88e9275eb00eed35b6467538a46e5cee32d5..7e97b5dffc1228b30f4e75789398b7b616d68447 100644 --- a/src/main/java/net/minecraft/server/FluidTypeFlowing.java +++ b/src/main/java/net/minecraft/server/FluidTypeFlowing.java @@ -7,16 +7,16 @@ import it.unimi.dsi.fastutil.shorts.Short2BooleanMap; import it.unimi.dsi.fastutil.shorts.Short2BooleanOpenHashMap; import it.unimi.dsi.fastutil.shorts.Short2ObjectMap; import it.unimi.dsi.fastutil.shorts.Short2ObjectOpenHashMap; -import java.util.Iterator; -import java.util.Map; -import java.util.Map.Entry; -// CraftBukkit start import org.bukkit.block.BlockFace; import org.bukkit.craftbukkit.block.CraftBlock; import org.bukkit.craftbukkit.block.data.CraftBlockData; import org.bukkit.craftbukkit.event.CraftEventFactory; import org.bukkit.event.block.BlockFromToEvent; import org.bukkit.event.block.FluidLevelChangeEvent; + +import java.util.Iterator; +import java.util.Map; +import java.util.Map.Entry; // CraftBukkit end public abstract class FluidTypeFlowing extends FluidType { diff --git a/src/main/java/net/minecraft/server/FurnaceRecipe.java b/src/main/java/net/minecraft/server/FurnaceRecipe.java index 0b15f25303c05b5d1dd04434ebd52c7af1ade2d2..c0f7def983d53e661b229a0a7eb44251665f2793 100644 --- a/src/main/java/net/minecraft/server/FurnaceRecipe.java +++ b/src/main/java/net/minecraft/server/FurnaceRecipe.java @@ -1,12 +1,10 @@ package net.minecraft.server; // CraftBukkit start -import java.util.ArrayList; -import java.util.List; + import org.bukkit.craftbukkit.inventory.CraftFurnaceRecipe; import org.bukkit.craftbukkit.inventory.CraftItemStack; import org.bukkit.craftbukkit.inventory.CraftRecipe; -import org.bukkit.craftbukkit.util.CraftMagicNumbers; import org.bukkit.craftbukkit.util.CraftNamespacedKey; import org.bukkit.inventory.Recipe; // CraftBukkit end diff --git a/src/main/java/net/minecraft/server/GameProfileBanEntry.java b/src/main/java/net/minecraft/server/GameProfileBanEntry.java index 120c71766d3f0c2fcfbf5210b4b6c8c013a8a7b0..c07122cf7df7d3f86c00574bec508dadb2f49151 100644 --- a/src/main/java/net/minecraft/server/GameProfileBanEntry.java +++ b/src/main/java/net/minecraft/server/GameProfileBanEntry.java @@ -2,10 +2,11 @@ package net.minecraft.server; import com.google.gson.JsonObject; import com.mojang.authlib.GameProfile; + +import javax.annotation.Nullable; import java.util.Date; import java.util.Objects; import java.util.UUID; -import javax.annotation.Nullable; public class GameProfileBanEntry extends ExpirableListEntry { diff --git a/src/main/java/net/minecraft/server/GameProfileSerializer.java b/src/main/java/net/minecraft/server/GameProfileSerializer.java index 1fe44d4a1a1895f5715c720f9d7d7acb10e50f61..66a10de0bd9d2901c4e5cc5398f19c20b70e6c56 100644 --- a/src/main/java/net/minecraft/server/GameProfileSerializer.java +++ b/src/main/java/net/minecraft/server/GameProfileSerializer.java @@ -7,13 +7,14 @@ import com.mojang.authlib.GameProfile; import com.mojang.authlib.properties.Property; import com.mojang.datafixers.DataFixer; import com.mojang.serialization.Dynamic; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +import javax.annotation.Nullable; import java.util.Iterator; import java.util.Map.Entry; import java.util.Optional; import java.util.UUID; -import javax.annotation.Nullable; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; public final class GameProfileSerializer { diff --git a/src/main/java/net/minecraft/server/GameRules.java b/src/main/java/net/minecraft/server/GameRules.java index dec56f5fe2d01564905c19a907eceea11abd42de..2510cfbd7bc96824fc660d02a80fe55f376853a6 100644 --- a/src/main/java/net/minecraft/server/GameRules.java +++ b/src/main/java/net/minecraft/server/GameRules.java @@ -8,6 +8,10 @@ import com.mojang.brigadier.arguments.IntegerArgumentType; import com.mojang.brigadier.builder.RequiredArgumentBuilder; import com.mojang.brigadier.context.CommandContext; import com.mojang.serialization.DynamicLike; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +import javax.annotation.Nullable; import java.util.Comparator; import java.util.Iterator; import java.util.Map; @@ -15,9 +19,6 @@ import java.util.Map.Entry; import java.util.function.BiConsumer; import java.util.function.Function; import java.util.function.Supplier; -import javax.annotation.Nullable; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; public class GameRules { diff --git a/src/main/java/net/minecraft/server/GuiStatsComponent.java b/src/main/java/net/minecraft/server/GuiStatsComponent.java index 859e31c63f94bdc7729c6d475990750b76e24b9c..decb89a87a85f26fa30574dc077e0f61910a1fe6 100644 --- a/src/main/java/net/minecraft/server/GuiStatsComponent.java +++ b/src/main/java/net/minecraft/server/GuiStatsComponent.java @@ -1,13 +1,10 @@ package net.minecraft.server; -import java.awt.Color; -import java.awt.Dimension; -import java.awt.Graphics; +import javax.swing.*; +import java.awt.*; import java.text.DecimalFormat; import java.text.DecimalFormatSymbols; import java.util.Locale; -import javax.swing.JComponent; -import javax.swing.Timer; public class GuiStatsComponent extends JComponent { diff --git a/src/main/java/net/minecraft/server/HeightMap.java b/src/main/java/net/minecraft/server/HeightMap.java index a43c4ca3ea2e0dbf34a177592daed18c64bb14d3..1fdc709f5dcb873a20cebc3fe788e2a6bd5a641e 100644 --- a/src/main/java/net/minecraft/server/HeightMap.java +++ b/src/main/java/net/minecraft/server/HeightMap.java @@ -5,11 +5,12 @@ import com.mojang.serialization.Codec; import it.unimi.dsi.fastutil.objects.ObjectArrayList; import it.unimi.dsi.fastutil.objects.ObjectList; import it.unimi.dsi.fastutil.objects.ObjectListIterator; + +import javax.annotation.Nullable; import java.util.Iterator; import java.util.Map; import java.util.Set; import java.util.function.Predicate; -import javax.annotation.Nullable; public class HeightMap { diff --git a/src/main/java/net/minecraft/server/IAsyncTaskHandler.java b/src/main/java/net/minecraft/server/IAsyncTaskHandler.java index fb4c5ae4011e104848bab9e9141d9e90a5cb45ca..94f9b2036573b035db6bc9625412f09185d22181 100644 --- a/src/main/java/net/minecraft/server/IAsyncTaskHandler.java +++ b/src/main/java/net/minecraft/server/IAsyncTaskHandler.java @@ -1,13 +1,14 @@ package net.minecraft.server; import com.google.common.collect.Queues; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + import java.util.Queue; import java.util.concurrent.CompletableFuture; import java.util.concurrent.Executor; import java.util.concurrent.locks.LockSupport; import java.util.function.BooleanSupplier; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; public abstract class IAsyncTaskHandler implements Mailbox, Executor { diff --git a/src/main/java/net/minecraft/server/IBlockAccess.java b/src/main/java/net/minecraft/server/IBlockAccess.java index a59df0e48a9bcbb32c51ec0013f634d474f68e52..54f48ebc0a1add4183ad1a02e21d8025550f1cdb 100644 --- a/src/main/java/net/minecraft/server/IBlockAccess.java +++ b/src/main/java/net/minecraft/server/IBlockAccess.java @@ -1,9 +1,9 @@ package net.minecraft.server; +import javax.annotation.Nullable; import java.util.function.BiFunction; import java.util.function.Function; import java.util.stream.Stream; -import javax.annotation.Nullable; public interface IBlockAccess { diff --git a/src/main/java/net/minecraft/server/IBlockState.java b/src/main/java/net/minecraft/server/IBlockState.java index 6550b55067db31dbbc903fe17a13849383651c5a..6dde34c3ce51ec7f3c06567c9675fe3bfab4610d 100644 --- a/src/main/java/net/minecraft/server/IBlockState.java +++ b/src/main/java/net/minecraft/server/IBlockState.java @@ -3,6 +3,7 @@ package net.minecraft.server; import com.google.common.base.MoreObjects; import com.mojang.serialization.Codec; import com.mojang.serialization.DataResult; + import java.util.Collection; import java.util.Optional; import java.util.stream.Stream; diff --git a/src/main/java/net/minecraft/server/IChatBaseComponent.java b/src/main/java/net/minecraft/server/IChatBaseComponent.java index 94a6d0ad76b10b8790ffb2019bf6972472b04c3d..9fa95225ff3a31db29236a55bb7ad4a6b700e62e 100644 --- a/src/main/java/net/minecraft/server/IChatBaseComponent.java +++ b/src/main/java/net/minecraft/server/IChatBaseComponent.java @@ -1,18 +1,11 @@ package net.minecraft.server; -import com.google.gson.Gson; -import com.google.gson.GsonBuilder; -import com.google.gson.JsonArray; -import com.google.gson.JsonDeserializationContext; -import com.google.gson.JsonDeserializer; -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; -import com.google.gson.JsonParseException; -import com.google.gson.JsonPrimitive; -import com.google.gson.JsonSerializationContext; -import com.google.gson.JsonSerializer; +import com.google.common.collect.Streams; +import com.google.gson.*; import com.google.gson.stream.JsonReader; import com.mojang.brigadier.Message; + +import javax.annotation.Nullable; import java.io.IOException; import java.io.StringReader; import java.lang.reflect.Field; @@ -21,9 +14,6 @@ import java.util.Iterator; import java.util.List; import java.util.Map.Entry; import java.util.Optional; -import javax.annotation.Nullable; -// CraftBukkit start -import com.google.common.collect.Streams; import java.util.stream.Stream; public interface IChatBaseComponent extends Message, IChatFormatted, Iterable { diff --git a/src/main/java/net/minecraft/server/IChunkAccess.java b/src/main/java/net/minecraft/server/IChunkAccess.java index 930cd8106412b362650c77a69ea5f945043c92c7..854edaf19962dd0d6d5dc47cdad8e025fb1fb6d1 100644 --- a/src/main/java/net/minecraft/server/IChunkAccess.java +++ b/src/main/java/net/minecraft/server/IChunkAccess.java @@ -2,13 +2,14 @@ package net.minecraft.server; import it.unimi.dsi.fastutil.shorts.ShortArrayList; import it.unimi.dsi.fastutil.shorts.ShortList; +import org.apache.logging.log4j.LogManager; + +import javax.annotation.Nullable; import java.util.Collection; import java.util.Map; import java.util.Map.Entry; import java.util.Set; import java.util.stream.Stream; -import javax.annotation.Nullable; -import org.apache.logging.log4j.LogManager; public interface IChunkAccess extends IBlockAccess, IStructureAccess { diff --git a/src/main/java/net/minecraft/server/IChunkLoader.java b/src/main/java/net/minecraft/server/IChunkLoader.java index 5601088cd5024a40e8296bab979f43de924c2b62..69d138f2bb4625ff96223c8d70217c3ffef6de5d 100644 --- a/src/main/java/net/minecraft/server/IChunkLoader.java +++ b/src/main/java/net/minecraft/server/IChunkLoader.java @@ -1,14 +1,11 @@ package net.minecraft.server; import com.mojang.datafixers.DataFixer; + +import javax.annotation.Nullable; import java.io.File; import java.io.IOException; -// Paper start -import java.util.concurrent.CompletableFuture; -import java.util.concurrent.CompletionException; -// Paper end import java.util.function.Supplier; -import javax.annotation.Nullable; public class IChunkLoader implements AutoCloseable { diff --git a/src/main/java/net/minecraft/server/ICollisionAccess.java b/src/main/java/net/minecraft/server/ICollisionAccess.java index 3ce2f7497a9e12082b70525ad2aaf5e0828cc068..37d5c492a1cfa137abfd3b801a7f1020e5289e00 100644 --- a/src/main/java/net/minecraft/server/ICollisionAccess.java +++ b/src/main/java/net/minecraft/server/ICollisionAccess.java @@ -1,10 +1,10 @@ package net.minecraft.server; +import javax.annotation.Nullable; import java.util.function.BiPredicate; import java.util.function.Predicate; import java.util.stream.Stream; import java.util.stream.StreamSupport; -import javax.annotation.Nullable; public interface ICollisionAccess extends IBlockAccess { diff --git a/src/main/java/net/minecraft/server/IDispenseBehavior.java b/src/main/java/net/minecraft/server/IDispenseBehavior.java index 660f44975a003ea68ddad59899618485fdaf5487..1ec06c6f02f40fb3bf29e0f11ddcbb4338d83cb1 100644 --- a/src/main/java/net/minecraft/server/IDispenseBehavior.java +++ b/src/main/java/net/minecraft/server/IDispenseBehavior.java @@ -1,16 +1,15 @@ package net.minecraft.server; -import java.util.Iterator; -import java.util.List; -import java.util.Random; -// CraftBukkit start import org.bukkit.Location; import org.bukkit.TreeType; -import org.bukkit.craftbukkit.event.CraftEventFactory; import org.bukkit.craftbukkit.inventory.CraftItemStack; import org.bukkit.craftbukkit.util.DummyGeneratorAccess; import org.bukkit.event.block.BlockDispenseEvent; import org.bukkit.event.world.StructureGrowEvent; + +import java.util.Iterator; +import java.util.List; +import java.util.Random; // CraftBukkit end public interface IDispenseBehavior { diff --git a/src/main/java/net/minecraft/server/IEntityAccess.java b/src/main/java/net/minecraft/server/IEntityAccess.java index 0edcb775e965a3d6539d44e49480068deafab7a5..09e2ecb035fc724f35304460b67f303637b2860a 100644 --- a/src/main/java/net/minecraft/server/IEntityAccess.java +++ b/src/main/java/net/minecraft/server/IEntityAccess.java @@ -1,13 +1,14 @@ package net.minecraft.server; import com.google.common.collect.Lists; + +import javax.annotation.Nullable; import java.util.Iterator; import java.util.List; import java.util.Objects; import java.util.UUID; import java.util.function.Predicate; import java.util.stream.Stream; -import javax.annotation.Nullable; public interface IEntityAccess { diff --git a/src/main/java/net/minecraft/server/IEntityAngerable.java b/src/main/java/net/minecraft/server/IEntityAngerable.java index d2b8bf5c1c92469a878755dd2d90b0291ae53e37..d8b8670c83816b2233a61b451cec4b08d21101c3 100644 --- a/src/main/java/net/minecraft/server/IEntityAngerable.java +++ b/src/main/java/net/minecraft/server/IEntityAngerable.java @@ -1,8 +1,8 @@ package net.minecraft.server; +import javax.annotation.Nullable; import java.util.Objects; import java.util.UUID; -import javax.annotation.Nullable; public interface IEntityAngerable { diff --git a/src/main/java/net/minecraft/server/IEntitySelector.java b/src/main/java/net/minecraft/server/IEntitySelector.java index a52dd0c021e264a57a62bde27ea9d2a6a97e2335..3873b29900485a40bbc464580e1e69aec767528c 100644 --- a/src/main/java/net/minecraft/server/IEntitySelector.java +++ b/src/main/java/net/minecraft/server/IEntitySelector.java @@ -1,8 +1,9 @@ package net.minecraft.server; import com.google.common.base.Predicates; -import java.util.function.Predicate; + import javax.annotation.Nullable; +import java.util.function.Predicate; public final class IEntitySelector { diff --git a/src/main/java/net/minecraft/server/IHopper.java b/src/main/java/net/minecraft/server/IHopper.java index 84dcf4a0c5020f54f233e514a101e608d70286d5..2553abbfa05f0c6537c5ec92694b3c0704adad5c 100644 --- a/src/main/java/net/minecraft/server/IHopper.java +++ b/src/main/java/net/minecraft/server/IHopper.java @@ -1,7 +1,5 @@ package net.minecraft.server; -import javax.annotation.Nullable; - public interface IHopper extends IInventory { VoxelShape a = Block.a(2.0D, 11.0D, 2.0D, 14.0D, 16.0D, 14.0D); diff --git a/src/main/java/net/minecraft/server/IInventory.java b/src/main/java/net/minecraft/server/IInventory.java index 46b88056b852a7f91d32862dea7bd3a7ea4a1226..8c6568019517336fc30c5f4e694e06c730639017 100644 --- a/src/main/java/net/minecraft/server/IInventory.java +++ b/src/main/java/net/minecraft/server/IInventory.java @@ -1,7 +1,8 @@ package net.minecraft.server; +import org.bukkit.craftbukkit.entity.CraftHumanEntity; + import java.util.Set; -import org.bukkit.craftbukkit.entity.CraftHumanEntity; // CraftBukkit public interface IInventory extends Clearable { diff --git a/src/main/java/net/minecraft/server/IMerchant.java b/src/main/java/net/minecraft/server/IMerchant.java index f69132b6b87dfad47738661fff097d8f1346f4a5..904756d92590ecb3e49c08ffe4e4cdc4c1a99d65 100644 --- a/src/main/java/net/minecraft/server/IMerchant.java +++ b/src/main/java/net/minecraft/server/IMerchant.java @@ -1,7 +1,7 @@ package net.minecraft.server; -import java.util.OptionalInt; import javax.annotation.Nullable; +import java.util.OptionalInt; public interface IMerchant { diff --git a/src/main/java/net/minecraft/server/IOWorker.java b/src/main/java/net/minecraft/server/IOWorker.java index 620acc318d67a7317e3c40b24f2015aff5907be2..907916f8ce8021b0f0007bb6e1cda9287163d0cc 100644 --- a/src/main/java/net/minecraft/server/IOWorker.java +++ b/src/main/java/net/minecraft/server/IOWorker.java @@ -2,6 +2,10 @@ package net.minecraft.server; import com.google.common.collect.Maps; import com.mojang.datafixers.util.Either; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +import javax.annotation.Nullable; import java.io.File; import java.io.IOException; import java.util.ArrayList; @@ -14,9 +18,6 @@ import java.util.concurrent.CompletionException; import java.util.concurrent.atomic.AtomicBoolean; import java.util.function.Function; import java.util.function.Supplier; -import javax.annotation.Nullable; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; public class IOWorker implements AutoCloseable { diff --git a/src/main/java/net/minecraft/server/IProjectile.java b/src/main/java/net/minecraft/server/IProjectile.java index f538189aead404e97254ad3c9ca7bde1901791d8..28f53508f91b6a3412b8b3cfb8f7e70f0727053f 100644 --- a/src/main/java/net/minecraft/server/IProjectile.java +++ b/src/main/java/net/minecraft/server/IProjectile.java @@ -1,11 +1,10 @@ package net.minecraft.server; +import org.bukkit.projectiles.ProjectileSource; + +import javax.annotation.Nullable; import java.util.Iterator; import java.util.UUID; -import javax.annotation.Nullable; - -// CraftBukkit start -import org.bukkit.projectiles.ProjectileSource; // CraftBukkit end public abstract class IProjectile extends Entity { diff --git a/src/main/java/net/minecraft/server/IWorldReader.java b/src/main/java/net/minecraft/server/IWorldReader.java index b6d6905260cdd32873010f24ef5a3505e66159be..a2475bd55975445fc1e412d45720d5d1ff0e4553 100644 --- a/src/main/java/net/minecraft/server/IWorldReader.java +++ b/src/main/java/net/minecraft/server/IWorldReader.java @@ -1,7 +1,7 @@ package net.minecraft.server; -import java.util.stream.Stream; import javax.annotation.Nullable; +import java.util.stream.Stream; public interface IWorldReader extends IBlockLightAccess, ICollisionAccess, BiomeManager.Provider { diff --git a/src/main/java/net/minecraft/server/InventoryCraftResult.java b/src/main/java/net/minecraft/server/InventoryCraftResult.java index ff35cb2bd68335eba6af8bf5e6bd90916f358e01..0948a829e72d26f47f4578fb3defc7dedf92c917 100644 --- a/src/main/java/net/minecraft/server/InventoryCraftResult.java +++ b/src/main/java/net/minecraft/server/InventoryCraftResult.java @@ -1,11 +1,11 @@ package net.minecraft.server; -import java.util.Iterator; -import javax.annotation.Nullable; -// CraftBukkit start import org.bukkit.Location; import org.bukkit.craftbukkit.entity.CraftHumanEntity; import org.bukkit.entity.HumanEntity; + +import javax.annotation.Nullable; +import java.util.Iterator; // CraftBukkit end public class InventoryCraftResult implements IInventory, RecipeHolder { diff --git a/src/main/java/net/minecraft/server/InventoryCrafting.java b/src/main/java/net/minecraft/server/InventoryCrafting.java index 0dd7a8708c7ae8b494cae8da57de089bb32c7d4a..1e29bf073058291b80d0a41b91b6e1690a861535 100644 --- a/src/main/java/net/minecraft/server/InventoryCrafting.java +++ b/src/main/java/net/minecraft/server/InventoryCrafting.java @@ -1,13 +1,12 @@ package net.minecraft.server; -import java.util.Iterator; -// CraftBukkit start -import java.util.List; import org.bukkit.Location; - import org.bukkit.craftbukkit.entity.CraftHumanEntity; import org.bukkit.entity.HumanEntity; import org.bukkit.event.inventory.InventoryType; + +import java.util.Iterator; +import java.util.List; // CraftBukkit end public class InventoryCrafting implements IInventory, AutoRecipeOutput { diff --git a/src/main/java/net/minecraft/server/InventoryLargeChest.java b/src/main/java/net/minecraft/server/InventoryLargeChest.java index d41f04ff36a437531f86abdad82efecd36f1b786..9c26d5d0475fc0dfe6ee9cb8df46772aa19194f4 100644 --- a/src/main/java/net/minecraft/server/InventoryLargeChest.java +++ b/src/main/java/net/minecraft/server/InventoryLargeChest.java @@ -1,12 +1,13 @@ package net.minecraft.server; // CraftBukkit start -import java.util.ArrayList; -import java.util.List; -import org.bukkit.Location; +import org.bukkit.Location; import org.bukkit.craftbukkit.entity.CraftHumanEntity; import org.bukkit.entity.HumanEntity; + +import java.util.ArrayList; +import java.util.List; // CraftBukkit end public class InventoryLargeChest implements IInventory { diff --git a/src/main/java/net/minecraft/server/InventoryMerchant.java b/src/main/java/net/minecraft/server/InventoryMerchant.java index 8f17a346deec7a3a7cacb516fcab04954e4b1824..9da614417d915d410335cf9bbcfca9343c36dd55 100644 --- a/src/main/java/net/minecraft/server/InventoryMerchant.java +++ b/src/main/java/net/minecraft/server/InventoryMerchant.java @@ -1,13 +1,13 @@ package net.minecraft.server; -import java.util.Iterator; -import javax.annotation.Nullable; -// CraftBukkit start -import java.util.List; import org.bukkit.Location; -import org.bukkit.craftbukkit.entity.CraftHumanEntity; import org.bukkit.craftbukkit.entity.CraftAbstractVillager; +import org.bukkit.craftbukkit.entity.CraftHumanEntity; import org.bukkit.entity.HumanEntity; + +import javax.annotation.Nullable; +import java.util.Iterator; +import java.util.List; // CraftBukkit end public class InventoryMerchant implements IInventory { diff --git a/src/main/java/net/minecraft/server/InventorySubcontainer.java b/src/main/java/net/minecraft/server/InventorySubcontainer.java index 4cf5dad0939ecb636752e19ad19aec2c882d5efc..b9d1c0d48c2fd0e2b423b99447a4b8d551077f08 100644 --- a/src/main/java/net/minecraft/server/InventorySubcontainer.java +++ b/src/main/java/net/minecraft/server/InventorySubcontainer.java @@ -1,16 +1,13 @@ package net.minecraft.server; import com.google.common.collect.Lists; +import org.bukkit.Location; +import org.bukkit.craftbukkit.entity.CraftHumanEntity; +import org.bukkit.entity.HumanEntity; import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import java.util.stream.Collectors; - -// CraftBukkit start -import org.bukkit.Location; -import org.bukkit.craftbukkit.entity.CraftHumanEntity; -import org.bukkit.entity.HumanEntity; // CraftBukkit end public class InventorySubcontainer implements IInventory, AutoRecipeOutput { diff --git a/src/main/java/net/minecraft/server/ItemArmor.java b/src/main/java/net/minecraft/server/ItemArmor.java index 885458d54c97ad597d84ebb414884bf9fc1e0d86..9aeecdafeed5b4bd7b13b91cfa71456e0719bcf0 100644 --- a/src/main/java/net/minecraft/server/ItemArmor.java +++ b/src/main/java/net/minecraft/server/ItemArmor.java @@ -3,12 +3,11 @@ package net.minecraft.server; import com.google.common.collect.ImmutableMultimap; import com.google.common.collect.ImmutableMultimap.Builder; import com.google.common.collect.Multimap; -import java.util.List; -import java.util.UUID; - -// CraftBukkit start import org.bukkit.craftbukkit.inventory.CraftItemStack; import org.bukkit.event.block.BlockDispenseArmorEvent; + +import java.util.List; +import java.util.UUID; // CraftBukkit end public class ItemArmor extends Item implements ItemWearable { diff --git a/src/main/java/net/minecraft/server/ItemBlock.java b/src/main/java/net/minecraft/server/ItemBlock.java index 63d2294da4f0da628e62b782b71e34cb3eb959b5..8425d58ccae4d1462e225ef7f0e4d25ce26ac43c 100644 --- a/src/main/java/net/minecraft/server/ItemBlock.java +++ b/src/main/java/net/minecraft/server/ItemBlock.java @@ -1,12 +1,12 @@ package net.minecraft.server; -import java.util.Iterator; -import java.util.Map; -import javax.annotation.Nullable; -// CraftBukkit start import org.bukkit.craftbukkit.block.CraftBlock; import org.bukkit.craftbukkit.block.data.CraftBlockData; import org.bukkit.event.block.BlockCanBuildEvent; + +import javax.annotation.Nullable; +import java.util.Iterator; +import java.util.Map; // CraftBukkit end public class ItemBlock extends Item { diff --git a/src/main/java/net/minecraft/server/ItemBucket.java b/src/main/java/net/minecraft/server/ItemBucket.java index 120bf8436fd82294c339add2e7bff1cda8311aea..6697cfb7cf32cc2a86993a9d59aec056ac493c30 100644 --- a/src/main/java/net/minecraft/server/ItemBucket.java +++ b/src/main/java/net/minecraft/server/ItemBucket.java @@ -1,12 +1,12 @@ package net.minecraft.server; -import javax.annotation.Nullable; -// CraftBukkit start import org.bukkit.craftbukkit.event.CraftEventFactory; import org.bukkit.craftbukkit.inventory.CraftItemStack; import org.bukkit.craftbukkit.util.DummyGeneratorAccess; import org.bukkit.event.player.PlayerBucketEmptyEvent; import org.bukkit.event.player.PlayerBucketFillEvent; + +import javax.annotation.Nullable; // CraftBukkit end public class ItemBucket extends Item { diff --git a/src/main/java/net/minecraft/server/ItemCrossbow.java b/src/main/java/net/minecraft/server/ItemCrossbow.java index 728767356ba82a77cc87040db5a7aef88c1ea8e1..4e5d09d2d43aca5cfd7f284120043293e82009a3 100644 --- a/src/main/java/net/minecraft/server/ItemCrossbow.java +++ b/src/main/java/net/minecraft/server/ItemCrossbow.java @@ -1,6 +1,7 @@ package net.minecraft.server; import com.google.common.collect.Lists; + import java.util.List; import java.util.Random; import java.util.function.Predicate; diff --git a/src/main/java/net/minecraft/server/ItemDebugStick.java b/src/main/java/net/minecraft/server/ItemDebugStick.java index 138dc40c4080ee6c345cb99d5a8fa26e2cb472be..480dbd68605a0d2ff6423ddb99a75b5a516ab600 100644 --- a/src/main/java/net/minecraft/server/ItemDebugStick.java +++ b/src/main/java/net/minecraft/server/ItemDebugStick.java @@ -1,7 +1,7 @@ package net.minecraft.server; -import java.util.Collection; import javax.annotation.Nullable; +import java.util.Collection; public class ItemDebugStick extends Item { diff --git a/src/main/java/net/minecraft/server/ItemDye.java b/src/main/java/net/minecraft/server/ItemDye.java index b885d66717c44ca128874b7c0887f8efe4bda183..64e63663e65bc4ab1e975f9b61c547fb270eb092 100644 --- a/src/main/java/net/minecraft/server/ItemDye.java +++ b/src/main/java/net/minecraft/server/ItemDye.java @@ -1,9 +1,9 @@ package net.minecraft.server; import com.google.common.collect.Maps; -import java.util.Map; +import org.bukkit.event.entity.SheepDyeWoolEvent; -import org.bukkit.event.entity.SheepDyeWoolEvent; // CraftBukkit +import java.util.Map; public class ItemDye extends Item { diff --git a/src/main/java/net/minecraft/server/ItemFireworks.java b/src/main/java/net/minecraft/server/ItemFireworks.java index 886b6006c0691afb85de605bb4f5dfc05b440878..cf232cb18bf320011f588602e42c0e20b52fe70c 100644 --- a/src/main/java/net/minecraft/server/ItemFireworks.java +++ b/src/main/java/net/minecraft/server/ItemFireworks.java @@ -1,7 +1,6 @@ package net.minecraft.server; import java.util.ArrayList; -import java.util.Arrays; import java.util.Comparator; import java.util.List; diff --git a/src/main/java/net/minecraft/server/ItemFishingRod.java b/src/main/java/net/minecraft/server/ItemFishingRod.java index 427c593be79fc26d5b8a1b5b60987d15b25f93ed..1b0146413e80c5a0df594da3def26e7118d874ee 100644 --- a/src/main/java/net/minecraft/server/ItemFishingRod.java +++ b/src/main/java/net/minecraft/server/ItemFishingRod.java @@ -1,6 +1,6 @@ package net.minecraft.server; -import org.bukkit.event.player.PlayerFishEvent; // CraftBukkit +import org.bukkit.event.player.PlayerFishEvent; public class ItemFishingRod extends Item implements ItemVanishable { diff --git a/src/main/java/net/minecraft/server/ItemLeash.java b/src/main/java/net/minecraft/server/ItemLeash.java index aadceb34a09729b883ff1fcabfafdc02b4448bff..7d58e32a257174053e73a5de0a31d055b90316cf 100644 --- a/src/main/java/net/minecraft/server/ItemLeash.java +++ b/src/main/java/net/minecraft/server/ItemLeash.java @@ -1,10 +1,10 @@ package net.minecraft.server; +import org.bukkit.event.hanging.HangingPlaceEvent; + import java.util.Iterator; import java.util.List; -import org.bukkit.event.hanging.HangingPlaceEvent; // CraftBukkit - public class ItemLeash extends Item { public ItemLeash(Item.Info item_info) { diff --git a/src/main/java/net/minecraft/server/ItemMonsterEgg.java b/src/main/java/net/minecraft/server/ItemMonsterEgg.java index 6d83210806aafd00f45dc44c6723b818c5b1fba1..cb88147e34f66a65d5da4db2637a28746c2eff87 100644 --- a/src/main/java/net/minecraft/server/ItemMonsterEgg.java +++ b/src/main/java/net/minecraft/server/ItemMonsterEgg.java @@ -2,10 +2,11 @@ package net.minecraft.server; import com.google.common.collect.Iterables; import com.google.common.collect.Maps; + +import javax.annotation.Nullable; import java.util.Map; import java.util.Objects; import java.util.Optional; -import javax.annotation.Nullable; public class ItemMonsterEgg extends Item { diff --git a/src/main/java/net/minecraft/server/ItemRecord.java b/src/main/java/net/minecraft/server/ItemRecord.java index 3e49b2c9db37ddba1c6bdd544877d5e7cd67141e..13b9bd8ece4aaa804d8d79b902d3ec63a737de87 100644 --- a/src/main/java/net/minecraft/server/ItemRecord.java +++ b/src/main/java/net/minecraft/server/ItemRecord.java @@ -1,6 +1,7 @@ package net.minecraft.server; import com.google.common.collect.Maps; + import java.util.Map; public class ItemRecord extends Item { diff --git a/src/main/java/net/minecraft/server/ItemSkullPlayer.java b/src/main/java/net/minecraft/server/ItemSkullPlayer.java index 61f4cf9cc62a1b2ba59137b8682cb58834b4abcc..d08946bb977a3e949fc2178ed12e84152551a635 100644 --- a/src/main/java/net/minecraft/server/ItemSkullPlayer.java +++ b/src/main/java/net/minecraft/server/ItemSkullPlayer.java @@ -1,9 +1,10 @@ package net.minecraft.server; import com.mojang.authlib.GameProfile; -import java.util.UUID; import org.apache.commons.lang3.StringUtils; +import java.util.UUID; + public class ItemSkullPlayer extends ItemBlockWallable { public ItemSkullPlayer(Block block, Block block1, Item.Info item_info) { diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java index 3c56053e3075173edd22eccb277f51a12287ab56..9529eb584b1d5f4549d4f376a2d4894a65f05c6d 100644 --- a/src/main/java/net/minecraft/server/ItemStack.java +++ b/src/main/java/net/minecraft/server/ItemStack.java @@ -6,26 +6,10 @@ import com.google.gson.JsonParseException; import com.mojang.brigadier.StringReader; import com.mojang.brigadier.exceptions.CommandSyntaxException; import com.mojang.serialization.Codec; +import com.mojang.serialization.Dynamic; import com.mojang.serialization.codecs.RecordCodecBuilder; -import java.text.DecimalFormat; -import java.text.DecimalFormatSymbols; -import java.util.Collections; -import java.util.Comparator; -import java.util.Locale; -import java.util.Objects; -import java.util.Optional; -import java.util.Random; -import java.util.function.Consumer; -import java.util.function.Predicate; -import javax.annotation.Nullable; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; - -// CraftBukkit start -import com.mojang.serialization.Dynamic; -import java.util.List; -import java.util.Map; - import org.bukkit.Location; import org.bukkit.TreeType; import org.bukkit.block.BlockState; @@ -37,6 +21,13 @@ import org.bukkit.entity.Player; import org.bukkit.event.block.BlockFertilizeEvent; import org.bukkit.event.player.PlayerItemDamageEvent; import org.bukkit.event.world.StructureGrowEvent; + +import javax.annotation.Nullable; +import java.text.DecimalFormat; +import java.text.DecimalFormatSymbols; +import java.util.*; +import java.util.function.Consumer; +import java.util.function.Predicate; // CraftBukkit end public final class ItemStack { diff --git a/src/main/java/net/minecraft/server/ItemWorldMap.java b/src/main/java/net/minecraft/server/ItemWorldMap.java index faa556d4358bc9890ae80c18ee10c38a8d46548e..0f342d972f94852d057e39f0c24baf46b21c0d52 100644 --- a/src/main/java/net/minecraft/server/ItemWorldMap.java +++ b/src/main/java/net/minecraft/server/ItemWorldMap.java @@ -4,11 +4,10 @@ import com.google.common.collect.Iterables; import com.google.common.collect.LinkedHashMultiset; import com.google.common.collect.Multiset; import com.google.common.collect.Multisets; -import javax.annotation.Nullable; - -// CraftBukkit start import org.bukkit.Bukkit; import org.bukkit.event.server.MapInitializeEvent; + +import javax.annotation.Nullable; // CraftBukkit end public class ItemWorldMap extends ItemWorldMapBase { diff --git a/src/main/java/net/minecraft/server/JsonList.java b/src/main/java/net/minecraft/server/JsonList.java index 6d7452d05c648cdee50b2077aec6f100449b8229..da52912a4ae8d23d1fa14a2a1b4fdcba26c2500e 100644 --- a/src/main/java/net/minecraft/server/JsonList.java +++ b/src/main/java/net/minecraft/server/JsonList.java @@ -1,29 +1,24 @@ package net.minecraft.server; -import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.io.Files; -import com.google.gson.Gson; -import com.google.gson.GsonBuilder; -import com.google.gson.JsonArray; -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; +import com.google.gson.*; +import org.apache.commons.io.IOUtils; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +import javax.annotation.Nullable; import java.io.BufferedReader; import java.io.BufferedWriter; import java.io.File; import java.io.IOException; -import java.lang.reflect.ParameterizedType; // Paper -import java.lang.reflect.Type; // Paper +import java.lang.reflect.ParameterizedType; +import java.lang.reflect.Type; import java.nio.charset.StandardCharsets; import java.util.Collection; import java.util.Iterator; import java.util.List; import java.util.Map; -import javax.annotation.Nullable; - -import org.apache.commons.io.IOUtils; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; public abstract class JsonList> { diff --git a/src/main/java/net/minecraft/server/LegacyPingHandler.java b/src/main/java/net/minecraft/server/LegacyPingHandler.java index 4a49fe4cc600e2b70963302ddae0c4479849f3f5..c9f277c06d29741fbab92c77dadf0b53cc84911a 100644 --- a/src/main/java/net/minecraft/server/LegacyPingHandler.java +++ b/src/main/java/net/minecraft/server/LegacyPingHandler.java @@ -1,17 +1,17 @@ package net.minecraft.server; import com.destroystokyo.paper.network.PaperLegacyStatusClient; - import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import io.netty.channel.ChannelFutureListener; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelInboundHandlerAdapter; -import java.net.InetSocketAddress; -import java.nio.charset.StandardCharsets; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import java.net.InetSocketAddress; +import java.nio.charset.StandardCharsets; + public class LegacyPingHandler extends ChannelInboundHandlerAdapter { private static final Logger LOGGER = LogManager.getLogger(); diff --git a/src/main/java/net/minecraft/server/LightEngineLayer.java b/src/main/java/net/minecraft/server/LightEngineLayer.java index b5d5dd1075fd6aabbfbbd60f219b76593fc54a76..56c2ee99ab1d2ec28befaf3383e83a8f70fbdb20 100644 --- a/src/main/java/net/minecraft/server/LightEngineLayer.java +++ b/src/main/java/net/minecraft/server/LightEngineLayer.java @@ -1,9 +1,10 @@ package net.minecraft.server; -import java.util.Arrays; -import javax.annotation.Nullable; import org.apache.commons.lang3.mutable.MutableInt; +import javax.annotation.Nullable; +import java.util.Arrays; + public abstract class LightEngineLayer, S extends LightEngineStorage> extends LightEngineGraph implements LightEngineLayerEventListener { private static final EnumDirection[] e = EnumDirection.values(); diff --git a/src/main/java/net/minecraft/server/LightEngineStorage.java b/src/main/java/net/minecraft/server/LightEngineStorage.java index e0bbfe1422cbad811ecb43d7436380d86b0f8abc..e06de856b8d889c4235cb0a443d9df808cfe34d3 100644 --- a/src/main/java/net/minecraft/server/LightEngineStorage.java +++ b/src/main/java/net/minecraft/server/LightEngineStorage.java @@ -1,13 +1,9 @@ package net.minecraft.server; -import it.unimi.dsi.fastutil.longs.Long2ObjectMap; +import it.unimi.dsi.fastutil.longs.*; import it.unimi.dsi.fastutil.longs.Long2ObjectMap.Entry; -import it.unimi.dsi.fastutil.longs.Long2ObjectMaps; -import it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap; -import it.unimi.dsi.fastutil.longs.LongIterator; -import it.unimi.dsi.fastutil.longs.LongOpenHashSet; -import it.unimi.dsi.fastutil.longs.LongSet; import it.unimi.dsi.fastutil.objects.ObjectIterator; + import javax.annotation.Nullable; public abstract class LightEngineStorage> extends LightEngineGraphSection { diff --git a/src/main/java/net/minecraft/server/LightEngineStorageArray.java b/src/main/java/net/minecraft/server/LightEngineStorageArray.java index 549c2551c2b59730bf53a80f8706d388d96ad932..cee30e695c378acba0aab9ae66094914364ea3c9 100644 --- a/src/main/java/net/minecraft/server/LightEngineStorageArray.java +++ b/src/main/java/net/minecraft/server/LightEngineStorageArray.java @@ -1,6 +1,5 @@ package net.minecraft.server; -import it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap; import javax.annotation.Nullable; public abstract class LightEngineStorageArray> { diff --git a/src/main/java/net/minecraft/server/LightEngineStorageBlock.java b/src/main/java/net/minecraft/server/LightEngineStorageBlock.java index 5b7b7506f5d1a7578fb54a578891324dfcec3f03..c6362f6ba91c5f945e1d3ce1e5b095771eebd55b 100644 --- a/src/main/java/net/minecraft/server/LightEngineStorageBlock.java +++ b/src/main/java/net/minecraft/server/LightEngineStorageBlock.java @@ -1,7 +1,5 @@ package net.minecraft.server; -import it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap; - public class LightEngineStorageBlock extends LightEngineStorage { protected LightEngineStorageBlock(ILightAccess ilightaccess) { diff --git a/src/main/java/net/minecraft/server/LightEngineStorageSky.java b/src/main/java/net/minecraft/server/LightEngineStorageSky.java index 944094e8e770cc8c0205ef2aa6c48fff55d74639..d29e1edffd6c27b351eebb385ceac23db6101713 100644 --- a/src/main/java/net/minecraft/server/LightEngineStorageSky.java +++ b/src/main/java/net/minecraft/server/LightEngineStorageSky.java @@ -1,10 +1,9 @@ package net.minecraft.server; -import it.unimi.dsi.fastutil.longs.Long2IntOpenHashMap; -import it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap; import it.unimi.dsi.fastutil.longs.LongIterator; import it.unimi.dsi.fastutil.longs.LongOpenHashSet; import it.unimi.dsi.fastutil.longs.LongSet; + import java.util.Arrays; public class LightEngineStorageSky extends LightEngineStorage { diff --git a/src/main/java/net/minecraft/server/LightEngineThreaded.java b/src/main/java/net/minecraft/server/LightEngineThreaded.java index cc22d89d540a4f86e11d7d09ad2be7fcf070f43d..adc7e6b6c0a8bec4dc0d2c9bf39a459578bdd41d 100644 --- a/src/main/java/net/minecraft/server/LightEngineThreaded.java +++ b/src/main/java/net/minecraft/server/LightEngineThreaded.java @@ -1,15 +1,12 @@ package net.minecraft.server; -import com.mojang.datafixers.util.Pair; -import it.unimi.dsi.fastutil.objects.ObjectArrayList; -import it.unimi.dsi.fastutil.objects.ObjectList; -import it.unimi.dsi.fastutil.objects.ObjectListIterator; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +import javax.annotation.Nullable; import java.util.concurrent.CompletableFuture; import java.util.concurrent.atomic.AtomicBoolean; import java.util.function.IntSupplier; -import javax.annotation.Nullable; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; public class LightEngineThreaded extends LightEngine implements AutoCloseable { diff --git a/src/main/java/net/minecraft/server/LocaleLanguage.java b/src/main/java/net/minecraft/server/LocaleLanguage.java index c83ba9d9869f8ba51df17963d530536d2a08c263..b87b989a4dfd1abe160842071b435d19bdd8942e 100644 --- a/src/main/java/net/minecraft/server/LocaleLanguage.java +++ b/src/main/java/net/minecraft/server/LocaleLanguage.java @@ -6,6 +6,9 @@ import com.google.gson.Gson; import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonParseException; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; @@ -15,8 +18,6 @@ import java.util.Map; import java.util.Map.Entry; import java.util.function.BiConsumer; import java.util.regex.Pattern; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; public abstract class LocaleLanguage { diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java index b46122a57b60888b20ec6602bb89df898ff981a4..656ba5b0621aa3f5a3208a4e08692a381522f437 100644 --- a/src/main/java/net/minecraft/server/LoginListener.java +++ b/src/main/java/net/minecraft/server/LoginListener.java @@ -4,6 +4,16 @@ import com.destroystokyo.paper.profile.CraftPlayerProfile; import com.destroystokyo.paper.profile.PlayerProfile; import com.mojang.authlib.GameProfile; import com.mojang.authlib.exceptions.AuthenticationUnavailableException; +import io.netty.buffer.Unpooled; +import org.apache.commons.lang3.Validate; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.bukkit.craftbukkit.util.Waitable; +import org.bukkit.event.player.AsyncPlayerPreLoginEvent; +import org.bukkit.event.player.PlayerPreLoginEvent; + +import javax.annotation.Nullable; +import javax.crypto.SecretKey; import java.math.BigInteger; import java.net.InetAddress; import java.net.InetSocketAddress; @@ -13,19 +23,6 @@ import java.util.Arrays; import java.util.Random; import java.util.UUID; import java.util.concurrent.atomic.AtomicInteger; -import javax.annotation.Nullable; -import javax.crypto.SecretKey; -import org.apache.commons.lang3.Validate; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; - -// CraftBukkit start -import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.util.Waitable; -import org.bukkit.event.player.AsyncPlayerPreLoginEvent; -import org.bukkit.event.player.PlayerPreLoginEvent; -// CraftBukkit end -import io.netty.buffer.Unpooled; // Paper public class LoginListener implements PacketLoginInListener { diff --git a/src/main/java/net/minecraft/server/LootEnchantFunction.java b/src/main/java/net/minecraft/server/LootEnchantFunction.java index 53c37b4a79a6bbd0d6b62ee0aa224f5cb32c9fbd..5da2f615e1a67cfca13609910576098daa741a82 100644 --- a/src/main/java/net/minecraft/server/LootEnchantFunction.java +++ b/src/main/java/net/minecraft/server/LootEnchantFunction.java @@ -4,6 +4,7 @@ import com.google.common.collect.ImmutableSet; import com.google.gson.JsonDeserializationContext; import com.google.gson.JsonObject; import com.google.gson.JsonSerializationContext; + import java.util.Set; public class LootEnchantFunction extends LootItemFunctionConditional { diff --git a/src/main/java/net/minecraft/server/LootEntryAbstract.java b/src/main/java/net/minecraft/server/LootEntryAbstract.java index 788078c209b8bcbd551cf0a52eb6172928d7b5f9..39227fd450c32ea58439f6ad1d310f2c518ad109 100644 --- a/src/main/java/net/minecraft/server/LootEntryAbstract.java +++ b/src/main/java/net/minecraft/server/LootEntryAbstract.java @@ -4,6 +4,7 @@ import com.google.common.collect.Lists; import com.google.gson.JsonDeserializationContext; import com.google.gson.JsonObject; import com.google.gson.JsonSerializationContext; + import java.util.List; import java.util.function.Predicate; diff --git a/src/main/java/net/minecraft/server/LootItemConditionRandomChanceWithLooting.java b/src/main/java/net/minecraft/server/LootItemConditionRandomChanceWithLooting.java index be735fe49317cb70b0f77d567a3714faca4b60ae..fb285b3fb92af4eb4c867e44253fa7cd3d3c87fc 100644 --- a/src/main/java/net/minecraft/server/LootItemConditionRandomChanceWithLooting.java +++ b/src/main/java/net/minecraft/server/LootItemConditionRandomChanceWithLooting.java @@ -4,6 +4,7 @@ import com.google.common.collect.ImmutableSet; import com.google.gson.JsonDeserializationContext; import com.google.gson.JsonObject; import com.google.gson.JsonSerializationContext; + import java.util.Set; public class LootItemConditionRandomChanceWithLooting implements LootItemCondition { diff --git a/src/main/java/net/minecraft/server/LootItemConditionSurvivesExplosion.java b/src/main/java/net/minecraft/server/LootItemConditionSurvivesExplosion.java index 873a177cdc13a7b04cea5af81c178e82a32d307b..bb75895189ddcef1a5376b328bf2fed0ec148079 100644 --- a/src/main/java/net/minecraft/server/LootItemConditionSurvivesExplosion.java +++ b/src/main/java/net/minecraft/server/LootItemConditionSurvivesExplosion.java @@ -4,6 +4,7 @@ import com.google.common.collect.ImmutableSet; import com.google.gson.JsonDeserializationContext; import com.google.gson.JsonObject; import com.google.gson.JsonSerializationContext; + import java.util.Random; import java.util.Set; diff --git a/src/main/java/net/minecraft/server/LootItemFunctionExplorationMap.java b/src/main/java/net/minecraft/server/LootItemFunctionExplorationMap.java index 30f21e3ff7eed3c7291e01b94cc0f66fd48756d0..cccd0b1a4cc7505b3a63b117e25ad8e8e0b949e4 100644 --- a/src/main/java/net/minecraft/server/LootItemFunctionExplorationMap.java +++ b/src/main/java/net/minecraft/server/LootItemFunctionExplorationMap.java @@ -4,11 +4,12 @@ import com.google.common.collect.ImmutableSet; import com.google.gson.JsonDeserializationContext; import com.google.gson.JsonObject; import com.google.gson.JsonSerializationContext; -import java.util.Locale; -import java.util.Set; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import java.util.Locale; +import java.util.Set; + public class LootItemFunctionExplorationMap extends LootItemFunctionConditional { private static final Logger LOGGER = LogManager.getLogger(); diff --git a/src/main/java/net/minecraft/server/LootSelectorEntry.java b/src/main/java/net/minecraft/server/LootSelectorEntry.java index ca18d3156fd2b10f8ee48ff02f6f47e6e649200b..3aced0cb32f3a4f11efda79e40b6f8cd5045b295 100644 --- a/src/main/java/net/minecraft/server/LootSelectorEntry.java +++ b/src/main/java/net/minecraft/server/LootSelectorEntry.java @@ -4,10 +4,11 @@ import com.google.common.collect.Lists; import com.google.gson.JsonDeserializationContext; import com.google.gson.JsonObject; import com.google.gson.JsonSerializationContext; +import org.apache.commons.lang3.ArrayUtils; + import java.util.List; import java.util.function.BiFunction; import java.util.function.Consumer; -import org.apache.commons.lang3.ArrayUtils; public abstract class LootSelectorEntry extends LootEntryAbstract { diff --git a/src/main/java/net/minecraft/server/LootTable.java b/src/main/java/net/minecraft/server/LootTable.java index 424144fc4c2fdec628ff0c0207f21b0c56d96501..451cec0df56e1153c1c8c9ae554530fbc77ad312 100644 --- a/src/main/java/net/minecraft/server/LootTable.java +++ b/src/main/java/net/minecraft/server/LootTable.java @@ -1,25 +1,18 @@ package net.minecraft.server; import com.google.common.collect.Lists; -import com.google.gson.JsonDeserializationContext; -import com.google.gson.JsonDeserializer; -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; -import com.google.gson.JsonParseException; -import com.google.gson.JsonSerializationContext; -import com.google.gson.JsonSerializer; -import java.lang.reflect.Type; -import java.util.*; -import java.util.function.BiFunction; -import java.util.function.Consumer; +import com.google.gson.*; import org.apache.commons.lang3.ArrayUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -// CraftBukkit start -import java.util.stream.Collectors; import org.bukkit.craftbukkit.event.CraftEventFactory; import org.bukkit.craftbukkit.inventory.CraftItemStack; import org.bukkit.event.world.LootGenerateEvent; + +import java.lang.reflect.Type; +import java.util.*; +import java.util.function.BiFunction; +import java.util.function.Consumer; // CraftBukkit end public class LootTable { diff --git a/src/main/java/net/minecraft/server/LootTableRegistry.java b/src/main/java/net/minecraft/server/LootTableRegistry.java index 43452f663eab54e094e8feab1e9f2266efe82e16..2c456bc34ca9eb56534f68f4844057a852f5ca8a 100644 --- a/src/main/java/net/minecraft/server/LootTableRegistry.java +++ b/src/main/java/net/minecraft/server/LootTableRegistry.java @@ -4,11 +4,12 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMap.Builder; import com.google.gson.Gson; import com.google.gson.JsonElement; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + import java.util.Map; import java.util.Set; import java.util.function.Function; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; public class LootTableRegistry extends ResourceDataJson { diff --git a/src/main/java/net/minecraft/server/MCUtil.java b/src/main/java/net/minecraft/server/MCUtil.java index 284448e6fe9c1c2649ac852cbf9efb7aa00ba3de..14f91c7e67e92b6407a789835378db76a2ecd797 100644 --- a/src/main/java/net/minecraft/server/MCUtil.java +++ b/src/main/java/net/minecraft/server/MCUtil.java @@ -4,7 +4,6 @@ import com.destroystokyo.paper.block.TargetBlockInfo; import com.destroystokyo.paper.profile.CraftPlayerProfile; import com.destroystokyo.paper.profile.PlayerProfile; import com.google.common.util.concurrent.ThreadFactoryBuilder; -import org.apache.commons.lang.exception.ExceptionUtils; import com.google.gson.JsonArray; import com.google.gson.JsonObject; import com.google.gson.internal.Streams; @@ -12,6 +11,7 @@ import com.google.gson.stream.JsonWriter; import com.mojang.authlib.GameProfile; import com.mojang.datafixers.util.Either; import it.unimi.dsi.fastutil.longs.Long2ObjectLinkedOpenHashMap; +import org.apache.commons.lang.exception.ExceptionUtils; import org.bukkit.Location; import org.bukkit.block.BlockFace; import org.bukkit.craftbukkit.CraftWorld; @@ -25,12 +25,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Queue; import java.util.Set; -import java.util.concurrent.CompletableFuture; -import java.util.concurrent.ExecutionException; -import java.util.concurrent.LinkedBlockingQueue; -import java.util.concurrent.ThreadPoolExecutor; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.TimeoutException; +import java.util.concurrent.*; import java.util.concurrent.atomic.AtomicBoolean; import java.util.function.BiConsumer; import java.util.function.Consumer; diff --git a/src/main/java/net/minecraft/server/Main.java b/src/main/java/net/minecraft/server/Main.java index c426d1ed14177326c774d44c248f38229b3ad5be..2ddd36aa4b7c6835261012c5b70570898c2877e7 100644 --- a/src/main/java/net/minecraft/server/Main.java +++ b/src/main/java/net/minecraft/server/Main.java @@ -5,9 +5,11 @@ import com.mojang.authlib.GameProfileRepository; import com.mojang.authlib.minecraft.MinecraftSessionService; import com.mojang.authlib.yggdrasil.YggdrasilAuthenticationService; import com.mojang.datafixers.DataFixer; -import com.mojang.serialization.DynamicOps; -import com.mojang.serialization.Lifecycle; -import java.awt.GraphicsEnvironment; +import joptsimple.OptionSet; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +import java.awt.*; import java.io.File; import java.net.Proxy; import java.nio.file.Paths; @@ -15,12 +17,6 @@ import java.util.Optional; import java.util.UUID; import java.util.concurrent.CompletableFuture; import java.util.function.BooleanSupplier; -import joptsimple.NonOptionArgumentSpec; -import joptsimple.OptionParser; -import joptsimple.OptionSet; -import joptsimple.OptionSpec; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; public class Main { diff --git a/src/main/java/net/minecraft/server/MerchantRecipe.java b/src/main/java/net/minecraft/server/MerchantRecipe.java index e42382a5c385c27b6322b03e87870eb20b21cb22..154a8bd5b17c79b4b3ff4d15ed43332f37528c2c 100644 --- a/src/main/java/net/minecraft/server/MerchantRecipe.java +++ b/src/main/java/net/minecraft/server/MerchantRecipe.java @@ -1,6 +1,6 @@ package net.minecraft.server; -import org.bukkit.craftbukkit.inventory.CraftMerchantRecipe; // CraftBukkit +import org.bukkit.craftbukkit.inventory.CraftMerchantRecipe; public class MerchantRecipe { diff --git a/src/main/java/net/minecraft/server/MinecartTrackLogic.java b/src/main/java/net/minecraft/server/MinecartTrackLogic.java index e0be3a425aae51e1aced8eb6d8a5e84fc9315e3a..6faccf602f22a2b58064ba2342bf2c6adc1b79f2 100644 --- a/src/main/java/net/minecraft/server/MinecartTrackLogic.java +++ b/src/main/java/net/minecraft/server/MinecartTrackLogic.java @@ -1,9 +1,10 @@ package net.minecraft.server; import com.google.common.collect.Lists; + +import javax.annotation.Nullable; import java.util.Iterator; import java.util.List; -import javax.annotation.Nullable; public class MinecartTrackLogic { diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java index 26ee6e9219059c9f7175148e934d2adec2b336a0..067956fdd37e058dbf94c04d1d19de7084f32e23 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1,13 +1,8 @@ package net.minecraft.server; +import co.aikar.timings.MinecraftTimings; import com.google.common.base.Splitter; -import com.google.common.collect.ImmutableList; -import co.aikar.timings.Timings; -import com.destroystokyo.paper.event.server.PaperServerListPingEvent; -import com.google.common.base.Stopwatch; -import com.google.common.collect.Lists; -import com.google.common.collect.Maps; -import com.google.common.collect.Sets; +import com.google.common.collect.*; import com.mojang.authlib.GameProfile; import com.mojang.authlib.GameProfileRepository; import com.mojang.authlib.minecraft.MinecraftSessionService; @@ -18,6 +13,15 @@ import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBufOutputStream; import io.netty.buffer.Unpooled; import it.unimi.dsi.fastutil.longs.LongIterator; +import joptsimple.OptionSet; +import org.apache.commons.lang3.Validate; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.bukkit.event.server.ServerLoadEvent; +import org.spigotmc.SlackActivityAccountant; + +import javax.annotation.Nullable; +import javax.imageio.ImageIO; import java.awt.image.BufferedImage; import java.io.BufferedWriter; import java.io.File; @@ -41,22 +45,6 @@ import java.util.concurrent.atomic.AtomicReference; import java.util.function.BooleanSupplier; import java.util.function.Function; import java.util.stream.Stream; -import javax.annotation.Nullable; -import javax.imageio.ImageIO; -import org.apache.commons.lang3.Validate; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; -// CraftBukkit start -import com.google.common.collect.ImmutableSet; -// import jline.console.ConsoleReader; // Paper -import joptsimple.OptionSet; -import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.CraftServer; -import org.bukkit.craftbukkit.Main; -import org.bukkit.event.server.ServerLoadEvent; -// CraftBukkit end -import co.aikar.timings.MinecraftTimings; // Paper -import org.spigotmc.SlackActivityAccountant; // Spigot public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant implements IMojangStatistics, ICommandListener, AutoCloseable { diff --git a/src/main/java/net/minecraft/server/MobEffectList.java b/src/main/java/net/minecraft/server/MobEffectList.java index 08911c9aacbd60a1fe4d19650f4335a4cce4084e..a6c18f175e0dbc1c03e5c9750a0e184b7d5c6ede 100644 --- a/src/main/java/net/minecraft/server/MobEffectList.java +++ b/src/main/java/net/minecraft/server/MobEffectList.java @@ -1,15 +1,14 @@ package net.minecraft.server; import com.google.common.collect.Maps; +import org.bukkit.craftbukkit.event.CraftEventFactory; +import org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason; + +import javax.annotation.Nullable; import java.util.Iterator; import java.util.Map; import java.util.Map.Entry; import java.util.UUID; -import javax.annotation.Nullable; - -// CraftBukkit start -import org.bukkit.craftbukkit.event.CraftEventFactory; -import org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason; // CraftBukkit end public class MobEffectList { diff --git a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java index 17e5e1f191efd91b0797826cb96e5f230d622a0d..2a7846b0ea96638e5b519f92e6d20a96c12d25b0 100644 --- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java +++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java @@ -1,12 +1,13 @@ package net.minecraft.server; import com.google.common.collect.Lists; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +import javax.annotation.Nullable; import java.util.Iterator; import java.util.List; import java.util.Optional; -import javax.annotation.Nullable; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; public abstract class MobSpawnerAbstract { diff --git a/src/main/java/net/minecraft/server/MobSpawnerTrader.java b/src/main/java/net/minecraft/server/MobSpawnerTrader.java index 736b794f8268858e2e63a3aafef328b443386989..55758e608cd439bd55b71d80408e9f1dec57d967 100644 --- a/src/main/java/net/minecraft/server/MobSpawnerTrader.java +++ b/src/main/java/net/minecraft/server/MobSpawnerTrader.java @@ -1,9 +1,9 @@ package net.minecraft.server; +import javax.annotation.Nullable; import java.util.Iterator; import java.util.Optional; import java.util.Random; -import javax.annotation.Nullable; public class MobSpawnerTrader implements MobSpawner { diff --git a/src/main/java/net/minecraft/server/NBTCompressedStreamTools.java b/src/main/java/net/minecraft/server/NBTCompressedStreamTools.java index c948e590eeff0aea53573532f8c507d638cc0bdf..1dd0276f409c4d82d9932582847cd128c3a668a2 100644 --- a/src/main/java/net/minecraft/server/NBTCompressedStreamTools.java +++ b/src/main/java/net/minecraft/server/NBTCompressedStreamTools.java @@ -1,17 +1,10 @@ package net.minecraft.server; -import java.io.BufferedInputStream; -import java.io.BufferedOutputStream; -import java.io.DataInput; -import java.io.DataInputStream; -import java.io.DataOutput; -import java.io.DataOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; +import io.netty.buffer.ByteBufInputStream; + +import java.io.*; import java.util.zip.GZIPInputStream; import java.util.zip.GZIPOutputStream; -import io.netty.buffer.ByteBufInputStream; // Paper public class NBTCompressedStreamTools { diff --git a/src/main/java/net/minecraft/server/NBTTagByteArray.java b/src/main/java/net/minecraft/server/NBTTagByteArray.java index d7ba2db6380d04d732888420a86a396e009b84c8..b62311247d1b8b02d2239de972a5a1450a973ef2 100644 --- a/src/main/java/net/minecraft/server/NBTTagByteArray.java +++ b/src/main/java/net/minecraft/server/NBTTagByteArray.java @@ -1,11 +1,12 @@ package net.minecraft.server; +import org.apache.commons.lang3.ArrayUtils; + import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; import java.util.Arrays; import java.util.List; -import org.apache.commons.lang3.ArrayUtils; public class NBTTagByteArray extends NBTList { diff --git a/src/main/java/net/minecraft/server/NBTTagCompound.java b/src/main/java/net/minecraft/server/NBTTagCompound.java index 436f40bcd7817bedde4f6570c7c47dba7ff7034f..2b044b9807826034b3b94c45b26b7c0882b53d2c 100644 --- a/src/main/java/net/minecraft/server/NBTTagCompound.java +++ b/src/main/java/net/minecraft/server/NBTTagCompound.java @@ -2,26 +2,18 @@ package net.minecraft.server; import com.google.common.base.Strings; import com.google.common.collect.Lists; -import com.google.common.collect.Maps; import com.mojang.serialization.Codec; import com.mojang.serialization.DataResult; import com.mojang.serialization.Dynamic; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +import javax.annotation.Nullable; import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.Set; -import java.util.UUID; +import java.util.*; import java.util.regex.Pattern; -import javax.annotation.Nullable; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; public class NBTTagCompound implements NBTBase { diff --git a/src/main/java/net/minecraft/server/NBTTagIntArray.java b/src/main/java/net/minecraft/server/NBTTagIntArray.java index eb3fc6db692b3be8cf6adea5eacc405b3c317f04..48ef35fb282395b1fa609ef4e2e9511abb7cf641 100644 --- a/src/main/java/net/minecraft/server/NBTTagIntArray.java +++ b/src/main/java/net/minecraft/server/NBTTagIntArray.java @@ -1,11 +1,12 @@ package net.minecraft.server; +import org.apache.commons.lang3.ArrayUtils; + import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; import java.util.Arrays; import java.util.List; -import org.apache.commons.lang3.ArrayUtils; public class NBTTagIntArray extends NBTList { diff --git a/src/main/java/net/minecraft/server/NBTTagList.java b/src/main/java/net/minecraft/server/NBTTagList.java index ad4807e0bdd6409bd798f995da8f43cec1d0b385..3a04a1eda9c12d5b5ffdea7dafdf93a410a404b0 100644 --- a/src/main/java/net/minecraft/server/NBTTagList.java +++ b/src/main/java/net/minecraft/server/NBTTagList.java @@ -5,6 +5,7 @@ import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import it.unimi.dsi.fastutil.bytes.ByteOpenHashSet; import it.unimi.dsi.fastutil.bytes.ByteSet; + import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; diff --git a/src/main/java/net/minecraft/server/NameReferencingFileConverter.java b/src/main/java/net/minecraft/server/NameReferencingFileConverter.java index 376427eee7774a26da53ac041ae197bd982bafce..04552de8d42d9bd75fd37f7ef13ee275a2ead931 100644 --- a/src/main/java/net/minecraft/server/NameReferencingFileConverter.java +++ b/src/main/java/net/minecraft/server/NameReferencingFileConverter.java @@ -8,14 +8,15 @@ import com.mojang.authlib.Agent; import com.mojang.authlib.GameProfile; import com.mojang.authlib.ProfileLookupCallback; import com.mojang.authlib.yggdrasil.ProfileNotFoundException; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +import javax.annotation.Nullable; import java.io.File; import java.io.IOException; import java.nio.charset.StandardCharsets; import java.text.ParseException; import java.util.*; -import javax.annotation.Nullable; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; public class NameReferencingFileConverter { diff --git a/src/main/java/net/minecraft/server/NavigationAbstract.java b/src/main/java/net/minecraft/server/NavigationAbstract.java index 2dac507e9e0044a32ae54ea57eada0de04c1467d..b0eeeb9827d523c878d1e84fde8f5036476fdf2e 100644 --- a/src/main/java/net/minecraft/server/NavigationAbstract.java +++ b/src/main/java/net/minecraft/server/NavigationAbstract.java @@ -1,10 +1,11 @@ package net.minecraft.server; import com.google.common.collect.ImmutableSet; + +import javax.annotation.Nullable; import java.util.Set; import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.annotation.Nullable; public abstract class NavigationAbstract { diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java index 946c9f05af3091e227efd7c1399c4d947710f722..773d51f0bbef5f4473bba99ea176b37739de862a 100644 --- a/src/main/java/net/minecraft/server/NetworkManager.java +++ b/src/main/java/net/minecraft/server/NetworkManager.java @@ -2,31 +2,27 @@ package net.minecraft.server; import com.google.common.collect.Queues; import com.google.common.util.concurrent.ThreadFactoryBuilder; -import io.netty.channel.Channel; -import io.netty.channel.ChannelFuture; -import io.netty.channel.ChannelFutureListener; -import io.netty.channel.ChannelHandlerContext; -import io.netty.channel.DefaultEventLoopGroup; -import io.netty.channel.SimpleChannelInboundHandler; +import io.netty.channel.*; import io.netty.channel.epoll.EpollEventLoopGroup; import io.netty.channel.local.LocalChannel; import io.netty.channel.local.LocalServerChannel; import io.netty.channel.nio.NioEventLoopGroup; -import io.netty.handler.codec.EncoderException; // Paper +import io.netty.handler.codec.EncoderException; import io.netty.handler.timeout.TimeoutException; import io.netty.util.AttributeKey; import io.netty.util.concurrent.Future; import io.netty.util.concurrent.GenericFutureListener; -import java.net.SocketAddress; -import java.util.Queue; -import javax.annotation.Nullable; -import javax.crypto.SecretKey; import org.apache.commons.lang3.Validate; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.Marker; import org.apache.logging.log4j.MarkerManager; +import javax.annotation.Nullable; +import javax.crypto.SecretKey; +import java.net.SocketAddress; +import java.util.Queue; + public class NetworkManager extends SimpleChannelInboundHandler> { private static final Logger LOGGER = LogManager.getLogger(); diff --git a/src/main/java/net/minecraft/server/NibbleArray.java b/src/main/java/net/minecraft/server/NibbleArray.java index a9795394c9b17f9f0ce4c4f9c8f51a48e950418e..09398d1740b1ad0752183578294ee8f5453b84fd 100644 --- a/src/main/java/net/minecraft/server/NibbleArray.java +++ b/src/main/java/net/minecraft/server/NibbleArray.java @@ -1,6 +1,6 @@ package net.minecraft.server; -import com.destroystokyo.paper.util.pooled.PooledObjects; // Paper +import com.destroystokyo.paper.util.pooled.PooledObjects; import javax.annotation.Nonnull; import javax.annotation.Nullable; diff --git a/src/main/java/net/minecraft/server/Packet.java b/src/main/java/net/minecraft/server/Packet.java index 545dbe6ddcce1d172f465b4a7ab85654ee5fdbb4..5d792e036848ed42973fc125fa4ab5e5688945d1 100644 --- a/src/main/java/net/minecraft/server/Packet.java +++ b/src/main/java/net/minecraft/server/Packet.java @@ -1,6 +1,7 @@ package net.minecraft.server; -import io.netty.channel.ChannelFuture; // Paper +import io.netty.channel.ChannelFuture; + import java.io.IOException; public interface Packet { diff --git a/src/main/java/net/minecraft/server/PacketDataSerializer.java b/src/main/java/net/minecraft/server/PacketDataSerializer.java index 31e7fb56206a522a335f5e78afd09324d1c38864..d410843fe0c0d20cc374eac676c8f34a0a8aef2f 100644 --- a/src/main/java/net/minecraft/server/PacketDataSerializer.java +++ b/src/main/java/net/minecraft/server/PacketDataSerializer.java @@ -10,11 +10,9 @@ import io.netty.buffer.ByteBufOutputStream; import io.netty.handler.codec.DecoderException; import io.netty.handler.codec.EncoderException; import io.netty.util.ByteProcessor; -import java.io.DataInput; -import java.io.DataOutput; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; + +import javax.annotation.Nullable; +import java.io.*; import java.nio.ByteBuffer; import java.nio.ByteOrder; import java.nio.channels.FileChannel; @@ -24,9 +22,6 @@ import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; import java.util.Date; import java.util.UUID; -import javax.annotation.Nullable; - -import org.bukkit.craftbukkit.inventory.CraftItemStack; // CraftBukkit public class PacketDataSerializer extends ByteBuf { diff --git a/src/main/java/net/minecraft/server/PacketEncoder.java b/src/main/java/net/minecraft/server/PacketEncoder.java index b0cfef52cbb5e23beae528668e4e98cedecf603c..7deab4d4e40156590eada8f49b7e078efe924b44 100644 --- a/src/main/java/net/minecraft/server/PacketEncoder.java +++ b/src/main/java/net/minecraft/server/PacketEncoder.java @@ -3,12 +3,13 @@ package net.minecraft.server; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; import io.netty.handler.codec.MessageToByteEncoder; -import java.io.IOException; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.Marker; import org.apache.logging.log4j.MarkerManager; +import java.io.IOException; + public class PacketEncoder extends MessageToByteEncoder> { private static final Logger LOGGER = LogManager.getLogger(); diff --git a/src/main/java/net/minecraft/server/PacketPlayInUseEntity.java b/src/main/java/net/minecraft/server/PacketPlayInUseEntity.java index 51970a4f134e29f5d2bf681d83aeeda916fe9195..79363155ce48746db8cb749358efad07e91b2f3d 100644 --- a/src/main/java/net/minecraft/server/PacketPlayInUseEntity.java +++ b/src/main/java/net/minecraft/server/PacketPlayInUseEntity.java @@ -1,7 +1,7 @@ package net.minecraft.server; -import java.io.IOException; import javax.annotation.Nullable; +import java.io.IOException; public class PacketPlayInUseEntity implements Packet { diff --git a/src/main/java/net/minecraft/server/PacketPlayOutLightUpdate.java b/src/main/java/net/minecraft/server/PacketPlayOutLightUpdate.java index a22f0cccecc85b4e4fe4603bcfa213f15c23db69..2400beb4128c9de380bf55476731359f83557c1b 100644 --- a/src/main/java/net/minecraft/server/PacketPlayOutLightUpdate.java +++ b/src/main/java/net/minecraft/server/PacketPlayOutLightUpdate.java @@ -1,7 +1,7 @@ package net.minecraft.server; import com.google.common.collect.Lists; -import io.netty.channel.ChannelFuture; // Paper +import io.netty.channel.ChannelFuture; import java.io.IOException; import java.util.Iterator; diff --git a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java b/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java index e0ee524093e63e902cc7aea3c82e226438d4deb6..5309ef7abbd243e1fa753139f175e9824d11802c 100644 --- a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java +++ b/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java @@ -1,14 +1,15 @@ package net.minecraft.server; -import com.destroystokyo.paper.antixray.ChunkPacketInfo; // Paper - Anti-Xray - Add chunk packet info +import com.destroystokyo.paper.antixray.ChunkPacketInfo; import com.google.common.collect.Lists; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; + +import javax.annotation.Nullable; import java.io.IOException; import java.util.Iterator; import java.util.List; import java.util.Map.Entry; -import javax.annotation.Nullable; public class PacketPlayOutMapChunk implements Packet { diff --git a/src/main/java/net/minecraft/server/PacketPlayOutScoreboardTeam.java b/src/main/java/net/minecraft/server/PacketPlayOutScoreboardTeam.java index 99dc43159f240135957aee35f6129f19419c6c25..27cf029e0704d59481621543fb1283767f166e2d 100644 --- a/src/main/java/net/minecraft/server/PacketPlayOutScoreboardTeam.java +++ b/src/main/java/net/minecraft/server/PacketPlayOutScoreboardTeam.java @@ -1,6 +1,7 @@ package net.minecraft.server; import com.google.common.collect.Lists; + import java.io.IOException; import java.util.Collection; import java.util.Iterator; diff --git a/src/main/java/net/minecraft/server/PacketPlayOutTitle.java b/src/main/java/net/minecraft/server/PacketPlayOutTitle.java index 535056c64ef866e645b1bfbd149b50c53cb64485..4edf99eb64be454eae25da128a81795038ca8f97 100644 --- a/src/main/java/net/minecraft/server/PacketPlayOutTitle.java +++ b/src/main/java/net/minecraft/server/PacketPlayOutTitle.java @@ -1,7 +1,7 @@ package net.minecraft.server; -import java.io.IOException; import javax.annotation.Nullable; +import java.io.IOException; public class PacketPlayOutTitle implements Packet { diff --git a/src/main/java/net/minecraft/server/PacketSplitter.java b/src/main/java/net/minecraft/server/PacketSplitter.java index 2aaa8770edfd8acc6861c23176e405863858b275..660f3f69b7c982ac4b5859844cc6d72a49d8f375 100644 --- a/src/main/java/net/minecraft/server/PacketSplitter.java +++ b/src/main/java/net/minecraft/server/PacketSplitter.java @@ -5,6 +5,7 @@ import io.netty.buffer.Unpooled; import io.netty.channel.ChannelHandlerContext; import io.netty.handler.codec.ByteToMessageDecoder; import io.netty.handler.codec.CorruptedFrameException; + import java.util.List; public class PacketSplitter extends ByteToMessageDecoder { diff --git a/src/main/java/net/minecraft/server/PacketStatusListener.java b/src/main/java/net/minecraft/server/PacketStatusListener.java index b98d094422f09ddffe09bac7cf1a9c7e92ae5aa6..ce17341ee7a4c26d48a2cc49a2cf412505185c91 100644 --- a/src/main/java/net/minecraft/server/PacketStatusListener.java +++ b/src/main/java/net/minecraft/server/PacketStatusListener.java @@ -1,12 +1,6 @@ package net.minecraft.server; // CraftBukkit start -import com.mojang.authlib.GameProfile; -import java.net.InetSocketAddress; -import java.util.Iterator; -import org.bukkit.craftbukkit.util.CraftChatMessage; -import org.bukkit.craftbukkit.util.CraftIconCache; -import org.bukkit.entity.Player; // CraftBukkit end public class PacketStatusListener implements PacketStatusInListener { diff --git a/src/main/java/net/minecraft/server/PairedQueue.java b/src/main/java/net/minecraft/server/PairedQueue.java index 2369afb4f37863c5c59456e46c48ad0d32f9eeb7..d18359567b46e4bbd807ad8eeadb8bfeff533bf8 100644 --- a/src/main/java/net/minecraft/server/PairedQueue.java +++ b/src/main/java/net/minecraft/server/PairedQueue.java @@ -1,13 +1,10 @@ package net.minecraft.server; import com.google.common.collect.Queues; -import java.util.Collection; -import java.util.Iterator; + +import javax.annotation.Nullable; import java.util.List; import java.util.Queue; -import java.util.stream.Collectors; -import java.util.stream.IntStream; -import javax.annotation.Nullable; public interface PairedQueue { diff --git a/src/main/java/net/minecraft/server/PathEntity.java b/src/main/java/net/minecraft/server/PathEntity.java index 9154c01a22bc7b6d2dd390bb7b6e21ef52c8006c..d786c3d2eb4e06e20b5125b7ef8fa7d929eb4d01 100644 --- a/src/main/java/net/minecraft/server/PathEntity.java +++ b/src/main/java/net/minecraft/server/PathEntity.java @@ -1,7 +1,7 @@ package net.minecraft.server; -import java.util.List; import javax.annotation.Nullable; +import java.util.List; public class PathEntity { diff --git a/src/main/java/net/minecraft/server/Pathfinder.java b/src/main/java/net/minecraft/server/Pathfinder.java index 9b2d23ef1c9369cf15f9f12161c28199fbf4f373..4dca3cd3447ed58f597db33f40da5a2df3c3cd82 100644 --- a/src/main/java/net/minecraft/server/Pathfinder.java +++ b/src/main/java/net/minecraft/server/Pathfinder.java @@ -2,16 +2,12 @@ package net.minecraft.server; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Lists; -import com.google.common.collect.Sets; + +import javax.annotation.Nullable; import java.util.Comparator; -import java.util.Iterator; import java.util.List; import java.util.Map; -import java.util.Optional; import java.util.Set; -import java.util.function.Function; -import java.util.stream.Collectors; -import javax.annotation.Nullable; public class Pathfinder { diff --git a/src/main/java/net/minecraft/server/PathfinderGoal.java b/src/main/java/net/minecraft/server/PathfinderGoal.java index 8f26cb20b8c63f2809838c97528cef62ec39bcdb..dc62b66a5bb31002b897d9db4633e7c2d34cfa01 100644 --- a/src/main/java/net/minecraft/server/PathfinderGoal.java +++ b/src/main/java/net/minecraft/server/PathfinderGoal.java @@ -1,6 +1,7 @@ package net.minecraft.server; -import com.destroystokyo.paper.util.set.OptimizedSmallEnumSet; // Paper - remove streams from pathfindergoalselector +import com.destroystokyo.paper.util.set.OptimizedSmallEnumSet; + import java.util.EnumSet; public abstract class PathfinderGoal { diff --git a/src/main/java/net/minecraft/server/PathfinderGoalEatTile.java b/src/main/java/net/minecraft/server/PathfinderGoalEatTile.java index b7e1e7e35a33cf6a476b11284ebdb0cdda524af2..e7d10a87dc83de567bba0545570c8a7dd96bfb77 100644 --- a/src/main/java/net/minecraft/server/PathfinderGoalEatTile.java +++ b/src/main/java/net/minecraft/server/PathfinderGoalEatTile.java @@ -1,10 +1,9 @@ package net.minecraft.server; +import org.bukkit.craftbukkit.event.CraftEventFactory; + import java.util.EnumSet; import java.util.function.Predicate; - -// CraftBukkit start -import org.bukkit.craftbukkit.event.CraftEventFactory; // CraftBukkit end public class PathfinderGoalEatTile extends PathfinderGoal { diff --git a/src/main/java/net/minecraft/server/PathfinderGoalFollowOwner.java b/src/main/java/net/minecraft/server/PathfinderGoalFollowOwner.java index 514dbf29aa74ac896a183cab84c233f26c41f813..2eb4eab78cf7f8205092982ab1278188085ecd80 100644 --- a/src/main/java/net/minecraft/server/PathfinderGoalFollowOwner.java +++ b/src/main/java/net/minecraft/server/PathfinderGoalFollowOwner.java @@ -1,10 +1,10 @@ package net.minecraft.server; -import java.util.EnumSet; -// CraftBukkit start import org.bukkit.Location; import org.bukkit.craftbukkit.entity.CraftEntity; import org.bukkit.event.entity.EntityTeleportEvent; + +import java.util.EnumSet; // CraftBukkit end public class PathfinderGoalFollowOwner extends PathfinderGoal { diff --git a/src/main/java/net/minecraft/server/PathfinderGoalNearestAttackableTarget.java b/src/main/java/net/minecraft/server/PathfinderGoalNearestAttackableTarget.java index c0721c7fe479c8f753b8f48197a70dcd1ecfef5f..dee689e4c792d94d5f313aa44e0568648a8fe949 100644 --- a/src/main/java/net/minecraft/server/PathfinderGoalNearestAttackableTarget.java +++ b/src/main/java/net/minecraft/server/PathfinderGoalNearestAttackableTarget.java @@ -1,8 +1,8 @@ package net.minecraft.server; +import javax.annotation.Nullable; import java.util.EnumSet; import java.util.function.Predicate; -import javax.annotation.Nullable; public class PathfinderGoalNearestAttackableTarget extends PathfinderGoalTarget { diff --git a/src/main/java/net/minecraft/server/PathfinderGoalPanic.java b/src/main/java/net/minecraft/server/PathfinderGoalPanic.java index a55a8ef6e110821c6c7c28a28d9e053e5e84adfa..30eab63fc900b4c92458d033cd26c9bf01575411 100644 --- a/src/main/java/net/minecraft/server/PathfinderGoalPanic.java +++ b/src/main/java/net/minecraft/server/PathfinderGoalPanic.java @@ -1,7 +1,7 @@ package net.minecraft.server; -import java.util.EnumSet; import javax.annotation.Nullable; +import java.util.EnumSet; public class PathfinderGoalPanic extends PathfinderGoal { diff --git a/src/main/java/net/minecraft/server/PathfinderGoalRemoveBlock.java b/src/main/java/net/minecraft/server/PathfinderGoalRemoveBlock.java index 29efbdd2ca77833e6be59e5b5b4c38633e43588d..b27679e5993177d550a7a2727fc3bcda5afe15b5 100644 --- a/src/main/java/net/minecraft/server/PathfinderGoalRemoveBlock.java +++ b/src/main/java/net/minecraft/server/PathfinderGoalRemoveBlock.java @@ -1,10 +1,10 @@ package net.minecraft.server; -import java.util.Random; -import javax.annotation.Nullable; -// CraftBukkit start import org.bukkit.craftbukkit.block.CraftBlock; import org.bukkit.event.entity.EntityInteractEvent; + +import javax.annotation.Nullable; +import java.util.Random; // CraftBukkit end public class PathfinderGoalRemoveBlock extends PathfinderGoalGotoTarget { diff --git a/src/main/java/net/minecraft/server/PathfinderGoalSelector.java b/src/main/java/net/minecraft/server/PathfinderGoalSelector.java index 2378a833cd31d703db462dd6f55a5cb858796b8d..3d791a74c37193dbf76d6b0a3d428d94a988d39f 100644 --- a/src/main/java/net/minecraft/server/PathfinderGoalSelector.java +++ b/src/main/java/net/minecraft/server/PathfinderGoalSelector.java @@ -1,17 +1,13 @@ package net.minecraft.server; -import com.destroystokyo.paper.util.set.OptimizedSmallEnumSet; // Paper - remove streams from pathfindergoalselector +import com.destroystokyo.paper.util.set.OptimizedSmallEnumSet; import it.unimi.dsi.fastutil.objects.ObjectLinkedOpenHashSet; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; -import java.util.EnumMap; -import java.util.EnumSet; -import java.util.Iterator; // Paper - remove streams from pathfindergoalselector -import java.util.Map; -import java.util.Set; +import java.util.*; import java.util.function.Supplier; import java.util.stream.Stream; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; public class PathfinderGoalSelector { diff --git a/src/main/java/net/minecraft/server/PathfinderGoalTarget.java b/src/main/java/net/minecraft/server/PathfinderGoalTarget.java index 29822c19496e3927eb9a061869872f4fee525254..6d1b9348e95ce154a1cae31e7f67a6213a1d3803 100644 --- a/src/main/java/net/minecraft/server/PathfinderGoalTarget.java +++ b/src/main/java/net/minecraft/server/PathfinderGoalTarget.java @@ -1,7 +1,8 @@ package net.minecraft.server; +import org.bukkit.event.entity.EntityTargetEvent; + import javax.annotation.Nullable; -import org.bukkit.event.entity.EntityTargetEvent; // CraftBukkit public abstract class PathfinderGoalTarget extends PathfinderGoal { diff --git a/src/main/java/net/minecraft/server/PathfinderGoalTempt.java b/src/main/java/net/minecraft/server/PathfinderGoalTempt.java index b115f40b0b11e89184960a5cce5b8295030469e9..c6feca04953a946aff4936bfd85b0e45c612a01c 100644 --- a/src/main/java/net/minecraft/server/PathfinderGoalTempt.java +++ b/src/main/java/net/minecraft/server/PathfinderGoalTempt.java @@ -1,11 +1,11 @@ package net.minecraft.server; -import java.util.EnumSet; -// CraftBukkit start import org.bukkit.craftbukkit.entity.CraftLivingEntity; import org.bukkit.craftbukkit.event.CraftEventFactory; import org.bukkit.event.entity.EntityTargetEvent; import org.bukkit.event.entity.EntityTargetLivingEntityEvent; + +import java.util.EnumSet; // CraftBukkit end public class PathfinderGoalTempt extends PathfinderGoal { diff --git a/src/main/java/net/minecraft/server/PathfinderGoalWrapped.java b/src/main/java/net/minecraft/server/PathfinderGoalWrapped.java index 112d8bab65bf41263a477c5faa717687fe8a2bc9..85e63bc6f46637e8a4c0fec77a61f9cadef815a5 100644 --- a/src/main/java/net/minecraft/server/PathfinderGoalWrapped.java +++ b/src/main/java/net/minecraft/server/PathfinderGoalWrapped.java @@ -1,7 +1,7 @@ package net.minecraft.server; -import java.util.EnumSet; import javax.annotation.Nullable; +import java.util.EnumSet; public class PathfinderGoalWrapped extends PathfinderGoal { diff --git a/src/main/java/net/minecraft/server/PathfinderNormal.java b/src/main/java/net/minecraft/server/PathfinderNormal.java index 279ca87d8826ea2696ffc08d4b52c55a5e7bd392..af25ec2b833fa10a7d27c4cf91c505aee85bffe6 100644 --- a/src/main/java/net/minecraft/server/PathfinderNormal.java +++ b/src/main/java/net/minecraft/server/PathfinderNormal.java @@ -4,14 +4,12 @@ import it.unimi.dsi.fastutil.longs.Long2ObjectMap; import it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap; import it.unimi.dsi.fastutil.objects.Object2BooleanMap; import it.unimi.dsi.fastutil.objects.Object2BooleanOpenHashMap; -import com.google.common.collect.Sets; - import it.unimi.dsi.fastutil.objects.Reference2ReferenceMap; import it.unimi.dsi.fastutil.objects.Reference2ReferenceOpenHashMap; +import javax.annotation.Nullable; import java.util.EnumSet; import java.util.Iterator; -import javax.annotation.Nullable; public class PathfinderNormal extends PathfinderAbstract { diff --git a/src/main/java/net/minecraft/server/PathfinderTargetCondition.java b/src/main/java/net/minecraft/server/PathfinderTargetCondition.java index af09e1926fb6f3b780a5063b2e2e00da4cdc8ce6..c855ca15a6b2e463de48a86738d5182d28b32c20 100644 --- a/src/main/java/net/minecraft/server/PathfinderTargetCondition.java +++ b/src/main/java/net/minecraft/server/PathfinderTargetCondition.java @@ -1,7 +1,7 @@ package net.minecraft.server; -import java.util.function.Predicate; import javax.annotation.Nullable; +import java.util.function.Predicate; public class PathfinderTargetCondition { diff --git a/src/main/java/net/minecraft/server/PersistentRaid.java b/src/main/java/net/minecraft/server/PersistentRaid.java index 64e5c6d1e4273dd5dc9fffe70f4f57d73d72f659..56f766ebddb0727b1edab918bc34151155bfa7a0 100644 --- a/src/main/java/net/minecraft/server/PersistentRaid.java +++ b/src/main/java/net/minecraft/server/PersistentRaid.java @@ -1,11 +1,12 @@ package net.minecraft.server; import com.google.common.collect.Maps; + +import javax.annotation.Nullable; import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.stream.Collectors; -import javax.annotation.Nullable; public class PersistentRaid extends PersistentBase { diff --git a/src/main/java/net/minecraft/server/PersistentScoreboard.java b/src/main/java/net/minecraft/server/PersistentScoreboard.java index a08c54da92d87fcd24ef8e2556901d3b1977c5ea..2b705fbcc68741237ad158888b1f27bcb5751b38 100644 --- a/src/main/java/net/minecraft/server/PersistentScoreboard.java +++ b/src/main/java/net/minecraft/server/PersistentScoreboard.java @@ -1,10 +1,11 @@ package net.minecraft.server; -import java.util.Collection; -import java.util.Iterator; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import java.util.Collection; +import java.util.Iterator; + public class PersistentScoreboard extends PersistentBase { private static final Logger LOGGER = LogManager.getLogger(); diff --git a/src/main/java/net/minecraft/server/PersistentStructureLegacy.java b/src/main/java/net/minecraft/server/PersistentStructureLegacy.java index 75f2da314b348ccf807975d9a7faeb71934a6e3b..a263559c2136743a4549ae630fc8a50b445abe45 100644 --- a/src/main/java/net/minecraft/server/PersistentStructureLegacy.java +++ b/src/main/java/net/minecraft/server/PersistentStructureLegacy.java @@ -5,12 +5,13 @@ import com.google.common.collect.Maps; import it.unimi.dsi.fastutil.longs.Long2ObjectMap; import it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap; import it.unimi.dsi.fastutil.longs.LongArrayList; + +import javax.annotation.Nullable; import java.io.IOException; import java.util.Iterator; import java.util.List; import java.util.Locale; import java.util.Map; -import javax.annotation.Nullable; public class PersistentStructureLegacy { diff --git a/src/main/java/net/minecraft/server/PiglinAI.java b/src/main/java/net/minecraft/server/PiglinAI.java index 313c383920213cc1eb5525dab4a1665a087abf6f..e219d23643fb01227fca8b83011525b23cbf4600 100644 --- a/src/main/java/net/minecraft/server/PiglinAI.java +++ b/src/main/java/net/minecraft/server/PiglinAI.java @@ -3,12 +3,8 @@ package net.minecraft.server; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import com.mojang.datafixers.util.Pair; -import java.util.Collections; -import java.util.Iterator; -import java.util.List; -import java.util.Optional; -import java.util.Random; -import java.util.Set; + +import java.util.*; public class PiglinAI { diff --git a/src/main/java/net/minecraft/server/PistonExtendsChecker.java b/src/main/java/net/minecraft/server/PistonExtendsChecker.java index 4fd1a98e8309bec2ef270ac70c4d79d143002b86..194a0a7bf3d48909ffe9322f0ad6b4e84cddd956 100644 --- a/src/main/java/net/minecraft/server/PistonExtendsChecker.java +++ b/src/main/java/net/minecraft/server/PistonExtendsChecker.java @@ -1,6 +1,7 @@ package net.minecraft.server; import com.google.common.collect.Lists; + import java.util.List; public class PistonExtendsChecker { diff --git a/src/main/java/net/minecraft/server/PlayerChunk.java b/src/main/java/net/minecraft/server/PlayerChunk.java index a90c97603e5e9fa5639f6ff1f8462b3323ecc428..b0997aa1b6d03f98042a8293eb7be702ba559f4a 100644 --- a/src/main/java/net/minecraft/server/PlayerChunk.java +++ b/src/main/java/net/minecraft/server/PlayerChunk.java @@ -1,6 +1,8 @@ package net.minecraft.server; import com.mojang.datafixers.util.Either; + +import javax.annotation.Nullable; import java.util.List; import java.util.Map; import java.util.Optional; @@ -9,7 +11,6 @@ import java.util.concurrent.atomic.AtomicReferenceArray; import java.util.function.IntConsumer; import java.util.function.IntSupplier; import java.util.stream.Stream; -import javax.annotation.Nullable; public class PlayerChunk { diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java index 74998ea20176c2753a0ebb03833f13f3f58a186a..af489b49985c90178d5231ea46869152e89614e2 100644 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java @@ -1,26 +1,25 @@ package net.minecraft.server; -import co.aikar.timings.Timing; // Paper -import com.destroystokyo.paper.PaperWorldConfig; // Paper +import co.aikar.timings.Timing; +import com.destroystokyo.paper.PaperWorldConfig; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; -import com.google.common.collect.ComparisonChain; // Paper import com.google.common.collect.Lists; -import com.google.common.collect.Queues; -import com.google.common.collect.Sets; import com.mojang.datafixers.DataFixer; import com.mojang.datafixers.util.Either; import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap; -import it.unimi.dsi.fastutil.longs.Long2ByteMap; -import it.unimi.dsi.fastutil.longs.Long2ByteOpenHashMap; -import it.unimi.dsi.fastutil.longs.Long2ObjectLinkedOpenHashMap; +import it.unimi.dsi.fastutil.longs.*; import it.unimi.dsi.fastutil.longs.Long2ObjectMap.Entry; -import it.unimi.dsi.fastutil.longs.LongIterator; -import it.unimi.dsi.fastutil.longs.LongOpenHashSet; -import it.unimi.dsi.fastutil.longs.LongSet; import it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator; import it.unimi.dsi.fastutil.objects.ObjectIterator; +import org.apache.commons.lang3.mutable.MutableBoolean; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.bukkit.entity.Player; +import org.spigotmc.AsyncCatcher; + +import javax.annotation.Nullable; import java.io.File; import java.io.IOException; import java.io.Writer; @@ -30,19 +29,8 @@ import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionException; import java.util.concurrent.Executor; import java.util.concurrent.atomic.AtomicInteger; -import java.util.function.BooleanSupplier; -import java.util.function.Consumer; -import java.util.function.IntFunction; -import java.util.function.IntSupplier; -import java.util.function.Supplier; -import java.util.stream.Collectors; +import java.util.function.*; import java.util.stream.Stream; -import javax.annotation.Nullable; -import org.apache.commons.lang3.mutable.MutableBoolean; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; -import org.bukkit.entity.Player; // CraftBukkit -import org.spigotmc.AsyncCatcher; public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java index 85bf9f9e5b4e75f17b8affdaac48d6e3183ed7de..ad56cb830d81c5d02bd338c004a788891becb095 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -1,5 +1,7 @@ package net.minecraft.server; +import co.aikar.timings.MinecraftTimings; +import com.destroystokyo.paper.event.player.PlayerJumpEvent; import com.google.common.primitives.Doubles; import com.google.common.primitives.Floats; import com.mojang.brigadier.ParseResults; @@ -8,20 +10,9 @@ import io.netty.util.concurrent.Future; import io.netty.util.concurrent.GenericFutureListener; import it.unimi.dsi.fastutil.ints.Int2ShortMap; import it.unimi.dsi.fastutil.ints.Int2ShortOpenHashMap; -import java.util.Collections; -import java.util.Iterator; -import java.util.Optional; -import java.util.Set; -import java.util.stream.Stream; -import javax.annotation.Nullable; -import org.apache.commons.lang3.StringEscapeUtils; import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; - -// CraftBukkit start -import java.util.concurrent.ExecutionException; -import java.util.concurrent.atomic.AtomicIntegerFieldUpdater; import org.bukkit.Location; import org.bukkit.craftbukkit.entity.CraftPlayer; import org.bukkit.craftbukkit.event.CraftEventFactory; @@ -34,34 +25,22 @@ import org.bukkit.entity.Player; import org.bukkit.event.Event; import org.bukkit.event.block.Action; import org.bukkit.event.block.SignChangeEvent; -import org.bukkit.event.inventory.ClickType; -import org.bukkit.event.inventory.CraftItemEvent; -import org.bukkit.event.inventory.InventoryAction; -import org.bukkit.event.inventory.InventoryClickEvent; -import org.bukkit.event.inventory.InventoryCreativeEvent; +import org.bukkit.event.inventory.*; import org.bukkit.event.inventory.InventoryType.SlotType; -import org.bukkit.event.player.AsyncPlayerChatEvent; -import org.bukkit.event.player.PlayerAnimationEvent; -import org.bukkit.event.player.PlayerChatEvent; -import org.bukkit.event.player.PlayerCommandPreprocessEvent; -import org.bukkit.event.player.PlayerInteractAtEntityEvent; -import org.bukkit.event.player.PlayerInteractEntityEvent; -import org.bukkit.event.player.PlayerItemHeldEvent; -import org.bukkit.event.player.PlayerKickEvent; -import org.bukkit.event.player.PlayerMoveEvent; -import org.bukkit.event.player.PlayerResourcePackStatusEvent; -import org.bukkit.event.player.PlayerSwapHandItemsEvent; -import org.bukkit.event.player.PlayerTeleportEvent; -import org.bukkit.event.player.PlayerToggleFlightEvent; -import org.bukkit.event.player.PlayerToggleSneakEvent; -import org.bukkit.event.player.PlayerToggleSprintEvent; +import org.bukkit.event.player.*; import org.bukkit.inventory.CraftingInventory; import org.bukkit.inventory.EquipmentSlot; import org.bukkit.inventory.InventoryView; import org.bukkit.util.NumberConversions; -import com.destroystokyo.paper.event.player.IllegalPacketEvent; // Paper -import com.destroystokyo.paper.event.player.PlayerJumpEvent; // Paper -import co.aikar.timings.MinecraftTimings; // Paper + +import javax.annotation.Nullable; +import java.util.Collections; +import java.util.Iterator; +import java.util.Optional; +import java.util.Set; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.atomic.AtomicIntegerFieldUpdater; +import java.util.stream.Stream; // CraftBukkit end public class PlayerConnection implements PacketListenerPlayIn { diff --git a/src/main/java/net/minecraft/server/PlayerConnectionUtils.java b/src/main/java/net/minecraft/server/PlayerConnectionUtils.java index e698dd22607b2b2c4068c5bfb03ac53eb5bac080..a0658cda96d3a2796fb940cd947aa708aaae24b7 100644 --- a/src/main/java/net/minecraft/server/PlayerConnectionUtils.java +++ b/src/main/java/net/minecraft/server/PlayerConnectionUtils.java @@ -1,9 +1,9 @@ package net.minecraft.server; +import co.aikar.timings.MinecraftTimings; +import co.aikar.timings.Timing; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import co.aikar.timings.MinecraftTimings; // Paper -import co.aikar.timings.Timing; // Paper public class PlayerConnectionUtils { diff --git a/src/main/java/net/minecraft/server/PlayerInteractManager.java b/src/main/java/net/minecraft/server/PlayerInteractManager.java index f5de49e3e384b1d2926197e72992ace51d2967b6..52b465ae49c602d8b52878c12d1aab37c003259a 100644 --- a/src/main/java/net/minecraft/server/PlayerInteractManager.java +++ b/src/main/java/net/minecraft/server/PlayerInteractManager.java @@ -1,16 +1,16 @@ package net.minecraft.server; -import java.util.Objects; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -// CraftBukkit start -import java.util.ArrayList; import org.bukkit.craftbukkit.block.CraftBlock; -import org.bukkit.event.block.BlockBreakEvent; import org.bukkit.craftbukkit.event.CraftEventFactory; import org.bukkit.event.Event; import org.bukkit.event.block.Action; +import org.bukkit.event.block.BlockBreakEvent; import org.bukkit.event.player.PlayerInteractEvent; + +import java.util.ArrayList; +import java.util.Objects; // CraftBukkit end public class PlayerInteractManager { diff --git a/src/main/java/net/minecraft/server/PlayerInventory.java b/src/main/java/net/minecraft/server/PlayerInventory.java index 3b65711b91c51ac7b4b5b2b0144ffd279fe60eeb..b7fe6425a6c830b2b63710b3c4c3c6e70df5268f 100644 --- a/src/main/java/net/minecraft/server/PlayerInventory.java +++ b/src/main/java/net/minecraft/server/PlayerInventory.java @@ -1,15 +1,14 @@ package net.minecraft.server; import com.google.common.collect.ImmutableList; -import java.util.Iterator; -import java.util.List; -import java.util.function.Predicate; - -// CraftBukkit start -import java.util.ArrayList; import org.bukkit.Location; import org.bukkit.craftbukkit.entity.CraftHumanEntity; import org.bukkit.entity.HumanEntity; + +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import java.util.function.Predicate; // CraftBukkit end public class PlayerInventory implements IInventory, INamableTileEntity { diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java index c10a1d15bcfe0cb1c2ff6ee7f2881bc2040bcd1d..35a0725e7124918765d3188d0774516d3fe7c152 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -1,6 +1,8 @@ package net.minecraft.server; import co.aikar.timings.MinecraftTimings; +import com.google.common.base.Predicate; +import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Sets; @@ -8,42 +10,24 @@ import com.mojang.authlib.GameProfile; import com.mojang.serialization.DataResult; import com.mojang.serialization.Dynamic; import io.netty.buffer.Unpooled; -import java.io.File; -import java.net.SocketAddress; -import java.text.SimpleDateFormat; -import java.util.Collection; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import java.util.Set; -import java.util.UUID; -import java.util.concurrent.CompletableFuture; -import java.util.concurrent.TimeUnit; -import javax.annotation.Nullable; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; - -// CraftBukkit start -import com.google.common.base.Predicate; -import com.google.common.collect.Iterables; - -import org.bukkit.craftbukkit.CraftServer; -import org.bukkit.craftbukkit.CraftWorld; - import org.bukkit.Bukkit; import org.bukkit.Location; +import org.bukkit.craftbukkit.CraftServer; +import org.bukkit.craftbukkit.CraftWorld; import org.bukkit.craftbukkit.util.CraftChatMessage; import org.bukkit.entity.Player; -import org.bukkit.event.player.PlayerChangedWorldEvent; -import org.bukkit.event.player.PlayerPortalEvent; -import org.bukkit.event.player.PlayerJoinEvent; -import org.bukkit.event.player.PlayerLoginEvent; -import org.bukkit.event.player.PlayerQuitEvent; -import org.bukkit.event.player.PlayerRespawnEvent; -import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; -import org.bukkit.util.Vector; +import org.bukkit.event.player.*; import org.spigotmc.event.player.PlayerSpawnLocationEvent; + +import javax.annotation.Nullable; +import java.io.File; +import java.net.SocketAddress; +import java.text.SimpleDateFormat; +import java.util.*; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.TimeUnit; // CraftBukkit end public abstract class PlayerList { diff --git a/src/main/java/net/minecraft/server/PortalTravelAgent.java b/src/main/java/net/minecraft/server/PortalTravelAgent.java index 68f693de5eaa5eaa8dc65230ffa95556530c2368..0b4a0052a25470033326f7533880a14eaccd6321 100644 --- a/src/main/java/net/minecraft/server/PortalTravelAgent.java +++ b/src/main/java/net/minecraft/server/PortalTravelAgent.java @@ -1,11 +1,11 @@ package net.minecraft.server; +import javax.annotation.Nullable; import java.util.Comparator; import java.util.List; import java.util.Optional; import java.util.Random; import java.util.stream.Collectors; -import javax.annotation.Nullable; public class PortalTravelAgent { diff --git a/src/main/java/net/minecraft/server/PotionUtil.java b/src/main/java/net/minecraft/server/PotionUtil.java index bf4172be525d5bdd7c152117afce8bf00106a139..a448fa6418e6e56df70dc53fec2e5582def5593e 100644 --- a/src/main/java/net/minecraft/server/PotionUtil.java +++ b/src/main/java/net/minecraft/server/PotionUtil.java @@ -1,10 +1,11 @@ package net.minecraft.server; import com.google.common.collect.Lists; + +import javax.annotation.Nullable; import java.util.Collection; import java.util.Iterator; import java.util.List; -import javax.annotation.Nullable; public class PotionUtil { diff --git a/src/main/java/net/minecraft/server/PropertyManager.java b/src/main/java/net/minecraft/server/PropertyManager.java index 729455ce53944a9afaaa3e30052ab44f2a87cad9..cea260df46d9300d95182d72cec2a1ea15ff8625 100644 --- a/src/main/java/net/minecraft/server/PropertyManager.java +++ b/src/main/java/net/minecraft/server/PropertyManager.java @@ -1,6 +1,11 @@ package net.minecraft.server; import com.google.common.base.MoreObjects; +import joptsimple.OptionSet; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +import javax.annotation.Nullable; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; @@ -11,11 +16,6 @@ import java.util.function.Function; import java.util.function.IntFunction; import java.util.function.Supplier; import java.util.function.UnaryOperator; -import javax.annotation.Nullable; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; - -import joptsimple.OptionSet; // CraftBukkit public abstract class PropertyManager> { diff --git a/src/main/java/net/minecraft/server/ProtoChunk.java b/src/main/java/net/minecraft/server/ProtoChunk.java index 6ac9f437e853957e19be077bb2c78eef0dbbbf01..5e34bb8a0619ca3ac170db5e94fb9597ee271e46 100644 --- a/src/main/java/net/minecraft/server/ProtoChunk.java +++ b/src/main/java/net/minecraft/server/ProtoChunk.java @@ -7,20 +7,14 @@ import it.unimi.dsi.fastutil.longs.LongOpenHashSet; import it.unimi.dsi.fastutil.longs.LongSet; import it.unimi.dsi.fastutil.objects.Object2ObjectArrayMap; import it.unimi.dsi.fastutil.shorts.ShortList; -import java.util.BitSet; -import java.util.Collection; -import java.util.Collections; -import java.util.EnumSet; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; -import java.util.Set; -import java.util.stream.Stream; -import javax.annotation.Nullable; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import javax.annotation.Nullable; +import java.util.*; +import java.util.Map.Entry; +import java.util.stream.Stream; + public class ProtoChunk implements IChunkAccess { private static final Logger LOGGER = LogManager.getLogger(); diff --git a/src/main/java/net/minecraft/server/ProtoChunkExtension.java b/src/main/java/net/minecraft/server/ProtoChunkExtension.java index 9f91c02b444874e690eacb0cfa0c810168c8bb46..c154b40f6ee4fda14debea94ae41ae24c5423633 100644 --- a/src/main/java/net/minecraft/server/ProtoChunkExtension.java +++ b/src/main/java/net/minecraft/server/ProtoChunkExtension.java @@ -1,10 +1,11 @@ package net.minecraft.server; import it.unimi.dsi.fastutil.longs.LongSet; + +import javax.annotation.Nullable; import java.util.BitSet; import java.util.Map; import java.util.stream.Stream; -import javax.annotation.Nullable; public class ProtoChunkExtension extends ProtoChunk { diff --git a/src/main/java/net/minecraft/server/Raid.java b/src/main/java/net/minecraft/server/Raid.java index 54731f78c844e5ae7484949f8621946de8562dea..8fb4513944de5bbdf08443d6c1e20ae2d0548686 100644 --- a/src/main/java/net/minecraft/server/Raid.java +++ b/src/main/java/net/minecraft/server/Raid.java @@ -2,20 +2,11 @@ package net.minecraft.server; import com.google.common.collect.Maps; import com.google.common.collect.Sets; -import java.util.Collection; -import java.util.Comparator; -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; -import java.util.Locale; -import java.util.Map; -import java.util.Optional; -import java.util.Random; -import java.util.Set; -import java.util.UUID; + +import javax.annotation.Nullable; +import java.util.*; import java.util.function.Predicate; import java.util.stream.Stream; -import javax.annotation.Nullable; public class Raid { diff --git a/src/main/java/net/minecraft/server/RandomPositionGenerator.java b/src/main/java/net/minecraft/server/RandomPositionGenerator.java index dc89c707b10c5544eca06a634a625bce0dd778f0..1584f6e83abd213309ea9dde2f567329eae0f8ed 100644 --- a/src/main/java/net/minecraft/server/RandomPositionGenerator.java +++ b/src/main/java/net/minecraft/server/RandomPositionGenerator.java @@ -1,9 +1,9 @@ package net.minecraft.server; +import javax.annotation.Nullable; import java.util.Random; import java.util.function.Predicate; import java.util.function.ToDoubleFunction; -import javax.annotation.Nullable; public class RandomPositionGenerator { diff --git a/src/main/java/net/minecraft/server/RecipeBook.java b/src/main/java/net/minecraft/server/RecipeBook.java index 0d27b76b66660b1764132bf0f1ca357a136978d7..badd7fb485b7d9783dc721e54bc5284ba5e54c81 100644 --- a/src/main/java/net/minecraft/server/RecipeBook.java +++ b/src/main/java/net/minecraft/server/RecipeBook.java @@ -1,8 +1,9 @@ package net.minecraft.server; import com.google.common.collect.Sets; -import java.util.Set; + import javax.annotation.Nullable; +import java.util.Set; public class RecipeBook { diff --git a/src/main/java/net/minecraft/server/RecipeBookServer.java b/src/main/java/net/minecraft/server/RecipeBookServer.java index 3235b26648d99a71e734e0d6ba2351ca9d9f4f30..03778e6381fe6b9d6264774fae7acba483474947 100644 --- a/src/main/java/net/minecraft/server/RecipeBookServer.java +++ b/src/main/java/net/minecraft/server/RecipeBookServer.java @@ -1,15 +1,12 @@ package net.minecraft.server; import com.google.common.collect.Lists; -import java.util.Collection; -import java.util.Collections; -import java.util.Iterator; -import java.util.List; -import java.util.Optional; -import java.util.function.Consumer; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.bukkit.craftbukkit.event.CraftEventFactory; // CraftBukkit +import org.bukkit.craftbukkit.event.CraftEventFactory; + +import java.util.*; +import java.util.function.Consumer; public class RecipeBookServer extends RecipeBook { diff --git a/src/main/java/net/minecraft/server/RecipeItemStack.java b/src/main/java/net/minecraft/server/RecipeItemStack.java index 31a06a908234f8d98c90ded33ba14c281a40db81..43c86b27b811f1fe5e3578973637f8d9bd20d246 100644 --- a/src/main/java/net/minecraft/server/RecipeItemStack.java +++ b/src/main/java/net/minecraft/server/RecipeItemStack.java @@ -1,20 +1,16 @@ package net.minecraft.server; import com.google.common.collect.Lists; -import com.google.gson.JsonArray; -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; -import com.google.gson.JsonParseException; -import com.google.gson.JsonSyntaxException; +import com.google.gson.*; import it.unimi.dsi.fastutil.ints.IntArrayList; import it.unimi.dsi.fastutil.ints.IntComparators; import it.unimi.dsi.fastutil.ints.IntList; +import javax.annotation.Nullable; import java.util.*; import java.util.function.Predicate; import java.util.stream.Stream; import java.util.stream.StreamSupport; -import javax.annotation.Nullable; public final class RecipeItemStack implements Predicate { diff --git a/src/main/java/net/minecraft/server/RecipeSmithing.java b/src/main/java/net/minecraft/server/RecipeSmithing.java index 035e4bfa8713637ca9cca05411d55f2d1b8be188..02c972d6e882fba22fc3f0285244bb848ad443aa 100644 --- a/src/main/java/net/minecraft/server/RecipeSmithing.java +++ b/src/main/java/net/minecraft/server/RecipeSmithing.java @@ -2,7 +2,6 @@ package net.minecraft.server; import com.google.gson.JsonElement; import com.google.gson.JsonObject; -// CraftBukkit start import org.bukkit.craftbukkit.inventory.CraftItemStack; import org.bukkit.craftbukkit.inventory.CraftRecipe; import org.bukkit.craftbukkit.inventory.CraftSmithingRecipe; diff --git a/src/main/java/net/minecraft/server/RegionFile.java b/src/main/java/net/minecraft/server/RegionFile.java index 7f2382a89547802bcb38eb5a785c69183827716e..2a36e621898ea4b70184130d57fa7db72aa4486f 100644 --- a/src/main/java/net/minecraft/server/RegionFile.java +++ b/src/main/java/net/minecraft/server/RegionFile.java @@ -1,15 +1,10 @@ package net.minecraft.server; -import java.io.BufferedInputStream; -import java.io.BufferedOutputStream; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.DataInputStream; -import java.io.DataOutputStream; -import java.io.File; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +import javax.annotation.Nullable; +import java.io.*; import java.nio.ByteBuffer; import java.nio.IntBuffer; import java.nio.channels.FileChannel; @@ -17,11 +12,7 @@ import java.nio.file.Files; import java.nio.file.LinkOption; import java.nio.file.StandardCopyOption; import java.nio.file.StandardOpenOption; -import java.util.zip.InflaterInputStream; // Paper - -import javax.annotation.Nullable; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import java.util.zip.InflaterInputStream; public class RegionFile implements AutoCloseable { diff --git a/src/main/java/net/minecraft/server/RegionFileCache.java b/src/main/java/net/minecraft/server/RegionFileCache.java index 60b4171a3aa2a8b216aba13738c84ac9d7f3b49e..50822874f484dc35c75195add9a478b23a4f96db 100644 --- a/src/main/java/net/minecraft/server/RegionFileCache.java +++ b/src/main/java/net/minecraft/server/RegionFileCache.java @@ -2,12 +2,9 @@ package net.minecraft.server; import it.unimi.dsi.fastutil.longs.Long2ObjectLinkedOpenHashMap; import it.unimi.dsi.fastutil.objects.ObjectIterator; -import java.io.DataInputStream; -import java.io.DataOutput; -import java.io.DataOutputStream; -import java.io.File; -import java.io.IOException; + import javax.annotation.Nullable; +import java.io.*; public class RegionFileCache implements AutoCloseable { // Paper - no final diff --git a/src/main/java/net/minecraft/server/RegionFileCompression.java b/src/main/java/net/minecraft/server/RegionFileCompression.java index 29137f495942d810e61fadc33178999ad57fdcc0..a4c1eb60ab7349cb3146018642cc753f403b61d9 100644 --- a/src/main/java/net/minecraft/server/RegionFileCompression.java +++ b/src/main/java/net/minecraft/server/RegionFileCompression.java @@ -2,6 +2,8 @@ package net.minecraft.server; import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap; + +import javax.annotation.Nullable; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; @@ -9,7 +11,6 @@ import java.util.zip.DeflaterOutputStream; import java.util.zip.GZIPInputStream; import java.util.zip.GZIPOutputStream; import java.util.zip.InflaterInputStream; -import javax.annotation.Nullable; public class RegionFileCompression { diff --git a/src/main/java/net/minecraft/server/RegionFileSection.java b/src/main/java/net/minecraft/server/RegionFileSection.java index bd0ff1e43a07a3332f9ade49fec2f76275a25c7f..41e1f7c8e22fadc7fe45e03f480f5ee9fef192b2 100644 --- a/src/main/java/net/minecraft/server/RegionFileSection.java +++ b/src/main/java/net/minecraft/server/RegionFileSection.java @@ -3,23 +3,20 @@ package net.minecraft.server; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Maps; import com.mojang.datafixers.DataFixer; -import com.mojang.serialization.Codec; -import com.mojang.serialization.DataResult; -import com.mojang.serialization.Dynamic; -import com.mojang.serialization.DynamicOps; -import com.mojang.serialization.OptionalDynamic; +import com.mojang.serialization.*; import it.unimi.dsi.fastutil.longs.Long2ObjectMap; import it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap; import it.unimi.dsi.fastutil.longs.LongLinkedOpenHashSet; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +import javax.annotation.Nullable; import java.io.File; import java.io.IOException; import java.util.Map; import java.util.Optional; import java.util.function.BooleanSupplier; import java.util.function.Function; -import javax.annotation.Nullable; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; public class RegionFileSection extends RegionFileCache implements AutoCloseable { // Paper - nuke IOWorker diff --git a/src/main/java/net/minecraft/server/RegionLimitedWorldAccess.java b/src/main/java/net/minecraft/server/RegionLimitedWorldAccess.java index 478d252953c65792df9f0068a4c1afd1985151ab..43180bb5b7fb6de1455bbe11b25925e28bd04826 100644 --- a/src/main/java/net/minecraft/server/RegionLimitedWorldAccess.java +++ b/src/main/java/net/minecraft/server/RegionLimitedWorldAccess.java @@ -1,12 +1,13 @@ package net.minecraft.server; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +import javax.annotation.Nullable; import java.util.Collections; import java.util.List; import java.util.Random; import java.util.function.Predicate; -import javax.annotation.Nullable; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; public class RegionLimitedWorldAccess implements GeneratorAccessSeed { diff --git a/src/main/java/net/minecraft/server/RegistryBlockID.java b/src/main/java/net/minecraft/server/RegistryBlockID.java index 60948afa4ead71010dc27c7cef3e5acdb0ba005a..636709f303401e528a539837917dac959d7e383b 100644 --- a/src/main/java/net/minecraft/server/RegistryBlockID.java +++ b/src/main/java/net/minecraft/server/RegistryBlockID.java @@ -3,10 +3,11 @@ package net.minecraft.server; import com.google.common.base.Predicates; import com.google.common.collect.Iterators; import com.google.common.collect.Lists; + +import javax.annotation.Nullable; import java.util.IdentityHashMap; import java.util.Iterator; import java.util.List; -import javax.annotation.Nullable; public class RegistryBlockID implements Registry { diff --git a/src/main/java/net/minecraft/server/RegistryID.java b/src/main/java/net/minecraft/server/RegistryID.java index f9692408a1d177ba4668261070d7610ecfb53a7b..7cf11307b18d66186bc592568f2ea0833a57faab 100644 --- a/src/main/java/net/minecraft/server/RegistryID.java +++ b/src/main/java/net/minecraft/server/RegistryID.java @@ -2,9 +2,10 @@ package net.minecraft.server; import com.google.common.base.Predicates; import com.google.common.collect.Iterators; + +import javax.annotation.Nullable; import java.util.Arrays; import java.util.Iterator; -import javax.annotation.Nullable; public class RegistryID implements Registry { diff --git a/src/main/java/net/minecraft/server/RegistryMaterials.java b/src/main/java/net/minecraft/server/RegistryMaterials.java index ba36ab19dbb13c33c6b0cdc30b1109d01c84b1da..075e250f451f64b91e748d42fdf4ceed91bf4667 100644 --- a/src/main/java/net/minecraft/server/RegistryMaterials.java +++ b/src/main/java/net/minecraft/server/RegistryMaterials.java @@ -1,27 +1,19 @@ package net.minecraft.server; -import com.google.common.collect.BiMap; -import com.google.common.collect.HashBiMap; -import com.google.common.collect.ImmutableList; +import com.google.common.collect.*; import com.google.common.collect.ImmutableList.Builder; -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.Sets; import com.mojang.datafixers.util.Pair; import com.mojang.serialization.Codec; import com.mojang.serialization.Lifecycle; import com.mojang.serialization.MapCodec; -import java.util.Collection; -import java.util.Collections; -import java.util.Iterator; -import java.util.Map.Entry; -import java.util.Optional; -import java.util.Random; -import java.util.Set; -import javax.annotation.Nullable; import org.apache.commons.lang3.Validate; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import javax.annotation.Nullable; +import java.util.*; +import java.util.Map.Entry; + public class RegistryMaterials extends IRegistryWritable { protected static final Logger LOGGER = LogManager.getLogger(); diff --git a/src/main/java/net/minecraft/server/RemoteControlListener.java b/src/main/java/net/minecraft/server/RemoteControlListener.java index e550b8428245ef2bc0265ae6267bb7e1cabec35c..8d9b6be9088a86966d36c14b2d4163b3b2c23867 100644 --- a/src/main/java/net/minecraft/server/RemoteControlListener.java +++ b/src/main/java/net/minecraft/server/RemoteControlListener.java @@ -1,6 +1,9 @@ package net.minecraft.server; import com.google.common.collect.Lists; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + import java.io.IOException; import java.net.InetAddress; import java.net.ServerSocket; @@ -8,8 +11,6 @@ import java.net.Socket; import java.net.SocketTimeoutException; import java.util.Iterator; import java.util.List; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; public class RemoteControlListener extends RemoteConnectionThread { diff --git a/src/main/java/net/minecraft/server/Reputation.java b/src/main/java/net/minecraft/server/Reputation.java index dffac0dc85fe7d093c58663f91ad687a6be50ad5..8c155b4a649b783996161991f04f7a130d354666 100644 --- a/src/main/java/net/minecraft/server/Reputation.java +++ b/src/main/java/net/minecraft/server/Reputation.java @@ -10,17 +10,9 @@ import it.unimi.dsi.fastutil.objects.Object2IntMap; import it.unimi.dsi.fastutil.objects.Object2IntMap.Entry; import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap; import it.unimi.dsi.fastutil.objects.ObjectIterator; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Random; -import java.util.Set; -import java.util.UUID; + +import java.util.*; import java.util.function.Predicate; -import java.util.stream.Collectors; import java.util.stream.Stream; public class Reputation { diff --git a/src/main/java/net/minecraft/server/ReputationType.java b/src/main/java/net/minecraft/server/ReputationType.java index 73ad45295efbdfb5bd37a7743e17f8f210d3efbf..35b9248af248f0a37013d9f938c29ca779903c23 100644 --- a/src/main/java/net/minecraft/server/ReputationType.java +++ b/src/main/java/net/minecraft/server/ReputationType.java @@ -1,10 +1,11 @@ package net.minecraft.server; import com.google.common.collect.ImmutableMap; + +import javax.annotation.Nullable; import java.util.Map; import java.util.function.Function; import java.util.stream.Stream; -import javax.annotation.Nullable; public enum ReputationType { diff --git a/src/main/java/net/minecraft/server/ScoreboardServer.java b/src/main/java/net/minecraft/server/ScoreboardServer.java index 929397a4ca8af8aba24c36bd6fc8ed0071982b64..cf15f7038ab4c392623b39ef676d3a24227f6e51 100644 --- a/src/main/java/net/minecraft/server/ScoreboardServer.java +++ b/src/main/java/net/minecraft/server/ScoreboardServer.java @@ -2,11 +2,12 @@ package net.minecraft.server; import com.google.common.collect.Lists; import com.google.common.collect.Sets; + +import javax.annotation.Nullable; import java.util.Arrays; import java.util.Iterator; import java.util.List; import java.util.Set; -import javax.annotation.Nullable; public class ScoreboardServer extends Scoreboard { diff --git a/src/main/java/net/minecraft/server/ServerConnection.java b/src/main/java/net/minecraft/server/ServerConnection.java index 0438126662e7c635d9a4f7b8c54fe7c50403ffe8..d8efb35f1c22c1ed495461d73f2ec124ce542e24 100644 --- a/src/main/java/net/minecraft/server/ServerConnection.java +++ b/src/main/java/net/minecraft/server/ServerConnection.java @@ -3,28 +3,23 @@ package net.minecraft.server; import com.google.common.collect.Lists; import com.google.common.util.concurrent.ThreadFactoryBuilder; import io.netty.bootstrap.ServerBootstrap; -import io.netty.channel.Channel; -import io.netty.channel.ChannelException; -import io.netty.channel.ChannelFuture; -import io.netty.channel.ChannelInitializer; -import io.netty.channel.ChannelOption; -import io.netty.channel.EventLoopGroup; +import io.netty.channel.*; import io.netty.channel.epoll.Epoll; import io.netty.channel.epoll.EpollEventLoopGroup; import io.netty.channel.epoll.EpollServerSocketChannel; import io.netty.channel.nio.NioEventLoopGroup; -import io.netty.channel.socket.ServerSocketChannel; import io.netty.channel.socket.nio.NioServerSocketChannel; -import io.netty.handler.flush.FlushConsolidationHandler; // Paper +import io.netty.handler.flush.FlushConsolidationHandler; import io.netty.handler.timeout.ReadTimeoutHandler; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +import javax.annotation.Nullable; import java.io.IOException; import java.net.InetAddress; import java.util.Collections; import java.util.Iterator; import java.util.List; -import javax.annotation.Nullable; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; public class ServerConnection { diff --git a/src/main/java/net/minecraft/server/ServerGUI.java b/src/main/java/net/minecraft/server/ServerGUI.java index 76ed8e87d3213080109205489c786d6bdbe08908..fe87c689d774666c0d39af80ca54aba259e954e6 100644 --- a/src/main/java/net/minecraft/server/ServerGUI.java +++ b/src/main/java/net/minecraft/server/ServerGUI.java @@ -2,33 +2,22 @@ package net.minecraft.server; import com.google.common.collect.Lists; import com.mojang.util.QueueLogAppender; -import java.awt.BorderLayout; -import java.awt.Component; -import java.awt.Dimension; -import java.awt.Font; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +import javax.swing.*; +import javax.swing.border.EtchedBorder; +import javax.swing.border.TitledBorder; +import javax.swing.text.AttributeSet; +import javax.swing.text.BadLocationException; +import javax.swing.text.Document; +import java.awt.*; import java.awt.event.FocusAdapter; import java.awt.event.FocusEvent; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; import java.util.Collection; import java.util.concurrent.atomic.AtomicBoolean; -import javax.swing.JComponent; -import javax.swing.JFrame; -import javax.swing.JList; -import javax.swing.JPanel; -import javax.swing.JScrollBar; -import javax.swing.JScrollPane; -import javax.swing.JTextArea; -import javax.swing.JTextField; -import javax.swing.SwingUtilities; -import javax.swing.UIManager; -import javax.swing.border.EtchedBorder; -import javax.swing.border.TitledBorder; -import javax.swing.text.AttributeSet; -import javax.swing.text.BadLocationException; -import javax.swing.text.Document; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; public class ServerGUI extends JComponent { diff --git a/src/main/java/net/minecraft/server/ServerPing.java b/src/main/java/net/minecraft/server/ServerPing.java index ea52e89bd965afbd74f15b0e2974657319c28e4a..e5b69c561f3ff2e76351f784d970f77d381f284d 100644 --- a/src/main/java/net/minecraft/server/ServerPing.java +++ b/src/main/java/net/minecraft/server/ServerPing.java @@ -1,14 +1,8 @@ package net.minecraft.server; -import com.google.gson.JsonArray; -import com.google.gson.JsonDeserializationContext; -import com.google.gson.JsonDeserializer; -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; -import com.google.gson.JsonParseException; -import com.google.gson.JsonSerializationContext; -import com.google.gson.JsonSerializer; +import com.google.gson.*; import com.mojang.authlib.GameProfile; + import java.lang.reflect.Type; import java.util.UUID; diff --git a/src/main/java/net/minecraft/server/ServerStatisticManager.java b/src/main/java/net/minecraft/server/ServerStatisticManager.java index 5f222d8b90951c61e77ab7032f8728772ba8ab9d..48a6f61bfd7408f2bdebcdd9bf07bde1c750209a 100644 --- a/src/main/java/net/minecraft/server/ServerStatisticManager.java +++ b/src/main/java/net/minecraft/server/ServerStatisticManager.java @@ -12,6 +12,9 @@ import com.mojang.datafixers.DataFixer; import it.unimi.dsi.fastutil.objects.Object2IntMap; import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap; import it.unimi.dsi.fastutil.objects.ObjectIterator; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + import java.io.File; import java.io.IOException; import java.io.StringReader; @@ -20,13 +23,9 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Optional; import java.util.Set; -import java.util.Map.Entry; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; - public class ServerStatisticManager extends StatisticManager { private static final Logger LOGGER = LogManager.getLogger(); diff --git a/src/main/java/net/minecraft/server/ShapedRecipes.java b/src/main/java/net/minecraft/server/ShapedRecipes.java index f9f65b30c66e46b00ec34976bc08380459eef270..05e39e5a9a6d8a89a4087429b7944de74d94dab1 100644 --- a/src/main/java/net/minecraft/server/ShapedRecipes.java +++ b/src/main/java/net/minecraft/server/ShapedRecipes.java @@ -3,23 +3,16 @@ package net.minecraft.server; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.Maps; import com.google.common.collect.Sets; -import com.google.gson.JsonArray; -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; -import com.google.gson.JsonParseException; -import com.google.gson.JsonSyntaxException; -import java.util.Iterator; -import java.util.Map; -import java.util.Map.Entry; -import java.util.Set; -// CraftBukkit start -import java.util.ArrayList; -import java.util.List; +import com.google.gson.*; import org.bukkit.craftbukkit.inventory.CraftItemStack; import org.bukkit.craftbukkit.inventory.CraftRecipe; import org.bukkit.craftbukkit.inventory.CraftShapedRecipe; -import org.bukkit.craftbukkit.util.CraftMagicNumbers; import org.bukkit.inventory.RecipeChoice; + +import java.util.Iterator; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Set; // CraftBukkit end public class ShapedRecipes implements RecipeCrafting { diff --git a/src/main/java/net/minecraft/server/ShapelessRecipes.java b/src/main/java/net/minecraft/server/ShapelessRecipes.java index fb481e65862b4aaa08e2302a517fdd8253d63812..9f14514ef9b16fbf473c1ee04c141cb0dbf7c7e4 100644 --- a/src/main/java/net/minecraft/server/ShapelessRecipes.java +++ b/src/main/java/net/minecraft/server/ShapelessRecipes.java @@ -3,12 +3,11 @@ package net.minecraft.server; import com.google.gson.JsonArray; import com.google.gson.JsonObject; import com.google.gson.JsonParseException; -import it.unimi.dsi.fastutil.ints.IntList; -import java.util.Iterator; -// CraftBukkit start import org.bukkit.craftbukkit.inventory.CraftItemStack; import org.bukkit.craftbukkit.inventory.CraftRecipe; import org.bukkit.craftbukkit.inventory.CraftShapelessRecipe; + +import java.util.Iterator; // CraftBukkit end public class ShapelessRecipes implements RecipeCrafting { diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java index 9af08eed145e527e3bcb4f2f5ab1804f53a4bbb6..600b508846d2e6654c74b61b04b7ef9c6095e856 100644 --- a/src/main/java/net/minecraft/server/SpawnerCreature.java +++ b/src/main/java/net/minecraft/server/SpawnerCreature.java @@ -1,19 +1,16 @@ package net.minecraft.server; +import com.destroystokyo.paper.exception.ServerInternalException; import it.unimi.dsi.fastutil.objects.Object2IntMap; import it.unimi.dsi.fastutil.objects.Object2IntMaps; import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap; - -import java.util.*; -import java.util.function.Consumer; -import java.util.stream.Stream; -import javax.annotation.Nullable; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; - -// CraftBukkit start -import com.destroystokyo.paper.exception.ServerInternalException; import org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason; + +import javax.annotation.Nullable; +import java.util.*; +import java.util.function.Consumer; // CraftBukkit end public final class SpawnerCreature { diff --git a/src/main/java/net/minecraft/server/StructureGenerator.java b/src/main/java/net/minecraft/server/StructureGenerator.java index 512afdfcbaab630a291d1aa120a90e554855d34f..f9200b8e6f915b401dc35ac88da31948b18aa551 100644 --- a/src/main/java/net/minecraft/server/StructureGenerator.java +++ b/src/main/java/net/minecraft/server/StructureGenerator.java @@ -5,13 +5,14 @@ import com.google.common.collect.HashBiMap; import com.google.common.collect.ImmutableList; import com.google.common.collect.Maps; import com.mojang.serialization.Codec; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +import javax.annotation.Nullable; import java.util.Collections; import java.util.List; import java.util.Locale; import java.util.Map; -import javax.annotation.Nullable; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; public abstract class StructureGenerator { diff --git a/src/main/java/net/minecraft/server/StructureManager.java b/src/main/java/net/minecraft/server/StructureManager.java index 6c7804ac0e994ec03b95eda7a24139b65a59db7e..88247c3d65733b7c07d52497740cb8f1b39f8b74 100644 --- a/src/main/java/net/minecraft/server/StructureManager.java +++ b/src/main/java/net/minecraft/server/StructureManager.java @@ -1,8 +1,7 @@ package net.minecraft.server; -import com.mojang.datafixers.DataFixUtils; -import java.util.stream.Stream; import javax.annotation.Nullable; +import java.util.stream.Stream; public class StructureManager { diff --git a/src/main/java/net/minecraft/server/StructureSettings.java b/src/main/java/net/minecraft/server/StructureSettings.java index 7bd9fa4811dae2a43bd8e51ab23766155921e5af..a5be5d4d9ea2429279594e8aa4664a6cf1b33d1c 100644 --- a/src/main/java/net/minecraft/server/StructureSettings.java +++ b/src/main/java/net/minecraft/server/StructureSettings.java @@ -4,10 +4,10 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.Maps; import com.mojang.serialization.Codec; import com.mojang.serialization.codecs.RecordCodecBuilder; -import java.util.Iterator; + +import javax.annotation.Nullable; import java.util.Map; import java.util.Optional; -import javax.annotation.Nullable; public class StructureSettings { diff --git a/src/main/java/net/minecraft/server/SystemUtils.java b/src/main/java/net/minecraft/server/SystemUtils.java index 91ebcea452707f5d64e2b61a76b42fcdbf40fdee..cfaab66b1e7d8dd54340af2956d24de426e0baad 100644 --- a/src/main/java/net/minecraft/server/SystemUtils.java +++ b/src/main/java/net/minecraft/server/SystemUtils.java @@ -8,27 +8,17 @@ import com.mojang.datafixers.DataFixUtils; import com.mojang.datafixers.types.Type; import com.mojang.serialization.DataResult; import it.unimi.dsi.fastutil.Hash.Strategy; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +import javax.annotation.Nullable; import java.io.File; import java.lang.management.ManagementFactory; import java.lang.management.RuntimeMXBean; import java.time.Instant; -import java.util.Arrays; -import java.util.Iterator; -import java.util.List; -import java.util.Locale; -import java.util.Map; +import java.util.*; import java.util.Map.Entry; -import java.util.Optional; -import java.util.Random; -import java.util.UUID; -import java.util.concurrent.CompletableFuture; -import java.util.concurrent.CompletionException; -import java.util.concurrent.Executor; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; -import java.util.concurrent.ForkJoinPool; -import java.util.concurrent.ForkJoinWorkerThread; -import java.util.concurrent.TimeUnit; +import java.util.concurrent.*; import java.util.concurrent.atomic.AtomicInteger; import java.util.function.Consumer; import java.util.function.LongSupplier; @@ -37,9 +27,6 @@ import java.util.stream.Collector; import java.util.stream.Collectors; import java.util.stream.IntStream; import java.util.stream.Stream; -import javax.annotation.Nullable; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; public class SystemUtils { diff --git a/src/main/java/net/minecraft/server/TagRegistry.java b/src/main/java/net/minecraft/server/TagRegistry.java index c836cd8f7945d9209c71ca7f1afebb43b931da18..0cce20c6115e9ef5eb0bba678951cb8a60013ec9 100644 --- a/src/main/java/net/minecraft/server/TagRegistry.java +++ b/src/main/java/net/minecraft/server/TagRegistry.java @@ -2,6 +2,7 @@ package net.minecraft.server; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; + import java.util.Map; import java.util.concurrent.CompletableFuture; import java.util.concurrent.Executor; diff --git a/src/main/java/net/minecraft/server/TagsServer.java b/src/main/java/net/minecraft/server/TagsServer.java index 1d1c79fc3e72e0b5eca072ec0fd150b4f7f6af86..c312f892153b81a6ba6ffdf6fcffb8ae5257be5a 100644 --- a/src/main/java/net/minecraft/server/TagsServer.java +++ b/src/main/java/net/minecraft/server/TagsServer.java @@ -3,6 +3,7 @@ package net.minecraft.server; import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSet.Builder; import com.google.common.collect.Maps; + import java.util.Iterator; import java.util.Map; import java.util.Map.Entry; diff --git a/src/main/java/net/minecraft/server/ThreadedMailbox.java b/src/main/java/net/minecraft/server/ThreadedMailbox.java index cd30215dc098068ae034117c409cb295ebca58c1..68e3314de4c0be6ab54594c0533ed69f37a5e9ce 100644 --- a/src/main/java/net/minecraft/server/ThreadedMailbox.java +++ b/src/main/java/net/minecraft/server/ThreadedMailbox.java @@ -1,12 +1,13 @@ package net.minecraft.server; import it.unimi.dsi.fastutil.ints.Int2BooleanFunction; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + import java.util.concurrent.ConcurrentLinkedQueue; import java.util.concurrent.Executor; import java.util.concurrent.RejectedExecutionException; import java.util.concurrent.atomic.AtomicInteger; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; public class ThreadedMailbox implements Mailbox, AutoCloseable, Runnable { diff --git a/src/main/java/net/minecraft/server/TickListChunk.java b/src/main/java/net/minecraft/server/TickListChunk.java index 8af1229c3da63a838b0bec1cafde1e41cf5cf551..56bd6ba96ea4331dbe1275840fded27428ea8fc3 100644 --- a/src/main/java/net/minecraft/server/TickListChunk.java +++ b/src/main/java/net/minecraft/server/TickListChunk.java @@ -1,6 +1,7 @@ package net.minecraft.server; import com.google.common.collect.Lists; + import java.util.Iterator; import java.util.List; import java.util.function.Function; diff --git a/src/main/java/net/minecraft/server/TickListServer.java b/src/main/java/net/minecraft/server/TickListServer.java index 721476be8f5cb1753605c1b09ea7ba87daae2725..454beb548ca3eb05e9ae39c8a4fb2ab25137ed69 100644 --- a/src/main/java/net/minecraft/server/TickListServer.java +++ b/src/main/java/net/minecraft/server/TickListServer.java @@ -3,17 +3,12 @@ package net.minecraft.server; import com.google.common.collect.Lists; import com.google.common.collect.Queues; import com.google.common.collect.Sets; -import java.util.Collection; -import java.util.Collections; -import java.util.Iterator; -import java.util.List; -import java.util.Queue; -import java.util.Set; -import java.util.TreeSet; + +import javax.annotation.Nullable; +import java.util.*; import java.util.function.Consumer; import java.util.function.Function; import java.util.function.Predicate; -import javax.annotation.Nullable; public class TickListServer implements TickList { diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java index e1f1d6e33fd76bd11eb23e78457ba711bf9d5cde..3f9201d2ae8fa86cfb2707bc3c4c9266dcf76dfe 100644 --- a/src/main/java/net/minecraft/server/TileEntity.java +++ b/src/main/java/net/minecraft/server/TileEntity.java @@ -1,16 +1,15 @@ package net.minecraft.server; -import javax.annotation.Nullable; +import co.aikar.timings.MinecraftTimings; +import co.aikar.timings.Timing; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.util.Supplier; -// CraftBukkit start import org.bukkit.craftbukkit.persistence.CraftPersistentDataContainer; import org.bukkit.craftbukkit.persistence.CraftPersistentDataTypeRegistry; import org.bukkit.inventory.InventoryHolder; -// CraftBukkit end -import co.aikar.timings.MinecraftTimings; // Paper -import co.aikar.timings.Timing; // Paper + +import javax.annotation.Nullable; public abstract class TileEntity implements KeyedObject, Cloneable { // Paper // Tuinity diff --git a/src/main/java/net/minecraft/server/TileEntityBanner.java b/src/main/java/net/minecraft/server/TileEntityBanner.java index 5397d8a69a0326cf73fe0ee1175d1871cac3769d..94a3f51d35930e86507490aaa942921dd4277cd6 100644 --- a/src/main/java/net/minecraft/server/TileEntityBanner.java +++ b/src/main/java/net/minecraft/server/TileEntityBanner.java @@ -1,9 +1,10 @@ package net.minecraft.server; import com.mojang.datafixers.util.Pair; + +import javax.annotation.Nullable; import java.util.List; import java.util.function.Supplier; -import javax.annotation.Nullable; public class TileEntityBanner extends TileEntity implements INamableTileEntity { diff --git a/src/main/java/net/minecraft/server/TileEntityBarrel.java b/src/main/java/net/minecraft/server/TileEntityBarrel.java index f70faa39a88dfe49c5abfcfb7ce9f80a065c4655..b7f1418aa0f10024159994cc57c67762c6a1bbd2 100644 --- a/src/main/java/net/minecraft/server/TileEntityBarrel.java +++ b/src/main/java/net/minecraft/server/TileEntityBarrel.java @@ -1,16 +1,12 @@ package net.minecraft.server; // CraftBukkit start -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import org.bukkit.Location; -import org.bukkit.block.Barrel; -import org.bukkit.block.Lectern; -import org.bukkit.craftbukkit.block.CraftBlock; + import org.bukkit.craftbukkit.entity.CraftHumanEntity; import org.bukkit.entity.HumanEntity; -import org.bukkit.inventory.InventoryHolder; + +import java.util.ArrayList; +import java.util.List; // CraftBukkit end public class TileEntityBarrel extends TileEntityLootable { diff --git a/src/main/java/net/minecraft/server/TileEntityBeacon.java b/src/main/java/net/minecraft/server/TileEntityBeacon.java index e109223f3f445f8b7d881853206f7bba9fd05b8b..1c91cc5ce28e936e62a5276ed82ddfebb2f233e6 100644 --- a/src/main/java/net/minecraft/server/TileEntityBeacon.java +++ b/src/main/java/net/minecraft/server/TileEntityBeacon.java @@ -1,21 +1,14 @@ package net.minecraft.server; +import com.destroystokyo.paper.event.block.BeaconEffectEvent; import com.google.common.collect.Lists; - -import java.util.*; -import java.util.stream.Collectors; -import javax.annotation.Nullable; - -// CraftBukkit start -import org.bukkit.craftbukkit.entity.CraftHumanEntity; -import org.bukkit.craftbukkit.potion.CraftPotionUtil; -import org.bukkit.entity.HumanEntity; -import org.bukkit.potion.PotionEffect; -// CraftBukkit end -// Paper start import org.bukkit.craftbukkit.event.CraftEventFactory; +import org.bukkit.craftbukkit.potion.CraftPotionUtil; import org.bukkit.entity.Player; -import com.destroystokyo.paper.event.block.BeaconEffectEvent; +import org.bukkit.potion.PotionEffect; + +import javax.annotation.Nullable; +import java.util.*; // Paper end public class TileEntityBeacon extends TileEntity implements ITileInventory, ITickable { diff --git a/src/main/java/net/minecraft/server/TileEntityBeehive.java b/src/main/java/net/minecraft/server/TileEntityBeehive.java index 9da356de6b98e4b9c48ee9ea23647c2e292adea9..ce66802b437b57e0f6a66be3c6d69b36228a4afc 100644 --- a/src/main/java/net/minecraft/server/TileEntityBeehive.java +++ b/src/main/java/net/minecraft/server/TileEntityBeehive.java @@ -1,9 +1,10 @@ package net.minecraft.server; import com.google.common.collect.Lists; + +import javax.annotation.Nullable; import java.util.Iterator; import java.util.List; -import javax.annotation.Nullable; public class TileEntityBeehive extends TileEntity implements ITickable { diff --git a/src/main/java/net/minecraft/server/TileEntityBrewingStand.java b/src/main/java/net/minecraft/server/TileEntityBrewingStand.java index e38a494d7b1aa03b5644a54e9ba9139aa43eb759..568bde484cdfe2e2f4a55fe6fd5616263c0e4c37 100644 --- a/src/main/java/net/minecraft/server/TileEntityBrewingStand.java +++ b/src/main/java/net/minecraft/server/TileEntityBrewingStand.java @@ -1,17 +1,16 @@ package net.minecraft.server; -import java.util.Arrays; -import java.util.Iterator; -import javax.annotation.Nullable; - -// CraftBukkit start -import java.util.List; import org.bukkit.craftbukkit.entity.CraftHumanEntity; import org.bukkit.craftbukkit.inventory.CraftItemStack; import org.bukkit.entity.HumanEntity; import org.bukkit.event.inventory.BrewEvent; import org.bukkit.event.inventory.BrewingStandFuelEvent; import org.bukkit.inventory.InventoryHolder; + +import javax.annotation.Nullable; +import java.util.Arrays; +import java.util.Iterator; +import java.util.List; // CraftBukkit end public class TileEntityBrewingStand extends TileEntityContainer implements IWorldInventory, ITickable { diff --git a/src/main/java/net/minecraft/server/TileEntityCampfire.java b/src/main/java/net/minecraft/server/TileEntityCampfire.java index 1d002341652f34100c033b84afd958e0e6aace97..d3fb2f4a190742441e88c497ff5f915055b4df19 100644 --- a/src/main/java/net/minecraft/server/TileEntityCampfire.java +++ b/src/main/java/net/minecraft/server/TileEntityCampfire.java @@ -1,12 +1,12 @@ package net.minecraft.server; -import java.util.Optional; -import java.util.Random; -import javax.annotation.Nullable; -// CraftBukkit start import org.bukkit.craftbukkit.block.CraftBlock; import org.bukkit.craftbukkit.inventory.CraftItemStack; import org.bukkit.event.block.BlockCookEvent; + +import javax.annotation.Nullable; +import java.util.Optional; +import java.util.Random; // CraftBukkit end public class TileEntityCampfire extends TileEntity implements Clearable, ITickable { diff --git a/src/main/java/net/minecraft/server/TileEntityChest.java b/src/main/java/net/minecraft/server/TileEntityChest.java index 0a73895999f6e680cc89746b8573a596d91749d2..2e638f09369f5041222f57cdef2fbb903da9ba88 100644 --- a/src/main/java/net/minecraft/server/TileEntityChest.java +++ b/src/main/java/net/minecraft/server/TileEntityChest.java @@ -1,10 +1,10 @@ package net.minecraft.server; -import java.util.Iterator; -import java.util.List; -// CraftBukkit start import org.bukkit.craftbukkit.entity.CraftHumanEntity; import org.bukkit.entity.HumanEntity; + +import java.util.Iterator; +import java.util.List; // CraftBukkit end public class TileEntityChest extends TileEntityLootable { // Paper - Remove ITickable diff --git a/src/main/java/net/minecraft/server/TileEntityConduit.java b/src/main/java/net/minecraft/server/TileEntityConduit.java index 7e9470caa568ccd5857b8f5c774b6d2651f6f96c..adbfb11064fe38648588b167e1f9db2130a6a0da 100644 --- a/src/main/java/net/minecraft/server/TileEntityConduit.java +++ b/src/main/java/net/minecraft/server/TileEntityConduit.java @@ -1,14 +1,14 @@ package net.minecraft.server; import com.google.common.collect.Lists; +import org.bukkit.craftbukkit.block.CraftBlock; +import org.bukkit.craftbukkit.event.CraftEventFactory; + +import javax.annotation.Nullable; import java.util.Iterator; import java.util.List; import java.util.Random; import java.util.UUID; -import javax.annotation.Nullable; -// CraftBukkit start -import org.bukkit.craftbukkit.block.CraftBlock; -import org.bukkit.craftbukkit.event.CraftEventFactory; // CraftBukkit end public class TileEntityConduit extends TileEntity implements ITickable { diff --git a/src/main/java/net/minecraft/server/TileEntityDispenser.java b/src/main/java/net/minecraft/server/TileEntityDispenser.java index 6ea4bc31151bce2bdd3376a889029c4b999befac..2fdee45e359d21fd73a1748ec0e534a6260c1588 100644 --- a/src/main/java/net/minecraft/server/TileEntityDispenser.java +++ b/src/main/java/net/minecraft/server/TileEntityDispenser.java @@ -1,11 +1,10 @@ package net.minecraft.server; -import java.util.Random; -// CraftBukkit start -import java.util.List; - import org.bukkit.craftbukkit.entity.CraftHumanEntity; import org.bukkit.entity.HumanEntity; + +import java.util.List; +import java.util.Random; // CraftBukkit end public class TileEntityDispenser extends TileEntityLootable { diff --git a/src/main/java/net/minecraft/server/TileEntityEndGateway.java b/src/main/java/net/minecraft/server/TileEntityEndGateway.java index 89537dec8ed278e79e078cb2fd3d3e839cdbab59..159db8d095f9abed59348594147a640cec96889f 100644 --- a/src/main/java/net/minecraft/server/TileEntityEndGateway.java +++ b/src/main/java/net/minecraft/server/TileEntityEndGateway.java @@ -1,16 +1,16 @@ package net.minecraft.server; -import java.util.Iterator; -import java.util.List; -import java.util.Random; -import javax.annotation.Nullable; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -// CraftBukkit start import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.craftbukkit.entity.CraftPlayer; import org.bukkit.event.player.PlayerTeleportEvent; + +import javax.annotation.Nullable; +import java.util.Iterator; +import java.util.List; +import java.util.Random; // CraftBukkit end public class TileEntityEndGateway extends TileEntityEnderPortal implements ITickable { diff --git a/src/main/java/net/minecraft/server/TileEntityFurnace.java b/src/main/java/net/minecraft/server/TileEntityFurnace.java index eded99b59beb7d6fe759b21fa7d3082057c741d4..497ca14dd5c6df02dfce897820967c3f6094a255 100644 --- a/src/main/java/net/minecraft/server/TileEntityFurnace.java +++ b/src/main/java/net/minecraft/server/TileEntityFurnace.java @@ -5,12 +5,6 @@ import com.google.common.collect.Maps; import it.unimi.dsi.fastutil.objects.Object2IntMap.Entry; import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap; import it.unimi.dsi.fastutil.objects.ObjectIterator; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import javax.annotation.Nullable; -// CraftBukkit start -import java.util.List; import org.bukkit.craftbukkit.block.CraftBlock; import org.bukkit.craftbukkit.entity.CraftHumanEntity; import org.bukkit.craftbukkit.inventory.CraftItemStack; @@ -19,6 +13,11 @@ import org.bukkit.entity.Player; import org.bukkit.event.inventory.FurnaceBurnEvent; import org.bukkit.event.inventory.FurnaceExtractEvent; import org.bukkit.event.inventory.FurnaceSmeltEvent; + +import javax.annotation.Nullable; +import java.util.Iterator; +import java.util.List; +import java.util.Map; // CraftBukkit end public abstract class TileEntityFurnace extends TileEntityContainer implements IWorldInventory, RecipeHolder, AutoRecipeOutput, ITickable { diff --git a/src/main/java/net/minecraft/server/TileEntityHopper.java b/src/main/java/net/minecraft/server/TileEntityHopper.java index a5a8528db91c15afcf8c77d5e4727c8e0212bb63..4285e9e4c1064468922b66d8cafbd102827f7f24 100644 --- a/src/main/java/net/minecraft/server/TileEntityHopper.java +++ b/src/main/java/net/minecraft/server/TileEntityHopper.java @@ -1,20 +1,17 @@ package net.minecraft.server; -import java.util.Iterator; -import java.util.List; -import java.util.Optional; -import java.util.function.Supplier; -import java.util.stream.Collectors; -import java.util.stream.IntStream; -import javax.annotation.Nullable; - -// CraftBukkit start import org.bukkit.craftbukkit.entity.CraftHumanEntity; import org.bukkit.craftbukkit.inventory.CraftItemStack; import org.bukkit.entity.HumanEntity; import org.bukkit.event.inventory.InventoryMoveItemEvent; import org.bukkit.event.inventory.InventoryPickupItemEvent; import org.bukkit.inventory.Inventory; + +import javax.annotation.Nullable; +import java.util.Iterator; +import java.util.List; +import java.util.function.Supplier; +import java.util.stream.IntStream; // CraftBukkit end public class TileEntityHopper extends TileEntityLootable implements IHopper, ITickable { diff --git a/src/main/java/net/minecraft/server/TileEntityLectern.java b/src/main/java/net/minecraft/server/TileEntityLectern.java index b955d5d6619d6b9c64559937df6aa619fb4c8c04..0651a733c7d18606e637fae3ab6602e544dd92da 100644 --- a/src/main/java/net/minecraft/server/TileEntityLectern.java +++ b/src/main/java/net/minecraft/server/TileEntityLectern.java @@ -1,17 +1,16 @@ package net.minecraft.server; -import javax.annotation.Nullable; -// CraftBukkit start -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.UUID; import org.bukkit.Location; import org.bukkit.block.Lectern; -import org.bukkit.craftbukkit.block.CraftBlock; import org.bukkit.craftbukkit.entity.CraftHumanEntity; import org.bukkit.entity.HumanEntity; import org.bukkit.inventory.InventoryHolder; + +import javax.annotation.Nullable; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.UUID; // CraftBukkit end public class TileEntityLectern extends TileEntity implements Clearable, ITileInventory, ICommandListener { // CraftBukkit - ICommandListener diff --git a/src/main/java/net/minecraft/server/TileEntityLootable.java b/src/main/java/net/minecraft/server/TileEntityLootable.java index 81651778fe1e81273ecdf7cdd511c84b5f3e1d40..634f7a444e98537a6895c2ac2a892f9f39e2fde9 100644 --- a/src/main/java/net/minecraft/server/TileEntityLootable.java +++ b/src/main/java/net/minecraft/server/TileEntityLootable.java @@ -1,7 +1,7 @@ package net.minecraft.server; -import java.util.Random; import javax.annotation.Nullable; +import java.util.Random; public abstract class TileEntityLootable extends TileEntityContainer { diff --git a/src/main/java/net/minecraft/server/TileEntityShulkerBox.java b/src/main/java/net/minecraft/server/TileEntityShulkerBox.java index 9459efde54d507231b4aacb7cba14e9905ebb4d7..9eee9c250d4b6cf28951cf9c0cee961268947320 100644 --- a/src/main/java/net/minecraft/server/TileEntityShulkerBox.java +++ b/src/main/java/net/minecraft/server/TileEntityShulkerBox.java @@ -1,12 +1,11 @@ package net.minecraft.server; -import java.util.Arrays; -import java.util.List; -import java.util.stream.IntStream; -import javax.annotation.Nullable; -// CraftBukkit start import org.bukkit.craftbukkit.entity.CraftHumanEntity; import org.bukkit.entity.HumanEntity; + +import javax.annotation.Nullable; +import java.util.Arrays; +import java.util.List; // CraftBukkit end public class TileEntityShulkerBox extends TileEntityLootable implements IWorldInventory, ITickable { diff --git a/src/main/java/net/minecraft/server/TileEntitySign.java b/src/main/java/net/minecraft/server/TileEntitySign.java index c4b0d8720e71c7bf2cac7ed962b8fd33cf0b49b3..fa63d9c7eae6f38a953176be8bcf1125094c3c52 100644 --- a/src/main/java/net/minecraft/server/TileEntitySign.java +++ b/src/main/java/net/minecraft/server/TileEntitySign.java @@ -1,8 +1,9 @@ package net.minecraft.server; import com.mojang.brigadier.exceptions.CommandSyntaxException; -import java.util.UUID; + import javax.annotation.Nullable; +import java.util.UUID; public class TileEntitySign extends TileEntity implements ICommandListener { // CraftBukkit - implements diff --git a/src/main/java/net/minecraft/server/TileEntitySkull.java b/src/main/java/net/minecraft/server/TileEntitySkull.java index ceb1f18a49ebc8fbac270d9f221fa44f9baea216..b9def7587a1dad2acce3509cc7b82e9768f8b1bc 100644 --- a/src/main/java/net/minecraft/server/TileEntitySkull.java +++ b/src/main/java/net/minecraft/server/TileEntitySkull.java @@ -1,32 +1,23 @@ package net.minecraft.server; -import com.google.common.collect.Iterables; -import com.mojang.authlib.GameProfile; -import com.mojang.authlib.minecraft.MinecraftSessionService; -import com.mojang.authlib.properties.Property; - -import dev.tr7zw.yatopia.events.GameProfileLookupEvent; - -import java.util.UUID; -import javax.annotation.Nullable; - -import org.bukkit.Bukkit; - -// Spigot start import com.google.common.base.Predicate; -import com.google.common.cache.LoadingCache; import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; +import com.google.common.cache.LoadingCache; +import com.google.common.collect.Iterables; import com.google.common.util.concurrent.Futures; -import java.util.concurrent.Executors; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Future; -import java.util.concurrent.TimeUnit; - import com.google.common.util.concurrent.ThreadFactoryBuilder; import com.mojang.authlib.Agent; +import com.mojang.authlib.GameProfile; import com.mojang.authlib.ProfileLookupCallback; -import java.util.concurrent.Callable; +import com.mojang.authlib.minecraft.MinecraftSessionService; +import com.mojang.authlib.properties.Property; +import dev.tr7zw.yatopia.events.GameProfileLookupEvent; +import org.bukkit.Bukkit; + +import javax.annotation.Nullable; +import java.util.UUID; +import java.util.concurrent.*; // Spigot end public class TileEntitySkull extends TileEntity /*implements ITickable*/ { // Paper - remove tickable diff --git a/src/main/java/net/minecraft/server/UserCache.java b/src/main/java/net/minecraft/server/UserCache.java index 2cdc6cf8ce06103b2c042f512e53567d95994202..d9421dc1afc86c8f1f4acacbe23a70ac8143bb19 100644 --- a/src/main/java/net/minecraft/server/UserCache.java +++ b/src/main/java/net/minecraft/server/UserCache.java @@ -2,42 +2,22 @@ package net.minecraft.server; import com.google.common.collect.Iterators; import com.google.common.collect.Lists; -import com.google.common.collect.Maps; import com.google.common.io.Files; -import com.google.gson.Gson; -import com.google.gson.GsonBuilder; -import com.google.gson.JsonDeserializationContext; -import com.google.gson.JsonDeserializer; -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; -import com.google.gson.JsonParseException; -import com.google.gson.JsonSerializationContext; -import com.google.gson.JsonSerializer; +import com.google.gson.*; import com.google.gson.reflect.TypeToken; import com.mojang.authlib.Agent; import com.mojang.authlib.GameProfile; import com.mojang.authlib.GameProfileRepository; import com.mojang.authlib.ProfileLookupCallback; -import java.io.BufferedReader; -import java.io.BufferedWriter; -import java.io.File; -import java.io.FileNotFoundException; -import java.io.IOException; -import java.io.Reader; +import org.apache.commons.io.IOUtils; + +import javax.annotation.Nullable; +import java.io.*; import java.lang.reflect.Type; import java.nio.charset.StandardCharsets; import java.text.ParseException; import java.text.SimpleDateFormat; -import java.util.Calendar; -import java.util.Date; -import java.util.Deque; -import java.util.Iterator; -import java.util.List; -import java.util.Locale; -import java.util.Map; -import java.util.UUID; -import javax.annotation.Nullable; -import org.apache.commons.io.IOUtils; +import java.util.*; public class UserCache { diff --git a/src/main/java/net/minecraft/server/VillagePlace.java b/src/main/java/net/minecraft/server/VillagePlace.java index f1e791c87457bcdf31a70f6f06bf865f556f12e7..1e75251c2a47f524ad7f2dbb864674c7707bc58b 100644 --- a/src/main/java/net/minecraft/server/VillagePlace.java +++ b/src/main/java/net/minecraft/server/VillagePlace.java @@ -6,13 +6,9 @@ import it.unimi.dsi.fastutil.longs.Long2ByteMap; import it.unimi.dsi.fastutil.longs.Long2ByteOpenHashMap; import it.unimi.dsi.fastutil.longs.LongOpenHashSet; import it.unimi.dsi.fastutil.longs.LongSet; + import java.io.File; -import java.util.Collections; -import java.util.Comparator; -import java.util.List; -import java.util.Optional; -import java.util.Random; -import java.util.Set; +import java.util.*; import java.util.function.BiConsumer; import java.util.function.BooleanSupplier; import java.util.function.Predicate; diff --git a/src/main/java/net/minecraft/server/VillageSiege.java b/src/main/java/net/minecraft/server/VillageSiege.java index b1081e441023f5d24091321b1267b5651adeb331..31783b9b1fe53ccb3ae39149bc066037b3074843 100644 --- a/src/main/java/net/minecraft/server/VillageSiege.java +++ b/src/main/java/net/minecraft/server/VillageSiege.java @@ -2,8 +2,8 @@ package net.minecraft.server; import com.destroystokyo.paper.exception.ServerInternalException; -import java.util.Iterator; import javax.annotation.Nullable; +import java.util.Iterator; public class VillageSiege implements MobSpawner { diff --git a/src/main/java/net/minecraft/server/VillagerTrades.java b/src/main/java/net/minecraft/server/VillagerTrades.java index d0c2ec4050458e26d1bd85cc09b1a3fdca8488c6..9eb3996a0e927276327402653de395f6cfa3669f 100644 --- a/src/main/java/net/minecraft/server/VillagerTrades.java +++ b/src/main/java/net/minecraft/server/VillagerTrades.java @@ -5,12 +5,13 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap; + +import javax.annotation.Nullable; import java.util.List; import java.util.Locale; import java.util.Map; import java.util.Random; import java.util.stream.Collectors; -import javax.annotation.Nullable; public class VillagerTrades { diff --git a/src/main/java/net/minecraft/server/VoxelShape.java b/src/main/java/net/minecraft/server/VoxelShape.java index 3a98e242e06ad3a936b9c3a110c66238d172323e..f7a647ce5ae20843f2b2274857cd71eca399fa46 100644 --- a/src/main/java/net/minecraft/server/VoxelShape.java +++ b/src/main/java/net/minecraft/server/VoxelShape.java @@ -3,8 +3,9 @@ package net.minecraft.server; import com.google.common.collect.Lists; import com.google.common.math.DoubleMath; import it.unimi.dsi.fastutil.doubles.DoubleList; -import java.util.List; + import javax.annotation.Nullable; +import java.util.List; public abstract class VoxelShape { diff --git a/src/main/java/net/minecraft/server/VoxelShapeArray.java b/src/main/java/net/minecraft/server/VoxelShapeArray.java index 8d68c783f6d8c1dae62c0d3ed34e305785169579..ee8b29fabcd706dfd324732daf22035848109aac 100644 --- a/src/main/java/net/minecraft/server/VoxelShapeArray.java +++ b/src/main/java/net/minecraft/server/VoxelShapeArray.java @@ -2,8 +2,8 @@ package net.minecraft.server; import it.unimi.dsi.fastutil.doubles.DoubleArrayList; import it.unimi.dsi.fastutil.doubles.DoubleList; + import java.util.Arrays; -import java.util.List; public final class VoxelShapeArray extends VoxelShape { diff --git a/src/main/java/net/minecraft/server/VoxelShapeSpliterator.java b/src/main/java/net/minecraft/server/VoxelShapeSpliterator.java index e841611bb7c36dffec44bb9e74a0a9657a113263..30d9414d20617c3b6f58994f4268a81461b1d011 100644 --- a/src/main/java/net/minecraft/server/VoxelShapeSpliterator.java +++ b/src/main/java/net/minecraft/server/VoxelShapeSpliterator.java @@ -1,10 +1,10 @@ package net.minecraft.server; +import javax.annotation.Nullable; import java.util.Objects; import java.util.Spliterators.AbstractSpliterator; import java.util.function.BiPredicate; import java.util.function.Consumer; -import javax.annotation.Nullable; public class VoxelShapeSpliterator extends AbstractSpliterator { diff --git a/src/main/java/net/minecraft/server/VoxelShapes.java b/src/main/java/net/minecraft/server/VoxelShapes.java index 34a180361e817b5cbd37d206fbc7cfd5ad2a468b..fa35fe79d1d35a6862151aca0dba09237236227d 100644 --- a/src/main/java/net/minecraft/server/VoxelShapes.java +++ b/src/main/java/net/minecraft/server/VoxelShapes.java @@ -5,7 +5,7 @@ import com.google.common.math.DoubleMath; import com.google.common.math.IntMath; import it.unimi.dsi.fastutil.doubles.DoubleArrayList; import it.unimi.dsi.fastutil.doubles.DoubleList; -import java.util.Arrays; + import java.util.Iterator; import java.util.Objects; import java.util.stream.Stream; diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java index 2977dadc19fa6bcafaa6f44a883eec235db8653d..f4058e70aea8295942c16041e0eb332b59894cd2 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -1,33 +1,15 @@ package net.minecraft.server; -import co.aikar.timings.Timing; -import co.aikar.timings.Timings; -import me.jellysquid.mods.lithium.common.util.collections.HashedList; - -import com.destroystokyo.paper.antixray.ChunkPacketBlockController; // Paper - Anti-Xray -import com.destroystokyo.paper.antixray.ChunkPacketBlockControllerAntiXray; // Paper - Anti-Xray +import com.destroystokyo.paper.antixray.ChunkPacketBlockController; +import com.destroystokyo.paper.antixray.ChunkPacketBlockControllerAntiXray; import com.destroystokyo.paper.event.server.ServerExceptionEvent; import com.destroystokyo.paper.exception.ServerInternalException; -import com.google.common.base.MoreObjects; import com.google.common.collect.Lists; import com.mojang.serialization.Codec; import com.proximyst.rainforest.RainforestWorldConfig; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Iterator; -import java.util.List; -import java.util.Random; -import java.util.function.Consumer; -import java.util.function.Predicate; -import java.util.function.Supplier; -import javax.annotation.Nullable; +import me.jellysquid.mods.lithium.common.util.collections.HashedList; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; - -// CraftBukkit start -import java.util.HashMap; -import java.util.Map; import org.bukkit.Bukkit; import org.bukkit.craftbukkit.CraftServer; import org.bukkit.craftbukkit.CraftWorld; @@ -35,6 +17,13 @@ import org.bukkit.craftbukkit.block.CapturedBlockState; import org.bukkit.craftbukkit.block.CraftBlockState; import org.bukkit.craftbukkit.block.data.CraftBlockData; import org.bukkit.event.block.BlockPhysicsEvent; + +import javax.annotation.Nullable; +import java.io.IOException; +import java.util.*; +import java.util.function.Consumer; +import java.util.function.Predicate; +import java.util.function.Supplier; // CraftBukkit end public abstract class World implements GeneratorAccess, AutoCloseable { diff --git a/src/main/java/net/minecraft/server/WorldBorder.java b/src/main/java/net/minecraft/server/WorldBorder.java index 5cba3b0e613bb6c016c4441ebb931be9dba8db4e..b9c4e82524f842475811eae5bbe4547d12f2ceba 100644 --- a/src/main/java/net/minecraft/server/WorldBorder.java +++ b/src/main/java/net/minecraft/server/WorldBorder.java @@ -2,6 +2,7 @@ package net.minecraft.server; import com.google.common.collect.Lists; import com.mojang.serialization.DynamicLike; + import java.util.Iterator; import java.util.List; diff --git a/src/main/java/net/minecraft/server/WorldChunkManagerTheEnd.java b/src/main/java/net/minecraft/server/WorldChunkManagerTheEnd.java index 631a028dd262476f257c382f488320fee42584cd..0f00d4c9bdf09eece00547c8a66db2e90eff1e5a 100644 --- a/src/main/java/net/minecraft/server/WorldChunkManagerTheEnd.java +++ b/src/main/java/net/minecraft/server/WorldChunkManagerTheEnd.java @@ -2,6 +2,7 @@ package net.minecraft.server; import com.google.common.collect.ImmutableList; import com.mojang.serialization.Codec; + import java.util.List; public class WorldChunkManagerTheEnd extends WorldChunkManager { diff --git a/src/main/java/net/minecraft/server/WorldDataServer.java b/src/main/java/net/minecraft/server/WorldDataServer.java index 51cec9739c1409a2865d1aef7488acdb2079c88c..98e70eb333793e7d28d77c9ad3627453d469c6e8 100644 --- a/src/main/java/net/minecraft/server/WorldDataServer.java +++ b/src/main/java/net/minecraft/server/WorldDataServer.java @@ -6,17 +6,17 @@ import com.mojang.datafixers.DataFixer; import com.mojang.serialization.DataResult; import com.mojang.serialization.Dynamic; import com.mojang.serialization.Lifecycle; -import java.util.LinkedHashSet; -import java.util.Set; -import java.util.UUID; -import java.util.stream.Collectors; -import javax.annotation.Nullable; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -// CraftBukkit start import org.bukkit.Bukkit; import org.bukkit.event.weather.ThunderChangeEvent; import org.bukkit.event.weather.WeatherChangeEvent; + +import javax.annotation.Nullable; +import java.util.LinkedHashSet; +import java.util.Set; +import java.util.UUID; +import java.util.stream.Collectors; // CraftBukkit end public class WorldDataServer implements IWorldDataServer, SaveData { diff --git a/src/main/java/net/minecraft/server/WorldGenMegaTreeProvider.java b/src/main/java/net/minecraft/server/WorldGenMegaTreeProvider.java index 2830c53c23e516ec0a2aec72084fdd1007274833..4000ba57175bcf8ac940573f3685ca27303ef707 100644 --- a/src/main/java/net/minecraft/server/WorldGenMegaTreeProvider.java +++ b/src/main/java/net/minecraft/server/WorldGenMegaTreeProvider.java @@ -1,7 +1,7 @@ package net.minecraft.server; -import java.util.Random; import javax.annotation.Nullable; +import java.util.Random; public abstract class WorldGenMegaTreeProvider extends WorldGenTreeProvider { diff --git a/src/main/java/net/minecraft/server/WorldGenTreeProvider.java b/src/main/java/net/minecraft/server/WorldGenTreeProvider.java index ce1cd82e6c9e4a41622f3c10e812003f4f273a6f..6e340b2581529dc52b739d43e58c74c80f5c1b01 100644 --- a/src/main/java/net/minecraft/server/WorldGenTreeProvider.java +++ b/src/main/java/net/minecraft/server/WorldGenTreeProvider.java @@ -1,9 +1,10 @@ package net.minecraft.server; +import org.bukkit.TreeType; + +import javax.annotation.Nullable; import java.util.Iterator; import java.util.Random; -import javax.annotation.Nullable; -import org.bukkit.TreeType; // CraftBukkit public abstract class WorldGenTreeProvider { diff --git a/src/main/java/net/minecraft/server/WorldLoadListenerLogger.java b/src/main/java/net/minecraft/server/WorldLoadListenerLogger.java index ae77805f71c6c574d92f39c51b1e48f2138e9ab6..3891835ccbda8cd3569b1054ec5873c1fb8e6ab1 100644 --- a/src/main/java/net/minecraft/server/WorldLoadListenerLogger.java +++ b/src/main/java/net/minecraft/server/WorldLoadListenerLogger.java @@ -1,9 +1,10 @@ package net.minecraft.server; -import javax.annotation.Nullable; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import javax.annotation.Nullable; + public class WorldLoadListenerLogger implements WorldLoadListener { private static final Logger LOGGER = LogManager.getLogger(); diff --git a/src/main/java/net/minecraft/server/WorldMap.java b/src/main/java/net/minecraft/server/WorldMap.java index 3b1779f8220afc61d4d63926bcda0c27b44dd96e..e3bcf63922639db39e83c8b6b1ad65b948295644 100644 --- a/src/main/java/net/minecraft/server/WorldMap.java +++ b/src/main/java/net/minecraft/server/WorldMap.java @@ -4,22 +4,20 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.mojang.serialization.DataResult; import com.mojang.serialization.Dynamic; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import javax.annotation.Nullable; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; - -// CraftBukkit start -import java.util.UUID; - import org.bukkit.Bukkit; import org.bukkit.craftbukkit.CraftServer; import org.bukkit.craftbukkit.CraftWorld; import org.bukkit.craftbukkit.map.CraftMapView; import org.bukkit.craftbukkit.util.CraftChatMessage; import org.bukkit.entity.Player; + +import javax.annotation.Nullable; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.UUID; // CraftBukkit end public class WorldMap extends PersistentBase { diff --git a/src/main/java/net/minecraft/server/WorldNBTStorage.java b/src/main/java/net/minecraft/server/WorldNBTStorage.java index b14f3d44a76ccac791b7be353bb2899fc59f70ec..484058ca6e5aea094a36f6e4e0d2c3106ec2da73 100644 --- a/src/main/java/net/minecraft/server/WorldNBTStorage.java +++ b/src/main/java/net/minecraft/server/WorldNBTStorage.java @@ -1,21 +1,14 @@ package net.minecraft.server; import com.mojang.datafixers.DataFixer; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; -import java.io.InputStream; -import java.io.OutputStream; -import javax.annotation.Nullable; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.bukkit.craftbukkit.entity.CraftPlayer; -// CraftBukkit start -import java.util.UUID; +import javax.annotation.Nullable; +import java.io.*; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; - -import org.bukkit.craftbukkit.entity.CraftPlayer; // CraftBukkit end public class WorldNBTStorage { diff --git a/src/main/java/net/minecraft/server/WorldPersistentData.java b/src/main/java/net/minecraft/server/WorldPersistentData.java index a2a25cf6a43a1f59a80c997e2980f2bb8e6b3817..045605b71a74a1ea3a29e622bb790bdd690d33dc 100644 --- a/src/main/java/net/minecraft/server/WorldPersistentData.java +++ b/src/main/java/net/minecraft/server/WorldPersistentData.java @@ -2,18 +2,14 @@ package net.minecraft.server; import com.google.common.collect.Maps; import com.mojang.datafixers.DataFixer; -import java.io.DataInputStream; -import java.io.File; -import java.io.FileInputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.PushbackInputStream; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +import javax.annotation.Nullable; +import java.io.*; import java.util.Iterator; import java.util.Map; import java.util.function.Supplier; -import javax.annotation.Nullable; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; public class WorldPersistentData { diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java index 3782d329dc62a9e834f16a9009f4102b5b4aad6f..7b16515ad249fac5e9dcf12e1a59a4699005b247 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -1,39 +1,17 @@ package net.minecraft.server; +import co.aikar.timings.TimingHistory; +import com.destroystokyo.paper.PaperWorldConfig; import com.google.common.annotations.VisibleForTesting; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.Iterables; -import co.aikar.timings.TimingHistory; // Paper -import co.aikar.timings.Timings; // Paper - -import com.destroystokyo.paper.PaperWorldConfig; // Paper -import com.google.common.collect.Lists; -import com.google.common.collect.Maps; -import com.google.common.collect.Queues; -import com.google.common.collect.Sets; +import com.google.common.collect.*; import it.unimi.dsi.fastutil.ints.Int2ObjectLinkedOpenHashMap; import it.unimi.dsi.fastutil.ints.Int2ObjectMap; -import it.unimi.dsi.fastutil.ints.Int2ObjectMap.Entry; import it.unimi.dsi.fastutil.longs.LongSet; import it.unimi.dsi.fastutil.longs.LongSets; import it.unimi.dsi.fastutil.objects.ObjectIterator; import it.unimi.dsi.fastutil.objects.ObjectLinkedOpenHashSet; -import java.io.BufferedWriter; -import java.io.IOException; -import java.io.Writer; -import java.nio.file.Files; -import java.util.*; -import java.util.concurrent.Executor; -import java.util.function.BooleanSupplier; -import java.util.function.Predicate; -import java.util.stream.Collectors; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; - -// CraftBukkit start -import java.util.logging.Level; import org.bukkit.Bukkit; import org.bukkit.WeatherType; import org.bukkit.craftbukkit.event.CraftEventFactory; @@ -42,6 +20,18 @@ import org.bukkit.event.entity.CreatureSpawnEvent; import org.bukkit.event.server.MapInitializeEvent; import org.bukkit.event.weather.LightningStrikeEvent; import org.bukkit.event.world.TimeSkipEvent; + +import javax.annotation.Nonnull; +import javax.annotation.Nullable; +import java.io.BufferedWriter; +import java.io.IOException; +import java.io.Writer; +import java.nio.file.Files; +import java.util.*; +import java.util.concurrent.Executor; +import java.util.function.BooleanSupplier; +import java.util.function.Predicate; +import java.util.logging.Level; // CraftBukkit end public class WorldServer extends World implements GeneratorAccessSeed { diff --git a/src/main/java/net/minecraft/server/WorldUpgrader.java b/src/main/java/net/minecraft/server/WorldUpgrader.java index 888dae2d5ee8a71e83dd24e5f3c6bc8513016f9d..61adf30422dd7c7d0444696e0aaf25ea2baf3a1c 100644 --- a/src/main/java/net/minecraft/server/WorldUpgrader.java +++ b/src/main/java/net/minecraft/server/WorldUpgrader.java @@ -1,16 +1,15 @@ package net.minecraft.server; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableMap; +import com.google.common.collect.*; import com.google.common.collect.ImmutableMap.Builder; -import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Lists; -import com.google.common.collect.UnmodifiableIterator; import com.google.common.util.concurrent.ThreadFactoryBuilder; import com.mojang.datafixers.DataFixer; import it.unimi.dsi.fastutil.objects.Object2FloatMap; import it.unimi.dsi.fastutil.objects.Object2FloatMaps; import it.unimi.dsi.fastutil.objects.Object2FloatOpenCustomHashMap; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + import java.io.File; import java.io.IOException; import java.util.List; @@ -18,8 +17,6 @@ import java.util.ListIterator; import java.util.concurrent.ThreadFactory; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; public class WorldUpgrader { diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java index 7cde55ae407012b3445f11b07a0ebc9d00e031e3..23cbd9a980ce65c99cdfd1cbade3ffa5796a1e7f 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -1,7 +1,9 @@ package net.pl3x.purpur; import org.bukkit.configuration.ConfigurationSection; + import java.util.List; + import static net.pl3x.purpur.PurpurConfig.log; public class PurpurWorldConfig { diff --git a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java index 06e42b7db5385f9a357183552259e7b4491d9fd0..523314656144ce4a79a788130152ddfcdba7b252 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java @@ -2,27 +2,7 @@ package org.bukkit.craftbukkit; import com.google.common.base.Preconditions; import com.google.common.base.Predicates; -import java.lang.ref.WeakReference; -import java.util.Arrays; -import java.util.Collection; -import java.util.function.Predicate; -import net.minecraft.server.BiomeStorage; -import net.minecraft.server.BlockPosition; -import net.minecraft.server.Blocks; -import net.minecraft.server.ChunkCoordIntPair; -import net.minecraft.server.ChunkSection; -import net.minecraft.server.DataPaletteBlock; -import net.minecraft.server.EnumSkyBlock; -import net.minecraft.server.GameProfileSerializer; -import net.minecraft.server.HeightMap; -import net.minecraft.server.IBlockData; -import net.minecraft.server.LightEngine; -import net.minecraft.server.NBTTagCompound; -import net.minecraft.server.NibbleArray; -import net.minecraft.server.SectionPosition; -import net.minecraft.server.SeededRandom; -import net.minecraft.server.WorldChunkManager; -import net.minecraft.server.WorldServer; +import net.minecraft.server.*; import org.bukkit.Chunk; import org.bukkit.ChunkSnapshot; import org.bukkit.World; @@ -35,6 +15,11 @@ import org.bukkit.craftbukkit.util.CraftMagicNumbers; import org.bukkit.entity.Entity; import org.bukkit.plugin.Plugin; +import java.lang.ref.WeakReference; +import java.util.Arrays; +import java.util.Collection; +import java.util.function.Predicate; + public class CraftChunk implements Chunk { private WeakReference weakChunk; private final WorldServer worldServer; diff --git a/src/main/java/org/bukkit/craftbukkit/CraftChunkSnapshot.java b/src/main/java/org/bukkit/craftbukkit/CraftChunkSnapshot.java index 31c81b4b52f79892de5c1315358ec161c5a0c204..9f3ff7b613ea0b69519999346eb63390b5e00a05 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftChunkSnapshot.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftChunkSnapshot.java @@ -2,12 +2,7 @@ package org.bukkit.craftbukkit; import com.google.common.base.Preconditions; import com.google.common.base.Predicates; -import java.util.function.Predicate; -import net.minecraft.server.BiomeStorage; -import net.minecraft.server.BlockPosition; -import net.minecraft.server.DataPaletteBlock; -import net.minecraft.server.HeightMap; -import net.minecraft.server.IBlockData; +import net.minecraft.server.*; import org.bukkit.ChunkSnapshot; import org.bukkit.Material; import org.bukkit.block.Biome; @@ -16,6 +11,8 @@ import org.bukkit.craftbukkit.block.CraftBlock; import org.bukkit.craftbukkit.block.data.CraftBlockData; import org.bukkit.craftbukkit.util.CraftMagicNumbers; +import java.util.function.Predicate; + /** * Represents a static, thread-safe snapshot of chunk of blocks * Purpose is to allow clean, efficient copy of a chunk data to be made, and then handed off for processing in another thread (e.g. map rendering) diff --git a/src/main/java/org/bukkit/craftbukkit/CraftCrashReport.java b/src/main/java/org/bukkit/craftbukkit/CraftCrashReport.java index 7511e38130f38703164395a670f12d1af648ff04..54b9b61f814a4987406661a1eacd7a1ffbd26924 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftCrashReport.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftCrashReport.java @@ -1,10 +1,5 @@ package org.bukkit.craftbukkit; -import java.io.PrintWriter; -import java.io.StringWriter; -import java.util.Arrays; -import java.util.Collection; -import java.util.Map; import net.minecraft.server.CrashReportCallable; import net.minecraft.server.MinecraftServer; import org.bukkit.Bukkit; @@ -14,6 +9,12 @@ import org.bukkit.craftbukkit.util.CraftMagicNumbers; import org.bukkit.plugin.Plugin; import org.bukkit.plugin.PluginDescriptionFile; +import java.io.PrintWriter; +import java.io.StringWriter; +import java.util.Arrays; +import java.util.Collection; +import java.util.Map; + public class CraftCrashReport implements CrashReportCallable { @Override diff --git a/src/main/java/org/bukkit/craftbukkit/CraftIpBanEntry.java b/src/main/java/org/bukkit/craftbukkit/CraftIpBanEntry.java index 372404cd185d2e85617db673edcd8eeab4401f2b..040a779017cf33192d17913b26651d246e95d4d0 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftIpBanEntry.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftIpBanEntry.java @@ -1,12 +1,13 @@ package org.bukkit.craftbukkit; -import java.io.IOException; -import java.util.Date; -import java.util.logging.Level; import net.minecraft.server.IpBanEntry; import net.minecraft.server.IpBanList; import org.bukkit.Bukkit; +import java.io.IOException; +import java.util.Date; +import java.util.logging.Level; + public final class CraftIpBanEntry implements org.bukkit.BanEntry { private final IpBanList list; private final String target; diff --git a/src/main/java/org/bukkit/craftbukkit/CraftIpBanList.java b/src/main/java/org/bukkit/craftbukkit/CraftIpBanList.java index 101a32555a632f8c023594319a76861b794d1a46..af277342d96367cb7c6e9f80a0120181d7297024 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftIpBanList.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftIpBanList.java @@ -1,17 +1,18 @@ package org.bukkit.craftbukkit; import com.google.common.collect.ImmutableSet; -import java.io.IOException; -import java.net.InetSocketAddress; -import java.util.Date; -import java.util.Set; -import java.util.logging.Level; import net.minecraft.server.IpBanEntry; import net.minecraft.server.IpBanList; import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.Validate; import org.bukkit.Bukkit; +import java.io.IOException; +import java.net.InetSocketAddress; +import java.util.Date; +import java.util.Set; +import java.util.logging.Level; + public class CraftIpBanList implements org.bukkit.BanList { private final IpBanList list; diff --git a/src/main/java/org/bukkit/craftbukkit/CraftLootTable.java b/src/main/java/org/bukkit/craftbukkit/CraftLootTable.java index 584ca998e077a0a8aef5be05f5b4f15879aab397..3ff9fa7173d64950769db96c41f9b7d651d6e3b0 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftLootTable.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftLootTable.java @@ -1,20 +1,6 @@ package org.bukkit.craftbukkit; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; -import java.util.Random; -import net.minecraft.server.BlockPosition; -import net.minecraft.server.DamageSource; -import net.minecraft.server.Entity; -import net.minecraft.server.EntityHuman; -import net.minecraft.server.IInventory; -import net.minecraft.server.LootContextParameter; -import net.minecraft.server.LootContextParameterSet; -import net.minecraft.server.LootContextParameters; -import net.minecraft.server.LootTable; -import net.minecraft.server.LootTableInfo; -import net.minecraft.server.WorldServer; +import net.minecraft.server.*; import org.bukkit.Location; import org.bukkit.NamespacedKey; import org.bukkit.craftbukkit.entity.CraftEntity; @@ -25,6 +11,11 @@ import org.bukkit.inventory.Inventory; import org.bukkit.inventory.ItemStack; import org.bukkit.loot.LootContext; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import java.util.Random; + public class CraftLootTable implements org.bukkit.loot.LootTable { private final LootTable handle; diff --git a/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java b/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java index 5770d4183c1b9ab6119a25930283c0235250ed6e..1b2f7dc78d8f969169718d289662361c50a38327 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java @@ -1,22 +1,11 @@ package org.bukkit.craftbukkit; import com.mojang.authlib.GameProfile; -import java.io.File; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import java.util.UUID; import net.minecraft.server.NBTTagCompound; import net.minecraft.server.ServerStatisticManager; import net.minecraft.server.WhiteListEntry; import net.minecraft.server.WorldNBTStorage; -import org.bukkit.BanList; -import org.bukkit.Bukkit; -import org.bukkit.Location; -import org.bukkit.Material; -import org.bukkit.OfflinePlayer; -import org.bukkit.Server; -import org.bukkit.Statistic; +import org.bukkit.*; import org.bukkit.configuration.serialization.ConfigurationSerializable; import org.bukkit.configuration.serialization.SerializableAs; import org.bukkit.entity.EntityType; @@ -24,6 +13,12 @@ import org.bukkit.entity.Player; import org.bukkit.metadata.MetadataValue; import org.bukkit.plugin.Plugin; +import java.io.File; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.UUID; + @SerializableAs("Player") public class CraftOfflinePlayer implements OfflinePlayer, ConfigurationSerializable { private final GameProfile profile; diff --git a/src/main/java/org/bukkit/craftbukkit/CraftParticle.java b/src/main/java/org/bukkit/craftbukkit/CraftParticle.java index 54800bbed574655db8bae174c85cb3f5e9602434..caf28d3450324af516e6805e9b8668af7ab4a6d3 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftParticle.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftParticle.java @@ -3,15 +3,7 @@ package org.bukkit.craftbukkit; import com.google.common.base.Preconditions; import com.google.common.collect.BiMap; import com.google.common.collect.HashBiMap; -import java.util.HashMap; -import java.util.Map; -import net.minecraft.server.IRegistry; -import net.minecraft.server.MinecraftKey; -import net.minecraft.server.ParticleParam; -import net.minecraft.server.ParticleParamBlock; -import net.minecraft.server.ParticleParamItem; -import net.minecraft.server.ParticleParamRedstone; -import net.minecraft.server.ParticleType; +import net.minecraft.server.*; import org.bukkit.Color; import org.bukkit.Particle; import org.bukkit.block.data.BlockData; @@ -21,6 +13,9 @@ import org.bukkit.craftbukkit.util.CraftMagicNumbers; import org.bukkit.inventory.ItemStack; import org.bukkit.material.MaterialData; +import java.util.HashMap; +import java.util.Map; + public enum CraftParticle { EXPLOSION_NORMAL("poof"), diff --git a/src/main/java/org/bukkit/craftbukkit/CraftProfileBanEntry.java b/src/main/java/org/bukkit/craftbukkit/CraftProfileBanEntry.java index bbe91bca15ee1506ff9ea33169286fa2ed2dd267..62964b62ea3f9e1dbee670c991f475b5299d3520 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftProfileBanEntry.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftProfileBanEntry.java @@ -1,13 +1,14 @@ package org.bukkit.craftbukkit; import com.mojang.authlib.GameProfile; -import java.io.IOException; -import java.util.Date; -import java.util.logging.Level; import net.minecraft.server.GameProfileBanEntry; import net.minecraft.server.GameProfileBanList; import org.bukkit.Bukkit; +import java.io.IOException; +import java.util.Date; +import java.util.logging.Level; + public final class CraftProfileBanEntry implements org.bukkit.BanEntry { private final GameProfileBanList list; private final GameProfile profile; diff --git a/src/main/java/org/bukkit/craftbukkit/CraftProfileBanList.java b/src/main/java/org/bukkit/craftbukkit/CraftProfileBanList.java index 492a5bad8549d781e3aee47f22421da186d45760..6239d96d78c35d1231d68b5f60fdb7dbb9214585 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftProfileBanList.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftProfileBanList.java @@ -2,11 +2,6 @@ package org.bukkit.craftbukkit; import com.google.common.collect.ImmutableSet; import com.mojang.authlib.GameProfile; -import java.io.IOException; -import java.util.Date; -import java.util.Set; -import java.util.UUID; -import java.util.logging.Level; import net.minecraft.server.GameProfileBanEntry; import net.minecraft.server.GameProfileBanList; import net.minecraft.server.JsonListEntry; @@ -15,6 +10,12 @@ import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.Validate; import org.bukkit.Bukkit; +import java.io.IOException; +import java.util.Date; +import java.util.Set; +import java.util.UUID; +import java.util.logging.Level; + public class CraftProfileBanList implements org.bukkit.BanList { private final GameProfileBanList list; diff --git a/src/main/java/org/bukkit/craftbukkit/CraftRaid.java b/src/main/java/org/bukkit/craftbukkit/CraftRaid.java index 360a4901f5159a3f0606214f1abf2f8cee2ecbe1..96b4380d6bbda6b52259440b33d56b3d3bede4ef 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftRaid.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftRaid.java @@ -2,11 +2,6 @@ package org.bukkit.craftbukkit; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; -import java.util.Collections; -import java.util.List; -import java.util.Set; -import java.util.UUID; -import java.util.function.Function; import net.minecraft.server.BlockPosition; import net.minecraft.server.EntityRaider; import net.minecraft.server.World; @@ -14,6 +9,12 @@ import org.bukkit.Location; import org.bukkit.Raid; import org.bukkit.entity.Raider; +import java.util.Collections; +import java.util.List; +import java.util.Set; +import java.util.UUID; +import java.util.function.Function; + public final class CraftRaid implements Raid { private final net.minecraft.server.Raid handle; diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java index 24b0fe67f2ea0a109fa32feb6ced0290cac7e8b7..f35258fdc19a0fdb5940e3bd2339427cb1ca8a45 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -3,11 +3,7 @@ package org.bukkit.craftbukkit; import com.google.common.base.Charsets; import com.google.common.base.Function; import com.google.common.base.Preconditions; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Iterators; -import com.google.common.collect.Lists; -import com.google.common.collect.MapMaker; +import com.google.common.collect.*; import com.mojang.authlib.GameProfile; import com.mojang.brigadier.StringReader; import com.mojang.brigadier.exceptions.CommandSyntaxException; @@ -19,106 +15,18 @@ import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBufOutputStream; import io.netty.buffer.Unpooled; import it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenHashMap; -import java.awt.image.BufferedImage; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.io.IOException; -import java.io.InputStreamReader; -import java.nio.ByteBuffer; -import java.nio.charset.StandardCharsets; -import java.util.*; -import java.util.function.Consumer; -import java.util.logging.Level; -import java.util.logging.Logger; -import javax.imageio.ImageIO; -//import jline.console.ConsoleReader; // Paper -import net.minecraft.server.Advancement; -import net.minecraft.server.ArgumentEntity; -import net.minecraft.server.BiomeManager; -import net.minecraft.server.Block; -import net.minecraft.server.BlockPosition; -import net.minecraft.server.BossBattleCustom; -import net.minecraft.server.CommandDispatcher; -import net.minecraft.server.CommandListenerWrapper; -import net.minecraft.server.CommandReload; -import net.minecraft.server.Convertable; -import net.minecraft.server.DataConverterRegistry; -import net.minecraft.server.DedicatedPlayerList; -import net.minecraft.server.DedicatedServer; -import net.minecraft.server.DedicatedServerProperties; -import net.minecraft.server.DedicatedServerSettings; -import net.minecraft.server.DimensionManager; -import net.minecraft.server.DynamicOpsNBT; -import net.minecraft.server.Enchantments; -import net.minecraft.server.EntityPlayer; -import net.minecraft.server.EnumDifficulty; -import net.minecraft.server.EnumGamemode; -import net.minecraft.server.GameRules; -import net.minecraft.server.GeneratorSettings; -import net.minecraft.server.IRecipe; -import net.minecraft.server.IRegistry; -import net.minecraft.server.IRegistryCustom; -import net.minecraft.server.Item; -import net.minecraft.server.ItemWorldMap; -import net.minecraft.server.Items; -import net.minecraft.server.JsonListEntry; -import net.minecraft.server.LootTableRegistry; -import net.minecraft.server.MapIcon; -import net.minecraft.server.MinecraftKey; -import net.minecraft.server.MinecraftServer; -import net.minecraft.server.MobEffects; -import net.minecraft.server.MobSpawner; -import net.minecraft.server.MobSpawnerCat; -import net.minecraft.server.MobSpawnerPatrol; -import net.minecraft.server.MobSpawnerPhantom; -import net.minecraft.server.MobSpawnerTrader; -import net.minecraft.server.NBTBase; -import net.minecraft.server.PlayerList; -import net.minecraft.server.RegistryMaterials; -import net.minecraft.server.RegistryReadOps; -import net.minecraft.server.ResourceKey; -import net.minecraft.server.SaveData; -import net.minecraft.server.ServerCommand; -import net.minecraft.server.TagsServer; -import net.minecraft.server.TicketType; -import net.minecraft.server.Vec3D; -import net.minecraft.server.VillageSiege; -import net.minecraft.server.WorldDataServer; -import net.minecraft.server.WorldDimension; -import net.minecraft.server.WorldMap; -import net.minecraft.server.WorldNBTStorage; -import net.minecraft.server.WorldServer; -import net.minecraft.server.WorldSettings; +import net.md_5.bungee.api.chat.BaseComponent; +import net.minecraft.server.*; import org.apache.commons.lang.Validate; import org.apache.commons.lang3.StringUtils; -import org.bukkit.BanList; -import org.bukkit.Bukkit; -import org.bukkit.ChatColor; -import org.bukkit.GameMode; -import org.bukkit.Keyed; -import org.bukkit.Location; -import org.bukkit.NamespacedKey; -import org.bukkit.OfflinePlayer; -import org.bukkit.Server; -import org.bukkit.StructureType; -import org.bukkit.UnsafeValues; -import org.bukkit.Warning.WarningState; +import org.bukkit.*; import org.bukkit.World; +import org.bukkit.Warning.WarningState; import org.bukkit.World.Environment; -import org.bukkit.WorldCreator; import org.bukkit.block.data.BlockData; -import org.bukkit.boss.BarColor; -import org.bukkit.boss.BarFlag; -import org.bukkit.boss.BarStyle; -import org.bukkit.boss.BossBar; -import org.bukkit.boss.KeyedBossBar; -import org.bukkit.command.Command; +import org.bukkit.boss.*; import org.bukkit.command.CommandException; -import org.bukkit.command.CommandSender; -import org.bukkit.command.ConsoleCommandSender; -import org.bukkit.command.PluginCommand; -import org.bukkit.command.SimpleCommandMap; +import org.bukkit.command.*; import org.bukkit.configuration.ConfigurationSection; import org.bukkit.configuration.file.YamlConfiguration; import org.bukkit.configuration.serialization.ConfigurationSerialization; @@ -132,19 +40,7 @@ import org.bukkit.craftbukkit.command.VanillaCommandWrapper; import org.bukkit.craftbukkit.entity.CraftPlayer; import org.bukkit.craftbukkit.generator.CraftChunkData; import org.bukkit.craftbukkit.help.SimpleHelpMap; -import org.bukkit.craftbukkit.inventory.CraftBlastingRecipe; -import org.bukkit.craftbukkit.inventory.CraftCampfireRecipe; -import org.bukkit.craftbukkit.inventory.CraftFurnaceRecipe; -import org.bukkit.craftbukkit.inventory.CraftItemFactory; -import org.bukkit.craftbukkit.inventory.CraftItemStack; -import org.bukkit.craftbukkit.inventory.CraftMerchantCustom; -import org.bukkit.craftbukkit.inventory.CraftRecipe; -import org.bukkit.craftbukkit.inventory.CraftShapedRecipe; -import org.bukkit.craftbukkit.inventory.CraftShapelessRecipe; -import org.bukkit.craftbukkit.inventory.CraftSmithingRecipe; -import org.bukkit.craftbukkit.inventory.CraftSmokingRecipe; -import org.bukkit.craftbukkit.inventory.CraftStonecuttingRecipe; -import org.bukkit.craftbukkit.inventory.RecipeIterator; +import org.bukkit.craftbukkit.inventory.*; import org.bukkit.craftbukkit.inventory.util.CraftInventoryCreator; import org.bukkit.craftbukkit.map.CraftMapView; import org.bukkit.craftbukkit.metadata.EntityMetadataStore; @@ -155,16 +51,11 @@ import org.bukkit.craftbukkit.scheduler.CraftScheduler; import org.bukkit.craftbukkit.scoreboard.CraftScoreboardManager; import org.bukkit.craftbukkit.tag.CraftBlockTag; import org.bukkit.craftbukkit.tag.CraftItemTag; -import org.bukkit.craftbukkit.util.CraftChatMessage; -import org.bukkit.craftbukkit.util.CraftIconCache; -import org.bukkit.craftbukkit.util.CraftMagicNumbers; -import org.bukkit.craftbukkit.util.CraftNamespacedKey; -import org.bukkit.craftbukkit.util.DatFileFilter; -import org.bukkit.craftbukkit.util.Versioning; +import org.bukkit.craftbukkit.util.*; import org.bukkit.craftbukkit.util.permissions.CraftDefaultPermissions; import org.bukkit.entity.Entity; import org.bukkit.entity.Player; -import org.bukkit.event.command.UnknownCommandEvent; // Paper +import org.bukkit.event.command.UnknownCommandEvent; import org.bukkit.event.inventory.InventoryType; import org.bukkit.event.player.PlayerChatTabCompleteEvent; import org.bukkit.event.server.BroadcastMessageEvent; @@ -175,30 +66,14 @@ import org.bukkit.event.world.WorldLoadEvent; import org.bukkit.event.world.WorldUnloadEvent; import org.bukkit.generator.ChunkGenerator; import org.bukkit.help.HelpMap; -import org.bukkit.inventory.BlastingRecipe; -import org.bukkit.inventory.CampfireRecipe; -import org.bukkit.inventory.ComplexRecipe; import org.bukkit.inventory.FurnaceRecipe; -import org.bukkit.inventory.Inventory; -import org.bukkit.inventory.InventoryHolder; import org.bukkit.inventory.ItemStack; -import org.bukkit.inventory.Merchant; -import org.bukkit.inventory.Recipe; -import org.bukkit.inventory.ShapedRecipe; -import org.bukkit.inventory.ShapelessRecipe; -import org.bukkit.inventory.SmithingRecipe; -import org.bukkit.inventory.SmokingRecipe; -import org.bukkit.inventory.StonecuttingRecipe; +import org.bukkit.inventory.*; import org.bukkit.loot.LootTable; import org.bukkit.map.MapView; import org.bukkit.permissions.Permissible; import org.bukkit.permissions.Permission; -import org.bukkit.plugin.Plugin; -import org.bukkit.plugin.PluginLoadOrder; -import org.bukkit.plugin.PluginManager; -import org.bukkit.plugin.ServicesManager; -import org.bukkit.plugin.SimplePluginManager; -import org.bukkit.plugin.SimpleServicesManager; +import org.bukkit.plugin.*; import org.bukkit.plugin.java.JavaPluginLoader; import org.bukkit.plugin.messaging.Messenger; import org.bukkit.plugin.messaging.StandardMessenger; @@ -211,10 +86,17 @@ import org.yaml.snakeyaml.Yaml; import org.yaml.snakeyaml.constructor.SafeConstructor; import org.yaml.snakeyaml.error.MarkedYAMLException; -import net.md_5.bungee.api.chat.BaseComponent; // Spigot - -import javax.annotation.Nullable; // Paper -import javax.annotation.Nonnull; // Paper +import javax.annotation.Nonnull; +import javax.annotation.Nullable; +import javax.imageio.ImageIO; +import java.awt.image.BufferedImage; +import java.io.*; +import java.nio.ByteBuffer; +import java.nio.charset.StandardCharsets; +import java.util.*; +import java.util.function.Consumer; +import java.util.logging.Level; +import java.util.logging.Logger; public final class CraftServer implements Server { private final String serverName = "Yatopia"; // Paper // Tuinity // Yatopia diff --git a/src/main/java/org/bukkit/craftbukkit/CraftStatistic.java b/src/main/java/org/bukkit/craftbukkit/CraftStatistic.java index 2758eee2be30ce7df40a98d396b0a810b00d703a..2a0d035b7c16ac96213319a963dc9da253fa219f 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftStatistic.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftStatistic.java @@ -3,13 +3,7 @@ package org.bukkit.craftbukkit; import com.google.common.base.Preconditions; import com.google.common.collect.BiMap; import com.google.common.collect.ImmutableBiMap; -import net.minecraft.server.Block; -import net.minecraft.server.EntityTypes; -import net.minecraft.server.IRegistry; -import net.minecraft.server.Item; -import net.minecraft.server.MinecraftKey; -import net.minecraft.server.ServerStatisticManager; -import net.minecraft.server.StatisticList; +import net.minecraft.server.*; import org.apache.commons.lang.Validate; import org.bukkit.Material; import org.bukkit.Statistic; diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java index 077f4793cd121701ea3912a1f601508827fa98dc..ad8627fd5e04d93ba78f0e0dbeba956f1d5d9fee 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -5,112 +5,15 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import it.unimi.dsi.fastutil.longs.Long2ObjectLinkedOpenHashMap; import it.unimi.dsi.fastutil.longs.Long2ObjectMap; -import java.io.File; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.Random; -import java.util.Set; -import java.util.UUID; -import java.util.concurrent.CompletableFuture; -import java.util.function.Predicate; -import java.util.stream.Collectors; -import net.minecraft.server.ArraySetSorted; -import net.minecraft.server.AxisAlignedBB; -import net.minecraft.server.BiomeBase; -import net.minecraft.server.BiomeDecoratorGroups; -import net.minecraft.server.BlockChorusFlower; -import net.minecraft.server.BlockDiodeAbstract; -import net.minecraft.server.BlockPosition; -import net.minecraft.server.Blocks; -import net.minecraft.server.ChunkCoordIntPair; -import net.minecraft.server.ChunkMapDistance; -import net.minecraft.server.ChunkStatus; -import net.minecraft.server.EntityAreaEffectCloud; -import net.minecraft.server.EntityArmorStand; -import net.minecraft.server.EntityArrow; -import net.minecraft.server.EntityBoat; -import net.minecraft.server.EntityEgg; -import net.minecraft.server.EntityEnderSignal; -import net.minecraft.server.EntityEvokerFangs; -import net.minecraft.server.EntityExperienceOrb; -import net.minecraft.server.EntityFallingBlock; -import net.minecraft.server.EntityFireball; -import net.minecraft.server.EntityFireworks; -import net.minecraft.server.EntityHanging; -import net.minecraft.server.EntityHuman; -import net.minecraft.server.EntityInsentient; -import net.minecraft.server.EntityItem; -import net.minecraft.server.EntityItemFrame; -import net.minecraft.server.EntityLeash; -import net.minecraft.server.EntityLightning; -import net.minecraft.server.EntityMinecartChest; -import net.minecraft.server.EntityMinecartCommandBlock; -import net.minecraft.server.EntityMinecartFurnace; -import net.minecraft.server.EntityMinecartHopper; -import net.minecraft.server.EntityMinecartMobSpawner; -import net.minecraft.server.EntityMinecartRideable; -import net.minecraft.server.EntityMinecartTNT; -import net.minecraft.server.EntityPainting; -import net.minecraft.server.EntityPotion; -import net.minecraft.server.EntitySnowball; -import net.minecraft.server.EntityTNTPrimed; -import net.minecraft.server.EntityTippedArrow; -import net.minecraft.server.EntityTypes; -import net.minecraft.server.EntityZombie; -import net.minecraft.server.EnumDifficulty; -import net.minecraft.server.EnumDirection; -import net.minecraft.server.EnumMobSpawn; -import net.minecraft.server.Explosion; -import net.minecraft.server.GameRules; -import net.minecraft.server.GroupDataEntity; -import net.minecraft.server.IBlockData; -import net.minecraft.server.IChunkAccess; -import net.minecraft.server.MCUtil; -import net.minecraft.server.MinecraftKey; -import net.minecraft.server.MinecraftServer; -import net.minecraft.server.MovingObjectPosition; -import net.minecraft.server.PacketPlayOutCustomSoundEffect; -import net.minecraft.server.PacketPlayOutUpdateTime; -import net.minecraft.server.PacketPlayOutWorldEvent; -import net.minecraft.server.PersistentRaid; -import net.minecraft.server.PlayerChunk; -import net.minecraft.server.ProtoChunkExtension; -import net.minecraft.server.RayTrace; -import net.minecraft.server.SavedFile; import net.minecraft.server.SoundCategory; -import net.minecraft.server.StructureGenerator; -import net.minecraft.server.Ticket; -import net.minecraft.server.TicketType; -import net.minecraft.server.Unit; -import net.minecraft.server.Vec3D; -import net.minecraft.server.WorldGenFeatureHugeFungiConfiguration; -import net.minecraft.server.WorldGenerator; -import net.minecraft.server.WorldServer; +import net.minecraft.server.*; import org.apache.commons.lang.Validate; -import org.bukkit.BlockChangeDelegate; -import org.bukkit.Bukkit; import org.bukkit.Chunk; -import org.bukkit.ChunkSnapshot; -import org.bukkit.Difficulty; -import org.bukkit.Effect; -import org.bukkit.FluidCollisionMode; -import org.bukkit.GameRule; -import org.bukkit.Location; import org.bukkit.Particle; import org.bukkit.Raid; -import org.bukkit.Sound; -import org.bukkit.StructureType; -import org.bukkit.TreeType; import org.bukkit.World; import org.bukkit.WorldBorder; +import org.bukkit.*; import org.bukkit.block.Biome; import org.bukkit.block.Block; import org.bukkit.block.BlockFace; @@ -128,129 +31,9 @@ import org.bukkit.craftbukkit.metadata.BlockMetadataStore; import org.bukkit.craftbukkit.potion.CraftPotionUtil; import org.bukkit.craftbukkit.util.CraftMagicNumbers; import org.bukkit.craftbukkit.util.CraftRayTraceResult; -import org.bukkit.entity.AbstractArrow; -import org.bukkit.entity.AbstractHorse; -import org.bukkit.entity.AbstractVillager; -import org.bukkit.entity.Ambient; -import org.bukkit.entity.AreaEffectCloud; -import org.bukkit.entity.ArmorStand; -import org.bukkit.entity.Arrow; -import org.bukkit.entity.Bat; -import org.bukkit.entity.Bee; -import org.bukkit.entity.Blaze; -import org.bukkit.entity.Boat; -import org.bukkit.entity.Cat; -import org.bukkit.entity.CaveSpider; -import org.bukkit.entity.ChestedHorse; -import org.bukkit.entity.Chicken; -import org.bukkit.entity.Cod; -import org.bukkit.entity.ComplexLivingEntity; -import org.bukkit.entity.Cow; -import org.bukkit.entity.Creeper; -import org.bukkit.entity.Dolphin; -import org.bukkit.entity.Donkey; -import org.bukkit.entity.DragonFireball; -import org.bukkit.entity.Drowned; -import org.bukkit.entity.Egg; -import org.bukkit.entity.ElderGuardian; -import org.bukkit.entity.EnderCrystal; -import org.bukkit.entity.EnderDragon; -import org.bukkit.entity.EnderPearl; -import org.bukkit.entity.EnderSignal; -import org.bukkit.entity.Enderman; -import org.bukkit.entity.Endermite; import org.bukkit.entity.Entity; -import org.bukkit.entity.EntityType; -import org.bukkit.entity.Evoker; -import org.bukkit.entity.EvokerFangs; -import org.bukkit.entity.ExperienceOrb; -import org.bukkit.entity.FallingBlock; -import org.bukkit.entity.Fireball; -import org.bukkit.entity.Firework; -import org.bukkit.entity.Fish; -import org.bukkit.entity.Fox; -import org.bukkit.entity.Ghast; -import org.bukkit.entity.Giant; -import org.bukkit.entity.Golem; -import org.bukkit.entity.Guardian; -import org.bukkit.entity.Hanging; -import org.bukkit.entity.Hoglin; -import org.bukkit.entity.HumanEntity; -import org.bukkit.entity.Husk; -import org.bukkit.entity.Illager; -import org.bukkit.entity.Illusioner; -import org.bukkit.entity.IronGolem; -import org.bukkit.entity.ItemFrame; -import org.bukkit.entity.LeashHitch; -import org.bukkit.entity.LightningStrike; -import org.bukkit.entity.LingeringPotion; -import org.bukkit.entity.LivingEntity; -import org.bukkit.entity.Llama; -import org.bukkit.entity.LlamaSpit; -import org.bukkit.entity.MagmaCube; -import org.bukkit.entity.Minecart; -import org.bukkit.entity.Mule; -import org.bukkit.entity.MushroomCow; -import org.bukkit.entity.Ocelot; -import org.bukkit.entity.Painting; -import org.bukkit.entity.Panda; -import org.bukkit.entity.Parrot; -import org.bukkit.entity.Phantom; -import org.bukkit.entity.Pig; -import org.bukkit.entity.PigZombie; -import org.bukkit.entity.Piglin; -import org.bukkit.entity.Pillager; -import org.bukkit.entity.Player; -import org.bukkit.entity.PolarBear; -import org.bukkit.entity.Projectile; -import org.bukkit.entity.PufferFish; -import org.bukkit.entity.Rabbit; -import org.bukkit.entity.Ravager; -import org.bukkit.entity.Salmon; -import org.bukkit.entity.Sheep; -import org.bukkit.entity.Shulker; -import org.bukkit.entity.ShulkerBullet; -import org.bukkit.entity.Silverfish; -import org.bukkit.entity.Skeleton; -import org.bukkit.entity.SkeletonHorse; -import org.bukkit.entity.Slime; -import org.bukkit.entity.SmallFireball; -import org.bukkit.entity.Snowball; -import org.bukkit.entity.Snowman; -import org.bukkit.entity.SpectralArrow; -import org.bukkit.entity.Spellcaster; -import org.bukkit.entity.Spider; -import org.bukkit.entity.Squid; -import org.bukkit.entity.Stray; -import org.bukkit.entity.Strider; -import org.bukkit.entity.TNTPrimed; -import org.bukkit.entity.Tameable; -import org.bukkit.entity.ThrownExpBottle; -import org.bukkit.entity.ThrownPotion; -import org.bukkit.entity.TippedArrow; -import org.bukkit.entity.TraderLlama; -import org.bukkit.entity.Trident; -import org.bukkit.entity.TropicalFish; -import org.bukkit.entity.Turtle; -import org.bukkit.entity.Vex; -import org.bukkit.entity.Villager; -import org.bukkit.entity.Vindicator; -import org.bukkit.entity.WanderingTrader; -import org.bukkit.entity.Witch; -import org.bukkit.entity.Wither; -import org.bukkit.entity.WitherSkeleton; -import org.bukkit.entity.WitherSkull; -import org.bukkit.entity.Wolf; -import org.bukkit.entity.Zoglin; -import org.bukkit.entity.Zombie; -import org.bukkit.entity.ZombieHorse; -import org.bukkit.entity.ZombieVillager; -import org.bukkit.entity.minecart.CommandMinecart; -import org.bukkit.entity.minecart.ExplosiveMinecart; -import org.bukkit.entity.minecart.HopperMinecart; -import org.bukkit.entity.minecart.PoweredMinecart; -import org.bukkit.entity.minecart.SpawnerMinecart; -import org.bukkit.entity.minecart.StorageMinecart; +import org.bukkit.entity.*; +import org.bukkit.entity.minecart.*; import org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason; import org.bukkit.event.world.SpawnChangeEvent; import org.bukkit.event.world.TimeSkipEvent; @@ -268,6 +51,12 @@ import org.bukkit.util.Consumer; import org.bukkit.util.RayTraceResult; import org.bukkit.util.Vector; +import java.io.File; +import java.io.IOException; +import java.util.*; +import java.util.concurrent.CompletableFuture; +import java.util.function.Predicate; + public class CraftWorld implements World { public static final int CUSTOM_DIMENSION_OFFSET = 10; diff --git a/src/main/java/org/bukkit/craftbukkit/LoggerOutputStream.java b/src/main/java/org/bukkit/craftbukkit/LoggerOutputStream.java index 93526ab602afe9640c73cd70c619065d86dc1abe..acaaee6cace19b751775e98cafe451345bd7489f 100644 --- a/src/main/java/org/bukkit/craftbukkit/LoggerOutputStream.java +++ b/src/main/java/org/bukkit/craftbukkit/LoggerOutputStream.java @@ -1,10 +1,11 @@ package org.bukkit.craftbukkit; -import java.io.ByteArrayOutputStream; -import java.io.IOException; import org.apache.logging.log4j.Level; import org.apache.logging.log4j.Logger; +import java.io.ByteArrayOutputStream; +import java.io.IOException; + public class LoggerOutputStream extends ByteArrayOutputStream { private final String separator = System.getProperty("line.separator"); private final Logger logger; diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java index 6820905bf16eb4e8a97615a7ef49b6d3337ab247..2c7d17ca65ca8444101de83008d546e65a4ae9e6 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -1,5 +1,9 @@ package org.bukkit.craftbukkit; +import joptsimple.OptionParser; +import joptsimple.OptionSet; +import net.minecrell.terminalconsole.TerminalConsoleAppender; + import java.io.File; import java.io.IOException; import java.text.SimpleDateFormat; @@ -7,12 +11,8 @@ import java.util.Arrays; import java.util.Calendar; import java.util.Date; import java.util.List; -import java.util.concurrent.TimeUnit; import java.util.logging.Level; import java.util.logging.Logger; -import joptsimple.OptionParser; -import joptsimple.OptionSet; -import net.minecrell.terminalconsole.TerminalConsoleAppender; // Paper public class Main { public static boolean useJline = true; diff --git a/src/main/java/org/bukkit/craftbukkit/advancement/CraftAdvancement.java b/src/main/java/org/bukkit/craftbukkit/advancement/CraftAdvancement.java index a5aadf2850f273e258f84b6c7bc9ca3649fb884d..11630549332ca910fa6ec82f8b0e58001b619140 100644 --- a/src/main/java/org/bukkit/craftbukkit/advancement/CraftAdvancement.java +++ b/src/main/java/org/bukkit/craftbukkit/advancement/CraftAdvancement.java @@ -1,11 +1,12 @@ package org.bukkit.craftbukkit.advancement; -import java.util.Collection; -import java.util.Collections; import net.minecraft.server.Advancement; import org.bukkit.NamespacedKey; import org.bukkit.craftbukkit.util.CraftNamespacedKey; +import java.util.Collection; +import java.util.Collections; + public class CraftAdvancement implements org.bukkit.advancement.Advancement { private final Advancement handle; diff --git a/src/main/java/org/bukkit/craftbukkit/advancement/CraftAdvancementProgress.java b/src/main/java/org/bukkit/craftbukkit/advancement/CraftAdvancementProgress.java index 60fc5aff80697cb4c85080350542c0f46056f74a..0f261a3b6bcee776ac9c691e05209909fde202f1 100644 --- a/src/main/java/org/bukkit/craftbukkit/advancement/CraftAdvancementProgress.java +++ b/src/main/java/org/bukkit/craftbukkit/advancement/CraftAdvancementProgress.java @@ -1,14 +1,15 @@ package org.bukkit.craftbukkit.advancement; import com.google.common.collect.Lists; -import java.util.Collection; -import java.util.Collections; -import java.util.Date; import net.minecraft.server.AdvancementDataPlayer; import net.minecraft.server.CriterionProgress; import org.bukkit.advancement.Advancement; import org.bukkit.advancement.AdvancementProgress; +import java.util.Collection; +import java.util.Collections; +import java.util.Date; + public class CraftAdvancementProgress implements AdvancementProgress { private final CraftAdvancement advancement; diff --git a/src/main/java/org/bukkit/craftbukkit/attribute/CraftAttributeInstance.java b/src/main/java/org/bukkit/craftbukkit/attribute/CraftAttributeInstance.java index a7c500323b52b532edf1f7fbaa0637efa527a4e8..6ac92a6b87edfb232efcc3881bfce385f10eb76f 100644 --- a/src/main/java/org/bukkit/craftbukkit/attribute/CraftAttributeInstance.java +++ b/src/main/java/org/bukkit/craftbukkit/attribute/CraftAttributeInstance.java @@ -1,13 +1,14 @@ package org.bukkit.craftbukkit.attribute; import com.google.common.base.Preconditions; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; import org.bukkit.attribute.Attribute; import org.bukkit.attribute.AttributeInstance; import org.bukkit.attribute.AttributeModifier; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; + public class CraftAttributeInstance implements AttributeInstance { private final net.minecraft.server.AttributeModifiable handle; diff --git a/src/main/java/org/bukkit/craftbukkit/block/CapturedBlockState.java b/src/main/java/org/bukkit/craftbukkit/block/CapturedBlockState.java index 27bd1916e060bcf8989597f1594c129131fd0aed..bb537efd2f7916e4e9bb258fcff41d1a2aff6103 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CapturedBlockState.java +++ b/src/main/java/org/bukkit/craftbukkit/block/CapturedBlockState.java @@ -1,16 +1,11 @@ package org.bukkit.craftbukkit.block; -import java.util.Random; -import net.minecraft.server.BlockPosition; -import net.minecraft.server.EntityBee; -import net.minecraft.server.EntityTypes; -import net.minecraft.server.GeneratorAccess; -import net.minecraft.server.TileEntity; -import net.minecraft.server.TileEntityBeehive; -import net.minecraft.server.World; +import net.minecraft.server.*; import org.bukkit.Material; import org.bukkit.block.Block; +import java.util.Random; + public final class CapturedBlockState extends CraftBlockState { private final boolean treeBlock; diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBanner.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBanner.java index 754205636b02f388ce5e885258b228f8a373a9f5..f98a342ef107799f8f47dc54908fbd4437d1d039 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBanner.java +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBanner.java @@ -1,13 +1,7 @@ package org.bukkit.craftbukkit.block; import com.google.common.base.Preconditions; -import java.util.ArrayList; -import java.util.List; -import net.minecraft.server.BlockBannerAbstract; -import net.minecraft.server.EnumColor; -import net.minecraft.server.NBTTagCompound; -import net.minecraft.server.NBTTagList; -import net.minecraft.server.TileEntityBanner; +import net.minecraft.server.*; import org.bukkit.DyeColor; import org.bukkit.Material; import org.bukkit.block.Banner; @@ -15,6 +9,9 @@ import org.bukkit.block.Block; import org.bukkit.block.banner.Pattern; import org.bukkit.block.banner.PatternType; +import java.util.ArrayList; +import java.util.List; + public class CraftBanner extends CraftBlockEntityState implements Banner { private DyeColor base; diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBeacon.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBeacon.java index 21ebceafbf27125761aa08cfe0785f6f05c77592..f65a2c602d7fd46d8c2d6d3810ed0d45475f66c5 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBeacon.java +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBeacon.java @@ -1,12 +1,6 @@ package org.bukkit.craftbukkit.block; -import java.util.ArrayList; -import java.util.Collection; -import net.minecraft.server.ChestLock; -import net.minecraft.server.EntityHuman; -import net.minecraft.server.MobEffectList; -import net.minecraft.server.TileEntity; -import net.minecraft.server.TileEntityBeacon; +import net.minecraft.server.*; import org.bukkit.Material; import org.bukkit.block.Beacon; import org.bukkit.block.Block; @@ -15,6 +9,9 @@ import org.bukkit.entity.LivingEntity; import org.bukkit.potion.PotionEffect; import org.bukkit.potion.PotionEffectType; +import java.util.ArrayList; +import java.util.Collection; + public class CraftBeacon extends CraftBlockEntityState implements Beacon { public CraftBeacon(final Block block) { diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBeehive.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBeehive.java index 0ffec81155fcf80b80360ffa8e4a6895095f84d7..70bacea68ed0286c5a746a24cafa222673449743 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBeehive.java +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBeehive.java @@ -1,8 +1,6 @@ package org.bukkit.craftbukkit.block; import com.google.common.base.Preconditions; -import java.util.ArrayList; -import java.util.List; import net.minecraft.server.BlockPosition; import net.minecraft.server.Entity; import net.minecraft.server.TileEntityBeehive; @@ -14,6 +12,9 @@ import org.bukkit.block.Block; import org.bukkit.craftbukkit.entity.CraftBee; import org.bukkit.entity.Bee; +import java.util.ArrayList; +import java.util.List; + public class CraftBeehive extends CraftBlockEntityState implements Beehive { public CraftBeehive(final Block block) { diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java index 6a681a8efc64417b0a2945d8fe3c1287c7d5e358..bbe1cb40f188a65e0a4665f6ca8bbab25311b03d 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java @@ -1,41 +1,14 @@ package org.bukkit.craftbukkit.block; import com.google.common.base.Preconditions; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.List; -import java.util.stream.Collectors; -import net.minecraft.server.AxisAlignedBB; -import net.minecraft.server.BiomeBase; -import net.minecraft.server.BlockPosition; -import net.minecraft.server.BlockRedstoneWire; -import net.minecraft.server.BlockTileEntity; -import net.minecraft.server.Blocks; -import net.minecraft.server.EnumDirection; -import net.minecraft.server.EnumSkyBlock; -import net.minecraft.server.GeneratorAccess; -import net.minecraft.server.IBlockData; -import net.minecraft.server.IRegistry; -import net.minecraft.server.MinecraftKey; -import net.minecraft.server.MovingObjectPosition; -import net.minecraft.server.RayTrace; -import net.minecraft.server.TileEntity; -import net.minecraft.server.Vec3D; -import net.minecraft.server.VoxelShape; -import net.minecraft.server.WorldServer; +import net.minecraft.server.*; import org.apache.commons.lang.Validate; import org.bukkit.Chunk; -import org.bukkit.FluidCollisionMode; -import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.World; -import org.bukkit.block.Biome; +import org.bukkit.*; import org.bukkit.block.Block; -import org.bukkit.block.BlockFace; -import org.bukkit.block.BlockState; -import org.bukkit.block.PistonMoveReaction; +import org.bukkit.block.*; import org.bukkit.block.data.BlockData; import org.bukkit.craftbukkit.CraftFluidCollisionMode; import org.bukkit.craftbukkit.CraftWorld; @@ -53,6 +26,11 @@ import org.bukkit.util.BoundingBox; import org.bukkit.util.RayTraceResult; import org.bukkit.util.Vector; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.List; + public class CraftBlock implements Block { private final net.minecraft.server.GeneratorAccess world; private final BlockPosition position; diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockState.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockState.java index c51c43573faa33ca5a10e76cb0f6aa9bc301f118..a3380b9bc574ebd77c31f7d275a17d1f7ec8bc38 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockState.java +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockState.java @@ -1,7 +1,6 @@ package org.bukkit.craftbukkit.block; import com.google.common.base.Preconditions; -import java.util.List; import net.minecraft.server.BlockPosition; import net.minecraft.server.GeneratorAccess; import net.minecraft.server.IBlockData; @@ -12,7 +11,6 @@ import org.bukkit.World; import org.bukkit.block.Block; import org.bukkit.block.BlockState; import org.bukkit.block.data.BlockData; -import org.bukkit.craftbukkit.CraftChunk; import org.bukkit.craftbukkit.CraftWorld; import org.bukkit.craftbukkit.block.data.CraftBlockData; import org.bukkit.craftbukkit.util.CraftMagicNumbers; @@ -21,6 +19,8 @@ import org.bukkit.material.MaterialData; import org.bukkit.metadata.MetadataValue; import org.bukkit.plugin.Plugin; +import java.util.List; + public class CraftBlockState implements BlockState { protected final CraftWorld world; private final BlockPosition position; diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftChest.java b/src/main/java/org/bukkit/craftbukkit/block/CraftChest.java index 31585e9bb825fbd84e30b7c026da57734a3698b3..251ad6ef51ed58ef9e7bb818e281d106a266cf56 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftChest.java +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftChest.java @@ -1,10 +1,7 @@ package org.bukkit.craftbukkit.block; -import net.minecraft.server.BlockChest; -import net.minecraft.server.Blocks; -import net.minecraft.server.ITileInventory; -import net.minecraft.server.SoundEffects; -import net.minecraft.server.TileEntityChest; +import com.destroystokyo.paper.loottable.PaperLootableBlockInventory; +import net.minecraft.server.*; import org.bukkit.Material; import org.bukkit.block.Block; import org.bukkit.block.Chest; @@ -12,7 +9,6 @@ import org.bukkit.craftbukkit.CraftWorld; import org.bukkit.craftbukkit.inventory.CraftInventory; import org.bukkit.craftbukkit.inventory.CraftInventoryDoubleChest; import org.bukkit.inventory.Inventory; -import com.destroystokyo.paper.loottable.PaperLootableBlockInventory; // Paper public class CraftChest extends CraftLootable implements Chest, PaperLootableBlockInventory { // Paper diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftEndGateway.java b/src/main/java/org/bukkit/craftbukkit/block/CraftEndGateway.java index 54287744e1385fe74a80e3f04d2cdc20f37e5541..90efa1220ddb6f3a562f96a862c922936a828272 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftEndGateway.java +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftEndGateway.java @@ -1,6 +1,5 @@ package org.bukkit.craftbukkit.block; -import java.util.Objects; import net.minecraft.server.BlockPosition; import net.minecraft.server.TileEntityEndGateway; import org.bukkit.Location; @@ -8,6 +7,8 @@ import org.bukkit.Material; import org.bukkit.block.Block; import org.bukkit.block.EndGateway; +import java.util.Objects; + public class CraftEndGateway extends CraftBlockEntityState implements EndGateway { public CraftEndGateway(Block block) { diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftJukebox.java b/src/main/java/org/bukkit/craftbukkit/block/CraftJukebox.java index 6f20b9ac76bc0d9f5f7c769af39103f4ac8d5ae7..035447cf0bdab65e4b835fbbebe496dbf1e6fdee 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftJukebox.java +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftJukebox.java @@ -1,10 +1,6 @@ package org.bukkit.craftbukkit.block; -import net.minecraft.server.BlockJukeBox; -import net.minecraft.server.Blocks; -import net.minecraft.server.ItemStack; -import net.minecraft.server.TileEntity; -import net.minecraft.server.TileEntityJukeBox; +import net.minecraft.server.*; import org.bukkit.Effect; import org.bukkit.Material; import org.bukkit.block.Block; diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftShulkerBox.java b/src/main/java/org/bukkit/craftbukkit/block/CraftShulkerBox.java index 10bc0b0944bdd7f6db2bb2cd4f329be0e23e3cea..fb9e71f57543f840b41918c9c9ff991511385032 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftShulkerBox.java +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftShulkerBox.java @@ -1,10 +1,6 @@ package org.bukkit.craftbukkit.block; -import net.minecraft.server.BlockShulkerBox; -import net.minecraft.server.SoundCategory; -import net.minecraft.server.SoundEffects; -import net.minecraft.server.TileEntityShulkerBox; -import net.minecraft.server.World; +import net.minecraft.server.*; import org.bukkit.DyeColor; import org.bukkit.Material; import org.bukkit.block.Block; diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftSkull.java b/src/main/java/org/bukkit/craftbukkit/block/CraftSkull.java index ecc32c2fb1e8e1ac03074102b982adb4cda169db..c6a20a2a121597ad8aada3e023d3195f412ab030 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftSkull.java +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftSkull.java @@ -17,6 +17,7 @@ import org.bukkit.block.data.BlockData; import org.bukkit.block.data.Directional; import org.bukkit.block.data.Rotatable; import org.bukkit.craftbukkit.entity.CraftPlayer; + import javax.annotation.Nullable; public class CraftSkull extends CraftBlockEntityState implements Skull { diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftStructureBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftStructureBlock.java index 15e01f615e5f7bf5f611159a3d529e8c78cdd84e..1a059ecb93ade09e723527d7cd58e3530e66ee8f 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftStructureBlock.java +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftStructureBlock.java @@ -1,11 +1,7 @@ package org.bukkit.craftbukkit.block; import com.google.common.base.Preconditions; -import net.minecraft.server.BlockPosition; -import net.minecraft.server.BlockPropertyStructureMode; -import net.minecraft.server.EnumBlockMirror; -import net.minecraft.server.EnumBlockRotation; -import net.minecraft.server.TileEntityStructure; +import net.minecraft.server.*; import org.apache.commons.lang3.Validate; import org.bukkit.Material; import org.bukkit.block.Block; diff --git a/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java b/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java index 4045e3c194048d66ada0a15a9c208f8dbac5285e..782c50c392222bb47de7c16b569257df4ed0d04c 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java +++ b/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java @@ -7,29 +7,18 @@ import com.google.common.collect.HashBiMap; import com.google.common.collect.ImmutableSet; import com.mojang.brigadier.StringReader; import com.mojang.brigadier.exceptions.CommandSyntaxException; -import java.util.HashMap; -import java.util.Map; -import java.util.Set; -import java.util.StringJoiner; -import java.util.stream.Collectors; -import net.minecraft.server.ArgumentBlock; -import net.minecraft.server.Block; -import net.minecraft.server.BlockStateBoolean; -import net.minecraft.server.BlockStateEnum; -import net.minecraft.server.BlockStateInteger; -import net.minecraft.server.EnumDirection; -import net.minecraft.server.IBlockData; -import net.minecraft.server.IBlockDataHolder; -import net.minecraft.server.IBlockState; -import net.minecraft.server.INamable; -import net.minecraft.server.IRegistry; -import net.minecraft.server.NBTTagCompound; +import net.minecraft.server.*; import org.bukkit.Material; import org.bukkit.block.BlockFace; import org.bukkit.block.data.BlockData; import org.bukkit.craftbukkit.block.CraftBlock; import org.bukkit.craftbukkit.util.CraftMagicNumbers; +import java.util.HashMap; +import java.util.Map; +import java.util.Set; +import java.util.StringJoiner; + public class CraftBlockData implements BlockData { private IBlockData state; diff --git a/src/main/java/org/bukkit/craftbukkit/boss/CraftBossBar.java b/src/main/java/org/bukkit/craftbukkit/boss/CraftBossBar.java index 7771cd6d04f08c4756cbb157d6c04bbb2fc960f9..f9c2d38fd9b329ae77c116ee12f02a5ec9e2f7fb 100644 --- a/src/main/java/org/bukkit/craftbukkit/boss/CraftBossBar.java +++ b/src/main/java/org/bukkit/craftbukkit/boss/CraftBossBar.java @@ -2,11 +2,6 @@ package org.bukkit.craftbukkit.boss; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.function.Consumer; -import java.util.function.Supplier; import net.minecraft.server.BossBattle; import net.minecraft.server.BossBattleServer; import net.minecraft.server.EntityPlayer; @@ -19,6 +14,12 @@ import org.bukkit.craftbukkit.entity.CraftPlayer; import org.bukkit.craftbukkit.util.CraftChatMessage; import org.bukkit.entity.Player; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.function.Consumer; +import java.util.function.Supplier; + public class CraftBossBar implements BossBar { private final BossBattleServer handle; diff --git a/src/main/java/org/bukkit/craftbukkit/command/BukkitCommandWrapper.java b/src/main/java/org/bukkit/craftbukkit/command/BukkitCommandWrapper.java index e16ecdea7d27424053b3f21378af054b2f808eca..08090858492b3a4788a0156e1ca1ba85c992544d 100644 --- a/src/main/java/org/bukkit/craftbukkit/command/BukkitCommandWrapper.java +++ b/src/main/java/org/bukkit/craftbukkit/command/BukkitCommandWrapper.java @@ -10,13 +10,14 @@ import com.mojang.brigadier.suggestion.SuggestionProvider; import com.mojang.brigadier.suggestion.Suggestions; import com.mojang.brigadier.suggestion.SuggestionsBuilder; import com.mojang.brigadier.tree.LiteralCommandNode; -import java.util.List; -import java.util.concurrent.CompletableFuture; -import java.util.function.Predicate; import net.minecraft.server.CommandListenerWrapper; import org.bukkit.command.Command; import org.bukkit.craftbukkit.CraftServer; +import java.util.List; +import java.util.concurrent.CompletableFuture; +import java.util.function.Predicate; + public class BukkitCommandWrapper implements com.mojang.brigadier.Command, Predicate, SuggestionProvider, com.destroystokyo.paper.brigadier.BukkitBrigadierCommand { // Paper private final CraftServer server; diff --git a/src/main/java/org/bukkit/craftbukkit/command/ColouredConsoleSender.java b/src/main/java/org/bukkit/craftbukkit/command/ColouredConsoleSender.java index 88acfeb8fa1a82f7a896a181ac57b435454656df..cf8b91e77fe400bf122e70c6a7cc146cf968442b 100644 --- a/src/main/java/org/bukkit/craftbukkit/command/ColouredConsoleSender.java +++ b/src/main/java/org/bukkit/craftbukkit/command/ColouredConsoleSender.java @@ -1,12 +1,5 @@ package org.bukkit.craftbukkit.command; -import java.util.EnumMap; -import java.util.Map; -//import jline.Terminal; -import org.bukkit.Bukkit; -import org.bukkit.ChatColor; -import org.bukkit.command.ConsoleCommandSender; -import org.bukkit.craftbukkit.CraftServer; //import org.fusesource.jansi.Ansi; //import org.fusesource.jansi.Ansi.Attribute; diff --git a/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java b/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java index f276cdcaacc2fd2650a2ddccbbf190421a20c2bd..fa3755aa9bb206bbcdab124741f6d6c2551fd033 100644 --- a/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java +++ b/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java @@ -1,21 +1,19 @@ package org.bukkit.craftbukkit.command; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.concurrent.ExecutionException; -import java.util.logging.Level; +import net.minecraft.server.DedicatedServer; import org.bukkit.craftbukkit.CraftServer; import org.bukkit.craftbukkit.util.Waitable; - -// Paper start - JLine update -import net.minecraft.server.DedicatedServer; // Paper +import org.bukkit.event.server.TabCompleteEvent; import org.jline.reader.Candidate; import org.jline.reader.Completer; import org.jline.reader.LineReader; import org.jline.reader.ParsedLine; -// Paper end -import org.bukkit.event.server.TabCompleteEvent; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.concurrent.ExecutionException; +import java.util.logging.Level; public class ConsoleCommandCompleter implements Completer { private final DedicatedServer server; // Paper - CraftServer -> DedicatedServer diff --git a/src/main/java/org/bukkit/craftbukkit/command/CraftCommandMap.java b/src/main/java/org/bukkit/craftbukkit/command/CraftCommandMap.java index 2fd69c0f915f1c3cb1c410d5dab0498f05d5c888..e8902262eb0edb422d3fd052bae2e0ef638b64ee 100644 --- a/src/main/java/org/bukkit/craftbukkit/command/CraftCommandMap.java +++ b/src/main/java/org/bukkit/craftbukkit/command/CraftCommandMap.java @@ -1,10 +1,11 @@ package org.bukkit.craftbukkit.command; -import java.util.Map; import org.bukkit.Server; import org.bukkit.command.Command; import org.bukkit.command.SimpleCommandMap; +import java.util.Map; + public class CraftCommandMap extends SimpleCommandMap { public CraftCommandMap(Server server) { diff --git a/src/main/java/org/bukkit/craftbukkit/command/ProxiedNativeCommandSender.java b/src/main/java/org/bukkit/craftbukkit/command/ProxiedNativeCommandSender.java index ce2c5c38c3df124ca1569cbd7cec62a9cf11f3d5..563e01a9bd187030aea586856df141a871638435 100644 --- a/src/main/java/org/bukkit/craftbukkit/command/ProxiedNativeCommandSender.java +++ b/src/main/java/org/bukkit/craftbukkit/command/ProxiedNativeCommandSender.java @@ -1,7 +1,6 @@ package org.bukkit.craftbukkit.command; -import java.util.Set; import net.minecraft.server.CommandListenerWrapper; import org.bukkit.Server; import org.bukkit.command.CommandSender; @@ -11,6 +10,8 @@ import org.bukkit.permissions.PermissionAttachment; import org.bukkit.permissions.PermissionAttachmentInfo; import org.bukkit.plugin.Plugin; +import java.util.Set; + public class ProxiedNativeCommandSender implements ProxiedCommandSender { private final CommandListenerWrapper orig; diff --git a/src/main/java/org/bukkit/craftbukkit/command/ServerCommandSender.java b/src/main/java/org/bukkit/craftbukkit/command/ServerCommandSender.java index 9776746a0a45a8e60b22c6a72ba91572c33922ff..e512df675cc01a7ff5d50cdec0ba08f23b454d6e 100644 --- a/src/main/java/org/bukkit/craftbukkit/command/ServerCommandSender.java +++ b/src/main/java/org/bukkit/craftbukkit/command/ServerCommandSender.java @@ -1,6 +1,5 @@ package org.bukkit.craftbukkit.command; -import java.util.Set; import org.bukkit.Bukkit; import org.bukkit.Server; import org.bukkit.command.CommandSender; @@ -10,6 +9,8 @@ import org.bukkit.permissions.PermissionAttachment; import org.bukkit.permissions.PermissionAttachmentInfo; import org.bukkit.plugin.Plugin; +import java.util.Set; + public abstract class ServerCommandSender implements CommandSender { private static PermissibleBase blockPermInst; private final PermissibleBase perm; diff --git a/src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java b/src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java index 3c610a889f371f54b0f456266d14538fc3ff03ac..9f7ead4c0fc24fb7412a4164741a3fd57617e198 100644 --- a/src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java +++ b/src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java @@ -4,21 +4,10 @@ import com.google.common.base.Joiner; import com.mojang.brigadier.ParseResults; import com.mojang.brigadier.suggestion.Suggestion; import com.mojang.brigadier.tree.CommandNode; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import net.minecraft.server.CommandDispatcher; -import net.minecraft.server.CommandListenerWrapper; -import net.minecraft.server.DedicatedServer; -import net.minecraft.server.EntityMinecartCommandBlock; -import net.minecraft.server.MinecraftServer; +import net.minecraft.server.*; import org.apache.commons.lang.Validate; import org.bukkit.Location; -import org.bukkit.command.BlockCommandSender; -import org.bukkit.command.CommandSender; -import org.bukkit.command.ConsoleCommandSender; -import org.bukkit.command.ProxiedCommandSender; -import org.bukkit.command.RemoteConsoleCommandSender; +import org.bukkit.command.*; import org.bukkit.command.defaults.BukkitCommand; import org.bukkit.craftbukkit.CraftServer; import org.bukkit.craftbukkit.entity.CraftMinecartCommand; @@ -26,6 +15,10 @@ import org.bukkit.craftbukkit.entity.CraftPlayer; import org.bukkit.entity.Player; import org.bukkit.entity.minecart.CommandMinecart; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + public final class VanillaCommandWrapper extends BukkitCommand { private final CommandDispatcher dispatcher; diff --git a/src/main/java/org/bukkit/craftbukkit/conversations/ConversationTracker.java b/src/main/java/org/bukkit/craftbukkit/conversations/ConversationTracker.java index 72127dde54cd9f128b83a44d9fcdd1f9014f49a1..0e584c04c8deb199e573e6eefb3dcfe5eec7d54c 100644 --- a/src/main/java/org/bukkit/craftbukkit/conversations/ConversationTracker.java +++ b/src/main/java/org/bukkit/craftbukkit/conversations/ConversationTracker.java @@ -1,12 +1,13 @@ package org.bukkit.craftbukkit.conversations; -import java.util.LinkedList; -import java.util.logging.Level; import org.bukkit.Bukkit; import org.bukkit.conversations.Conversation; import org.bukkit.conversations.ConversationAbandonedEvent; import org.bukkit.conversations.ManuallyAbandonedConversationCanceller; +import java.util.LinkedList; +import java.util.logging.Level; + /** */ public class ConversationTracker { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java index 218a2190d1203ca0fbc2a5ad87e145f436aac314..ed3ff7880a075fdab86098b198b10add9dfd6684 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java @@ -1,17 +1,17 @@ package org.bukkit.craftbukkit.entity; -import java.util.UUID; import net.minecraft.server.EntityHorseAbstract; import net.minecraft.server.GenericAttributes; import org.apache.commons.lang.Validate; import org.bukkit.craftbukkit.CraftServer; -import org.bukkit.craftbukkit.inventory.CraftInventoryAbstractHorse; import org.bukkit.craftbukkit.inventory.CraftSaddledInventory; import org.bukkit.entity.AbstractHorse; import org.bukkit.entity.AnimalTamer; import org.bukkit.entity.Horse; import org.bukkit.inventory.AbstractHorseInventory; +import java.util.UUID; + public abstract class CraftAbstractHorse extends CraftAnimals implements AbstractHorse { public CraftAbstractHorse(CraftServer server, EntityHorseAbstract entity) { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractVillager.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractVillager.java index 18520fec054b3bcdf73aaca95c665e7a1254b76f..c6ba1e913868dfb41fea539d284fad3d17f46282 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractVillager.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractVillager.java @@ -1,6 +1,5 @@ package org.bukkit.craftbukkit.entity; -import java.util.List; import net.minecraft.server.EntityVillager; import net.minecraft.server.EntityVillagerAbstract; import org.bukkit.craftbukkit.CraftServer; @@ -12,6 +11,8 @@ import org.bukkit.inventory.Inventory; import org.bukkit.inventory.InventoryHolder; import org.bukkit.inventory.MerchantRecipe; +import java.util.List; + public class CraftAbstractVillager extends CraftAgeable implements AbstractVillager, InventoryHolder { public CraftAbstractVillager(CraftServer server, EntityVillagerAbstract entity) { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftAnimals.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftAnimals.java index 599db583b19fb085d55319903e35b853d1d3719e..d7b8ae59d32bf76fdb5060b384f9fb39692ab4dd 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftAnimals.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftAnimals.java @@ -1,11 +1,12 @@ package org.bukkit.craftbukkit.entity; import com.google.common.base.Preconditions; -import java.util.UUID; import net.minecraft.server.EntityAnimal; import org.bukkit.craftbukkit.CraftServer; import org.bukkit.entity.Animals; +import java.util.UUID; + public class CraftAnimals extends CraftAgeable implements Animals { public CraftAnimals(CraftServer server, EntityAnimal entity) { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftAreaEffectCloud.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftAreaEffectCloud.java index ab6cbf560040a3650ac6320659897cb0c8ecec6d..6593347c49963a70be100a109be9d3aa934b572d 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftAreaEffectCloud.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftAreaEffectCloud.java @@ -1,7 +1,6 @@ package org.bukkit.craftbukkit.entity; import com.google.common.collect.ImmutableList; -import java.util.List; import net.minecraft.server.EntityAreaEffectCloud; import net.minecraft.server.EntityLiving; import net.minecraft.server.MobEffect; @@ -20,6 +19,8 @@ import org.bukkit.potion.PotionEffect; import org.bukkit.potion.PotionEffectType; import org.bukkit.projectiles.ProjectileSource; +import java.util.List; + public class CraftAreaEffectCloud extends CraftEntity implements AreaEffectCloud { public CraftAreaEffectCloud(CraftServer server, EntityAreaEffectCloud entity) { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftComplexLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftComplexLivingEntity.java index 4947249da2d507163de90f92ff59d9b08213eafd..66c618dff4787a0fad0e8c6c9933838dd1c589ba 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftComplexLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftComplexLivingEntity.java @@ -1,7 +1,6 @@ package org.bukkit.craftbukkit.entity; import net.minecraft.server.EntityInsentient; -import net.minecraft.server.EntityLiving; import org.bukkit.craftbukkit.CraftServer; import org.bukkit.entity.ComplexLivingEntity; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderDragon.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderDragon.java index e8eb5f9f269effcc369237491ed543e17119afdb..289f231d1fbf2922a9d5bca96485e08659ff9a9c 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderDragon.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderDragon.java @@ -2,7 +2,6 @@ package org.bukkit.craftbukkit.entity; import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSet.Builder; -import java.util.Set; import net.minecraft.server.DragonControllerPhase; import net.minecraft.server.EntityComplexPart; import net.minecraft.server.EntityEnderDragon; @@ -14,6 +13,8 @@ import org.bukkit.entity.ComplexEntityPart; import org.bukkit.entity.EnderDragon; import org.bukkit.entity.EntityType; +import java.util.Set; + public class CraftEnderDragon extends CraftComplexLivingEntity implements EnderDragon { public CraftEnderDragon(CraftServer server, EntityEnderDragon entity) { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java index 6f18a789805163de63561569e84d9fa1b3dabb61..6b33a1e2c1f793df363697f868cbaeae01bc15f0 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java @@ -3,149 +3,10 @@ package org.bukkit.craftbukkit.entity; import com.google.common.base.Function; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; -import java.util.List; -import java.util.Set; -import java.util.UUID; -import net.minecraft.server.AxisAlignedBB; -import net.minecraft.server.BlockPosition; -import net.minecraft.server.DamageSource; -import net.minecraft.server.Entity; -import net.minecraft.server.EntityAmbient; -import net.minecraft.server.EntityAnimal; -import net.minecraft.server.EntityAreaEffectCloud; -import net.minecraft.server.EntityArmorStand; -import net.minecraft.server.EntityArrow; -import net.minecraft.server.EntityBat; -import net.minecraft.server.EntityBee; -import net.minecraft.server.EntityBlaze; -import net.minecraft.server.EntityBoat; -import net.minecraft.server.EntityCat; -import net.minecraft.server.EntityCaveSpider; -import net.minecraft.server.EntityChicken; -import net.minecraft.server.EntityCod; -import net.minecraft.server.EntityComplexPart; -import net.minecraft.server.EntityCow; -import net.minecraft.server.EntityCreature; -import net.minecraft.server.EntityCreeper; -import net.minecraft.server.EntityDolphin; -import net.minecraft.server.EntityDragonFireball; -import net.minecraft.server.EntityDrowned; -import net.minecraft.server.EntityEgg; -import net.minecraft.server.EntityEnderCrystal; -import net.minecraft.server.EntityEnderDragon; -import net.minecraft.server.EntityEnderPearl; -import net.minecraft.server.EntityEnderSignal; -import net.minecraft.server.EntityEnderman; -import net.minecraft.server.EntityEndermite; -import net.minecraft.server.EntityEvoker; -import net.minecraft.server.EntityEvokerFangs; -import net.minecraft.server.EntityExperienceOrb; -import net.minecraft.server.EntityFallingBlock; -import net.minecraft.server.EntityFireball; -import net.minecraft.server.EntityFireworks; -import net.minecraft.server.EntityFish; -import net.minecraft.server.EntityFishingHook; -import net.minecraft.server.EntityFlying; -import net.minecraft.server.EntityFox; -import net.minecraft.server.EntityGhast; -import net.minecraft.server.EntityGiantZombie; -import net.minecraft.server.EntityGolem; -import net.minecraft.server.EntityGuardian; -import net.minecraft.server.EntityGuardianElder; -import net.minecraft.server.EntityHanging; -import net.minecraft.server.EntityHoglin; -import net.minecraft.server.EntityHorse; -import net.minecraft.server.EntityHorseAbstract; -import net.minecraft.server.EntityHorseChestedAbstract; -import net.minecraft.server.EntityHorseDonkey; -import net.minecraft.server.EntityHorseMule; -import net.minecraft.server.EntityHorseSkeleton; -import net.minecraft.server.EntityHorseZombie; -import net.minecraft.server.EntityHuman; -import net.minecraft.server.EntityIllagerAbstract; -import net.minecraft.server.EntityIllagerIllusioner; -import net.minecraft.server.EntityIllagerWizard; -import net.minecraft.server.EntityIronGolem; -import net.minecraft.server.EntityItem; -import net.minecraft.server.EntityItemFrame; -import net.minecraft.server.EntityLargeFireball; -import net.minecraft.server.EntityLeash; -import net.minecraft.server.EntityLightning; -import net.minecraft.server.EntityLiving; -import net.minecraft.server.EntityLlama; -import net.minecraft.server.EntityLlamaSpit; -import net.minecraft.server.EntityLlamaTrader; -import net.minecraft.server.EntityMagmaCube; -import net.minecraft.server.EntityMinecartAbstract; -import net.minecraft.server.EntityMinecartChest; -import net.minecraft.server.EntityMinecartCommandBlock; -import net.minecraft.server.EntityMinecartFurnace; -import net.minecraft.server.EntityMinecartHopper; -import net.minecraft.server.EntityMinecartMobSpawner; -import net.minecraft.server.EntityMinecartRideable; -import net.minecraft.server.EntityMinecartTNT; -import net.minecraft.server.EntityMonster; -import net.minecraft.server.EntityMushroomCow; -import net.minecraft.server.EntityOcelot; -import net.minecraft.server.EntityPainting; -import net.minecraft.server.EntityPanda; -import net.minecraft.server.EntityParrot; -import net.minecraft.server.EntityPhantom; -import net.minecraft.server.EntityPig; -import net.minecraft.server.EntityPigZombie; -import net.minecraft.server.EntityPiglin; -import net.minecraft.server.EntityPillager; -import net.minecraft.server.EntityPlayer; -import net.minecraft.server.EntityPolarBear; -import net.minecraft.server.EntityPotion; -import net.minecraft.server.EntityProjectile; -import net.minecraft.server.EntityPufferFish; -import net.minecraft.server.EntityRabbit; -import net.minecraft.server.EntityRavager; -import net.minecraft.server.EntitySalmon; -import net.minecraft.server.EntitySheep; -import net.minecraft.server.EntityShulker; -import net.minecraft.server.EntityShulkerBullet; -import net.minecraft.server.EntitySilverfish; -import net.minecraft.server.EntitySkeletonAbstract; -import net.minecraft.server.EntitySkeletonStray; -import net.minecraft.server.EntitySkeletonWither; -import net.minecraft.server.EntitySlime; -import net.minecraft.server.EntitySmallFireball; -import net.minecraft.server.EntitySnowball; -import net.minecraft.server.EntitySnowman; -import net.minecraft.server.EntitySpectralArrow; -import net.minecraft.server.EntitySpider; -import net.minecraft.server.EntitySquid; -import net.minecraft.server.EntityStrider; -import net.minecraft.server.EntityTNTPrimed; -import net.minecraft.server.EntityTameableAnimal; -import net.minecraft.server.EntityThrownExpBottle; -import net.minecraft.server.EntityThrownTrident; -import net.minecraft.server.EntityTippedArrow; -import net.minecraft.server.EntityTropicalFish; -import net.minecraft.server.EntityTurtle; -import net.minecraft.server.EntityVex; -import net.minecraft.server.EntityVillager; -import net.minecraft.server.EntityVillagerAbstract; -import net.minecraft.server.EntityVillagerTrader; -import net.minecraft.server.EntityVindicator; -import net.minecraft.server.EntityWaterAnimal; -import net.minecraft.server.EntityWitch; -import net.minecraft.server.EntityWither; -import net.minecraft.server.EntityWitherSkull; -import net.minecraft.server.EntityWolf; -import net.minecraft.server.EntityZoglin; -import net.minecraft.server.EntityZombie; -import net.minecraft.server.EntityZombieHusk; -import net.minecraft.server.EntityZombieVillager; -import net.minecraft.server.IChatBaseComponent; -import net.minecraft.server.NBTTagCompound; -import org.bukkit.Chunk; // Paper -import org.bukkit.EntityEffect; -import org.bukkit.Location; -import org.bukkit.Server; +import net.minecraft.server.*; +import org.bukkit.Chunk; import org.bukkit.World; +import org.bukkit.*; import org.bukkit.block.BlockFace; import org.bukkit.block.PistonMoveReaction; import org.bukkit.craftbukkit.CraftServer; @@ -159,16 +20,16 @@ import org.bukkit.entity.Pose; import org.bukkit.event.entity.EntityDamageEvent; import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; import org.bukkit.metadata.MetadataValue; -import org.bukkit.permissions.PermissibleBase; -import org.bukkit.permissions.Permission; -import org.bukkit.permissions.PermissionAttachment; -import org.bukkit.permissions.PermissionAttachmentInfo; -import org.bukkit.permissions.ServerOperator; +import org.bukkit.permissions.*; import org.bukkit.plugin.Plugin; import org.bukkit.util.BoundingBox; import org.bukkit.util.NumberConversions; import org.bukkit.util.Vector; +import java.util.List; +import java.util.Set; +import java.util.UUID; + public abstract class CraftEntity implements org.bukkit.entity.Entity { private static PermissibleBase perm; private static final CraftPersistentDataTypeRegistry DATA_TYPE_REGISTRY = new CraftPersistentDataTypeRegistry(); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftFireball.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftFireball.java index 97fdf356034dd6b063519474fca6e4d947e6b886..f1437d2c508c82eba3cd614d61c9ca1b60166404 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftFireball.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftFireball.java @@ -1,7 +1,6 @@ package org.bukkit.craftbukkit.entity; import net.minecraft.server.EntityFireball; -import net.minecraft.server.MathHelper; import org.apache.commons.lang.Validate; import org.bukkit.craftbukkit.CraftServer; import org.bukkit.entity.EntityType; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java index f3066e6c781bcee72c235abcef5060fb080892d5..618b96769d4c99983db6d35c0539412cd70d2eb8 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java @@ -1,6 +1,5 @@ package org.bukkit.craftbukkit.entity; -import java.util.Random; import net.minecraft.server.EntityFireworks; import net.minecraft.server.ItemStack; import net.minecraft.server.Items; @@ -11,6 +10,8 @@ import org.bukkit.entity.EntityType; import org.bukkit.entity.Firework; import org.bukkit.inventory.meta.FireworkMeta; +import java.util.Random; + public class CraftFirework extends CraftProjectile implements Firework { private final Random random = new Random(); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftFox.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftFox.java index 0b73a448604177dcc2b4c4dc77c7186dfc397135..7a2e186336defb8020b91cc55d154e024e461223 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftFox.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftFox.java @@ -1,14 +1,15 @@ package org.bukkit.craftbukkit.entity; import com.google.common.base.Preconditions; -import java.util.Optional; -import java.util.UUID; import net.minecraft.server.EntityFox; import org.bukkit.craftbukkit.CraftServer; import org.bukkit.entity.AnimalTamer; import org.bukkit.entity.EntityType; import org.bukkit.entity.Fox; +import java.util.Optional; +import java.util.UUID; + public class CraftFox extends CraftAnimals implements Fox { public CraftFox(CraftServer server, EntityFox entity) { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java index fef2035fe5564645d786d042dceedb10ca8b59ce..a2e283b941f399380551920a0533f7cdc15df8f5 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java @@ -2,36 +2,7 @@ package org.bukkit.craftbukkit.entity; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableSet; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.Optional; -import java.util.Set; -import net.minecraft.server.BlockBed; -import net.minecraft.server.BlockEnchantmentTable; -import net.minecraft.server.BlockPosition; -import net.minecraft.server.BlockWorkbench; -import net.minecraft.server.Blocks; -import net.minecraft.server.ChatComponentText; -import net.minecraft.server.Container; -import net.minecraft.server.Containers; -import net.minecraft.server.CraftingManager; -import net.minecraft.server.Entity; -import net.minecraft.server.EntityHuman; -import net.minecraft.server.EntityPlayer; -import net.minecraft.server.EntityTypes; -import net.minecraft.server.EnumMainHand; -import net.minecraft.server.IBlockData; -import net.minecraft.server.IChatBaseComponent; -import net.minecraft.server.IMerchant; -import net.minecraft.server.IRecipe; -import net.minecraft.server.ITileInventory; -import net.minecraft.server.ItemCooldown; -import net.minecraft.server.NBTTagCompound; -import net.minecraft.server.PacketPlayInCloseWindow; -import net.minecraft.server.PacketPlayOutOpenWindow; -import net.minecraft.server.TileEntity; -import net.minecraft.server.TileEntityContainer; +import net.minecraft.server.*; import org.bukkit.GameMode; import org.bukkit.Location; import org.bukkit.Material; @@ -39,31 +10,23 @@ import org.bukkit.NamespacedKey; import org.bukkit.block.Block; import org.bukkit.craftbukkit.CraftServer; import org.bukkit.craftbukkit.event.CraftEventFactory; -import org.bukkit.craftbukkit.inventory.CraftContainer; -import org.bukkit.craftbukkit.inventory.CraftInventory; -import org.bukkit.craftbukkit.inventory.CraftInventoryDoubleChest; -import org.bukkit.craftbukkit.inventory.CraftInventoryPlayer; -import org.bukkit.craftbukkit.inventory.CraftInventoryView; -import org.bukkit.craftbukkit.inventory.CraftItemStack; -import org.bukkit.craftbukkit.inventory.CraftMerchantCustom; +import org.bukkit.craftbukkit.inventory.*; import org.bukkit.craftbukkit.util.CraftChatMessage; import org.bukkit.craftbukkit.util.CraftMagicNumbers; import org.bukkit.craftbukkit.util.CraftNamespacedKey; import org.bukkit.entity.HumanEntity; import org.bukkit.entity.Villager; -import org.bukkit.inventory.EntityEquipment; -import org.bukkit.inventory.Inventory; -import org.bukkit.inventory.InventoryView; import org.bukkit.inventory.ItemStack; -import org.bukkit.inventory.MainHand; -import org.bukkit.inventory.Merchant; import org.bukkit.inventory.PlayerInventory; +import org.bukkit.inventory.*; import org.bukkit.permissions.PermissibleBase; import org.bukkit.permissions.Permission; import org.bukkit.permissions.PermissionAttachment; import org.bukkit.permissions.PermissionAttachmentInfo; import org.bukkit.plugin.Plugin; +import java.util.*; + public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity { private CraftInventoryPlayer inventory; private final CraftInventory enderChest; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java index cb756b1ba0438045904a1b3fe8e827e8f1e105bd..0797782298ac903929c2f46c556a7d6a7a8d2262 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java @@ -8,7 +8,6 @@ import org.bukkit.entity.EntityType; import org.bukkit.entity.Item; import org.bukkit.inventory.ItemStack; -// Paper start import javax.annotation.Nullable; import java.util.UUID; // Paper end diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftItemFrame.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftItemFrame.java index 8a43416ae2a9b923e3fa2b207931cb48cdb6bbd2..e36af9de1263fa07e523451f0a6efc667e9111a7 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftItemFrame.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftItemFrame.java @@ -1,11 +1,6 @@ package org.bukkit.craftbukkit.entity; -import net.minecraft.server.BlockPosition; -import net.minecraft.server.EntityHanging; -import net.minecraft.server.EntityItemFrame; -import net.minecraft.server.EnumDirection; -import net.minecraft.server.ItemStack; -import net.minecraft.server.WorldServer; +import net.minecraft.server.*; import org.apache.commons.lang.Validate; import org.bukkit.Rotation; import org.bukkit.block.BlockFace; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java index 3777aba5f32f58f4620d4fe496af4e641ff8c858..d9d4ba1f0b9e47b8632b2488f7a639e303b392d6 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java @@ -2,42 +2,7 @@ package org.bukkit.craftbukkit.entity; import com.google.common.base.Preconditions; import com.google.common.collect.Sets; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Iterator; -import java.util.List; -import java.util.Set; -import java.util.UUID; -import net.minecraft.server.DamageSource; -import net.minecraft.server.EntityArmorStand; -import net.minecraft.server.EntityArrow; -import net.minecraft.server.EntityDragonFireball; -import net.minecraft.server.EntityEgg; -import net.minecraft.server.EntityEnderPearl; -import net.minecraft.server.EntityFireball; -import net.minecraft.server.EntityFireworks; -import net.minecraft.server.EntityFishingHook; -import net.minecraft.server.EntityHuman; -import net.minecraft.server.EntityInsentient; -import net.minecraft.server.EntityLargeFireball; -import net.minecraft.server.EntityLiving; -import net.minecraft.server.EntityLlamaSpit; -import net.minecraft.server.EntityPotion; -import net.minecraft.server.EntityProjectile; -import net.minecraft.server.EntityShulkerBullet; -import net.minecraft.server.EntitySmallFireball; -import net.minecraft.server.EntitySnowball; -import net.minecraft.server.EntitySpectralArrow; -import net.minecraft.server.EntityThrownExpBottle; -import net.minecraft.server.EntityThrownTrident; -import net.minecraft.server.EntityTippedArrow; -import net.minecraft.server.EntityTypes; -import net.minecraft.server.EntityWither; -import net.minecraft.server.EntityWitherSkull; -import net.minecraft.server.EnumHand; -import net.minecraft.server.GenericAttributes; -import net.minecraft.server.MobEffect; -import net.minecraft.server.MobEffectList; +import net.minecraft.server.*; import org.apache.commons.lang.Validate; import org.bukkit.FluidCollisionMode; import org.bukkit.Location; @@ -52,30 +17,8 @@ import org.bukkit.craftbukkit.entity.memory.CraftMemoryMapper; import org.bukkit.craftbukkit.inventory.CraftEntityEquipment; import org.bukkit.craftbukkit.inventory.CraftItemStack; import org.bukkit.craftbukkit.potion.CraftPotionUtil; -import org.bukkit.entity.AbstractArrow; -import org.bukkit.entity.DragonFireball; -import org.bukkit.entity.Egg; -import org.bukkit.entity.EnderPearl; import org.bukkit.entity.Entity; -import org.bukkit.entity.EntityType; -import org.bukkit.entity.Fireball; -import org.bukkit.entity.Firework; -import org.bukkit.entity.FishHook; -import org.bukkit.entity.HumanEntity; -import org.bukkit.entity.LingeringPotion; -import org.bukkit.entity.LivingEntity; -import org.bukkit.entity.LlamaSpit; -import org.bukkit.entity.Player; -import org.bukkit.entity.Projectile; -import org.bukkit.entity.ShulkerBullet; -import org.bukkit.entity.SmallFireball; -import org.bukkit.entity.Snowball; -import org.bukkit.entity.SpectralArrow; -import org.bukkit.entity.ThrownExpBottle; -import org.bukkit.entity.ThrownPotion; -import org.bukkit.entity.TippedArrow; -import org.bukkit.entity.Trident; -import org.bukkit.entity.WitherSkull; +import org.bukkit.entity.*; import org.bukkit.entity.memory.MemoryKey; import org.bukkit.event.entity.EntityPotionEffectEvent; import org.bukkit.event.player.PlayerTeleportEvent; @@ -89,6 +32,8 @@ import org.bukkit.util.BlockIterator; import org.bukkit.util.RayTraceResult; import org.bukkit.util.Vector; +import java.util.*; + public class CraftLivingEntity extends CraftEntity implements LivingEntity { private CraftEntityEquipment equipment; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartChest.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartChest.java index ab4807b2cd3cdcd61d8ac4ae2825df69dd2b7c64..6cf5d3a3bc91e11110a35ea52d8172307d862e09 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartChest.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartChest.java @@ -1,6 +1,6 @@ package org.bukkit.craftbukkit.entity; -import com.destroystokyo.paper.loottable.PaperLootableEntityInventory; // Paper +import com.destroystokyo.paper.loottable.PaperLootableEntityInventory; import net.minecraft.server.EntityMinecartChest; import org.bukkit.craftbukkit.CraftServer; import org.bukkit.craftbukkit.inventory.CraftInventory; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartCommand.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartCommand.java index 89affac56d40ed4b20d5ddd668d0f820bad72a3f..430ce5f831e1e15ea054338098f05f685f9cc388 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartCommand.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartCommand.java @@ -1,6 +1,5 @@ package org.bukkit.craftbukkit.entity; -import java.util.Set; import net.minecraft.server.EntityMinecartCommandBlock; import org.bukkit.Bukkit; import org.bukkit.Server; @@ -14,6 +13,8 @@ import org.bukkit.permissions.PermissionAttachment; import org.bukkit.permissions.PermissionAttachmentInfo; import org.bukkit.plugin.Plugin; +import java.util.Set; + public class CraftMinecartCommand extends CraftMinecart implements CommandMinecart { private final PermissibleBase perm = new PermissibleBase(this); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartHopper.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartHopper.java index f5b31237fc6e62345edcc3d6b02ff9e94237ae31..326478d8e79bec0f5523badae09f0279b6faf99e 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartHopper.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartHopper.java @@ -1,6 +1,6 @@ package org.bukkit.craftbukkit.entity; -import com.destroystokyo.paper.loottable.PaperLootableEntityInventory; // Paper +import com.destroystokyo.paper.loottable.PaperLootableEntityInventory; import net.minecraft.server.EntityMinecartHopper; import org.bukkit.craftbukkit.CraftServer; import org.bukkit.craftbukkit.inventory.CraftInventory; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java index adf918fd757fe3147f897de3ade64a9adf1d3203..3dbf0254047bc0c8a0bb06091b7e4407f285832c 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1,8 +1,8 @@ package org.bukkit.craftbukkit.entity; +import com.destroystokyo.paper.ClientOption; import com.destroystokyo.paper.ClientOption.ChatVisibility; import com.destroystokyo.paper.PaperSkinParts; -import com.destroystokyo.paper.ClientOption; import com.destroystokyo.paper.Title; import com.destroystokyo.paper.profile.CraftPlayerProfile; import com.destroystokyo.paper.profile.PlayerProfile; @@ -11,99 +11,21 @@ import com.google.common.collect.ImmutableSet; import com.google.common.io.BaseEncoding; import com.mojang.authlib.GameProfile; import io.netty.buffer.Unpooled; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.lang.ref.WeakReference; -import java.net.InetSocketAddress; -import java.net.SocketAddress; -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashMap; -import java.util.HashSet; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import java.util.Set; -import java.util.UUID; -import java.util.WeakHashMap; -import java.util.logging.Level; -import java.util.logging.Logger; -import javax.annotation.Nullable; -import net.minecraft.server.AdvancementDataPlayer; -import net.minecraft.server.AdvancementProgress; -import net.minecraft.server.AttributeMapBase; -import net.minecraft.server.AttributeModifiable; -import net.minecraft.server.BlockPosition; -import net.minecraft.server.ChatComponentText; -import net.minecraft.server.ChatMessageType; -import net.minecraft.server.Container; -import net.minecraft.server.Entity; -import net.minecraft.server.EntityHuman; -import net.minecraft.server.EntityLiving; -import net.minecraft.server.EntityPlayer; -import net.minecraft.server.EnumColor; -import net.minecraft.server.EnumGamemode; -import net.minecraft.server.GenericAttributes; -import net.minecraft.server.IChatBaseComponent; -import net.minecraft.server.MCUtil; -import net.minecraft.server.MapIcon; -import net.minecraft.server.MinecraftKey; -import net.minecraft.server.NBTTagCompound; -import net.minecraft.server.PacketDataSerializer; -import net.minecraft.server.PacketPlayOutBlockChange; -import net.minecraft.server.PacketPlayOutChat; -import net.minecraft.server.PacketPlayOutCustomPayload; -import net.minecraft.server.PacketPlayOutCustomSoundEffect; -import net.minecraft.server.PacketPlayOutExperience; -import net.minecraft.server.PacketPlayOutMap; -import net.minecraft.server.PacketPlayOutNamedSoundEffect; -import net.minecraft.server.PacketPlayOutPlayerInfo; -import net.minecraft.server.PacketPlayOutPlayerListHeaderFooter; -import net.minecraft.server.PacketPlayOutSpawnPosition; -import net.minecraft.server.PacketPlayOutStopSound; -import net.minecraft.server.PacketPlayOutTitle; -import net.minecraft.server.PacketPlayOutUpdateAttributes; -import net.minecraft.server.PacketPlayOutUpdateHealth; -import net.minecraft.server.PacketPlayOutWorldEvent; -import net.minecraft.server.PacketPlayOutWorldParticles; -import net.minecraft.server.PlayerChunkMap; -import net.minecraft.server.PlayerConnection; -import net.minecraft.server.SystemUtils; -import net.minecraft.server.TileEntitySign; -import net.minecraft.server.Vec3D; -import net.minecraft.server.WhiteListEntry; -import net.minecraft.server.WorldServer; +import net.md_5.bungee.api.chat.BaseComponent; +import net.minecraft.server.*; import org.apache.commons.lang.NotImplementedException; import org.apache.commons.lang.Validate; -import org.bukkit.BanList; -import org.bukkit.Bukkit; -import org.bukkit.DyeColor; -import org.bukkit.Effect; -import org.bukkit.GameMode; -import org.bukkit.Instrument; -import org.bukkit.Location; import org.bukkit.Material; -import org.bukkit.NamespacedKey; -import org.bukkit.Note; -import org.bukkit.OfflinePlayer; import org.bukkit.Particle; -import org.bukkit.Sound; import org.bukkit.Statistic; -import org.bukkit.WeatherType; import org.bukkit.World; +import org.bukkit.*; import org.bukkit.block.data.BlockData; import org.bukkit.configuration.serialization.DelegateDeserialization; import org.bukkit.conversations.Conversation; import org.bukkit.conversations.ConversationAbandonedEvent; import org.bukkit.conversations.ManuallyAbandonedConversationCanceller; -import org.bukkit.craftbukkit.CraftEffect; -import org.bukkit.craftbukkit.CraftOfflinePlayer; -import org.bukkit.craftbukkit.CraftParticle; -import org.bukkit.craftbukkit.CraftServer; -import org.bukkit.craftbukkit.CraftSound; -import org.bukkit.craftbukkit.CraftStatistic; -import org.bukkit.craftbukkit.CraftWorld; +import org.bukkit.craftbukkit.*; import org.bukkit.craftbukkit.advancement.CraftAdvancement; import org.bukkit.craftbukkit.advancement.CraftAdvancementProgress; import org.bukkit.craftbukkit.block.CraftSign; @@ -129,7 +51,15 @@ import org.bukkit.plugin.Plugin; import org.bukkit.plugin.messaging.StandardMessenger; import org.bukkit.scoreboard.Scoreboard; -import net.md_5.bungee.api.chat.BaseComponent; // Spigot +import javax.annotation.Nullable; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.lang.ref.WeakReference; +import java.net.InetSocketAddress; +import java.net.SocketAddress; +import java.util.*; +import java.util.logging.Level; +import java.util.logging.Logger; @DelegateDeserialization(CraftOfflinePlayer.class) public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftTameableAnimal.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftTameableAnimal.java index 6a642155cf387f7d0e2cf9bdf1a78c62aef8205b..eaef6458d62093667c620a267a0bcd1d5761fef4 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftTameableAnimal.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftTameableAnimal.java @@ -1,12 +1,13 @@ package org.bukkit.craftbukkit.entity; -import java.util.UUID; import net.minecraft.server.EntityTameableAnimal; import org.bukkit.craftbukkit.CraftServer; import org.bukkit.entity.AnimalTamer; import org.bukkit.entity.Creature; import org.bukkit.entity.Tameable; +import java.util.UUID; + public class CraftTameableAnimal extends CraftAnimals implements Tameable, Creature { public CraftTameableAnimal(CraftServer server, EntityTameableAnimal entity) { super(server, entity); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftThrownPotion.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftThrownPotion.java index 2400f33093639dcf70884b939da2426a8821f1b9..d23f625d17f96237ffa85c335456b0d86dd12706 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftThrownPotion.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftThrownPotion.java @@ -1,7 +1,6 @@ package org.bukkit.craftbukkit.entity; import com.google.common.collect.ImmutableList; -import java.util.Collection; import net.minecraft.server.EntityPotion; import net.minecraft.server.MobEffect; import net.minecraft.server.PotionUtil; @@ -15,6 +14,8 @@ import org.bukkit.entity.ThrownPotion; import org.bukkit.inventory.ItemStack; import org.bukkit.potion.PotionEffect; +import java.util.Collection; + public class CraftThrownPotion extends CraftProjectile implements ThrownPotion { public CraftThrownPotion(CraftServer server, EntityPotion entity) { super(server, entity); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftTippedArrow.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftTippedArrow.java index ecdaa2b97f48486362eedded188fec4246117d8e..dabe6775f5b8a00cba52a4a304201a5762141a76 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftTippedArrow.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftTippedArrow.java @@ -1,7 +1,6 @@ package org.bukkit.craftbukkit.entity; import com.google.common.collect.ImmutableList; -import java.util.List; import net.minecraft.server.EntityTippedArrow; import net.minecraft.server.MobEffect; import net.minecraft.server.MobEffectList; @@ -15,6 +14,8 @@ import org.bukkit.potion.PotionData; import org.bukkit.potion.PotionEffect; import org.bukkit.potion.PotionEffectType; +import java.util.List; + public class CraftTippedArrow extends CraftArrow implements Arrow { public CraftTippedArrow(CraftServer server, EntityTippedArrow entity) { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftTropicalFish.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftTropicalFish.java index 9243381a2fbdf255b3772000ba1c4653871ab976..5c6523bfa26d94da2eaade55aea740c436a5138e 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftTropicalFish.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftTropicalFish.java @@ -1,13 +1,14 @@ package org.bukkit.craftbukkit.entity; -import java.util.HashMap; -import java.util.Map; import net.minecraft.server.EntityTropicalFish; import org.bukkit.DyeColor; import org.bukkit.craftbukkit.CraftServer; import org.bukkit.entity.EntityType; import org.bukkit.entity.TropicalFish; +import java.util.HashMap; +import java.util.Map; + public class CraftTropicalFish extends CraftFish implements TropicalFish { public CraftTropicalFish(CraftServer server, EntityTropicalFish entity) { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java index 85a7406048a5d44b8e26d7949feacb7ec12c575c..a9ead9a050998bca4f855ad31d669e5aa0c4fdfd 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java @@ -1,19 +1,9 @@ package org.bukkit.craftbukkit.entity; -import com.destroystokyo.paper.entity.villager.Reputation; // Paper +import com.destroystokyo.paper.entity.villager.Reputation; import com.google.common.base.Preconditions; -import com.google.common.collect.Maps; // Paper - -import java.util.HashMap; -import java.util.Locale; -import net.minecraft.server.BlockBed; -import net.minecraft.server.BlockPosition; -import java.util.Map; // Paper -import java.util.UUID; // Paper -import net.minecraft.server.EntityVillager; -import net.minecraft.server.IBlockData; -import net.minecraft.server.IRegistry; -import net.minecraft.server.VillagerProfession; +import com.google.common.collect.Maps; +import net.minecraft.server.*; import org.apache.commons.lang.Validate; import org.bukkit.Location; import org.bukkit.craftbukkit.CraftServer; @@ -21,6 +11,11 @@ import org.bukkit.craftbukkit.util.CraftNamespacedKey; import org.bukkit.entity.EntityType; import org.bukkit.entity.Villager; +import java.util.HashMap; +import java.util.Locale; +import java.util.Map; +import java.util.UUID; + public class CraftVillager extends CraftAbstractVillager implements Villager { public CraftVillager(CraftServer server, EntityVillager entity) { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftVillagerZombie.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftVillagerZombie.java index 2c8f157a928c6a05575eb2760be2b40cc3fda293..60d3135d5a503a982bea7f3738f2439c57244057 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftVillagerZombie.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftVillagerZombie.java @@ -1,8 +1,6 @@ package org.bukkit.craftbukkit.entity; import com.google.common.base.Preconditions; -import java.util.Locale; -import java.util.UUID; import net.minecraft.server.EntityZombieVillager; import net.minecraft.server.IRegistry; import net.minecraft.server.MinecraftKey; @@ -16,6 +14,9 @@ import org.bukkit.entity.EntityType; import org.bukkit.entity.Villager; import org.bukkit.entity.ZombieVillager; +import java.util.Locale; +import java.util.UUID; + public class CraftVillagerZombie extends CraftZombie implements ZombieVillager { public CraftVillagerZombie(CraftServer server, EntityZombieVillager entity) { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftWitch.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftWitch.java index b43a2bbd5bfd613887a7ae1519f6e729faf9bcc2..e1f23f1a5cf535129b150edaaae7b0e754cd2442 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftWitch.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftWitch.java @@ -1,14 +1,13 @@ package org.bukkit.craftbukkit.entity; -import net.minecraft.server.EntityWitch; -import org.bukkit.craftbukkit.CraftServer; -import org.bukkit.entity.EntityType; -import org.bukkit.entity.Witch; -// Paper start import com.destroystokyo.paper.entity.CraftRangedEntity; import com.google.common.base.Preconditions; +import net.minecraft.server.EntityWitch; import org.bukkit.Material; +import org.bukkit.craftbukkit.CraftServer; import org.bukkit.craftbukkit.inventory.CraftItemStack; +import org.bukkit.entity.EntityType; +import org.bukkit.entity.Witch; import org.bukkit.inventory.ItemStack; // Paper end diff --git a/src/main/java/org/bukkit/craftbukkit/entity/memory/CraftMemoryMapper.java b/src/main/java/org/bukkit/craftbukkit/entity/memory/CraftMemoryMapper.java index 0616cdf196d734312b3ce62e4e032119a9b46499..e96c9887cf6900ef75d289ab97533635fb9244b9 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/memory/CraftMemoryMapper.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/memory/CraftMemoryMapper.java @@ -1,6 +1,5 @@ package org.bukkit.craftbukkit.entity.memory; -import java.util.UUID; import net.minecraft.server.BlockPosition; import net.minecraft.server.GlobalPos; import org.bukkit.Bukkit; @@ -8,6 +7,8 @@ import org.bukkit.Location; import org.bukkit.craftbukkit.CraftServer; import org.bukkit.craftbukkit.CraftWorld; +import java.util.UUID; + public final class CraftMemoryMapper { private CraftMemoryMapper() {} diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java index 6b01f0493c4905142c2c2038e8e57adc3d37c02b..a3fc8c0b641f0224affc399a73ef55f324c336b4 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -4,85 +4,18 @@ import com.google.common.base.Function; import com.google.common.base.Functions; import com.google.common.collect.Lists; import com.mojang.datafixers.util.Either; -import java.net.InetAddress; -import java.util.ArrayList; -import java.util.Collections; -import java.util.EnumMap; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; -import javax.annotation.Nullable; -import net.minecraft.server.BlockPosition; -import net.minecraft.server.BlockPropertyInstrument; -import net.minecraft.server.ChatMessage; -import net.minecraft.server.ChatModifier; -import net.minecraft.server.Container; -import net.minecraft.server.ContainerMerchant; -import net.minecraft.server.DamageSource; import net.minecraft.server.Entity; -import net.minecraft.server.EntityAnimal; -import net.minecraft.server.EntityAreaEffectCloud; -import net.minecraft.server.EntityDamageSource; -import net.minecraft.server.EntityDamageSourceIndirect; -import net.minecraft.server.EntityEnderCrystal; -import net.minecraft.server.EntityEnderDragon; -import net.minecraft.server.EntityExperienceOrb; -import net.minecraft.server.EntityFireworks; -import net.minecraft.server.EntityGhast; -import net.minecraft.server.EntityGolem; -import net.minecraft.server.EntityHuman; -import net.minecraft.server.EntityInsentient; -import net.minecraft.server.EntityItem; -import net.minecraft.server.EntityLiving; -import net.minecraft.server.EntityMonster; -import net.minecraft.server.EntityPlayer; -import net.minecraft.server.EntityPotion; -import net.minecraft.server.EntityRaider; -import net.minecraft.server.EntitySlime; -import net.minecraft.server.EntityStrider; -import net.minecraft.server.EntityTypes; -import net.minecraft.server.EntityVillager; -import net.minecraft.server.EntityWaterAnimal; -import net.minecraft.server.EnumDirection; -import net.minecraft.server.EnumHand; -import net.minecraft.server.EnumItemSlot; -import net.minecraft.server.Explosion; -import net.minecraft.server.GeneratorAccess; -import net.minecraft.server.IBlockData; -import net.minecraft.server.IChatBaseComponent; -import net.minecraft.server.IInventory; -import net.minecraft.server.IProjectile; -import net.minecraft.server.ItemActionContext; -import net.minecraft.server.ItemStack; -import net.minecraft.server.Items; -import net.minecraft.server.LootContextParameters; -import net.minecraft.server.LootTable; -import net.minecraft.server.LootTableInfo; -import net.minecraft.server.MinecraftKey; -import net.minecraft.server.MobEffect; -import net.minecraft.server.MovingObjectPosition; -import net.minecraft.server.MovingObjectPositionBlock; -import net.minecraft.server.MovingObjectPositionEntity; import net.minecraft.server.NPC; -import net.minecraft.server.PacketPlayInCloseWindow; import net.minecraft.server.Raid; -import net.minecraft.server.Unit; import net.minecraft.server.World; -import net.minecraft.server.WorldServer; -import org.bukkit.Bukkit; -import org.bukkit.Location; +import net.minecraft.server.*; import org.bukkit.Material; -import org.bukkit.NamespacedKey; -import org.bukkit.Server; +import org.bukkit.*; import org.bukkit.Statistic.Type; import org.bukkit.block.Block; import org.bukkit.block.BlockFace; import org.bukkit.block.BlockState; -import org.bukkit.craftbukkit.CraftLootTable; -import org.bukkit.craftbukkit.CraftRaid; -import org.bukkit.craftbukkit.CraftServer; -import org.bukkit.craftbukkit.CraftStatistic; -import org.bukkit.craftbukkit.CraftWorld; +import org.bukkit.craftbukkit.*; import org.bukkit.craftbukkit.block.CraftBlock; import org.bukkit.craftbukkit.block.CraftBlockState; import org.bukkit.craftbukkit.block.data.CraftBlockData; @@ -97,116 +30,21 @@ import org.bukkit.craftbukkit.potion.CraftPotionUtil; import org.bukkit.craftbukkit.util.CraftDamageSource; import org.bukkit.craftbukkit.util.CraftMagicNumbers; import org.bukkit.craftbukkit.util.CraftNamespacedKey; -import org.bukkit.entity.AbstractHorse; -import org.bukkit.entity.Animals; -import org.bukkit.entity.AreaEffectCloud; -import org.bukkit.entity.Bat; -import org.bukkit.entity.Creeper; -import org.bukkit.entity.EntityType; -import org.bukkit.entity.ExperienceOrb; -import org.bukkit.entity.Firework; -import org.bukkit.entity.HumanEntity; import org.bukkit.entity.Item; -import org.bukkit.entity.LightningStrike; -import org.bukkit.entity.LivingEntity; -import org.bukkit.entity.Pig; -import org.bukkit.entity.PigZombie; -import org.bukkit.entity.Player; -import org.bukkit.entity.Projectile; -import org.bukkit.entity.Raider; -import org.bukkit.entity.Strider; -import org.bukkit.entity.ThrownExpBottle; -import org.bukkit.entity.ThrownPotion; -import org.bukkit.entity.Vehicle; -import org.bukkit.entity.Villager; +import org.bukkit.entity.*; import org.bukkit.entity.Villager.Profession; -import org.bukkit.entity.ExperienceOrb; // Paper import org.bukkit.event.Cancellable; import org.bukkit.event.Event; import org.bukkit.event.Event.Result; -import org.bukkit.event.block.Action; -import org.bukkit.event.block.BlockDamageEvent; -import org.bukkit.event.block.BlockDropItemEvent; -import org.bukkit.event.block.BlockFadeEvent; -import org.bukkit.event.block.BlockFormEvent; -import org.bukkit.event.block.BlockGrowEvent; -import org.bukkit.event.block.BlockIgniteEvent; +import org.bukkit.event.block.*; import org.bukkit.event.block.BlockIgniteEvent.IgniteCause; -import org.bukkit.event.block.BlockMultiPlaceEvent; -import org.bukkit.event.block.BlockPhysicsEvent; -import org.bukkit.event.block.BlockPlaceEvent; -import org.bukkit.event.block.BlockRedstoneEvent; -import org.bukkit.event.block.BlockShearEntityEvent; -import org.bukkit.event.block.BlockSpreadEvent; -import org.bukkit.event.block.EntityBlockFormEvent; -import org.bukkit.event.block.FluidLevelChangeEvent; -import org.bukkit.event.block.MoistureChangeEvent; -import org.bukkit.event.block.NotePlayEvent; -import org.bukkit.event.entity.AreaEffectCloudApplyEvent; -import org.bukkit.event.entity.BatToggleSleepEvent; -import org.bukkit.event.entity.CreatureSpawnEvent; +import org.bukkit.event.entity.*; import org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason; -import org.bukkit.event.entity.CreeperPowerEvent; -import org.bukkit.event.entity.EntityBreakDoorEvent; -import org.bukkit.event.entity.EntityBreedEvent; -import org.bukkit.event.entity.EntityChangeBlockEvent; -import org.bukkit.event.entity.EntityDamageByBlockEvent; -import org.bukkit.event.entity.EntityDamageByEntityEvent; -import org.bukkit.event.entity.EntityDamageEvent; import org.bukkit.event.entity.EntityDamageEvent.DamageCause; import org.bukkit.event.entity.EntityDamageEvent.DamageModifier; -import org.bukkit.event.entity.EntityDeathEvent; -import org.bukkit.event.entity.EntityEnterLoveModeEvent; -import org.bukkit.event.entity.EntityPickupItemEvent; -import org.bukkit.event.entity.EntityPlaceEvent; -import org.bukkit.event.entity.EntityPortalEvent; -import org.bukkit.event.entity.EntityPotionEffectEvent; -import org.bukkit.event.entity.EntityShootBowEvent; -import org.bukkit.event.entity.EntitySpawnEvent; -import org.bukkit.event.entity.EntityTameEvent; -import org.bukkit.event.entity.EntityTargetEvent; -import org.bukkit.event.entity.EntityTargetLivingEntityEvent; -import org.bukkit.event.entity.EntityToggleGlideEvent; -import org.bukkit.event.entity.EntityToggleSwimEvent; -import org.bukkit.event.entity.EntityTransformEvent; -import org.bukkit.event.entity.ExpBottleEvent; -import org.bukkit.event.entity.FireworkExplodeEvent; -import org.bukkit.event.entity.FoodLevelChangeEvent; -import org.bukkit.event.entity.HorseJumpEvent; -import org.bukkit.event.entity.ItemDespawnEvent; -import org.bukkit.event.entity.ItemMergeEvent; -import org.bukkit.event.entity.ItemSpawnEvent; -import org.bukkit.event.entity.LingeringPotionSplashEvent; -import org.bukkit.event.entity.PigZapEvent; -import org.bukkit.event.entity.PlayerDeathEvent; -import org.bukkit.event.entity.PlayerLeashEntityEvent; -import org.bukkit.event.entity.PotionSplashEvent; -import org.bukkit.event.entity.ProjectileHitEvent; -import org.bukkit.event.entity.ProjectileLaunchEvent; -import org.bukkit.event.entity.StriderTemperatureChangeEvent; -import org.bukkit.event.entity.VillagerCareerChangeEvent; -import org.bukkit.event.inventory.InventoryCloseEvent; -import org.bukkit.event.inventory.InventoryOpenEvent; -import org.bukkit.event.inventory.PrepareAnvilEvent; -import org.bukkit.event.inventory.PrepareItemCraftEvent; -import org.bukkit.event.inventory.PrepareSmithingEvent; -import org.bukkit.event.inventory.TradeSelectEvent; -import org.bukkit.event.player.PlayerBedEnterEvent; +import org.bukkit.event.inventory.*; +import org.bukkit.event.player.*; import org.bukkit.event.player.PlayerBedEnterEvent.BedEnterResult; -import org.bukkit.event.player.PlayerBucketEmptyEvent; -import org.bukkit.event.player.PlayerBucketFillEvent; -import org.bukkit.event.player.PlayerEditBookEvent; -import org.bukkit.event.player.PlayerEvent; -import org.bukkit.event.player.PlayerExpChangeEvent; -import org.bukkit.event.player.PlayerHarvestBlockEvent; -import org.bukkit.event.player.PlayerInteractEvent; -import org.bukkit.event.player.PlayerItemBreakEvent; -import org.bukkit.event.player.PlayerItemMendEvent; -import org.bukkit.event.player.PlayerLevelChangeEvent; -import org.bukkit.event.player.PlayerRecipeDiscoverEvent; -import org.bukkit.event.player.PlayerShearEntityEvent; -import org.bukkit.event.player.PlayerStatisticIncrementEvent; -import org.bukkit.event.player.PlayerUnleashEntityEvent; import org.bukkit.event.raid.RaidFinishEvent; import org.bukkit.event.raid.RaidSpawnWaveEvent; import org.bukkit.event.raid.RaidStopEvent; @@ -218,9 +56,11 @@ import org.bukkit.inventory.EquipmentSlot; import org.bukkit.inventory.InventoryView; import org.bukkit.inventory.meta.BookMeta; import org.bukkit.potion.PotionEffect; -import org.bukkit.projectiles.ProjectileSource; -import org.bukkit.event.entity.SpawnerSpawnEvent; // Spigot +import javax.annotation.Nullable; +import java.net.InetAddress; +import java.util.*; +import java.util.stream.Collectors; public class CraftEventFactory { public static final DamageSource MELTING = CraftDamageSource.copyOf(DamageSource.BURN); diff --git a/src/main/java/org/bukkit/craftbukkit/generator/CraftChunkData.java b/src/main/java/org/bukkit/craftbukkit/generator/CraftChunkData.java index ab43c97e8fdcb977ed6349e4163e8ba115588adf..baa14fe42eb07cdc10cf58580478af585f680697 100644 --- a/src/main/java/org/bukkit/craftbukkit/generator/CraftChunkData.java +++ b/src/main/java/org/bukkit/craftbukkit/generator/CraftChunkData.java @@ -1,7 +1,5 @@ package org.bukkit.craftbukkit.generator; -import java.util.HashSet; -import java.util.Set; import net.minecraft.server.BlockPosition; import net.minecraft.server.Blocks; import net.minecraft.server.ChunkSection; @@ -14,6 +12,9 @@ import org.bukkit.craftbukkit.util.CraftMagicNumbers; import org.bukkit.generator.ChunkGenerator; import org.bukkit.material.MaterialData; +import java.util.HashSet; +import java.util.Set; + /** * Data to be used for the block types and data in a newly generated chunk. */ diff --git a/src/main/java/org/bukkit/craftbukkit/generator/CustomChunkGenerator.java b/src/main/java/org/bukkit/craftbukkit/generator/CustomChunkGenerator.java index b53d44f0c2dd5f4f2033d4017ee9d6e2d0b6e7ae..afdec465f7b739e8f54b2d2127dd1725997e71a2 100644 --- a/src/main/java/org/bukkit/craftbukkit/generator/CustomChunkGenerator.java +++ b/src/main/java/org/bukkit/craftbukkit/generator/CustomChunkGenerator.java @@ -2,39 +2,16 @@ package org.bukkit.craftbukkit.generator; import com.google.common.base.Preconditions; import com.mojang.serialization.Codec; -import java.util.List; -import java.util.Random; -import net.minecraft.server.BiomeBase; -import net.minecraft.server.BiomeManager; -import net.minecraft.server.BiomeStorage; -import net.minecraft.server.Block; -import net.minecraft.server.BlockPosition; -import net.minecraft.server.ChunkSection; -import net.minecraft.server.DefinedStructureManager; -import net.minecraft.server.DimensionManager; -import net.minecraft.server.EnumCreatureType; -import net.minecraft.server.GeneratorAccess; -import net.minecraft.server.HeightMap; -import net.minecraft.server.IBlockAccess; -import net.minecraft.server.IChunkAccess; -import net.minecraft.server.ITileEntity; -import net.minecraft.server.ProtoChunk; -import net.minecraft.server.RegionLimitedWorldAccess; -import net.minecraft.server.RegistryMaterials; -import net.minecraft.server.StructureManager; -import net.minecraft.server.StructureSettings; -import net.minecraft.server.TileEntity; -import net.minecraft.server.WorldChunkManager; -import net.minecraft.server.WorldDimension; -import net.minecraft.server.WorldGenStage; -import net.minecraft.server.WorldServer; -import org.bukkit.World; +import net.minecraft.server.*; import org.bukkit.block.Biome; import org.bukkit.craftbukkit.block.CraftBlock; import org.bukkit.generator.ChunkGenerator; import org.bukkit.generator.ChunkGenerator.BiomeGrid; import org.bukkit.generator.ChunkGenerator.ChunkData; +import java.util.List; +import java.util.Random; + public class CustomChunkGenerator extends InternalChunkGenerator { private final net.minecraft.server.ChunkGenerator delegate; private final ChunkGenerator generator; diff --git a/src/main/java/org/bukkit/craftbukkit/help/CustomIndexHelpTopic.java b/src/main/java/org/bukkit/craftbukkit/help/CustomIndexHelpTopic.java index 77134d74bdfe9a56e858deb4cdbdef0b1b7ebc58..2089a5f524220178ca231dd569ab0a963552d5be 100644 --- a/src/main/java/org/bukkit/craftbukkit/help/CustomIndexHelpTopic.java +++ b/src/main/java/org/bukkit/craftbukkit/help/CustomIndexHelpTopic.java @@ -1,13 +1,14 @@ package org.bukkit.craftbukkit.help; -import java.util.HashSet; -import java.util.LinkedList; -import java.util.List; import org.bukkit.command.CommandSender; import org.bukkit.help.HelpMap; import org.bukkit.help.HelpTopic; import org.bukkit.help.IndexHelpTopic; +import java.util.HashSet; +import java.util.LinkedList; +import java.util.List; + /** */ public class CustomIndexHelpTopic extends IndexHelpTopic { diff --git a/src/main/java/org/bukkit/craftbukkit/help/HelpYamlReader.java b/src/main/java/org/bukkit/craftbukkit/help/HelpYamlReader.java index d3f17d4cde99c4948244f53e6f54326e4f180b99..4b710c12045aa19a42bd62c9008b19dc2b62ff99 100644 --- a/src/main/java/org/bukkit/craftbukkit/help/HelpYamlReader.java +++ b/src/main/java/org/bukkit/craftbukkit/help/HelpYamlReader.java @@ -1,17 +1,18 @@ package org.bukkit.craftbukkit.help; import com.google.common.base.Charsets; +import org.bukkit.ChatColor; +import org.bukkit.Server; +import org.bukkit.configuration.ConfigurationSection; +import org.bukkit.configuration.file.YamlConfiguration; +import org.bukkit.help.HelpTopic; + import java.io.File; import java.io.IOException; import java.io.InputStreamReader; import java.util.LinkedList; import java.util.List; import java.util.logging.Level; -import org.bukkit.ChatColor; -import org.bukkit.Server; -import org.bukkit.configuration.ConfigurationSection; -import org.bukkit.configuration.file.YamlConfiguration; -import org.bukkit.help.HelpTopic; /** * HelpYamlReader is responsible for processing the contents of the help.yml file. diff --git a/src/main/java/org/bukkit/craftbukkit/help/SimpleHelpMap.java b/src/main/java/org/bukkit/craftbukkit/help/SimpleHelpMap.java index 2358ba5bdc64f6c003a2b9f5f36364bf2328a0a8..4a554b5727112cdd8528dfd0df032c049ec77b5e 100644 --- a/src/main/java/org/bukkit/craftbukkit/help/SimpleHelpMap.java +++ b/src/main/java/org/bukkit/craftbukkit/help/SimpleHelpMap.java @@ -3,28 +3,13 @@ package org.bukkit.craftbukkit.help; import com.google.common.base.Predicate; import com.google.common.base.Predicates; import com.google.common.collect.Collections2; -import java.util.Collection; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.TreeMap; -import java.util.TreeSet; -import org.bukkit.command.Command; -import org.bukkit.command.CommandExecutor; -import org.bukkit.command.MultipleCommandAlias; -import org.bukkit.command.PluginCommand; -import org.bukkit.command.PluginIdentifiableCommand; +import org.bukkit.command.*; import org.bukkit.command.defaults.BukkitCommand; import org.bukkit.craftbukkit.CraftServer; import org.bukkit.craftbukkit.command.VanillaCommandWrapper; -import org.bukkit.help.GenericCommandHelpTopic; -import org.bukkit.help.HelpMap; -import org.bukkit.help.HelpTopic; -import org.bukkit.help.HelpTopicComparator; -import org.bukkit.help.HelpTopicFactory; -import org.bukkit.help.IndexHelpTopic; +import org.bukkit.help.*; + +import java.util.*; /** * Standard implementation of {@link HelpMap} for CraftBukkit servers. diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java index 8c714c7430c0a6b8fd7f4a158d9a271e1642bd7a..22102f154964dafd1ee61eae85fdd7006237c9e5 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java @@ -1,34 +1,6 @@ package org.bukkit.craftbukkit.inventory; -import net.minecraft.server.ChatComponentText; -import net.minecraft.server.Container; -import net.minecraft.server.ContainerAnvil; -import net.minecraft.server.ContainerBeacon; -import net.minecraft.server.ContainerBlastFurnace; -import net.minecraft.server.ContainerBrewingStand; -import net.minecraft.server.ContainerCartography; -import net.minecraft.server.ContainerChest; -import net.minecraft.server.ContainerDispenser; -import net.minecraft.server.ContainerEnchantTable; -import net.minecraft.server.ContainerFurnaceFurnace; -import net.minecraft.server.ContainerGrindstone; -import net.minecraft.server.ContainerHopper; -import net.minecraft.server.ContainerLectern; -import net.minecraft.server.ContainerLoom; -import net.minecraft.server.ContainerMerchant; -import net.minecraft.server.ContainerProperties; -import net.minecraft.server.ContainerShulkerBox; -import net.minecraft.server.ContainerSmithing; -import net.minecraft.server.ContainerSmoker; -import net.minecraft.server.ContainerStonecutter; -import net.minecraft.server.ContainerWorkbench; -import net.minecraft.server.Containers; -import net.minecraft.server.EntityHuman; -import net.minecraft.server.IInventory; -import net.minecraft.server.ItemStack; -import net.minecraft.server.PacketPlayOutOpenWindow; -import net.minecraft.server.PlayerInventory; -import net.minecraft.server.Slot; +import net.minecraft.server.*; import org.bukkit.craftbukkit.entity.CraftPlayer; import org.bukkit.entity.HumanEntity; import org.bukkit.event.inventory.InventoryType; diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java index 7fa5aaff44b44b60d0ddcf08f7e94dbeef4de422..afb6129036c4dd633bb4ecb3b55bb808bb47c751 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java @@ -1,23 +1,6 @@ package org.bukkit.craftbukkit.inventory; -import java.util.HashMap; -import java.util.List; -import java.util.ListIterator; -import net.minecraft.server.IHopper; -import net.minecraft.server.IInventory; -import net.minecraft.server.InventoryCrafting; -import net.minecraft.server.InventoryEnderChest; -import net.minecraft.server.InventoryMerchant; -import net.minecraft.server.PlayerInventory; -import net.minecraft.server.TileEntityBarrel; -import net.minecraft.server.TileEntityBlastFurnace; -import net.minecraft.server.TileEntityBrewingStand; -import net.minecraft.server.TileEntityDispenser; -import net.minecraft.server.TileEntityDropper; -import net.minecraft.server.TileEntityFurnace; -import net.minecraft.server.TileEntityLectern; -import net.minecraft.server.TileEntityShulkerBox; -import net.minecraft.server.TileEntitySmoker; +import net.minecraft.server.*; import org.apache.commons.lang.Validate; import org.bukkit.Location; import org.bukkit.Material; @@ -28,6 +11,10 @@ import org.bukkit.inventory.Inventory; import org.bukkit.inventory.InventoryHolder; import org.bukkit.inventory.ItemStack; +import java.util.HashMap; +import java.util.List; +import java.util.ListIterator; + public class CraftInventory implements Inventory { protected final IInventory inventory; diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryCrafting.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryCrafting.java index 3cf4cd5fa8d7075f7fcc4fd33b002b554ae2cf71..947556832791dcc633c7318c041e694bd45d8b8c 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryCrafting.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryCrafting.java @@ -1,13 +1,14 @@ package org.bukkit.craftbukkit.inventory; -import java.util.Arrays; -import java.util.List; import net.minecraft.server.IInventory; import net.minecraft.server.IRecipe; import org.bukkit.inventory.CraftingInventory; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.Recipe; +import java.util.Arrays; +import java.util.List; + public class CraftInventoryCrafting extends CraftInventory implements CraftingInventory { private final IInventory resultInventory; diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryCustom.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryCustom.java index e1dfdb23f7d755b19cf14c0bf15358095406e9a0..09ba087b7b32ae3a38187a7174444c2a9b1fba3e 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryCustom.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryCustom.java @@ -1,8 +1,5 @@ package org.bukkit.craftbukkit.inventory; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; import net.minecraft.server.EntityHuman; import net.minecraft.server.IInventory; import net.minecraft.server.ItemStack; @@ -14,6 +11,10 @@ import org.bukkit.entity.HumanEntity; import org.bukkit.event.inventory.InventoryType; import org.bukkit.inventory.InventoryHolder; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; + public class CraftInventoryCustom extends CraftInventory { public CraftInventoryCustom(InventoryHolder owner, InventoryType type) { super(new MinecraftInventory(owner, type)); diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java index addb8ef990de3dfbf74969ef4c22276d2fa2614a..967eb9ab814b594247bf999b017af5c38ac3fb4f 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java @@ -1,16 +1,12 @@ package org.bukkit.craftbukkit.inventory; -import static org.bukkit.craftbukkit.inventory.CraftMetaItem.*; import com.google.common.collect.ImmutableMap; -import java.util.Map; -import net.minecraft.server.EnchantmentManager; import net.minecraft.server.Item; import net.minecraft.server.NBTTagCompound; import net.minecraft.server.NBTTagList; import org.apache.commons.lang.Validate; import org.bukkit.Material; import org.bukkit.configuration.serialization.DelegateDeserialization; -import org.bukkit.craftbukkit.enchantments.CraftEnchantment; import org.bukkit.craftbukkit.util.CraftLegacy; import org.bukkit.craftbukkit.util.CraftMagicNumbers; import org.bukkit.craftbukkit.util.CraftNamespacedKey; @@ -19,6 +15,11 @@ import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.ItemMeta; import org.bukkit.material.MaterialData; +import java.util.Map; + +import static org.bukkit.craftbukkit.inventory.CraftMetaItem.ENCHANTMENTS_ID; +import static org.bukkit.craftbukkit.inventory.CraftMetaItem.ENCHANTMENTS_LVL; + @DelegateDeserialization(ItemStack.class) public final class CraftItemStack extends ItemStack { diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMerchant.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMerchant.java index 50bc720d4268804f53b204091c9e8f0c17d8dd23..8cfc359da6caff1e0112cf87c2cb4b025f5add0f 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMerchant.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMerchant.java @@ -2,8 +2,6 @@ package org.bukkit.craftbukkit.inventory; import com.google.common.base.Function; import com.google.common.collect.Lists; -import java.util.Collections; -import java.util.List; import net.minecraft.server.EntityHuman; import net.minecraft.server.IMerchant; import net.minecraft.server.MerchantRecipeList; @@ -11,6 +9,9 @@ import org.bukkit.entity.HumanEntity; import org.bukkit.inventory.Merchant; import org.bukkit.inventory.MerchantRecipe; +import java.util.Collections; +import java.util.List; + public class CraftMerchant implements Merchant { protected final IMerchant merchant; diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMerchantCustom.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMerchantCustom.java index 9f6e797d34e5ad21a496c89f5a45ddb0638d3adc..749b5facb60df384b48d492a08dde0df65dec49e 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMerchantCustom.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMerchantCustom.java @@ -1,15 +1,6 @@ package org.bukkit.craftbukkit.inventory; -import net.minecraft.server.ChatComponentText; -import net.minecraft.server.EntityHuman; -import net.minecraft.server.IChatBaseComponent; -import net.minecraft.server.IMerchant; -import net.minecraft.server.ItemStack; -import net.minecraft.server.MerchantRecipe; -import net.minecraft.server.MerchantRecipeList; -import net.minecraft.server.SoundEffect; -import net.minecraft.server.SoundEffects; -import net.minecraft.server.World; +import net.minecraft.server.*; import org.apache.commons.lang.Validate; public class CraftMerchantCustom extends CraftMerchant { diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMerchantRecipe.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMerchantRecipe.java index e198251617bfd6b0fe932d8bfa5dfcafdac919c2..058bc9839f18d14115611442710eeb3a0d41e1b1 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMerchantRecipe.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMerchantRecipe.java @@ -1,10 +1,11 @@ package org.bukkit.craftbukkit.inventory; import com.google.common.base.Preconditions; -import java.util.List; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.MerchantRecipe; +import java.util.List; + public class CraftMerchantRecipe extends MerchantRecipe { private final net.minecraft.server.MerchantRecipe handle; diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaArmorStand.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaArmorStand.java index 25b310ad3f1bcefd04406b7efd1ffa82519250e1..9f8364761421e75d6e57dfb8b888066d64cbaf2f 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaArmorStand.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaArmorStand.java @@ -1,12 +1,13 @@ package org.bukkit.craftbukkit.inventory; import com.google.common.collect.ImmutableMap.Builder; -import java.util.Map; import net.minecraft.server.NBTBase; import net.minecraft.server.NBTTagCompound; import org.bukkit.Material; import org.bukkit.configuration.serialization.DelegateDeserialization; +import java.util.Map; + @DelegateDeserialization(CraftMetaItem.SerializableMeta.class) public class CraftMetaArmorStand extends CraftMetaItem implements com.destroystokyo.paper.inventory.meta.ArmorStandMeta { // Paper diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBanner.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBanner.java index 87a19622cfcc1e87b3648c3aa11e3d983dd8f624..bd73063c3b9c79c07e4224f5ab741a704c51c6a0 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBanner.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBanner.java @@ -2,9 +2,6 @@ package org.bukkit.craftbukkit.inventory; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; import net.minecraft.server.NBTTagCompound; import net.minecraft.server.NBTTagList; import org.bukkit.DyeColor; @@ -15,6 +12,10 @@ import org.bukkit.configuration.serialization.DelegateDeserialization; import org.bukkit.craftbukkit.util.CraftMagicNumbers; import org.bukkit.inventory.meta.BannerMeta; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + @DelegateDeserialization(CraftMetaItem.SerializableMeta.class) public class CraftMetaBanner extends CraftMetaItem implements BannerMeta { diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBlockState.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBlockState.java index 852e793c0c24bf42f9eb3a5b88e7d0328c7c86fd..83552ce9ba2f7580abc82ef919e918584be150dd 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBlockState.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBlockState.java @@ -2,75 +2,17 @@ package org.bukkit.craftbukkit.inventory; import com.google.common.base.Objects; import com.google.common.collect.ImmutableMap; -import java.util.Map; -import net.minecraft.server.EnumColor; -import net.minecraft.server.NBTBase; -import net.minecraft.server.NBTTagCompound; -import net.minecraft.server.TileEntity; -import net.minecraft.server.TileEntityBanner; -import net.minecraft.server.TileEntityBarrel; -import net.minecraft.server.TileEntityBeacon; -import net.minecraft.server.TileEntityBeehive; -import net.minecraft.server.TileEntityBell; -import net.minecraft.server.TileEntityBlastFurnace; -import net.minecraft.server.TileEntityBrewingStand; -import net.minecraft.server.TileEntityCampfire; -import net.minecraft.server.TileEntityChest; -import net.minecraft.server.TileEntityCommand; -import net.minecraft.server.TileEntityComparator; -import net.minecraft.server.TileEntityDispenser; -import net.minecraft.server.TileEntityDropper; -import net.minecraft.server.TileEntityEnchantTable; -import net.minecraft.server.TileEntityEndGateway; -import net.minecraft.server.TileEntityEnderChest; -import net.minecraft.server.TileEntityFurnaceFurnace; -import net.minecraft.server.TileEntityHopper; -import net.minecraft.server.TileEntityJigsaw; -import net.minecraft.server.TileEntityJukeBox; -import net.minecraft.server.TileEntityLectern; -import net.minecraft.server.TileEntityLightDetector; -import net.minecraft.server.TileEntityMobSpawner; -import net.minecraft.server.TileEntityShulkerBox; -import net.minecraft.server.TileEntitySign; -import net.minecraft.server.TileEntitySkull; -import net.minecraft.server.TileEntitySmoker; -import net.minecraft.server.TileEntityStructure; +import net.minecraft.server.*; import org.apache.commons.lang.Validate; import org.bukkit.Material; import org.bukkit.block.BlockState; import org.bukkit.configuration.serialization.DelegateDeserialization; -import org.bukkit.craftbukkit.block.CraftBanner; -import org.bukkit.craftbukkit.block.CraftBarrel; -import org.bukkit.craftbukkit.block.CraftBeacon; -import org.bukkit.craftbukkit.block.CraftBeehive; -import org.bukkit.craftbukkit.block.CraftBell; -import org.bukkit.craftbukkit.block.CraftBlastFurnace; -import org.bukkit.craftbukkit.block.CraftBlockEntityState; -import org.bukkit.craftbukkit.block.CraftBrewingStand; -import org.bukkit.craftbukkit.block.CraftCampfire; -import org.bukkit.craftbukkit.block.CraftChest; -import org.bukkit.craftbukkit.block.CraftCommandBlock; -import org.bukkit.craftbukkit.block.CraftComparator; -import org.bukkit.craftbukkit.block.CraftCreatureSpawner; -import org.bukkit.craftbukkit.block.CraftDaylightDetector; -import org.bukkit.craftbukkit.block.CraftDispenser; -import org.bukkit.craftbukkit.block.CraftDropper; -import org.bukkit.craftbukkit.block.CraftEnchantingTable; -import org.bukkit.craftbukkit.block.CraftEndGateway; -import org.bukkit.craftbukkit.block.CraftEnderChest; -import org.bukkit.craftbukkit.block.CraftFurnaceFurnace; -import org.bukkit.craftbukkit.block.CraftHopper; -import org.bukkit.craftbukkit.block.CraftJigsaw; -import org.bukkit.craftbukkit.block.CraftJukebox; -import org.bukkit.craftbukkit.block.CraftLectern; -import org.bukkit.craftbukkit.block.CraftShulkerBox; -import org.bukkit.craftbukkit.block.CraftSign; -import org.bukkit.craftbukkit.block.CraftSkull; -import org.bukkit.craftbukkit.block.CraftSmoker; -import org.bukkit.craftbukkit.block.CraftStructureBlock; +import org.bukkit.craftbukkit.block.*; import org.bukkit.craftbukkit.util.CraftMagicNumbers; import org.bukkit.inventory.meta.BlockStateMeta; +import java.util.Map; + @DelegateDeserialization(CraftMetaItem.SerializableMeta.class) public class CraftMetaBlockState extends CraftMetaItem implements BlockStateMeta { diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java index 95ec299687cd4410146f71bd3429bd12ac291a26..abfa2f837b56b33dacba62e656badcc50da75960 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java @@ -2,9 +2,8 @@ package org.bukkit.craftbukkit.inventory; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap.Builder; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; +import net.md_5.bungee.api.chat.BaseComponent; +import net.md_5.bungee.chat.ComponentSerializer; import net.minecraft.server.IChatBaseComponent; import net.minecraft.server.IChatBaseComponent.ChatSerializer; import net.minecraft.server.NBTTagCompound; @@ -18,11 +17,12 @@ import org.bukkit.craftbukkit.util.CraftChatMessage; import org.bukkit.craftbukkit.util.CraftMagicNumbers; import org.bukkit.inventory.meta.BookMeta; -// Spigot start -import static org.spigotmc.ValidateUtils.*; import java.util.AbstractList; -import net.md_5.bungee.api.chat.BaseComponent; -import net.md_5.bungee.chat.ComponentSerializer; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +import static org.spigotmc.ValidateUtils.limit; // Spigot end @DelegateDeserialization(SerializableMeta.class) diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBookSigned.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBookSigned.java index 0ea7a9606b529ed6b8fa12d4e285e0eaea2fa93d..be4ba6b96b5936dbfeaeb227ab7941749d37d84e 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBookSigned.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBookSigned.java @@ -1,7 +1,6 @@ package org.bukkit.craftbukkit.inventory; import com.google.common.collect.ImmutableMap.Builder; -import java.util.Map; import net.minecraft.server.IChatBaseComponent; import net.minecraft.server.IChatBaseComponent.ChatSerializer; import net.minecraft.server.NBTTagCompound; @@ -13,6 +12,8 @@ import org.bukkit.craftbukkit.inventory.CraftMetaItem.SerializableMeta; import org.bukkit.craftbukkit.util.CraftMagicNumbers; import org.bukkit.inventory.meta.BookMeta; +import java.util.Map; + @DelegateDeserialization(SerializableMeta.class) class CraftMetaBookSigned extends CraftMetaBook implements BookMeta { diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaCharge.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaCharge.java index 1ff9ff3f2e97dba2befb4b9f6826cd4aa70c44b9..99e6adf08dda31a72f7d18bfe360b03fd530d108 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaCharge.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaCharge.java @@ -1,7 +1,6 @@ package org.bukkit.craftbukkit.inventory; import com.google.common.collect.ImmutableMap.Builder; -import java.util.Map; import net.minecraft.server.NBTTagCompound; import org.bukkit.FireworkEffect; import org.bukkit.Material; @@ -9,6 +8,8 @@ import org.bukkit.configuration.serialization.DelegateDeserialization; import org.bukkit.craftbukkit.inventory.CraftMetaItem.SerializableMeta; import org.bukkit.inventory.meta.FireworkEffectMeta; +import java.util.Map; + @DelegateDeserialization(SerializableMeta.class) class CraftMetaCharge extends CraftMetaItem implements FireworkEffectMeta { static final ItemMetaKey EXPLOSION = new ItemMetaKey("Explosion", "firework-effect"); diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaCompass.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaCompass.java index 974246499c097e61c33fff857a371a208dbfaded..bc8d3c4824e7c20663a0d9437c7cbc5ca98a6cbe 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaCompass.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaCompass.java @@ -3,13 +3,7 @@ package org.bukkit.craftbukkit.inventory; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableMap.Builder; import com.mojang.serialization.DataResult; -import java.util.Map; -import java.util.Optional; -import net.minecraft.server.DynamicOpsNBT; -import net.minecraft.server.MinecraftServer; -import net.minecraft.server.NBTBase; -import net.minecraft.server.NBTTagCompound; -import net.minecraft.server.ResourceKey; +import net.minecraft.server.*; import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.World; @@ -17,6 +11,9 @@ import org.bukkit.configuration.serialization.DelegateDeserialization; import org.bukkit.craftbukkit.CraftWorld; import org.bukkit.inventory.meta.CompassMeta; +import java.util.Map; +import java.util.Optional; + @DelegateDeserialization(CraftMetaItem.SerializableMeta.class) public class CraftMetaCompass extends CraftMetaItem implements CompassMeta { diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaCrossbow.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaCrossbow.java index 8d3d39943c3ee3bd7dca34b20f46b35c7fa8bffe..75259908f08782b1d9f34ad419b0305694651626 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaCrossbow.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaCrossbow.java @@ -3,9 +3,6 @@ package org.bukkit.craftbukkit.inventory; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; import net.minecraft.server.ItemArrow; import net.minecraft.server.NBTTagCompound; import net.minecraft.server.NBTTagList; @@ -15,6 +12,10 @@ import org.bukkit.craftbukkit.util.CraftMagicNumbers; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.CrossbowMeta; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + @DelegateDeserialization(CraftMetaItem.SerializableMeta.class) public class CraftMetaCrossbow extends CraftMetaItem implements CrossbowMeta { diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaEnchantedBook.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaEnchantedBook.java index f5feea20716cd5e1586a71676fa3272e12d1663f..bcc3b23e39e4e4516655f0b725077567c7fd3ad4 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaEnchantedBook.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaEnchantedBook.java @@ -2,8 +2,6 @@ package org.bukkit.craftbukkit.inventory; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMap.Builder; -import java.util.HashMap; -import java.util.Map; import net.minecraft.server.NBTTagCompound; import org.bukkit.Material; import org.bukkit.configuration.serialization.DelegateDeserialization; @@ -11,6 +9,9 @@ import org.bukkit.craftbukkit.inventory.CraftMetaItem.SerializableMeta; import org.bukkit.enchantments.Enchantment; import org.bukkit.inventory.meta.EnchantmentStorageMeta; +import java.util.HashMap; +import java.util.Map; + @DelegateDeserialization(SerializableMeta.class) class CraftMetaEnchantedBook extends CraftMetaItem implements EnchantmentStorageMeta { static final ItemMetaKey STORED_ENCHANTMENTS = new ItemMetaKey("StoredEnchantments", "stored-enchants"); diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaEntityTag.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaEntityTag.java index 325fec72abeaaeae9cb0a38d144b1a5fb123fb74..53f8d13e99019501e85a9a151e948799160a1d46 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaEntityTag.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaEntityTag.java @@ -1,12 +1,13 @@ package org.bukkit.craftbukkit.inventory; import com.google.common.collect.ImmutableMap.Builder; -import java.util.Map; import net.minecraft.server.NBTBase; import net.minecraft.server.NBTTagCompound; import org.bukkit.Material; import org.bukkit.configuration.serialization.DelegateDeserialization; +import java.util.Map; + @DelegateDeserialization(CraftMetaItem.SerializableMeta.class) public class CraftMetaEntityTag extends CraftMetaItem { diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaFirework.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaFirework.java index e57a0ebf327843c1dc7e33cf48899a938b4d2b04..54820c36311d5bd2a7d5f600ec3deaf92e81b85c 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaFirework.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaFirework.java @@ -2,10 +2,6 @@ package org.bukkit.craftbukkit.inventory; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap.Builder; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; -import java.util.Map; import net.minecraft.server.NBTTagCompound; import net.minecraft.server.NBTTagList; import org.apache.commons.lang.Validate; @@ -20,6 +16,11 @@ import org.bukkit.craftbukkit.inventory.CraftMetaItem.SerializableMeta; import org.bukkit.craftbukkit.util.CraftMagicNumbers; import org.bukkit.inventory.meta.FireworkMeta; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import java.util.Map; + @DelegateDeserialization(SerializableMeta.class) class CraftMetaFirework extends CraftMetaItem implements FireworkMeta { /* diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java index fe27e2f51a7d734cb874f9fd87c15ccb6f5c63fa..23df1af99051e565f03f63f0b5a9acc55575b22f 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java @@ -1,40 +1,12 @@ package org.bukkit.craftbukkit.inventory; +import com.destroystokyo.paper.Namespaced; +import com.destroystokyo.paper.NamespacedTag; import com.google.common.base.Preconditions; import com.google.common.base.Strings; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.ImmutableMultimap; -import com.google.common.collect.LinkedHashMultimap; -import com.google.common.collect.ImmutableSortedMap; // Paper -import com.google.common.collect.Lists; -import com.google.common.collect.Multimap; -import com.google.common.collect.SetMultimap; -import com.google.common.collect.Sets; +import com.google.common.collect.*; import com.google.gson.JsonParseException; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; -import java.lang.reflect.Constructor; -import java.lang.reflect.InvocationTargetException; -import java.util.*; -import java.util.logging.Level; -import java.util.logging.Logger; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; -import net.minecraft.server.ChatComponentText; -import net.minecraft.server.EnumItemSlot; -import net.minecraft.server.IChatBaseComponent; -import net.minecraft.server.ItemBlock; -import net.minecraft.server.NBTBase; -import net.minecraft.server.NBTCompressedStreamTools; -import net.minecraft.server.NBTTagCompound; -import net.minecraft.server.NBTTagList; -import net.minecraft.server.NBTTagString; +import net.minecraft.server.*; import org.apache.commons.codec.binary.Base64; import org.apache.commons.lang.Validate; import org.apache.commons.lang3.EnumUtils; @@ -69,13 +41,22 @@ import org.bukkit.inventory.meta.Repairable; import org.bukkit.inventory.meta.tags.CustomItemTagContainer; import org.bukkit.persistence.PersistentDataContainer; -// Spigot start -import static org.spigotmc.ValidateUtils.*; -// Spigot end +import javax.annotation.Nonnull; +import javax.annotation.Nullable; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; +import java.lang.reflect.Constructor; +import java.lang.reflect.InvocationTargetException; +import java.util.*; +import java.util.logging.Level; +import java.util.logging.Logger; -// Paper start -import com.destroystokyo.paper.Namespaced; -import com.destroystokyo.paper.NamespacedTag; +import static org.spigotmc.ValidateUtils.limit; // Paper end /** diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaKnowledgeBook.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaKnowledgeBook.java index 8c86fe2084d5022a2fdd4d4d8d5dca045fe45f82..40d22683be2b0da5c2d11898bb8df81d3c07a19a 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaKnowledgeBook.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaKnowledgeBook.java @@ -1,10 +1,6 @@ package org.bukkit.craftbukkit.inventory; import com.google.common.collect.ImmutableMap.Builder; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.Map; import net.minecraft.server.NBTTagCompound; import net.minecraft.server.NBTTagList; import net.minecraft.server.NBTTagString; @@ -15,6 +11,11 @@ import org.bukkit.craftbukkit.inventory.CraftMetaItem.SerializableMeta; import org.bukkit.craftbukkit.util.CraftNamespacedKey; import org.bukkit.inventory.meta.KnowledgeBookMeta; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Map; + @DelegateDeserialization(SerializableMeta.class) public class CraftMetaKnowledgeBook extends CraftMetaItem implements KnowledgeBookMeta { diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaLeatherArmor.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaLeatherArmor.java index 01f6bef68acc78dadb5d083ef698633049af4dfb..7e6270f78175e382f7823f2e15edada74fe7cb7c 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaLeatherArmor.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaLeatherArmor.java @@ -1,8 +1,6 @@ package org.bukkit.craftbukkit.inventory; -import static org.bukkit.craftbukkit.inventory.CraftItemFactory.*; import com.google.common.collect.ImmutableMap.Builder; -import java.util.Map; import net.minecraft.server.NBTTagCompound; import net.minecraft.server.NBTTagInt; import org.bukkit.Color; @@ -11,6 +9,10 @@ import org.bukkit.configuration.serialization.DelegateDeserialization; import org.bukkit.craftbukkit.inventory.CraftMetaItem.SerializableMeta; import org.bukkit.inventory.meta.LeatherArmorMeta; +import java.util.Map; + +import static org.bukkit.craftbukkit.inventory.CraftItemFactory.DEFAULT_LEATHER_COLOR; + @DelegateDeserialization(SerializableMeta.class) class CraftMetaLeatherArmor extends CraftMetaItem implements LeatherArmorMeta { static final ItemMetaKey COLOR = new ItemMetaKey("color"); diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaMap.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaMap.java index edfe1f773c3688efb78603f74f2d70eb8e0b6401..985acb4a685e0010c323a7a14e92162f46f78d8e 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaMap.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaMap.java @@ -2,7 +2,6 @@ package org.bukkit.craftbukkit.inventory; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableMap; -import java.util.Map; import net.minecraft.server.NBTTagCompound; import net.minecraft.server.NBTTagInt; import net.minecraft.server.NBTTagString; @@ -15,6 +14,8 @@ import org.bukkit.craftbukkit.util.CraftMagicNumbers; import org.bukkit.inventory.meta.MapMeta; import org.bukkit.map.MapView; +import java.util.Map; + @DelegateDeserialization(SerializableMeta.class) class CraftMetaMap extends CraftMetaItem implements MapMeta { static final ItemMetaKey MAP_SCALING = new ItemMetaKey("map_is_scaling", "scaling"); diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaPotion.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaPotion.java index f4374ac95bc33715f8f7f59c1677838771366439..ab3aefae8185733b70f9b8dd000ae8b68a049c0b 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaPotion.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaPotion.java @@ -2,10 +2,6 @@ package org.bukkit.craftbukkit.inventory; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap.Builder; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; -import java.util.Map; import net.minecraft.server.NBTTagCompound; import net.minecraft.server.NBTTagList; import org.apache.commons.lang.Validate; @@ -21,6 +17,11 @@ import org.bukkit.potion.PotionEffect; import org.bukkit.potion.PotionEffectType; import org.bukkit.potion.PotionType; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import java.util.Map; + @DelegateDeserialization(SerializableMeta.class) class CraftMetaPotion extends CraftMetaItem implements PotionMeta { static final ItemMetaKey AMPLIFIER = new ItemMetaKey("Amplifier", "amplifier"); diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java index 21e7a661739da84e6ec7a20c81cefcb0440484a2..003ac1dfe80f7dadb82c178556581ab928e83a15 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java @@ -1,10 +1,9 @@ package org.bukkit.craftbukkit.inventory; -import com.google.common.collect.ImmutableMap.Builder; -import com.mojang.authlib.GameProfile; -import java.util.Map; import com.destroystokyo.paper.profile.CraftPlayerProfile; import com.destroystokyo.paper.profile.PlayerProfile; +import com.google.common.collect.ImmutableMap.Builder; +import com.mojang.authlib.GameProfile; import net.minecraft.server.GameProfileSerializer; import net.minecraft.server.NBTBase; import net.minecraft.server.NBTTagCompound; @@ -19,6 +18,7 @@ import org.bukkit.craftbukkit.util.CraftMagicNumbers; import org.bukkit.inventory.meta.SkullMeta; import javax.annotation.Nullable; +import java.util.Map; @DelegateDeserialization(SerializableMeta.class) class CraftMetaSkull extends CraftMetaItem implements SkullMeta { diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSpawnEgg.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSpawnEgg.java index 592017c8196b0af8f61a94503e691fca280fd110..c185f76f66ca19a332689f4ad41a72a914ebff6c 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSpawnEgg.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSpawnEgg.java @@ -1,7 +1,6 @@ package org.bukkit.craftbukkit.inventory; import com.google.common.collect.ImmutableMap.Builder; -import java.util.Map; import net.minecraft.server.MinecraftKey; import net.minecraft.server.NBTBase; import net.minecraft.server.NBTTagCompound; @@ -12,6 +11,8 @@ import org.bukkit.entity.EntityType; import org.bukkit.inventory.meta.SpawnEggMeta; import org.bukkit.material.MaterialData; +import java.util.Map; + @DelegateDeserialization(CraftMetaItem.SerializableMeta.class) public class CraftMetaSpawnEgg extends CraftMetaItem implements SpawnEggMeta { diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSuspiciousStew.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSuspiciousStew.java index 00bacfe74c83f9af41c732a3e63ecdf6640c8653..8749a022df994829de6542eedd4299e10f0c4cb8 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSuspiciousStew.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSuspiciousStew.java @@ -2,10 +2,6 @@ package org.bukkit.craftbukkit.inventory; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap.Builder; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; -import java.util.Map; import net.minecraft.server.NBTTagCompound; import net.minecraft.server.NBTTagList; import org.apache.commons.lang.Validate; @@ -16,6 +12,11 @@ import org.bukkit.inventory.meta.SuspiciousStewMeta; import org.bukkit.potion.PotionEffect; import org.bukkit.potion.PotionEffectType; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import java.util.Map; + @DelegateDeserialization(CraftMetaItem.SerializableMeta.class) public class CraftMetaSuspiciousStew extends CraftMetaItem implements SuspiciousStewMeta { diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaTropicalFishBucket.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaTropicalFishBucket.java index 134f40f30198f13a4a3381bb00921703c477989e..9616e83bb2cea9e1df03cfb7d93e1c2279e84221 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaTropicalFishBucket.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaTropicalFishBucket.java @@ -1,7 +1,6 @@ package org.bukkit.craftbukkit.inventory; import com.google.common.collect.ImmutableMap; -import java.util.Map; import net.minecraft.server.NBTBase; import net.minecraft.server.NBTTagCompound; import org.bukkit.DyeColor; @@ -13,6 +12,8 @@ import org.bukkit.craftbukkit.util.CraftMagicNumbers; import org.bukkit.entity.TropicalFish; import org.bukkit.inventory.meta.TropicalFishBucketMeta; +import java.util.Map; + @DelegateDeserialization(SerializableMeta.class) class CraftMetaTropicalFishBucket extends CraftMetaItem implements TropicalFishBucketMeta { static final ItemMetaKey VARIANT = new ItemMetaKey("BucketVariantTag", "fish-variant"); diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftRecipe.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftRecipe.java index ef29599a89bc630899c65df9a7004f836787d95e..e0f5ea21b64abcae53a2cf642e4305ca903cc596 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftRecipe.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftRecipe.java @@ -1,13 +1,14 @@ package org.bukkit.craftbukkit.inventory; -import java.util.ArrayList; -import java.util.List; import net.minecraft.server.RecipeItemStack; import org.bukkit.craftbukkit.util.CraftMagicNumbers; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.Recipe; import org.bukkit.inventory.RecipeChoice; +import java.util.ArrayList; +import java.util.List; + public interface CraftRecipe extends Recipe { void addToCraftingManager(); diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftSaddledInventory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftSaddledInventory.java index 99cfbaf90b5ccd828834b33b3c658206efd6ac21..b45809508ee30d299e41c97c4e40923396065741 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftSaddledInventory.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftSaddledInventory.java @@ -1,9 +1,6 @@ package org.bukkit.craftbukkit.inventory; import net.minecraft.server.IInventory; - -import org.bukkit.inventory.AbstractHorseInventory; -import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.SaddledHorseInventory; public class CraftSaddledInventory extends CraftInventoryAbstractHorse implements SaddledHorseInventory { diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftShapedRecipe.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftShapedRecipe.java index 6dbd249f54a0c36b7f2dc8857c462e8e17b6a4b2..1e2c6d2ca690262dedd8e9ea620e68400c1bfe2c 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftShapedRecipe.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftShapedRecipe.java @@ -1,6 +1,5 @@ package org.bukkit.craftbukkit.inventory; -import java.util.Map; import net.minecraft.server.MinecraftServer; import net.minecraft.server.NonNullList; import net.minecraft.server.RecipeItemStack; @@ -11,6 +10,8 @@ import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.RecipeChoice; import org.bukkit.inventory.ShapedRecipe; +import java.util.Map; + public class CraftShapedRecipe extends ShapedRecipe implements CraftRecipe { // TODO: Could eventually use this to add a matches() method or some such private ShapedRecipes recipe; diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftShapelessRecipe.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftShapelessRecipe.java index 4aba511fe8078164bf1467b39645dd9bf6a931e7..344a06f88ae460320bc8134fdd9a938a5fb9d786 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftShapelessRecipe.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftShapelessRecipe.java @@ -1,6 +1,5 @@ package org.bukkit.craftbukkit.inventory; -import java.util.List; import net.minecraft.server.MinecraftServer; import net.minecraft.server.NonNullList; import net.minecraft.server.RecipeItemStack; @@ -11,6 +10,8 @@ import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.RecipeChoice; import org.bukkit.inventory.ShapelessRecipe; +import java.util.List; + public class CraftShapelessRecipe extends ShapelessRecipe implements CraftRecipe { // TODO: Could eventually use this to add a matches() method or some such private ShapelessRecipes recipe; diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/InventoryIterator.java b/src/main/java/org/bukkit/craftbukkit/inventory/InventoryIterator.java index de558eef3fa03d770ee44d3250e49408db64c81b..f3888f278e9fa514894e97d2fb3ecce32ff1551d 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/InventoryIterator.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/InventoryIterator.java @@ -1,9 +1,10 @@ package org.bukkit.craftbukkit.inventory; -import java.util.ListIterator; import org.bukkit.inventory.Inventory; import org.bukkit.inventory.ItemStack; +import java.util.ListIterator; + public class InventoryIterator implements ListIterator { private final Inventory inventory; private int nextIndex; diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/RecipeIterator.java b/src/main/java/org/bukkit/craftbukkit/inventory/RecipeIterator.java index 1223bfc7f5de3bafe283f6289c413c9848bf6f08..fd4d4ef6931c9a1262077d85c225a3817d174d11 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/RecipeIterator.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/RecipeIterator.java @@ -1,14 +1,15 @@ package org.bukkit.craftbukkit.inventory; import it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenHashMap; -import java.util.Iterator; -import java.util.Map; import net.minecraft.server.IRecipe; import net.minecraft.server.MinecraftKey; import net.minecraft.server.MinecraftServer; import net.minecraft.server.Recipes; import org.bukkit.inventory.Recipe; +import java.util.Iterator; +import java.util.Map; + public class RecipeIterator implements Iterator { private final Iterator, Object2ObjectLinkedOpenHashMap>>> recipes; private Iterator> current; diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/tags/DeprecatedCustomTagContainer.java b/src/main/java/org/bukkit/craftbukkit/inventory/tags/DeprecatedCustomTagContainer.java index 3ef217b0821fc4b9e759e1667840d07124ba33f8..94e59710d814d8c252c4cfcd3245208da7e3cfcc 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/tags/DeprecatedCustomTagContainer.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/tags/DeprecatedCustomTagContainer.java @@ -1,12 +1,13 @@ package org.bukkit.craftbukkit.inventory.tags; -import java.util.Objects; import org.bukkit.NamespacedKey; import org.bukkit.inventory.meta.tags.CustomItemTagContainer; import org.bukkit.inventory.meta.tags.ItemTagAdapterContext; import org.bukkit.inventory.meta.tags.ItemTagType; import org.bukkit.persistence.PersistentDataContainer; +import java.util.Objects; + /** * The {@link DeprecatedCustomTagContainer} is a simply wrapper implementation * that wraps the new api to still be usable with the old api parts. diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/util/CraftInventoryCreator.java b/src/main/java/org/bukkit/craftbukkit/inventory/util/CraftInventoryCreator.java index c1db7104e398df484f1e5400e98714aefd3315f2..3ede4449ecd40c2f15d076b27b284d054f02c1c6 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/util/CraftInventoryCreator.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/util/CraftInventoryCreator.java @@ -1,11 +1,12 @@ package org.bukkit.craftbukkit.inventory.util; -import java.util.HashMap; -import java.util.Map; import org.bukkit.event.inventory.InventoryType; import org.bukkit.inventory.Inventory; import org.bukkit.inventory.InventoryHolder; +import java.util.HashMap; +import java.util.Map; + public final class CraftInventoryCreator { public static final CraftInventoryCreator INSTANCE = new CraftInventoryCreator(); diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/util/CraftTileInventoryConverter.java b/src/main/java/org/bukkit/craftbukkit/inventory/util/CraftTileInventoryConverter.java index ad91eabb47511268d0cf307d941070800ce9bd3f..d89b7e68aa4c91e569e0d9e96d76d0c85dd9a21a 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/util/CraftTileInventoryConverter.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/util/CraftTileInventoryConverter.java @@ -1,19 +1,6 @@ package org.bukkit.craftbukkit.inventory.util; -import net.minecraft.server.BlockPosition; -import net.minecraft.server.IInventory; -import net.minecraft.server.MinecraftServer; -import net.minecraft.server.TileEntityBlastFurnace; -import net.minecraft.server.TileEntityBrewingStand; -import net.minecraft.server.TileEntityDispenser; -import net.minecraft.server.TileEntityDropper; -import net.minecraft.server.TileEntityFurnace; -import net.minecraft.server.TileEntityFurnaceFurnace; -import net.minecraft.server.TileEntityHopper; -import net.minecraft.server.TileEntityLectern; -import net.minecraft.server.TileEntityLootable; -import net.minecraft.server.TileEntitySmoker; -import net.minecraft.server.World; +import net.minecraft.server.*; import org.bukkit.craftbukkit.inventory.CraftInventory; import org.bukkit.craftbukkit.inventory.CraftInventoryBrewer; import org.bukkit.craftbukkit.inventory.CraftInventoryFurnace; diff --git a/src/main/java/org/bukkit/craftbukkit/legacy/CraftLegacy.java b/src/main/java/org/bukkit/craftbukkit/legacy/CraftLegacy.java index b14333ce9e6921024bc93c2847b84f1fb40a5508..4d93b4a6670d1e13e6ec5123d91170a5b47122f1 100644 --- a/src/main/java/org/bukkit/craftbukkit/legacy/CraftLegacy.java +++ b/src/main/java/org/bukkit/craftbukkit/legacy/CraftLegacy.java @@ -2,35 +2,14 @@ package org.bukkit.craftbukkit.legacy; import com.google.common.base.Preconditions; import com.mojang.serialization.Dynamic; -import java.util.Arrays; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Map; -import java.util.Optional; -import java.util.Set; -import net.minecraft.server.Block; -import net.minecraft.server.BlockStateList; -import net.minecraft.server.Blocks; -import net.minecraft.server.DataConverterFlattenData; -import net.minecraft.server.DataConverterMaterialId; -import net.minecraft.server.DataConverterRegistry; -import net.minecraft.server.DataConverterTypes; -import net.minecraft.server.DispenserRegistry; -import net.minecraft.server.DynamicOpsNBT; -import net.minecraft.server.IBlockData; -import net.minecraft.server.IBlockState; -import net.minecraft.server.IRegistry; -import net.minecraft.server.Item; -import net.minecraft.server.Items; -import net.minecraft.server.MinecraftKey; -import net.minecraft.server.MinecraftServer; -import net.minecraft.server.NBTBase; -import net.minecraft.server.NBTTagCompound; +import net.minecraft.server.*; import org.bukkit.Material; import org.bukkit.craftbukkit.util.CraftMagicNumbers; import org.bukkit.entity.EntityType; import org.bukkit.material.MaterialData; +import java.util.*; + /** * This class may seem unnecessarily slow and complicated/repetitive however it * is able to handle a lot more edge cases and invertible transformations (many diff --git a/src/main/java/org/bukkit/craftbukkit/map/CraftMapCanvas.java b/src/main/java/org/bukkit/craftbukkit/map/CraftMapCanvas.java index a4bf147e9b43173f5e7b7d68a9b6109437bac4e1..2cca3eb7ca279c4bb6efbbe048ce2227c8c962d6 100644 --- a/src/main/java/org/bukkit/craftbukkit/map/CraftMapCanvas.java +++ b/src/main/java/org/bukkit/craftbukkit/map/CraftMapCanvas.java @@ -1,13 +1,14 @@ package org.bukkit.craftbukkit.map; -import java.awt.Image; -import java.util.Arrays; import org.bukkit.map.MapCanvas; import org.bukkit.map.MapCursorCollection; import org.bukkit.map.MapFont; import org.bukkit.map.MapFont.CharacterSprite; import org.bukkit.map.MapPalette; +import java.awt.*; +import java.util.Arrays; + public class CraftMapCanvas implements MapCanvas { private final byte[] buffer = new byte[128 * 128]; diff --git a/src/main/java/org/bukkit/craftbukkit/map/CraftMapView.java b/src/main/java/org/bukkit/craftbukkit/map/CraftMapView.java index 2c21c5a44d318a548719c8ce379b9c0daf9ef228..6592b115cdfb5e9a182a6232505770da16add13f 100644 --- a/src/main/java/org/bukkit/craftbukkit/map/CraftMapView.java +++ b/src/main/java/org/bukkit/craftbukkit/map/CraftMapView.java @@ -1,11 +1,5 @@ package org.bukkit.craftbukkit.map; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.logging.Level; import net.minecraft.server.MinecraftServer; import net.minecraft.server.ResourceKey; import net.minecraft.server.WorldMap; @@ -17,6 +11,9 @@ import org.bukkit.craftbukkit.entity.CraftPlayer; import org.bukkit.map.MapRenderer; import org.bukkit.map.MapView; +import java.util.*; +import java.util.logging.Level; + public final class CraftMapView implements MapView { private final Map renderCache = new HashMap(); diff --git a/src/main/java/org/bukkit/craftbukkit/map/RenderData.java b/src/main/java/org/bukkit/craftbukkit/map/RenderData.java index 5768cd512ec166f1e8d1f4a28792015347297c3f..816d2536027cc960028a675211421d01b6816222 100644 --- a/src/main/java/org/bukkit/craftbukkit/map/RenderData.java +++ b/src/main/java/org/bukkit/craftbukkit/map/RenderData.java @@ -1,8 +1,9 @@ package org.bukkit.craftbukkit.map; -import java.util.ArrayList; import org.bukkit.map.MapCursor; +import java.util.ArrayList; + public class RenderData { public byte[] buffer; // Paper diff --git a/src/main/java/org/bukkit/craftbukkit/metadata/BlockMetadataStore.java b/src/main/java/org/bukkit/craftbukkit/metadata/BlockMetadataStore.java index b3659e4c1332268abda919b3a0f0493f7978aad2..8935a6d81251cc854cb19c6face4d525ac83e6ca 100644 --- a/src/main/java/org/bukkit/craftbukkit/metadata/BlockMetadataStore.java +++ b/src/main/java/org/bukkit/craftbukkit/metadata/BlockMetadataStore.java @@ -1,6 +1,5 @@ package org.bukkit.craftbukkit.metadata; -import java.util.List; import org.bukkit.World; import org.bukkit.block.Block; import org.bukkit.metadata.MetadataStore; @@ -8,6 +7,8 @@ import org.bukkit.metadata.MetadataStoreBase; import org.bukkit.metadata.MetadataValue; import org.bukkit.plugin.Plugin; +import java.util.List; + /** * A BlockMetadataStore stores metadata values for {@link Block} objects. */ diff --git a/src/main/java/org/bukkit/craftbukkit/persistence/CraftPersistentDataContainer.java b/src/main/java/org/bukkit/craftbukkit/persistence/CraftPersistentDataContainer.java index 5187878792d8f387dbe8c8df7938521f1671adfe..1848846fa801002b0859a70ab67481fc61befb63 100644 --- a/src/main/java/org/bukkit/craftbukkit/persistence/CraftPersistentDataContainer.java +++ b/src/main/java/org/bukkit/craftbukkit/persistence/CraftPersistentDataContainer.java @@ -1,11 +1,5 @@ package org.bukkit.craftbukkit.persistence; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Map; -import java.util.Map.Entry; -import java.util.Objects; -import java.util.Set; import net.minecraft.server.NBTBase; import net.minecraft.server.NBTTagCompound; import org.apache.commons.lang.Validate; @@ -15,6 +9,9 @@ import org.bukkit.persistence.PersistentDataAdapterContext; import org.bukkit.persistence.PersistentDataContainer; import org.bukkit.persistence.PersistentDataType; +import java.util.*; +import java.util.Map.Entry; + public final class CraftPersistentDataContainer implements PersistentDataContainer { private final Map customDataTags = new HashMap<>(); diff --git a/src/main/java/org/bukkit/craftbukkit/persistence/CraftPersistentDataTypeRegistry.java b/src/main/java/org/bukkit/craftbukkit/persistence/CraftPersistentDataTypeRegistry.java index 1b3b8646387255c888175daedf0e4ddcc13b9ff7..a6c796e0ac10a31f9941f5ca7be09403008ee1ff 100644 --- a/src/main/java/org/bukkit/craftbukkit/persistence/CraftPersistentDataTypeRegistry.java +++ b/src/main/java/org/bukkit/craftbukkit/persistence/CraftPersistentDataTypeRegistry.java @@ -1,26 +1,15 @@ package org.bukkit.craftbukkit.persistence; import com.google.common.primitives.Primitives; +import net.minecraft.server.*; +import org.apache.commons.lang3.Validate; +import org.bukkit.persistence.PersistentDataContainer; + import java.util.Arrays; import java.util.HashMap; import java.util.Map; import java.util.Objects; import java.util.function.Function; -import net.minecraft.server.NBTBase; -import net.minecraft.server.NBTTagByte; -import net.minecraft.server.NBTTagByteArray; -import net.minecraft.server.NBTTagCompound; -import net.minecraft.server.NBTTagDouble; -import net.minecraft.server.NBTTagFloat; -import net.minecraft.server.NBTTagInt; -import net.minecraft.server.NBTTagIntArray; -import net.minecraft.server.NBTTagList; -import net.minecraft.server.NBTTagLong; -import net.minecraft.server.NBTTagLongArray; -import net.minecraft.server.NBTTagShort; -import net.minecraft.server.NBTTagString; -import org.apache.commons.lang3.Validate; -import org.bukkit.persistence.PersistentDataContainer; /** * This class represents a registry that contains the used adapters for. diff --git a/src/main/java/org/bukkit/craftbukkit/potion/CraftPotionBrewer.java b/src/main/java/org/bukkit/craftbukkit/potion/CraftPotionBrewer.java index 87d680a8776d0000cf567ff2acbcd138bcc0a6c7..af6cd24d78a215d9ed5b5c4b86b005538865a0b0 100644 --- a/src/main/java/org/bukkit/craftbukkit/potion/CraftPotionBrewer.java +++ b/src/main/java/org/bukkit/craftbukkit/potion/CraftPotionBrewer.java @@ -2,17 +2,14 @@ package org.bukkit.craftbukkit.potion; import com.google.common.collect.ImmutableList; import com.google.common.collect.Maps; +import net.minecraft.server.MobEffect; +import net.minecraft.server.PotionRegistry; +import org.bukkit.potion.*; + import java.util.ArrayList; import java.util.Collection; import java.util.List; import java.util.Map; -import net.minecraft.server.MobEffect; -import net.minecraft.server.PotionRegistry; -import org.bukkit.potion.PotionBrewer; -import org.bukkit.potion.PotionData; -import org.bukkit.potion.PotionEffect; -import org.bukkit.potion.PotionEffectType; -import org.bukkit.potion.PotionType; public class CraftPotionBrewer implements PotionBrewer { private static final Map> cache = Maps.newHashMap(); diff --git a/src/main/java/org/bukkit/craftbukkit/projectiles/CraftBlockProjectileSource.java b/src/main/java/org/bukkit/craftbukkit/projectiles/CraftBlockProjectileSource.java index 46e9caf0fbef07e9e6899a57c39736aa462e16b2..5453271e6ac11511fb2ee88b4eb2e5d262df550c 100644 --- a/src/main/java/org/bukkit/craftbukkit/projectiles/CraftBlockProjectileSource.java +++ b/src/main/java/org/bukkit/craftbukkit/projectiles/CraftBlockProjectileSource.java @@ -1,49 +1,20 @@ package org.bukkit.craftbukkit.projectiles; -import java.util.Random; -import net.minecraft.server.BlockDispenser; -import net.minecraft.server.EntityArrow; -import net.minecraft.server.EntityEgg; -import net.minecraft.server.EntityEnderPearl; -import net.minecraft.server.EntityFireball; -import net.minecraft.server.EntityPotion; -import net.minecraft.server.EntityProjectile; -import net.minecraft.server.EntitySmallFireball; -import net.minecraft.server.EntitySnowball; -import net.minecraft.server.EntitySpectralArrow; -import net.minecraft.server.EntityThrownExpBottle; -import net.minecraft.server.EntityTippedArrow; -import net.minecraft.server.EntityTypes; -import net.minecraft.server.EnumDirection; -import net.minecraft.server.IPosition; -import net.minecraft.server.IProjectile; -import net.minecraft.server.MathHelper; -import net.minecraft.server.SourceBlock; -import net.minecraft.server.TileEntityDispenser; +import net.minecraft.server.*; import org.apache.commons.lang.Validate; import org.bukkit.Material; import org.bukkit.block.Block; import org.bukkit.craftbukkit.inventory.CraftItemStack; import org.bukkit.craftbukkit.potion.CraftPotionUtil; -import org.bukkit.entity.AbstractArrow; -import org.bukkit.entity.Egg; -import org.bukkit.entity.EnderPearl; -import org.bukkit.entity.Fireball; -import org.bukkit.entity.LingeringPotion; -import org.bukkit.entity.Projectile; -import org.bukkit.entity.SmallFireball; -import org.bukkit.entity.Snowball; -import org.bukkit.entity.SpectralArrow; -import org.bukkit.entity.ThrownExpBottle; -import org.bukkit.entity.ThrownPotion; -import org.bukkit.entity.TippedArrow; -import org.bukkit.entity.WitherSkull; +import org.bukkit.entity.*; import org.bukkit.inventory.ItemStack; import org.bukkit.potion.PotionData; import org.bukkit.potion.PotionType; import org.bukkit.projectiles.BlockProjectileSource; import org.bukkit.util.Vector; +import java.util.Random; + public class CraftBlockProjectileSource implements BlockProjectileSource { private final TileEntityDispenser dispenserBlock; diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftAsyncScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftAsyncScheduler.java index 3c1992e212a6d6f1db4d5b807b38d71913619fc0..bc07f29552dbfcb35eb3bdd3e17bc7acd2b8d03a 100644 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftAsyncScheduler.java +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftAsyncScheduler.java @@ -30,11 +30,7 @@ import org.bukkit.plugin.Plugin; import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import java.util.concurrent.Executor; -import java.util.concurrent.Executors; -import java.util.concurrent.SynchronousQueue; -import java.util.concurrent.ThreadPoolExecutor; -import java.util.concurrent.TimeUnit; +import java.util.concurrent.*; public class CraftAsyncScheduler extends CraftScheduler { diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftAsyncTask.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftAsyncTask.java index c38e514b004a4684026d5a89c606399a4fd7efe1..4675805cf281b178b0fcf7dbecda6e70f34973c3 100644 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftAsyncTask.java +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftAsyncTask.java @@ -1,11 +1,12 @@ package org.bukkit.craftbukkit.scheduler; +import org.bukkit.plugin.Plugin; +import org.bukkit.scheduler.BukkitWorker; + import java.util.Iterator; import java.util.LinkedList; import java.util.Map; import java.util.logging.Level; -import org.bukkit.plugin.Plugin; -import org.bukkit.scheduler.BukkitWorker; class CraftAsyncTask extends CraftTask { diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftFuture.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftFuture.java index 1e20385fd60d144ad2d915867156449d5d53c50d..3fa618c2a60651cf8906b9950b9b3ab1da72b573 100644 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftFuture.java +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftFuture.java @@ -1,13 +1,9 @@ package org.bukkit.craftbukkit.scheduler; -import java.util.concurrent.Callable; -import java.util.concurrent.CancellationException; -import java.util.concurrent.ExecutionException; -import java.util.concurrent.Future; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.TimeoutException; import org.bukkit.plugin.Plugin; +import java.util.concurrent.*; + class CraftFuture extends CraftTask implements Future { private final Callable callable; diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java index 1bc65ae63673b1de3aa6e0c49bf95dadd7d7b355..56e553e012a2d19b3f2dd17b5c10b77be0847677 100644 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java @@ -1,22 +1,6 @@ package org.bukkit.craftbukkit.scheduler; -import co.aikar.timings.MinecraftTimings; // Paper -import com.google.common.util.concurrent.ThreadFactoryBuilder; -import java.util.ArrayList; -import java.util.Comparator; -import java.util.Iterator; -import java.util.List; -import java.util.PriorityQueue; -import java.util.concurrent.Callable; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.Executor; -import java.util.concurrent.Executors; -import java.util.concurrent.Future; -import java.util.concurrent.atomic.AtomicInteger; -import java.util.concurrent.atomic.AtomicReference; -import java.util.function.Consumer; -import java.util.logging.Level; -import com.destroystokyo.paper.ServerSchedulerReportingWrapper; +import co.aikar.timings.MinecraftTimings; import com.destroystokyo.paper.event.server.ServerExceptionEvent; import com.destroystokyo.paper.exception.ServerSchedulerException; import org.apache.commons.lang.Validate; @@ -27,6 +11,15 @@ import org.bukkit.scheduler.BukkitScheduler; import org.bukkit.scheduler.BukkitTask; import org.bukkit.scheduler.BukkitWorker; +import java.util.*; +import java.util.concurrent.Callable; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.Future; +import java.util.concurrent.atomic.AtomicInteger; +import java.util.concurrent.atomic.AtomicReference; +import java.util.function.Consumer; +import java.util.logging.Level; + /** * The fundamental concepts for this implementation: *
  • Main thread owns {@link #head} and {@link #currentTick}, but it may be read from any thread
    • diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java index 9d0d1598bfce2f51998395faf39d8bd2f5d3f9f3..ab07107e373d91aad2c37607de741a16a8c684c2 100644 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java @@ -1,14 +1,14 @@ package org.bukkit.craftbukkit.scheduler; -import java.util.function.Consumer; - +import co.aikar.timings.MinecraftTimings; import co.aikar.timings.NullTimingHandler; +import co.aikar.timings.Timing; import org.bukkit.Bukkit; -import co.aikar.timings.MinecraftTimings; // Paper -import co.aikar.timings.Timing; // Paper import org.bukkit.plugin.Plugin; import org.bukkit.scheduler.BukkitTask; +import java.util.function.Consumer; + public class CraftTask implements BukkitTask, Runnable { // Spigot diff --git a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftCriteria.java b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftCriteria.java index 73786eda788d18f8dac96de1119e13b6f56b999a..5c6c564aaad467cff76fb2e93a346b628e39972f 100644 --- a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftCriteria.java +++ b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftCriteria.java @@ -1,10 +1,11 @@ package org.bukkit.craftbukkit.scoreboard; import com.google.common.collect.ImmutableMap; -import java.util.Map; import net.minecraft.server.IScoreboardCriteria; import net.minecraft.server.ScoreboardObjective; +import java.util.Map; + final class CraftCriteria { static final Map DEFAULTS; static final CraftCriteria DUMMY; diff --git a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScore.java b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScore.java index 41d22d223dc66028f7574515c34a75fdfee660ab..5528e29843d23ebe48ce1a22ef81cccd0939371b 100644 --- a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScore.java +++ b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScore.java @@ -1,6 +1,5 @@ package org.bukkit.craftbukkit.scoreboard; -import java.util.Map; import net.minecraft.server.Scoreboard; import net.minecraft.server.ScoreboardObjective; import net.minecraft.server.ScoreboardScore; @@ -9,6 +8,8 @@ import org.bukkit.OfflinePlayer; import org.bukkit.scoreboard.Objective; import org.bukkit.scoreboard.Score; +import java.util.Map; + /** * TL;DR: This class is special and lazily grabs a handle... * ...because a handle is a full fledged (I think permanent) hashMap for the associated name. diff --git a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboard.java b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboard.java index e3036fe23fa2be100044332c432d1ad5b4872823..3b7090b7e0415ebd2df4ce5e4a60be55f0852651 100644 --- a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboard.java +++ b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboard.java @@ -3,7 +3,6 @@ package org.bukkit.craftbukkit.scoreboard; import com.google.common.base.Function; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; -import java.util.Collection; import net.minecraft.server.Scoreboard; import net.minecraft.server.ScoreboardObjective; import net.minecraft.server.ScoreboardTeam; @@ -11,11 +10,9 @@ import org.apache.commons.lang.Validate; import org.bukkit.Bukkit; import org.bukkit.OfflinePlayer; import org.bukkit.craftbukkit.util.CraftChatMessage; -import org.bukkit.scoreboard.DisplaySlot; -import org.bukkit.scoreboard.Objective; -import org.bukkit.scoreboard.RenderType; -import org.bukkit.scoreboard.Score; -import org.bukkit.scoreboard.Team; +import org.bukkit.scoreboard.*; + +import java.util.Collection; public final class CraftScoreboard implements org.bukkit.scoreboard.Scoreboard { final Scoreboard board; diff --git a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboardManager.java b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboardManager.java index 2c5701376506f07a748e7ac75c6870320585bb4d..0f8d2ffd5a293856b2fb8e6122a39cfd25d28d82 100644 --- a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboardManager.java +++ b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboardManager.java @@ -1,27 +1,15 @@ package org.bukkit.craftbukkit.scoreboard; -import java.util.Collection; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.Map; -import java.util.function.Consumer; -import net.minecraft.server.EntityPlayer; -import net.minecraft.server.IScoreboardCriteria; -import net.minecraft.server.MinecraftServer; -import net.minecraft.server.PacketPlayOutScoreboardObjective; -import net.minecraft.server.PacketPlayOutScoreboardTeam; -import net.minecraft.server.Scoreboard; -import net.minecraft.server.ScoreboardObjective; -import net.minecraft.server.ScoreboardScore; -import net.minecraft.server.ScoreboardServer; -import net.minecraft.server.ScoreboardTeam; +import net.minecraft.server.*; import org.apache.commons.lang.Validate; import org.bukkit.craftbukkit.entity.CraftPlayer; import org.bukkit.craftbukkit.util.WeakCollection; import org.bukkit.entity.Player; import org.bukkit.scoreboard.ScoreboardManager; +import java.util.*; +import java.util.function.Consumer; + public final class CraftScoreboardManager implements ScoreboardManager { private final CraftScoreboard mainScoreboard; private final MinecraftServer server; diff --git a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java index 0fba3d2a8d3bd7ec615d137e4625a7f357729d8d..f797411443720552b130fb5e04118a51ab2b7c30 100644 --- a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java +++ b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java @@ -1,7 +1,6 @@ package org.bukkit.craftbukkit.scoreboard; import com.google.common.collect.ImmutableSet; -import java.util.Set; import net.minecraft.server.ScoreboardTeam; import net.minecraft.server.ScoreboardTeamBase; import net.minecraft.server.ScoreboardTeamBase.EnumNameTagVisibility; @@ -13,6 +12,8 @@ import org.bukkit.craftbukkit.util.CraftChatMessage; import org.bukkit.scoreboard.NameTagVisibility; import org.bukkit.scoreboard.Team; +import java.util.Set; + final class CraftTeam extends CraftScoreboardComponent implements Team { private final ScoreboardTeam team; diff --git a/src/main/java/org/bukkit/craftbukkit/tag/CraftBlockTag.java b/src/main/java/org/bukkit/craftbukkit/tag/CraftBlockTag.java index 57acfb7c0e1e0a9c104cadf9a0f3ab5b8b3f685b..b3a15dd7efbe1a41f72817ebb0c983af6df751c7 100644 --- a/src/main/java/org/bukkit/craftbukkit/tag/CraftBlockTag.java +++ b/src/main/java/org/bukkit/craftbukkit/tag/CraftBlockTag.java @@ -1,15 +1,15 @@ package org.bukkit.craftbukkit.tag; -import java.util.Collections; -import java.util.HashSet; -import java.util.Set; -import java.util.stream.Collectors; import net.minecraft.server.Block; import net.minecraft.server.MinecraftKey; import net.minecraft.server.TagsServer; import org.bukkit.Material; import org.bukkit.craftbukkit.util.CraftMagicNumbers; +import java.util.Collections; +import java.util.HashSet; +import java.util.Set; + public class CraftBlockTag extends CraftTag { public CraftBlockTag(TagsServer registry, MinecraftKey tag) { diff --git a/src/main/java/org/bukkit/craftbukkit/tag/CraftItemTag.java b/src/main/java/org/bukkit/craftbukkit/tag/CraftItemTag.java index 96ee7881b2dea2b4b764265e670e5a7b57a35f69..f64a3c863dd18e52512f5ac2baa3f53d3bd1d22e 100644 --- a/src/main/java/org/bukkit/craftbukkit/tag/CraftItemTag.java +++ b/src/main/java/org/bukkit/craftbukkit/tag/CraftItemTag.java @@ -1,15 +1,15 @@ package org.bukkit.craftbukkit.tag; -import java.util.Collections; -import java.util.HashSet; -import java.util.Set; -import java.util.stream.Collectors; import net.minecraft.server.Item; import net.minecraft.server.MinecraftKey; import net.minecraft.server.TagsServer; import org.bukkit.Material; import org.bukkit.craftbukkit.util.CraftMagicNumbers; +import java.util.Collections; +import java.util.HashSet; +import java.util.Set; + public class CraftItemTag extends CraftTag { public CraftItemTag(TagsServer registry, MinecraftKey tag) { diff --git a/src/main/java/org/bukkit/craftbukkit/util/BlockStateListPopulator.java b/src/main/java/org/bukkit/craftbukkit/util/BlockStateListPopulator.java index c22dbbfbe8b16d4c2f1df1f9efd3b06e330ac909..e938c819fcf5328ec26a8edd851aaacbb0781704 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/BlockStateListPopulator.java +++ b/src/main/java/org/bukkit/craftbukkit/util/BlockStateListPopulator.java @@ -1,9 +1,5 @@ package org.bukkit.craftbukkit.util; -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Set; import net.minecraft.server.BlockPosition; import net.minecraft.server.Fluid; import net.minecraft.server.IBlockData; @@ -11,6 +7,11 @@ import net.minecraft.server.World; import org.bukkit.block.BlockState; import org.bukkit.craftbukkit.block.CraftBlockState; +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Set; + public class BlockStateListPopulator extends DummyGeneratorAccess { private final World world; private final LinkedHashMap list; diff --git a/src/main/java/org/bukkit/craftbukkit/util/Commodore.java b/src/main/java/org/bukkit/craftbukkit/util/Commodore.java index e944a0f941fc74e267437d43717ddee283ffb673..291ddc726622892dba7ae93c4360eaa132e66430 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/Commodore.java +++ b/src/main/java/org/bukkit/craftbukkit/util/Commodore.java @@ -1,35 +1,22 @@ package org.bukkit.craftbukkit.util; import com.google.common.io.ByteStreams; -import java.io.File; -import java.io.FileOutputStream; -import java.io.InputStream; -import java.util.Arrays; -import java.util.Enumeration; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Map; -import java.util.Set; -import java.util.jar.JarEntry; -import java.util.jar.JarFile; -import java.util.jar.JarOutputStream; -import java.util.zip.ZipEntry; import joptsimple.OptionParser; import joptsimple.OptionSet; import joptsimple.OptionSpec; import org.bukkit.Material; import org.bukkit.plugin.AuthorNagException; -import org.objectweb.asm.ClassReader; -import org.objectweb.asm.ClassVisitor; -import org.objectweb.asm.ClassWriter; -import org.objectweb.asm.FieldVisitor; -import org.objectweb.asm.Handle; -import org.objectweb.asm.Label; -import org.objectweb.asm.MethodVisitor; -import org.objectweb.asm.Opcodes; -import org.objectweb.asm.Type; +import org.objectweb.asm.*; import javax.annotation.Nonnull; +import java.io.File; +import java.io.FileOutputStream; +import java.io.InputStream; +import java.util.*; +import java.util.jar.JarEntry; +import java.util.jar.JarFile; +import java.util.jar.JarOutputStream; +import java.util.zip.ZipEntry; /** * This file is imported from Commodore. diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftChatMessage.java b/src/main/java/org/bukkit/craftbukkit/util/CraftChatMessage.java index 00c24bf2fb1df7246d128c5bf33a2c01c4f398c2..f00d81077e372d6dbe34ab0d703316f397083978 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftChatMessage.java +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftChatMessage.java @@ -2,22 +2,16 @@ package org.bukkit.craftbukkit.util; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMap.Builder; +import net.minecraft.server.*; +import net.minecraft.server.ChatClickable.EnumClickAction; +import org.bukkit.ChatColor; + import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.Optional; import java.util.regex.Matcher; import java.util.regex.Pattern; -import net.minecraft.server.ChatClickable; -import net.minecraft.server.ChatClickable.EnumClickAction; -import net.minecraft.server.ChatComponentText; -import net.minecraft.server.ChatHexColor; -import net.minecraft.server.ChatMessage; -import net.minecraft.server.ChatModifier; -import net.minecraft.server.EnumChatFormat; -import net.minecraft.server.IChatBaseComponent; -import net.minecraft.server.IChatMutableComponent; -import org.bukkit.ChatColor; public final class CraftChatMessage { diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftLegacy.java b/src/main/java/org/bukkit/craftbukkit/util/CraftLegacy.java index c8dde75de231b5fdde88f5bc111c21883d9c3f49..30572e20c13b8d1204c2d4d239d9b28594c4ad62 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftLegacy.java +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftLegacy.java @@ -1,9 +1,10 @@ package org.bukkit.craftbukkit.util; -import java.util.Arrays; import org.bukkit.Material; import org.bukkit.material.MaterialData; +import java.util.Arrays; + /** * @deprecated legacy use only */ diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java index 60604e44911d4eb1b67f4a68f8ddad03bcaff95f..58ac86c205fa8f2b18412d8524731c2322d4077d 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java @@ -8,34 +8,7 @@ import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.mojang.brigadier.exceptions.CommandSyntaxException; import com.mojang.serialization.Dynamic; -import java.io.File; -import java.io.IOException; -import java.util.Arrays; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Locale; -import java.util.Map; -import java.util.logging.Level; -import java.util.logging.Logger; -import net.minecraft.server.AdvancementDataWorld; -import net.minecraft.server.Block; -import net.minecraft.server.ChatDeserializer; -import net.minecraft.server.DataConverterRegistry; -import net.minecraft.server.DataConverterTypes; -import net.minecraft.server.DynamicOpsNBT; -import net.minecraft.server.IBlockData; -import net.minecraft.server.IRegistry; -import net.minecraft.server.Item; -import net.minecraft.server.LootDeserializationContext; -import net.minecraft.server.MinecraftKey; -import net.minecraft.server.MinecraftServer; -import net.minecraft.server.MojangsonParser; -import net.minecraft.server.NBTBase; -import net.minecraft.server.NBTTagCompound; -import net.minecraft.server.NBTTagString; -import net.minecraft.server.SavedFile; -import net.minecraft.server.SharedConstants; +import net.minecraft.server.*; import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.NamespacedKey; @@ -50,6 +23,12 @@ import org.bukkit.material.MaterialData; import org.bukkit.plugin.InvalidPluginException; import org.bukkit.plugin.PluginDescriptionFile; +import java.io.File; +import java.io.IOException; +import java.util.*; +import java.util.logging.Level; +import java.util.logging.Logger; + @SuppressWarnings("deprecation") public final class CraftMagicNumbers implements UnsafeValues { public static final UnsafeValues INSTANCE = new CraftMagicNumbers(); diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftNBTTagConfigSerializer.java b/src/main/java/org/bukkit/craftbukkit/util/CraftNBTTagConfigSerializer.java index b17faa25e6db28e8538cc21d7a651e4acdf0c580..e5e0a437cf2138682076fcc60c84afc40852de96 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftNBTTagConfigSerializer.java +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftNBTTagConfigSerializer.java @@ -2,19 +2,13 @@ package org.bukkit.craftbukkit.util; import com.mojang.brigadier.StringReader; import com.mojang.brigadier.exceptions.CommandSyntaxException; +import net.minecraft.server.*; + import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.regex.Pattern; -import net.minecraft.server.MojangsonParser; -import net.minecraft.server.NBTBase; -import net.minecraft.server.NBTList; -import net.minecraft.server.NBTTagCompound; -import net.minecraft.server.NBTTagDouble; -import net.minecraft.server.NBTTagInt; -import net.minecraft.server.NBTTagList; -import net.minecraft.server.NBTTagString; public class CraftNBTTagConfigSerializer { diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftRayTraceResult.java b/src/main/java/org/bukkit/craftbukkit/util/CraftRayTraceResult.java index 6995e1beadfb0d802f2f10d11bc1109012eeb2c6..5599161b7757359ef20c9b317804a07c856d1d8d 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftRayTraceResult.java +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftRayTraceResult.java @@ -1,11 +1,7 @@ package org.bukkit.craftbukkit.util; -import net.minecraft.server.BlockPosition; -import net.minecraft.server.MovingObjectPosition; +import net.minecraft.server.*; import net.minecraft.server.MovingObjectPosition.EnumMovingObjectType; -import net.minecraft.server.MovingObjectPositionBlock; -import net.minecraft.server.MovingObjectPositionEntity; -import net.minecraft.server.Vec3D; import org.bukkit.World; import org.bukkit.block.Block; import org.bukkit.block.BlockFace; diff --git a/src/main/java/org/bukkit/craftbukkit/util/DummyGeneratorAccess.java b/src/main/java/org/bukkit/craftbukkit/util/DummyGeneratorAccess.java index b6c39bf77e716addc9d2a1e915687bc770e937f4..9ec674643ce4667742b8da75612c2cda02889fb5 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/DummyGeneratorAccess.java +++ b/src/main/java/org/bukkit/craftbukkit/util/DummyGeneratorAccess.java @@ -1,35 +1,10 @@ package org.bukkit.craftbukkit.util; +import net.minecraft.server.*; + import java.util.List; import java.util.Random; import java.util.function.Predicate; -import net.minecraft.server.AxisAlignedBB; -import net.minecraft.server.BiomeBase; -import net.minecraft.server.BiomeManager; -import net.minecraft.server.Block; -import net.minecraft.server.BlockPosition; -import net.minecraft.server.ChunkStatus; -import net.minecraft.server.DifficultyDamageScaler; -import net.minecraft.server.DimensionManager; -import net.minecraft.server.Entity; -import net.minecraft.server.EntityHuman; -import net.minecraft.server.Fluid; -import net.minecraft.server.FluidType; -import net.minecraft.server.GeneratorAccess; -import net.minecraft.server.HeightMap; -import net.minecraft.server.IBlockData; -import net.minecraft.server.IChunkAccess; -import net.minecraft.server.IChunkProvider; -import net.minecraft.server.LightEngine; -import net.minecraft.server.ParticleParam; -import net.minecraft.server.SoundCategory; -import net.minecraft.server.SoundEffect; -import net.minecraft.server.TickList; -import net.minecraft.server.TickListEmpty; -import net.minecraft.server.TileEntity; -import net.minecraft.server.World; -import net.minecraft.server.WorldBorder; -import net.minecraft.server.WorldData; public class DummyGeneratorAccess implements GeneratorAccess { diff --git a/src/main/java/org/bukkit/craftbukkit/util/ForwardLogHandler.java b/src/main/java/org/bukkit/craftbukkit/util/ForwardLogHandler.java index 100b8566d9f16f20dfe1c5d1875ad7cdacb7b960..74ce4b2ec75b1ca80fe5b2a7f4bfff287f42326d 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/ForwardLogHandler.java +++ b/src/main/java/org/bukkit/craftbukkit/util/ForwardLogHandler.java @@ -1,12 +1,13 @@ package org.bukkit.craftbukkit.util; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import java.util.logging.ConsoleHandler; import java.util.logging.Level; import java.util.logging.LogRecord; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; public class ForwardLogHandler extends ConsoleHandler { private Map cachedLoggers = new ConcurrentHashMap(); diff --git a/src/main/java/org/bukkit/craftbukkit/util/LazyPlayerSet.java b/src/main/java/org/bukkit/craftbukkit/util/LazyPlayerSet.java index f847a9dd6214ba7e7807365a56c1977bc4930c15..408524476651f24e2d28294d88b8be88b0d719fe 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/LazyPlayerSet.java +++ b/src/main/java/org/bukkit/craftbukkit/util/LazyPlayerSet.java @@ -1,11 +1,12 @@ package org.bukkit.craftbukkit.util; -import java.util.HashSet; -import java.util.List; import net.minecraft.server.EntityPlayer; import net.minecraft.server.MinecraftServer; import org.bukkit.entity.Player; +import java.util.HashSet; +import java.util.List; + public class LazyPlayerSet extends LazyHashSet { private final MinecraftServer server; diff --git a/src/main/java/org/bukkit/craftbukkit/util/TerminalConsoleWriterThread.java b/src/main/java/org/bukkit/craftbukkit/util/TerminalConsoleWriterThread.java index 9a2da548b8860b496e396564b2c8f6383f020193..7b579654e0eda696ee5419b2a8a02148cbd3f40f 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/TerminalConsoleWriterThread.java +++ b/src/main/java/org/bukkit/craftbukkit/util/TerminalConsoleWriterThread.java @@ -1,12 +1,5 @@ package org.bukkit.craftbukkit.util; -import com.mojang.util.QueueLogAppender; -import java.io.IOException; -import java.io.OutputStream; -import java.util.logging.Level; -import java.util.logging.Logger; -//import jline.console.ConsoleReader; -import org.bukkit.craftbukkit.Main; //import org.fusesource.jansi.Ansi; //import org.fusesource.jansi.Ansi.Erase; diff --git a/src/main/java/org/bukkit/craftbukkit/util/UnsafeList.java b/src/main/java/org/bukkit/craftbukkit/util/UnsafeList.java index 50f855b931dba60754fff9c7cdf5e0e744f00fdd..3165126e185ad18a4406712d1a0e27d3634e7b81 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/UnsafeList.java +++ b/src/main/java/org/bukkit/craftbukkit/util/UnsafeList.java @@ -4,13 +4,7 @@ import java.io.IOException; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; import java.io.Serializable; -import java.util.AbstractList; -import java.util.Arrays; -import java.util.ConcurrentModificationException; -import java.util.Iterator; -import java.util.List; -import java.util.NoSuchElementException; -import java.util.RandomAccess; +import java.util.*; // implementation of an ArrayList that offers a getter without range checks @SuppressWarnings("unchecked") diff --git a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java index 2e6cd1780d759a9f94dc4d740fa1b81faad2a1ee..f96d936c82cd223621a12abbf4f0780d7df26259 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java +++ b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java @@ -1,11 +1,12 @@ package org.bukkit.craftbukkit.util; +import org.bukkit.Bukkit; + import java.io.IOException; import java.io.InputStream; import java.util.Properties; import java.util.logging.Level; import java.util.logging.Logger; -import org.bukkit.Bukkit; public final class Versioning { public static String getBukkitVersion() { diff --git a/src/main/java/org/bukkit/craftbukkit/util/WeakCollection.java b/src/main/java/org/bukkit/craftbukkit/util/WeakCollection.java index 3c8946837351bf5a469be494b735d414e1801c20..d2e979c0ece68ccae2045d1bcbc6299eee4bf751 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/WeakCollection.java +++ b/src/main/java/org/bukkit/craftbukkit/util/WeakCollection.java @@ -1,11 +1,12 @@ package org.bukkit.craftbukkit.util; +import org.apache.commons.lang.Validate; + import java.lang.ref.WeakReference; import java.util.ArrayList; import java.util.Collection; import java.util.Iterator; import java.util.NoSuchElementException; -import org.apache.commons.lang.Validate; public final class WeakCollection implements Collection { static final Object NO_VALUE = new Object(); diff --git a/src/main/java/org/bukkit/craftbukkit/util/WorldUUID.java b/src/main/java/org/bukkit/craftbukkit/util/WorldUUID.java index f101ed6c5a5e16e5804b36f1182edca874981831..af89e91a272a6850fe55221a7b103f6e8b8c59a2 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/WorldUUID.java +++ b/src/main/java/org/bukkit/craftbukkit/util/WorldUUID.java @@ -1,15 +1,11 @@ package org.bukkit.craftbukkit.util; -import java.io.DataInputStream; -import java.io.DataOutputStream; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; -import java.io.IOException; -import java.util.UUID; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import java.io.*; +import java.util.UUID; + public final class WorldUUID { private static final Logger LOGGER = LogManager.getLogger(); diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java index 37e930e0cb05cdb19c1b0dbd870313a14402181b..91a4afcce0df7652285af12b822662f0d181af1b 100644 --- a/src/main/java/org/spigotmc/ActivationRange.java +++ b/src/main/java/org/spigotmc/ActivationRange.java @@ -1,54 +1,7 @@ package org.spigotmc; -import java.util.Collection; -import java.util.List; - -import net.minecraft.server.Activity; -import net.minecraft.server.AxisAlignedBB; -import net.minecraft.server.BehaviorController; -import net.minecraft.server.BlockPosition; -import net.minecraft.server.Chunk; -import net.minecraft.server.ChunkProviderServer; // Paper -import net.minecraft.server.Entity; -import net.minecraft.server.EntityAmbient; -import net.minecraft.server.EntityAnimal; -import net.minecraft.server.EntityArrow; -import net.minecraft.server.EntityBee; -import net.minecraft.server.EntityComplexPart; -import net.minecraft.server.EntityCreature; -import net.minecraft.server.EntityCreeper; -import net.minecraft.server.EntityEnderCrystal; -import net.minecraft.server.EntityEnderDragon; -import net.minecraft.server.EntityEnderSignal; -import net.minecraft.server.EntityFallingBlock; // Paper -import net.minecraft.server.EntityFireball; -import net.minecraft.server.EntityFireworks; -import net.minecraft.server.EntityFlying; -import net.minecraft.server.EntityHuman; -import net.minecraft.server.EntityLightning; -import net.minecraft.server.EntityLiving; -import net.minecraft.server.EntityMonster; -import net.minecraft.server.EntityPillager; -import net.minecraft.server.EntityPlayer; -import net.minecraft.server.EntityProjectile; -import net.minecraft.server.EntityRaider; -import net.minecraft.server.EntitySheep; -import net.minecraft.server.EntitySlice; -import net.minecraft.server.EntitySlime; -import net.minecraft.server.EntityTNTPrimed; -import net.minecraft.server.EntityThrownTrident; -import net.minecraft.server.EntityVillager; -import net.minecraft.server.EntityWither; -import net.minecraft.server.IMonster; -import net.minecraft.server.MathHelper; -import net.minecraft.server.MemoryModuleType; -import net.minecraft.server.MinecraftServer; -import net.minecraft.server.World; import co.aikar.timings.MinecraftTimings; -// Paper start -import net.minecraft.server.EntityInsentient; -import net.minecraft.server.EntityLlama; -import net.minecraft.server.EntityWaterAnimal; +import net.minecraft.server.*; // Paper end public class ActivationRange diff --git a/src/main/java/org/spigotmc/AsyncCatcher.java b/src/main/java/org/spigotmc/AsyncCatcher.java index c3ac1a46c3e06bfe06ad9ff9f4ec49c055a790b0..1951ace93be5e7a74b80011890e71e7d6b26fc95 100644 --- a/src/main/java/org/spigotmc/AsyncCatcher.java +++ b/src/main/java/org/spigotmc/AsyncCatcher.java @@ -1,7 +1,5 @@ package org.spigotmc; -import net.minecraft.server.MinecraftServer; - public class AsyncCatcher { diff --git a/src/main/java/org/spigotmc/LimitStream.java b/src/main/java/org/spigotmc/LimitStream.java index 8c32e8b62d47ba984a7a1e2e5dad042e2a59284d..4a5463079694b24e7591f124a851b945a16a9aee 100644 --- a/src/main/java/org/spigotmc/LimitStream.java +++ b/src/main/java/org/spigotmc/LimitStream.java @@ -1,9 +1,10 @@ package org.spigotmc; +import net.minecraft.server.NBTReadLimiter; + import java.io.FilterInputStream; import java.io.IOException; import java.io.InputStream; -import net.minecraft.server.NBTReadLimiter; public class LimitStream extends FilterInputStream { diff --git a/src/main/java/org/spigotmc/Metrics.java b/src/main/java/org/spigotmc/Metrics.java index 05d2d3d523b5855f0bc0d9b34232ba9045a0368d..32f07f052496ecda189c9d6af9def6a1a8fc032d 100644 --- a/src/main/java/org/spigotmc/Metrics.java +++ b/src/main/java/org/spigotmc/Metrics.java @@ -27,34 +27,19 @@ */ package org.spigotmc; +import net.minecraft.server.MinecraftServer; import org.bukkit.Bukkit; -import org.bukkit.configuration.file.YamlConfiguration; import org.bukkit.configuration.InvalidConfigurationException; -import org.bukkit.plugin.Plugin; -import org.bukkit.plugin.PluginDescriptionFile; -import org.bukkit.scheduler.BukkitTask; - -import java.io.BufferedReader; -import java.io.File; -import java.io.IOException; -import java.io.InputStreamReader; -import java.io.OutputStreamWriter; -import java.io.UnsupportedEncodingException; +import org.bukkit.configuration.file.YamlConfiguration; + +import java.io.*; import java.net.Proxy; import java.net.URL; import java.net.URLConnection; import java.net.URLEncoder; -import java.util.Collections; -import java.util.HashSet; -import java.util.Iterator; -import java.util.LinkedHashSet; -import java.util.Set; -import java.util.Timer; -import java.util.TimerTask; -import java.util.UUID; +import java.util.*; import java.util.concurrent.TimeUnit; import java.util.logging.Level; -import net.minecraft.server.MinecraftServer; /** *

    The metrics class obtains data about a plugin and submits statistics about it to the metrics backend.

    diff --git a/src/main/java/org/spigotmc/RestartCommand.java b/src/main/java/org/spigotmc/RestartCommand.java index 123de5ac9026508e21cdc225f0962f5c3c46fed5..44b12b9b367acb51ee02c7b2d91f2e5cbb788cb6 100644 --- a/src/main/java/org/spigotmc/RestartCommand.java +++ b/src/main/java/org/spigotmc/RestartCommand.java @@ -1,12 +1,12 @@ package org.spigotmc; -import java.io.File; -import java.util.List; import net.minecraft.server.EntityPlayer; import net.minecraft.server.MinecraftServer; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; +import java.io.File; + public class RestartCommand extends Command { diff --git a/src/main/java/org/spigotmc/SpigotCommand.java b/src/main/java/org/spigotmc/SpigotCommand.java index d0be3c3b593ad5f4bb1d166462fddd32bebb4875..421f64e67a602ae6c6df9372dd6dde47eabb0ff9 100644 --- a/src/main/java/org/spigotmc/SpigotCommand.java +++ b/src/main/java/org/spigotmc/SpigotCommand.java @@ -1,12 +1,13 @@ package org.spigotmc; -import java.io.File; import net.minecraft.server.MinecraftServer; import net.minecraft.server.WorldServer; import org.bukkit.ChatColor; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; +import java.io.File; + public class SpigotCommand extends Command { public SpigotCommand(String name) { diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java index e66050b87ace6544636e10123ad0963176e5fdf7..d842b72d1fad93b7e499bb7af6fa0cae2cb04e8b 100644 --- a/src/main/java/org/spigotmc/SpigotConfig.java +++ b/src/main/java/org/spigotmc/SpigotConfig.java @@ -1,23 +1,7 @@ package org.spigotmc; import com.google.common.base.Throwables; -import java.io.File; -import java.io.IOException; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; -import java.lang.reflect.Modifier; -import java.util.Arrays; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.logging.Level; -import net.minecraft.server.AttributeRanged; -import net.minecraft.server.GenericAttributes; -import net.minecraft.server.IRegistry; -import net.minecraft.server.MinecraftKey; -import net.minecraft.server.MinecraftServer; +import net.minecraft.server.*; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.core.LoggerContext; import org.apache.logging.log4j.core.config.Configuration; @@ -28,6 +12,14 @@ import org.bukkit.configuration.ConfigurationSection; import org.bukkit.configuration.InvalidConfigurationException; import org.bukkit.configuration.file.YamlConfiguration; +import java.io.File; +import java.io.IOException; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.lang.reflect.Modifier; +import java.util.*; +import java.util.logging.Level; + public class SpigotConfig { diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java index 9859e0c964e4d1e7dc7689cb97f40643a8e5cdd7..e92462eaa355a325a78c5b16c7d44dbcacf586c8 100644 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java @@ -1,9 +1,10 @@ package org.spigotmc; -import java.util.List; import org.bukkit.Bukkit; import org.bukkit.configuration.file.YamlConfiguration; +import java.util.List; + public class SpigotWorldConfig { diff --git a/src/main/java/org/spigotmc/TicksPerSecondCommand.java b/src/main/java/org/spigotmc/TicksPerSecondCommand.java index 87812ace9e1327f31693bdfb3fa45ac38766799b..0b603f80e2db60590d996cae6ed3e87ead7bd752 100644 --- a/src/main/java/org/spigotmc/TicksPerSecondCommand.java +++ b/src/main/java/org/spigotmc/TicksPerSecondCommand.java @@ -1,8 +1,5 @@ package org.spigotmc; -import com.google.common.base.Joiner; -import net.minecraft.server.MinecraftServer; -import com.google.common.collect.Iterables; import org.bukkit.ChatColor; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; diff --git a/src/main/java/org/spigotmc/TrackingRange.java b/src/main/java/org/spigotmc/TrackingRange.java index 627e9a90b3045602bc540a5f3f031aaf3716c942..ad70a45b8ec7f893157215f2767145e842de31fd 100644 --- a/src/main/java/org/spigotmc/TrackingRange.java +++ b/src/main/java/org/spigotmc/TrackingRange.java @@ -1,14 +1,6 @@ package org.spigotmc; -import net.minecraft.server.Entity; -import net.minecraft.server.EntityEnderDragon; // Paper -import net.minecraft.server.WorldServer; // Paper -import net.minecraft.server.EntityExperienceOrb; -import net.minecraft.server.EntityGhast; -import net.minecraft.server.EntityItem; -import net.minecraft.server.EntityItemFrame; -import net.minecraft.server.EntityPainting; -import net.minecraft.server.EntityPlayer; +import net.minecraft.server.*; public class TrackingRange { diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java index 4d310908489953d6d061b2358f614142edacb62e..e6a76a4a55de87a2383eb5c831184e50cc11d042 100644 --- a/src/main/java/org/spigotmc/WatchdogThread.java +++ b/src/main/java/org/spigotmc/WatchdogThread.java @@ -1,14 +1,15 @@ package org.spigotmc; +import com.destroystokyo.paper.PaperConfig; +import com.destroystokyo.paper.io.chunk.ChunkTaskManager; +import net.minecraft.server.MinecraftServer; +import org.bukkit.Bukkit; + import java.lang.management.ManagementFactory; import java.lang.management.MonitorInfo; import java.lang.management.ThreadInfo; import java.util.logging.Level; import java.util.logging.Logger; -import com.destroystokyo.paper.PaperConfig; -import com.destroystokyo.paper.io.chunk.ChunkTaskManager; // Paper -import net.minecraft.server.MinecraftServer; -import org.bukkit.Bukkit; public class WatchdogThread extends Thread { diff --git a/src/test/java/com/destroystokyo/paper/entity/ai/VanillaMobGoalTest.java b/src/test/java/com/destroystokyo/paper/entity/ai/VanillaMobGoalTest.java index 232c382b586b0812c9f7161565c0d382177adf7d..8970d2abdac703c1757ad2570079f43f9b82a6f3 100644 --- a/src/test/java/com/destroystokyo/paper/entity/ai/VanillaMobGoalTest.java +++ b/src/test/java/com/destroystokyo/paper/entity/ai/VanillaMobGoalTest.java @@ -1,8 +1,10 @@ package com.destroystokyo.paper.entity.ai; +import io.github.classgraph.ClassGraph; +import io.github.classgraph.ScanResult; import net.minecraft.server.EntityInsentient; import net.minecraft.server.PathfinderGoal; - +import org.bukkit.entity.Mob; import org.junit.Assert; import org.junit.Test; @@ -12,11 +14,6 @@ import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; -import org.bukkit.entity.Mob; - -import io.github.classgraph.ClassGraph; -import io.github.classgraph.ScanResult; - public class VanillaMobGoalTest { @Test diff --git a/src/test/java/org/bukkit/ArtTest.java b/src/test/java/org/bukkit/ArtTest.java index 39e3d2150aa0da327ab8980d18e1a0d0e77ae3a9..5eb2cc27695da52a702f831057ec0cf5b4a5dab5 100644 --- a/src/test/java/org/bukkit/ArtTest.java +++ b/src/test/java/org/bukkit/ArtTest.java @@ -1,13 +1,6 @@ package org.bukkit; -import static org.hamcrest.Matchers.*; -import static org.junit.Assert.*; import com.google.common.collect.Lists; -import java.util.Collections; -import java.util.EnumMap; -import java.util.HashMap; -import java.util.List; -import java.util.Map; import net.minecraft.server.IRegistry; import net.minecraft.server.MinecraftKey; import net.minecraft.server.Paintings; @@ -15,6 +8,13 @@ import org.bukkit.craftbukkit.CraftArt; import org.bukkit.support.AbstractTestingBase; import org.junit.Test; +import java.util.*; + +import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.nullValue; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertThat; + public class ArtTest extends AbstractTestingBase { private static final int UNIT_MULTIPLIER = 16; diff --git a/src/test/java/org/bukkit/BlockDataConversionTest.java b/src/test/java/org/bukkit/BlockDataConversionTest.java index 46cc26b316f0ab17f676bae98ffbd109928c85dd..a1719437849ea14c4ce53f72cd9ad0aeb40d1035 100644 --- a/src/test/java/org/bukkit/BlockDataConversionTest.java +++ b/src/test/java/org/bukkit/BlockDataConversionTest.java @@ -1,7 +1,5 @@ package org.bukkit; -import java.util.ArrayList; -import java.util.List; import net.minecraft.server.Block; import net.minecraft.server.IBlockData; import net.minecraft.server.IRegistry; @@ -12,6 +10,9 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; +import java.util.ArrayList; +import java.util.List; + /** * This test class ensures that all Blocks (as registered in IRegistry.BLOCK) * can be converted into their CraftBlockData equivalent. diff --git a/src/test/java/org/bukkit/BlockDataTest.java b/src/test/java/org/bukkit/BlockDataTest.java index 00b8ad356f013943396ef971641ea121babb3ffb..7758303ee7622463ef5cabcff9dbb3bc924c2f4a 100644 --- a/src/test/java/org/bukkit/BlockDataTest.java +++ b/src/test/java/org/bukkit/BlockDataTest.java @@ -1,6 +1,5 @@ package org.bukkit; -import static org.hamcrest.Matchers.*; import net.minecraft.server.BlockCake; import net.minecraft.server.BlockChest; import net.minecraft.server.Blocks; @@ -14,6 +13,9 @@ import org.bukkit.support.AbstractTestingBase; import org.junit.Assert; import org.junit.Test; +import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.not; + public class BlockDataTest extends AbstractTestingBase { @Test diff --git a/src/test/java/org/bukkit/ChatTest.java b/src/test/java/org/bukkit/ChatTest.java index 95bc1d598d01b982847dda1a8531fb21a1cec423..d5251ac1cb8e85756b97a7c47a4b43a7d7695741 100644 --- a/src/test/java/org/bukkit/ChatTest.java +++ b/src/test/java/org/bukkit/ChatTest.java @@ -1,12 +1,13 @@ package org.bukkit; -import static org.junit.Assert.*; import net.minecraft.server.EnumChatFormat; import net.minecraft.server.IChatBaseComponent; import org.bukkit.craftbukkit.util.CraftChatMessage; import org.junit.Assert; import org.junit.Test; +import static org.junit.Assert.assertEquals; + public class ChatTest { @Test diff --git a/src/test/java/org/bukkit/DyeColorsTest.java b/src/test/java/org/bukkit/DyeColorsTest.java index 9bd05a702585566b90a778afb1ff0bf32c0c71f5..eedde20db9ded0ddacaba306c9f413f4c8152b14 100644 --- a/src/test/java/org/bukkit/DyeColorsTest.java +++ b/src/test/java/org/bukkit/DyeColorsTest.java @@ -1,9 +1,5 @@ package org.bukkit; -import static org.hamcrest.Matchers.*; -import static org.junit.Assert.*; -import java.util.ArrayList; -import java.util.List; import net.minecraft.server.EnumColor; import org.bukkit.support.AbstractTestingBase; import org.junit.Test; @@ -12,6 +8,12 @@ import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameter; import org.junit.runners.Parameterized.Parameters; +import java.util.ArrayList; +import java.util.List; + +import static org.hamcrest.Matchers.is; +import static org.junit.Assert.assertThat; + @RunWith(Parameterized.class) public class DyeColorsTest extends AbstractTestingBase { diff --git a/src/test/java/org/bukkit/GameRuleTest.java b/src/test/java/org/bukkit/GameRuleTest.java index ca598c58b400aacbf1c1801cf29fd7b0b7c12d63..c9a81c742bd679698992451a98a1ccc924afc924 100644 --- a/src/test/java/org/bukkit/GameRuleTest.java +++ b/src/test/java/org/bukkit/GameRuleTest.java @@ -1,11 +1,12 @@ package org.bukkit; -import java.util.Map; import net.minecraft.server.GameRules; import org.bukkit.craftbukkit.CraftWorld; import org.junit.Assert; import org.junit.Test; +import java.util.Map; + public class GameRuleTest { @Test diff --git a/src/test/java/org/bukkit/MaterialTest.java b/src/test/java/org/bukkit/MaterialTest.java index efac35cb7b5931c21d42306009ff6e92c2260677..bd4b02e16b7bbb91e6b2045866b8f5a76fe492f8 100644 --- a/src/test/java/org/bukkit/MaterialTest.java +++ b/src/test/java/org/bukkit/MaterialTest.java @@ -1,16 +1,6 @@ package org.bukkit; -import static org.hamcrest.Matchers.*; -import static org.junit.Assert.*; import com.google.common.collect.Maps; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.Comparator; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.stream.StreamSupport; import net.minecraft.server.IRegistry; import net.minecraft.server.Item; import net.minecraft.server.MinecraftKey; @@ -18,6 +8,12 @@ import org.bukkit.craftbukkit.util.CraftMagicNumbers; import org.bukkit.support.AbstractTestingBase; import org.junit.Test; +import java.util.*; +import java.util.stream.StreamSupport; + +import static org.hamcrest.Matchers.*; +import static org.junit.Assert.*; + public class MaterialTest extends AbstractTestingBase { @Test diff --git a/src/test/java/org/bukkit/NibbleArrayTest.java b/src/test/java/org/bukkit/NibbleArrayTest.java index 40ba97fb77dddafe7c792249ca343d5abee3e5d0..460a3e64ecf3efeaecbcbbb86d1ad221fcc35365 100644 --- a/src/test/java/org/bukkit/NibbleArrayTest.java +++ b/src/test/java/org/bukkit/NibbleArrayTest.java @@ -1,10 +1,11 @@ package org.bukkit; -import java.util.Random; import net.minecraft.server.NibbleArray; import org.junit.Assert; import org.junit.Test; +import java.util.Random; + public class NibbleArrayTest { private static final int NIBBLE_SIZE = 4096; diff --git a/src/test/java/org/bukkit/PerMaterialTest.java b/src/test/java/org/bukkit/PerMaterialTest.java index b99ad0faf3b4a8390dcc5af5346b68daed75d4ed..c503a44ef32e1076a1fdc542aab55e3b1b3a42ff 100644 --- a/src/test/java/org/bukkit/PerMaterialTest.java +++ b/src/test/java/org/bukkit/PerMaterialTest.java @@ -1,24 +1,7 @@ package org.bukkit; -import static org.hamcrest.Matchers.*; -import static org.junit.Assert.*; import com.google.common.collect.Lists; -import java.util.List; -import java.util.Map; -import net.minecraft.server.Block; -import net.minecraft.server.BlockAccessAir; -import net.minecraft.server.BlockBase; -import net.minecraft.server.BlockFalling; -import net.minecraft.server.BlockFire; -import net.minecraft.server.BlockPosition; -import net.minecraft.server.Blocks; -import net.minecraft.server.EntityHuman; -import net.minecraft.server.EnumHand; -import net.minecraft.server.IBlockData; -import net.minecraft.server.Item; -import net.minecraft.server.ItemRecord; -import net.minecraft.server.MovingObjectPositionBlock; -import net.minecraft.server.TileEntityFurnace; +import net.minecraft.server.*; import org.bukkit.craftbukkit.inventory.CraftItemStack; import org.bukkit.craftbukkit.util.CraftMagicNumbers; import org.bukkit.enchantments.EnchantmentTarget; @@ -32,6 +15,12 @@ import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameter; import org.junit.runners.Parameterized.Parameters; +import java.util.List; +import java.util.Map; + +import static org.hamcrest.Matchers.*; +import static org.junit.Assert.*; + @RunWith(Parameterized.class) public class PerMaterialTest extends AbstractTestingBase { private static Map fireValues; diff --git a/src/test/java/org/bukkit/SoundTest.java b/src/test/java/org/bukkit/SoundTest.java index f8e87443438eadd7d95da05027c2bb78114f9c47..b361c0d119afefa0d049587059422522fda8fc21 100644 --- a/src/test/java/org/bukkit/SoundTest.java +++ b/src/test/java/org/bukkit/SoundTest.java @@ -1,13 +1,15 @@ package org.bukkit; -import static org.hamcrest.Matchers.*; -import static org.junit.Assert.*; import net.minecraft.server.IRegistry; import net.minecraft.server.MinecraftKey; import org.bukkit.craftbukkit.CraftSound; import org.bukkit.support.AbstractTestingBase; import org.junit.Test; +import static org.hamcrest.Matchers.*; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertThat; + public class SoundTest extends AbstractTestingBase { @Test diff --git a/src/test/java/org/bukkit/StatisticsAndAchievementsTest.java b/src/test/java/org/bukkit/StatisticsAndAchievementsTest.java index f45fa3fd632a7bcea7ef51b26d6ae5e3fb67fc6f..5c5b7db9d7e694fd899f64cf40b087e64c8f6b4b 100644 --- a/src/test/java/org/bukkit/StatisticsAndAchievementsTest.java +++ b/src/test/java/org/bukkit/StatisticsAndAchievementsTest.java @@ -1,7 +1,5 @@ package org.bukkit; -import static org.hamcrest.Matchers.*; -import static org.junit.Assert.*; import com.google.common.collect.HashMultiset; import net.minecraft.server.EntityTypes; import net.minecraft.server.IRegistry; @@ -11,6 +9,10 @@ import org.bukkit.entity.EntityType; import org.bukkit.support.AbstractTestingBase; import org.junit.Test; +import static org.hamcrest.Matchers.*; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertThat; + public class StatisticsAndAchievementsTest extends AbstractTestingBase { @Test diff --git a/src/test/java/org/bukkit/StructureTypeTest.java b/src/test/java/org/bukkit/StructureTypeTest.java index f25e13c08ac20da2e1fcc817cadd3a86c411915c..8fe4d3ecf6075bd95806407628f711bac6f921df 100644 --- a/src/test/java/org/bukkit/StructureTypeTest.java +++ b/src/test/java/org/bukkit/StructureTypeTest.java @@ -1,6 +1,5 @@ package org.bukkit; -import java.util.Map; import net.minecraft.server.IRegistry; import net.minecraft.server.MinecraftKey; import org.bukkit.support.AbstractTestingBase; @@ -8,6 +7,8 @@ import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; +import java.util.Map; + /** * This test makes sure that Bukkit always has Minecraft structure types up to * date. diff --git a/src/test/java/org/bukkit/craftbukkit/generator/ChunkDataTest.java b/src/test/java/org/bukkit/craftbukkit/generator/ChunkDataTest.java index b59b28aa9c3824d352b89394eb3a506a11a0dff6..f0773b14258c8555c6f3c2e983609e39767d7670 100644 --- a/src/test/java/org/bukkit/craftbukkit/generator/ChunkDataTest.java +++ b/src/test/java/org/bukkit/craftbukkit/generator/ChunkDataTest.java @@ -1,11 +1,12 @@ package org.bukkit.craftbukkit.generator; -import static org.junit.Assert.*; import org.bukkit.Material; import org.bukkit.block.data.BlockData; import org.bukkit.support.AbstractTestingBase; import org.junit.Test; +import static org.junit.Assert.assertTrue; + public class ChunkDataTest extends AbstractTestingBase { private static final BlockData RED_WOOL = Material.RED_WOOL.createBlockData(); diff --git a/src/test/java/org/bukkit/craftbukkit/inventory/CompositeSerialization.java b/src/test/java/org/bukkit/craftbukkit/inventory/CompositeSerialization.java index 4a85b083b4185e25a6da38d299d01b0a0eca117f..3a405223002a15210e6b05c62030310f2ad21855 100644 --- a/src/test/java/org/bukkit/craftbukkit/inventory/CompositeSerialization.java +++ b/src/test/java/org/bukkit/craftbukkit/inventory/CompositeSerialization.java @@ -1,10 +1,5 @@ package org.bukkit.craftbukkit.inventory; -import static org.hamcrest.Matchers.*; -import static org.junit.Assert.*; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; import org.bukkit.ChatColor; import org.bukkit.Material; import org.bukkit.configuration.InvalidConfigurationException; @@ -15,6 +10,14 @@ import org.bukkit.inventory.meta.ItemMeta; import org.bukkit.support.AbstractTestingBase; import org.junit.Test; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +import static org.hamcrest.Matchers.hasSize; +import static org.hamcrest.Matchers.is; +import static org.junit.Assert.assertThat; + public class CompositeSerialization extends AbstractTestingBase { diff --git a/src/test/java/org/bukkit/craftbukkit/inventory/DeprecatedItemMetaCustomValueTest.java b/src/test/java/org/bukkit/craftbukkit/inventory/DeprecatedItemMetaCustomValueTest.java index 0ab65ac7310cfc184b1d41b417c0a1db184f199e..8ae0a4a862094bcc0ac2894f10da12c56c69b0c2 100644 --- a/src/test/java/org/bukkit/craftbukkit/inventory/DeprecatedItemMetaCustomValueTest.java +++ b/src/test/java/org/bukkit/craftbukkit/inventory/DeprecatedItemMetaCustomValueTest.java @@ -1,11 +1,5 @@ package org.bukkit.craftbukkit.inventory; -import static org.junit.Assert.*; -import java.io.StringReader; -import java.lang.reflect.Array; -import java.nio.ByteBuffer; -import java.util.Map; -import java.util.UUID; import net.minecraft.server.NBTTagCompound; import org.bukkit.Bukkit; import org.bukkit.Material; @@ -20,6 +14,14 @@ import org.bukkit.support.AbstractTestingBase; import org.junit.Before; import org.junit.Test; +import java.io.StringReader; +import java.lang.reflect.Array; +import java.nio.ByteBuffer; +import java.util.Map; +import java.util.UUID; + +import static org.junit.Assert.*; + public class DeprecatedItemMetaCustomValueTest extends AbstractTestingBase { private static NamespacedKey VALID_KEY; diff --git a/src/test/java/org/bukkit/craftbukkit/inventory/FactoryItemMaterialTest.java b/src/test/java/org/bukkit/craftbukkit/inventory/FactoryItemMaterialTest.java index c279579c2bd54363090c6c99fbd92798a6b97c79..1eeca7324d755ef45b353dfb167b2faa17c7dfc6 100644 --- a/src/test/java/org/bukkit/craftbukkit/inventory/FactoryItemMaterialTest.java +++ b/src/test/java/org/bukkit/craftbukkit/inventory/FactoryItemMaterialTest.java @@ -1,9 +1,5 @@ package org.bukkit.craftbukkit.inventory; -import static org.hamcrest.Matchers.*; -import static org.junit.Assert.*; -import java.util.ArrayList; -import java.util.List; import org.bukkit.Material; import org.bukkit.inventory.ItemFactory; import org.bukkit.inventory.ItemStack; @@ -15,6 +11,13 @@ import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameter; import org.junit.runners.Parameterized.Parameters; +import java.util.ArrayList; +import java.util.List; + +import static org.hamcrest.Matchers.*; +import static org.junit.Assert.assertThat; +import static org.junit.Assert.assertTrue; + @RunWith(Parameterized.class) public class FactoryItemMaterialTest extends AbstractTestingBase { static final ItemFactory factory = CraftItemFactory.instance(); diff --git a/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaCloneTest.java b/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaCloneTest.java index cefedd7d1e568d046b2e6f2ee75ffcf13754c5bb..bd8240c24b6addc45475a7de6f2f90624c5442a9 100644 --- a/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaCloneTest.java +++ b/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaCloneTest.java @@ -1,11 +1,15 @@ package org.bukkit.craftbukkit.inventory; -import static org.hamcrest.Matchers.*; -import static org.junit.Assert.*; -import java.lang.reflect.Method; import org.bukkit.Material; import org.junit.Test; +import java.lang.reflect.Method; + +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.is; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertThat; + public class ItemMetaCloneTest { @Test diff --git a/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaImplementationOverrideTest.java b/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaImplementationOverrideTest.java index 61ac1fb7c5beee7b7adbaafd6ea20e2e6bc778e5..ff1476c0a8a993d572ca8c2276f0bc1459bca4b3 100644 --- a/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaImplementationOverrideTest.java +++ b/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaImplementationOverrideTest.java @@ -1,11 +1,5 @@ package org.bukkit.craftbukkit.inventory; -import static org.hamcrest.Matchers.*; -import static org.junit.Assert.*; -import java.lang.reflect.Method; -import java.util.ArrayList; -import java.util.List; -import java.util.concurrent.Callable; import org.bukkit.Material; import org.bukkit.configuration.serialization.DelegateDeserialization; import org.bukkit.craftbukkit.Overridden; @@ -15,6 +9,14 @@ import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameter; import org.junit.runners.Parameterized.Parameters; +import java.lang.reflect.Method; +import java.util.ArrayList; +import java.util.List; +import java.util.concurrent.Callable; + +import static org.hamcrest.Matchers.*; +import static org.junit.Assert.assertThat; + @RunWith(Parameterized.class) public class ItemMetaImplementationOverrideTest { static final Class parent = CraftMetaItem.class; diff --git a/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java b/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java index b0edd62eb9066d145cfc52272c71d5f00b7e928d..6adc6850effe0e75ea16d5bd03c7defdf4eaa952 100644 --- a/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java +++ b/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java @@ -1,25 +1,9 @@ package org.bukkit.craftbukkit.inventory; -import static org.hamcrest.Matchers.*; -import static org.junit.Assert.*; - -import java.util.*; - -import com.destroystokyo.paper.inventory.meta.ArmorStandMeta; // Paper -import net.minecraft.server.Block; -import net.minecraft.server.IRegistry; -import net.minecraft.server.ITileEntity; -import net.minecraft.server.Item; -import net.minecraft.server.ItemBlock; -import net.minecraft.server.ItemBlockWallable; -import net.minecraft.server.NBTTagCompound; -import org.bukkit.Bukkit; -import org.bukkit.Color; -import org.bukkit.DyeColor; -import org.bukkit.FireworkEffect; -import org.bukkit.FireworkEffect.Type; +import net.minecraft.server.*; +import org.bukkit.*; import org.bukkit.Material; -import org.bukkit.NamespacedKey; +import org.bukkit.FireworkEffect.Type; import org.bukkit.attribute.Attribute; import org.bukkit.attribute.AttributeModifier; import org.bukkit.block.banner.Pattern; @@ -32,26 +16,18 @@ import org.bukkit.craftbukkit.inventory.ItemStackTest.StackWrapper; import org.bukkit.enchantments.Enchantment; import org.bukkit.entity.TropicalFish; import org.bukkit.inventory.ItemStack; -import org.bukkit.inventory.meta.BannerMeta; -import org.bukkit.inventory.meta.BlockDataMeta; -import org.bukkit.inventory.meta.BlockStateMeta; -import org.bukkit.inventory.meta.BookMeta; -import org.bukkit.inventory.meta.CrossbowMeta; -import org.bukkit.inventory.meta.EnchantmentStorageMeta; -import org.bukkit.inventory.meta.FireworkEffectMeta; -import org.bukkit.inventory.meta.FireworkMeta; -import org.bukkit.inventory.meta.ItemMeta; -import org.bukkit.inventory.meta.KnowledgeBookMeta; -import org.bukkit.inventory.meta.LeatherArmorMeta; -import org.bukkit.inventory.meta.MapMeta; -import org.bukkit.inventory.meta.PotionMeta; -import org.bukkit.inventory.meta.TropicalFishBucketMeta; +import org.bukkit.inventory.meta.*; import org.bukkit.potion.PotionData; import org.bukkit.potion.PotionEffectType; import org.bukkit.potion.PotionType; import org.bukkit.support.AbstractTestingBase; import org.junit.Test; +import java.util.*; + +import static org.hamcrest.Matchers.*; +import static org.junit.Assert.*; + public class ItemMetaTest extends AbstractTestingBase { static final int MAX_FIREWORK_POWER = 127; // Please update ItemStackFireworkTest if/when this gets changed. diff --git a/src/test/java/org/bukkit/craftbukkit/inventory/ItemStackBookTest.java b/src/test/java/org/bukkit/craftbukkit/inventory/ItemStackBookTest.java index c7d10b08925c0b4e7c49876d37f009fff546f7ea..4f55cb6ce350f2b53c25b15858da6e929a4ff663 100644 --- a/src/test/java/org/bukkit/craftbukkit/inventory/ItemStackBookTest.java +++ b/src/test/java/org/bukkit/craftbukkit/inventory/ItemStackBookTest.java @@ -1,8 +1,6 @@ package org.bukkit.craftbukkit.inventory; import com.google.common.base.Joiner; -import java.util.Arrays; -import java.util.List; import org.bukkit.Material; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.BookMeta; @@ -10,6 +8,9 @@ import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; +import java.util.Arrays; +import java.util.List; + @RunWith(Parameterized.class) public class ItemStackBookTest extends ItemStackTest { diff --git a/src/test/java/org/bukkit/craftbukkit/inventory/ItemStackEnchantStorageTest.java b/src/test/java/org/bukkit/craftbukkit/inventory/ItemStackEnchantStorageTest.java index 157eef07ee1603ac0002d4fe213b74df24391f4c..e8add3611a2f10fb8e8ebfba5bc5e68b9770972f 100644 --- a/src/test/java/org/bukkit/craftbukkit/inventory/ItemStackEnchantStorageTest.java +++ b/src/test/java/org/bukkit/craftbukkit/inventory/ItemStackEnchantStorageTest.java @@ -1,8 +1,6 @@ package org.bukkit.craftbukkit.inventory; import com.google.common.base.Joiner; -import java.util.Arrays; -import java.util.List; import org.bukkit.Material; import org.bukkit.enchantments.Enchantment; import org.bukkit.inventory.ItemStack; @@ -11,6 +9,9 @@ import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; +import java.util.Arrays; +import java.util.List; + @RunWith(Parameterized.class) public class ItemStackEnchantStorageTest extends ItemStackTest { diff --git a/src/test/java/org/bukkit/craftbukkit/inventory/ItemStackFireworkChargeTest.java b/src/test/java/org/bukkit/craftbukkit/inventory/ItemStackFireworkChargeTest.java index 1515ec20020111435403d3f3f7da6158a9c614e1..0605caa8f31683d8d338acc74e0c08d4d8daf17a 100644 --- a/src/test/java/org/bukkit/craftbukkit/inventory/ItemStackFireworkChargeTest.java +++ b/src/test/java/org/bukkit/craftbukkit/inventory/ItemStackFireworkChargeTest.java @@ -1,8 +1,6 @@ package org.bukkit.craftbukkit.inventory; import com.google.common.base.Joiner; -import java.util.Arrays; -import java.util.List; import org.bukkit.Color; import org.bukkit.FireworkEffect; import org.bukkit.FireworkEffect.Type; @@ -13,6 +11,9 @@ import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; +import java.util.Arrays; +import java.util.List; + @RunWith(Parameterized.class) public class ItemStackFireworkChargeTest extends ItemStackTest { diff --git a/src/test/java/org/bukkit/craftbukkit/inventory/ItemStackFireworkTest.java b/src/test/java/org/bukkit/craftbukkit/inventory/ItemStackFireworkTest.java index 31fc6046af46033d9e9ed2c414f78dbc214490bd..98512257f9fc703c8570b17788faafa08d58e9ef 100644 --- a/src/test/java/org/bukkit/craftbukkit/inventory/ItemStackFireworkTest.java +++ b/src/test/java/org/bukkit/craftbukkit/inventory/ItemStackFireworkTest.java @@ -1,8 +1,6 @@ package org.bukkit.craftbukkit.inventory; import com.google.common.base.Joiner; -import java.util.Arrays; -import java.util.List; import org.bukkit.Color; import org.bukkit.FireworkEffect; import org.bukkit.FireworkEffect.Type; @@ -13,6 +11,9 @@ import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; +import java.util.Arrays; +import java.util.List; + @RunWith(Parameterized.class) public class ItemStackFireworkTest extends ItemStackTest { diff --git a/src/test/java/org/bukkit/craftbukkit/inventory/ItemStackLeatherTest.java b/src/test/java/org/bukkit/craftbukkit/inventory/ItemStackLeatherTest.java index 9dea89e756029cf2c800dd05e9f00473a2cc45e6..4b6124ea821697e186fff945bc26dad787434450 100644 --- a/src/test/java/org/bukkit/craftbukkit/inventory/ItemStackLeatherTest.java +++ b/src/test/java/org/bukkit/craftbukkit/inventory/ItemStackLeatherTest.java @@ -1,8 +1,6 @@ package org.bukkit.craftbukkit.inventory; import com.google.common.base.Joiner; -import java.util.Arrays; -import java.util.List; import org.bukkit.Color; import org.bukkit.Material; import org.bukkit.inventory.ItemStack; @@ -11,6 +9,9 @@ import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; +import java.util.Arrays; +import java.util.List; + @RunWith(Parameterized.class) public class ItemStackLeatherTest extends ItemStackTest { diff --git a/src/test/java/org/bukkit/craftbukkit/inventory/ItemStackLoreEnchantmentTest.java b/src/test/java/org/bukkit/craftbukkit/inventory/ItemStackLoreEnchantmentTest.java index 339b45191d8edd26e173bff45b4e6400f3739a1a..359e17b91f8e4cd74bb211fcd0dd91e43373fe2a 100644 --- a/src/test/java/org/bukkit/craftbukkit/inventory/ItemStackLoreEnchantmentTest.java +++ b/src/test/java/org/bukkit/craftbukkit/inventory/ItemStackLoreEnchantmentTest.java @@ -1,8 +1,6 @@ package org.bukkit.craftbukkit.inventory; import com.google.common.base.Joiner; -import java.util.Arrays; -import java.util.List; import org.bukkit.enchantments.Enchantment; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.ItemMeta; @@ -11,6 +9,9 @@ import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; +import java.util.Arrays; +import java.util.List; + @RunWith(Parameterized.class) public class ItemStackLoreEnchantmentTest extends ItemStackTest { diff --git a/src/test/java/org/bukkit/craftbukkit/inventory/ItemStackMapTest.java b/src/test/java/org/bukkit/craftbukkit/inventory/ItemStackMapTest.java index fb36575b05596aaa5587093ec49c421a17f4b181..1c0df97be887c312469417be4940ab2b340ffea2 100644 --- a/src/test/java/org/bukkit/craftbukkit/inventory/ItemStackMapTest.java +++ b/src/test/java/org/bukkit/craftbukkit/inventory/ItemStackMapTest.java @@ -1,8 +1,6 @@ package org.bukkit.craftbukkit.inventory; import com.google.common.base.Joiner; -import java.util.Arrays; -import java.util.List; import org.bukkit.Material; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.MapMeta; @@ -10,6 +8,9 @@ import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; +import java.util.Arrays; +import java.util.List; + @RunWith(Parameterized.class) public class ItemStackMapTest extends ItemStackTest { diff --git a/src/test/java/org/bukkit/craftbukkit/inventory/ItemStackPotionsTest.java b/src/test/java/org/bukkit/craftbukkit/inventory/ItemStackPotionsTest.java index f7cf39fdd1d180374f2edcf7596f8df8fa204671..f239b34b6578f4def1028446ff6733c1ed90e86c 100644 --- a/src/test/java/org/bukkit/craftbukkit/inventory/ItemStackPotionsTest.java +++ b/src/test/java/org/bukkit/craftbukkit/inventory/ItemStackPotionsTest.java @@ -1,8 +1,6 @@ package org.bukkit.craftbukkit.inventory; import com.google.common.base.Joiner; -import java.util.Arrays; -import java.util.List; import org.bukkit.Material; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.PotionMeta; @@ -11,6 +9,9 @@ import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; +import java.util.Arrays; +import java.util.List; + @RunWith(Parameterized.class) public class ItemStackPotionsTest extends ItemStackTest { diff --git a/src/test/java/org/bukkit/craftbukkit/inventory/ItemStackSkullTest.java b/src/test/java/org/bukkit/craftbukkit/inventory/ItemStackSkullTest.java index 0ac5e8cb5717b81760ed57461a05f0c5bd2325d8..dd753e0729bc5ee72f425831aeed55064f47b2da 100644 --- a/src/test/java/org/bukkit/craftbukkit/inventory/ItemStackSkullTest.java +++ b/src/test/java/org/bukkit/craftbukkit/inventory/ItemStackSkullTest.java @@ -1,8 +1,6 @@ package org.bukkit.craftbukkit.inventory; import com.google.common.base.Joiner; -import java.util.Arrays; -import java.util.List; import org.bukkit.Material; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.SkullMeta; @@ -10,6 +8,9 @@ import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; +import java.util.Arrays; +import java.util.List; + @RunWith(Parameterized.class) public class ItemStackSkullTest extends ItemStackTest { diff --git a/src/test/java/org/bukkit/craftbukkit/inventory/ItemStackTest.java b/src/test/java/org/bukkit/craftbukkit/inventory/ItemStackTest.java index 1add9c7d39c9e02c9dcdfe14e204d9a1e32d68b0..163b2509ec131fb9dcc86649a8c12195b079873b 100644 --- a/src/test/java/org/bukkit/craftbukkit/inventory/ItemStackTest.java +++ b/src/test/java/org/bukkit/craftbukkit/inventory/ItemStackTest.java @@ -1,20 +1,7 @@ package org.bukkit.craftbukkit.inventory; -import static org.bukkit.support.Matchers.*; -import static org.hamcrest.Matchers.*; -import static org.junit.Assert.*; import com.google.common.base.Joiner; import com.google.common.collect.ImmutableList; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.ObjectInputStream; -import java.io.ObjectOutputStream; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashMap; -import java.util.List; -import java.util.Map; import org.bukkit.Material; import org.bukkit.configuration.InvalidConfigurationException; import org.bukkit.configuration.file.YamlConfiguration; @@ -31,6 +18,13 @@ import org.junit.runners.Parameterized.Parameter; import org.junit.runners.Parameterized.Parameters; import org.yaml.snakeyaml.external.biz.base64Coder.Base64Coder; +import java.io.*; +import java.util.*; + +import static org.bukkit.support.Matchers.sameHash; +import static org.hamcrest.Matchers.*; +import static org.junit.Assert.assertThat; + @RunWith(Parameterized.class) public class ItemStackTest extends AbstractTestingBase { abstract static class StackProvider { diff --git a/src/test/java/org/bukkit/craftbukkit/inventory/NMSCraftItemStackTest.java b/src/test/java/org/bukkit/craftbukkit/inventory/NMSCraftItemStackTest.java index 5f5781230dab9e151ccf3260f1c42e906b655e7e..5328814ecad8e15fe099cba67455ff7c2d8d6d5b 100644 --- a/src/test/java/org/bukkit/craftbukkit/inventory/NMSCraftItemStackTest.java +++ b/src/test/java/org/bukkit/craftbukkit/inventory/NMSCraftItemStackTest.java @@ -1,12 +1,13 @@ package org.bukkit.craftbukkit.inventory; -import static org.hamcrest.Matchers.*; -import static org.junit.Assert.*; import net.minecraft.server.Enchantments; import org.bukkit.inventory.ItemStack; import org.bukkit.support.AbstractTestingBase; import org.junit.Test; +import static org.hamcrest.Matchers.is; +import static org.junit.Assert.assertThat; + public class NMSCraftItemStackTest extends AbstractTestingBase { @Test diff --git a/src/test/java/org/bukkit/craftbukkit/inventory/PersistentDataContainerTest.java b/src/test/java/org/bukkit/craftbukkit/inventory/PersistentDataContainerTest.java index 6feee747e1ee0fc7fb57dc7ee91b7290d6cc348d..f169a98dbcb968cd5d672c4384eb523e65442d65 100644 --- a/src/test/java/org/bukkit/craftbukkit/inventory/PersistentDataContainerTest.java +++ b/src/test/java/org/bukkit/craftbukkit/inventory/PersistentDataContainerTest.java @@ -1,11 +1,5 @@ package org.bukkit.craftbukkit.inventory; -import static org.junit.Assert.*; -import java.io.StringReader; -import java.lang.reflect.Array; -import java.nio.ByteBuffer; -import java.util.Map; -import java.util.UUID; import net.minecraft.server.NBTTagCompound; import org.bukkit.Bukkit; import org.bukkit.Material; @@ -20,6 +14,14 @@ import org.bukkit.support.AbstractTestingBase; import org.junit.Before; import org.junit.Test; +import java.io.StringReader; +import java.lang.reflect.Array; +import java.nio.ByteBuffer; +import java.util.Map; +import java.util.UUID; + +import static org.junit.Assert.*; + public class PersistentDataContainerTest extends AbstractTestingBase { private static NamespacedKey VALID_KEY; diff --git a/src/test/java/org/bukkit/craftbukkit/inventory/PlayerInventoryTest.java b/src/test/java/org/bukkit/craftbukkit/inventory/PlayerInventoryTest.java index 6f56e56afb58cd227231027aa22bbfeb390b3420..7610865e695df2000f4f2efb1f9ab488a0c55b12 100644 --- a/src/test/java/org/bukkit/craftbukkit/inventory/PlayerInventoryTest.java +++ b/src/test/java/org/bukkit/craftbukkit/inventory/PlayerInventoryTest.java @@ -1,12 +1,13 @@ package org.bukkit.craftbukkit.inventory; -import static org.junit.Assert.*; import net.minecraft.server.ItemStack; import net.minecraft.server.Items; import net.minecraft.server.PlayerInventory; import org.bukkit.support.AbstractTestingBase; import org.junit.Test; +import static org.junit.Assert.assertEquals; + public class PlayerInventoryTest extends AbstractTestingBase { @Test diff --git a/src/test/java/org/bukkit/craftbukkit/legacy/LegacyTest.java b/src/test/java/org/bukkit/craftbukkit/legacy/LegacyTest.java index e39b87ae6de87d4a9776aa960cf8b1c4305b1db0..02e6cabc2c6904e0bfeb7154f94e90d048d3aeca 100644 --- a/src/test/java/org/bukkit/craftbukkit/legacy/LegacyTest.java +++ b/src/test/java/org/bukkit/craftbukkit/legacy/LegacyTest.java @@ -1,8 +1,5 @@ package org.bukkit.craftbukkit.legacy; -import java.util.Arrays; -import java.util.HashSet; -import java.util.Set; import org.bukkit.Material; import org.bukkit.craftbukkit.util.CraftMagicNumbers; import org.bukkit.material.MaterialData; @@ -10,6 +7,10 @@ import org.bukkit.support.AbstractTestingBase; import org.junit.Assert; import org.junit.Test; +import java.util.Arrays; +import java.util.HashSet; +import java.util.Set; + public class LegacyTest extends AbstractTestingBase { private final Set INVALIDATED_MATERIALS = new HashSet<>(Arrays.asList(Material.ACACIA_BUTTON, Material.ACACIA_PRESSURE_PLATE, Material.ACACIA_TRAPDOOR, Material.AIR, Material.ATTACHED_MELON_STEM, Material.ATTACHED_PUMPKIN_STEM, diff --git a/src/test/java/org/bukkit/craftbukkit/util/CraftChatMessageTest.java b/src/test/java/org/bukkit/craftbukkit/util/CraftChatMessageTest.java index e4a98f441e6d7213e4c8642cc8a7c0b57fc7d75a..34beafde38a55348eaafa0d822e130a4436ae4f4 100644 --- a/src/test/java/org/bukkit/craftbukkit/util/CraftChatMessageTest.java +++ b/src/test/java/org/bukkit/craftbukkit/util/CraftChatMessageTest.java @@ -1,10 +1,11 @@ package org.bukkit.craftbukkit.util; -import static org.junit.Assert.assertEquals; import net.minecraft.server.IChatBaseComponent; import net.minecraft.server.IChatMutableComponent; import org.junit.Test; +import static org.junit.Assert.assertEquals; + public class CraftChatMessageTest { @Test diff --git a/src/test/java/org/bukkit/entity/EntityTypesTest.java b/src/test/java/org/bukkit/entity/EntityTypesTest.java index af570ccfd671d4b4654df1fcf22ef91218e293e2..dc2cc90e61d4522972265689cbea8870b9c76c7a 100644 --- a/src/test/java/org/bukkit/entity/EntityTypesTest.java +++ b/src/test/java/org/bukkit/entity/EntityTypesTest.java @@ -1,8 +1,5 @@ package org.bukkit.entity; -import java.util.Arrays; -import java.util.Set; -import java.util.stream.Collectors; import net.minecraft.server.EntityTypes; import net.minecraft.server.IRegistry; import net.minecraft.server.MinecraftKey; @@ -10,6 +7,10 @@ import org.bukkit.support.AbstractTestingBase; import org.junit.Assert; import org.junit.Test; +import java.util.Arrays; +import java.util.Set; +import java.util.stream.Collectors; + public class EntityTypesTest extends AbstractTestingBase { @Test diff --git a/src/test/java/org/bukkit/entity/TropicalFishTest.java b/src/test/java/org/bukkit/entity/TropicalFishTest.java index aa70881a77fd7c2d6b1058d9dba4d70e3ae12ba8..48313ae6e3629972bd44099e2321e184bfdcb995 100644 --- a/src/test/java/org/bukkit/entity/TropicalFishTest.java +++ b/src/test/java/org/bukkit/entity/TropicalFishTest.java @@ -1,12 +1,13 @@ package org.bukkit.entity; -import static org.hamcrest.Matchers.*; -import static org.junit.Assert.*; import org.bukkit.DyeColor; import org.bukkit.craftbukkit.entity.CraftTropicalFish; import org.bukkit.entity.TropicalFish.Pattern; import org.junit.Test; +import static org.hamcrest.Matchers.is; +import static org.junit.Assert.assertThat; + public class TropicalFishTest { @Test diff --git a/src/test/java/org/bukkit/map/MapTest.java b/src/test/java/org/bukkit/map/MapTest.java index 2dde26d3fd4a51828a0aa6e40831ba33aaebeccc..46ab6a50abd5d1231fcdb69bbb74cd7ba684cd24 100644 --- a/src/test/java/org/bukkit/map/MapTest.java +++ b/src/test/java/org/bukkit/map/MapTest.java @@ -1,13 +1,14 @@ package org.bukkit.map; -import java.awt.Color; -import java.util.logging.Level; -import java.util.logging.Logger; import net.minecraft.server.MaterialMapColor; import org.junit.Assert; import org.junit.Test; +import java.awt.*; +import java.util.logging.Level; +import java.util.logging.Logger; + public class MapTest { private static final Logger logger = Logger.getLogger("MapTest"); diff --git a/src/test/java/org/bukkit/potion/PotionTest.java b/src/test/java/org/bukkit/potion/PotionTest.java index ebd2efa5ae21b790695775b068207336da60e549..50cbb7da1a96d3bb0ce60c28405152ce89f8ee84 100644 --- a/src/test/java/org/bukkit/potion/PotionTest.java +++ b/src/test/java/org/bukkit/potion/PotionTest.java @@ -1,16 +1,14 @@ package org.bukkit.potion; -import static org.junit.Assert.*; +import net.minecraft.server.*; +import org.bukkit.support.AbstractTestingBase; +import org.junit.Test; + import java.util.EnumMap; import java.util.List; import java.util.Map; -import net.minecraft.server.IRegistry; -import net.minecraft.server.MinecraftKey; -import net.minecraft.server.MobEffect; -import net.minecraft.server.MobEffectList; -import net.minecraft.server.PotionRegistry; -import org.bukkit.support.AbstractTestingBase; -import org.junit.Test; + +import static org.junit.Assert.*; public class PotionTest extends AbstractTestingBase { @Test diff --git a/src/test/java/org/bukkit/support/AbstractTestingBase.java b/src/test/java/org/bukkit/support/AbstractTestingBase.java index d3281c81a4e8e0b8c2ad3a8d6628faf546746a2f..bb3400d2ccce6fb73550f80ef1df5a4869e58b9a 100644 --- a/src/test/java/org/bukkit/support/AbstractTestingBase.java +++ b/src/test/java/org/bukkit/support/AbstractTestingBase.java @@ -2,21 +2,15 @@ package org.bukkit.support; import com.google.common.collect.ImmutableList; import com.google.common.util.concurrent.MoreExecutors; -import java.util.Collections; -import java.util.List; -import java.util.concurrent.CompletableFuture; -import net.minecraft.server.DispenserRegistry; -import net.minecraft.server.EnumResourcePackType; -import net.minecraft.server.LootPredicateManager; -import net.minecraft.server.LootTableRegistry; -import net.minecraft.server.ResourceManager; -import net.minecraft.server.ResourcePackVanilla; -import net.minecraft.server.TagRegistry; -import net.minecraft.server.Unit; +import net.minecraft.server.*; import org.bukkit.Material; import org.bukkit.craftbukkit.util.CraftMagicNumbers; import org.junit.Assert; +import java.util.Collections; +import java.util.List; +import java.util.concurrent.CompletableFuture; + /** * If you are getting: java.lang.ExceptionInInitializerError * at net.minecraft.server.StatisticList.<clinit>(SourceFile:58) diff --git a/src/test/java/org/bukkit/support/DummyServer.java b/src/test/java/org/bukkit/support/DummyServer.java index 97eb5fa880d009bef973467403323d022bea5d7a..1036bd4e8fcf5e7ae65388cdc54b770c125e2547 100644 --- a/src/test/java/org/bukkit/support/DummyServer.java +++ b/src/test/java/org/bukkit/support/DummyServer.java @@ -1,10 +1,5 @@ package org.bukkit.support; -import java.lang.reflect.InvocationHandler; -import java.lang.reflect.Method; -import java.lang.reflect.Proxy; -import java.util.HashMap; -import java.util.logging.Logger; import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.NamespacedKey; @@ -16,6 +11,12 @@ import org.bukkit.craftbukkit.util.CraftMagicNumbers; import org.bukkit.craftbukkit.util.CraftNamespacedKey; import org.bukkit.craftbukkit.util.Versioning; +import java.lang.reflect.InvocationHandler; +import java.lang.reflect.Method; +import java.lang.reflect.Proxy; +import java.util.HashMap; +import java.util.logging.Logger; + public final class DummyServer implements InvocationHandler { private static interface MethodHandler { Object handle(DummyServer server, Object[] args);