flewkey/flan
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update gradle and version handling

Browse Source
This commit is contained in:
Flemmli97 2023-05-21 23:59:43 +02:00
parent f5e2e84de1
commit d4502be70b
5 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fabric/build.gradle
View File

@ -92,7 +92,7 @@ processResources {
inputs.property "version", project.version inputs.property "version", project.version
filesMatching("fabric.mod.json") { filesMatching("fabric.mod.json") {
expand "version": project.version expand "version": project.version, "homepage": curse_page_fabric, "mcversion": minecraft_version, "fabric_version": fabric_version
} }
} }

6
fabric/src/main/resources/fabric.mod.json
View File

@ -8,7 +8,7 @@
"Flemmli97" "Flemmli97"
], ],
"contact": { "contact": {
"homepage": "https://www.curseforge.com/minecraft/mc-mods/flan", "homepage": "${homepage}",
"issues": "https://github.com/Flemmli97/Flan/issues", "issues": "https://github.com/Flemmli97/Flan/issues",
"sources": "https://github.com/Flemmli97/Flan" "sources": "https://github.com/Flemmli97/Flan"
}, },
@ -25,7 +25,7 @@
"flan.fabric.mixins.json" "flan.fabric.mixins.json"
], ],
"depends": { "depends": {
"fabric": ">=0.57.0", "fabric": ">=${fabric_version}",
"minecraft": ">=1.19.4" "minecraft": ">=${mcversion}"
} }
} }

5
forge/build.gradle
View File

@ -38,7 +38,7 @@ repositories {
} }
dependencies { dependencies {
forge "net.minecraftforge:forge:${rootProject.forge_version}" forge "net.minecraftforge:forge:${minecraft_version}-${forge_version}"
common(project(path: ":common", configuration: "namedElements")) { transitive false } common(project(path: ":common", configuration: "namedElements")) { transitive false }
shadowCommon(project(path: ":common", configuration: "transformProductionForge")) { transitive = false } shadowCommon(project(path: ":common", configuration: "transformProductionForge")) { transitive = false }
@ -54,8 +54,9 @@ dependencies {
processResources { processResources {
inputs.property "version", project.version inputs.property "version", project.version
def loader_version = (forge_version =~ /([0-9]+)\.([0-9]+)\.([0-9]+)/)[0][1]
filesMatching("META-INF/mods.toml") { filesMatching("META-INF/mods.toml") {
expand "version": project.version expand "version": project.version, "loader_version": loader_version, "homepage": curse_page_forge, "mcversion": minecraft_version, "forge_version": forge_version
} }
} }

8
forge/src/main/resources/META-INF/mods.toml
View File

@ -1,24 +1,24 @@
modLoader="javafml" modLoader="javafml"
loaderVersion="[45,)" loaderVersion="[${loader_version},)"
license="All rights reserved" license="All rights reserved"
issueTrackerURL="https://github.com/Flemmli97/Flan/issues" issueTrackerURL="https://github.com/Flemmli97/Flan/issues"
[[mods]] [[mods]]
modId="flan" modId="flan"
version="${version}" version="${version}"
displayName="Flan" displayName="Flan"
displayURL="https://www.curseforge.com/minecraft/mc-mods/flan-forge" displayURL="${homepage}"
logoFile="icon.png" logoFile="icon.png"
authors="Flemmli97" authors="Flemmli97"
description='''Flan (Forge version): A serverside claiming mod''' description='''Flan (Forge version): A serverside claiming mod'''
[[dependencies.flan]] [[dependencies.flan]]
modId="minecraft" modId="minecraft"
mandatory=true mandatory=true
versionRange="[1.19.4,)" versionRange="[${mcversion},)"
ordering="NONE" ordering="NONE"
side="BOTH" side="BOTH"
[[dependencies.flan]] [[dependencies.flan]]
modId="forge" modId="forge"
mandatory=true mandatory=true
versionRange="[45.0.22,)" versionRange="[${forge_version},)"
ordering="NONE" ordering="NONE"
side="BOTH" side="BOTH"

2
gradle.properties
View File

@ -4,7 +4,7 @@ minecraft_version=1.19.4
parchment_version=1.19.3:2023.03.12 parchment_version=1.19.3:2023.03.12
# Forge Properties # Forge Properties
forge_version=1.19.4-45.0.59 forge_version=45.0.59
# Fabric Properties # Fabric Properties
loader_version=0.14.17 loader_version=0.14.17