Skip to content

Commit dca0c58

Browse files
committed
fix: mixins didn't work on (neo)forge
1 parent c0946b2 commit dca0c58

File tree

4 files changed

+24
-8
lines changed

4 files changed

+24
-8
lines changed

forge/build.gradle.kts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,11 @@ repositories {
2222

2323
dependencies {
2424
"forge"("net.minecraftforge:forge:$minecraft-${common.mod.dep("forge_loader")}")
25+
26+
"io.github.llamalad7:mixinextras-forge:${mod.dep("mixin_extras")}".let {
27+
add("include", it)
28+
add("implementation", it)
29+
}
2530
}
2631

2732
fun convertMinecraftTargets(): String {

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ mod.modrinthSlug=datapack-utils
99
mod.curseforgeId=1138955
1010
mod.curseforgeSlug=datapack-utils
1111

12-
mod.version=0.1.6
12+
mod.version=0.1.7
1313
mod.group=org.rhm
1414
mod.id=datapack_utils
1515
mod.name=Datapack Utils

neoforge/build.gradle.kts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,11 @@ repositories {
2222

2323
dependencies {
2424
"neoForge"("net.neoforged:neoforge:${common.mod.dep("neoforge_loader")}")
25+
26+
"io.github.llamalad7:mixinextras-neoforge:${mod.dep("mixin_extras")}".let {
27+
add("include", it)
28+
add("implementation", it)
29+
}
2530
}
2631

2732
fun convertMinecraftTargets(): String {

stonecutter.gradle.kts

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ plugins {
4444
id("dev.kikugie.fletching-table.lexforge") version "0.1.0-alpha.22" apply false
4545
id("dev.kikugie.fletching-table.neoforge") version "0.1.0-alpha.22" apply false
4646
}
47-
stonecutter active "1.21.3" /* [SC] DO NOT EDIT */
47+
stonecutter active "1.20.6" /* [SC] DO NOT EDIT */
4848

4949
val changelogProvider = layout.buildDirectory.file("CHANGELOG.md")
5050
changelogProvider.get().asFile.apply {
@@ -98,6 +98,15 @@ for (node in stonecutter.tree.nodes) {
9898
isCanBeConsumed = false
9999
isCanBeResolved = true
100100
}
101+
val fancyName = when (node.branch.id) {
102+
"fabric" -> "Fabric"
103+
"forge" -> "Forge"
104+
"neoforge" -> "NeoForge"
105+
"" -> "Common"
106+
else -> {
107+
TODO("Invalid branch: ${node.branch.id}")
108+
}
109+
}
101110

102111
node.project.dependencies {
103112
add("minecraft", "com.mojang:minecraft:$minecraft")
@@ -110,7 +119,7 @@ for (node in stonecutter.tree.nodes) {
110119
node.project.configurations {
111120
named("compileClasspath") { extendsFrom(commonBundle) }
112121
named("runtimeClasspath") { extendsFrom(commonBundle) }
113-
maybeCreate("developmentFabric").extendsFrom(commonBundle)
122+
maybeCreate("development$fancyName").extendsFrom(commonBundle)
114123
}
115124

116125
node.project.dependencies {
@@ -121,7 +130,7 @@ for (node in stonecutter.tree.nodes) {
121130

122131
if (loader != "common") {
123132
commonBundle(project(common.path, "namedElements")) { isTransitive = false }
124-
shadowBundle(project(common.path, "transformProductionFabric")) { isTransitive = false }
133+
shadowBundle(project(common.path, "transformProduction$fancyName")) { isTransitive = false }
125134
}
126135
}
127136

@@ -141,10 +150,6 @@ for (node in stonecutter.tree.nodes) {
141150
archiveClassifier = "dev"
142151
}
143152

144-
node.project.tasks.named("validateAccessWidener") {
145-
enabled = false
146-
}
147-
148153
if (loader != "common") {
149154
node.project.tasks.withType<RemapJarTask> {
150155
destinationDirectory = rootProject.layout.buildDirectory.dir("libs/${mod.version}/$loader")
@@ -319,6 +324,7 @@ publishMods {
319324
displayName = mod.version
320325

321326
github {
327+
changelog = rootProject.publishMods.changelog
322328
accessToken = providers.environmentVariable("GITHUB_TOKEN")
323329
repository = mod.prop("github")
324330
commitish = "main"

0 commit comments

Comments
 (0)