mirror of
https://github.com/FabricMC/fabric.git
synced 2024-11-30 03:26:07 -05:00
a680b9b44b
- Added transitive-accessible wideners for `BlockStateModelGenerator$TintType`, `BlockStateModelGenerator$BlockTexturePool`, `BlockStateModelGenerator$LogTexturePool`, and `BlockStateModelGenerator$BuiltinModelPool` classes - Added transitive-accessible widener for `TexturedModel#makeFactory` method - Moved transitive-accessible wideners for `ItemModelGenerator` methods to the generate run, so it covers the 2 new methods and any future ones - Fixed `generateAccessWideners` task so it can now find the jar - Tweaked the whitespace in the accesswidener file a bit
118 lines
3.1 KiB
Groovy
118 lines
3.1 KiB
Groovy
archivesBaseName = "fabric-data-generation-api-v1"
|
|
version = getSubprojectVersion(project)
|
|
|
|
moduleDependencies(project, [
|
|
'fabric-api-base',
|
|
'fabric-registry-sync-v0',
|
|
'fabric-networking-api-v1',
|
|
'fabric-resource-conditions-api-v1'
|
|
])
|
|
|
|
dependencies {
|
|
}
|
|
|
|
sourceSets {
|
|
testmod {
|
|
resources {
|
|
srcDirs += [
|
|
'src/testmod/generated'
|
|
]
|
|
}
|
|
}
|
|
}
|
|
|
|
loom {
|
|
accessWidenerPath = file("src/main/resources/fabric-data-generation-api-v1.accesswidener")
|
|
|
|
runs {
|
|
datagen {
|
|
inherit testmodServer
|
|
name "Data Generation"
|
|
vmArg "-Dfabric-api.datagen"
|
|
vmArg "-Dfabric-api.datagen.output-dir=${file("src/testmod/generated")}"
|
|
vmArg "-Dfabric-api.datagen.strict-validation"
|
|
|
|
ideConfigGenerated = true
|
|
runDir "build/datagen"
|
|
}
|
|
datagenClient {
|
|
client()
|
|
name "Data Generation"
|
|
vmArg "-Dfabric-api.datagen"
|
|
vmArg "-Dfabric-api.datagen.output-dir=${file("src/testmod/generated")}"
|
|
vmArg "-Dfabric-api.datagen.strict-validation"
|
|
|
|
ideConfigGenerated = true
|
|
runDir "build/datagen"
|
|
source sourceSets.testmod
|
|
}
|
|
}
|
|
}
|
|
|
|
test.dependsOn runDatagen
|
|
|
|
import org.objectweb.asm.ClassReader
|
|
import org.objectweb.asm.Opcodes
|
|
import org.objectweb.asm.tree.ClassNode
|
|
|
|
import java.util.zip.ZipFile
|
|
|
|
task generateAccessWidener() {
|
|
doLast {
|
|
File inputJar = loom.namedMinecraftProvider.parentMinecraftProvider.commonJar.toFile()
|
|
String accessWidener = file("template.accesswidener").text + "\n"
|
|
|
|
visitMethods(inputJar, "net/minecraft/data/server/RecipeProvider.class") { name, desc, owner ->
|
|
if (it.name == "generate")
|
|
return
|
|
|
|
accessWidener += "transitive-accessible\tmethod\t${owner}\t${name}\t${desc}\n"
|
|
}
|
|
|
|
visitMethods(inputJar, "net/minecraft/data/client/BlockStateModelGenerator.class") { name, desc, owner ->
|
|
if (desc == "()V")
|
|
// Skip over methods that dont take any arguments, as they are specific to minecraft.
|
|
return
|
|
|
|
accessWidener += "transitive-accessible\tmethod\t${owner}\t${name}\t${desc}\n"
|
|
}
|
|
|
|
visitMethods(inputJar, "net/minecraft/data/server/BlockLootTableGenerator.class") { name, desc, owner ->
|
|
accessWidener += "transitive-accessible\tmethod\t${owner}\t${name}\t${desc}\n"
|
|
}
|
|
|
|
visitMethods(inputJar, "net/minecraft/data/client/ItemModelGenerator.class") { name, desc, owner ->
|
|
accessWidener += "transitive-accessible\tmethod\t${owner}\t${name}\t${desc}\n"
|
|
}
|
|
|
|
file("src/main/resources/fabric-data-generation-api-v1.accesswidener").text = accessWidener
|
|
}
|
|
}
|
|
|
|
def visitMethods(File input, String className, closure) {
|
|
def clazz = getClassNode(input, className)
|
|
|
|
clazz.methods.forEach {
|
|
if ((it.access & Opcodes.ACC_SYNTHETIC) != 0 || (it.access & Opcodes.ACC_PUBLIC) != 0)
|
|
return
|
|
|
|
if (it.name.startsWith("<"))
|
|
return
|
|
|
|
closure(it.name, it.desc, clazz.name)
|
|
}
|
|
}
|
|
|
|
ClassNode getClassNode(File input, String className) {
|
|
new ZipFile(input).withCloseable { ZipFile zip ->
|
|
zip.getInputStream(zip.getEntry(className)).withCloseable { is ->
|
|
ClassReader reader = new ClassReader(is)
|
|
ClassNode classNode = new ClassNode()
|
|
reader.accept(classNode, 0)
|
|
|
|
return classNode
|
|
}
|
|
}
|
|
}
|
|
|
|
generateResources.dependsOn generateAccessWidener
|