From ca18dc40cbaef04fca44dea4c55d1c81a059cf60 Mon Sep 17 00:00:00 2001 From: makamys Date: Sat, 4 Mar 2023 18:15:52 +0100 Subject: [PATCH] Fix modid decorator not parsing v2 mcmod.infos properly This was causing mods like BugTorch 1.2.5 and ModernSplash 2c17c9a to appear as (unknown) in error messages. --- .../unimixins/mixin/MixinModidDecorator.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/module-mixin/src/main/java/io/github/legacymoddingmc/unimixins/mixin/MixinModidDecorator.java b/module-mixin/src/main/java/io/github/legacymoddingmc/unimixins/mixin/MixinModidDecorator.java index 180f5f1..bf61412 100644 --- a/module-mixin/src/main/java/io/github/legacymoddingmc/unimixins/mixin/MixinModidDecorator.java +++ b/module-mixin/src/main/java/io/github/legacymoddingmc/unimixins/mixin/MixinModidDecorator.java @@ -80,7 +80,7 @@ public final class MixinModidDecorator { if (root.isJsonArray()) { return Arrays.asList(new Gson().fromJson(new InputStreamReader(url.openStream()), ModMetadata[].class)); } else { - return Arrays.asList(new Gson().fromJson(new InputStreamReader(url.openStream()), ModMetadata.class)); + return ((ModMetadataCollection)new Gson().fromJson(new InputStreamReader(url.openStream()), ModMetadataCollection.class)).modList; } } catch (Exception e) { logger.warn("Failed to parse mcmod.info at " + url + ": " + e); @@ -103,4 +103,8 @@ public final class MixinModidDecorator { String modid; } -} \ No newline at end of file + private static class ModMetadataCollection { + List modList; + } + +}