[PORT] Update to 1.21.2-rc1

This commit is contained in:
2024-10-18 12:30:15 +02:00
parent 1ccb4c1f56
commit 4fab7e51a1
7 changed files with 25 additions and 11 deletions

View File

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

View File

@@ -9,6 +9,8 @@ dependencies {
exclude(group: "net.fabricmc.fabric-api") exclude(group: "net.fabricmc.fabric-api")
} }
stupidRemapArch("dev.ftb.mods:ftb-essentials:${ftb_essentials}")
modImplementation "maven.modrinth:fabrictailor:${fabrictailor}" modImplementation "maven.modrinth:fabrictailor:${fabrictailor}"
modImplementation "maven.modrinth:vanish:${vanish}" modImplementation "maven.modrinth:vanish:${vanish}"

View File

@@ -33,7 +33,7 @@
"depends": { "depends": {
"fabricloader": ">=0.16.2", "fabricloader": ">=0.16.2",
"fabric-api": "*", "fabric-api": "*",
"minecraft": ">=1.21.2", "minecraft": "*",
"java": ">=21" "java": ">=21"
} }
} }

View File

@@ -4,6 +4,8 @@ dependencies {
// Compat // Compat
modImplementation("maven.modrinth:vanishmod:${vanishmod_neo}") modImplementation("maven.modrinth:vanishmod:${vanishmod_neo}")
stupidRemapArch("dev.ftb.mods:ftb-essentials-neoforge:${ftb_essentials}")
// Do not edit or remove // Do not edit or remove
implementation project(":Common") implementation project(":Common")
} }
@@ -32,7 +34,12 @@ shadowJar {
unimined.minecraft { unimined.minecraft {
neoForged { 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") mixinConfig("${mod_id}.mixins.json", "${mod_id}.neoforge.mixins.json")
} }
} }

View File

@@ -7,15 +7,21 @@ plugins {
id 'maven-publish' id 'maven-publish'
} }
var relType = project.properties["releaseType"] ?: "${release_type}"
ext {
isPort = (relType == 'port')
}
orion.setup { orion.setup {
multiProject = true multiProject = true
enableMirrorMaven = true enableMirrorMaven = true
enableReleasesMaven = true enableReleasesMaven = true
enableSnapshotsMaven = isPort
dopplerToken = System.getenv("DOPPLER_KEY") dopplerToken = System.getenv("DOPPLER_KEY")
versioning { versioning {
var relType = project.properties["releaseType"] ?: "${release_type}"
identifier("${relType}") identifier("${relType}")
} }
} }
@@ -36,6 +42,7 @@ subprojects {
repositories { repositories {
mavenCentral() mavenCentral()
mavenLocal()
maven { maven {
name = "Modrinth" name = "Modrinth"
@@ -66,8 +73,6 @@ subprojects {
shade "net.kyori:adventure-text-serializer-gson:${adventure}" shade "net.kyori:adventure-text-serializer-gson:${adventure}"
shade "net.kyori:adventure-text-minimessage:${adventure}" shade "net.kyori:adventure-text-minimessage:${adventure}"
stupidRemapArch("dev.ftb.mods:ftb-essentials:${ftb_essentials}")
compileOnly 'net.luckperms:api:5.4' compileOnly 'net.luckperms:api:5.4'
compileOnly("org.projectlombok:lombok:${lombok}") compileOnly("org.projectlombok:lombok:${lombok}")
annotationProcessor("org.projectlombok:lombok:${lombok}") annotationProcessor("org.projectlombok:lombok:${lombok}")

View File

@@ -10,21 +10,21 @@ mod_id=craterlib
mod_name=CraterLib mod_name=CraterLib
# Shared # Shared
minecraft_version=1.21.2-pre3 minecraft_version=1.21.2-rc1
project_group=com.hypherionmc.craterlib project_group=com.hypherionmc.craterlib
# Fabric # Fabric
fabric_loader=0.16.5 fabric_loader=0.16.5
fabric_api=0.105.4+1.21.2 fabric_api=0.106.0+1.21.2
# Forge # Forge
forge_version=50.0.6 forge_version=50.0.6
# NeoForged # NeoForged
neoforge_version=0.0-beta neoforge_version=21.2.0-alpha.1.21.2-rc1.20241017.224038
# Dependencies # Dependencies
moon_config=1.0.9 moon_config=1.0.10
lombok=1.18.32 lombok=1.18.32
adventure=4.17.0 adventure=4.17.0
rpc_sdk=1.0 rpc_sdk=1.0

View File

@@ -14,4 +14,4 @@ pluginManagement {
} }
rootProject.name = 'CraterLib' rootProject.name = 'CraterLib'
include("Common", "Fabric", /*"NeoForge"*/) include("Common", "Fabric", "NeoForge")