From 327a60c80603fc0ef29fe6d490b02ec34bab03f3 Mon Sep 17 00:00:00 2001
From: hypherionmc <hypherionmc@gmail.com>
Date: Tue, 25 Mar 2025 19:49:02 +0200
Subject: [PATCH] [DEV] Rebuild Porting Patches

---
 commit.sha                                          |  2 +-
 patches/1.18.2/.jenkins/Jenkinsfile.snapshot.patch  |  2 +-
 patches/1.18.2/NeoForge/build.gradle.patch          |  6 +++---
 .../client/NeoForgeClientHelper.java.patch          |  4 +---
 .../ServerGamePacketListenerImplMixin.java.patch    |  2 +-
 patches/1.18.2/build.gradle.patch                   |  4 ++--
 patches/1.18.2/gradle.properties.patch              |  6 +++---
 patches/1.18.2/settings.gradle.patch                |  2 +-
 patches/1.19.2/.jenkins/Jenkinsfile.snapshot.patch  |  2 +-
 patches/1.19.2/NeoForge/build.gradle.patch          |  6 +++---
 .../client/NeoForgeClientHelper.java.patch          |  4 +---
 .../ServerGamePacketListenerImplMixin.java.patch    |  2 +-
 patches/1.19.2/build.gradle.patch                   |  4 ++--
 patches/1.19.2/gradle.properties.patch              |  6 +++---
 patches/1.19.2/settings.gradle.patch                |  2 +-
 patches/1.19.3/.jenkins/Jenkinsfile.snapshot.patch  |  2 +-
 patches/1.19.3/NeoForge/build.gradle.patch          |  6 +++---
 .../client/NeoForgeClientHelper.java.patch          |  4 +---
 .../ServerGamePacketListenerImplMixin.java.patch    |  2 +-
 patches/1.19.3/build.gradle.patch                   |  4 ++--
 patches/1.19.3/gradle.properties.patch              |  6 +++---
 patches/1.19.3/settings.gradle.patch                |  2 +-
 patches/1.20.2/.jenkins/Jenkinsfile.snapshot.patch  |  2 +-
 patches/1.20.2/NeoForge/build.gradle.patch          |  6 +++---
 .../client/NeoForgeClientHelper.java.patch          |  4 +---
 .../ServerGamePacketListenerImplMixin.java.patch    |  2 +-
 patches/1.20.2/build.gradle.patch                   |  4 ++--
 patches/1.20.2/gradle.properties.patch              |  6 +++---
 patches/1.20.2/settings.gradle.patch                |  2 +-
 patches/1.20.4/.jenkins/Jenkinsfile.snapshot.patch  |  2 +-
 patches/1.20.4/NeoForge/build.gradle.patch          |  6 +++---
 .../client/NeoForgeClientHelper.java.patch          |  6 ++----
 patches/1.20.4/build.gradle.patch                   |  4 ++--
 patches/1.20.4/gradle.properties.patch              |  6 +++---
 patches/1.20.4/settings.gradle.patch                |  2 +-
 patches/1.20/.jenkins/Jenkinsfile.snapshot.patch    |  2 +-
 patches/1.20/NeoForge/build.gradle.patch            |  6 +++---
 .../client/NeoForgeClientHelper.java.patch          |  4 +---
 .../ServerGamePacketListenerImplMixin.java.patch    |  2 +-
 patches/1.20/build.gradle.patch                     |  4 ++--
 patches/1.20/gradle.properties.patch                |  6 +++---
 patches/1.20/settings.gradle.patch                  |  2 +-
 patches/1.21.2/.jenkins/Jenkinsfile.snapshot.patch  |  2 +-
 patches/1.21.2/NeoForge/build.gradle.patch          |  6 +++---
 .../client/NeoForgeClientHelper.java.patch          | 11 +++++++++++
 .../ServerGamePacketListenerImplMixin.java.patch    |  4 ++--
 patches/1.21.2/build.gradle.patch                   |  4 ++--
 patches/1.21.2/gradle.properties.patch              | 13 ++++++++++---
 patches/1.21.2/settings.gradle.patch                |  6 ++----
 patches/1.21/.jenkins/Jenkinsfile.snapshot.patch    |  2 +-
 patches/1.21/NeoForge/build.gradle.patch            |  6 +++---
 .../client/NeoForgeClientHelper.java.patch          | 11 +++++++++++
 .../ServerGamePacketListenerImplMixin.java.patch    | 11 +++++++++++
 patches/1.21/build.gradle.patch                     |  4 ++--
 patches/1.21/gradle.properties.patch                |  6 +++---
 patches/1.21/settings.gradle.patch                  |  6 ++----
 56 files changed, 137 insertions(+), 113 deletions(-)
 create mode 100644 patches/1.21.2/NeoForge/src/main/java/com/hypherionmc/craterlib/client/NeoForgeClientHelper.java.patch
 rename patches/{1.20.4 => 1.21.2}/NeoForge/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java.patch (78%)
 create mode 100644 patches/1.21/NeoForge/src/main/java/com/hypherionmc/craterlib/client/NeoForgeClientHelper.java.patch
 create mode 100644 patches/1.21/NeoForge/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java.patch

diff --git a/commit.sha b/commit.sha
index de55155..fd36070 100644
--- a/commit.sha
+++ b/commit.sha
@@ -1 +1 @@
-771d43853358f76b0df6a1ce0956501c3d7a7649
\ No newline at end of file
+79b2277a77ff03dc7622f58b024431572d6967a9
\ No newline at end of file
diff --git a/patches/1.18.2/.jenkins/Jenkinsfile.snapshot.patch b/patches/1.18.2/.jenkins/Jenkinsfile.snapshot.patch
index b3a646b..d438a5b 100644
--- a/patches/1.18.2/.jenkins/Jenkinsfile.snapshot.patch
+++ b/patches/1.18.2/.jenkins/Jenkinsfile.snapshot.patch
@@ -6,7 +6,7 @@
 -def JDK = "21";
 -def majorMc = "1.21.5";
 -def modLoaders = "neoforge|fabric|quilt|paper";
--def supportedMc = "25w10a";
+-def supportedMc = "1.21.5-rc1";
 -def reltype = "experimental";
 +def JDK = "17";
 +def majorMc = "1.18.2";
diff --git a/patches/1.18.2/NeoForge/build.gradle.patch b/patches/1.18.2/NeoForge/build.gradle.patch
index 87d718d..5eede2e 100644
--- a/patches/1.18.2/NeoForge/build.gradle.patch
+++ b/patches/1.18.2/NeoForge/build.gradle.patch
@@ -42,11 +42,11 @@
 -
 -unimined.minecraft {
 -    neoForged {
--        /*if (isPort) {
+-        if (isPort) {
 -            loader "net.neoforged:neoforge:${neoforge_version}:universal"
--        } else {*/
+-        } else {
 -            loader neoforge_version
--        //}
+-        }
 -
 -        mixinConfig("${mod_id}.mixins.json", "${mod_id}.neoforge.mixins.json")
 -    }
diff --git a/patches/1.18.2/NeoForge/src/main/java/com/hypherionmc/craterlib/client/NeoForgeClientHelper.java.patch b/patches/1.18.2/NeoForge/src/main/java/com/hypherionmc/craterlib/client/NeoForgeClientHelper.java.patch
index 3319550..5098e9d 100644
--- a/patches/1.18.2/NeoForge/src/main/java/com/hypherionmc/craterlib/client/NeoForgeClientHelper.java.patch
+++ b/patches/1.18.2/NeoForge/src/main/java/com/hypherionmc/craterlib/client/NeoForgeClientHelper.java.patch
@@ -1,12 +1,10 @@
 --- a/NeoForge/src/main/java/com/hypherionmc/craterlib/client/NeoForgeClientHelper.java
 +++ /dev/null
-@@ -1,68 +1,0 @@
+@@ -1,66 +1,0 @@
 -package com.hypherionmc.craterlib.client;
 -
 -import com.hypherionmc.craterlib.api.events.client.LateInitEvent;
 -import com.hypherionmc.craterlib.client.gui.config.ClothConfigScreenBuilder;
--import com.hypherionmc.craterlib.client.gui.config.CraterConfigScreen;
--import com.hypherionmc.craterlib.core.config.AbstractConfig;
 -import com.hypherionmc.craterlib.core.config.ConfigController;
 -import com.hypherionmc.craterlib.core.config.annotations.ClothScreen;
 -import com.hypherionmc.craterlib.core.config.annotations.NoConfigScreen;
diff --git a/patches/1.18.2/NeoForge/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java.patch b/patches/1.18.2/NeoForge/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java.patch
index 2f716b8..bfc032d 100644
--- a/patches/1.18.2/NeoForge/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java.patch
+++ b/patches/1.18.2/NeoForge/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java.patch
@@ -25,7 +25,7 @@
 -    public ServerPlayer player;
 -
 -    @Inject(
--            method = "lambda$handleChat$5",
+-            method = "lambda$handleChat$6",
 -            at = @At("HEAD"),
 -            cancellable = true
 -    )
diff --git a/patches/1.18.2/build.gradle.patch b/patches/1.18.2/build.gradle.patch
index 2c2af8d..e64c002 100644
--- a/patches/1.18.2/build.gradle.patch
+++ b/patches/1.18.2/build.gradle.patch
@@ -7,14 +7,14 @@
 -var relType = project.properties["releaseType"] ?: "${release_type}"
 -
 -ext {
--    isPort = (relType == 'experimental')
+-    isPort = false //(relType == 'experimental')
 -}
 -
  orion.setup {
      multiProject = true
      enableMirrorMaven = true
      enableReleasesMaven = true
--    //enableSnapshotsMaven = isPort
+-    enableSnapshotsMaven = isPort
  
      dopplerToken = System.getenv("DOPPLER_KEY")
  
diff --git a/patches/1.18.2/gradle.properties.patch b/patches/1.18.2/gradle.properties.patch
index fc5766d..d23fccf 100644
--- a/patches/1.18.2/gradle.properties.patch
+++ b/patches/1.18.2/gradle.properties.patch
@@ -4,13 +4,13 @@
  mod_name=CraterLib
  
  # Shared
--minecraft_version=25w10a
+-minecraft_version=1.21.5
 +minecraft_version=1.18.2
  project_group=com.hypherionmc.craterlib
  
  # Fabric
 -fabric_loader=0.16.10
--fabric_api=0.118.4+1.21.5
+-fabric_api=0.119.5+1.21.5
 +fabric_loader=0.15.11
 +fabric_api=0.76.0+1.18.2
  
@@ -18,7 +18,7 @@
 -forge_version=50.0.6
 -
 -# NeoForged
--neoforge_version=16-beta
+-neoforge_version=0-beta
 +forge_version=40.2.0
  
  # Dependencies
diff --git a/patches/1.18.2/settings.gradle.patch b/patches/1.18.2/settings.gradle.patch
index f4eada2..f76ef43 100644
--- a/patches/1.18.2/settings.gradle.patch
+++ b/patches/1.18.2/settings.gradle.patch
@@ -5,7 +5,7 @@
  }
  
 -rootProject.name = 'CraterLib'
--include("Common", "Fabric"/*, "NeoForge"*/)
+-include("Common", "Fabric", "NeoForge")
 -//include 'Paper'
 -
 +rootProject.name = 'CraterLib-1.18.2'
diff --git a/patches/1.19.2/.jenkins/Jenkinsfile.snapshot.patch b/patches/1.19.2/.jenkins/Jenkinsfile.snapshot.patch
index 0d47909..0d7e3af 100644
--- a/patches/1.19.2/.jenkins/Jenkinsfile.snapshot.patch
+++ b/patches/1.19.2/.jenkins/Jenkinsfile.snapshot.patch
@@ -6,7 +6,7 @@
 -def JDK = "21";
 -def majorMc = "1.21.5";
 -def modLoaders = "neoforge|fabric|quilt|paper";
--def supportedMc = "25w10a";
+-def supportedMc = "1.21.5-rc1";
 -def reltype = "experimental";
 +def JDK = "17";
 +def majorMc = "1.19.2";
diff --git a/patches/1.19.2/NeoForge/build.gradle.patch b/patches/1.19.2/NeoForge/build.gradle.patch
index 87d718d..5eede2e 100644
--- a/patches/1.19.2/NeoForge/build.gradle.patch
+++ b/patches/1.19.2/NeoForge/build.gradle.patch
@@ -42,11 +42,11 @@
 -
 -unimined.minecraft {
 -    neoForged {
--        /*if (isPort) {
+-        if (isPort) {
 -            loader "net.neoforged:neoforge:${neoforge_version}:universal"
--        } else {*/
+-        } else {
 -            loader neoforge_version
--        //}
+-        }
 -
 -        mixinConfig("${mod_id}.mixins.json", "${mod_id}.neoforge.mixins.json")
 -    }
diff --git a/patches/1.19.2/NeoForge/src/main/java/com/hypherionmc/craterlib/client/NeoForgeClientHelper.java.patch b/patches/1.19.2/NeoForge/src/main/java/com/hypherionmc/craterlib/client/NeoForgeClientHelper.java.patch
index 3319550..5098e9d 100644
--- a/patches/1.19.2/NeoForge/src/main/java/com/hypherionmc/craterlib/client/NeoForgeClientHelper.java.patch
+++ b/patches/1.19.2/NeoForge/src/main/java/com/hypherionmc/craterlib/client/NeoForgeClientHelper.java.patch
@@ -1,12 +1,10 @@
 --- a/NeoForge/src/main/java/com/hypherionmc/craterlib/client/NeoForgeClientHelper.java
 +++ /dev/null
-@@ -1,68 +1,0 @@
+@@ -1,66 +1,0 @@
 -package com.hypherionmc.craterlib.client;
 -
 -import com.hypherionmc.craterlib.api.events.client.LateInitEvent;
 -import com.hypherionmc.craterlib.client.gui.config.ClothConfigScreenBuilder;
--import com.hypherionmc.craterlib.client.gui.config.CraterConfigScreen;
--import com.hypherionmc.craterlib.core.config.AbstractConfig;
 -import com.hypherionmc.craterlib.core.config.ConfigController;
 -import com.hypherionmc.craterlib.core.config.annotations.ClothScreen;
 -import com.hypherionmc.craterlib.core.config.annotations.NoConfigScreen;
diff --git a/patches/1.19.2/NeoForge/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java.patch b/patches/1.19.2/NeoForge/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java.patch
index 2f716b8..bfc032d 100644
--- a/patches/1.19.2/NeoForge/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java.patch
+++ b/patches/1.19.2/NeoForge/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java.patch
@@ -25,7 +25,7 @@
 -    public ServerPlayer player;
 -
 -    @Inject(
--            method = "lambda$handleChat$5",
+-            method = "lambda$handleChat$6",
 -            at = @At("HEAD"),
 -            cancellable = true
 -    )
diff --git a/patches/1.19.2/build.gradle.patch b/patches/1.19.2/build.gradle.patch
index b4c8491..044d8a0 100644
--- a/patches/1.19.2/build.gradle.patch
+++ b/patches/1.19.2/build.gradle.patch
@@ -7,14 +7,14 @@
 -var relType = project.properties["releaseType"] ?: "${release_type}"
 -
 -ext {
--    isPort = (relType == 'experimental')
+-    isPort = false //(relType == 'experimental')
 -}
 -
  orion.setup {
      multiProject = true
      enableMirrorMaven = true
      enableReleasesMaven = true
--    //enableSnapshotsMaven = isPort
+-    enableSnapshotsMaven = isPort
  
      dopplerToken = System.getenv("DOPPLER_KEY")
  
diff --git a/patches/1.19.2/gradle.properties.patch b/patches/1.19.2/gradle.properties.patch
index d2f3b21..5d174b3 100644
--- a/patches/1.19.2/gradle.properties.patch
+++ b/patches/1.19.2/gradle.properties.patch
@@ -4,13 +4,13 @@
  mod_name=CraterLib
  
  # Shared
--minecraft_version=25w10a
+-minecraft_version=1.21.5
 +minecraft_version=1.19.2
  project_group=com.hypherionmc.craterlib
  
  # Fabric
 -fabric_loader=0.16.10
--fabric_api=0.118.4+1.21.5
+-fabric_api=0.119.5+1.21.5
 +fabric_loader=0.15.11
 +fabric_api=0.76.0+1.19.2
  
@@ -18,7 +18,7 @@
 -forge_version=50.0.6
 -
 -# NeoForged
--neoforge_version=16-beta
+-neoforge_version=0-beta
 +forge_version=43.4.0
  
  # Dependencies
diff --git a/patches/1.19.2/settings.gradle.patch b/patches/1.19.2/settings.gradle.patch
index f42bf4e..517a41b 100644
--- a/patches/1.19.2/settings.gradle.patch
+++ b/patches/1.19.2/settings.gradle.patch
@@ -5,7 +5,7 @@
  }
  
 -rootProject.name = 'CraterLib'
--include("Common", "Fabric"/*, "NeoForge"*/)
+-include("Common", "Fabric", "NeoForge")
 -//include 'Paper'
 -
 +rootProject.name = 'CraterLib-1.19.2'
diff --git a/patches/1.19.3/.jenkins/Jenkinsfile.snapshot.patch b/patches/1.19.3/.jenkins/Jenkinsfile.snapshot.patch
index 1c8a0ab..918a76f 100644
--- a/patches/1.19.3/.jenkins/Jenkinsfile.snapshot.patch
+++ b/patches/1.19.3/.jenkins/Jenkinsfile.snapshot.patch
@@ -6,7 +6,7 @@
 -def JDK = "21";
 -def majorMc = "1.21.5";
 -def modLoaders = "neoforge|fabric|quilt|paper";
--def supportedMc = "25w10a";
+-def supportedMc = "1.21.5-rc1";
 -def reltype = "experimental";
 +def JDK = "17";
 +def majorMc = "1.19.3";
diff --git a/patches/1.19.3/NeoForge/build.gradle.patch b/patches/1.19.3/NeoForge/build.gradle.patch
index 87d718d..5eede2e 100644
--- a/patches/1.19.3/NeoForge/build.gradle.patch
+++ b/patches/1.19.3/NeoForge/build.gradle.patch
@@ -42,11 +42,11 @@
 -
 -unimined.minecraft {
 -    neoForged {
--        /*if (isPort) {
+-        if (isPort) {
 -            loader "net.neoforged:neoforge:${neoforge_version}:universal"
--        } else {*/
+-        } else {
 -            loader neoforge_version
--        //}
+-        }
 -
 -        mixinConfig("${mod_id}.mixins.json", "${mod_id}.neoforge.mixins.json")
 -    }
diff --git a/patches/1.19.3/NeoForge/src/main/java/com/hypherionmc/craterlib/client/NeoForgeClientHelper.java.patch b/patches/1.19.3/NeoForge/src/main/java/com/hypherionmc/craterlib/client/NeoForgeClientHelper.java.patch
index 3319550..5098e9d 100644
--- a/patches/1.19.3/NeoForge/src/main/java/com/hypherionmc/craterlib/client/NeoForgeClientHelper.java.patch
+++ b/patches/1.19.3/NeoForge/src/main/java/com/hypherionmc/craterlib/client/NeoForgeClientHelper.java.patch
@@ -1,12 +1,10 @@
 --- a/NeoForge/src/main/java/com/hypherionmc/craterlib/client/NeoForgeClientHelper.java
 +++ /dev/null
-@@ -1,68 +1,0 @@
+@@ -1,66 +1,0 @@
 -package com.hypherionmc.craterlib.client;
 -
 -import com.hypherionmc.craterlib.api.events.client.LateInitEvent;
 -import com.hypherionmc.craterlib.client.gui.config.ClothConfigScreenBuilder;
--import com.hypherionmc.craterlib.client.gui.config.CraterConfigScreen;
--import com.hypherionmc.craterlib.core.config.AbstractConfig;
 -import com.hypherionmc.craterlib.core.config.ConfigController;
 -import com.hypherionmc.craterlib.core.config.annotations.ClothScreen;
 -import com.hypherionmc.craterlib.core.config.annotations.NoConfigScreen;
diff --git a/patches/1.19.3/NeoForge/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java.patch b/patches/1.19.3/NeoForge/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java.patch
index 2f716b8..bfc032d 100644
--- a/patches/1.19.3/NeoForge/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java.patch
+++ b/patches/1.19.3/NeoForge/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java.patch
@@ -25,7 +25,7 @@
 -    public ServerPlayer player;
 -
 -    @Inject(
--            method = "lambda$handleChat$5",
+-            method = "lambda$handleChat$6",
 -            at = @At("HEAD"),
 -            cancellable = true
 -    )
diff --git a/patches/1.19.3/build.gradle.patch b/patches/1.19.3/build.gradle.patch
index b4c8491..044d8a0 100644
--- a/patches/1.19.3/build.gradle.patch
+++ b/patches/1.19.3/build.gradle.patch
@@ -7,14 +7,14 @@
 -var relType = project.properties["releaseType"] ?: "${release_type}"
 -
 -ext {
--    isPort = (relType == 'experimental')
+-    isPort = false //(relType == 'experimental')
 -}
 -
  orion.setup {
      multiProject = true
      enableMirrorMaven = true
      enableReleasesMaven = true
--    //enableSnapshotsMaven = isPort
+-    enableSnapshotsMaven = isPort
  
      dopplerToken = System.getenv("DOPPLER_KEY")
  
diff --git a/patches/1.19.3/gradle.properties.patch b/patches/1.19.3/gradle.properties.patch
index 68796aa..b2fc5f7 100644
--- a/patches/1.19.3/gradle.properties.patch
+++ b/patches/1.19.3/gradle.properties.patch
@@ -4,13 +4,13 @@
  mod_name=CraterLib
  
  # Shared
--minecraft_version=25w10a
+-minecraft_version=1.21.5
 +minecraft_version=1.19.4
  project_group=com.hypherionmc.craterlib
  
  # Fabric
 -fabric_loader=0.16.10
--fabric_api=0.118.4+1.21.5
+-fabric_api=0.119.5+1.21.5
 +fabric_loader=0.15.11
 +fabric_api=0.87.2+1.19.4
  
@@ -18,7 +18,7 @@
 -forge_version=50.0.6
 -
 -# NeoForged
--neoforge_version=16-beta
+-neoforge_version=0-beta
 +forge_version=45.3.0
  
  # Dependencies
diff --git a/patches/1.19.3/settings.gradle.patch b/patches/1.19.3/settings.gradle.patch
index f808b27..856b17e 100644
--- a/patches/1.19.3/settings.gradle.patch
+++ b/patches/1.19.3/settings.gradle.patch
@@ -5,7 +5,7 @@
  }
  
 -rootProject.name = 'CraterLib'
--include("Common", "Fabric"/*, "NeoForge"*/)
+-include("Common", "Fabric", "NeoForge")
 -//include 'Paper'
 -
 +rootProject.name = 'CraterLib-1.19.3'
diff --git a/patches/1.20.2/.jenkins/Jenkinsfile.snapshot.patch b/patches/1.20.2/.jenkins/Jenkinsfile.snapshot.patch
index eaedf4c..f5d074f 100644
--- a/patches/1.20.2/.jenkins/Jenkinsfile.snapshot.patch
+++ b/patches/1.20.2/.jenkins/Jenkinsfile.snapshot.patch
@@ -6,7 +6,7 @@
 -def JDK = "21";
 -def majorMc = "1.21.5";
 -def modLoaders = "neoforge|fabric|quilt|paper";
--def supportedMc = "25w10a";
+-def supportedMc = "1.21.5-rc1";
 -def reltype = "experimental";
 +def JDK = "17";
 +def majorMc = "1.20.2";
diff --git a/patches/1.20.2/NeoForge/build.gradle.patch b/patches/1.20.2/NeoForge/build.gradle.patch
index 87d718d..5eede2e 100644
--- a/patches/1.20.2/NeoForge/build.gradle.patch
+++ b/patches/1.20.2/NeoForge/build.gradle.patch
@@ -42,11 +42,11 @@
 -
 -unimined.minecraft {
 -    neoForged {
--        /*if (isPort) {
+-        if (isPort) {
 -            loader "net.neoforged:neoforge:${neoforge_version}:universal"
--        } else {*/
+-        } else {
 -            loader neoforge_version
--        //}
+-        }
 -
 -        mixinConfig("${mod_id}.mixins.json", "${mod_id}.neoforge.mixins.json")
 -    }
diff --git a/patches/1.20.2/NeoForge/src/main/java/com/hypherionmc/craterlib/client/NeoForgeClientHelper.java.patch b/patches/1.20.2/NeoForge/src/main/java/com/hypherionmc/craterlib/client/NeoForgeClientHelper.java.patch
index 3319550..5098e9d 100644
--- a/patches/1.20.2/NeoForge/src/main/java/com/hypherionmc/craterlib/client/NeoForgeClientHelper.java.patch
+++ b/patches/1.20.2/NeoForge/src/main/java/com/hypherionmc/craterlib/client/NeoForgeClientHelper.java.patch
@@ -1,12 +1,10 @@
 --- a/NeoForge/src/main/java/com/hypherionmc/craterlib/client/NeoForgeClientHelper.java
 +++ /dev/null
-@@ -1,68 +1,0 @@
+@@ -1,66 +1,0 @@
 -package com.hypherionmc.craterlib.client;
 -
 -import com.hypherionmc.craterlib.api.events.client.LateInitEvent;
 -import com.hypherionmc.craterlib.client.gui.config.ClothConfigScreenBuilder;
--import com.hypherionmc.craterlib.client.gui.config.CraterConfigScreen;
--import com.hypherionmc.craterlib.core.config.AbstractConfig;
 -import com.hypherionmc.craterlib.core.config.ConfigController;
 -import com.hypherionmc.craterlib.core.config.annotations.ClothScreen;
 -import com.hypherionmc.craterlib.core.config.annotations.NoConfigScreen;
diff --git a/patches/1.20.2/NeoForge/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java.patch b/patches/1.20.2/NeoForge/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java.patch
index 2f716b8..bfc032d 100644
--- a/patches/1.20.2/NeoForge/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java.patch
+++ b/patches/1.20.2/NeoForge/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java.patch
@@ -25,7 +25,7 @@
 -    public ServerPlayer player;
 -
 -    @Inject(
--            method = "lambda$handleChat$5",
+-            method = "lambda$handleChat$6",
 -            at = @At("HEAD"),
 -            cancellable = true
 -    )
diff --git a/patches/1.20.2/build.gradle.patch b/patches/1.20.2/build.gradle.patch
index b4c8491..044d8a0 100644
--- a/patches/1.20.2/build.gradle.patch
+++ b/patches/1.20.2/build.gradle.patch
@@ -7,14 +7,14 @@
 -var relType = project.properties["releaseType"] ?: "${release_type}"
 -
 -ext {
--    isPort = (relType == 'experimental')
+-    isPort = false //(relType == 'experimental')
 -}
 -
  orion.setup {
      multiProject = true
      enableMirrorMaven = true
      enableReleasesMaven = true
--    //enableSnapshotsMaven = isPort
+-    enableSnapshotsMaven = isPort
  
      dopplerToken = System.getenv("DOPPLER_KEY")
  
diff --git a/patches/1.20.2/gradle.properties.patch b/patches/1.20.2/gradle.properties.patch
index 0c120f9..25f6929 100644
--- a/patches/1.20.2/gradle.properties.patch
+++ b/patches/1.20.2/gradle.properties.patch
@@ -4,13 +4,13 @@
  mod_name=CraterLib
  
  # Shared
--minecraft_version=25w10a
+-minecraft_version=1.21.5
 +minecraft_version=1.20.2
  project_group=com.hypherionmc.craterlib
  
  # Fabric
 -fabric_loader=0.16.10
--fabric_api=0.118.4+1.21.5
+-fabric_api=0.119.5+1.21.5
 +fabric_loader=0.15.11
 +fabric_api=0.91.6+1.20.2
  
@@ -18,7 +18,7 @@
 -forge_version=50.0.6
 -
 -# NeoForged
--neoforge_version=16-beta
+-neoforge_version=0-beta
 +forge_version=48.1.0
  
  # Dependencies
diff --git a/patches/1.20.2/settings.gradle.patch b/patches/1.20.2/settings.gradle.patch
index b8f8192..1c021b5 100644
--- a/patches/1.20.2/settings.gradle.patch
+++ b/patches/1.20.2/settings.gradle.patch
@@ -5,7 +5,7 @@
  }
  
 -rootProject.name = 'CraterLib'
--include("Common", "Fabric"/*, "NeoForge"*/)
+-include("Common", "Fabric", "NeoForge")
 -//include 'Paper'
 -
 +rootProject.name = 'CraterLib-1.20.2'
diff --git a/patches/1.20.4/.jenkins/Jenkinsfile.snapshot.patch b/patches/1.20.4/.jenkins/Jenkinsfile.snapshot.patch
index 8a25f8c..3a253b2 100644
--- a/patches/1.20.4/.jenkins/Jenkinsfile.snapshot.patch
+++ b/patches/1.20.4/.jenkins/Jenkinsfile.snapshot.patch
@@ -6,7 +6,7 @@
 -def JDK = "21";
 -def majorMc = "1.21.5";
 -def modLoaders = "neoforge|fabric|quilt|paper";
--def supportedMc = "25w10a";
+-def supportedMc = "1.21.5-rc1";
 -def reltype = "experimental";
 +def JDK = "17";
 +def majorMc = "1.20.4";
diff --git a/patches/1.20.4/NeoForge/build.gradle.patch b/patches/1.20.4/NeoForge/build.gradle.patch
index f1485d7..a045fb4 100644
--- a/patches/1.20.4/NeoForge/build.gradle.patch
+++ b/patches/1.20.4/NeoForge/build.gradle.patch
@@ -4,11 +4,11 @@
  
  unimined.minecraft {
      neoForged {
--        /*if (isPort) {
+-        if (isPort) {
 -            loader "net.neoforged:neoforge:${neoforge_version}:universal"
--        } else {*/
+-        } else {
 -            loader neoforge_version
--        //}
+-        }
 -
 +        loader neoforge_version
          mixinConfig("${mod_id}.mixins.json", "${mod_id}.neoforge.mixins.json")
diff --git a/patches/1.20.4/NeoForge/src/main/java/com/hypherionmc/craterlib/client/NeoForgeClientHelper.java.patch b/patches/1.20.4/NeoForge/src/main/java/com/hypherionmc/craterlib/client/NeoForgeClientHelper.java.patch
index f2075ef..8f6dac5 100644
--- a/patches/1.20.4/NeoForge/src/main/java/com/hypherionmc/craterlib/client/NeoForgeClientHelper.java.patch
+++ b/patches/1.20.4/NeoForge/src/main/java/com/hypherionmc/craterlib/client/NeoForgeClientHelper.java.patch
@@ -1,12 +1,10 @@
 --- a/NeoForge/src/main/java/com/hypherionmc/craterlib/client/NeoForgeClientHelper.java
 +++ b/NeoForge/src/main/java/com/hypherionmc/craterlib/client/NeoForgeClientHelper.java
-@@ -1,23 +1,12 @@
+@@ -1,21 +1,12 @@
  package com.hypherionmc.craterlib.client;
  
 -import com.hypherionmc.craterlib.api.events.client.LateInitEvent;
 -import com.hypherionmc.craterlib.client.gui.config.ClothConfigScreenBuilder;
--import com.hypherionmc.craterlib.client.gui.config.CraterConfigScreen;
--import com.hypherionmc.craterlib.core.config.AbstractConfig;
 -import com.hypherionmc.craterlib.core.config.ConfigController;
 -import com.hypherionmc.craterlib.core.config.annotations.ClothScreen;
 -import com.hypherionmc.craterlib.core.config.annotations.NoConfigScreen;
@@ -24,7 +22,7 @@
  
  import java.util.Objects;
  
-@@ -48,21 +37,5 @@
+@@ -46,21 +37,5 @@
      public Connection getClientConnection() {
          Objects.requireNonNull(Minecraft.getInstance().getConnection(), "Cannot send packets when not in game!");
          return Minecraft.getInstance().getConnection().getConnection();
diff --git a/patches/1.20.4/build.gradle.patch b/patches/1.20.4/build.gradle.patch
index d448962..7ee54f1 100644
--- a/patches/1.20.4/build.gradle.patch
+++ b/patches/1.20.4/build.gradle.patch
@@ -7,14 +7,14 @@
 -var relType = project.properties["releaseType"] ?: "${release_type}"
 -
 -ext {
--    isPort = (relType == 'experimental')
+-    isPort = false //(relType == 'experimental')
 -}
 -
  orion.setup {
      multiProject = true
      enableMirrorMaven = true
      enableReleasesMaven = true
--    //enableSnapshotsMaven = isPort
+-    enableSnapshotsMaven = isPort
  
      dopplerToken = System.getenv("DOPPLER_KEY")
  
diff --git a/patches/1.20.4/gradle.properties.patch b/patches/1.20.4/gradle.properties.patch
index 59019a3..cc9ed0d 100644
--- a/patches/1.20.4/gradle.properties.patch
+++ b/patches/1.20.4/gradle.properties.patch
@@ -4,13 +4,13 @@
  mod_name=CraterLib
  
  # Shared
--minecraft_version=25w10a
+-minecraft_version=1.21.5
 +minecraft_version=1.20.4
  project_group=com.hypherionmc.craterlib
  
  # Fabric
 -fabric_loader=0.16.10
--fabric_api=0.118.4+1.21.5
+-fabric_api=0.119.5+1.21.5
 +fabric_loader=0.15.11
 +fabric_api=0.97.0+1.20.4
  
@@ -19,7 +19,7 @@
 +forge_version=49.0.49
  
  # NeoForged
--neoforge_version=16-beta
+-neoforge_version=0-beta
 +neoforge_version=234
  
  # Dependencies
diff --git a/patches/1.20.4/settings.gradle.patch b/patches/1.20.4/settings.gradle.patch
index d4a07c4..80df0c3 100644
--- a/patches/1.20.4/settings.gradle.patch
+++ b/patches/1.20.4/settings.gradle.patch
@@ -5,7 +5,7 @@
  }
  
 -rootProject.name = 'CraterLib'
--include("Common", "Fabric"/*, "NeoForge"*/)
+-include("Common", "Fabric", "NeoForge")
 -//include 'Paper'
 -
 +rootProject.name = 'CraterLib-1.20.4'
diff --git a/patches/1.20/.jenkins/Jenkinsfile.snapshot.patch b/patches/1.20/.jenkins/Jenkinsfile.snapshot.patch
index 01d12cd..f64945d 100644
--- a/patches/1.20/.jenkins/Jenkinsfile.snapshot.patch
+++ b/patches/1.20/.jenkins/Jenkinsfile.snapshot.patch
@@ -6,7 +6,7 @@
 -def JDK = "21";
 -def majorMc = "1.21.5";
 -def modLoaders = "neoforge|fabric|quilt|paper";
--def supportedMc = "25w10a";
+-def supportedMc = "1.21.5-rc1";
 -def reltype = "experimental";
 +def JDK = "17";
 +def majorMc = "1.20";
diff --git a/patches/1.20/NeoForge/build.gradle.patch b/patches/1.20/NeoForge/build.gradle.patch
index 87d718d..5eede2e 100644
--- a/patches/1.20/NeoForge/build.gradle.patch
+++ b/patches/1.20/NeoForge/build.gradle.patch
@@ -42,11 +42,11 @@
 -
 -unimined.minecraft {
 -    neoForged {
--        /*if (isPort) {
+-        if (isPort) {
 -            loader "net.neoforged:neoforge:${neoforge_version}:universal"
--        } else {*/
+-        } else {
 -            loader neoforge_version
--        //}
+-        }
 -
 -        mixinConfig("${mod_id}.mixins.json", "${mod_id}.neoforge.mixins.json")
 -    }
diff --git a/patches/1.20/NeoForge/src/main/java/com/hypherionmc/craterlib/client/NeoForgeClientHelper.java.patch b/patches/1.20/NeoForge/src/main/java/com/hypherionmc/craterlib/client/NeoForgeClientHelper.java.patch
index 3319550..5098e9d 100644
--- a/patches/1.20/NeoForge/src/main/java/com/hypherionmc/craterlib/client/NeoForgeClientHelper.java.patch
+++ b/patches/1.20/NeoForge/src/main/java/com/hypherionmc/craterlib/client/NeoForgeClientHelper.java.patch
@@ -1,12 +1,10 @@
 --- a/NeoForge/src/main/java/com/hypherionmc/craterlib/client/NeoForgeClientHelper.java
 +++ /dev/null
-@@ -1,68 +1,0 @@
+@@ -1,66 +1,0 @@
 -package com.hypherionmc.craterlib.client;
 -
 -import com.hypherionmc.craterlib.api.events.client.LateInitEvent;
 -import com.hypherionmc.craterlib.client.gui.config.ClothConfigScreenBuilder;
--import com.hypherionmc.craterlib.client.gui.config.CraterConfigScreen;
--import com.hypherionmc.craterlib.core.config.AbstractConfig;
 -import com.hypherionmc.craterlib.core.config.ConfigController;
 -import com.hypherionmc.craterlib.core.config.annotations.ClothScreen;
 -import com.hypherionmc.craterlib.core.config.annotations.NoConfigScreen;
diff --git a/patches/1.20/NeoForge/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java.patch b/patches/1.20/NeoForge/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java.patch
index 2f716b8..bfc032d 100644
--- a/patches/1.20/NeoForge/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java.patch
+++ b/patches/1.20/NeoForge/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java.patch
@@ -25,7 +25,7 @@
 -    public ServerPlayer player;
 -
 -    @Inject(
--            method = "lambda$handleChat$5",
+-            method = "lambda$handleChat$6",
 -            at = @At("HEAD"),
 -            cancellable = true
 -    )
diff --git a/patches/1.20/build.gradle.patch b/patches/1.20/build.gradle.patch
index 564eeb6..1671bfe 100644
--- a/patches/1.20/build.gradle.patch
+++ b/patches/1.20/build.gradle.patch
@@ -7,14 +7,14 @@
 -var relType = project.properties["releaseType"] ?: "${release_type}"
 -
 -ext {
--    isPort = (relType == 'experimental')
+-    isPort = false //(relType == 'experimental')
 -}
 -
  orion.setup {
      multiProject = true
      enableMirrorMaven = true
      enableReleasesMaven = true
--    //enableSnapshotsMaven = isPort
+-    enableSnapshotsMaven = isPort
 -
      dopplerToken = System.getenv("DOPPLER_KEY")
  
diff --git a/patches/1.20/gradle.properties.patch b/patches/1.20/gradle.properties.patch
index d8651c0..b77f4a1 100644
--- a/patches/1.20/gradle.properties.patch
+++ b/patches/1.20/gradle.properties.patch
@@ -4,13 +4,13 @@
  mod_name=CraterLib
  
  # Shared
--minecraft_version=25w10a
+-minecraft_version=1.21.5
 +minecraft_version=1.20
  project_group=com.hypherionmc.craterlib
  
  # Fabric
 -fabric_loader=0.16.10
--fabric_api=0.118.4+1.21.5
+-fabric_api=0.119.5+1.21.5
 +fabric_loader=0.15.11
 +fabric_api=0.83.0+1.20
  
@@ -18,7 +18,7 @@
 -forge_version=50.0.6
 -
 -# NeoForged
--neoforge_version=16-beta
+-neoforge_version=0-beta
 +forge_version=46.0.14
  
  # Dependencies
diff --git a/patches/1.20/settings.gradle.patch b/patches/1.20/settings.gradle.patch
index 2fabd8f..720cc43 100644
--- a/patches/1.20/settings.gradle.patch
+++ b/patches/1.20/settings.gradle.patch
@@ -5,7 +5,7 @@
  }
  
 -rootProject.name = 'CraterLib'
--include("Common", "Fabric"/*, "NeoForge"*/)
+-include("Common", "Fabric", "NeoForge")
 -//include 'Paper'
 -
 +rootProject.name = 'CraterLib-1.20'
diff --git a/patches/1.21.2/.jenkins/Jenkinsfile.snapshot.patch b/patches/1.21.2/.jenkins/Jenkinsfile.snapshot.patch
index 1930f63..55c3a38 100644
--- a/patches/1.21.2/.jenkins/Jenkinsfile.snapshot.patch
+++ b/patches/1.21.2/.jenkins/Jenkinsfile.snapshot.patch
@@ -7,7 +7,7 @@
 -def majorMc = "1.21.5";
 +def majorMc = "1.21.2";
  def modLoaders = "neoforge|fabric|quilt|paper";
--def supportedMc = "25w10a";
+-def supportedMc = "1.21.5-rc1";
 -def reltype = "experimental";
 +def supportedMc = "1.21.3|1.21.4";
 +def reltype = "snapshot";
diff --git a/patches/1.21.2/NeoForge/build.gradle.patch b/patches/1.21.2/NeoForge/build.gradle.patch
index 8d54b9a..ffec57e 100644
--- a/patches/1.21.2/NeoForge/build.gradle.patch
+++ b/patches/1.21.2/NeoForge/build.gradle.patch
@@ -4,11 +4,11 @@
  
  unimined.minecraft {
      neoForged {
--        /*if (isPort) {
+-        if (isPort) {
 -            loader "net.neoforged:neoforge:${neoforge_version}:universal"
--        } else {*/
+-        } else {
 -            loader neoforge_version
--        //}
+-        }
 -
 +        loader neoforge_version
          mixinConfig("${mod_id}.mixins.json", "${mod_id}.neoforge.mixins.json")
diff --git a/patches/1.21.2/NeoForge/src/main/java/com/hypherionmc/craterlib/client/NeoForgeClientHelper.java.patch b/patches/1.21.2/NeoForge/src/main/java/com/hypherionmc/craterlib/client/NeoForgeClientHelper.java.patch
new file mode 100644
index 0000000..9a8353d
--- /dev/null
+++ b/patches/1.21.2/NeoForge/src/main/java/com/hypherionmc/craterlib/client/NeoForgeClientHelper.java.patch
@@ -0,0 +1,11 @@
+--- a/NeoForge/src/main/java/com/hypherionmc/craterlib/client/NeoForgeClientHelper.java
++++ b/NeoForge/src/main/java/com/hypherionmc/craterlib/client/NeoForgeClientHelper.java
+@@ -2,6 +2,8 @@
+ 
+ import com.hypherionmc.craterlib.api.events.client.LateInitEvent;
+ import com.hypherionmc.craterlib.client.gui.config.ClothConfigScreenBuilder;
++import com.hypherionmc.craterlib.client.gui.config.CraterConfigScreen;
++import com.hypherionmc.craterlib.core.config.AbstractConfig;
+ import com.hypherionmc.craterlib.core.config.ConfigController;
+ import com.hypherionmc.craterlib.core.config.annotations.ClothScreen;
+ import com.hypherionmc.craterlib.core.config.annotations.NoConfigScreen;
diff --git a/patches/1.20.4/NeoForge/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java.patch b/patches/1.21.2/NeoForge/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java.patch
similarity index 78%
rename from patches/1.20.4/NeoForge/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java.patch
rename to patches/1.21.2/NeoForge/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java.patch
index 96dc485..50f5cb4 100644
--- a/patches/1.20.4/NeoForge/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java.patch
+++ b/patches/1.21.2/NeoForge/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java.patch
@@ -4,8 +4,8 @@
      public ServerPlayer player;
  
      @Inject(
--            method = "lambda$handleChat$5",
-+            method = "lambda$handleChat$6",
+-            method = "lambda$handleChat$6",
++            method = "lambda$handleChat$5",
              at = @At("HEAD"),
              cancellable = true
      )
diff --git a/patches/1.21.2/build.gradle.patch b/patches/1.21.2/build.gradle.patch
index 2717099..e034cac 100644
--- a/patches/1.21.2/build.gradle.patch
+++ b/patches/1.21.2/build.gradle.patch
@@ -5,14 +5,14 @@
  var relType = project.properties["releaseType"] ?: "${release_type}"
  
 -ext {
--    isPort = (relType == 'experimental')
+-    isPort = false //(relType == 'experimental')
 -}
 -
  orion.setup {
      multiProject = true
      enableMirrorMaven = true
      enableReleasesMaven = true
--    //enableSnapshotsMaven = isPort
+-    enableSnapshotsMaven = isPort
  
      dopplerToken = System.getenv("DOPPLER_KEY")
  
diff --git a/patches/1.21.2/gradle.properties.patch b/patches/1.21.2/gradle.properties.patch
index 26c2d2b..3b4ece8 100644
--- a/patches/1.21.2/gradle.properties.patch
+++ b/patches/1.21.2/gradle.properties.patch
@@ -1,21 +1,28 @@
 --- a/gradle.properties
 +++ b/gradle.properties
-@@ -10,12 +10,12 @@
+@@ -10,18 +10,18 @@
  mod_name=CraterLib
  
  # Shared
--minecraft_version=25w10a
+-minecraft_version=1.21.5
 +minecraft_version=1.21.3
  project_group=com.hypherionmc.craterlib
  
  # Fabric
 -fabric_loader=0.16.10
--fabric_api=0.118.4+1.21.5
+-fabric_api=0.119.5+1.21.5
 +fabric_loader=0.16.7
 +fabric_api=0.107.3+1.21.3
  
  # Forge
  forge_version=50.0.6
+ 
+ # NeoForged
+-neoforge_version=0-beta
++neoforge_version=16-beta
+ 
+ # Dependencies
+ moon_config=1.0.12
 @@ -39,13 +39,13 @@
  vanishmod_neo=puxrKAMr
  ftb_essentials=2101.1.0
diff --git a/patches/1.21.2/settings.gradle.patch b/patches/1.21.2/settings.gradle.patch
index 40d3a7b..a399196 100644
--- a/patches/1.21.2/settings.gradle.patch
+++ b/patches/1.21.2/settings.gradle.patch
@@ -1,11 +1,9 @@
 --- a/settings.gradle
 +++ b/settings.gradle
-@@ -14,6 +14,5 @@
- }
+@@ -15,5 +15,4 @@
  
  rootProject.name = 'CraterLib'
--include("Common", "Fabric"/*, "NeoForge"*/)
+ include("Common", "Fabric", "NeoForge")
 -//include 'Paper'
 -
-+include("Common", "Fabric", "NeoForge")
 +include 'Paper'
diff --git a/patches/1.21/.jenkins/Jenkinsfile.snapshot.patch b/patches/1.21/.jenkins/Jenkinsfile.snapshot.patch
index 4ec6a9a..9c3c6b2 100644
--- a/patches/1.21/.jenkins/Jenkinsfile.snapshot.patch
+++ b/patches/1.21/.jenkins/Jenkinsfile.snapshot.patch
@@ -7,7 +7,7 @@
 -def majorMc = "1.21.5";
 +def majorMc = "1.21";
  def modLoaders = "neoforge|fabric|quilt|paper";
--def supportedMc = "25w10a";
+-def supportedMc = "1.21.5-rc1";
 -def reltype = "experimental";
 +def supportedMc = "1.21|1.21.1";
 +def reltype = "snapshot";
diff --git a/patches/1.21/NeoForge/build.gradle.patch b/patches/1.21/NeoForge/build.gradle.patch
index 1bb3769..d688266 100644
--- a/patches/1.21/NeoForge/build.gradle.patch
+++ b/patches/1.21/NeoForge/build.gradle.patch
@@ -4,11 +4,11 @@
  
  unimined.minecraft {
      neoForged {
--        /*if (isPort) {
+-        if (isPort) {
 -            loader "net.neoforged:neoforge:${neoforge_version}:universal"
--        } else {*/
+-        } else {
 -            loader neoforge_version
--        //}
+-        }
 -
 +        loader neoforge_version
          mixinConfig("${mod_id}.mixins.json", "${mod_id}.neoforge.mixins.json")
diff --git a/patches/1.21/NeoForge/src/main/java/com/hypherionmc/craterlib/client/NeoForgeClientHelper.java.patch b/patches/1.21/NeoForge/src/main/java/com/hypherionmc/craterlib/client/NeoForgeClientHelper.java.patch
new file mode 100644
index 0000000..9a8353d
--- /dev/null
+++ b/patches/1.21/NeoForge/src/main/java/com/hypherionmc/craterlib/client/NeoForgeClientHelper.java.patch
@@ -0,0 +1,11 @@
+--- a/NeoForge/src/main/java/com/hypherionmc/craterlib/client/NeoForgeClientHelper.java
++++ b/NeoForge/src/main/java/com/hypherionmc/craterlib/client/NeoForgeClientHelper.java
+@@ -2,6 +2,8 @@
+ 
+ import com.hypherionmc.craterlib.api.events.client.LateInitEvent;
+ import com.hypherionmc.craterlib.client.gui.config.ClothConfigScreenBuilder;
++import com.hypherionmc.craterlib.client.gui.config.CraterConfigScreen;
++import com.hypherionmc.craterlib.core.config.AbstractConfig;
+ import com.hypherionmc.craterlib.core.config.ConfigController;
+ import com.hypherionmc.craterlib.core.config.annotations.ClothScreen;
+ import com.hypherionmc.craterlib.core.config.annotations.NoConfigScreen;
diff --git a/patches/1.21/NeoForge/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java.patch b/patches/1.21/NeoForge/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java.patch
new file mode 100644
index 0000000..50f5cb4
--- /dev/null
+++ b/patches/1.21/NeoForge/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java.patch
@@ -0,0 +1,11 @@
+--- a/NeoForge/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java
++++ b/NeoForge/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java
+@@ -22,7 +22,7 @@
+     public ServerPlayer player;
+ 
+     @Inject(
+-            method = "lambda$handleChat$6",
++            method = "lambda$handleChat$5",
+             at = @At("HEAD"),
+             cancellable = true
+     )
diff --git a/patches/1.21/build.gradle.patch b/patches/1.21/build.gradle.patch
index 00b21e2..c481f86 100644
--- a/patches/1.21/build.gradle.patch
+++ b/patches/1.21/build.gradle.patch
@@ -7,14 +7,14 @@
 -var relType = project.properties["releaseType"] ?: "${release_type}"
 -
 -ext {
--    isPort = (relType == 'experimental')
+-    isPort = false //(relType == 'experimental')
 -}
 -
  orion.setup {
      multiProject = true
      enableMirrorMaven = true
      enableReleasesMaven = true
--    //enableSnapshotsMaven = isPort
+-    enableSnapshotsMaven = isPort
  
      dopplerToken = System.getenv("DOPPLER_KEY")
  
diff --git a/patches/1.21/gradle.properties.patch b/patches/1.21/gradle.properties.patch
index 9cb913a..a13ebbe 100644
--- a/patches/1.21/gradle.properties.patch
+++ b/patches/1.21/gradle.properties.patch
@@ -4,13 +4,13 @@
  mod_name=CraterLib
  
  # Shared
--minecraft_version=25w10a
+-minecraft_version=1.21.5
 +minecraft_version=1.21
  project_group=com.hypherionmc.craterlib
  
  # Fabric
 -fabric_loader=0.16.10
--fabric_api=0.118.4+1.21.5
+-fabric_api=0.119.5+1.21.5
 +fabric_loader=0.15.11
 +fabric_api=0.100.1+1.21
  
@@ -18,7 +18,7 @@
  forge_version=50.0.6
  
  # NeoForged
--neoforge_version=16-beta
+-neoforge_version=0-beta
 +neoforge_version=167
  
  # Dependencies
diff --git a/patches/1.21/settings.gradle.patch b/patches/1.21/settings.gradle.patch
index 40d3a7b..a399196 100644
--- a/patches/1.21/settings.gradle.patch
+++ b/patches/1.21/settings.gradle.patch
@@ -1,11 +1,9 @@
 --- a/settings.gradle
 +++ b/settings.gradle
-@@ -14,6 +14,5 @@
- }
+@@ -15,5 +15,4 @@
  
  rootProject.name = 'CraterLib'
--include("Common", "Fabric"/*, "NeoForge"*/)
+ include("Common", "Fabric", "NeoForge")
 -//include 'Paper'
 -
-+include("Common", "Fabric", "NeoForge")
 +include 'Paper'