diff --git a/src/main/java/net/fabricmc/loom/configuration/providers/forge/ForgeRunsProvider.java b/src/main/java/net/fabricmc/loom/configuration/providers/forge/ForgeRunsProvider.java index 96818c9c..212c8755 100644 --- a/src/main/java/net/fabricmc/loom/configuration/providers/forge/ForgeRunsProvider.java +++ b/src/main/java/net/fabricmc/loom/configuration/providers/forge/ForgeRunsProvider.java @@ -73,7 +73,6 @@ public class ForgeRunsProvider { if (launchSettings != null) { launchSettings.evaluateLater(() -> { - if (value.has("args")) { launchSettings.arg(StreamSupport.stream(value.getAsJsonArray("args").spliterator(), false) .map(JsonElement::getAsString) diff --git a/src/main/java/net/fabricmc/loom/configuration/providers/forge/ForgeUserdevProvider.java b/src/main/java/net/fabricmc/loom/configuration/providers/forge/ForgeUserdevProvider.java index 04d0a667..6b0888e5 100644 --- a/src/main/java/net/fabricmc/loom/configuration/providers/forge/ForgeUserdevProvider.java +++ b/src/main/java/net/fabricmc/loom/configuration/providers/forge/ForgeUserdevProvider.java @@ -77,8 +77,6 @@ public class ForgeUserdevProvider extends DependencyProvider { addDependency(json.get("mcp").getAsString(), Constants.Configurations.SRG); addDependency(json.get("universal").getAsString(), Constants.Configurations.FORGE_UNIVERSAL); - // addDependency(new SelfBreakingDependency(), Constants.Configurations.FORGE_DEPENDENCIES); - if (Files.notExists(joinedPatches)) { Files.write(joinedPatches, ZipUtils.unpack(userdevJar.toPath(), json.get("binpatches").getAsString())); } diff --git a/src/main/java/net/fabricmc/loom/configuration/providers/forge/mcpconfig/McpExecutor.java b/src/main/java/net/fabricmc/loom/configuration/providers/forge/mcpconfig/McpExecutor.java index ba79eef5..7515e22a 100644 --- a/src/main/java/net/fabricmc/loom/configuration/providers/forge/mcpconfig/McpExecutor.java +++ b/src/main/java/net/fabricmc/loom/configuration/providers/forge/mcpconfig/McpExecutor.java @@ -49,7 +49,6 @@ import org.jetbrains.annotations.Nullable; import net.fabricmc.loom.LoomGradleExtension; import net.fabricmc.loom.configuration.providers.minecraft.MinecraftProvider; import net.fabricmc.loom.util.Constants; -import net.fabricmc.loom.util.DependencyDownloader; import net.fabricmc.loom.util.ForgeToolExecutor; import net.fabricmc.loom.util.function.CollectionUtil; diff --git a/src/main/java/net/fabricmc/loom/util/srg/RemapObjectHolderVisitor.java b/src/main/java/net/fabricmc/loom/util/srg/RemapObjectHolderVisitor.java index 08a9b4b0..b965a0fb 100644 --- a/src/main/java/net/fabricmc/loom/util/srg/RemapObjectHolderVisitor.java +++ b/src/main/java/net/fabricmc/loom/util/srg/RemapObjectHolderVisitor.java @@ -67,6 +67,7 @@ public class RemapObjectHolderVisitor extends ClassVisitor { @Override public MethodVisitor visitMethod(int access, String name, String descriptor, String signature, String[] exceptions) { MethodVisitor methodVisitor = super.visitMethod(access, name, descriptor, signature, exceptions); + if ("".equals(name) && "()V".equals(descriptor) && from != MappingTree.NULL_NAMESPACE_ID && to != MappingTree.NULL_NAMESPACE_ID) { return new MethodVisitor(api, methodVisitor) { @Override @@ -75,10 +76,12 @@ public class RemapObjectHolderVisitor extends ClassVisitor { value = mappings.mapClassName(str.replace('.', '/'), from, to) .replace('/', '.'); } + super.visitLdcInsn(value); } }; } + return methodVisitor; } } diff --git a/src/main/java/net/fabricmc/loom/util/srg/SrgMerger.java b/src/main/java/net/fabricmc/loom/util/srg/SrgMerger.java index c778830f..ad37d30c 100644 --- a/src/main/java/net/fabricmc/loom/util/srg/SrgMerger.java +++ b/src/main/java/net/fabricmc/loom/util/srg/SrgMerger.java @@ -72,7 +72,7 @@ public final class SrgMerger { private final @Nullable MemoryMappingTree extra; private final ListMultimap methodsBySrgName; - public SrgMerger(Path srg, Path tiny, @Nullable ExtraMappings extraMappings, boolean lenient) throws IOException { + private SrgMerger(Path srg, Path tiny, @Nullable ExtraMappings extraMappings, boolean lenient) throws IOException { this.srg = readSrg(srg); this.src = new MemoryMappingTree(); this.output = new MemoryMappingTree();