R3944Realms/ModernFix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make blockstate model loader more resilient

Browse Source
This commit is contained in:
embeddedt 2024-06-08 16:41:45 -04:00
parent a0f391e258
commit 9d584d13d2
No known key found for this signature in database
GPG Key ID: A69433EC199B5613
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_resources/BlockStateModelLoaderMixin.java
View File

@ -56,10 +56,13 @@ public abstract class BlockStateModelLoaderMixin implements IBlockStateModelLoad
ModernFix.LOGGER.error("Exception filtering states on {}", location, e); ModernFix.LOGGER.error("Exception filtering states on {}", location, e);
filteredStates = null; filteredStates = null;
} }
try {
this.loadBlockStateDefinitions(location.id(), optionalBlock.get().getStateDefinition()); this.loadBlockStateDefinitions(location.id(), optionalBlock.get().getStateDefinition());
} finally {
filteredStates = null; filteredStates = null;
} }
} }
}
@Redirect(method = "loadAllBlockStates", at = @At(value = "INVOKE", target = "Lnet/minecraft/core/DefaultedRegistry;iterator()Ljava/util/Iterator;")) @Redirect(method = "loadAllBlockStates", at = @At(value = "INVOKE", target = "Lnet/minecraft/core/DefaultedRegistry;iterator()Ljava/util/Iterator;"))
private Iterator<?> skipIteratingBlocks(DefaultedRegistry instance) { private Iterator<?> skipIteratingBlocks(DefaultedRegistry instance) {