mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-17 02:55:17 +00:00
Fix authors - it'll read both "authors" and "authorList" from the json now
This commit is contained in:
1 parent
907cf2d925
commit
58e6dd9794
1 file changed
+2
-1
@@ -25,6 +25,7 @@ import argo.jdom.JsonStringNode;
|
|||||||
|
|
||||||
import com.google.common.base.Function;
|
import com.google.common.base.Function;
|
||||||
import com.google.common.base.Joiner;
|
import com.google.common.base.Joiner;
|
||||||
|
import com.google.common.base.Objects;
|
||||||
import com.google.common.base.Optional;
|
import com.google.common.base.Optional;
|
||||||
import com.google.common.base.Strings;
|
import com.google.common.base.Strings;
|
||||||
import com.google.common.collect.Lists;
|
import com.google.common.collect.Lists;
|
||||||
@@ -107,7 +108,7 @@ public class ModMetadata
|
|||||||
version = Strings.nullToEmpty((String)processedFields.get(aStringBuilder("version")));
|
version = Strings.nullToEmpty((String)processedFields.get(aStringBuilder("version")));
|
||||||
credits = Strings.nullToEmpty((String)processedFields.get(aStringBuilder("credits")));
|
credits = Strings.nullToEmpty((String)processedFields.get(aStringBuilder("credits")));
|
||||||
parent = Strings.nullToEmpty((String)processedFields.get(aStringBuilder("parent")));
|
parent = Strings.nullToEmpty((String)processedFields.get(aStringBuilder("parent")));
|
||||||
authorList = Optional.fromNullable((List<String>)processedFields.get(aStringBuilder("authorList"))).or(authorList);
|
authorList = Objects.firstNonNull(((List<String>)processedFields.get(aStringBuilder("authors"))),Objects.firstNonNull(((List<String>)processedFields.get(aStringBuilder("authorList"))), authorList));
|
||||||
requiredMods = processReferences((List<String>)processedFields.get(aStringBuilder("requiredMods")));
|
requiredMods = processReferences((List<String>)processedFields.get(aStringBuilder("requiredMods")));
|
||||||
dependencies = processReferences((List<String>)processedFields.get(aStringBuilder("dependencies")));
|
dependencies = processReferences((List<String>)processedFields.get(aStringBuilder("dependencies")));
|
||||||
dependants = processReferences((List<String>)processedFields.get(aStringBuilder("dependants")));
|
dependants = processReferences((List<String>)processedFields.get(aStringBuilder("dependants")));
|
||||||
|
|||||||
Reference in new issue
Block a user