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

Freeze model bakery later to allow for mutation in event

Browse Source
This commit is contained in:
embeddedt 2024-06-14 19:19:52 -04:00
parent 1b6075562c
commit 700ccc25b7
No known key found for this signature in database
GPG Key ID: A69433EC199B5613
3 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_resources/ModelBakeryMixin.java
View File

@ -151,7 +151,6 @@ public abstract class ModelBakeryMixin implements IExtendedModelBakery {
@Inject(method = "bakeModels", at = @At("RETURN")) @Inject(method = "bakeModels", at = @At("RETURN"))
private void onInitialBakeFinish(ModelBakery.TextureGetter textureGetter, CallbackInfo ci) { private void onInitialBakeFinish(ModelBakery.TextureGetter textureGetter, CallbackInfo ci) {
inInitialLoad = false;
var permanentMRLs = new ObjectOpenHashSet<>(this.bakedTopLevelModels.keySet()); var permanentMRLs = new ObjectOpenHashSet<>(this.bakedTopLevelModels.keySet());
((LRUMap<ModelResourceLocation, BakedModel>)this.bakedTopLevelModels).setPermanentEntries(permanentMRLs); ((LRUMap<ModelResourceLocation, BakedModel>)this.bakedTopLevelModels).setPermanentEntries(permanentMRLs);
ModernFix.LOGGER.info("Dynamic model bakery initial baking finished, with {} permanent top level baked models", this.bakedTopLevelModels.size()); ModernFix.LOGGER.info("Dynamic model bakery initial baking finished, with {} permanent top level baked models", this.bakedTopLevelModels.size());
@ -177,6 +176,11 @@ public abstract class ModelBakeryMixin implements IExtendedModelBakery {
((LRUMap<?, ?>)this.bakedTopLevelModels).dropEntriesToMeetSize(MAXIMUM_CACHE_SIZE); ((LRUMap<?, ?>)this.bakedTopLevelModels).dropEntriesToMeetSize(MAXIMUM_CACHE_SIZE);
} }
@Override
public void mfix$finishLoading() {
inInitialLoad = false;
}
@Override @Override
public void mfix$tick() { public void mfix$tick() {
if(inInitialLoad) { if(inInitialLoad) {

7
common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_resources/ModelManagerMixin.java
View File

@ -1,6 +1,7 @@
package org.embeddedt.modernfix.common.mixin.perf.dynamic_resources; package org.embeddedt.modernfix.common.mixin.perf.dynamic_resources;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import com.llamalad7.mixinextras.sugar.Local;
import net.minecraft.client.renderer.block.model.BlockModel; import net.minecraft.client.renderer.block.model.BlockModel;
import net.minecraft.client.resources.model.AtlasSet; import net.minecraft.client.resources.model.AtlasSet;
import net.minecraft.client.resources.model.BakedModel; import net.minecraft.client.resources.model.BakedModel;
@ -23,6 +24,7 @@ import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.Unique; import org.spongepowered.asm.mixin.Unique;
import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Coerce;
import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.Redirect; import org.spongepowered.asm.mixin.injection.Redirect;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
@ -95,6 +97,11 @@ public class ModelManagerMixin implements IExtendedModelManager {
tickHandler = ((IExtendedModelBakery)modelBakery)::mfix$tick; tickHandler = ((IExtendedModelBakery)modelBakery)::mfix$tick;
} }
@Inject(method = "apply", at = @At("RETURN"))
private void freezeBakery(@Coerce Object reloadState, ProfilerFiller profilerFiller, CallbackInfo ci, @Local(ordinal = 0) ModelBakery bakery) {
((IExtendedModelBakery)bakery).mfix$finishLoading();
}
@Override @Override
public void mfix$tick() { public void mfix$tick() {
tickHandler.run(); tickHandler.run();

1
common/src/main/java/org/embeddedt/modernfix/duck/IExtendedModelBakery.java
View File

@ -2,4 +2,5 @@ package org.embeddedt.modernfix.duck;
public interface IExtendedModelBakery { public interface IExtendedModelBakery {
void mfix$tick(); void mfix$tick();
void mfix$finishLoading();
} }