Organise imports

By: md_5 <git@md-5.net>

paper-server/nms-patches/WorldDataServer.patch

@@ -1,15 +1,15 @@
 --- a/net/minecraft/server/WorldDataServer.java
 +++ b/net/minecraft/server/WorldDataServer.java
-@@ -13,11 +13,16 @@
- import javax.annotation.Nullable;
+@@ -14,10 +14,16 @@
  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;
 +// CraftBukkit end
- 
++
  public class WorldDataServer implements IWorldDataServer, SaveData {
  
      private static final Logger LOGGER = LogManager.getLogger();
@@ -18,7 +18,7 @@
      private final GeneratorSettings c;
      private final Lifecycle d;
      private int e;
-@@ -51,6 +56,7 @@
+@@ -51,6 +57,7 @@
      private final Set<String> C;
      private boolean D;
      private final CustomFunctionCallbackTimerQueue<MinecraftServer> E;
@@ -26,7 +26,7 @@
  
      private WorldDataServer(@Nullable DataFixer datafixer, int i, @Nullable NBTTagCompound nbttagcompound, boolean flag, int j, int k, int l, float f, long i1, long j1, int k1, int l1, int i2, boolean flag1, int j2, boolean flag2, boolean flag3, boolean flag4, WorldBorder.c worldborder_c, int k2, int l2, @Nullable UUID uuid, LinkedHashSet<String> linkedhashset, CustomFunctionCallbackTimerQueue<MinecraftServer> customfunctioncallbacktimerqueue, @Nullable NBTTagCompound nbttagcompound1, NBTTagCompound nbttagcompound2, WorldSettings worldsettings, GeneratorSettings generatorsettings, Lifecycle lifecycle) {
          this.k = datafixer;
-@@ -94,7 +100,8 @@
+@@ -94,7 +101,8 @@
              return (NBTBase) dynamic.get("DimensionData").get("1").get("DragonFight").orElseEmptyMap().getValue();
          });
  
@@ -36,7 +36,7 @@
              return SystemUtils.a(dynamic1.asString().result());
          }).collect(Collectors.toCollection(Sets::newLinkedHashSet)), new CustomFunctionCallbackTimerQueue<>(CustomFunctionCallbackTimers.a, dynamic.get("ScheduledEvents").asStream()), (NBTTagCompound) dynamic.get("CustomBossEvents").orElseEmptyMap().getValue(), nbttagcompound1, worldsettings, generatorsettings, lifecycle);
      }
-@@ -126,7 +133,7 @@
+@@ -126,7 +134,7 @@
          nbttagcompound.set("Version", nbttagcompound2);
          nbttagcompound.setInt("DataVersion", SharedConstants.getGameVersion().getWorldVersion());
          RegistryWriteOps<NBTBase> registrywriteops = RegistryWriteOps.a(DynamicOpsNBT.a, iregistrycustom);
@@ -45,7 +45,7 @@
          Logger logger = WorldDataServer.LOGGER;
  
          logger.getClass();
-@@ -174,6 +181,7 @@
+@@ -174,6 +182,7 @@
              nbttagcompound.a("WanderingTraderId", this.B);
          }
  
@@ -53,7 +53,7 @@
      }
  
      @Override
-@@ -291,6 +299,20 @@
+@@ -291,6 +300,20 @@
  
      @Override
      public void setThundering(boolean flag) {
@@ -74,7 +74,7 @@
          this.thundering = flag;
      }
  
-@@ -311,6 +333,20 @@
+@@ -311,6 +334,20 @@
  
      @Override
      public void setStorm(boolean flag) {
@@ -95,7 +95,7 @@
          this.raining = flag;
      }
  
-@@ -377,6 +413,12 @@
+@@ -377,6 +414,12 @@
      @Override
      public void setDifficulty(EnumDifficulty enumdifficulty) {
          this.b = this.b.a(enumdifficulty);
@@ -108,7 +108,7 @@
      }
  
      @Override
-@@ -481,4 +523,12 @@
+@@ -481,4 +524,12 @@
      public IWorldDataServer H() {
          return this;
      }