[DEV] Rebuild Porting Patches

2025-03-25 19:49:02 +02:00
parent 9da963f3c8
commit 327a60c806
56 changed files with 137 additions and 113 deletions
--- a/commit.sha
+++ b/commit.sha
@@ -1 +1 @@
-771d43853358f76b0df6a1ce0956501c3d7a7649
+79b2277a77ff03dc7622f58b024431572d6967a9
--- 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";
--- 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")
 -    }
--- 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;
--- 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
 -    )
--- 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")
 
--- 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
--- 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'
--- 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";
--- 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")
 -    }
--- 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;
--- 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
 -    )
--- 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")
 
--- 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
--- 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'
--- 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";
--- 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")
 -    }
--- 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;
--- 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
 -    )
--- 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")
 
--- 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
--- 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'
--- 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";
--- 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")
 -    }
--- 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;
--- 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
 -    )
--- 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")
 
--- 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
--- 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'
--- 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";
--- 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")
--- 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();
--- 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")
 
--- 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
--- 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'
--- 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";
--- 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")
 -    }
--- 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;
--- 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
 -    )
--- 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")
 
--- 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
--- 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'
--- 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";
--- 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")
--- 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
@@ -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;
--- a/patches/1.21.2/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
     )
--- 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")
 
--- 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
--- 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'
--- 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";
--- 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")
--- 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
@@ -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;
--- 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
@@ -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
+     )
--- 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")
 
--- 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
--- 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'