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

Do not treat invalid ModelResourceLocations as top-level when baking dynamic models

Browse Source 
Related: #379
This commit is contained in:
embeddedt 2024-03-20 10:18:45 -04:00
parent de63462363
commit 0e9d024c5d
No known key found for this signature in database
GPG Key ID: A69433EC199B5613
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
fabric/src/main/java/org/embeddedt/modernfix/fabric/mixin/perf/dynamic_resources/ModelBakerImplMixin.java
View File

@ -1,5 +1,6 @@
package org.embeddedt.modernfix.fabric.mixin.perf.dynamic_resources; package org.embeddedt.modernfix.fabric.mixin.perf.dynamic_resources;
import com.google.common.collect.ImmutableList;
import com.llamalad7.mixinextras.injector.wrapoperation.Operation; import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation; import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
import net.fabricmc.loader.api.FabricLoader; import net.fabricmc.loader.api.FabricLoader;
@ -75,9 +76,19 @@ public abstract class ModelBakerImplMixin implements IExtendedModelBaker {
synchronized (this.field_40571) { synchronized (this.field_40571) {
/* to emulate vanilla model loading, treat as top-level */ /* to emulate vanilla model loading, treat as top-level */
Optional<Block> blockOpt = Objects.equals(((ModelResourceLocation)arg).getVariant(), "inventory") ? Optional.empty() : BuiltInRegistries.BLOCK.getOptional(new ResourceLocation(arg.getNamespace(), arg.getPath())); Optional<Block> blockOpt = Objects.equals(((ModelResourceLocation)arg).getVariant(), "inventory") ? Optional.empty() : BuiltInRegistries.BLOCK.getOptional(new ResourceLocation(arg.getNamespace(), arg.getPath()));
boolean invalidMRL = false;
if(blockOpt.isPresent()) { if(blockOpt.isPresent()) {
/* load via lambda for mods that expect blockstate to get loaded */ /* load via lambda for mods that expect blockstate to get loaded */
for(BlockState state : extendedBakery.getBlockStatesForMRL(blockOpt.get().getStateDefinition(), (ModelResourceLocation)arg)) { ImmutableList<BlockState> states;
try {
states = extendedBakery.getBlockStatesForMRL(blockOpt.get().getStateDefinition(), (ModelResourceLocation)arg);
} catch(RuntimeException e) {
states = ImmutableList.of();
invalidMRL = true;
// Fall back to getModel
cir.setReturnValue(this.field_40571.getModel(arg));
}
for(BlockState state : states) {
try { try {
blockStateLoaderHandle.invokeExact(this.field_40571, state); blockStateLoaderHandle.invokeExact(this.field_40571, state);
} catch(Throwable e) { } catch(Throwable e) {
@ -87,9 +98,11 @@ public abstract class ModelBakerImplMixin implements IExtendedModelBaker {
} else { } else {
this.field_40571.loadTopLevel((ModelResourceLocation)arg); this.field_40571.loadTopLevel((ModelResourceLocation)arg);
} }
cir.setReturnValue(this.field_40571.topLevelModels.getOrDefault(arg, extendedBakery.mfix$getUnbakedMissingModel())); if(!invalidMRL) {
// avoid leaks cir.setReturnValue(this.field_40571.topLevelModels.getOrDefault(arg, extendedBakery.mfix$getUnbakedMissingModel()));
this.field_40571.topLevelModels.clear(); // avoid leaks
this.field_40571.topLevelModels.clear();
}
} }
} else } else
cir.setReturnValue(this.field_40571.getModel(arg)); cir.setReturnValue(this.field_40571.getModel(arg));