Skip to content

Commit

Permalink
get fg2 dev launching (fix at's)
Browse files Browse the repository at this point in the history
  • Loading branch information
@wagyourtail
wagyourtail committed Dec 12, 2021
1 parent 8023faa commit 9e81355
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 44 deletions.
65 changes: 23 additions & 42 deletions src/main/java/net/fabricmc/loom/configuration/providers/forge/MinecraftPatchedProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@ public abstract class MinecraftPatchedProvider extends DependencyProvider {
private static final String LOOM_PATCH_VERSION_KEY = "Loom-Patch-Version";
private static final String CURRENT_LOOM_PATCH_VERSION = "5";
private static final String NAME_MAPPING_SERVICE_PATH = "/inject/META-INF/services/cpw.mods.modlauncher.api.INameMappingService";
protected final String accessTransformerPath;

// step 3 - fg2: srg transform, fg3: merge
protected File minecraftMergedPatchedSrgJar;
Expand All @@ -117,8 +118,9 @@ public abstract class MinecraftPatchedProvider extends DependencyProvider {
protected boolean filesDirty = false;
protected Path mcpConfigMappings;

protected MinecraftPatchedProvider(Project project) {
protected MinecraftPatchedProvider(Project project, String accessTransformerPath) {
super(project);
this.accessTransformerPath = accessTransformerPath;
}

@Override
Expand Down Expand Up @@ -193,8 +195,7 @@ public void initFiles() throws IOException {
}

public void testCleanAllCaches() throws IOException {
if (isRefreshDeps() || Stream.of(getGlobalCaches()).anyMatch(((Predicate<File>) File::exists).negate())
|| !isPatchedJarUpToDate(minecraftMergedPatchedAtJar)) {
if (isRefreshDeps() || Stream.of(getGlobalCaches()).anyMatch(((Predicate<File>) File::exists).negate()) || !isPatchedJarUpToDate(minecraftMergedPatchedAtJar)) {
cleanAllCache();
} else if (atDirty || Stream.of(getProjectCache()).anyMatch(((Predicate<File>) File::exists).negate())) {
cleanProjectCache();
Expand Down Expand Up @@ -267,9 +268,7 @@ public void cleanAllCache() {
}

protected File[] getGlobalCaches() {
File[] files = {
minecraftClientExtra
};
File[] files = {minecraftClientExtra};

if (forgeMergedJar != null) {
Arrays.copyOf(files, files.length + 1);
Expand All @@ -286,10 +285,7 @@ public void cleanProjectCache() {
}

protected File[] getProjectCache() {
return new File[] {
minecraftMergedPatchedSrgAtJar,
minecraftMergedPatchedAtJar
};
return new File[] {minecraftMergedPatchedSrgAtJar, minecraftMergedPatchedAtJar};
}

private void writeAtHash() throws IOException {
Expand All @@ -311,25 +307,21 @@ private byte[] getProjectAtsHash() throws IOException {

private void walkFileSystems(File source, File target, Predicate<Path> filter, Function<FileSystem, Iterable<Path>> toWalk, FsPathConsumer action)
throws IOException {
try (FileSystemUtil.Delegate sourceFs = FileSystemUtil.getJarFileSystem(source, false);
FileSystemUtil.Delegate targetFs = FileSystemUtil.getJarFileSystem(target, false)) {
try (FileSystemUtil.Delegate sourceFs = FileSystemUtil.getJarFileSystem(source, false); FileSystemUtil.Delegate targetFs = FileSystemUtil.getJarFileSystem(target, false)) {
for (Path sourceDir : toWalk.apply(sourceFs.get())) {
Path dir = sourceDir.toAbsolutePath();
if (!Files.exists(dir)) continue;
Files.walk(dir)
.filter(Files::isRegularFile)
.filter(filter)
.forEach(it -> {
boolean root = dir.getParent() == null;

try {
Path relativeSource = root ? it : dir.relativize(it);
Path targetPath = targetFs.get().getPath(relativeSource.toString());
action.accept(sourceFs.get(), targetFs.get(), it, targetPath);
} catch (IOException e) {
throw new UncheckedIOException(e);
}
});
Files.walk(dir).filter(Files::isRegularFile).filter(filter).forEach(it -> {
boolean root = dir.getParent() == null;

try {
Path relativeSource = root ? it : dir.relativize(it);
Path targetPath = targetFs.get().getPath(relativeSource.toString());
action.accept(sourceFs.get(), targetFs.get(), it, targetPath);
} catch (IOException e) {
throw new UncheckedIOException(e);
}
});
}
}
}
Expand Down Expand Up @@ -507,7 +499,7 @@ protected void accessTransformForge(Logger logger) throws Exception {
args.add(target.getAbsolutePath());

for (File jar : ImmutableList.of(getForgeJar(), getForgeUserdevJar(), minecraftMergedPatchedSrgJar)) {
byte[] atBytes = ZipUtils.unpackNullable(jar.toPath(), Constants.Forge.ACCESS_TRANSFORMER_PATH);
byte[] atBytes = ZipUtils.unpackNullable(jar.toPath(), accessTransformerPath);

if (atBytes != null) {
File tmpFile = File.createTempFile("at-conf", ".cfg");
Expand All @@ -531,8 +523,7 @@ protected void accessTransformForge(Logger logger) throws Exception {
spec.setClasspath(classpath);

// if running with INFO or DEBUG logging
if (getProject().getGradle().getStartParameter().getShowStacktrace() != ShowStacktrace.INTERNAL_EXCEPTIONS
|| getProject().getGradle().getStartParameter().getLogLevel().compareTo(LogLevel.LIFECYCLE) < 0) {
if (getProject().getGradle().getStartParameter().getShowStacktrace() != ShowStacktrace.INTERNAL_EXCEPTIONS || getProject().getGradle().getStartParameter().getLogLevel().compareTo(LogLevel.LIFECYCLE) < 0) {
spec.setStandardOutput(System.out);
spec.setErrorOutput(System.err);
} else {
Expand Down Expand Up @@ -560,15 +551,7 @@ protected TinyRemapper buildRemapper(Path input, String from, String to) throws
Path[] libraries = TinyRemapperHelper.getMinecraftDependencies(getProject());
MemoryMappingTree mappingsWithSrg = getExtension().getMappingsProvider().getMappingsWithSrg();

TinyRemapper remapper = TinyRemapper.newRemapper()
.logger(getProject().getLogger()::lifecycle)
.logUnknownInvokeDynamic(false)
.withMappings(TinyRemapperHelper.create(mappingsWithSrg, from, to, true))
.withMappings(InnerClassRemapper.of(InnerClassRemapper.readClassNames(input), mappingsWithSrg, from, to))
.renameInvalidLocals(true)
.rebuildSourceFilenames(true)
.fixPackageAccess(true)
.build();
TinyRemapper remapper = TinyRemapper.newRemapper().logger(getProject().getLogger()::lifecycle).logUnknownInvokeDynamic(false).withMappings(TinyRemapperHelper.create(mappingsWithSrg, from, to, true)).withMappings(InnerClassRemapper.of(InnerClassRemapper.readClassNames(input), mappingsWithSrg, from, to)).renameInvalidLocals(true).rebuildSourceFilenames(true).fixPackageAccess(true).build();

if (getProject().getGradle().getStartParameter().getLogLevel().compareTo(LogLevel.LIFECYCLE) < 0) {
MappingsProviderVerbose.saveFile(remapper);
Expand Down Expand Up @@ -596,10 +579,8 @@ protected void remapPatchedJar(Logger logger) throws Exception {

TinyRemapper remapper = buildRemapper(mcInput, "srg", "official");

try (
OutputConsumerPath outputConsumer = new OutputConsumerPath.Builder(mcOutput).build();
Closeable outputConsumerForge = !splitJars ? () -> {
} : new OutputConsumerPath.Builder(forgeOutput).build()) {
try (OutputConsumerPath outputConsumer = new OutputConsumerPath.Builder(mcOutput).build(); Closeable outputConsumerForge = !splitJars ? () -> {
} : new OutputConsumerPath.Builder(forgeOutput).build()) {
outputConsumer.addNonClassFiles(mcInput);

InputTag mcTag = remapper.createInputTag();
Expand Down
3 changes: 2 additions & 1 deletion ...java/net/fabricmc/loom/configuration/providers/forge/fg2/MinecraftPatchedProviderFG2.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,8 @@ public class MinecraftPatchedProviderFG2 extends MinecraftPatchedProvider {
// fields in super

public MinecraftPatchedProviderFG2(Project project) {
super(project);
// use AT from forge universal (btw userdev at's are named `forge_at.cfg` if this should be changed)
super(project, "forge_at.cfg");
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion ...java/net/fabricmc/loom/configuration/providers/forge/fg3/MinecraftPatchedProviderFG3.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ public class MinecraftPatchedProviderFG3 extends MinecraftPatchedProvider {
private Path[] mergedMojangTsrg2Files;

public MinecraftPatchedProviderFG3(Project project) {
super(project);
super(project, Constants.Forge.ACCESS_TRANSFORMER_PATH);
}

@Override
Expand Down

0 comments on commit 9e81355

Please sign in to comment.