Merge 1.19.2 into 1.20

embeddedt · embeddedt · commit ebb4f26777c1 · 2024-03-17T15:55:35.000-04:00
diff --git a/forge/src/main/java/org/embeddedt/modernfix/forge/dynresources/ModelBakeEventHelper.java b/forge/src/main/java/org/embeddedt/modernfix/forge/dynresources/ModelBakeEventHelper.java
@@ -43,8 +43,9 @@ public ModelBakeEventHelper(Map<ResourceLocation, BakedModel> modelRegistry) {
         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")));

Original file line number	Diff line number	Diff line change
`@@ -43,8 +43,9 @@ public ModelBakeEventHelper(Map<ResourceLocation, BakedModel> modelRegistry) {`
`43`	`43`	`this.topLevelModelLocations = new HashSet<>(modelRegistry.keySet());`
`44`	`44`	`// Skip going through ModelLocationCache because most of the accesses will be misses`
`45`	`45`	`for(Block block : ForgeRegistries.BLOCKS) {`
	`46`	`+ ResourceLocation name = block.delegate.name();`
`46`	`47`	`for(BlockState state : block.getStateDefinition().getPossibleStates()) {`
`47`		`- topLevelModelLocations.add(BlockModelShaper.stateToModelLocation(state));`
	`48`	`+ topLevelModelLocations.add(BlockModelShaper.stateToModelLocation(name, state));`
`48`	`49`	`}`
`49`	`50`	`}`
`50`	`51`	`ForgeRegistries.ITEMS.getKeys().forEach(key -> topLevelModelLocations.add(new ModelResourceLocation(key, "inventory")));`