diff --git a/commit.sha b/commit.sha index 5298e4e..fbd3597 100644 --- a/commit.sha +++ b/commit.sha @@ -1 +1 @@ -6b05af6c83d8766cad3894ab322fef69c3152bea \ No newline at end of file +ce16c08760cf548e5c6a3d698a4f4a3c31f7aca1 \ No newline at end of file diff --git a/patches/1.18.2/NeoForge/build.gradle.patch b/patches/1.18.2/NeoForge/build.gradle.patch index 1e3bedc..9065d9a 100644 --- a/patches/1.18.2/NeoForge/build.gradle.patch +++ b/patches/1.18.2/NeoForge/build.gradle.patch @@ -1,6 +1,6 @@ --- a/NeoForge/build.gradle +++ /dev/null -@@ -1,111 +1,0 @@ +@@ -1,112 +1,0 @@ -archivesBaseName = "${mod_name.replace(" ", "")}-NeoForge-${minecraft_version}" - -dependencies { @@ -34,7 +34,7 @@ - -unimined.minecraft { - neoForged { -- loader "net.neoforged:neoforge:${neoforge_version}:universal" +- loader neoforge_version - mixinConfig("${mod_id}.mixins.json", "${mod_id}.neoforge.mixins.json") - } -} @@ -111,4 +111,5 @@ - setLoaders("neoforge") - setArtifact(remapJar) - setCurseEnvironment("both") +- setIsManualRelease(true) -} diff --git a/patches/1.18.2/build.gradle.patch b/patches/1.18.2/build.gradle.patch index cc72c88..879d507 100644 --- a/patches/1.18.2/build.gradle.patch +++ b/patches/1.18.2/build.gradle.patch @@ -1,14 +1,6 @@ --- a/build.gradle +++ b/build.gradle -@@ -11,7 +11,6 @@ - multiProject = true - enableMirrorMaven = true - enableReleasesMaven = true -- enableSnapshotsMaven = true - - dopplerToken = System.getenv("DOPPLER_KEY") - -@@ -30,8 +29,8 @@ +@@ -29,8 +29,8 @@ apply plugin: 'com.github.johnrengelman.shadow' apply plugin: 'com.hypherionmc.modutils.modpublisher' @@ -19,7 +11,7 @@ group = rootProject.group -@@ -59,7 +58,7 @@ +@@ -58,7 +58,7 @@ shade "me.hypherionmc.moon-config:core:${moon_config}" shade "me.hypherionmc.moon-config:toml:${moon_config}" shade "com.hypherionmc:rpcsdk:${rpc_sdk}" diff --git a/patches/1.18.2/gradle.properties.patch b/patches/1.18.2/gradle.properties.patch index 59ae860..e225bc5 100644 --- a/patches/1.18.2/gradle.properties.patch +++ b/patches/1.18.2/gradle.properties.patch @@ -4,20 +4,20 @@ mod_name=CraterLib # Shared --minecraft_version=1.21-pre4 +-minecraft_version=1.21 +minecraft_version=1.18.2 project_group=com.hypherionmc.craterlib # Fabric fabric_loader=0.15.11 --fabric_api=0.100.0+1.21 +-fabric_api=0.100.1+1.21 +fabric_api=0.76.0+1.18.2 # Forge -forge_version=50.0.6 - -# NeoForged --neoforge_version=21.0.0-alpha.1.21-pre4.20240609.095301 +-neoforge_version=0.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 6affdd1..7ac621f 100644 --- a/patches/1.18.2/settings.gradle.patch +++ b/patches/1.18.2/settings.gradle.patch @@ -1,6 +1,6 @@ --- a/settings.gradle +++ b/settings.gradle -@@ -10,5 +10,5 @@ +@@ -13,5 +13,5 @@ } } diff --git a/patches/1.19.2/NeoForge/build.gradle.patch b/patches/1.19.2/NeoForge/build.gradle.patch index 1e3bedc..9065d9a 100644 --- a/patches/1.19.2/NeoForge/build.gradle.patch +++ b/patches/1.19.2/NeoForge/build.gradle.patch @@ -1,6 +1,6 @@ --- a/NeoForge/build.gradle +++ /dev/null -@@ -1,111 +1,0 @@ +@@ -1,112 +1,0 @@ -archivesBaseName = "${mod_name.replace(" ", "")}-NeoForge-${minecraft_version}" - -dependencies { @@ -34,7 +34,7 @@ - -unimined.minecraft { - neoForged { -- loader "net.neoforged:neoforge:${neoforge_version}:universal" +- loader neoforge_version - mixinConfig("${mod_id}.mixins.json", "${mod_id}.neoforge.mixins.json") - } -} @@ -111,4 +111,5 @@ - setLoaders("neoforge") - setArtifact(remapJar) - setCurseEnvironment("both") +- setIsManualRelease(true) -} diff --git a/patches/1.19.2/build.gradle.patch b/patches/1.19.2/build.gradle.patch index 169744c..4252ab9 100644 --- a/patches/1.19.2/build.gradle.patch +++ b/patches/1.19.2/build.gradle.patch @@ -1,14 +1,6 @@ --- a/build.gradle +++ b/build.gradle -@@ -11,7 +11,6 @@ - multiProject = true - enableMirrorMaven = true - enableReleasesMaven = true -- enableSnapshotsMaven = true - - dopplerToken = System.getenv("DOPPLER_KEY") - -@@ -30,8 +29,8 @@ +@@ -29,8 +29,8 @@ apply plugin: 'com.github.johnrengelman.shadow' apply plugin: 'com.hypherionmc.modutils.modpublisher' @@ -19,7 +11,7 @@ group = rootProject.group -@@ -59,7 +58,7 @@ +@@ -58,7 +58,7 @@ shade "me.hypherionmc.moon-config:core:${moon_config}" shade "me.hypherionmc.moon-config:toml:${moon_config}" shade "com.hypherionmc:rpcsdk:${rpc_sdk}" diff --git a/patches/1.19.2/gradle.properties.patch b/patches/1.19.2/gradle.properties.patch index 853ee9a..8e72ffd 100644 --- a/patches/1.19.2/gradle.properties.patch +++ b/patches/1.19.2/gradle.properties.patch @@ -4,20 +4,20 @@ mod_name=CraterLib # Shared --minecraft_version=1.21-pre4 +-minecraft_version=1.21 +minecraft_version=1.19.2 project_group=com.hypherionmc.craterlib # Fabric fabric_loader=0.15.11 --fabric_api=0.100.0+1.21 +-fabric_api=0.100.1+1.21 +fabric_api=0.76.0+1.19.2 # Forge -forge_version=50.0.6 - -# NeoForged --neoforge_version=21.0.0-alpha.1.21-pre4.20240609.095301 +-neoforge_version=0.0-beta +forge_version=43.2.0 # Dependencies diff --git a/patches/1.19.2/settings.gradle.patch b/patches/1.19.2/settings.gradle.patch index ed73f8a..76a8416 100644 --- a/patches/1.19.2/settings.gradle.patch +++ b/patches/1.19.2/settings.gradle.patch @@ -1,6 +1,6 @@ --- a/settings.gradle +++ b/settings.gradle -@@ -10,5 +10,5 @@ +@@ -13,5 +13,5 @@ } } diff --git a/patches/1.19.3/NeoForge/build.gradle.patch b/patches/1.19.3/NeoForge/build.gradle.patch index 1e3bedc..9065d9a 100644 --- a/patches/1.19.3/NeoForge/build.gradle.patch +++ b/patches/1.19.3/NeoForge/build.gradle.patch @@ -1,6 +1,6 @@ --- a/NeoForge/build.gradle +++ /dev/null -@@ -1,111 +1,0 @@ +@@ -1,112 +1,0 @@ -archivesBaseName = "${mod_name.replace(" ", "")}-NeoForge-${minecraft_version}" - -dependencies { @@ -34,7 +34,7 @@ - -unimined.minecraft { - neoForged { -- loader "net.neoforged:neoforge:${neoforge_version}:universal" +- loader neoforge_version - mixinConfig("${mod_id}.mixins.json", "${mod_id}.neoforge.mixins.json") - } -} @@ -111,4 +111,5 @@ - setLoaders("neoforge") - setArtifact(remapJar) - setCurseEnvironment("both") +- setIsManualRelease(true) -} diff --git a/patches/1.19.3/build.gradle.patch b/patches/1.19.3/build.gradle.patch index 169744c..4252ab9 100644 --- a/patches/1.19.3/build.gradle.patch +++ b/patches/1.19.3/build.gradle.patch @@ -1,14 +1,6 @@ --- a/build.gradle +++ b/build.gradle -@@ -11,7 +11,6 @@ - multiProject = true - enableMirrorMaven = true - enableReleasesMaven = true -- enableSnapshotsMaven = true - - dopplerToken = System.getenv("DOPPLER_KEY") - -@@ -30,8 +29,8 @@ +@@ -29,8 +29,8 @@ apply plugin: 'com.github.johnrengelman.shadow' apply plugin: 'com.hypherionmc.modutils.modpublisher' @@ -19,7 +11,7 @@ group = rootProject.group -@@ -59,7 +58,7 @@ +@@ -58,7 +58,7 @@ shade "me.hypherionmc.moon-config:core:${moon_config}" shade "me.hypherionmc.moon-config:toml:${moon_config}" shade "com.hypherionmc:rpcsdk:${rpc_sdk}" diff --git a/patches/1.19.3/gradle.properties.patch b/patches/1.19.3/gradle.properties.patch index 3ea5b65..cb6daae 100644 --- a/patches/1.19.3/gradle.properties.patch +++ b/patches/1.19.3/gradle.properties.patch @@ -4,20 +4,20 @@ mod_name=CraterLib # Shared --minecraft_version=1.21-pre4 +-minecraft_version=1.21 +minecraft_version=1.19.3 project_group=com.hypherionmc.craterlib # Fabric fabric_loader=0.15.11 --fabric_api=0.100.0+1.21 +-fabric_api=0.100.1+1.21 +fabric_api=0.76.1+1.19.3 # Forge -forge_version=50.0.6 - -# NeoForged --neoforge_version=21.0.0-alpha.1.21-pre4.20240609.095301 +-neoforge_version=0.0-beta +forge_version=44.1.0 # Dependencies diff --git a/patches/1.19.3/settings.gradle.patch b/patches/1.19.3/settings.gradle.patch index 09c3682..0ddbb30 100644 --- a/patches/1.19.3/settings.gradle.patch +++ b/patches/1.19.3/settings.gradle.patch @@ -1,6 +1,6 @@ --- a/settings.gradle +++ b/settings.gradle -@@ -10,5 +10,5 @@ +@@ -13,5 +13,5 @@ } } diff --git a/patches/1.20.2/NeoForge/build.gradle.patch b/patches/1.20.2/NeoForge/build.gradle.patch index 1e3bedc..9065d9a 100644 --- a/patches/1.20.2/NeoForge/build.gradle.patch +++ b/patches/1.20.2/NeoForge/build.gradle.patch @@ -1,6 +1,6 @@ --- a/NeoForge/build.gradle +++ /dev/null -@@ -1,111 +1,0 @@ +@@ -1,112 +1,0 @@ -archivesBaseName = "${mod_name.replace(" ", "")}-NeoForge-${minecraft_version}" - -dependencies { @@ -34,7 +34,7 @@ - -unimined.minecraft { - neoForged { -- loader "net.neoforged:neoforge:${neoforge_version}:universal" +- loader neoforge_version - mixinConfig("${mod_id}.mixins.json", "${mod_id}.neoforge.mixins.json") - } -} @@ -111,4 +111,5 @@ - setLoaders("neoforge") - setArtifact(remapJar) - setCurseEnvironment("both") +- setIsManualRelease(true) -} diff --git a/patches/1.20.2/build.gradle.patch b/patches/1.20.2/build.gradle.patch index 169744c..4252ab9 100644 --- a/patches/1.20.2/build.gradle.patch +++ b/patches/1.20.2/build.gradle.patch @@ -1,14 +1,6 @@ --- a/build.gradle +++ b/build.gradle -@@ -11,7 +11,6 @@ - multiProject = true - enableMirrorMaven = true - enableReleasesMaven = true -- enableSnapshotsMaven = true - - dopplerToken = System.getenv("DOPPLER_KEY") - -@@ -30,8 +29,8 @@ +@@ -29,8 +29,8 @@ apply plugin: 'com.github.johnrengelman.shadow' apply plugin: 'com.hypherionmc.modutils.modpublisher' @@ -19,7 +11,7 @@ group = rootProject.group -@@ -59,7 +58,7 @@ +@@ -58,7 +58,7 @@ shade "me.hypherionmc.moon-config:core:${moon_config}" shade "me.hypherionmc.moon-config:toml:${moon_config}" shade "com.hypherionmc:rpcsdk:${rpc_sdk}" diff --git a/patches/1.20.2/gradle.properties.patch b/patches/1.20.2/gradle.properties.patch index 230ac83..1ce1258 100644 --- a/patches/1.20.2/gradle.properties.patch +++ b/patches/1.20.2/gradle.properties.patch @@ -4,20 +4,20 @@ mod_name=CraterLib # Shared --minecraft_version=1.21-pre4 +-minecraft_version=1.21 +minecraft_version=1.20.2 project_group=com.hypherionmc.craterlib # Fabric fabric_loader=0.15.11 --fabric_api=0.100.0+1.21 +-fabric_api=0.100.1+1.21 +fabric_api=0.91.6+1.20.2 # Forge -forge_version=50.0.6 - -# NeoForged --neoforge_version=21.0.0-alpha.1.21-pre4.20240609.095301 +-neoforge_version=0.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 b3e2592..c9134fa 100644 --- a/patches/1.20.2/settings.gradle.patch +++ b/patches/1.20.2/settings.gradle.patch @@ -1,6 +1,6 @@ --- a/settings.gradle +++ b/settings.gradle -@@ -10,5 +10,5 @@ +@@ -13,5 +13,5 @@ } } diff --git a/patches/1.20.4/NeoForge/build.gradle.patch b/patches/1.20.4/NeoForge/build.gradle.patch index b8e3cf4..710eff7 100644 --- a/patches/1.20.4/NeoForge/build.gradle.patch +++ b/patches/1.20.4/NeoForge/build.gradle.patch @@ -1,14 +1,5 @@ --- a/NeoForge/build.gradle +++ b/NeoForge/build.gradle -@@ -31,7 +31,7 @@ - - unimined.minecraft { - neoForged { -- loader "net.neoforged:neoforge:${neoforge_version}:universal" -+ loader neoforge_version - mixinConfig("${mod_id}.mixins.json", "${mod_id}.neoforge.mixins.json") - } - } @@ -50,7 +50,7 @@ from project(":Common").sourceSets.main.resources def buildProps = project.properties.clone() diff --git a/patches/1.20.4/build.gradle.patch b/patches/1.20.4/build.gradle.patch index d1d5292..390a3be 100644 --- a/patches/1.20.4/build.gradle.patch +++ b/patches/1.20.4/build.gradle.patch @@ -1,14 +1,6 @@ --- a/build.gradle +++ b/build.gradle -@@ -11,7 +11,6 @@ - multiProject = true - enableMirrorMaven = true - enableReleasesMaven = true -- enableSnapshotsMaven = true - - dopplerToken = System.getenv("DOPPLER_KEY") - -@@ -30,8 +29,8 @@ +@@ -29,8 +29,8 @@ apply plugin: 'com.github.johnrengelman.shadow' apply plugin: 'com.hypherionmc.modutils.modpublisher' diff --git a/patches/1.20.4/gradle.properties.patch b/patches/1.20.4/gradle.properties.patch index 2b3ee5a..23a3e18 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=1.21-pre4 +-minecraft_version=1.21 +minecraft_version=1.20.4 project_group=com.hypherionmc.craterlib # Fabric fabric_loader=0.15.11 --fabric_api=0.100.0+1.21 +-fabric_api=0.100.1+1.21 +fabric_api=0.97.0+1.20.4 # Forge @@ -18,7 +18,7 @@ +forge_version=49.0.49 # NeoForged --neoforge_version=21.0.0-alpha.1.21-pre4.20240609.095301 +-neoforge_version=0.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 decd09a..793539a 100644 --- a/patches/1.20.4/settings.gradle.patch +++ b/patches/1.20.4/settings.gradle.patch @@ -1,6 +1,6 @@ --- a/settings.gradle +++ b/settings.gradle -@@ -10,5 +10,5 @@ +@@ -13,5 +13,5 @@ } } diff --git a/patches/1.20/NeoForge/build.gradle.patch b/patches/1.20/NeoForge/build.gradle.patch index 1e3bedc..9065d9a 100644 --- a/patches/1.20/NeoForge/build.gradle.patch +++ b/patches/1.20/NeoForge/build.gradle.patch @@ -1,6 +1,6 @@ --- a/NeoForge/build.gradle +++ /dev/null -@@ -1,111 +1,0 @@ +@@ -1,112 +1,0 @@ -archivesBaseName = "${mod_name.replace(" ", "")}-NeoForge-${minecraft_version}" - -dependencies { @@ -34,7 +34,7 @@ - -unimined.minecraft { - neoForged { -- loader "net.neoforged:neoforge:${neoforge_version}:universal" +- loader neoforge_version - mixinConfig("${mod_id}.mixins.json", "${mod_id}.neoforge.mixins.json") - } -} @@ -111,4 +111,5 @@ - setLoaders("neoforge") - setArtifact(remapJar) - setCurseEnvironment("both") +- setIsManualRelease(true) -} diff --git a/patches/1.20/build.gradle.patch b/patches/1.20/build.gradle.patch index e44add1..e17823d 100644 --- a/patches/1.20/build.gradle.patch +++ b/patches/1.20/build.gradle.patch @@ -1,15 +1,14 @@ --- a/build.gradle +++ b/build.gradle -@@ -11,8 +11,6 @@ +@@ -11,7 +11,6 @@ multiProject = true enableMirrorMaven = true enableReleasesMaven = true -- enableSnapshotsMaven = true - dopplerToken = System.getenv("DOPPLER_KEY") versioning { -@@ -30,8 +28,8 @@ +@@ -29,8 +28,8 @@ apply plugin: 'com.github.johnrengelman.shadow' apply plugin: 'com.hypherionmc.modutils.modpublisher' @@ -20,7 +19,7 @@ group = rootProject.group -@@ -59,7 +57,7 @@ +@@ -58,7 +57,7 @@ shade "me.hypherionmc.moon-config:core:${moon_config}" shade "me.hypherionmc.moon-config:toml:${moon_config}" shade "com.hypherionmc:rpcsdk:${rpc_sdk}" diff --git a/patches/1.20/gradle.properties.patch b/patches/1.20/gradle.properties.patch index 44ab41f..1973256 100644 --- a/patches/1.20/gradle.properties.patch +++ b/patches/1.20/gradle.properties.patch @@ -4,20 +4,20 @@ mod_name=CraterLib # Shared --minecraft_version=1.21-pre4 +-minecraft_version=1.21 +minecraft_version=1.20 project_group=com.hypherionmc.craterlib # Fabric fabric_loader=0.15.11 --fabric_api=0.100.0+1.21 +-fabric_api=0.100.1+1.21 +fabric_api=0.83.0+1.20 # Forge -forge_version=50.0.6 - -# NeoForged --neoforge_version=21.0.0-alpha.1.21-pre4.20240609.095301 +-neoforge_version=0.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 e089efd..c57b5d0 100644 --- a/patches/1.20/settings.gradle.patch +++ b/patches/1.20/settings.gradle.patch @@ -1,6 +1,6 @@ --- a/settings.gradle +++ b/settings.gradle -@@ -10,5 +10,5 @@ +@@ -13,5 +13,5 @@ } }