Merge 1.18 into 1.19.2

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

View File

@ -42,8 +42,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")));