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

Fixed missing variant logging; added the possibility to specify the item variant in the blockstate json.

Browse source
This commit is contained in:
RainWarrior 2015-06-04 18:07:03 +03:00
parent 897d41fa77
commit 685a97fd93
1 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -91,7 +91,8 @@ public class ModelLoader extends ModelBakery
isLoading = true; isLoading = true;
loadBlocks(); loadBlocks();
loadItems(); loadItems();
stateModels.put(MODEL_MISSING, getModel(new ResourceLocation(MODEL_MISSING.getResourceDomain(), MODEL_MISSING.getResourcePath()))); IModel missing = getModel(new ResourceLocation(MODEL_MISSING.getResourceDomain(), MODEL_MISSING.getResourcePath()));
stateModels.put(MODEL_MISSING, missing);
textures.remove(TextureMap.LOCATION_MISSING_TEXTURE); textures.remove(TextureMap.LOCATION_MISSING_TEXTURE);
textures.addAll(LOCATIONS_BUILTIN_TEXTURES); textures.addAll(LOCATIONS_BUILTIN_TEXTURES);
textureMap.loadSprites(resourceManager, new IIconCreator() textureMap.loadSprites(resourceManager, new IIconCreator()
@ -106,10 +107,18 @@ public class ModelLoader extends ModelBakery
}); });
sprites.put(new ResourceLocation("missingno"), textureMap.getMissingSprite()); sprites.put(new ResourceLocation("missingno"), textureMap.getMissingSprite());
Function<ResourceLocation, TextureAtlasSprite> textureGetter = Functions.forMap(sprites, textureMap.getMissingSprite()); Function<ResourceLocation, TextureAtlasSprite> textureGetter = Functions.forMap(sprites, textureMap.getMissingSprite());
IFlexibleBakedModel missingBaked = missing.bake(missing.getDefaultState(), Attributes.DEFAULT_BAKED_FORMAT, textureGetter);
for(Entry<ModelResourceLocation, IModel> e : stateModels.entrySet()) for(Entry<ModelResourceLocation, IModel> e : stateModels.entrySet())
{
if(e.getValue() == getMissingModel())
{
bakedRegistry.putObject(e.getKey(), missingBaked);
}
else
{ {
bakedRegistry.putObject(e.getKey(), e.getValue().bake(e.getValue().getDefaultState(), Attributes.DEFAULT_BAKED_FORMAT, textureGetter)); bakedRegistry.putObject(e.getKey(), e.getValue().bake(e.getValue().getDefaultState(), Attributes.DEFAULT_BAKED_FORMAT, textureGetter));
} }
}
return bakedRegistry; return bakedRegistry;
} }
@ -159,7 +168,8 @@ public class ModelLoader extends ModelBakery
IModel model = getModel(file); IModel model = getModel(file);
if(model == null || model == getMissingModel()) if(model == null || model == getMissingModel())
{ {
missingVariants.add(memory); FMLLog.fine("Item json isn't found for '" + memory + "', trying to load the variant from the blockstate json");
registerVariant(getModelBlockDefinition(memory), memory);
} }
else stateModels.put(memory, model); else stateModels.put(memory, model);
} }
@ -569,9 +579,11 @@ public class ModelLoader extends ModelBakery
public void onPostBakeEvent(IRegistry modelRegistry) public void onPostBakeEvent(IRegistry modelRegistry)
{ {
Object missingModel = modelRegistry.getObject(MODEL_MISSING);
for(ModelResourceLocation missing : missingVariants) for(ModelResourceLocation missing : missingVariants)
{ {
if(modelRegistry.getObject(missing) == null) Object model = modelRegistry.getObject(missing);
if(model == null || model == missingModel)
{ {
FMLLog.severe("Model definition for location %s not found", missing); FMLLog.severe("Model definition for location %s not found", missing);
} }