Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,8 @@

public class MetadataCollection
{
private String modListVersion;
private ModMetadata[] modList;
private Map<String, ModMetadata> metadatas = Maps.newHashMap();
private final Map<String, ModMetadata> metadatas = Maps.newHashMap();

public static MetadataCollection from(@Nullable InputStream inputStream, String sourceName)
{
Expand All @@ -59,8 +58,7 @@ public static MetadataCollection from(@Nullable InputStream inputStream, String
{
MetadataCollection collection;
Gson gson = new GsonBuilder().registerTypeAdapter(ArtifactVersion.class, new ArtifactVersionAdapter()).create();
JsonParser parser = new JsonParser();
JsonElement rootElement = parser.parse(reader);
JsonElement rootElement = JsonParser.parseReader(reader);
if (rootElement.isJsonArray())
{
collection = new MetadataCollection();
Expand Down
10 changes: 10 additions & 0 deletions src/main/java/net/minecraftforge/fml/common/ModMetadata.java
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,9 @@

package net.minecraftforge.fml.common;

import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;

import net.minecraftforge.fml.common.versioning.ArtifactVersion;
Expand Down Expand Up @@ -64,6 +66,14 @@ public class ModMetadata
public Set<ArtifactVersion> requiredMods = Sets.newHashSet();
public List<ArtifactVersion> dependencies = Lists.newArrayList();
public List<ArtifactVersion> dependants = Lists.newArrayList();
/**
* Use for extra data, should write it like
* "modProperties": {
* "keyA": "valueA",
* "keyB": "valueB"
* }
*/
public Map<String, String> modProperties = HashMap.newHashMap(5);
// this field is not for use in the json
public transient boolean autogenerated;

Expand Down