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

Fixes for LBG+Diagonal Fences together

Browse Source
This commit is contained in:
embeddedt 2023-05-23 21:02:27 -04:00
parent a327b460bb
commit 214b39ce8f
No known key found for this signature in database
GPG Key ID: A69433EC199B5613
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
fabric/src/main/java/org/embeddedt/modernfix/fabric/mixin/perf/dynamic_resources/ModelBakeryMixin.java
View File

@ -44,10 +44,6 @@ import org.spongepowered.asm.mixin.Final;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Mutable; import org.spongepowered.asm.mixin.Mutable;
import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.ModifyArg;
import org.spongepowered.asm.mixin.injection.Redirect;
import org.spongepowered.asm.mixin.injection.*; import org.spongepowered.asm.mixin.injection.*;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
@ -179,7 +175,7 @@ public abstract class ModelBakeryMixin implements IExtendedModelBakery {
@Inject(method = "loadModel", at = @At(value = "HEAD"), cancellable = true) @Inject(method = "loadModel", at = @At(value = "HEAD"), cancellable = true)
private void ignoreNonFabricModel(ResourceLocation modelLocation, CallbackInfo ci) throws Exception { private void ignoreNonFabricModel(ResourceLocation modelLocation, CallbackInfo ci) throws Exception {
if(this.inTextureGatheringPass && !this.forceLoadModel && !this.injectedModels.contains(modelLocation)) { if(this.inTextureGatheringPass && this.blockStateFiles != null && !this.forceLoadModel && !this.injectedModels.contains(modelLocation)) {
// Custom model processor, try to avoid loading unwrapped models // Custom model processor, try to avoid loading unwrapped models
// First add this to the list of models to scan for textures // First add this to the list of models to scan for textures
ResourceLocation blockStateLocation = null; ResourceLocation blockStateLocation = null;
@ -210,7 +206,7 @@ public abstract class ModelBakeryMixin implements IExtendedModelBakery {
this.cacheAndQueueDependencies(modelLocation, this.missingModel); this.cacheAndQueueDependencies(modelLocation, this.missingModel);
this.forceLoadModel = false; this.forceLoadModel = false;
if(this.smallLoadingCache.get(modelLocation) != this.missingModel) { if(this.smallLoadingCache.get(modelLocation) != this.missingModel) {
/* probably a wrapped model, allow it to load normally */ // probably a wrapped model, allow it to load normally
isWrappedModel = true; isWrappedModel = true;
} }
this.smallLoadingCache.clear(); this.smallLoadingCache.clear();
@ -344,6 +340,8 @@ public abstract class ModelBakeryMixin implements IExtendedModelBakery {
@ModifyVariable(method = "cacheAndQueueDependencies", at = @At("HEAD"), argsOnly = true) @ModifyVariable(method = "cacheAndQueueDependencies", at = @At("HEAD"), argsOnly = true)
private UnbakedModel fireUnbakedEvent(UnbakedModel model, ResourceLocation location) { private UnbakedModel fireUnbakedEvent(UnbakedModel model, ResourceLocation location) {
if(this.inTextureGatheringPass)
return model;
for(ModernFixClientIntegration integration : ModernFixClient.CLIENT_INTEGRATIONS) { for(ModernFixClientIntegration integration : ModernFixClient.CLIENT_INTEGRATIONS) {
try { try {
model = integration.onUnbakedModelLoad(location, model, (ModelBakery)(Object)this); model = integration.onUnbakedModelLoad(location, model, (ModelBakery)(Object)this);