Repackage NMS

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

paper-server/nms-patches/net/minecraft/util/datafix/DataConverterRegistry.patch

@@ -1,6 +1,6 @@
---- a/net/minecraft/server/DataConverterRegistry.java
-+++ b/net/minecraft/server/DataConverterRegistry.java
-@@ -183,6 +183,18 @@
+--- a/net/minecraft/util/datafix/DataConverterRegistry.java
++++ b/net/minecraft/util/datafix/DataConverterRegistry.java
+@@ -367,6 +367,18 @@
          datafixerbuilder.addFixer(new DataConverterItemFrame(schema46, false));
          Schema schema47 = datafixerbuilder.addSchema(1458, DataConverterRegistry.b);
  

paper-server/nms-patches/net/minecraft/util/datafix/fixes/DataConverterFlatten.patch

@@ -1,6 +1,6 @@
---- a/net/minecraft/server/DataConverterFlatten.java
-+++ b/net/minecraft/server/DataConverterFlatten.java
-@@ -375,7 +375,7 @@
+--- a/net/minecraft/util/datafix/fixes/DataConverterFlatten.java
++++ b/net/minecraft/util/datafix/fixes/DataConverterFlatten.java
+@@ -376,7 +376,7 @@
                      Typed<?> typed2 = typed.getOrCreateTyped(opticfinder1);
                      Dynamic<?> dynamic1 = (Dynamic) typed2.get(DSL.remainderFinder());
  

paper-server/nms-patches/net/minecraft/util/datafix/fixes/DataConverterMap.patch

@@ -1,6 +1,6 @@
---- a/net/minecraft/server/DataConverterMap.java
-+++ b/net/minecraft/server/DataConverterMap.java
-@@ -31,7 +31,7 @@
+--- a/net/minecraft/util/datafix/fixes/DataConverterMap.java
++++ b/net/minecraft/util/datafix/fixes/DataConverterMap.java
+@@ -32,7 +32,7 @@
                  Typed<?> typed1 = typed.getOrCreateTyped(opticfinder1);
                  Dynamic<?> dynamic1 = (Dynamic) typed1.get(DSL.remainderFinder());
  

paper-server/nms-patches/net/minecraft/util/worldupdate/WorldUpgrader.patch

@@ -1,6 +1,14 @@
---- a/net/minecraft/server/WorldUpgrader.java
-+++ b/net/minecraft/server/WorldUpgrader.java
-@@ -25,7 +25,7 @@
+--- a/net/minecraft/util/worldupdate/WorldUpgrader.java
++++ b/net/minecraft/util/worldupdate/WorldUpgrader.java
+@@ -34,11 +34,15 @@
+ import org.apache.logging.log4j.LogManager;
+ import org.apache.logging.log4j.Logger;
+ 
++// CraftBukkit start
++import net.minecraft.world.level.dimension.DimensionManager;
++// CraftBukkit end
++
+ public class WorldUpgrader {
  
      private static final Logger LOGGER = LogManager.getLogger();
      private static final ThreadFactory b = (new ThreadFactoryBuilder()).setDaemon(true).build();
@@ -9,7 +17,7 @@
      private final boolean d;
      private final Convertable.ConversionSession e;
      private final Thread f;
-@@ -36,12 +36,12 @@
+@@ -49,12 +53,12 @@
      private volatile int k;
      private volatile int l;
      private volatile int m;
@@ -24,7 +32,7 @@
          this.c = immutableset;
          this.d = flag;
          this.g = datafixer;
-@@ -69,12 +69,12 @@
+@@ -82,12 +86,12 @@
  
      private void i() {
          this.k = 0;
@@ -39,7 +47,7 @@
  
              list = this.b(resourcekey);
              builder.put(resourcekey, list.listIterator());
-@@ -84,18 +84,18 @@
+@@ -97,18 +101,18 @@
              this.i = true;
          } else {
              float f = (float) this.k;
@@ -63,7 +71,7 @@
              long i = SystemUtils.getMonotonicMillis();
  
              this.o = new ChatMessage("optimizeWorld.stage.upgrading");
-@@ -107,7 +107,7 @@
+@@ -120,7 +124,7 @@
                  float f2;
  
                  for (UnmodifiableIterator unmodifiableiterator2 = this.c.iterator(); unmodifiableiterator2.hasNext(); f1 += f2) {
@@ -72,7 +80,7 @@
                      ListIterator<ChunkCoordIntPair> listiterator = (ListIterator) immutablemap.get(resourcekey2);
                      IChunkLoader ichunkloader = (IChunkLoader) immutablemap1.get(resourcekey2);
  
-@@ -122,7 +122,7 @@
+@@ -135,7 +139,7 @@
                                  int j = IChunkLoader.a(nbttagcompound);
                                  NBTTagCompound nbttagcompound1 = ichunkloader.getChunkData(resourcekey2, () -> {
                                      return this.q;
@@ -81,7 +89,7 @@
                                  NBTTagCompound nbttagcompound2 = nbttagcompound1.getCompound("Level");
                                  ChunkCoordIntPair chunkcoordintpair1 = new ChunkCoordIntPair(nbttagcompound2.getInt("xPos"), nbttagcompound2.getInt("zPos"));
  
-@@ -195,8 +195,8 @@
+@@ -208,8 +212,8 @@
          }
      }