From 21898f8420bd812bf9880930d9e760689495e3d2 Mon Sep 17 00:00:00 2001 From: hypherionmc Date: Sat, 12 Oct 2024 13:54:44 +0200 Subject: [PATCH] [DEV] Update Porting Patches --- 1.18.2/Common/build.gradle | 2 +- 1.18.2/gradle.properties | 2 +- 1.19.2/Common/build.gradle | 2 +- 1.19.2/gradle.properties | 2 +- 1.19.3/Common/build.gradle | 2 +- 1.19.3/gradle.properties | 2 +- 1.20.2/Common/build.gradle | 2 +- 1.20.2/gradle.properties | 2 +- 1.20.4/Common/build.gradle | 2 +- 1.20.4/gradle.properties | 2 +- 1.20/Common/build.gradle | 2 +- 1.20/gradle.properties | 2 +- 1.21/Common/build.gradle | 2 +- 1.21/gradle.properties | 2 +- 1.21/settings.gradle | 2 +- commit.sha | 2 +- .../Common/build.gradle.patch | 4 +- patches/1.18.2/Fabric/build.gradle.patch | 11 ++++- .../src/main/resources/fabric.mod.json.patch | 2 +- patches/1.18.2/NeoForge/build.gradle.patch | 11 ++++- patches/1.18.2/build.gradle.patch | 41 +++++++++++++++++-- patches/1.18.2/gradle.properties.patch | 8 ++-- patches/1.18.2/settings.gradle.patch | 2 +- patches/1.19.2/Fabric/build.gradle.patch | 8 ++-- .../src/main/resources/fabric.mod.json.patch | 2 +- patches/1.19.2/NeoForge/build.gradle.patch | 11 ++++- patches/1.19.2/build.gradle.patch | 41 +++++++++++++++---- patches/1.19.2/gradle.properties.patch | 8 ++-- patches/1.19.2/settings.gradle.patch | 2 +- patches/1.19.3/Common/build.gradle.patch | 11 ----- patches/1.19.3/Fabric/build.gradle.patch | 8 ++-- .../src/main/resources/fabric.mod.json.patch | 2 +- patches/1.19.3/NeoForge/build.gradle.patch | 11 ++++- patches/1.19.3/build.gradle.patch | 41 +++++++++++++++---- patches/1.19.3/gradle.properties.patch | 8 ++-- patches/1.19.3/settings.gradle.patch | 2 +- patches/1.20.2/Common/build.gradle.patch | 11 ----- patches/1.20.2/Fabric/build.gradle.patch | 8 ++-- .../src/main/resources/fabric.mod.json.patch | 2 +- patches/1.20.2/NeoForge/build.gradle.patch | 11 ++++- patches/1.20.2/build.gradle.patch | 41 +++++++++++++++---- patches/1.20.2/gradle.properties.patch | 8 ++-- patches/1.20.2/settings.gradle.patch | 2 +- patches/1.20.4/Common/build.gradle.patch | 11 ----- patches/1.20.4/Fabric/build.gradle.patch | 11 +---- .../src/main/resources/fabric.mod.json.patch | 2 +- patches/1.20.4/NeoForge/build.gradle.patch | 23 +++++++---- patches/1.20.4/build.gradle.patch | 40 +++++++++++++----- patches/1.20.4/gradle.properties.patch | 8 ++-- patches/1.20.4/settings.gradle.patch | 2 +- patches/1.20/Common/build.gradle.patch | 11 ----- patches/1.20/Fabric/build.gradle.patch | 8 ++-- .../src/main/resources/fabric.mod.json.patch | 2 +- patches/1.20/NeoForge/build.gradle.patch | 11 ++++- patches/1.20/build.gradle.patch | 35 +++++++++++----- patches/1.20/gradle.properties.patch | 8 ++-- patches/1.20/settings.gradle.patch | 2 +- patches/1.21/Common/build.gradle.patch | 11 ----- patches/1.21/Fabric/build.gradle.patch | 11 +---- .../src/main/resources/fabric.mod.json.patch | 2 +- patches/1.21/NeoForge/build.gradle.patch | 21 ++++++---- patches/1.21/build.gradle.patch | 36 ++++++++++++---- patches/1.21/gradle.properties.patch | 8 ++-- patches/1.21/settings.gradle.patch | 8 ---- 64 files changed, 377 insertions(+), 243 deletions(-) rename patches/{1.19.2 => 1.18.2}/Common/build.gradle.patch (74%) delete mode 100644 patches/1.19.3/Common/build.gradle.patch delete mode 100644 patches/1.20.2/Common/build.gradle.patch delete mode 100644 patches/1.20.4/Common/build.gradle.patch delete mode 100644 patches/1.20/Common/build.gradle.patch delete mode 100644 patches/1.21/Common/build.gradle.patch delete mode 100644 patches/1.21/settings.gradle.patch diff --git a/1.18.2/Common/build.gradle b/1.18.2/Common/build.gradle index 843d62a..a8e4f79 100644 --- a/1.18.2/Common/build.gradle +++ b/1.18.2/Common/build.gradle @@ -65,4 +65,4 @@ publishing { repositories { maven rootProject.orion.getPublishingMaven() } -} \ No newline at end of file +} diff --git a/1.18.2/gradle.properties b/1.18.2/gradle.properties index e857342..5a55a99 100644 --- a/1.18.2/gradle.properties +++ b/1.18.2/gradle.properties @@ -21,7 +21,7 @@ fabric_api=0.76.0+1.18.2 forge_version=40.2.0 # Dependencies -moon_config=1.0.9 +moon_config=1.0.10 lombok=1.18.32 adventure=4.17.0 rpc_sdk=1.0 diff --git a/1.19.2/Common/build.gradle b/1.19.2/Common/build.gradle index b4de412..15a4dec 100644 --- a/1.19.2/Common/build.gradle +++ b/1.19.2/Common/build.gradle @@ -65,4 +65,4 @@ publishing { repositories { maven rootProject.orion.getPublishingMaven() } -} +} \ No newline at end of file diff --git a/1.19.2/gradle.properties b/1.19.2/gradle.properties index 5f773bb..b4408b1 100644 --- a/1.19.2/gradle.properties +++ b/1.19.2/gradle.properties @@ -21,7 +21,7 @@ fabric_api=0.76.0+1.19.2 forge_version=43.4.0 # Dependencies -moon_config=1.0.9 +moon_config=1.0.10 lombok=1.18.32 adventure=4.17.0 rpc_sdk=1.0 diff --git a/1.19.3/Common/build.gradle b/1.19.3/Common/build.gradle index b4de412..15a4dec 100644 --- a/1.19.3/Common/build.gradle +++ b/1.19.3/Common/build.gradle @@ -65,4 +65,4 @@ publishing { repositories { maven rootProject.orion.getPublishingMaven() } -} +} \ No newline at end of file diff --git a/1.19.3/gradle.properties b/1.19.3/gradle.properties index 14cfd51..3ffbfc8 100644 --- a/1.19.3/gradle.properties +++ b/1.19.3/gradle.properties @@ -21,7 +21,7 @@ fabric_api=0.87.2+1.19.4 forge_version=45.3.0 # Dependencies -moon_config=1.0.9 +moon_config=1.0.10 lombok=1.18.32 adventure=4.17.0 rpc_sdk=1.0 diff --git a/1.20.2/Common/build.gradle b/1.20.2/Common/build.gradle index b4de412..15a4dec 100644 --- a/1.20.2/Common/build.gradle +++ b/1.20.2/Common/build.gradle @@ -65,4 +65,4 @@ publishing { repositories { maven rootProject.orion.getPublishingMaven() } -} +} \ No newline at end of file diff --git a/1.20.2/gradle.properties b/1.20.2/gradle.properties index cd6b2f0..2696bd6 100644 --- a/1.20.2/gradle.properties +++ b/1.20.2/gradle.properties @@ -21,7 +21,7 @@ fabric_api=0.91.6+1.20.2 forge_version=48.1.0 # Dependencies -moon_config=1.0.9 +moon_config=1.0.10 lombok=1.18.32 adventure=4.17.0 rpc_sdk=1.0 diff --git a/1.20.4/Common/build.gradle b/1.20.4/Common/build.gradle index b4de412..15a4dec 100644 --- a/1.20.4/Common/build.gradle +++ b/1.20.4/Common/build.gradle @@ -65,4 +65,4 @@ publishing { repositories { maven rootProject.orion.getPublishingMaven() } -} +} \ No newline at end of file diff --git a/1.20.4/gradle.properties b/1.20.4/gradle.properties index d4b375b..0dbd6ab 100644 --- a/1.20.4/gradle.properties +++ b/1.20.4/gradle.properties @@ -24,7 +24,7 @@ forge_version=49.0.49 neoforge_version=234 # Dependencies -moon_config=1.0.9 +moon_config=1.0.10 lombok=1.18.32 adventure=4.17.0 rpc_sdk=1.0 diff --git a/1.20/Common/build.gradle b/1.20/Common/build.gradle index b4de412..15a4dec 100644 --- a/1.20/Common/build.gradle +++ b/1.20/Common/build.gradle @@ -65,4 +65,4 @@ publishing { repositories { maven rootProject.orion.getPublishingMaven() } -} +} \ No newline at end of file diff --git a/1.20/gradle.properties b/1.20/gradle.properties index c5cba17..efced36 100644 --- a/1.20/gradle.properties +++ b/1.20/gradle.properties @@ -21,7 +21,7 @@ fabric_api=0.83.0+1.20 forge_version=46.0.14 # Dependencies -moon_config=1.0.9 +moon_config=1.0.10 lombok=1.18.32 adventure=4.17.0 rpc_sdk=1.0 diff --git a/1.21/Common/build.gradle b/1.21/Common/build.gradle index b4de412..15a4dec 100644 --- a/1.21/Common/build.gradle +++ b/1.21/Common/build.gradle @@ -65,4 +65,4 @@ publishing { repositories { maven rootProject.orion.getPublishingMaven() } -} +} \ No newline at end of file diff --git a/1.21/gradle.properties b/1.21/gradle.properties index dec5e92..550a6d5 100644 --- a/1.21/gradle.properties +++ b/1.21/gradle.properties @@ -24,7 +24,7 @@ forge_version=50.0.6 neoforge_version=0-beta # Dependencies -moon_config=1.0.9 +moon_config=1.0.10 lombok=1.18.32 adventure=4.17.0 rpc_sdk=1.0 diff --git a/1.21/settings.gradle b/1.21/settings.gradle index 4f72fdc..07a31e6 100644 --- a/1.21/settings.gradle +++ b/1.21/settings.gradle @@ -14,4 +14,4 @@ pluginManagement { } rootProject.name = 'CraterLib' -include("Common", "Fabric", "NeoForge") +include("Common", "Fabric", "NeoForge") \ No newline at end of file diff --git a/commit.sha b/commit.sha index 153f89f..5b547a2 100644 --- a/commit.sha +++ b/commit.sha @@ -1 +1 @@ -d4a8de0fd2b5b8a6bc58d213d72f135bed411d94 \ No newline at end of file +4fab7e51a1f7a0e0ea4880d54a74214edfccd4c0 \ No newline at end of file diff --git a/patches/1.19.2/Common/build.gradle.patch b/patches/1.18.2/Common/build.gradle.patch similarity index 74% rename from patches/1.19.2/Common/build.gradle.patch rename to patches/1.18.2/Common/build.gradle.patch index dc0f827..b3b155f 100644 --- a/patches/1.19.2/Common/build.gradle.patch +++ b/patches/1.18.2/Common/build.gradle.patch @@ -4,8 +4,8 @@ archivesBaseName = "${mod_name.replace(" ", "")}-Common-${minecraft_version}" dependencies { -- -+ stupidRemapArch("dev.ftb.mods:ftb-essentials:${ftb_essentials}") +- stupidRemapArch("dev.ftb.mods:ftb-essentials:${ftb_essentials}") ++ } shadowJar { diff --git a/patches/1.18.2/Fabric/build.gradle.patch b/patches/1.18.2/Fabric/build.gradle.patch index c5f089d..d319250 100644 --- a/patches/1.18.2/Fabric/build.gradle.patch +++ b/patches/1.18.2/Fabric/build.gradle.patch @@ -1,6 +1,15 @@ --- a/Fabric/build.gradle +++ b/Fabric/build.gradle -@@ -113,8 +113,8 @@ +@@ -9,8 +9,6 @@ + exclude(group: "net.fabricmc.fabric-api") + } + +- stupidRemapArch("dev.ftb.mods:ftb-essentials:${ftb_essentials}") +- + modImplementation "maven.modrinth:fabrictailor:${fabrictailor}" + modImplementation "maven.modrinth:vanish:${vanish}" + +@@ -115,8 +113,8 @@ setVersionType("release") setChangelog("https://raw.githubusercontent.com/hypherionmc/changelogs/main/craterlib/changelog-fabric.md") setProjectVersion("${minecraft_version}-${project.version}") diff --git a/patches/1.18.2/Fabric/src/main/resources/fabric.mod.json.patch b/patches/1.18.2/Fabric/src/main/resources/fabric.mod.json.patch index 6b828aa..525c640 100644 --- a/patches/1.18.2/Fabric/src/main/resources/fabric.mod.json.patch +++ b/patches/1.18.2/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.18.2", + "java": ">=17" diff --git a/patches/1.18.2/NeoForge/build.gradle.patch b/patches/1.18.2/NeoForge/build.gradle.patch index cee3b9f..88a02d1 100644 --- a/patches/1.18.2/NeoForge/build.gradle.patch +++ b/patches/1.18.2/NeoForge/build.gradle.patch @@ -1,12 +1,14 @@ --- a/NeoForge/build.gradle +++ /dev/null -@@ -1,115 +1,0 @@ +@@ -1,122 +1,0 @@ -archivesBaseName = "${mod_name.replace(" ", "")}-NeoForge-${minecraft_version}" - -dependencies { - // Compat - modImplementation("maven.modrinth:vanishmod:${vanishmod_neo}") - +- stupidRemapArch("dev.ftb.mods:ftb-essentials-neoforge:${ftb_essentials}") +- - // Do not edit or remove - implementation project(":Common") -} @@ -35,7 +37,12 @@ - -unimined.minecraft { - neoForged { -- loader neoforge_version +- if (isPort) { +- loader "net.neoforged:neoforge:${neoforge_version}:universal" +- } else { +- loader neoforge_version +- } +- - mixinConfig("${mod_id}.mixins.json", "${mod_id}.neoforge.mixins.json") - } -} diff --git a/patches/1.18.2/build.gradle.patch b/patches/1.18.2/build.gradle.patch index 5be20b1..ad83f80 100644 --- a/patches/1.18.2/build.gradle.patch +++ b/patches/1.18.2/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,7 +34,13 @@ group = rootProject.group -@@ -61,7 +61,7 @@ + repositories { + mavenCentral() +- mavenLocal() + + maven { + name = "Modrinth" +@@ -68,11 +61,13 @@ shade "me.hypherionmc.moon-config:toml:${moon_config}" shade "me.hypherionmc.moon-config:json:${moon_config}" shade "com.hypherionmc:rpcsdk:${rpc_sdk}" @@ -20,7 +49,13 @@ shade "net.kyori:adventure-api:${adventure}" shade "net.kyori:adventure-text-serializer-gson:${adventure}" shade "net.kyori:adventure-text-minimessage:${adventure}" -@@ -112,7 +112,7 @@ + ++ stupidRemapArch("dev.ftb.mods:ftb-essentials:${ftb_essentials}") ++ + compileOnly 'net.luckperms:api:5.4' + compileOnly("org.projectlombok:lombok:${lombok}") + annotationProcessor("org.projectlombok:lombok:${lombok}") +@@ -117,7 +112,7 @@ tasks.withType(JavaCompile).configureEach { it.options.encoding = 'UTF-8' diff --git a/patches/1.18.2/gradle.properties.patch b/patches/1.18.2/gradle.properties.patch index f8d4ddb..68830ac 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=1.21.2-pre1 +-minecraft_version=1.21.2-rc1 +minecraft_version=1.18.2 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.76.0+1.18.2 @@ -18,11 +18,11 @@ -forge_version=50.0.6 - -# NeoForged --neoforge_version=0.0-beta +-neoforge_version=21.2.0-alpha.1.21.2-rc1.20241017.224038 +forge_version=40.2.0 # Dependencies - moon_config=1.0.9 + moon_config=1.0.10 @@ -31,17 +28,16 @@ discord_formatter=2.0.0 diff --git a/patches/1.18.2/settings.gradle.patch b/patches/1.18.2/settings.gradle.patch index d77ae4f..7ac621f 100644 --- a/patches/1.18.2/settings.gradle.patch +++ b/patches/1.18.2/settings.gradle.patch @@ -5,6 +5,6 @@ } -rootProject.name = 'CraterLib' --include("Common", "Fabric", /*"NeoForge"*/) +-include("Common", "Fabric", "NeoForge") +rootProject.name = 'CraterLib-1.18.2' +include("Common", "Fabric", "Forge") diff --git a/patches/1.19.2/Fabric/build.gradle.patch b/patches/1.19.2/Fabric/build.gradle.patch index 2692aa1..0736b2e 100644 --- a/patches/1.19.2/Fabric/build.gradle.patch +++ b/patches/1.19.2/Fabric/build.gradle.patch @@ -1,14 +1,14 @@ --- a/Fabric/build.gradle +++ b/Fabric/build.gradle -@@ -9,6 +9,7 @@ - exclude(group: "net.fabricmc.fabric-api") +@@ -10,7 +10,6 @@ } -+ stupidRemapArch("dev.ftb.mods:ftb-essentials:${ftb_essentials}") + stupidRemapArch("dev.ftb.mods:ftb-essentials:${ftb_essentials}") +- modImplementation "maven.modrinth:fabrictailor:${fabrictailor}" modImplementation "maven.modrinth:vanish:${vanish}" -@@ -113,8 +114,8 @@ +@@ -115,8 +114,8 @@ setVersionType("release") setChangelog("https://raw.githubusercontent.com/hypherionmc/changelogs/main/craterlib/changelog-fabric.md") setProjectVersion("${minecraft_version}-${project.version}") diff --git a/patches/1.19.2/Fabric/src/main/resources/fabric.mod.json.patch b/patches/1.19.2/Fabric/src/main/resources/fabric.mod.json.patch index eff1b81..dbb8bc8 100644 --- a/patches/1.19.2/Fabric/src/main/resources/fabric.mod.json.patch +++ b/patches/1.19.2/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.19.2", + "java": ">=17" diff --git a/patches/1.19.2/NeoForge/build.gradle.patch b/patches/1.19.2/NeoForge/build.gradle.patch index cee3b9f..88a02d1 100644 --- a/patches/1.19.2/NeoForge/build.gradle.patch +++ b/patches/1.19.2/NeoForge/build.gradle.patch @@ -1,12 +1,14 @@ --- a/NeoForge/build.gradle +++ /dev/null -@@ -1,115 +1,0 @@ +@@ -1,122 +1,0 @@ -archivesBaseName = "${mod_name.replace(" ", "")}-NeoForge-${minecraft_version}" - -dependencies { - // Compat - modImplementation("maven.modrinth:vanishmod:${vanishmod_neo}") - +- stupidRemapArch("dev.ftb.mods:ftb-essentials-neoforge:${ftb_essentials}") +- - // Do not edit or remove - implementation project(":Common") -} @@ -35,7 +37,12 @@ - -unimined.minecraft { - neoForged { -- loader neoforge_version +- if (isPort) { +- loader "net.neoforged:neoforge:${neoforge_version}:universal" +- } else { +- loader neoforge_version +- } +- - mixinConfig("${mod_id}.mixins.json", "${mod_id}.neoforge.mixins.json") - } -} diff --git a/patches/1.19.2/build.gradle.patch b/patches/1.19.2/build.gradle.patch index 5645279..5786da2 100644 --- a/patches/1.19.2/build.gradle.patch +++ b/patches/1.19.2/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,7 +34,13 @@ group = rootProject.group -@@ -61,13 +61,11 @@ + repositories { + mavenCentral() +- mavenLocal() + + maven { + name = "Modrinth" +@@ -68,7 +61,7 @@ shade "me.hypherionmc.moon-config:toml:${moon_config}" shade "me.hypherionmc.moon-config:json:${moon_config}" shade "com.hypherionmc:rpcsdk:${rpc_sdk}" @@ -20,13 +49,7 @@ shade "net.kyori:adventure-api:${adventure}" shade "net.kyori:adventure-text-serializer-gson:${adventure}" shade "net.kyori:adventure-text-minimessage:${adventure}" - -- 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 @@ +@@ -117,7 +110,7 @@ tasks.withType(JavaCompile).configureEach { it.options.encoding = 'UTF-8' diff --git a/patches/1.19.2/gradle.properties.patch b/patches/1.19.2/gradle.properties.patch index 9486029..88752d1 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=1.21.2-pre1 +-minecraft_version=1.21.2-rc1 +minecraft_version=1.19.2 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.76.0+1.19.2 @@ -18,11 +18,11 @@ -forge_version=50.0.6 - -# NeoForged --neoforge_version=0.0-beta +-neoforge_version=21.2.0-alpha.1.21.2-rc1.20241017.224038 +forge_version=43.4.0 # Dependencies - moon_config=1.0.9 + moon_config=1.0.10 @@ -31,17 +28,16 @@ discord_formatter=2.0.0 diff --git a/patches/1.19.2/settings.gradle.patch b/patches/1.19.2/settings.gradle.patch index e705df1..76a8416 100644 --- a/patches/1.19.2/settings.gradle.patch +++ b/patches/1.19.2/settings.gradle.patch @@ -5,6 +5,6 @@ } -rootProject.name = 'CraterLib' --include("Common", "Fabric", /*"NeoForge"*/) +-include("Common", "Fabric", "NeoForge") +rootProject.name = 'CraterLib-1.19.2' +include("Common", "Fabric", "Forge") diff --git a/patches/1.19.3/Common/build.gradle.patch b/patches/1.19.3/Common/build.gradle.patch deleted file mode 100644 index dc0f827..0000000 --- a/patches/1.19.3/Common/build.gradle.patch +++ /dev/null @@ -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 { diff --git a/patches/1.19.3/Fabric/build.gradle.patch b/patches/1.19.3/Fabric/build.gradle.patch index 514ec06..612fe6c 100644 --- a/patches/1.19.3/Fabric/build.gradle.patch +++ b/patches/1.19.3/Fabric/build.gradle.patch @@ -1,14 +1,14 @@ --- a/Fabric/build.gradle +++ b/Fabric/build.gradle -@@ -9,6 +9,7 @@ - exclude(group: "net.fabricmc.fabric-api") +@@ -10,7 +10,6 @@ } -+ stupidRemapArch("dev.ftb.mods:ftb-essentials:${ftb_essentials}") + stupidRemapArch("dev.ftb.mods:ftb-essentials:${ftb_essentials}") +- modImplementation "maven.modrinth:fabrictailor:${fabrictailor}" modImplementation "maven.modrinth:vanish:${vanish}" -@@ -113,8 +114,8 @@ +@@ -115,8 +114,8 @@ setVersionType("release") setChangelog("https://raw.githubusercontent.com/hypherionmc/changelogs/main/craterlib/changelog-fabric.md") setProjectVersion("${minecraft_version}-${project.version}") diff --git a/patches/1.19.3/Fabric/src/main/resources/fabric.mod.json.patch b/patches/1.19.3/Fabric/src/main/resources/fabric.mod.json.patch index b249bea..f15df44 100644 --- a/patches/1.19.3/Fabric/src/main/resources/fabric.mod.json.patch +++ b/patches/1.19.3/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.19.4", + "java": ">=17" diff --git a/patches/1.19.3/NeoForge/build.gradle.patch b/patches/1.19.3/NeoForge/build.gradle.patch index cee3b9f..88a02d1 100644 --- a/patches/1.19.3/NeoForge/build.gradle.patch +++ b/patches/1.19.3/NeoForge/build.gradle.patch @@ -1,12 +1,14 @@ --- a/NeoForge/build.gradle +++ /dev/null -@@ -1,115 +1,0 @@ +@@ -1,122 +1,0 @@ -archivesBaseName = "${mod_name.replace(" ", "")}-NeoForge-${minecraft_version}" - -dependencies { - // Compat - modImplementation("maven.modrinth:vanishmod:${vanishmod_neo}") - +- stupidRemapArch("dev.ftb.mods:ftb-essentials-neoforge:${ftb_essentials}") +- - // Do not edit or remove - implementation project(":Common") -} @@ -35,7 +37,12 @@ - -unimined.minecraft { - neoForged { -- loader neoforge_version +- if (isPort) { +- loader "net.neoforged:neoforge:${neoforge_version}:universal" +- } else { +- loader neoforge_version +- } +- - mixinConfig("${mod_id}.mixins.json", "${mod_id}.neoforge.mixins.json") - } -} diff --git a/patches/1.19.3/build.gradle.patch b/patches/1.19.3/build.gradle.patch index 5645279..5786da2 100644 --- a/patches/1.19.3/build.gradle.patch +++ b/patches/1.19.3/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,7 +34,13 @@ group = rootProject.group -@@ -61,13 +61,11 @@ + repositories { + mavenCentral() +- mavenLocal() + + maven { + name = "Modrinth" +@@ -68,7 +61,7 @@ shade "me.hypherionmc.moon-config:toml:${moon_config}" shade "me.hypherionmc.moon-config:json:${moon_config}" shade "com.hypherionmc:rpcsdk:${rpc_sdk}" @@ -20,13 +49,7 @@ shade "net.kyori:adventure-api:${adventure}" shade "net.kyori:adventure-text-serializer-gson:${adventure}" shade "net.kyori:adventure-text-minimessage:${adventure}" - -- 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 @@ +@@ -117,7 +110,7 @@ tasks.withType(JavaCompile).configureEach { it.options.encoding = 'UTF-8' diff --git a/patches/1.19.3/gradle.properties.patch b/patches/1.19.3/gradle.properties.patch index 5ea9cba..ce1acce 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=1.21.2-pre1 +-minecraft_version=1.21.2-rc1 +minecraft_version=1.19.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.87.2+1.19.4 @@ -18,11 +18,11 @@ -forge_version=50.0.6 - -# NeoForged --neoforge_version=0.0-beta +-neoforge_version=21.2.0-alpha.1.21.2-rc1.20241017.224038 +forge_version=45.3.0 # Dependencies - moon_config=1.0.9 + moon_config=1.0.10 @@ -31,17 +28,16 @@ discord_formatter=2.0.0 diff --git a/patches/1.19.3/settings.gradle.patch b/patches/1.19.3/settings.gradle.patch index e052803..0ddbb30 100644 --- a/patches/1.19.3/settings.gradle.patch +++ b/patches/1.19.3/settings.gradle.patch @@ -5,6 +5,6 @@ } -rootProject.name = 'CraterLib' --include("Common", "Fabric", /*"NeoForge"*/) +-include("Common", "Fabric", "NeoForge") +rootProject.name = 'CraterLib-1.19.3' +include("Common", "Fabric", "Forge") diff --git a/patches/1.20.2/Common/build.gradle.patch b/patches/1.20.2/Common/build.gradle.patch deleted file mode 100644 index dc0f827..0000000 --- a/patches/1.20.2/Common/build.gradle.patch +++ /dev/null @@ -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 { diff --git a/patches/1.20.2/Fabric/build.gradle.patch b/patches/1.20.2/Fabric/build.gradle.patch index fddf03e..4e6eadc 100644 --- a/patches/1.20.2/Fabric/build.gradle.patch +++ b/patches/1.20.2/Fabric/build.gradle.patch @@ -1,14 +1,14 @@ --- a/Fabric/build.gradle +++ b/Fabric/build.gradle -@@ -9,6 +9,7 @@ - exclude(group: "net.fabricmc.fabric-api") +@@ -10,7 +10,6 @@ } -+ stupidRemapArch("dev.ftb.mods:ftb-essentials:${ftb_essentials}") + stupidRemapArch("dev.ftb.mods:ftb-essentials:${ftb_essentials}") +- modImplementation "maven.modrinth:fabrictailor:${fabrictailor}" modImplementation "maven.modrinth:vanish:${vanish}" -@@ -113,8 +114,8 @@ +@@ -115,8 +114,8 @@ setVersionType("release") setChangelog("https://raw.githubusercontent.com/hypherionmc/changelogs/main/craterlib/changelog-fabric.md") setProjectVersion("${minecraft_version}-${project.version}") diff --git a/patches/1.20.2/Fabric/src/main/resources/fabric.mod.json.patch b/patches/1.20.2/Fabric/src/main/resources/fabric.mod.json.patch index 5d65ce0..6176310 100644 --- a/patches/1.20.2/Fabric/src/main/resources/fabric.mod.json.patch +++ b/patches/1.20.2/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.2", + "java": ">=17" diff --git a/patches/1.20.2/NeoForge/build.gradle.patch b/patches/1.20.2/NeoForge/build.gradle.patch index cee3b9f..88a02d1 100644 --- a/patches/1.20.2/NeoForge/build.gradle.patch +++ b/patches/1.20.2/NeoForge/build.gradle.patch @@ -1,12 +1,14 @@ --- a/NeoForge/build.gradle +++ /dev/null -@@ -1,115 +1,0 @@ +@@ -1,122 +1,0 @@ -archivesBaseName = "${mod_name.replace(" ", "")}-NeoForge-${minecraft_version}" - -dependencies { - // Compat - modImplementation("maven.modrinth:vanishmod:${vanishmod_neo}") - +- stupidRemapArch("dev.ftb.mods:ftb-essentials-neoforge:${ftb_essentials}") +- - // Do not edit or remove - implementation project(":Common") -} @@ -35,7 +37,12 @@ - -unimined.minecraft { - neoForged { -- loader neoforge_version +- if (isPort) { +- loader "net.neoforged:neoforge:${neoforge_version}:universal" +- } else { +- loader neoforge_version +- } +- - mixinConfig("${mod_id}.mixins.json", "${mod_id}.neoforge.mixins.json") - } -} diff --git a/patches/1.20.2/build.gradle.patch b/patches/1.20.2/build.gradle.patch index 5645279..5786da2 100644 --- a/patches/1.20.2/build.gradle.patch +++ b/patches/1.20.2/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,7 +34,13 @@ group = rootProject.group -@@ -61,13 +61,11 @@ + repositories { + mavenCentral() +- mavenLocal() + + maven { + name = "Modrinth" +@@ -68,7 +61,7 @@ shade "me.hypherionmc.moon-config:toml:${moon_config}" shade "me.hypherionmc.moon-config:json:${moon_config}" shade "com.hypherionmc:rpcsdk:${rpc_sdk}" @@ -20,13 +49,7 @@ shade "net.kyori:adventure-api:${adventure}" shade "net.kyori:adventure-text-serializer-gson:${adventure}" shade "net.kyori:adventure-text-minimessage:${adventure}" - -- 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 @@ +@@ -117,7 +110,7 @@ tasks.withType(JavaCompile).configureEach { it.options.encoding = 'UTF-8' diff --git a/patches/1.20.2/gradle.properties.patch b/patches/1.20.2/gradle.properties.patch index ab92bfa..4f8a8a0 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=1.21.2-pre1 +-minecraft_version=1.21.2-rc1 +minecraft_version=1.20.2 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.91.6+1.20.2 @@ -18,11 +18,11 @@ -forge_version=50.0.6 - -# NeoForged --neoforge_version=0.0-beta +-neoforge_version=21.2.0-alpha.1.21.2-rc1.20241017.224038 +forge_version=48.1.0 # Dependencies - moon_config=1.0.9 + moon_config=1.0.10 @@ -31,17 +28,16 @@ discord_formatter=2.0.0 diff --git a/patches/1.20.2/settings.gradle.patch b/patches/1.20.2/settings.gradle.patch index c1c0c77..c9134fa 100644 --- a/patches/1.20.2/settings.gradle.patch +++ b/patches/1.20.2/settings.gradle.patch @@ -5,6 +5,6 @@ } -rootProject.name = 'CraterLib' --include("Common", "Fabric", /*"NeoForge"*/) +-include("Common", "Fabric", "NeoForge") +rootProject.name = 'CraterLib-1.20.2' +include("Common", "Fabric", "Forge") diff --git a/patches/1.20.4/Common/build.gradle.patch b/patches/1.20.4/Common/build.gradle.patch deleted file mode 100644 index dc0f827..0000000 --- a/patches/1.20.4/Common/build.gradle.patch +++ /dev/null @@ -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 { diff --git a/patches/1.20.4/Fabric/build.gradle.patch b/patches/1.20.4/Fabric/build.gradle.patch index 3f60a9c..efe38db 100644 --- a/patches/1.20.4/Fabric/build.gradle.patch +++ b/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}") diff --git a/patches/1.20.4/Fabric/src/main/resources/fabric.mod.json.patch b/patches/1.20.4/Fabric/src/main/resources/fabric.mod.json.patch index 3bb0177..a301973 100644 --- a/patches/1.20.4/Fabric/src/main/resources/fabric.mod.json.patch +++ b/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" diff --git a/patches/1.20.4/NeoForge/build.gradle.patch b/patches/1.20.4/NeoForge/build.gradle.patch index 9a591d2..5f74182 100644 --- a/patches/1.20.4/NeoForge/build.gradle.patch +++ b/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}") diff --git a/patches/1.20.4/build.gradle.patch b/patches/1.20.4/build.gradle.patch index de280fe..c37aecc 100644 --- a/patches/1.20.4/build.gradle.patch +++ b/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' diff --git a/patches/1.20.4/gradle.properties.patch b/patches/1.20.4/gradle.properties.patch index 1ea3578..3b34a14 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.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 diff --git a/patches/1.20.4/settings.gradle.patch b/patches/1.20.4/settings.gradle.patch index a154c00..793539a 100644 --- a/patches/1.20.4/settings.gradle.patch +++ b/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") diff --git a/patches/1.20/Common/build.gradle.patch b/patches/1.20/Common/build.gradle.patch deleted file mode 100644 index dc0f827..0000000 --- a/patches/1.20/Common/build.gradle.patch +++ /dev/null @@ -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 { diff --git a/patches/1.20/Fabric/build.gradle.patch b/patches/1.20/Fabric/build.gradle.patch index 407265b..d20dfb5 100644 --- a/patches/1.20/Fabric/build.gradle.patch +++ b/patches/1.20/Fabric/build.gradle.patch @@ -1,14 +1,14 @@ --- a/Fabric/build.gradle +++ b/Fabric/build.gradle -@@ -9,6 +9,7 @@ - exclude(group: "net.fabricmc.fabric-api") +@@ -10,7 +10,6 @@ } -+ stupidRemapArch("dev.ftb.mods:ftb-essentials:${ftb_essentials}") + stupidRemapArch("dev.ftb.mods:ftb-essentials:${ftb_essentials}") +- modImplementation "maven.modrinth:fabrictailor:${fabrictailor}" modImplementation "maven.modrinth:vanish:${vanish}" -@@ -113,8 +114,8 @@ +@@ -115,8 +114,8 @@ setVersionType("release") setChangelog("https://raw.githubusercontent.com/hypherionmc/changelogs/main/craterlib/changelog-fabric.md") setProjectVersion("${minecraft_version}-${project.version}") diff --git a/patches/1.20/Fabric/src/main/resources/fabric.mod.json.patch b/patches/1.20/Fabric/src/main/resources/fabric.mod.json.patch index c504f78..8a3f62d 100644 --- a/patches/1.20/Fabric/src/main/resources/fabric.mod.json.patch +++ b/patches/1.20/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", + "java": ">=17" diff --git a/patches/1.20/NeoForge/build.gradle.patch b/patches/1.20/NeoForge/build.gradle.patch index cee3b9f..88a02d1 100644 --- a/patches/1.20/NeoForge/build.gradle.patch +++ b/patches/1.20/NeoForge/build.gradle.patch @@ -1,12 +1,14 @@ --- a/NeoForge/build.gradle +++ /dev/null -@@ -1,115 +1,0 @@ +@@ -1,122 +1,0 @@ -archivesBaseName = "${mod_name.replace(" ", "")}-NeoForge-${minecraft_version}" - -dependencies { - // Compat - modImplementation("maven.modrinth:vanishmod:${vanishmod_neo}") - +- stupidRemapArch("dev.ftb.mods:ftb-essentials-neoforge:${ftb_essentials}") +- - // Do not edit or remove - implementation project(":Common") -} @@ -35,7 +37,12 @@ - -unimined.minecraft { - neoForged { -- loader neoforge_version +- if (isPort) { +- loader "net.neoforged:neoforge:${neoforge_version}:universal" +- } else { +- loader neoforge_version +- } +- - mixinConfig("${mod_id}.mixins.json", "${mod_id}.neoforge.mixins.json") - } -} diff --git a/patches/1.20/build.gradle.patch b/patches/1.20/build.gradle.patch index 1b4ad61..18fb830 100644 --- a/patches/1.20/build.gradle.patch +++ b/patches/1.20/build.gradle.patch @@ -1,14 +1,29 @@ --- a/build.gradle +++ b/build.gradle -@@ -11,7 +11,6 @@ +@@ -7,21 +7,14 @@ + 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 { -@@ -29,8 +28,8 @@ ++ var relType = project.properties["releaseType"] ?: "${release_type}" + identifier("${relType}") + } + } +@@ -35,14 +28,13 @@ apply plugin: 'com.github.johnrengelman.shadow' apply plugin: 'com.hypherionmc.modutils.modpublisher' @@ -19,7 +34,13 @@ group = rootProject.group -@@ -61,13 +60,11 @@ + repositories { + mavenCentral() +- mavenLocal() + + maven { + name = "Modrinth" +@@ -68,7 +60,7 @@ shade "me.hypherionmc.moon-config:toml:${moon_config}" shade "me.hypherionmc.moon-config:json:${moon_config}" shade "com.hypherionmc:rpcsdk:${rpc_sdk}" @@ -28,13 +49,7 @@ shade "net.kyori:adventure-api:${adventure}" shade "net.kyori:adventure-text-serializer-gson:${adventure}" shade "net.kyori:adventure-text-minimessage:${adventure}" - -- 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 +109,7 @@ +@@ -117,7 +109,7 @@ tasks.withType(JavaCompile).configureEach { it.options.encoding = 'UTF-8' diff --git a/patches/1.20/gradle.properties.patch b/patches/1.20/gradle.properties.patch index 86867ee..62908db 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=1.21.2-pre1 +-minecraft_version=1.21.2-rc1 +minecraft_version=1.20 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.83.0+1.20 @@ -18,11 +18,11 @@ -forge_version=50.0.6 - -# NeoForged --neoforge_version=0.0-beta +-neoforge_version=21.2.0-alpha.1.21.2-rc1.20241017.224038 +forge_version=46.0.14 # Dependencies - moon_config=1.0.9 + moon_config=1.0.10 @@ -31,17 +28,16 @@ discord_formatter=2.0.0 diff --git a/patches/1.20/settings.gradle.patch b/patches/1.20/settings.gradle.patch index d5c13e0..c57b5d0 100644 --- a/patches/1.20/settings.gradle.patch +++ b/patches/1.20/settings.gradle.patch @@ -5,6 +5,6 @@ } -rootProject.name = 'CraterLib' --include("Common", "Fabric", /*"NeoForge"*/) +-include("Common", "Fabric", "NeoForge") +rootProject.name = 'CraterLib-1.20' +include("Common", "Fabric", "Forge") diff --git a/patches/1.21/Common/build.gradle.patch b/patches/1.21/Common/build.gradle.patch deleted file mode 100644 index dc0f827..0000000 --- a/patches/1.21/Common/build.gradle.patch +++ /dev/null @@ -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 { diff --git a/patches/1.21/Fabric/build.gradle.patch b/patches/1.21/Fabric/build.gradle.patch index c49616f..4aa78e3 100644 --- a/patches/1.21/Fabric/build.gradle.patch +++ b/patches/1.21/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}") diff --git a/patches/1.21/Fabric/src/main/resources/fabric.mod.json.patch b/patches/1.21/Fabric/src/main/resources/fabric.mod.json.patch index f2b278e..a71f2a5 100644 --- a/patches/1.21/Fabric/src/main/resources/fabric.mod.json.patch +++ b/patches/1.21/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": "*", + "minecraft": ">=1.21", "java": ">=21" } diff --git a/patches/1.21/NeoForge/build.gradle.patch b/patches/1.21/NeoForge/build.gradle.patch index 2474f29..0f6a044 100644 --- a/patches/1.21/NeoForge/build.gradle.patch +++ b/patches/1.21/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") + } } -@@ -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}") diff --git a/patches/1.21/build.gradle.patch b/patches/1.21/build.gradle.patch index 63315a0..8560532 100644 --- a/patches/1.21/build.gradle.patch +++ b/patches/1.21/build.gradle.patch @@ -1,11 +1,33 @@ --- a/build.gradle +++ b/build.gradle -@@ -66,8 +66,6 @@ - shade "net.kyori:adventure-text-serializer-gson:${adventure}" - shade "net.kyori:adventure-text-minimessage:${adventure}" +@@ -7,21 +7,15 @@ + id 'maven-publish' + } -- stupidRemapArch("dev.ftb.mods:ftb-essentials:${ftb_essentials}") +-var relType = project.properties["releaseType"] ?: "${release_type}" - - compileOnly 'net.luckperms:api:5.4' - compileOnly("org.projectlombok:lombok:${lombok}") - annotationProcessor("org.projectlombok:lombok:${lombok}") +-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}") + } + } +@@ -42,7 +36,6 @@ + + repositories { + mavenCentral() +- mavenLocal() + + maven { + name = "Modrinth" diff --git a/patches/1.21/gradle.properties.patch b/patches/1.21/gradle.properties.patch index 7966350..0189d4a 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=1.21.2-pre1 +-minecraft_version=1.21.2-rc1 +minecraft_version=1.21 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.100.1+1.21 @@ -18,11 +18,11 @@ forge_version=50.0.6 # NeoForged --neoforge_version=0.0-beta +-neoforge_version=21.2.0-alpha.1.21.2-rc1.20241017.224038 +neoforge_version=0-beta # Dependencies - moon_config=1.0.9 + moon_config=1.0.10 @@ -41,7 +41,7 @@ # Publishing curse_id=867099 diff --git a/patches/1.21/settings.gradle.patch b/patches/1.21/settings.gradle.patch deleted file mode 100644 index a3ad260..0000000 --- a/patches/1.21/settings.gradle.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- a/settings.gradle -+++ b/settings.gradle -@@ -14,4 +14,4 @@ - } - - rootProject.name = 'CraterLib' --include("Common", "Fabric", /*"NeoForge"*/) -+include("Common", "Fabric", "NeoForge")