Skip to content

Commit ed280cf

Browse files
committed
Fix Forge setup
1 parent 23fe3de commit ed280cf

3 files changed

Lines changed: 7 additions & 3 deletions

File tree

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ org.jetbrains.dokka.experimental.gradle.pluginMode.noWarn=true
88

99
maven_group=dev.firstdark.unimined
1010
archives_base_name=unimined
11-
version=1.0.6+1.4.2
11+
version=1.0.7+1.4.2

src/minecraft/kotlin/xyz/wagyourtail/unimined/internal/minecraft/patch/forge/MinecraftForgeMinecraftTransformer.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ open class MinecraftForgeMinecraftTransformer(project: Project, provider: Minecr
2424
override var useUnionRelaunch: Boolean by FinalizeOnRead(provider.minecraftData.mcVersionCompare(provider.version, "1.20.3") >= 0)
2525

2626
init {
27-
atDependency = project.dependencies.create("net.minecraftforge:accesstransformers:8.2.2")
27+
atDependency = project.dependencies.create("net.minecraftforge:accesstransformers:8.2.14")
2828
atMainClass = "net.minecraftforge.accesstransformer.TransformerProcessor"
2929
}
3030

src/minecraft/kotlin/xyz/wagyourtail/unimined/internal/minecraft/patch/forge/fg3/FG3MinecraftTransformer.kt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,10 @@ open class FG3MinecraftTransformer(project: Project, val parent: ForgeLikeMinecr
4949
providerName.equals("NeoForged-FG3", true) && !provider.obfuscated
5050
}
5151

52+
val isModernForge by lazy {
53+
providerName.equals("MinecraftForge-FG3", true) && !provider.obfuscated
54+
}
55+
5256
val cacheDir by lazy {
5357
val forgeUniversal = parent.forge.dependencies.last()
5458
provider.minecraftData.mcVersionFolder.resolve(providerName).resolve(forgeUniversal.version!!)
@@ -410,7 +414,7 @@ open class FG3MinecraftTransformer(project: Project, val parent: ForgeLikeMinecr
410414
if (output.path.exists() && !project.unimined.forceReload) {
411415
return output
412416
}
413-
if (userdevCfg["notchObf"]?.asBoolean == true) {
417+
if (userdevCfg["notchObf"]?.asBoolean == true || isModernForge) {
414418
executeMcp("merge", output.path)
415419
} else if (isModernNeo) {
416420
executeMcp("preProcessJar", output.path)

0 commit comments

Comments
 (0)