Update to 1.17

.gitignore

@@ -4,6 +4,6 @@ Airplane-Server
 last-tuinity
 build/
 .gradle/
+run/
 
-launcher-airplane.jar
-mcdevimports.conf
+launcher-airplane.jar

build-data/dev-imports.txt

@@ -0,0 +1,14 @@
+# You can use this file to import files from minecraft libraries into the project
+# format:
+#     <artifactId> <fileName>
+# both fully qualified and a file based syntax are accepted for <fileName>:
+#     authlib com/mojang/authlib/yggdrasil/YggdrasilGameProfileRepository.java
+#     datafixerupper com.mojang.datafixers.DataFixerBuilder
+#     datafixerupper com/mojang/datafixers/util/Either.java
+# To import classes from the vanilla Minecraft jar use `minecraft` as the artifactId:
+#     minecraft net.minecraft.world.level.entity.LevelEntityGetterAdapter
+#     minecraft net/minecraft/world/level/entity/LevelEntityGetter.java
+
+minecraft net.minecraft.world.entity.monster.hoglin.Hoglin
+minecraft net.minecraft.world.entity.ai.behavior.AcquirePoi
+minecraft net.minecraft.world.phys.shapes.EntityCollisionContext

build.gradle.kts

@@ -1,48 +1,58 @@
 plugins {
-    `java-library`
-    id("xyz.jpenilla.toothpick")
+    java
+    id("com.github.johnrengelman.shadow") version "7.0.0" apply false
+    id("io.papermc.paperweight.patcher") version "1.1.5"
 }
 
-toothpick {
-    forkName = "Airplane"
-    groupId = "gg.airplane"
-    val versionTag = System.getenv("BUILD_NUMBER")
-        ?: "\"${commitHash() ?: error("Could not obtain git hash")}\""
-    forkVersion = "git-$forkName-$versionTag"
-    forkUrl = "https://github.com/Technove/Airplane"
+repositories {
+    mavenCentral()
+    maven("https://papermc.io/repo/repository/maven-public/") {
+        content { onlyForConfigurations("paperclip") }
+    }
+    maven("https://maven.quiltmc.org/repository/release/") {
+        content { onlyForConfigurations("remapper") }
+    }
+}
 
-    minecraftVersion = "1.16.5"
-    nmsPackage = "1_16_R3"
-    nmsRevision = "R0.1-SNAPSHOT"
+dependencies {
+    remapper("org.quiltmc:tiny-remapper:0.4.1")
+    paperclip("io.papermc:paperclip:2.0.1")
+}
 
-    upstream = "Tuinity"
-    upstreamBranch = "origin/master"
+subprojects {
+    apply(plugin = "java")
 
-    paperclipName = "launcher-airplane"
+    java { toolchain { languageVersion.set(JavaLanguageVersion.of(16)) } }
 
-    server {
-        project = projects.airplaneServer.dependencyProject
-        patchesDir = file("patches/server")
-    }
-    api {
-        project = projects.airplaneApi.dependencyProject
-        patchesDir = file("patches/api")
+    tasks.withType<JavaCompile>().configureEach {
+        options.encoding = "UTF-8"
+        options.release.set(16)
     }
-}
 
-subprojects {
     repositories {
         mavenCentral()
-        maven("https://repo.aikar.co/content/groups/aikar/")
-        maven("https://nexus.velocitypowered.com/repository/velocity-artifacts-snapshots/")
-        maven("https://libraries.minecraft.net")
+        maven("https://oss.sonatype.org/content/groups/public/")
+        maven("https://papermc.io/repo/repository/maven-public/")
+        maven("https://ci.emc.gs/nexus/content/groups/aikar/")
+        maven("https://repo.aikar.co/content/groups/aikar")
+        maven("https://repo.md-5.net/content/repositories/releases/")
+        maven("https://hub.spigotmc.org/nexus/content/groups/public/")
         maven("https://jitpack.io")
-        mavenLocal()
     }
+}
+
+paperweight {
+    serverProject.set(project(":Airplane-Server"))
+
+    useStandardUpstream("tuinity") {
+        url.set(github("Tuinity", "Tuinity"))
+        ref.set(providers.gradleProperty("tuinityRef"))
+
+        withStandardPatcher {
+            baseName("Tuinity")
 
-    java {
-        sourceCompatibility = JavaVersion.toVersion(8)
-        targetCompatibility = JavaVersion.toVersion(8)
-        withSourcesJar()
+            apiOutputDir.set(layout.projectDirectory.dir("Airplane-API"))
+            serverOutputDir.set(layout.projectDirectory.dir("Airplane-Server"))
+        }
     }
 }

gradle.properties

@@ -1,2 +1,12 @@
-org.gradle.daemon=true
+group = gg.airplane
+version = 1.17-R0.1-SNAPSHOT
+
+mcVersion = 1.17
+packageVersion = 1_17_R1
+tuinityRef = f213b04963707bb7a66c11fa3cc49211fcae4ceb
+
 org.gradle.jvmargs=-Xmx2G
+
+org.gradle.vfs.watch=false
+org.gradle.parallel=true
+org.gradle.daemon=true

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -72,7 +72,7 @@ case "`uname`" in
   Darwin* )
     darwin=true
     ;;
-  MINGW* )
+  MSYS* | MINGW* )
     msys=true
     ;;
   NONSTOP* )

patches/api/0001-Expose-findClass-for-profiler.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Expose findClass for profiler
 
 
 diff --git a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
-index 81da90531cc3a7ab13d455860f89411081825949..a20d3ae5cc09732e79fa10f9df76b221aa7eab2d 100644
+index 81292899918c4dc880661ee628384cb840a6244f..f593718b8020c6f26c3285c20d8ad284724e7b80 100644
 --- a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
 +++ b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
-@@ -153,6 +153,7 @@ public final class PluginClassLoader extends URLClassLoader { // Spigot
+@@ -146,6 +146,7 @@ public final class PluginClassLoader extends URLClassLoader { // Spigot
          throw new ClassNotFoundException(name);
      }
 

patches/server/0001-Initial.patch

@@ -0,0 +1,19 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Initial Source <[email protected]>
+Date: Mon, 21 Jun 2021 15:25:32 -0500
+Subject: [PATCH] Initial
+
+
+diff --git a/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java b/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java
+index c510da19883d1aa79b2fc25e2d9c8f5cd8dd7bfa..d86b2b5bdb6b7446cee5edda40c7ea316b74a200 100644
+--- a/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java
++++ b/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java
+@@ -123,7 +123,7 @@ public class Hoglin extends Animal implements Enemy, HoglinBase {
+
+     @Override
+     public Brain<Hoglin> getBrain() {
+-        return super.getBrain();
++        return (Brain<Hoglin>) super.getBrain(); // Airplane - decompile fix
+     }
+
+     @Override