Skip to content

refactor: Unify ModMetadata parsing in Cleanroom #595

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Ecdcaeb wants to merge 3 commits into
base: main
Choose a base branch
from
Open

refactor: Unify ModMetadata parsing in Cleanroom #595

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e26d02a
Add getIds method to MetadataCollection
Ecdcaeb Aug 2, 2026
888d936
Simplify mcmod.info parsing logic
Ecdcaeb Aug 2, 2026
518dee3
Merge branch 'main' into patch-1
Ecdcaeb Aug 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 1 addition & 14 deletions src/main/java/com/cleanroommc/discovery/CleanroomModDiscoverer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -601,20 +601,7 @@ private boolean recordMod(String modId, File source) {

private void parseMcmodInfo(File file, Gson gson, InputStream stream, Set<String> ids) {
try {
JsonElement root = gson.fromJson(new InputStreamReader(stream, StandardCharsets.UTF_8), JsonElement.class);
if (root instanceof JsonArray rootArray) {
for (JsonElement element : rootArray) {
if (element instanceof JsonObject mod && mod.has("modid")) {
ids.add(mod.get("modid").getAsString());
}
}
} else if (root instanceof JsonObject rootObject && rootObject.get("modList") instanceof JsonArray modList) {
for (JsonElement element : modList) {
if (element instanceof JsonObject mod && mod.has("modid")) {
ids.add(mod.get("modid").getAsString());
}
}
}
ids.addAll(MetadataCollection.from(stream, file.getName()).getIds());
} catch (Throwable t) {
CleanroomLog.get().error("Failed to parse mcmod.info for {}", file.getName(), t);
} finally {
Expand Down
5 changes: 5 additions & 0 deletions src/main/java/net/minecraftforge/fml/common/MetadataCollection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import java.io.InputStreamReader;
import java.nio.charset.StandardCharsets;
import java.util.Map;
import java.util.Set;

import net.minecraftforge.fml.common.versioning.ArtifactVersion;
import net.minecraftforge.fml.common.versioning.VersionParser;
Expand Down Expand Up @@ -106,6 +107,10 @@ public ModMetadata getMetadataForId(String modId, Map<String, Object> extraData)
return metadatas.get(modId);
}

public Set<String> getIds() {
return metadatas.keySet();
}

public static class ArtifactVersionAdapter extends TypeAdapter<ArtifactVersion>
{

Expand Down