[DEV] Rebuild Porting Patches

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";

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")

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();

patches/1.20.4/NeoForge/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java.patch

@@ -1,11 +0,0 @@
---- 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$5",
-+            method = "lambda$handleChat$6",
-             at = @At("HEAD"),
-             cancellable = true
-     )

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")
  

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

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'