mirrors/yarn
mirrors
/
yarn
mirror of https://github.com/FabricMC/yarn.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Update CFR and Enigma (#3794) 

* Update CFR and Enigma

* Update and fix build
This commit is contained in:
modmuss 2024-02-15 13:02:36 +00:00 committed by GitHub
parent 65fa200911
commit ec47d43d67
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 29 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
build.gradle
View File

@ -104,6 +104,7 @@ import net.fabricmc.filament.task.UnpickJarTask
import net.fabricmc.filament.task.base.WithFileInput
import net.fabricmc.filament.task.base.WithFileOutput
import net.fabricmc.filament.task.enigma.MapSpecializedMethodsTask
import net.fabricmc.filament.task.mappingio.CompleteMappingsTask
import net.fabricmc.filament.task.mappingio.ConvertMappingsTask
import net.fabricmc.filament.task.mappingio.MergeMappingsTask
import net.fabricmc.mappingio.format.MappingFormat
@ -179,12 +180,18 @@ tasks.register('checkMappings') {
tasks.register('mapSpecializedMethods', MapSpecializedMethodsTask) {
intermediaryJarFile = mapIntermediaryJar.output
mappings = mappingsDir
output = new File(tempDir, "yarn-mappings-v2.tiny")
output = new File(tempDir, "yarn-specialized-mappings-v2.tiny")
inputMappingsFormat = "enigma"
outputMappingsFormat = "tinyv2:intermediary:named"
}
tasks.register('completeMappings', CompleteMappingsTask) {
input = mapSpecializedMethods.output
output = new File(tempDir, "yarn-mappings-v2.tiny")
outputFormat = MappingFormat.TINY_2_FILE
}
tasks.register('convertToV1', ConvertMappingsTask) {
input = mapSpecializedMethods.output
output = new File(tempDir, "yarn-mappings.tiny")
@ -303,7 +310,7 @@ build.dependsOn constantsJar
tasks.register('insertAutoGeneratedEnumMappings', FileInputOutput) {
dependsOn mapIntermediaryJar, downloadIntermediary
group = buildMappingGroup
input = mapSpecializedMethods.output
input = completeMappings.output
output = new File(tempDir, "unmerged-named-v2-with-enum.tiny")
inputs.file mapIntermediaryJar.output

2
filament/gradle.properties
View File

@ -1 +1 @@
filament_version=0.7.0
filament_version=0.7.1

17
filament/src/main/java/net/fabricmc/filament/task/mappingio/CompleteMappingsTask.java Normal file
View File

@ -0,0 +1,17 @@
package net.fabricmc.filament.task.mappingio;
import java.io.IOException;
import java.util.Map;
import net.fabricmc.filament.task.base.WithFileInput;
import net.fabricmc.mappingio.MappingReader;
import net.fabricmc.mappingio.MappingWriter;
import net.fabricmc.mappingio.adapter.MappingNsCompleter;
public abstract class CompleteMappingsTask extends MappingOutputTask implements WithFileInput {
@Override
void run(MappingWriter writer) throws IOException {
var nsCompleter = new MappingNsCompleter(writer, Map.of("named", "intermediary"), true);
MappingReader.read(getInputPath(), nsCompleter);
}
}

4
gradle.properties
View File

@ -3,9 +3,9 @@ org.gradle.jvmargs=-Xmx1G
org.gradle.parallel=true
org.gradle.configuration-cache=true
enigma_version=2.3.3
enigma_version=2.4.1
unpick_version=2.3.0
cfr_version=0.2.1
cfr_version=0.2.2
name_proposal_version=0.2.0
asm_version=9.6