diff --git a/src/main/java/org/quiltmc/loader/impl/plugin/QuiltPluginManagerImpl.java b/src/main/java/org/quiltmc/loader/impl/plugin/QuiltPluginManagerImpl.java index 512c940ae..79e6b2848 100644 --- a/src/main/java/org/quiltmc/loader/impl/plugin/QuiltPluginManagerImpl.java +++ b/src/main/java/org/quiltmc/loader/impl/plugin/QuiltPluginManagerImpl.java @@ -959,8 +959,8 @@ private void appendModTable(Consumer to) { // - loader plugin // - source path(s) row.put(modColumn, mod.metadata().name()); - row.put(id, mod.metadata().id()); - row.put(version, mod.metadata().version()); + row.put(id, mod.id()); + row.put(version, mod.version()); row.put(plugin, mod.loader().pluginId()); StringBuilder flagStr = new StringBuilder(); flagStr.append(theQuiltPlugin.hasDepsChanged(mod) ? QuiltLoaderImpl.FLAG_DEPS_CHANGED : '.'); diff --git a/src/main/java/org/quiltmc/loader/impl/plugin/SolverErrorHelper.java b/src/main/java/org/quiltmc/loader/impl/plugin/SolverErrorHelper.java index 32212ac0e..986c343cb 100644 --- a/src/main/java/org/quiltmc/loader/impl/plugin/SolverErrorHelper.java +++ b/src/main/java/org/quiltmc/loader/impl/plugin/SolverErrorHelper.java @@ -140,7 +140,7 @@ void reportSolverError(Collection rules) { for (LoadOption load: rule.getNodesFrom()) graph.computeIfAbsent(options.get(load), option -> new ArrayList<>()) - .add(new BreaksAll(breaks)); + .add(new BreaksAll(breaks, (QuiltRuleBreakAll) rule)); } else if (rule instanceof QuiltRuleBreakOnly) { Option breaks = rule.getNodesTo().stream() .map(options::get) @@ -149,7 +149,7 @@ void reportSolverError(Collection rules) { for (LoadOption load: rule.getNodesFrom()) graph.computeIfAbsent(options.get(load), option -> new ArrayList<>()) - .add(new Breaks(breaks)); + .add(new Breaks(breaks, ((QuiltRuleBreakOnly) rule))); } else if (rule instanceof QuiltRuleDepAny) { Set