Skip to content

Commit f2b991b

Browse files
committed
Forgot to wire up the mod configs.
1 parent dac8bd5 commit f2b991b

File tree

5 files changed

+31
-18
lines changed

5 files changed

+31
-18
lines changed

fabric/build.gradle.kts

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ dependencies {
5757

5858
// modImplementation(group = "earth.terrarium.common_storage_lib", name = "common-storage-lib-fabric-1.21.1", version = "0.0.7")
5959

60-
modRuntimeOnly("mcp.mobius.waila:wthit:fabric-${project.properties["WTHIT"]}")
60+
modRuntimeOnly("mcp.mobius.waila:wthit:fabric-${project.properties["WTHIT"]}+")
6161
modRuntimeOnly("lol.bai:badpackets:fabric-${project.properties["badPackets"]}")
6262

6363
modCompileOnly("me.shedaniel:RoughlyEnoughItems-api-fabric:${project.properties["rei"]}")
@@ -81,7 +81,14 @@ tasks {
8181
inputs.property("version", project.version)
8282

8383
filesMatching("fabric.mod.json") {
84-
expand(mapOf("version" to project.version))
84+
expand(mapOf(
85+
"version" to project.version,
86+
"fabricloader" to project.properties["fabric_loader_version"],
87+
"minecraft" to project.properties["minecraft_version"],
88+
"cobblemon" to project.properties["cobblemon_version"],
89+
"wthit" to project.properties["WTHIT"],
90+
"description" to project.properties["description"]
91+
))
8592
}
8693

8794
from(rootProject.file("common/src/main/resources")) {

fabric/src/main/resources/fabric.mod.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"id": "generations_core",
44
"version": "${version}",
55
"name": "Generations-Core",
6-
"description": "",
6+
"description": "${description}",
77
"authors": ["Joseph T. McQuigg (JT122406)", "Waterpicker"],
88
"contributors": ["Greg_lor, Hydos, Dysthymic"],
99
"icon": "generations.png",
@@ -40,12 +40,12 @@
4040
"GenerationsCore-common.mixins.json"
4141
],
4242
"depends": {
43-
"fabricloader": ">=0.15.3",
44-
"minecraft": ">=1.21.1",
45-
"cobblemon": "=1.6.1+1.21.1"
43+
"fabricloader": ">=${fabricloader}",
44+
"minecraft": ">=${minecraft}",
45+
"cobblemon": "=${cobblemon}"
4646
},
4747
"suggests": {
48-
"wthit": ">=8.15.0"
48+
"wthit": ">=${wthit}"
4949
},
5050
"custom": {
5151
"catalogue": {

gradle.properties

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ archives_base_name=Generations-Core
66
mod_version=1.1.0-SNAPSHOT
77
maven_group=generations.gg.generations.core
88

9+
description=Core mod for Generations. Required for all other Generations mods. Contains Blocks, Items, Entities, and other things that are used by all other Generations mods.
10+
911
architectury_version=13.0.8
1012
botarium_version=2.3.4
1113
devauth_version=1.2.1
@@ -23,7 +25,7 @@ badPackets=8.2
2325

2426
parchment=2024.11.17
2527

26-
WTHIT=12.5.1+
28+
WTHIT=12.5.1
2729
rareCandy=2.13.2
2830

2931
recipe_viewer=rei

neoforge/build.gradle.kts

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ configurations {
7474
) { isTransitive = false })!!
7575

7676
modCompileOnly("mcp.mobius.waila:wthit-api:neo-${project.properties["WTHIT"]}")
77-
modRuntimeOnly("mcp.mobius.waila:wthit:neo-${project.properties["WTHIT"]}")
77+
modRuntimeOnly("mcp.mobius.waila:wthit:neo-${project.properties["WTHIT"]}+")
7878
modRuntimeOnly("lol.bai:badpackets:neo-${project.properties["badPackets"]}")
7979

8080
// modLocalRuntime("curse.maven:spit-it-out-857141:4888754")
@@ -105,7 +105,14 @@ tasks {
105105
inputs.property("version", project.version)
106106

107107
filesMatching("META-INF/neoforge.mods.toml") {
108-
expand(mapOf("version" to project.version))
108+
expand(mutableMapOf(
109+
"version" to project.version,
110+
"neoforge" to project.properties["neoforge_version"],
111+
"minecraft" to project.properties["minecraft_version"],
112+
"cobblemon" to project.properties["cobblemon_version"],
113+
"wthit" to project.properties["WTHIT"],
114+
"description" to project.properties["description"]
115+
))
109116
}
110117
}
111118

neoforge/src/main/resources/META-INF/neoforge.mods.toml

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,7 @@ authors="Joseph T. McQuigg (JT122406), Waterpicker, Stampede"
1111
credits="Generations Development Team"
1212
logoFile="generations.png"
1313
catalogueImageIcon="generations.png"
14-
description='''
15-
Core mod for Generations. Required for all other Generations mods.
16-
Contains Blocks, Items, Entities, and other things that are used by all other Generations mods.
17-
'''
14+
description="${description}"
1815

1916
[[accessTransformers]]
2017
file="META-INF/accesstransformer.cfg"
@@ -25,26 +22,26 @@ config="GenerationsCore-common.mixins.json"
2522
[[dependencies.generations_core]]
2623
modId="neoforge"
2724
mandatory=true
28-
versionRange="[21.1.84,)"
25+
versionRange="[${neoforge},)"
2926
ordering="NONE"
3027
side="BOTH"
3128

3229
[[dependencies.generations_core]]
3330
modId="minecraft"
3431
mandatory=true
35-
versionRange="[1.20.1,)"
32+
versionRange="[${minecraft},)"
3633
ordering="NONE"
3734
side="BOTH"
3835

3936
[[dependencies.generations_core]]
4037
modId="cobblemon"
4138
mandatory=true
42-
versionRange="[1.6.1+1.21.1]"
39+
versionRange="[${cobblemon}]"
4340
ordering="AFTER"
4441
side="BOTH"
4542

4643
[[dependencies.generations_core]]
4744
modId="wthit"
4845
mandatory=false
49-
versionRange="[8.15.0,)"
46+
versionRange="[${wthit},)"
5047
ordering="NONE"

0 commit comments

Comments
 (0)