Merge 1.19.2 into 1.20

This commit is contained in:
embeddedt 2024-03-17 15:55:35 -04:00
commit ebb4f26777
No known key found for this signature in database
GPG Key ID: A69433EC199B5613

View File

@ -43,8 +43,9 @@ public class ModelBakeEventHelper {
this.topLevelModelLocations = new HashSet<>(modelRegistry.keySet());
// Skip going through ModelLocationCache because most of the accesses will be misses
for(Block block : ForgeRegistries.BLOCKS) {
ResourceLocation name = block.delegate.name();
for(BlockState state : block.getStateDefinition().getPossibleStates()) {
topLevelModelLocations.add(BlockModelShaper.stateToModelLocation(state));
topLevelModelLocations.add(BlockModelShaper.stateToModelLocation(name, state));
}
}
ForgeRegistries.ITEMS.getKeys().forEach(key -> topLevelModelLocations.add(new ModelResourceLocation(key, "inventory")));