Make blockstate model loader more resilient

embeddedt · embeddedt · commit 9d584d13d20b · 2024-06-08T16:41:45.000-04:00
diff --git a/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_resources/BlockStateModelLoaderMixin.java b/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_resources/BlockStateModelLoaderMixin.java
@@ -56,8 +56,11 @@ public void loadSpecificBlock(ModelResourceLocation location) {
                 ModernFix.LOGGER.error("Exception filtering states on {}", location, e);
                 filteredStates = null;
             }
-            this.loadBlockStateDefinitions(location.id(), optionalBlock.get().getStateDefinition());
-            filteredStates = null;
+            try {
+                this.loadBlockStateDefinitions(location.id(), optionalBlock.get().getStateDefinition());
+            } finally {
+                filteredStates = null;
+            }
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -56,8 +56,11 @@ public void loadSpecificBlock(ModelResourceLocation location) {`
`56`	`56`	`ModernFix.LOGGER.error("Exception filtering states on {}", location, e);`
`57`	`57`	`filteredStates = null;`
`58`	`58`	`}`
`59`		`- this.loadBlockStateDefinitions(location.id(), optionalBlock.get().getStateDefinition());`
`60`		`- filteredStates = null;`
	`59`	`+ try {`
	`60`	`+ this.loadBlockStateDefinitions(location.id(), optionalBlock.get().getStateDefinition());`
	`61`	`+ } finally {`
	`62`	`+ filteredStates = null;`
	`63`	`+ }`
`61`	`64`	`}`
`62`	`65`	`}`
`63`	`66`