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

[Patch] Fix item frame rendering with dynamic resources.

Browse Source
This commit is contained in:
coredex-source 2026-01-02 00:28:22 +05:30
parent 07f4e2c6a3
commit 1a5fd8b9e8
2 changed files with 38 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_resources/BlockStateDefinitionsAccessor.java Normal file
View File

@ -0,0 +1,21 @@
package org.embeddedt.modernfix.common.mixin.perf.dynamic_resources;
import net.minecraft.client.resources.model.BlockStateDefinitions;
import net.minecraft.resources.Identifier;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.block.state.StateDefinition;
import org.embeddedt.modernfix.annotation.ClientOnlyMixin;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.gen.Accessor;
import java.util.Map;
@Mixin(BlockStateDefinitions.class)
@ClientOnlyMixin
public interface BlockStateDefinitionsAccessor {
@Accessor("STATIC_DEFINITIONS")
static Map<Identifier, StateDefinition<Block, BlockState>> getStaticDefinitions() {
throw new AssertionError();
}
}

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

@ -25,9 +25,11 @@ import net.minecraft.resources.Identifier;
import net.minecraft.server.packs.resources.Resource; import net.minecraft.server.packs.resources.Resource;
import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.block.state.StateDefinition;
import net.neoforged.neoforge.client.model.UnbakedModelParser; import net.neoforged.neoforge.client.model.UnbakedModelParser;
import net.neoforged.neoforge.client.model.standalone.StandaloneModelLoader; import net.neoforged.neoforge.client.model.standalone.StandaloneModelLoader;
import org.embeddedt.modernfix.ModernFix; import org.embeddedt.modernfix.ModernFix;
import org.embeddedt.modernfix.common.mixin.perf.dynamic_resources.BlockStateDefinitionsAccessor;
import org.embeddedt.modernfix.common.mixin.perf.dynamic_resources.IdMapperAccessor; import org.embeddedt.modernfix.common.mixin.perf.dynamic_resources.IdMapperAccessor;
import org.embeddedt.modernfix.common.mixin.perf.dynamic_resources.ModelDiscoveryAccessor; import org.embeddedt.modernfix.common.mixin.perf.dynamic_resources.ModelDiscoveryAccessor;
@ -69,11 +71,19 @@ public class DynamicModelSystem {
BlockStateModelLoader.LoadedModels loadEntry(Identifier identifier, List<Resource> blockstateResources); BlockStateModelLoader.LoadedModels loadEntry(Identifier identifier, List<Resource> blockstateResources);
} }
public static Set<BlockState> getAllBlockStates() {
return ReferenceSets.unmodifiable(((IdMapperAccessor<BlockState>) Block.BLOCK_STATE_REGISTRY).getReferenceMap().keySet());
}
public static BlockStateModelLoader.LoadedModels createDynamicBlockStateLoadedModels(Map<Identifier, List<Resource>> resourceMap, SingleBlockStateEntryLoader entryLoader) { public static BlockStateModelLoader.LoadedModels createDynamicBlockStateLoadedModels(Map<Identifier, List<Resource>> resourceMap, SingleBlockStateEntryLoader entryLoader) {
Set<BlockState> allStates = new java.util.HashSet<>(((IdMapperAccessor<BlockState>) Block.BLOCK_STATE_REGISTRY).getReferenceMap().keySet());
Map<BlockState, Identifier> staticLookup = new java.util.IdentityHashMap<>();
for (var entry : BlockStateDefinitionsAccessor.getStaticDefinitions().entrySet()) {
for (BlockState state : entry.getValue().getPossibleStates()) {
allStates.add(state);
staticLookup.put(state, entry.getKey());
}
}
if (!staticLookup.isEmpty()) {
ModernFix.LOGGER.info("Registered {} states from {} static definitions for dynamic loading", staticLookup.size(), BlockStateDefinitionsAccessor.getStaticDefinitions().size());
}
LoadingCache<Identifier, BlockStateModelLoader.LoadedModels> definitionCache = CacheBuilder.newBuilder().softValues().maximumSize(1000).build(new CacheLoader<>() { LoadingCache<Identifier, BlockStateModelLoader.LoadedModels> definitionCache = CacheBuilder.newBuilder().softValues().maximumSize(1000).build(new CacheLoader<>() {
@Override @Override
public BlockStateModelLoader.LoadedModels load(Identifier key) throws Exception { public BlockStateModelLoader.LoadedModels load(Identifier key) throws Exception {
@ -85,8 +95,9 @@ public class DynamicModelSystem {
return entryLoader.loadEntry(file, resources); return entryLoader.loadEntry(file, resources);
} }
}); });
return new BlockStateModelLoader.LoadedModels(Maps.asMap(getAllBlockStates(), state -> { return new BlockStateModelLoader.LoadedModels(Maps.asMap(allStates, state -> {
var identifier = state.getBlock().builtInRegistryHolder().getKey().identifier(); Identifier staticId = staticLookup.get(state);
Identifier identifier = staticId != null ? staticId : state.getBlock().builtInRegistryHolder().getKey().identifier();
var loadedModels = definitionCache.getUnchecked(identifier); var loadedModels = definitionCache.getUnchecked(identifier);
return loadedModels.models().get(state); return loadedModels.models().get(state);
})); }));