diff --git a/PATCHES.md b/PATCHES.md
index 723f7172..610e19a9 100644
--- a/PATCHES.md
+++ b/PATCHES.md
@@ -10,16 +10,16 @@ # Patches
 | ----- | ------------- |:-------------:| -----:|
 | server |  Add 5 second tps average in /tps      | William Blake Galbreath |  |
 | api |  Add ChatColor.getById      | Aikar |  |
-| server |  Add GameProfileLookupEvent      | tr7zw |  |
 | api |  Add GameProfileLookupEvent      | tr7zw |  |
+| server |  Add GameProfileLookupEvent      | tr7zw |  |
 | server |  Add IntelliJ IDEA runnable      | Bud Gidiere |  |
 | server |  Add JsonList save timings      | Ivan Pekov |  |
-| server |  Add NBT API as a first-class lib      | tr7zw |  |
 | api |  Add NBT API as a first-class lib      | tr7zw |  |
+| server |  Add NBT API as a first-class lib      | tr7zw |  |
 | server |  Add a special case for floodgate and offline uuids      | Ivan Pekov |  |
 | server |  Add component util      | William Blake Galbreath |  |
-| server |  Add last tick time API      | Ivan Pekov | tr7zw |
 | api |  Add last tick time API      | Ivan Pekov | tr7zw |
+| server |  Add last tick time API      | Ivan Pekov | tr7zw |
 | server |  Add no-tick block list      | William Blake Galbreath |  |
 | server |  Add nspt command      | Ivan Pekov |  |
 | server |  Add option to disable dolphin treasure searching      | William Blake Galbreath |  |
@@ -85,8 +85,8 @@ # Patches
 | server |  MC-147659 - Fix non black cats spawning in swamp huts      | William Blake Galbreath |  |
 | server |  MC-168772 Fix - Add turtle egg block options      | William Blake Galbreath |  |
 | server |  Make lava flow speed configurable      | William Blake Galbreath |  |
-| server |  Modify POM      | YatopiaMC |  |
 | api |  Modify POM      | YatopiaMC |  |
+| server |  Modify POM      | YatopiaMC |  |
 | server |  Modify default configs      | tr7zw |  |
 | server |  Nuke streams off BlockPosition      | Ivan Pekov |  |
 | server |  Nuke streams off SectionPosition      | Ivan Pekov |  |
@@ -107,10 +107,10 @@ # Patches
 | server |  PaperPR - Fix username connecting with no texture being      | Camotoy |  |
 | server |  Per entity (type) collision settings      | MrIvanPlays | tr7zw |
 | server |  Persistent TileEntity Lore and DisplayName      | jmp |  |
-| server |  PlayerAttackEntityEvent      | Ivan Pekov |  |
 | api |  PlayerAttackEntityEvent      | Ivan Pekov |  |
-| server |  ProxyForwardDataEvent      | Ivan Pekov |  |
+| server |  PlayerAttackEntityEvent      | Ivan Pekov |  |
 | api |  ProxyForwardDataEvent      | Ivan Pekov |  |
+| server |  ProxyForwardDataEvent      | Ivan Pekov |  |
 | server |  Purpur config files      | William Blake Galbreath |  |
 | server |  Redirect Configs      | tr7zw |  |
 | server |  Reduce projectile chunk loading      | Paul Sauve |  |
diff --git a/patches/api/0002-Modify-POM.patch b/patches/api/0002-Modify-POM.patch
index 25d2201c..d51fef7b 100644
--- a/patches/api/0002-Modify-POM.patch
+++ b/patches/api/0002-Modify-POM.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Modify POM
 
 
 diff --git a/pom.xml b/pom.xml
-index c441d455e2273b63d2cec136872a5025182d75d6..fc54a282a6a2a77ee54a1a658358447475f25be4 100644
+index c441d455e2273b63d2cec136872a5025182d75d6..0a4a2d639e53f6cccc1877896818bbf2d381044d 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -3,18 +3,18 @@
@@ -40,11 +40,11 @@ index c441d455e2273b63d2cec136872a5025182d75d6..fc54a282a6a2a77ee54a1a6583584474
 +    <distributionManagement>
 +        <repository>
 +            <id>codemc-releases</id>
-+            <url>https://repo.codemc.org/repository/maven-releases/</url>
++            <url>https://repo.codemc.io/repository/maven-releases/</url>
 +        </repository>
 +        <snapshotRepository>
 +            <id>codemc-snapshots</id>
-+            <url>https://repo.codemc.org/repository/maven-snapshots/</url>
++            <url>https://repo.codemc.io/repository/maven-snapshots/</url>
 +        </snapshotRepository>
 +    </distributionManagement>
 +    <!-- Yatopia end -->
diff --git a/patches/api/0003-Add-GameProfileLookupEvent.patch b/patches/api/0003-Add-GameProfileLookupEvent.patch
index 37117ad7..1ae55e01 100644
--- a/patches/api/0003-Add-GameProfileLookupEvent.patch
+++ b/patches/api/0003-Add-GameProfileLookupEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add GameProfileLookupEvent
 
 
 diff --git a/pom.xml b/pom.xml
-index fc54a282a6a2a77ee54a1a658358447475f25be4..3afbd1fef5d008388351a29ed3815934a19767d1 100644
+index 0a4a2d639e53f6cccc1877896818bbf2d381044d..e1c693d4d9e26e29d81ca0eee92a11e7dc2943be 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -52,6 +52,10 @@
diff --git a/patches/api/0005-Add-NBT-API-as-a-first-class-lib.patch b/patches/api/0005-Add-NBT-API-as-a-first-class-lib.patch
index 28e9abee..55ac29ec 100644
--- a/patches/api/0005-Add-NBT-API-as-a-first-class-lib.patch
+++ b/patches/api/0005-Add-NBT-API-as-a-first-class-lib.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add NBT API as a first-class lib
 
 
 diff --git a/pom.xml b/pom.xml
-index 3afbd1fef5d008388351a29ed3815934a19767d1..be53996abe326464f2ca6ffa4435e018d0099686 100644
+index e1c693d4d9e26e29d81ca0eee92a11e7dc2943be..3772b54690f1cbce2f9f175b1b94e9ce9ba75603 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -56,6 +56,11 @@
@@ -15,7 +15,7 @@ index 3afbd1fef5d008388351a29ed3815934a19767d1..be53996abe326464f2ca6ffa4435e018
 +        <!-- CodeMC -->
 +        <repository>
 +            <id>codemc-repo</id>
-+            <url>https://repo.codemc.org/repository/maven-public/</url>
++            <url>https://repo.codemc.io/repository/maven-public/</url>
 +        </repository>
      </repositories>
  
diff --git a/patches/server/0002-Modify-POM.patch b/patches/server/0002-Modify-POM.patch
index 74f33fda..21eb79b0 100644
--- a/patches/server/0002-Modify-POM.patch
+++ b/patches/server/0002-Modify-POM.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Modify POM
 
 
 diff --git a/pom.xml b/pom.xml
-index e83e4241a56fe131a75fe21cc1518992c089da2c..4fb3f3183ba51e971c98d6104b9100cddc840c92 100644
+index e83e4241a56fe131a75fe21cc1518992c089da2c..3c01daecc01583275b5007e259bddb62035fd361 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -1,11 +1,11 @@
@@ -39,7 +39,7 @@ index e83e4241a56fe131a75fe21cc1518992c089da2c..4fb3f3183ba51e971c98d6104b9100cd
 +     <distributionManagement>
 +         <repository>
 +             <id>codemc-snapshots</id>
-+             <url>https://repo.codemc.org/repository/nms-local/</url>
++             <url>https://repo.codemc.io/repository/nms-local/</url>
 +         </repository>
 +     </distributionManagement>
 +     <!-- Yatopia end -->
diff --git a/patches/server/0004-Utilities.patch b/patches/server/0004-Utilities.patch
index 823f836a..882cd824 100644
--- a/patches/server/0004-Utilities.patch
+++ b/patches/server/0004-Utilities.patch
@@ -9,7 +9,7 @@ Co-authored-by: Mykyta Komarnytskyy <nkomarn@hotmail.com>
 Co-authored-by: Ivan Pekov <ivan@mrivanplays.com>
 
 diff --git a/pom.xml b/pom.xml
-index 4fb3f3183ba51e971c98d6104b9100cddc840c92..bf5f5ceba13f6b6eff3b58f27b28e9d8500a58ef 100644
+index 3c01daecc01583275b5007e259bddb62035fd361..464767f08635fa8668c8dc9dd93323bf4b5c7060 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -174,6 +174,12 @@
diff --git a/patches/server/0010-Add-NBT-API-as-a-first-class-lib.patch b/patches/server/0010-Add-NBT-API-as-a-first-class-lib.patch
index 86c95db9..4db43a2a 100644
--- a/patches/server/0010-Add-NBT-API-as-a-first-class-lib.patch
+++ b/patches/server/0010-Add-NBT-API-as-a-first-class-lib.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add NBT API as a first-class lib
 
 
 diff --git a/pom.xml b/pom.xml
-index bf5f5ceba13f6b6eff3b58f27b28e9d8500a58ef..cd681eb181571543b63108f33d1d3f129c035e84 100644
+index 464767f08635fa8668c8dc9dd93323bf4b5c7060..70e88bdfe5c6c6be1f6555340556b34479f49048 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -356,6 +356,10 @@