diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 24c276e11..c073a7728 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -21,12 +21,12 @@ jobs:
       - name: Configure Git
         run: git config --global user.email "no-reply@github.com" && git config --global user.name "Github Actions"
       - name: Apply Patches
-        run: ./gradlew applyPatches --no-daemon --stacktrace
+        run: ./gradlew applyAllPatches --no-daemon --stacktrace
       - name: Build
         run: ./gradlew build --no-daemon --stacktrace
       - name: Rebuild on Failure
         if: ${{ failure() }}
         run: |
-          ./gradlew clean cleanCache
-          ./gradlew applyPatches --no-daemon --stacktrace 
+          ./gradlew clean cleanCache --refresh-dependencies
+          ./gradlew applyAllPatches --no-daemon --stacktrace 
           ./gradlew build --no-daemon --stacktrace
diff --git a/.idea/runConfigurations/Run_Purpur_Paperclip_Jar.xml b/.idea/runConfigurations/Run_Purpur_Paperclip_Jar.xml
index 3f3ea1dc5..72f5fa6c4 100644
--- a/.idea/runConfigurations/Run_Purpur_Paperclip_Jar.xml
+++ b/.idea/runConfigurations/Run_Purpur_Paperclip_Jar.xml
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Run Purpur Paperclip Jar" type="JarApplication">
-    <option name="JAR_PATH" value="$PROJECT_DIR$/build/libs/purpur-paperclip-1.21.4-R0.1-SNAPSHOT-mojmap.jar" />
+    <option name="JAR_PATH" value="$PROJECT_DIR$/purpur-server/build/libs/purpur-paperclip-1.21.4-R0.1-SNAPSHOT-mojmap.jar" />
     <option name="VM_PARAMETERS" value="-Dcom.mojang.eula.agree" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/run" />
     <option name="ALTERNATIVE_JRE_PATH" />
@@ -8,4 +8,4 @@
       <option name="RunConfigurationTask" enabled="false" run_configuration_name="Upstream Paper [createMojmapPaperclipJar]" run_configuration_type="GradleRunConfiguration" />
     </method>
   </configuration>
-</component>
+</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Upstream_Paper__applyPatches_.xml b/.idea/runConfigurations/Upstream_Paper__applyAllPatches_.xml
similarity index 78%
rename from .idea/runConfigurations/Upstream_Paper__applyPatches_.xml
rename to .idea/runConfigurations/Upstream_Paper__applyAllPatches_.xml
index e3255f71d..ef348a313 100644
--- a/.idea/runConfigurations/Upstream_Paper__applyPatches_.xml
+++ b/.idea/runConfigurations/Upstream_Paper__applyAllPatches_.xml
@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Upstream Paper [applyPatches]" type="GradleRunConfiguration" factoryName="Gradle">
+  <configuration default="false" name="Upstream Paper [applyAllPatches]" type="GradleRunConfiguration" factoryName="Gradle">
     <ExternalSystemSettings>
       <option name="executionName" />
       <option name="externalProjectPath" value="$PROJECT_DIR$" />
@@ -10,7 +10,7 @@
       </option>
       <option name="taskNames">
         <list>
-          <option value="applyPatches" />
+          <option value="applyAllPatches" />
         </list>
       </option>
       <option name="vmOptions" />
@@ -18,7 +18,7 @@
     <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
     <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
     <DebugAllEnabled>false</DebugAllEnabled>
-    <ForceTestExec>false</ForceTestExec>
+    <RunAsTest>false</RunAsTest>
     <method v="2" />
   </configuration>
 </component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Upstream_Paper__build_.xml b/.idea/runConfigurations/Upstream_Paper__build_.xml
index 195cdef25..b3491f8c0 100644
--- a/.idea/runConfigurations/Upstream_Paper__build_.xml
+++ b/.idea/runConfigurations/Upstream_Paper__build_.xml
@@ -20,7 +20,7 @@
     <DebugAllEnabled>false</DebugAllEnabled>
     <RunAsTest>false</RunAsTest>
     <method v="2">
-      <option name="RunConfigurationTask" enabled="true" run_configuration_name="Upstream Paper [rebuildPatches]" run_configuration_type="GradleRunConfiguration" />
+      <option name="RunConfigurationTask" enabled="true" run_configuration_name="Upstream Paper [rebuildAllServerPatches]" run_configuration_type="GradleRunConfiguration" />
     </method>
   </configuration>
-</component>
+</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Upstream_Paper__rebuildAllServerPatches_.xml b/.idea/runConfigurations/Upstream_Paper__rebuildAllServerPatches_.xml
new file mode 100644
index 000000000..7e0110e69
--- /dev/null
+++ b/.idea/runConfigurations/Upstream_Paper__rebuildAllServerPatches_.xml
@@ -0,0 +1,26 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Upstream Paper [rebuildAllServerPatches]" type="GradleRunConfiguration" factoryName="Gradle">
+    <ExternalSystemSettings>
+      <option name="executionName" />
+      <option name="externalProjectPath" value="$PROJECT_DIR$" />
+      <option name="externalSystemIdString" value="GRADLE" />
+      <option name="scriptParameters" value="" />
+      <option name="taskDescriptions">
+        <list />
+      </option>
+      <option name="taskNames">
+        <list>
+          <option value="rebuildAllServerPatches" />
+        </list>
+      </option>
+      <option name="vmOptions" />
+    </ExternalSystemSettings>
+    <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
+    <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
+    <DebugAllEnabled>false</DebugAllEnabled>
+    <RunAsTest>false</RunAsTest>
+    <method v="2">
+      <option name="RunConfigurationTask" enabled="true" run_configuration_name="Upstream Paper [rebuildPaperApiPatches]" run_configuration_type="GradleRunConfiguration" />
+    </method>
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Upstream_Paper__rebuildPaperApiGeneratorPatches_.xml b/.idea/runConfigurations/Upstream_Paper__rebuildPaperApiGeneratorPatches_.xml
new file mode 100644
index 000000000..b1025a73c
--- /dev/null
+++ b/.idea/runConfigurations/Upstream_Paper__rebuildPaperApiGeneratorPatches_.xml
@@ -0,0 +1,26 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Upstream Paper [rebuildPaperApiGeneratorPatches]" type="GradleRunConfiguration" factoryName="Gradle">
+    <ExternalSystemSettings>
+      <option name="executionName" />
+      <option name="externalProjectPath" value="$PROJECT_DIR$" />
+      <option name="externalSystemIdString" value="GRADLE" />
+      <option name="scriptParameters" value="" />
+      <option name="taskDescriptions">
+        <list />
+      </option>
+      <option name="taskNames">
+        <list>
+          <option value="rebuildPaperApiGeneratorPatches" />
+        </list>
+      </option>
+      <option name="vmOptions" />
+    </ExternalSystemSettings>
+    <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
+    <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
+    <DebugAllEnabled>false</DebugAllEnabled>
+    <RunAsTest>false</RunAsTest>
+    <method v="2">
+      <option name="RunConfigurationTask" enabled="true" run_configuration_name="Upstream Paper [applyAllPatches]" run_configuration_type="GradleRunConfiguration" />
+    </method>
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Upstream_Paper__rebuildPatches_.xml b/.idea/runConfigurations/Upstream_Paper__rebuildPaperApiPatches_.xml
similarity index 76%
rename from .idea/runConfigurations/Upstream_Paper__rebuildPatches_.xml
rename to .idea/runConfigurations/Upstream_Paper__rebuildPaperApiPatches_.xml
index 0188aeb0f..ed88625b0 100644
--- a/.idea/runConfigurations/Upstream_Paper__rebuildPatches_.xml
+++ b/.idea/runConfigurations/Upstream_Paper__rebuildPaperApiPatches_.xml
@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Upstream Paper [rebuildPatches]" type="GradleRunConfiguration" factoryName="Gradle">
+  <configuration default="false" name="Upstream Paper [rebuildPaperApiPatches]" type="GradleRunConfiguration" factoryName="Gradle">
     <ExternalSystemSettings>
       <option name="executionName" />
       <option name="externalProjectPath" value="$PROJECT_DIR$" />
@@ -10,7 +10,7 @@
       </option>
       <option name="taskNames">
         <list>
-          <option value="rebuildPatches" />
+          <option value="rebuildPaperApiPatches" />
         </list>
       </option>
       <option name="vmOptions" />
@@ -18,9 +18,9 @@
     <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
     <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
     <DebugAllEnabled>false</DebugAllEnabled>
-    <ForceTestExec>false</ForceTestExec>
+    <RunAsTest>false</RunAsTest>
     <method v="2">
-      <option name="RunConfigurationTask" enabled="true" run_configuration_name="Upstream Paper [applyPatches]" run_configuration_type="GradleRunConfiguration" />
+      <option name="RunConfigurationTask" enabled="true" run_configuration_name="Upstream Paper [rebuildPaperApiGeneratorPatches]" run_configuration_type="GradleRunConfiguration" />
     </method>
   </configuration>
 </component>
\ No newline at end of file