Prepare for updating server patches

build-data/dev-imports.txt

@@ -9,3 +9,4 @@
 #     minecraft net.minecraft.world.level.entity.LevelEntityGetterAdapter
 #     minecraft net/minecraft/world/level/entity/LevelEntityGetter.java
 
+minecraft net.minecraft.network.protocol.game.ClientboundLoginPacket

build-data/paper.at

@@ -9,6 +9,10 @@
 # Remap/Decompile fix (unclear why this is happening)
 public net.minecraft.server.MinecraftServer doRunTask(Lnet/minecraft/server/TickTask;)V
 
+# AT remap issue? todo 1.18
+public net.minecraft.world.level.dimension.end.EndDragonFight findExitPortal()Lnet/minecraft/world/level/block/state/pattern/BlockPattern$BlockPatternMatch;
+public net.minecraft.nbt.TagParser readArrayTag()Lnet/minecraft/nbt/Tag;
+
 # Paper config files
 public org.spigotmc.SpigotWorldConfig getBoolean(Ljava/lang/String;Z)Z
 public org.spigotmc.SpigotWorldConfig getDouble(Ljava/lang/String;)D

build.gradle.kts

@@ -48,7 +48,7 @@ repositories {
 dependencies {
     paramMappings("net.fabricmc:yarn:1.18-pre5+build.4:mergedv2")
     remapper("net.fabricmc:tiny-remapper:0.7.0:fat")
-    decompiler("org.quiltmc:quiltflower:1.6.0")
+    decompiler("net.minecraftforge:forgeflower:1.5.498.22")
     paperclip("io.papermc:paperclip:2.0.1")
 }
 
@@ -58,7 +58,7 @@ paperweight {
 
     paramMappingsRepo.set("https://maven.fabricmc.net/")
     remapRepo.set("https://maven.fabricmc.net/")
-    decompileRepo.set("https://maven.quiltmc.org/repository/release/")
+    decompileRepo.set("https://files.minecraftforge.net/maven/")
 
     paper {
         spigotApiPatchDir.set(layout.projectDirectory.dir("patches/api"))

patches/api/Add-FastUtil-to-Bukkit.patch

@@ -13,7 +13,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      api("net.md-5:bungeecord-chat:1.16-R0.4")
      api("org.yaml:snakeyaml:1.28")
      api("com.googlecode.json-simple:json-simple:1.1.1") // Paper
-+    api("it.unimi.dsi:fastutil:8.2.2")
++    api("it.unimi.dsi:fastutil:8.5.6")
  
      compileOnly("org.apache.maven:maven-resolver-provider:3.8.1")
      compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.0")

patches/server/Build-system-changes.patch

@@ -16,26 +16,11 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 -        exclude(group = "org.apache.logging.log4j", module = "log4j-api")
 -    }
 +    implementation("org.apache.logging.log4j:log4j-iostreams:2.14.1") // Paper
-+    implementation("org.apache.logging.log4j:log4j-api:2.14.1") // Paper
      implementation("org.ow2.asm:asm:9.2")
 +    implementation("org.ow2.asm:asm-commons:9.2") // Paper - ASM event executor generation
      implementation("com.googlecode.json-simple:json-simple:1.1.1") {
          // This includes junit transitively for whatever reason
          isTransitive = false
-     }
-     runtimeOnly("org.xerial:sqlite-jdbc:3.34.0")
--    runtimeOnly("mysql:mysql-connector-java:5.1.49")
-+    runtimeOnly("mysql:mysql-connector-java:8.0.23") // Paper
- 
-     runtimeOnly("org.apache.maven:maven-resolver-provider:3.8.1")
-     runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.0")
-     runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.7.0")
- 
-+    implementation("io.netty:netty-all:4.1.65.Final") // Paper
-+
-     testImplementation("junit:junit:4.13.1")
-     testImplementation("org.hamcrest:hamcrest-library:1.3")
- }
 @@ -0,0 +0,0 @@ tasks.jar {
              "Specification-Title" to "Bukkit",
              "Specification-Version" to project.version,
@@ -44,15 +29,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
          )
          for (tld in setOf("net", "com", "org")) {
              attributes("$tld/bukkit", "Sealed" to true)
-@@ -0,0 +0,0 @@ relocation {
-     sequenceOf(
-         "commons-codec:commons-codec" to "org.apache.commons.codec",
-         "commons-io:commons-io" to "org.apache.commons.io",
--        "it.unimi.dsi:fastutil" to "it.unimi",
-+        //"it.unimi.dsi:fastutil" to "it.unimi", // Paper - don't relocate fastutil
-         "org.apache.commons:commons-lang3" to "org.apache.commons.lang3",
-         "org.ow2.asm:asm" to "org.objectweb.asm"
-     ).forEach { (owner, pack) ->
 @@ -0,0 +0,0 @@ relocation {
      }
  }
@@ -83,7 +59,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +                    Date buildDate = new java.text.SimpleDateFormat("yyyy-MM-dd HH:mm:ss Z").parse(Main.class.getPackage().getImplementationVendor()); // Paper
  
                      Calendar deadline = Calendar.getInstance();
-                     deadline.add(Calendar.DAY_OF_YEAR, -28);
+                     deadline.add(Calendar.DAY_OF_YEAR, -7);
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java

patches/server/Paper-config-files.patch

@@ -619,9 +619,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    }
 +    // Paper end
 +
-     public static void forceUpgrade(LevelStorageSource.LevelStorageAccess session, DataFixer dataFixer, boolean eraseCache, BooleanSupplier booleansupplier, ImmutableSet<ResourceKey<DimensionType>> worlds) { // CraftBukkit
+     public static void forceUpgrade(LevelStorageSource.LevelStorageAccess session, DataFixer dataFixer, boolean eraseCache, BooleanSupplier continueCheck, WorldGenSettings generatorOptions) {
          Main.LOGGER.info("Forcing world upgrade! {}", session.getLevelId()); // CraftBukkit
-         WorldUpgrader worldupgrader = new WorldUpgrader(session, dataFixer, worlds, eraseCache);
+         WorldUpgrader worldupgrader = new WorldUpgrader(session, dataFixer, generatorOptions, eraseCache);
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -631,7 +631,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
          this.forceDifficulty();
          for (ServerLevel worldserver : this.getAllLevels()) {
 +            worldserver.paperConfig.removeOldValues(); // Paper - callback for clearing old config options, after any migrations have taken place
-             this.loadSpawn(worldserver.getChunkSource().chunkMap.progressListener, worldserver);
+             this.prepareLevels(worldserver.getChunkSource().chunkMap.progressListener, worldserver);
              worldserver.entityManager.tick(); // SPIGOT-6526: Load pending entities so they are available to the API
              this.server.getPluginManager().callEvent(new org.bukkit.event.world.WorldLoadEvent(worldserver.getWorld()));
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
@@ -669,27 +669,19 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    // Paper end
 +
      public boolean isPositionTicking(long pos) {
-         return this.checkChunkFuture(pos, (Function<ChunkHolder, CompletableFuture<Either<LevelChunk, ChunkHolder.ChunkLoadingFailure>>>) ChunkHolder::getTickingChunkFuture); // CraftBukkit - decompile error
-     }
+         ChunkHolder playerchunk = this.getVisibleChunkIfPresent(pos);
+ 
 diff --git a/src/main/java/net/minecraft/world/entity/EntityType.java b/src/main/java/net/minecraft/world/entity/EntityType.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/net/minecraft/world/entity/EntityType.java
 +++ b/src/main/java/net/minecraft/world/entity/EntityType.java
-@@ -0,0 +0,0 @@ import com.google.common.collect.ImmutableSet;
- import java.util.List;
- import java.util.Optional;
- import java.util.Spliterator;
-+import java.util.Set; // Paper
- import java.util.UUID;
- import java.util.function.Consumer;
- import java.util.function.Function;
 @@ -0,0 +0,0 @@ public class EntityType<T extends Entity> implements EntityTypeTest<Entity, T> {
  
          T create(EntityType<T> type, Level world);
      }
 +
 +    // Paper start
-+    public static Set<ResourceLocation> getEntityNameList() {
++    public static java.util.Set<ResourceLocation> getEntityNameList() {
 +        return Registry.ENTITY_TYPE.keySet();
 +    }
 +    // Paper end

patches/server/Remap-fixes.patch

@@ -67,25 +67,16 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
          return optional.map((uuid) -> {
              return ((ServerLevel) entity.level).getEntity(uuid);
 -        }).map((entity) -> {
--            return entity instanceof LivingEntity ? (LivingEntity) entity : null;
-+        }).map((entity2) -> { // Paper - remap fix
-+            return entity2 instanceof LivingEntity ? (LivingEntity) entity2 : null; // Paper - remap fix
-         });
-     }
++        }).map((entity1) -> { // Paper - remap fix
+             LivingEntity entityliving1;
  
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Phantom.java b/src/main/java/net/minecraft/world/entity/monster/Phantom.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Phantom.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Phantom.java
-@@ -0,0 +0,0 @@ public class Phantom extends FlyingMob implements Enemy {
-                 List<Player> list = Phantom.this.level.getNearbyPlayers(this.attackTargeting, (LivingEntity) Phantom.this, Phantom.this.getBoundingBox().inflate(16.0D, 64.0D, 16.0D));
+-            if (entity instanceof LivingEntity) {
+-                LivingEntity entityliving2 = (LivingEntity) entity;
++            if (entity1 instanceof LivingEntity) { // Paper - remap fix
++                LivingEntity entityliving2 = (LivingEntity) entity1; // Paper - remap fix
  
-                 if (!list.isEmpty()) {
--                    list.sort(Comparator.comparing(Entity::getY).reversed());
-+                    list.sort(Comparator.<Player, Double>comparing(Entity::getY).reversed()); // Paper - remap fix
-                     Iterator iterator = list.iterator();
- 
-                     while (iterator.hasNext()) {
+                 entityliving1 = entityliving2;
+             } else {
 diff --git a/src/main/java/net/minecraft/world/item/crafting/RecipeManager.java b/src/main/java/net/minecraft/world/item/crafting/RecipeManager.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/net/minecraft/world/item/crafting/RecipeManager.java
@@ -129,19 +120,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
          assertThat(color, is(Color.fromRGB(nmsColor)));
      }
  }
-diff --git a/src/test/java/org/bukkit/PerMaterialTest.java b/src/test/java/org/bukkit/PerMaterialTest.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/test/java/org/bukkit/PerMaterialTest.java
-+++ b/src/test/java/org/bukkit/PerMaterialTest.java
-@@ -0,0 +0,0 @@ public class PerMaterialTest extends AbstractTestingBase {
-         if (this.material.isBlock()) {
-             assertThat(this.material.isInteractable(),
-                     is(!CraftMagicNumbers.getBlock(material).getClass()
--                            .getMethod("interact", BlockState.class, net.minecraft.world.level.Level.class, BlockPos.class, Player.class, InteractionHand.class, BlockHitResult.class)
-+                            .getMethod("use", BlockState.class, net.minecraft.world.level.Level.class, BlockPos.class, Player.class, InteractionHand.class, BlockHitResult.class) // Paper - remap fix
-                             .getDeclaringClass().equals(BlockBehaviour.class)));
-         } else {
-             assertFalse(this.material.isInteractable());
 diff --git a/src/test/java/org/bukkit/entity/EntityTypesTest.java b/src/test/java/org/bukkit/entity/EntityTypesTest.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/test/java/org/bukkit/entity/EntityTypesTest.java

patches/server/Setup-Gradle-project.patch

@@ -59,8 +59,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        // This includes junit transitively for whatever reason
 +        isTransitive = false
 +    }
-+    runtimeOnly("org.xerial:sqlite-jdbc:3.34.0")
-+    runtimeOnly("mysql:mysql-connector-java:5.1.49")
++    runtimeOnly("org.xerial:sqlite-jdbc:3.36.0.3")
++    runtimeOnly("mysql:mysql-connector-java:8.0.27")
 +
 +    runtimeOnly("org.apache.maven:maven-resolver-provider:3.8.1")
 +    runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.0")
@@ -105,35 +105,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +
 +relocation {
 +    // Order matters here - e.g. craftbukkit proper must be relocated before any of the libs are relocated into the cb package
-+    val packageVersion = "1_17_R1"
++    val packageVersion = "1_18_R1"
 +    relocate("org.bukkit.craftbukkit" to "org.bukkit.craftbukkit.v$packageVersion") {
 +        exclude("org.bukkit.craftbukkit.Main*")
 +    }
-+
-+    fun cb(pack: String) = "org.bukkit.craftbukkit.libs.$pack"
-+
-+    relocate("org.jline:jline-terminal-jansi", "org.jline" to cb("jline"))
-+    sequenceOf(
-+        "commons-codec:commons-codec" to "org.apache.commons.codec",
-+        "commons-io:commons-io" to "org.apache.commons.io",
-+        "it.unimi.dsi:fastutil" to "it.unimi",
-+        "org.apache.commons:commons-lang3" to "org.apache.commons.lang3",
-+        "org.ow2.asm:asm" to "org.objectweb.asm"
-+    ).forEach { (owner, pack) ->
-+        relocate(owner, pack to cb(pack))
-+    }
-+
-+    // runtimeOnly dependencies don't need an owner attached
-+    // owner is used for dev bundle generation, runtimeOnly deps are not included in dev bundle
-+    sequenceOf(
-+        "org.apache.http",
-+        "org.apache.maven",
-+        "org.codehaus.plexus",
-+        "org.eclipse.aether",
-+        "org.eclipse.sisu"
-+    ).forEach { pack ->
-+        relocate(pack to cb(pack))
-+    }
 +}
 +
 +tasks.shadowJar {
@@ -166,7 +141,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    if (rootProject.childProjects["test-plugin"] != null) {
 +        val testPluginJar = rootProject.project(":test-plugin").tasks.jar.flatMap { it.archiveFile }
 +        inputs.file(testPluginJar)
-+        args("-add-plugin=${testPluginJar.get().asFile.absolutePath}")
++        // args("-add-plugin=${testPluginJar.get().asFile.absolutePath}") // todo - uncomment
 +    }
 +
 +    args("--nogui")
@@ -214,20 +189,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 -    <groupId>org.spigotmc</groupId>
 -    <artifactId>spigot</artifactId>
 -    <packaging>jar</packaging>
--    <version>1.17.1-R0.1-SNAPSHOT</version>
+-    <version>1.18-pre5-R0.1-SNAPSHOT</version>
 -    <name>Spigot</name>
 -    <url>https://www.spigotmc.org/</url>
 -
--    <properties>
--        <skipTests>true</skipTests>
--        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
--        <api.version>unknown</api.version>
--        <bt.name>git</bt.name>
--        <minecraft_version>1_17_R1</minecraft_version>
--        <maven.compiler.source>1.8</maven.compiler.source>
--        <maven.compiler.target>1.8</maven.compiler.target>
--    </properties>
--
 -    <parent>
 -        <groupId>org.spigotmc</groupId>
 -        <artifactId>spigot-parent</artifactId>
@@ -235,6 +200,24 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 -        <relativePath>../pom.xml</relativePath>
 -    </parent>
 -
+-    <properties>
+-        <skipTests>true</skipTests>
+-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+-        <api.version>unknown</api.version>
+-        <bt.name>git</bt.name>
+-        <minecraft_version>1_18_R1</minecraft_version>
+-        <maven.compiler.source>16</maven.compiler.source>
+-        <maven.compiler.target>16</maven.compiler.target>
+-    </properties>
+-
+-    <repositories>
+-        <repository>
+-            <id>minecraft-libraries</id>
+-            <name>Minecraft Libraries</name>
+-            <url>https://libraries.minecraft.net/</url>
+-        </repository>
+-    </repositories>
+-
 -    <dependencies>
 -        <dependency>
 -            <groupId>org.spigotmc</groupId>
@@ -259,13 +242,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 -            <artifactId>log4j-iostreams</artifactId>
 -            <version>2.14.1</version>
 -            <scope>compile</scope>
--            <exclusions>
--                <!-- included in minecraft-server -->
--                <exclusion>
--                    <groupId>org.apache.logging.log4j</groupId>
--                    <artifactId>log4j-api</artifactId>
--                </exclusion>
--            </exclusions>
 -        </dependency>
 -        <dependency>
 -            <groupId>org.ow2.asm</groupId>
@@ -273,6 +249,85 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 -            <version>9.2</version>
 -            <scope>compile</scope>
 -        </dependency>
+-        <!-- Mojang depends -->
+-        <dependency>
+-            <groupId>com.github.oshi</groupId>
+-            <artifactId>oshi-core</artifactId>
+-            <version>5.8.2</version>
+-            <scope>compile</scope>
+-        </dependency>
+-        <dependency>
+-            <groupId>com.mojang</groupId>
+-            <artifactId>authlib</artifactId>
+-            <version>3.2.38</version>
+-            <scope>compile</scope>
+-        </dependency>
+-        <dependency>
+-            <groupId>com.mojang</groupId>
+-            <artifactId>brigadier</artifactId>
+-            <version>1.0.18</version>
+-            <scope>compile</scope>
+-        </dependency>
+-        <dependency>
+-            <groupId>com.mojang</groupId>
+-            <artifactId>datafixerupper</artifactId>
+-            <version>4.0.26</version>
+-            <scope>compile</scope>
+-        </dependency>
+-        <dependency>
+-            <groupId>com.mojang</groupId>
+-            <artifactId>javabridge</artifactId>
+-            <version>1.2.24</version>
+-            <scope>compile</scope>
+-        </dependency>
+-        <dependency>
+-            <groupId>commons-io</groupId>
+-            <artifactId>commons-io</artifactId>
+-            <version>2.11.0</version>
+-            <scope>compile</scope>
+-        </dependency>
+-        <dependency>
+-            <groupId>io.netty</groupId>
+-            <artifactId>netty-all</artifactId>
+-            <version>4.1.68.Final</version>
+-            <scope>compile</scope>
+-        </dependency>
+-        <dependency>
+-            <groupId>it.unimi.dsi</groupId>
+-            <artifactId>fastutil</artifactId>
+-            <version>8.5.6</version>
+-            <scope>compile</scope>
+-        </dependency>
+-        <dependency>
+-            <groupId>net.sf.jopt-simple</groupId>
+-            <artifactId>jopt-simple</artifactId>
+-            <version>5.0.4</version>
+-            <scope>compile</scope>
+-        </dependency>
+-        <dependency>
+-            <groupId>org.apache.commons</groupId>
+-            <artifactId>commons-lang3</artifactId>
+-            <version>3.12.0</version>
+-            <scope>compile</scope>
+-        </dependency>
+-        <dependency>
+-            <groupId>org.apache.logging.log4j</groupId>
+-            <artifactId>log4j-core</artifactId>
+-            <version>2.14.1</version>
+-            <scope>compile</scope>
+-        </dependency>
+-        <dependency>
+-            <groupId>org.apache.logging.log4j</groupId>
+-            <artifactId>log4j-slf4j18-impl</artifactId>
+-            <version>2.14.1</version>
+-            <scope>compile</scope>
+-        </dependency>
+-        <dependency>
+-            <groupId>org.slf4j</groupId>
+-            <artifactId>slf4j-api</artifactId>
+-            <version>1.8.0-beta4</version>
+-            <scope>compile</scope>
+-        </dependency>
 -        <!-- deprecated API depend -->
 -        <dependency>
 -            <groupId>com.googlecode.json-simple</groupId>
@@ -283,13 +338,13 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 -        <dependency>
 -            <groupId>org.xerial</groupId>
 -            <artifactId>sqlite-jdbc</artifactId>
--            <version>3.34.0</version>
+-            <version>3.36.0.3</version>
 -            <scope>runtime</scope>
 -        </dependency>
 -        <dependency>
 -            <groupId>mysql</groupId>
 -            <artifactId>mysql-connector-java</artifactId>
--            <version>5.1.49</version>
+-            <version>8.0.27</version>
 -            <scope>runtime</scope>
 -        </dependency>
 -        <!-- add these back in as they are not exposed by the API -->
@@ -439,87 +494,21 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 -                        </goals>
 -                        <configuration>
 -                            <createSourcesJar>${shadeSourcesJar}</createSourcesJar>
--                            <filters>
--                                <filter>
--                                    <artifact>org.spigotmc:minecraft-server</artifact>
--                                    <excludes>
--                                        <exclude>com/google/common/**</exclude>
--                                        <exclude>com/google/gson/**</exclude>
--                                        <exclude>com/google/thirdparty/**</exclude>
--                                    </excludes>
--                                </filter>
--                                <filter>
--                                    <artifact>org.eclipse.sisu:org.eclipse.sisu.inject</artifact>
--                                    <excludes>
--                                        <exclude>META-INF/services/javax.annotation.processing.Processor</exclude>
--                                    </excludes>
--                                </filter>
--                            </filters>
+-                            <artifactSet>
+-                                <includes>
+-                                    <include>org.spigotmc:minecraft-server</include>
+-                                </includes>
+-                            </artifactSet>
 -                            <relocations>
--                                <!-- Cannot be relocated as it breaks translation property keys -->
--                                <!--
--                                <relocation>
--                                    <pattern>joptsimple</pattern>
--                                    <shadedPattern>org.bukkit.craftbukkit.libs.joptsimple</shadedPattern>
--                                </relocation>
--                                -->
--                                <relocation>
--                                    <pattern>jline</pattern>
--                                    <shadedPattern>org.bukkit.craftbukkit.libs.jline</shadedPattern>
--                                </relocation>
--                                <relocation>
--                                    <pattern>it.unimi</pattern>
--                                    <shadedPattern>org.bukkit.craftbukkit.libs.it.unimi</shadedPattern>
--                                </relocation>
--                                <relocation>
--                                    <pattern>org.apache.commons.codec</pattern>
--                                    <shadedPattern>org.bukkit.craftbukkit.libs.org.apache.commons.codec</shadedPattern>
--                                </relocation>
--                                <relocation>
--                                    <pattern>org.apache.commons.io</pattern>
--                                    <shadedPattern>org.bukkit.craftbukkit.libs.org.apache.commons.io</shadedPattern>
--                                </relocation>
--                                <relocation>
--                                    <pattern>org.apache.commons.lang3</pattern>
--                                    <shadedPattern>org.bukkit.craftbukkit.libs.org.apache.commons.lang3</shadedPattern>
--                                </relocation>
--                                <relocation>
--                                    <pattern>org.apache.http</pattern>
--                                    <shadedPattern>org.bukkit.craftbukkit.libs.org.apache.http</shadedPattern>
--                                </relocation>
--                                <relocation>
--                                    <pattern>org.apache.maven</pattern>
--                                    <shadedPattern>org.bukkit.craftbukkit.libs.org.apache.maven</shadedPattern>
--                                </relocation>
--                                <relocation>
--                                    <pattern>org.codehaus.plexus</pattern>
--                                    <shadedPattern>org.bukkit.craftbukkit.libs.org.codehaus.plexus</shadedPattern>
--                                </relocation>
--                                <relocation>
--                                    <pattern>org.eclipse.aether</pattern>
--                                    <shadedPattern>org.bukkit.craftbukkit.libs.org.eclipse.aether</shadedPattern>
--                                </relocation>
--                                <relocation>
--                                    <pattern>org.eclipse.sisu</pattern>
--                                    <shadedPattern>org.bukkit.craftbukkit.libs.org.eclipse.sisu</shadedPattern>
--                                </relocation>
--                                <relocation>
--                                    <pattern>org.objectweb.asm</pattern>
--                                    <shadedPattern>org.bukkit.craftbukkit.libs.org.objectweb.asm</shadedPattern>
--                                </relocation>
 -                                <relocation>
 -                                    <pattern>org.bukkit.craftbukkit</pattern>
 -                                    <shadedPattern>org.bukkit.craftbukkit.v${minecraft_version}</shadedPattern>
 -                                    <excludes>
+-                                        <exclude>org.bukkit.craftbukkit.bootstrap.*</exclude>
 -                                        <exclude>org.bukkit.craftbukkit.Main*</exclude>
 -                                    </excludes>
 -                                </relocation>
 -                            </relocations>
--                            <transformers>
--                                <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
--                                    <resource>META-INF/services/java.sql.Driver</resource>
--                                </transformer>
--                            </transformers>
 -                        </configuration>
 -                    </execution>
 -                </executions>
@@ -527,22 +516,75 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 -            <plugin>
 -                <groupId>net.md-5</groupId>
 -                <artifactId>specialsource-maven-plugin</artifactId>
--                <version>1.2.2</version>
+-                <version>1.2.3</version>
 -                <executions>
 -                    <execution>
 -                        <phase>package</phase>
 -                        <goals>
 -                            <goal>remap</goal>
 -                        </goals>
--                        <id>remap-fields</id>
+-                        <id>remap-members</id>
 -                        <configuration>
--                            <srgIn>org.spigotmc:minecraft-server:${project.version}:csrg:maps-spigot-fields</srgIn>
+-                            <logFile>${project.build.directory}/server.txt</logFile>
+-                            <srgIn>org.spigotmc:minecraft-server:${project.version}:csrg:maps-spigot-members</srgIn>
 -                            <reverse>true</reverse>
 -                        </configuration>
 -                    </execution>
 -                </executions>
 -            </plugin>
 -            <plugin>
+-                <groupId>net.nicoulaj.maven.plugins</groupId>
+-                <artifactId>checksum-maven-plugin</artifactId>
+-                <version>1.11</version>
+-                <executions>
+-                    <execution>
+-                        <phase>package</phase>
+-                        <goals>
+-                            <goal>artifacts</goal>
+-                            <goal>dependencies</goal>
+-                        </goals>
+-                        <configuration>
+-                            <algorithms>
+-                                <algorithm>SHA-256</algorithm>
+-                            </algorithms>
+-                            <scopes>
+-                                <scope>compile</scope>
+-                                <scope>runtime</scope>
+-                            </scopes>
+-                            <shasumSummary>true</shasumSummary>
+-                            <transitive>true</transitive>
+-                        </configuration>
+-                    </execution>
+-                </executions>
+-            </plugin>
+-            <plugin>
+-                <groupId>org.apache.maven.plugins</groupId>
+-                <artifactId>maven-assembly-plugin</artifactId>
+-                <version>3.3.0</version>
+-                <executions>
+-                    <execution>
+-                        <phase>package</phase>
+-                        <goals>
+-                            <goal>single</goal>
+-                        </goals>
+-                        <configuration>
+-                            <appendAssemblyId>false</appendAssemblyId>
+-                            <archive>
+-                                <manifest>
+-                                    <addDefaultEntries>false</addDefaultEntries>
+-                                </manifest>
+-                                <manifestEntries>
+-                                    <Main-Class>org.bukkit.craftbukkit.bootstrap.Main</Main-Class>
+-                                </manifestEntries>
+-                            </archive>
+-                            <descriptors>
+-                                <descriptor>${project.basedir}/src/assembly/bootstrap.xml</descriptor>
+-                            </descriptors>
+-                        </configuration>
+-                    </execution>
+-                </executions>
+-            </plugin>
+-            <plugin>
 -                <groupId>org.apache.maven.plugins</groupId>
 -                <artifactId>maven-compiler-plugin</artifactId>
 -                <version>3.8.1</version>
@@ -559,7 +601,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 -                    <dependency>
 -                        <groupId>org.eclipse.jdt</groupId>
 -                        <artifactId>ecj</artifactId>
--                        <version>3.26.0</version>
+-                        <version>3.27.0</version>
 -                    </dependency>
 -                </dependencies>
 -            </plugin>
@@ -612,7 +654,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 -                            <dependency>
 -                                <groupId>com.puppycrawl.tools</groupId>
 -                                <artifactId>checkstyle</artifactId>
--                                <version>8.44</version>
+-                                <version>8.45.1</version>
 -                            </dependency>
 -                        </dependencies>
 -                    </plugin>
@@ -624,7 +666,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 -                            <execution>
 -                                <phase>process-classes</phase>
 -                                <goals>
--                                    <goal>check</goal>
+-                                    <!--<goal>check</goal>-->
 -                                </goals>
 -                            </execution>
 -                        </executions>