[DEV] Update Porting Patches

patches/1.20.4/Common/build.gradle.patch

@@ -1,11 +0,0 @@
---- a/Common/build.gradle
-+++ b/Common/build.gradle
-@@ -1,7 +1,7 @@
- archivesBaseName = "${mod_name.replace(" ", "")}-Common-${minecraft_version}"
- 
- dependencies {
--
-+    stupidRemapArch("dev.ftb.mods:ftb-essentials:${ftb_essentials}")
- }
- 
- shadowJar {

patches/1.20.4/Fabric/build.gradle.patch

@@ -1,15 +1,6 @@
 --- a/Fabric/build.gradle
 +++ b/Fabric/build.gradle
-@@ -9,6 +9,8 @@
-         exclude(group: "net.fabricmc.fabric-api")
-     }
- 
-+    stupidRemapArch("dev.ftb.mods:ftb-essentials:${ftb_essentials}")
-+
-     modImplementation "maven.modrinth:fabrictailor:${fabrictailor}"
-     modImplementation "maven.modrinth:vanish:${vanish}"
- 
-@@ -113,8 +115,8 @@
+@@ -115,8 +115,8 @@
      setVersionType("release")
      setChangelog("https://raw.githubusercontent.com/hypherionmc/changelogs/main/craterlib/changelog-fabric.md")
      setProjectVersion("${minecraft_version}-${project.version}")

patches/1.20.4/Fabric/src/main/resources/fabric.mod.json.patch

@@ -7,7 +7,7 @@
 -    "fabricloader": ">=0.16.2",
 +    "fabricloader": ">=0.15.0",
      "fabric-api": "*",
--    "minecraft": ">=1.21.2",
+-    "minecraft": "*",
 -    "java": ">=21"
 +    "minecraft": "1.20.4",
 +    "java": ">=17"

patches/1.20.4/NeoForge/build.gradle.patch

@@ -1,15 +1,20 @@
 --- a/NeoForge/build.gradle
 +++ b/NeoForge/build.gradle
-@@ -4,6 +4,8 @@
-     // Compat
-     modImplementation("maven.modrinth:vanishmod:${vanishmod_neo}")
+@@ -34,12 +34,7 @@
  
-+    stupidRemapArch("dev.ftb.mods:ftb-essentials-neoforge:${ftb_essentials}")
-+
-     // Do not edit or remove
-     implementation project(":Common")
+ unimined.minecraft {
+     neoForged {
+-        if (isPort) {
+-            loader "net.neoforged:neoforge:${neoforge_version}:universal"
+-        } else {
+-            loader neoforge_version
+-        }
+-
++        loader neoforge_version
+         mixinConfig("${mod_id}.mixins.json", "${mod_id}.neoforge.mixins.json")
+     }
  }
-@@ -51,7 +53,7 @@
+@@ -58,7 +53,7 @@
      from project(":Common").sourceSets.main.resources
      def buildProps = project.properties.clone()
  
@@ -18,7 +23,7 @@
          expand buildProps
      }
  }
-@@ -106,8 +108,8 @@
+@@ -113,8 +108,8 @@
      setVersionType("release")
      setChangelog("https://raw.githubusercontent.com/hypherionmc/changelogs/main/craterlib/changelog-forge.md")
      setProjectVersion("${minecraft_version}-${project.version}")

patches/1.20.4/build.gradle.patch

@@ -1,6 +1,29 @@
 --- a/build.gradle
 +++ b/build.gradle
-@@ -29,8 +29,8 @@
+@@ -7,21 +7,15 @@
+     id 'maven-publish'
+ }
+ 
+-var relType = project.properties["releaseType"] ?: "${release_type}"
+-
+-ext {
+-    isPort = (relType == 'port')
+-}
+-
+ orion.setup {
+     multiProject = true
+     enableMirrorMaven = true
+     enableReleasesMaven = true
+-    enableSnapshotsMaven = isPort
+ 
+     dopplerToken = System.getenv("DOPPLER_KEY")
+ 
+     versioning {
++        var relType = project.properties["releaseType"] ?: "${release_type}"
+         identifier("${relType}")
+     }
+ }
+@@ -35,14 +29,13 @@
      apply plugin: 'com.github.johnrengelman.shadow'
      apply plugin: 'com.hypherionmc.modutils.modpublisher'
  
@@ -11,16 +34,13 @@
  
      group = rootProject.group
  
-@@ -66,8 +66,6 @@
-         shade "net.kyori:adventure-text-serializer-gson:${adventure}"
-         shade "net.kyori:adventure-text-minimessage:${adventure}"
+     repositories {
+         mavenCentral()
+-        mavenLocal()
  
--        stupidRemapArch("dev.ftb.mods:ftb-essentials:${ftb_essentials}")
--
-         compileOnly 'net.luckperms:api:5.4'
-         compileOnly("org.projectlombok:lombok:${lombok}")
-         annotationProcessor("org.projectlombok:lombok:${lombok}")
-@@ -112,7 +110,7 @@
+         maven {
+             name = "Modrinth"
+@@ -117,7 +110,7 @@
  
      tasks.withType(JavaCompile).configureEach {
          it.options.encoding = 'UTF-8'

patches/1.20.4/gradle.properties.patch

@@ -4,13 +4,13 @@
  mod_name=CraterLib
  
  # Shared
--minecraft_version=1.21.2-pre1
+-minecraft_version=1.21.2-rc1
 +minecraft_version=1.20.4
  project_group=com.hypherionmc.craterlib
  
  # Fabric
 -fabric_loader=0.16.5
--fabric_api=0.105.3+1.21.2
+-fabric_api=0.106.0+1.21.2
 +fabric_loader=0.15.11
 +fabric_api=0.97.0+1.20.4
  
@@ -19,11 +19,11 @@
 +forge_version=49.0.49
  
  # NeoForged
--neoforge_version=0.0-beta
+-neoforge_version=21.2.0-alpha.1.21.2-rc1.20241017.224038
 +neoforge_version=234
  
  # Dependencies
- moon_config=1.0.9
+ moon_config=1.0.10
 @@ -32,16 +32,16 @@
  
  # Mod Dependencies

patches/1.20.4/settings.gradle.patch

@@ -5,6 +5,6 @@
  }
  
 -rootProject.name = 'CraterLib'
--include("Common", "Fabric", /*"NeoForge"*/)
+-include("Common", "Fabric", "NeoForge")
 +rootProject.name = 'CraterLib-1.20.4'
 +include("Common", "Fabric", "Forge", "NeoForge")