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

fix ModelLoader.setCustomModelResourceLocation not storing same item with different metadata values

Browse source
This commit is contained in:
RainWarrior 2015-02-09 17:18:18 +03:00
parent 0e69e84d89
commit dfc2e04255
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/main/java/net/minecraftforge/client/model/ModelLoader.java
View file

@ -460,11 +460,11 @@ public class ModelLoader extends ModelBakery
}
private static final Map<RegistryDelegate<Item>, ItemMeshDefinition> customMeshDefinitions = com.google.common.collect.Maps.newHashMap();
private static final Map<RegistryDelegate<Item>, Pair<Integer, ModelResourceLocation>> customModels = com.google.common.collect.Maps.newHashMap();
private static final Map<Pair<RegistryDelegate<Item>, Integer>, ModelResourceLocation> customModels = com.google.common.collect.Maps.newHashMap();
public static void setCustomModelResourceLocation(Item item, int metadata, ModelResourceLocation model)
{
customModels.put(item.delegate, Pair.of(metadata, model));
customModels.put(Pair.of(item.delegate, metadata), model);
}
public static void setCustomMeshDefinition(Item item, ItemMeshDefinition meshDefinition)
@ -478,9 +478,9 @@ public class ModelLoader extends ModelBakery
{
mesher.register(e.getKey().get(), e.getValue());
}
for (Entry<RegistryDelegate<Item>, Pair<Integer, ModelResourceLocation>> e : customModels.entrySet())
for (Entry<Pair<RegistryDelegate<Item>, Integer>, ModelResourceLocation> e : customModels.entrySet())
{
mesher.register(e.getKey().get(), e.getValue().getLeft(), e.getValue().getRight());
mesher.register(e.getKey().getLeft().get(), e.getKey().getRight(), e.getValue());
}
}
}