Fix issues with Forge #225
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -58,6 +58,7 @@ | |
| import org.gradle.api.Project; | ||
| import org.gradle.api.logging.LogLevel; | ||
| import org.gradle.api.logging.Logger; | ||
| import org.jetbrains.annotations.Nullable; | ||
| import org.objectweb.asm.ClassReader; | ||
| import org.objectweb.asm.ClassVisitor; | ||
| import org.objectweb.asm.ClassWriter; | ||
|
|
@@ -111,6 +112,8 @@ public class MinecraftPatchedProvider { | |
| private Path minecraftPatchedIntermediateJar; | ||
| // Step 3: Access Transform | ||
| private Path minecraftPatchedIntermediateAtJar; | ||
| // Forge 1.20.6: Step 3.5: Remap Patched AT and Forge to mojmaps | ||
| private Path minecraftPatchedMojangAtJar; | ||
| // Step 4: Remap Patched AT & Forge to official | ||
| private Path minecraftPatchedJar; | ||
| private Path minecraftClientExtra; | ||
|
|
@@ -151,6 +154,11 @@ private void initPatchedFiles() { | |
| minecraftIntermediateJar = forgeWorkingDir.resolve("minecraft-" + type.id + "-" + intermediateId + ".jar"); | ||
| minecraftPatchedIntermediateJar = forgeWorkingDir.resolve("minecraft-" + type.id + "-" + intermediateId + "-patched.jar"); | ||
| minecraftPatchedIntermediateAtJar = forgeWorkingDir.resolve("minecraft-" + type.id + "-" + intermediateId + "-at-patched.jar"); | ||
|
|
||
| if (getExtension().isForge() && getExtension().getForgeProvider().usesMojangAtRuntime()) { | ||
| minecraftPatchedMojangAtJar = forgeWorkingDir.resolve("minecraft-" + type.id + "-mojang-at-patched.jar"); | ||
| } | ||
|
|
||
| minecraftPatchedJar = forgeWorkingDir.resolve("minecraft-" + type.id + "-patched.jar"); | ||
| minecraftClientExtra = forgeWorkingDir.resolve("client-extra.jar"); | ||
| } | ||
|
|
@@ -162,13 +170,14 @@ private void cleanAllCache() throws IOException { | |
| } | ||
|
|
||
| private Path[] getGlobalCaches() { | ||
| Path[] files = Stream.of( | ||
| minecraftIntermediateJar, | ||
| minecraftPatchedIntermediateJar, | ||
| minecraftPatchedIntermediateAtJar, | ||
| minecraftPatchedMojangAtJar, | ||
| minecraftPatchedJar, | ||
| minecraftClientExtra | ||
| ).filter(Objects::nonNull).toArray(Path[]::new); | ||
|
|
||
| return files; | ||
| } | ||
|
|
@@ -201,7 +210,7 @@ public void provide() throws Exception { | |
| patchJars(); | ||
| } | ||
|
|
||
| if (dirty || Files.notExists(minecraftPatchedIntermediateAtJar) || (getExtension().isForge() && getExtension().getForgeProvider().usesMojangAtRuntime() && Files.notExists(minecraftPatchedMojangAtJar))) { | ||
| this.dirty = true; | ||
| accessTransformForge(); | ||
| } | ||
|
|
@@ -227,14 +236,16 @@ private void fillClientExtraJar() throws IOException { | |
| } | ||
|
|
||
| private TinyRemapper buildRemapper(SharedServiceManager serviceManager, Path input) throws IOException { | ||
| return buildRemapper(MappingOption.forPlatform(getExtension()), IntermediaryNamespaces.intermediary(project), "official", serviceManager, input); | ||
| } | ||
|
|
||
| private TinyRemapper buildRemapper(final MappingOption mappingOption, final String sourceNamespace, final String to, SharedServiceManager serviceManager, Path input) throws IOException { | ||
| TinyMappingsService mappingsService = getExtension().getMappingConfiguration().getMappingsService(serviceManager, mappingOption); | ||
| MemoryMappingTree mappings = mappingsService.getMappingTree(); | ||
|
|
||
| TinyRemapper.Builder builder = TinyRemapper.newRemapper() | ||
| .withMappings(TinyRemapperHelper.create(mappings, sourceNamespace, to, true)) | ||
| .withMappings(InnerClassRemapper.of(InnerClassRemapper.readClassNames(input), mappings, sourceNamespace, to)) | ||
| .renameInvalidLocals(true) | ||
| .rebuildSourceFilenames(true); | ||
|
|
||
|
|
@@ -409,33 +420,51 @@ public static void accessTransform(Project project, Path input, Path target) thr | |
| } | ||
|
|
||
| private void remapPatchedJar(SharedServiceManager serviceManager) throws Exception { | ||
| Path mcInput = minecraftPatchedIntermediateAtJar; | ||
| Path mcPatchedAt = minecraftPatchedMojangAtJar; | ||
| Path mcOutput = minecraftPatchedJar; | ||
| Path forgeJar = getForgeJar().toPath(); | ||
| Path forgeUserdevJar = getForgeUserdevJar().toPath(); | ||
|
|
||
| if (mcPatchedAt != null) { | ||
| Files.deleteIfExists(mcPatchedAt); | ||
| } | ||
|
|
||
| Files.deleteIfExists(mcOutput); | ||
|
|
||
| if (getExtension().isForge() && getExtension().getForgeProvider().usesMojangAtRuntime()) { | ||
| logger.lifecycle(":remapping minecraft (TinyRemapper, srg -> mojang)"); | ||
| TinyRemapper remapper = buildRemapper(MappingOption.WITH_SRG, "srg", "mojang", serviceManager, mcInput); | ||
| remapJar(remapper, serviceManager, mcInput, mcPatchedAt, forgeJar, forgeUserdevJar, false); | ||
| logger.lifecycle(":remapping minecraft (TinyRemapper, mojang -> official)"); | ||
| TinyRemapper remapper2 = buildRemapper(MappingOption.WITH_MOJANG, "mojang", "official", serviceManager, mcInput); | ||
| remapJar(remapper2, serviceManager, mcPatchedAt, mcOutput, null, null, true); | ||
|
Comment on lines
+436
to
+441
There was a problem hiding this comment. Why is the game remapped twice? Remapping the game is slow, so it should be avoided. |
||
| } else { | ||
| logger.lifecycle(":remapping minecraft (TinyRemapper, %s -> official)".formatted(getExtension().isForge() ? "srg" : "mojang")); | ||
| TinyRemapper remapper = buildRemapper(serviceManager, mcInput); | ||
| remapJar(remapper, serviceManager, mcInput, mcOutput, forgeJar, forgeUserdevJar, true); | ||
| } | ||
| } | ||
|
|
||
| private void remapJar(TinyRemapper remapper, SharedServiceManager serviceManager, Path mcInput, Path mcOutput, @Nullable Path forgeJar, @Nullable Path forgeUserdevJar, boolean remapCoreMods) throws Exception { | ||
| try (OutputConsumerPath outputConsumer = new OutputConsumerPath.Builder(mcOutput).build()) { | ||
| outputConsumer.addNonClassFiles(mcInput); | ||
| if (forgeJar != null) outputConsumer.addNonClassFiles(forgeJar, NonClassCopyMode.FIX_META_INF, remapper); | ||
|
|
||
| InputTag mcTag = remapper.createInputTag(); | ||
| InputTag forgeTag = remapper.createInputTag(); | ||
| List<CompletableFuture<?>> futures = new ArrayList<>(); | ||
| futures.add(remapper.readInputsAsync(mcTag, mcInput)); | ||
| if (forgeJar != null) futures.add(remapper.readInputsAsync(forgeTag, forgeJar, forgeUserdevJar)); | ||
| CompletableFuture.allOf(futures.toArray(new CompletableFuture[0])).join(); | ||
| remapper.apply(outputConsumer, mcTag); | ||
| remapper.apply(outputConsumer, forgeTag); | ||
| } finally { | ||
| remapper.finish(); | ||
| } | ||
|
|
||
| if (forgeUserdevJar != null) copyUserdevFiles(forgeUserdevJar, mcOutput); | ||
| if (remapCoreMods) remapCoreMods(mcOutput, serviceManager); | ||
| applyLoomPatchVersion(mcOutput); | ||
| } | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -99,6 +99,7 @@ public class MappingConfiguration { | |||||
| private boolean hasUnpickDefinitions; | ||||||
| private UnpickMetadata unpickMetadata; | ||||||
| private Map<String, String> signatureFixes; | ||||||
| private LoomGradleExtension extension; | ||||||
|
|
||||||
| protected MappingConfiguration(String mappingsIdentifier, Path mappingsWorkingDir) { | ||||||
| this.mappingsIdentifier = mappingsIdentifier; | ||||||
|
|
@@ -164,6 +165,11 @@ public TinyMappingsService getMappingsService(SharedServiceManager serviceManage | |||||
| } | ||||||
|
|
||||||
| public TinyMappingsService getMappingsService(SharedServiceManager serviceManager, MappingOption mappingOption) { | ||||||
| if (extension.isForge() && extension.getForgeProvider().usesMojangAtRuntime() && mappingOption == MappingOption.WITH_MOJANG) { | ||||||
| // Mojang mappings are merged into the SRG file. | ||||||
| return getMappingsService(serviceManager, MappingOption.WITH_SRG); | ||||||
|
There was a problem hiding this comment.
Suggested change
No need to recurse |
||||||
| } | ||||||
|
|
||||||
| final Path tinyMappings = switch (mappingOption) { | ||||||
| case WITH_SRG -> { | ||||||
| if (Files.notExists(this.tinyMappingsWithSrg)) { | ||||||
|
|
@@ -205,7 +211,7 @@ protected void setup(Project project, SharedServiceManager serviceManager, Minec | |||||
| } | ||||||
|
|
||||||
| public void setupPost(Project project) throws IOException { | ||||||
| this.extension = LoomGradleExtension.get(project); | ||||||
|
|
||||||
| if (extension.isNeoForge()) { | ||||||
| // Generate the Mojmap-merged mappings if needed. | ||||||
|
|
||||||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Using
asserthere is a behaviour change (since this check needs assertions at runtime which are never enabled for Gradle probably?)