imports/architectury-plugin
1
0
Fork 0
mirror of https://github.com/architectury/architectury-plugin.git synced 2026-03-28 04:07:01 -05:00
Code Issues Packages Projects Releases Wiki Activity

Forge 50+ (#48)

Browse Source 
* Detect 1.20.5 Minecraft and disable fix mixins for Forge 50+

* Bump to 5.2.87
This commit is contained in:
shedaniel
2024-08-12 23:19:50 +08:00
committed by GitHub
parent 2f42cfe308
commit ab888121d3
6 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@@ -5,5 +5,5 @@ loom_version_010Legacy=0.10.0.171
loom_version_010=0.10.0.188 loom_version_010=0.10.0.188
loom_version_011=0.11.0.217 loom_version_011=0.11.0.217
loom_version_11=1.1.313 loom_version_11=1.1.313
transformer_version=5.2.83 transformer_version=5.2.87
base_version=3.4 base_version=3.4

5
src/loom11/kotlin/dev/architectury/plugin/loom/LoomInterface11.kt
View File

@@ -53,6 +53,11 @@ class LoomInterface11(private val project: Project) : LoomInterface {
override val legacyMixinApEnabled: Boolean override val legacyMixinApEnabled: Boolean
get() = extension.mixin.useLegacyMixinAp.get() get() = extension.mixin.useLegacyMixinAp.get()
override val addRefmapForForge: Boolean
// Awful hack to check if the version >= 1.20.5, we don't get any info of forge version in common
get() = !extension.minecraftProvider.versionInfo.isVersionOrNewer("2024-04-23T00:00:00+00:00")
override val generateTransformerPropertiesInTask = true override val generateTransformerPropertiesInTask = true
override fun settingsPostEdit(action: (config: LoomInterface.LoomRunConfig) -> Unit) { override fun settingsPostEdit(action: (config: LoomInterface.LoomRunConfig) -> Unit) {

6
src/main/kotlin/dev/architectury/plugin/ArchitecturyPluginExtension.kt
View File

@@ -31,7 +31,7 @@ import java.util.jar.JarOutputStream
import java.util.jar.Manifest import java.util.jar.Manifest
open class ArchitectPluginExtension(val project: Project) { open class ArchitectPluginExtension(val project: Project) {
var transformerVersion = "5.2.83" var transformerVersion = "5.2.87"
var injectablesVersion = "1.0.10" var injectablesVersion = "1.0.10"
var minecraft = "" var minecraft = ""
private var compileOnly = false private var compileOnly = false
@@ -109,7 +109,9 @@ open class ArchitectPluginExtension(val project: Project) {
) )
if (platform != "neoforge") { if (platform != "neoforge") {
if (loom.legacyMixinApEnabled) { if (platform == "forge" && !loom.addRefmapForForge) {
map[BuiltinProperties.FORGE_FIX_MIXINS] = "false"
} else if (loom.legacyMixinApEnabled) {
map[BuiltinProperties.REFMAP_NAME] = loom.refmapName map[BuiltinProperties.REFMAP_NAME] = loom.refmapName
} }

2
src/main/kotlin/dev/architectury/plugin/ModLoader.kt
View File

@@ -88,7 +88,7 @@ open class ModLoader(
add(RemapInjectables()) { file -> add(RemapInjectables()) { file ->
this[BuiltinProperties.UNIQUE_IDENTIFIER] = projectGeneratedPackage(project, file) this[BuiltinProperties.UNIQUE_IDENTIFIER] = projectGeneratedPackage(project, file)
} }
this += AddRefmapName() this += AddRefmapName { loom.addRefmapForForge }
this += TransformPlatformOnly() this += TransformPlatformOnly()
this += TransformForgeAnnotations() this += TransformForgeAnnotations()

1
src/main/kotlin/dev/architectury/plugin/loom/LoomInterface.kt
View File

@@ -49,6 +49,7 @@ interface LoomInterface {
val refmapName: String val refmapName: String
var generateSrgTiny: Boolean var generateSrgTiny: Boolean
val legacyMixinApEnabled: Boolean get() = false val legacyMixinApEnabled: Boolean get() = false
val addRefmapForForge: Boolean get() = true
/** /**
* Loom 0.11+ has to generate the runtime transformer properties file * Loom 0.11+ has to generate the runtime transformer properties file

3
src/main/kotlin/dev/architectury/plugin/transformers/AddRefmapName.kt
View File

@@ -10,9 +10,10 @@ import dev.architectury.transformer.transformers.base.edit.TransformerContext
import dev.architectury.transformer.util.Logger import dev.architectury.transformer.util.Logger
import java.io.ByteArrayInputStream import java.io.ByteArrayInputStream
class AddRefmapName : AssetEditTransformer { data class AddRefmapName(val enabled: () -> Boolean = { true }) : AssetEditTransformer {
val gson = GsonBuilder().setPrettyPrinting().create() val gson = GsonBuilder().setPrettyPrinting().create()
override fun doEdit(context: TransformerContext, output: FileAccess) { override fun doEdit(context: TransformerContext, output: FileAccess) {
if (!enabled()) return
val refmap = System.getProperty(BuiltinProperties.REFMAP_NAME) ?: return val refmap = System.getProperty(BuiltinProperties.REFMAP_NAME) ?: return
val mixins = mutableSetOf<String>() val mixins = mutableSetOf<String>()
output.handle { path, bytes -> output.handle { path, bytes ->