diff --git a/build.gradle.kts b/build.gradle.kts
index dfa0c15..da33b09 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -4,7 +4,26 @@ plugins {
     id("io.papermc.paperweight.patcher") version "1.0.0-SNAPSHOT"
 }
 
-allprojects {
+repositories {
+    mavenCentral()
+    maven("https://wav.jfrog.io/artifactory/repo/") {
+        content {
+            onlyForConfigurations("paperclip")
+        }
+    }
+    maven("https://maven.quiltmc.org/repository/release/") {
+        content {
+            onlyForConfigurations("remapper")
+        }
+    }
+}
+
+dependencies {
+    remapper("org.quiltmc:tiny-remapper:0.4.1")
+    paperclip("io.papermc:paperclip:2.0.0-SNAPSHOT@jar")
+}
+
+subprojects {
     apply(plugin = "java")
 
     java {
@@ -12,9 +31,7 @@ allprojects {
             languageVersion.set(JavaLanguageVersion.of(16))
         }
     }
-}
 
-subprojects {
     tasks.withType<JavaCompile>().configureEach {
         options.encoding = "UTF-8"
         options.release.set(16)
@@ -22,7 +39,6 @@ subprojects {
 
     repositories {
         mavenCentral()
-        maven("https://repo1.maven.org/maven2/")
         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/")
diff --git a/gradlew b/gradlew
old mode 100644
new mode 100755
diff --git a/patches/server/0001-Build-changes.patch b/patches/server/0001-Build-changes.patch
index d7d287d..0bec6fc 100644
--- a/patches/server/0001-Build-changes.patch
+++ b/patches/server/0001-Build-changes.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Build changes
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index ac607a3be84bc02dedb95cab9a5eace40e33b511..a2bacf289fd19c6118faecdcc0297e19b1571707 100644
+index f0256fe4aea16c9e0d6f5eee360eeec36cfdeebd..8a13deacc6d70ae1555f1cc8dedd1b7cb50bf291 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -20,7 +20,7 @@ repositories {
@@ -17,32 +17,17 @@ index ac607a3be84bc02dedb95cab9a5eace40e33b511..a2bacf289fd19c6118faecdcc0297e19
      // Paper start
      implementation("org.jline:jline-terminal-jansi:3.12.1")
      implementation("net.minecrell:terminalconsoleappender:1.2.0")
-@@ -99,7 +99,7 @@ tasks.test {
+@@ -98,7 +98,7 @@ tasks.test {
  
  fun TaskContainer.registerRunTask(name: String, block: JavaExec.() -> Unit): TaskProvider<JavaExec> =
      register<JavaExec>(name) {
 -        group = "Paper"
 +        group = "paperweight"
-         workingDir = rootProject.projectDir.resolve("run")
-         doFirst {
-             if (!workingDir.exists()) workingDir.mkdir()
-@@ -115,10 +115,10 @@ tasks.registerRunTask("runShadow") {
-     classpath(tasks.shadowJar.flatMap { it.archiveFile })
- }
- 
--tasks.registerRunTask("runReobf") {
--    description = "Spin up a test server from the reobfJar output jar"
--    classpath(tasks.reobfJar.flatMap { it.outputJar })
--}
-+//tasks.registerRunTask("runReobf") {
-+//    description = "Spin up a test server from the reobfJar output jar"
-+//    classpath(tasks.reobfJar.flatMap { it.outputJar })
-+//}
- 
- tasks.registerRunTask("runDev") {
-     description = "Spin up a non-shaded non-remapped test server"
+         workingDir = rootProject.layout.projectDirectory.dir(
+             providers.gradleProperty("runWorkDir").forUseAtConfigurationTime().orElse("run")
+         ).get().asFile
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index a0c436fd5e7e03a0a01e59c046e65ebdcd88021a..fd8b4e9466c9cd97878fe00bf18d397121473edd 100644
+index cf92c3275869e4a0209fd4b07ad723e11717dc86..9846c65bbd77e5e30dcb93a90cdd961e58244ba2 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -459,7 +459,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -63,7 +48,7 @@ index a0c436fd5e7e03a0a01e59c046e65ebdcd88021a..fd8b4e9466c9cd97878fe00bf18d3971
                  }
  
                  worlddata = new PrimaryLevelData(worldsettings, generatorsettings, Lifecycle.stable());
-@@ -1510,7 +1510,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1511,7 +1511,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
      @DontObfuscate
      public String getServerModName() {
@@ -72,12 +57,8 @@ index a0c436fd5e7e03a0a01e59c046e65ebdcd88021a..fd8b4e9466c9cd97878fe00bf18d3971
      }
  
      public SystemReport fillSystemReport(SystemReport systemreport) {
-diff --git a/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinAI.java b/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinAi.java
-similarity index 100%
-rename from src/main/java/net/minecraft/world/entity/monster/piglin/PiglinAI.java
-rename to src/main/java/net/minecraft/world/entity/monster/piglin/PiglinAi.java
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index cb09b6170a74984628f2c3dbacad2ddc9fe56faf..9f231e772195d5c3af7f478e4c8b8075b9fb029b 100644
+index 3452fc8ccddd5e9c8c12d98f55473fb2e322859a..58098f30f94e27112e23b4873bbd112a3dc8b546 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -230,7 +230,7 @@ import javax.annotation.Nullable; // Paper