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

Add ModelBakeEvent alternative for dynamic models

Browse Source
This commit is contained in:
embeddedt 2023-04-09 12:48:00 -04:00
parent a6d924535e
commit 8937ca020d
No known key found for this signature in database
GPG Key ID: A69433EC199B5613
2 changed files with 39 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/main/java/org/embeddedt/modernfix/dynamicresources/DynamicModelBakeEvent.java Normal file
View File

@ -0,0 +1,33 @@
package org.embeddedt.modernfix.dynamicresources;
import net.minecraft.client.resources.model.BakedModel;
import net.minecraft.resources.ResourceLocation;
import net.minecraftforge.eventbus.api.Event;
/**
* Fired when a model is baked dynamically. Intended to be used as a replacement for ModelBakeEvent
* if mods want to replace a model.
* <p></p>
* Note that this event can fire many times for the same resource location, as models are unloaded
* if unused/under memory pressure.
*/
public class DynamicModelBakeEvent extends Event {
private final ResourceLocation location;
private BakedModel model;
public DynamicModelBakeEvent(ResourceLocation location, BakedModel model) {
this.location = location;
this.model = model;
}
public ResourceLocation getLocation() {
return this.location;
}
public BakedModel getModel() {
return this.model;
}
public void setModel(BakedModel model) {
this.model = model;
}
}

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

@ -30,10 +30,12 @@ import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.block.state.StateDefinition;
import net.minecraftforge.client.ForgeHooksClient;
import net.minecraftforge.client.model.ModelLoaderRegistry;
import net.minecraftforge.common.MinecraftForge;
import org.apache.commons.lang3.tuple.Triple;
import org.apache.logging.log4j.Logger;
import org.embeddedt.modernfix.ModernFix;
import org.embeddedt.modernfix.dynamicresources.DynamicBakedModelProvider;
import org.embeddedt.modernfix.dynamicresources.DynamicModelBakeEvent;
import org.embeddedt.modernfix.dynamicresources.ModelLocationCache;
import org.embeddedt.modernfix.dynamicresources.ResourcePackHandler;
import org.spongepowered.asm.mixin.*;
@ -289,8 +291,10 @@ public abstract class ModelBakeryMixin {
if(ibakedmodel == null) {
ibakedmodel = iunbakedmodel.bake((ModelBakery) (Object) this, textureGetter, arg2, arg);
}
this.bakedCache.put(triple, ibakedmodel);
return ibakedmodel;
DynamicModelBakeEvent event = new DynamicModelBakeEvent(arg, ibakedmodel);
MinecraftForge.EVENT_BUS.post(event);
this.bakedCache.put(triple, event.getModel());
return event.getModel();
}
}
}