broken-refmap-remapping
This commit is contained in:
parent
54fb5fe91e
commit
cbdfac65fc
|
|
@ -7,7 +7,6 @@ import java.io.IOException;
|
|||
import java.lang.reflect.Field;
|
||||
import java.nio.file.Files;
|
||||
import java.util.Map;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
import dev.frogmc.thyroxine.api.data.MappingBundle;
|
||||
import dev.frogmc.thyroxine.api.data.MappingData;
|
||||
|
|
@ -21,23 +20,32 @@ public class FrogMappingProvider extends MappingProvider {
|
|||
private final Map<MappingMethod, MappingMethod> methodMap = getMap("methodMap");
|
||||
private final Map<MappingField, MappingField> fieldMap = getMap("fieldMap");
|
||||
private final Map<String, String> classMap = getMap("classMap");
|
||||
public FrogMappingProvider(Messager messager, Filer filer) {
|
||||
public FrogMappingProvider(Messager messager, Filer filer, String from, String to) {
|
||||
super(messager, filer);
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public void read(File input) throws IOException {
|
||||
if (!input.getName().endsWith(".tiny")) {
|
||||
return;
|
||||
}
|
||||
MappingBundle bundle = TinyV2Parser.parse(Files.readString(input.toPath()));
|
||||
MappingData data = bundle.data().getFirst();
|
||||
|
||||
classMap.putAll(data.classes());
|
||||
fieldMap.putAll(data.fields().entrySet().stream().collect(Collectors.toMap(
|
||||
e -> new MappingField(e.getKey().owner(), e.getKey().name(), e.getKey().descriptor()),
|
||||
e -> new MappingField(e.getKey().owner(), e.getKey().name()))));
|
||||
methodMap.putAll(data.methods().entrySet().stream().collect(Collectors.toMap(
|
||||
e -> new MappingMethod(e.getKey().owner(), e.getKey().name(), e.getKey().descriptor()),
|
||||
e -> new MappingMethod(e.getKey().owner(), e.getKey().name()))));
|
||||
data.fields().forEach((key, value) -> {
|
||||
fieldMap.put(
|
||||
new MappingField(key.owner(), key.name(), key.descriptor()),
|
||||
new MappingField(classMap.get(key.owner()), value, key.descriptor())
|
||||
);
|
||||
});
|
||||
data.methods().forEach((key, value) -> {
|
||||
methodMap.put(
|
||||
new MappingMethod(key.owner(), key.name(), key.descriptor()),
|
||||
new MappingMethod(classMap.get(key.owner()), value, key.descriptor())
|
||||
);
|
||||
});
|
||||
}
|
||||
|
||||
// Mixin has guava shadowed which means the actual type is not something we can import
|
||||
|
|
|
|||
|
|
@ -15,7 +15,8 @@ public class FrogObfuscationEnvironment extends ObfuscationEnvironment {
|
|||
|
||||
@Override
|
||||
protected IMappingProvider getMappingProvider(Messager messager, Filer filer) {
|
||||
return new FrogMappingProvider(messager, filer);
|
||||
String[] key = type.getKey().split(":");
|
||||
return new FrogMappingProvider(messager, filer, key[0], key[1]);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
|||
|
|
@ -25,6 +25,7 @@ import dev.frogmc.thyroxine.writer.tiny.TinyV2Writer
|
|||
import net.fabricmc.fernflower.api.IFabricJavadocProvider
|
||||
import org.gradle.api.Plugin
|
||||
import org.gradle.api.Project
|
||||
import org.gradle.api.logging.LogLevel
|
||||
import org.gradle.api.plugins.JavaBasePlugin
|
||||
import org.gradle.api.plugins.JavaPlugin
|
||||
import org.gradle.api.tasks.Delete
|
||||
|
|
@ -142,7 +143,7 @@ class PhytotelmaPlugin : Plugin<Project> {
|
|||
projectData.remappedGameJarPath!!.resolveSibling(
|
||||
fileName.substring(
|
||||
0,
|
||||
fileName.lastIndexOf("-")
|
||||
fileName.lastIndexOf(".")
|
||||
) + "-sources.jar"
|
||||
)
|
||||
if (output.exists()) {
|
||||
|
|
@ -150,7 +151,7 @@ class PhytotelmaPlugin : Plugin<Project> {
|
|||
output.deleteExisting()
|
||||
}
|
||||
val options = mutableMapOf<String, Any>()
|
||||
println("Preparing Parchment...")
|
||||
println("Preparing javadocs...")
|
||||
val javadocs = ProjectStorage.get(project).mappings!!
|
||||
options[IFabricJavadocProvider.PROPERTY_NAME] =
|
||||
FrogJavadocProvider(javadocs.get(ProjectStorage.get(project).targetNamespace))
|
||||
|
|
|
|||
|
|
@ -6,6 +6,8 @@ import dev.frogmc.phytotelma.ProjectStorage
|
|||
import dev.frogmc.phytotelma.VersionChecker
|
||||
import dev.frogmc.phytotelma.accesswidener.AccessWidener
|
||||
import dev.frogmc.phytotelma.ext.datagen.DatagenExtension
|
||||
import dev.frogmc.phytotelma.mappings.renameDstNamespace
|
||||
import dev.frogmc.phytotelma.mappings.renameNamespaces
|
||||
import dev.frogmc.phytotelma.run.AssetDownloader
|
||||
import dev.frogmc.phytotelma.run.RunConfigGenerator
|
||||
import dev.frogmc.phytotelma.run.RuntimeAccessFixVisitor
|
||||
|
|
@ -13,7 +15,9 @@ import dev.frogmc.phytotelma.run.datagen.DatagenConfigGenerator
|
|||
import dev.frogmc.phytotelma.run.datagen.DatagenTask
|
||||
import dev.frogmc.thyroxine.RemappingStep
|
||||
import dev.frogmc.thyroxine.Thyroxine
|
||||
import dev.frogmc.thyroxine.api.data.MappingBundle
|
||||
import dev.frogmc.thyroxine.api.data.MappingData
|
||||
import dev.frogmc.thyroxine.provider.MojmapProvider
|
||||
import dev.frogmc.thyroxine.writer.tiny.TinyV2Writer
|
||||
import org.gradle.api.Action
|
||||
import org.gradle.api.Project
|
||||
|
|
@ -108,10 +112,21 @@ abstract class PhytotelmaGradleExtensionImpl @Inject constructor(
|
|||
VersionChecker.saveMergedPomFile(version, mergedJar.parent)
|
||||
|
||||
println("Writing mappings...")
|
||||
TinyV2Writer.write(
|
||||
mappings,
|
||||
ProjectStorage.get(project).localCacheDir?.resolve("mappings.tiny")?.writer()
|
||||
)
|
||||
if (projectData.intermediaryNs != Constants.MOJMAP_NAMESPACE) {
|
||||
TinyV2Writer.write(
|
||||
MappingBundle(mappings.forNamespaces(mcConf.targetNamespace, projectData.intermediaryNs))
|
||||
.renameNamespaces("dev", projectData.intermediaryNs!!),
|
||||
ProjectStorage.get(project).localCacheDir?.resolve("mappings.tiny")?.writer()
|
||||
)
|
||||
} else {
|
||||
TinyV2Writer.write(
|
||||
MappingBundle.merge(
|
||||
mappings.reverse(),
|
||||
mcConf.mojmap().get().reverse().renameDstNamespace("moj")
|
||||
),
|
||||
ProjectStorage.get(project).localCacheDir?.resolve("mappings.tiny")?.writer()
|
||||
)
|
||||
}
|
||||
|
||||
|
||||
projectData.targetNamespace = mcConf.targetNamespace
|
||||
|
|
@ -168,46 +183,50 @@ abstract class PhytotelmaGradleExtensionImpl @Inject constructor(
|
|||
error("No loader version provided!")
|
||||
}
|
||||
project.dependencies.add(Constants.MINECRAFT_CONFIGURATION, "dev.frogmc:frogloader:${conf.version.get()}")
|
||||
project.configurations.getByName(JavaPlugin.COMPILE_CLASSPATH_CONFIGURATION_NAME)
|
||||
.dependencies.find { it.group.equals("net.fabricmc") && it.name.equals("sponge-mixin") }
|
||||
?.let { mixinDep ->
|
||||
project.dependencies.add(
|
||||
JavaPlugin.ANNOTATION_PROCESSOR_CONFIGURATION_NAME,
|
||||
mixinDep.group + ":" + mixinDep.name + ":" + mixinDep.version
|
||||
)
|
||||
project.dependencies.add(
|
||||
JavaPlugin.ANNOTATION_PROCESSOR_CONFIGURATION_NAME,
|
||||
"dev.frogmc.phytotelma:frog-mixin-obfuscation:" + PhytotelmaPlugin::class.java.`package`.implementationVersion
|
||||
)
|
||||
val options = mapOf(
|
||||
"defaultObfuscationEnv" to "dev:" + ProjectStorage.get(project).targetNamespace,
|
||||
"quiet" to "true",
|
||||
"inMapFileDevMoj" to ProjectStorage.get(project).localCacheDir!!.resolve("mappings.tiny"),
|
||||
"outMapFileDevMoj" to project.layout.buildDirectory.file(
|
||||
"mixin-out-" + ProjectStorage.get(project).mappingsName + "_" +
|
||||
project.extensions.getByType(JavaPluginExtension::class.java).sourceSets.getByName(
|
||||
SourceSet.MAIN_SOURCE_SET_NAME
|
||||
)
|
||||
project.afterEvaluate {
|
||||
project.logger.warn("doing ap stuff")
|
||||
project.configurations.getByName(JavaPlugin.COMPILE_CLASSPATH_CONFIGURATION_NAME)
|
||||
.resolvedConfiguration.resolvedArtifacts.map { it.moduleVersion.id }
|
||||
.find { it.group.equals("net.fabricmc") && it.name.equals("sponge-mixin") }
|
||||
?.let { mixinDep ->
|
||||
project.dependencies.add(
|
||||
JavaPlugin.ANNOTATION_PROCESSOR_CONFIGURATION_NAME,
|
||||
"dev.frogmc.phytotelma:frog-mixin-obfuscation:" + PhytotelmaPlugin::class.java.`package`.implementationVersion
|
||||
)
|
||||
project.dependencies.add(
|
||||
JavaPlugin.ANNOTATION_PROCESSOR_CONFIGURATION_NAME,
|
||||
mixinDep.group + ":" + mixinDep.name + ":" + mixinDep.version
|
||||
)
|
||||
val options = mapOf(
|
||||
"defaultObfuscationEnv" to "dev:" + ProjectStorage.get(project).intermediaryNs,
|
||||
"quiet" to "true",
|
||||
"inMapFileDevMoj" to ProjectStorage.get(project).localCacheDir!!.resolve("mappings.tiny"),
|
||||
"outMapFileDevMoj" to project.layout.buildDirectory.file(
|
||||
"mixin-out-" + (ProjectStorage.get(project).mappingsName + "_" +
|
||||
project.extensions.getByType(JavaPluginExtension::class.java).sourceSets.getByName(
|
||||
SourceSet.MAIN_SOURCE_SET_NAME
|
||||
).name
|
||||
).replace("[(). +,]".toRegex(), ""))
|
||||
.get().asFile,
|
||||
"inMapExtraFilesDevMoj" to ProjectStorage.get(project).remappedGameJarPath,
|
||||
)
|
||||
.get().asFile,
|
||||
"inMapExtraFilesDevMoj" to ProjectStorage.get(project).remappedGameJarPath,
|
||||
)
|
||||
|
||||
val compileTasks = listOf(JavaPlugin.COMPILE_JAVA_TASK_NAME, JavaPlugin.COMPILE_TEST_JAVA_TASK_NAME)
|
||||
compileTasks.forEach { name ->
|
||||
project.tasks.getByName(name)
|
||||
.takeIf { it is JavaCompile }
|
||||
.let { it as JavaCompile }
|
||||
.also { task ->
|
||||
task.options.compilerArgs.addAll(options
|
||||
.map { "-A" + it.key + "=" + it.value }
|
||||
.plus(
|
||||
"-AoutRefmapFile=" + task.destinationDirectory.asFile.get()
|
||||
.resolve(project.name + "-refmap.json")
|
||||
))
|
||||
}
|
||||
val compileTasks = listOf(JavaPlugin.COMPILE_JAVA_TASK_NAME, JavaPlugin.COMPILE_TEST_JAVA_TASK_NAME)
|
||||
compileTasks.forEach { name ->
|
||||
project.tasks.getByName(name)
|
||||
.takeIf { it is JavaCompile }
|
||||
.let { it as JavaCompile }
|
||||
.also { task ->
|
||||
task.options.compilerArgs.addAll(options
|
||||
.map { "-A" + it.key + "=" + it.value }
|
||||
.plus(
|
||||
"-AoutRefMapFile=" + task.destinationDirectory.asFile.get()
|
||||
.resolve(project.name + "-refmap.json")
|
||||
))
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
override fun froglib(action: Action<VersionConfiguration>) {
|
||||
|
|
|
|||
|
|
@ -12,17 +12,21 @@ class FrogJavadocProvider(data: DocumentationData) : IFabricJavadocProvider {
|
|||
private val classMap = data.classes.stream().collect(Collectors.toMap({ it.name() }, { it }))
|
||||
|
||||
override fun getClassDoc(structClass: StructClass): String? {
|
||||
return classMap[structClass.qualifiedName]?.javadoc?.joinToString("\n")
|
||||
if (structClass.qualifiedName.contains("package-info")) {
|
||||
println(structClass)
|
||||
}
|
||||
println(structClass)
|
||||
return classMap[structClass.qualifiedName]?.javadoc?.takeUnless { it.isEmpty() }?.joinToString("\n")
|
||||
}
|
||||
|
||||
override fun getFieldDoc(structClass: StructClass, structField: StructField): String? {
|
||||
return classMap[structClass.qualifiedName]
|
||||
?.getField(structField.name, structField.descriptor)
|
||||
?.orElse(null)?.javadoc?.joinToString("\n")
|
||||
?.orElse(null)?.javadoc?.takeUnless { it.isEmpty() }?.joinToString("\n")
|
||||
}
|
||||
|
||||
override fun getMethodDoc(structClass: StructClass, structMethod: StructMethod): String? {
|
||||
return classMap[structClass.qualifiedName]?.getMethod(structMethod.name, structMethod.descriptor)
|
||||
?.orElse(null)?.javadoc?.joinToString("\n")
|
||||
?.orElse(null)?.javadoc?.takeUnless { it.isEmpty() }?.joinToString("\n")
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue