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

Improve dynamic resources performance when mods iterate the whole model map

Browse Source
This commit is contained in:
embeddedt 2026-04-11 11:50:05 -04:00
parent 7a8f40d0f9
commit 8e2d6968a0
No known key found for this signature in database
GPG Key ID: A69433EC199B5613
1 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/main/java/org/embeddedt/modernfix/dynresources/DynamicModelSystem.java
View File

@ -20,6 +20,7 @@ import net.minecraft.client.resources.model.ResolvedModel;
import net.minecraft.client.resources.model.UnbakedModel;
import net.minecraft.client.resources.model.cuboid.ItemModelGenerator;
import net.minecraft.client.resources.model.cuboid.MissingCuboidModel;
import net.minecraft.core.registries.BuiltInRegistries;
import net.minecraft.resources.FileToIdConverter;
import net.minecraft.resources.Identifier;
import net.minecraft.server.packs.resources.Resource;
@ -73,7 +74,25 @@ public class DynamicModelSystem {
}
public static Set<BlockState> getAllBlockStates() {
return ReferenceSets.unmodifiable(((IdMapperAccessor<BlockState>) Block.BLOCK_STATE_REGISTRY).getReferenceMap().keySet());
var blockStateSet = ((IdMapperAccessor<BlockState>) Block.BLOCK_STATE_REGISTRY).getReferenceMap().keySet();
return new AbstractSet<>() {
@Override
public Iterator<BlockState> iterator() {
// We explicitly override iterator() and handle it differently so that mods iterating the maps
// are likely to work with the same block many times in a row, which hits our caches better
return BuiltInRegistries.BLOCK.stream().flatMap(b -> b.getStateDefinition().getPossibleStates().stream()).iterator();
}
@Override
public boolean contains(Object o) {
return blockStateSet.contains(o);
}
@Override
public int size() {
return blockStateSet.size();
}
};
}
public static BlockStateModelLoader.LoadedModels createDynamicBlockStateLoadedModels(Map<Identifier, List<Resource>> resourceMap, SingleBlockStateEntryLoader entryLoader) {