diff options
| author | Juuxel <6596629+Juuxel@users.noreply.github.com> | 2020-12-02 21:35:43 +0200 |
|---|---|---|
| committer | Juuxel <6596629+Juuxel@users.noreply.github.com> | 2020-12-02 21:35:43 +0200 |
| commit | ee64d34bdb92eb477d5b40a2402515583b5e8a29 (patch) | |
| tree | 580f68db607d4516d6056c84af01c8216056b66b /src/main | |
| parent | 5a8cd5ce9ff8e680c91d4f23f461659859171e08 (diff) | |
| download | architectury-loom-ee64d34bdb92eb477d5b40a2402515583b5e8a29.tar.gz architectury-loom-ee64d34bdb92eb477d5b40a2402515583b5e8a29.tar.bz2 architectury-loom-ee64d34bdb92eb477d5b40a2402515583b5e8a29.zip | |
Revert unnecessary custom changes
Diffstat (limited to 'src/main')
| -rw-r--r-- | src/main/java/net/fabricmc/loom/AbstractPlugin.java | 2 | ||||
| -rw-r--r-- | src/main/java/net/fabricmc/loom/util/accesswidener/AccessWidenerJarProcessor.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/net/fabricmc/loom/AbstractPlugin.java b/src/main/java/net/fabricmc/loom/AbstractPlugin.java index 78a26ab6..5077decc 100644 --- a/src/main/java/net/fabricmc/loom/AbstractPlugin.java +++ b/src/main/java/net/fabricmc/loom/AbstractPlugin.java @@ -288,9 +288,9 @@ public class AbstractPlugin implements Plugin<Project> { if (!remapJarTask.getInput().isPresent()) { jarTask.setClassifier("dev"); remapJarTask.setClassifier(""); + remapJarTask.getInput().set(jarTask.getArchivePath()); if (extension.isForge()) { - remapJarTask.getInput().set(jarTask.getArchivePath()); remapJarTask.getToM().set("srg"); } } diff --git a/src/main/java/net/fabricmc/loom/util/accesswidener/AccessWidenerJarProcessor.java b/src/main/java/net/fabricmc/loom/util/accesswidener/AccessWidenerJarProcessor.java index 04794b50..aa02c2d1 100644 --- a/src/main/java/net/fabricmc/loom/util/accesswidener/AccessWidenerJarProcessor.java +++ b/src/main/java/net/fabricmc/loom/util/accesswidener/AccessWidenerJarProcessor.java @@ -87,7 +87,7 @@ public class AccessWidenerJarProcessor implements JarProcessor { //Remap accessWidener if its not named, allows for AE's to be written in intermediary if (!accessWidener.getNamespace().equals("named")) { try { - TinyRemapper tinyRemapper = loomGradleExtension.getMinecraftMappedProvider().getTinyRemapper("intermediary", "named"); + TinyRemapper tinyRemapper = loomGradleExtension.getMinecraftMappedProvider().getTinyRemapper("official", "named"); tinyRemapper.readClassPath(loomGradleExtension.getMinecraftMappedProvider().getRemapClasspath()); AccessWidenerRemapper remapper = new AccessWidenerRemapper(accessWidener, tinyRemapper.getRemapper(), "named"); |