keith
/
ForgePatch
1
0
Fork 0
Code Issues Pull Requests Projects Releases 2 Wiki Activity

Fixed partial variant detection in the forge blockstate loader.

This commit is contained in:
RainWarrior 2015-06-04 16:59:18 +03:00
parent 5064d33519
commit 897d41fa77
1 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/main/java/net/minecraftforge/client/model/ForgeBlockStateV1.java
View File

@ -56,30 +56,34 @@ public class ForgeBlockStateV1 extends Marker
for (Entry<String, JsonElement> e : JsonUtils.getJsonObject(json, "variants").entrySet()) for (Entry<String, JsonElement> e : JsonUtils.getJsonObject(json, "variants").entrySet())
{ {
if (e.getKey().contains("=")) //Normal fully defined variant if (e.getValue().isJsonArray())
{ {
if (e.getValue().isJsonArray()) // array of fully-defined variants
{ for (JsonElement a : e.getValue().getAsJsonArray())
for (JsonElement a : e.getValue().getAsJsonArray())
{
Variant.Deserializer.INSTANCE.simpleSubmodelKey = e.getKey();
specified.put(e.getKey(), (ForgeBlockStateV1.Variant)context.deserialize(a, ForgeBlockStateV1.Variant.class));
}
}
else
{ {
Variant.Deserializer.INSTANCE.simpleSubmodelKey = e.getKey(); Variant.Deserializer.INSTANCE.simpleSubmodelKey = e.getKey();
specified.put(e.getKey(), (ForgeBlockStateV1.Variant)context.deserialize(e.getValue(), ForgeBlockStateV1.Variant.class)); specified.put(e.getKey(), (ForgeBlockStateV1.Variant)context.deserialize(a, ForgeBlockStateV1.Variant.class));
} }
} }
else else
{ {
Map<String, ForgeBlockStateV1.Variant> subs = Maps.newHashMap(); JsonObject obj = e.getValue().getAsJsonObject();
condensed.put(e.getKey(), subs); if(obj.entrySet().iterator().next().getValue().isJsonObject())
for (Entry<String, JsonElement> se : e.getValue().getAsJsonObject().entrySet())
{ {
Variant.Deserializer.INSTANCE.simpleSubmodelKey = e.getKey() + "=" + se.getKey(); // first value is a json object, so we know it's not a fully-defined variant
subs.put(se.getKey(), (ForgeBlockStateV1.Variant)context.deserialize(se.getValue(), ForgeBlockStateV1.Variant.class)); Map<String, ForgeBlockStateV1.Variant> subs = Maps.newHashMap();
condensed.put(e.getKey(), subs);
for (Entry<String, JsonElement> se : e.getValue().getAsJsonObject().entrySet())
{
Variant.Deserializer.INSTANCE.simpleSubmodelKey = e.getKey() + "=" + se.getKey();
subs.put(se.getKey(), (ForgeBlockStateV1.Variant)context.deserialize(se.getValue(), ForgeBlockStateV1.Variant.class));
}
}
else
{
// fully-defined variant
Variant.Deserializer.INSTANCE.simpleSubmodelKey = e.getKey();
specified.put(e.getKey(), (ForgeBlockStateV1.Variant)context.deserialize(e.getValue(), ForgeBlockStateV1.Variant.class));
} }
} }
} }
@ -178,7 +182,8 @@ public class ForgeBlockStateV1 extends Marker
{ {
if (depth == sorted.size()) if (depth == sorted.size())
{ {
ret.put(prefix, parent); if(parent != null)
ret.put(prefix, parent);
return ret; return ret;
} }