Support Legacy Forge versions for loom 1.2 #138
Conversation
| @@ -128,7 +128,7 @@ protected LoomGradleExtensionApiImpl(Project project, LoomFiles directories) { | |||
| .convention(project.provider(() -> !isForge())); | |||
| this.modProvidedJavadoc.finalizeValueOnRead(); | |||
| this.intermediary = project.getObjects().property(String.class) | |||
| .convention("https://maven.fabricmc.net/net/fabricmc/intermediary/%1$s/intermediary-%1$s-v2.jar"); | |||
| .convention(true ? "https://maven.legacyfabric.net/net/legacyfabric/v2/intermediary/%1$s/intermediary-%1$s-v2.jar" : "https://maven.fabricmc.net/net/fabricmc/intermediary/%1$s/intermediary-%1$s-v2.jar"); | |||
| @@ -84,6 +84,8 @@ dependencies { | |||
| implementation ('org.ow2.asm:asm-tree:9.5') | |||
| implementation ('org.ow2.asm:asm-util:9.5') | |||
| implementation ('me.tongfei:progressbar:0.9.0') | |||
| implementation 'com.github.jponge:lzma-java:1.3' | |||
| runtimeOnly 'dev.architectury.architectury-pack200:dev.architectury.architectury-pack200.gradle.plugin:0.1.3' | |||
There was a problem hiding this comment.
Would not want this to be applied by default, pack200 is GPL
There was a problem hiding this comment.
GPL with the classpath exception (same as OpenJDK), no? So it shouldn't be a problem to my knowledge.
| @@ -173,4 +173,12 @@ default ForgeProvider getForgeProvider() { | |||
|
|
|||
| ForgeRunsProvider getForgeRunsProvider(); | |||
| void setForgeRunsProvider(ForgeRunsProvider forgeRunsProvider); | |||
|
|
|||
| default boolean isLegacyForge() { | |||
There was a problem hiding this comment.
Would want to have old forge as a different platform all together, can’t believe there are much code to share anyways
| @@ -168,6 +168,7 @@ public static void executeAt(Project project, Path input, Path output, AccessTra | |||
| args.add(output.toAbsolutePath().toString()); | |||
|
|
|||
| configuration.apply(args); | |||
| project.getLogger().info(args.toString()); | |||
| Files.delete(fs.get().getPath("binpatches.pack.lzma")); | ||
| } | ||
|
|
||
| // Older versions of Forge rely on utility classes from log4j-core 2.0-beta9 but we'll upgrade the runtime to a |
| @@ -128,7 +128,7 @@ protected LoomGradleExtensionApiImpl(Project project, LoomFiles directories) { | |||
| .convention(project.provider(() -> !isForge())); | |||
| this.modProvidedJavadoc.finalizeValueOnRead(); | |||
| this.intermediary = project.getObjects().property(String.class) | |||
| .convention("https://maven.fabricmc.net/net/fabricmc/intermediary/%1$s/intermediary-%1$s-v2.jar"); | |||
| .convention(true ? "https://maven.legacyfabric.net/net/legacyfabric/v2/intermediary/%1$s/intermediary-%1$s-v2.jar" : "https://maven.fabricmc.net/net/fabricmc/intermediary/%1$s/intermediary-%1$s-v2.jar"); | |||
There was a problem hiding this comment.
We are not going to depend on legacy fabric. Loom has an option to not use intermediary at all
There was a problem hiding this comment.
Not sure if there is something else broken or I was just using it incorrectly but when I tried to use that one it just didn't remap the classes at all.
I ended up just using generated intermediate mappings again in my port attempt: dev/1.2...EssentialGG:architectury-loom:tmp/1.2#diff-20b5dff527819597ac32d1c18d1037df3b26e7c5efcd91c742c4875d217c2d86
There was a problem hiding this comment.
…AN WORK WITHOUT INTERMEDIARY)
strongly based off of #70