Support for FG2-era Forge #70
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -101,7 +101,7 @@ public void configureMixin() { | |
| ConfigurationContainer configs = project.getConfigurations(); | ||
| LoomGradleExtension extension = LoomGradleExtension.get(project); | ||
|
|
||
| if (!extension.ideSync() || extension.isLegacyForge()) { | ||
|
There was a problem hiding this comment. The IDE sync check here is done for a reason and the mixin AP shouldn't be used in IDE builds. There was a problem hiding this comment. Tbh I don't recall why I even added it. I must have had some issues with Mixin before but I can no longer reproduce that, so I'll remove it again. Out of curiosity, do you happen to know the reason? Removing mixin from the AP classpath just for the IDE seems wrong (you have to manually build to get its errors/warnings) and I've not noticed anything wrong while it was there. The oldest commit I could track it back to (5c2b669) doesn't give any reason. There was a problem hiding this comment. Afaik the 0.8.5 AP detects IDEA and disables itself accordingly, Mixin has done that for eclipse for a while too. There was a problem hiding this comment. The Mixin AP would be used to have errors if it's not disabled, and those errors are wrong |
||
| for (Configuration processorConfig : apConfigurations) { | ||
| project.getLogger().info("Adding mixin to classpath of AP config: " + processorConfig.getName()); | ||
| // Pass named MC classpath to mixin AP classpath | ||
|
|
||
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 |
|---|---|---|
|
|
@@ -109,14 +109,21 @@ protected String createMappingsIdentifier(String mappingsName, String version, S | |
| public void manipulateMappings(Path mappingsJar) throws IOException { | ||
| Stopwatch stopwatch = Stopwatch.createStarted(); | ||
| LoomGradleExtension extension = getExtension(); | ||
|
|
||
| if (extension.isLegacyForge()) { | ||
| // Legacy forge patches are in official namespace, so if the type of a field is changed by them, then that | ||
| // is effectively a new field and not traceable to any mapping. Therefore this does not apply to it. | ||
| return; | ||
| } | ||
|
|
||
| this.rawTinyMappings = tinyMappings; | ||
| this.rawTinyMappingsWithSrg = tinyMappingsWithSrg; | ||
| String mappingsJarName = mappingsJar.getFileName().toString(); | ||
|
|
||
| if (getExtension().shouldGenerateSrgTiny()) { | ||
| if (Files.notExists(rawTinyMappingsWithSrg) || isRefreshDeps()) { | ||
| // Merge tiny mappings with srg | ||
| SrgMerger.mergeSrg(getProject().getLogger(), getExtension().getMappingsProvider()::getMojmapSrgFileIfPossible, getRawSrgFile(), rawTinyMappings, rawTinyMappingsWithSrg, true, false); | ||
| } | ||
| } | ||
|
|
||
|
|
||
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 |
|---|---|---|
|
|
@@ -72,6 +72,7 @@ public class ForgeUserdevProvider extends DependencyProvider { | |
| private File userdevJar; | ||
| private JsonObject json; | ||
| private Consumer<Runnable> postPopulationScheduler; | ||
| private boolean isLegacyForge; | ||
|
|
||
| public ForgeUserdevProvider(Project project) { | ||
| super(project); | ||
|
|
@@ -99,19 +100,44 @@ public void provide(DependencyInfo dependency, Consumer<Runnable> postPopulation | |
| Files.copy(resolved.toPath(), userdevJar.toPath(), StandardCopyOption.REPLACE_EXISTING); | ||
|
|
||
| try (FileSystem fs = FileSystems.newFileSystem(new URI("jar:" + resolved.toURI()), ImmutableMap.of("create", false))) { | ||
| Path configEntry = fs.getPath("config.json"); | ||
|
|
||
| if (!Files.exists(configEntry)) { | ||
Johni0702 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| configEntry = fs.getPath("dev.json"); | ||
Juuxel marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| } | ||
|
|
||
| Files.copy(configEntry, configJson, StandardCopyOption.REPLACE_EXISTING); | ||
| } | ||
| } | ||
|
|
||
| try (Reader reader = Files.newBufferedReader(configJson)) { | ||
| json = new Gson().fromJson(reader, JsonObject.class); | ||
| } | ||
|
|
||
| isLegacyForge = !json.has("mcp"); | ||
|
|
||
| if (isLegacyForge) { | ||
| Map<String, String> mcpDep = Map.of( | ||
| "group", "de.oceanlabs.mcp", | ||
| "name", "mcp", | ||
| "version", json.get("inheritsFrom").getAsString(), | ||
| "classifier", "srg", | ||
| "ext", "zip" | ||
| ); | ||
| addDependency(mcpDep, Constants.Configurations.MCP_CONFIG); | ||
| addDependency(mcpDep, Constants.Configurations.SRG); | ||
| addDependency(dependency.getDepString() + ":universal", Constants.Configurations.FORGE_UNIVERSAL); | ||
| } else { | ||
| addDependency(json.get("mcp").getAsString(), Constants.Configurations.MCP_CONFIG); | ||
| addDependency(json.get("mcp").getAsString(), Constants.Configurations.SRG); | ||
| addDependency(json.get("universal").getAsString(), Constants.Configurations.FORGE_UNIVERSAL); | ||
| } | ||
|
|
||
| for (JsonElement lib : json.get("libraries").getAsJsonArray()) { | ||
| if (isLegacyForge) { | ||
| lib = lib.getAsJsonObject().get("name"); | ||
| } | ||
|
|
||
| Dependency dep = null; | ||
|
|
||
| if (lib.getAsString().startsWith("org.spongepowered:mixin:")) { | ||
|
|
@@ -128,7 +154,7 @@ public void provide(DependencyInfo dependency, Consumer<Runnable> postPopulation | |
| dep = addDependency(lib.getAsString(), Constants.Configurations.FORGE_DEPENDENCIES); | ||
| } | ||
|
|
||
| if (!isLegacyForge && lib.getAsString().split(":").length < 4) { | ||
| ((ModuleDependency) dep).attributes(attributes -> { | ||
| attributes.attribute(transformed, true); | ||
| }); | ||
|
|
@@ -137,7 +163,10 @@ public void provide(DependencyInfo dependency, Consumer<Runnable> postPopulation | |
|
|
||
| // TODO: Should I copy the patches from here as well? | ||
| // That'd require me to run the "MCP environment" fully up to merging. | ||
|
|
||
| JsonObject runs = isLegacyForge ? new JsonObject() : json.getAsJsonObject("runs"); | ||
Juuxel marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| for (Map.Entry<String, JsonElement> entry : runs.entrySet()) { | ||
| LaunchProviderSettings launchSettings = getExtension().getLaunchConfigs().findByName(entry.getKey()); | ||
| RunConfigSettings settings = getExtension().getRunConfigs().findByName(entry.getKey()); | ||
| JsonObject value = entry.getValue().getAsJsonObject(); | ||
|
|
@@ -182,6 +211,18 @@ public void provide(DependencyInfo dependency, Consumer<Runnable> postPopulation | |
| }); | ||
| } | ||
| } | ||
|
|
||
| if (isLegacyForge) { | ||
| getExtension().getRunConfigs().configureEach(config -> { | ||
| if (Constants.Forge.LAUNCH_TESTING.equals(config.getDefaultMainClass())) { | ||
| config.setDefaultMainClass(Constants.LegacyForge.LAUNCH_WRAPPER); | ||
| } | ||
| }); | ||
| } | ||
| } | ||
|
|
||
| public boolean isLegacyForge() { | ||
| return isLegacyForge; | ||
| } | ||
|
|
||
| public abstract static class RemoveNameProvider implements TransformAction<TransformParameters.None> { | ||
|
|
||
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 |
|---|---|---|
|
|
@@ -64,6 +64,11 @@ public McpConfigProvider(Project project) { | |
|
|
||
| @Override | ||
| public void provide(DependencyInfo dependency, Consumer<Runnable> postPopulationScheduler) throws Exception { | ||
| if (getExtension().isLegacyForge()) { | ||
| official = false; | ||
| return; | ||
| } | ||
|
|
||
| init(dependency.getDependency().getVersion()); | ||
|
|
||
| Path mcpZip = dependency.resolveFile().orElseThrow(() -> new RuntimeException("Could not resolve MCPConfig")).toPath(); | ||
|
|
||
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.
Does the current AT tool not work for old MC versions?
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.
It would require remapping the entire minecraft jar (and presumably also forge? I guess ATs can apply to it as well?) from official to srg and back, only to run the AT tool. Much slower than this implementation which basically just converts the names as it looks them up.
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.
Hmm, I see. You could also remap the AT since we have tools (CadixDev's library) for that.