From a3e7435c615922cb00318f70dc1d616274b5e631 Mon Sep 17 00:00:00 2001 From: embeddedt <42941056+embeddedt@users.noreply.github.com> Date: Tue, 25 Apr 2023 11:10:09 -0400 Subject: [PATCH 1/2] Correctly emulate nullishness of baked top level model map --- .../DynamicBakedModelProvider.java | 24 ++++++++++++++++--- .../dynamic_resources/ModelBakeryMixin.java | 16 ++++++++++++- 2 files changed, 36 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/embeddedt/modernfix/dynamicresources/DynamicBakedModelProvider.java b/src/main/java/org/embeddedt/modernfix/dynamicresources/DynamicBakedModelProvider.java index 74fca3d5..3b21d552 100644 --- a/src/main/java/org/embeddedt/modernfix/dynamicresources/DynamicBakedModelProvider.java +++ b/src/main/java/org/embeddedt/modernfix/dynamicresources/DynamicBakedModelProvider.java @@ -5,6 +5,7 @@ import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap; import it.unimi.dsi.fastutil.objects.ObjectOpenHashSet; import net.minecraft.client.resources.model.BakedModel; import net.minecraft.client.resources.model.BlockModelRotation; +import net.minecraft.client.resources.model.BuiltInModel; import net.minecraft.client.resources.model.ModelBakery; import net.minecraft.resources.ResourceLocation; import org.apache.commons.lang3.tuple.Triple; @@ -22,12 +23,19 @@ public class DynamicBakedModelProvider implements Map, BakedModel> bakedCache; private final Map permanentOverrides; + private BakedModel missingModel; + private static final BakedModel SENTINEL = new BuiltInModel(null, null, null, false); public DynamicBakedModelProvider(ModelBakery bakery, Map, BakedModel> cache) { this.bakery = bakery; this.bakedCache = cache; this.permanentOverrides = new Object2ObjectOpenHashMap<>(); } + + public void setMissingModel(BakedModel model) { + this.missingModel = model; + } + private static Triple vanillaKey(Object o) { return Triple.of((ResourceLocation)o, BlockModelRotation.X0_Y0.getRotation(), false); } @@ -43,7 +51,7 @@ public class DynamicBakedModelProvider implements Map textureGetter); + private Cache, BakedModel> loadedBakedModels; private Cache loadedModels; @@ -322,6 +324,8 @@ public abstract class ModelBakeryMixin implements IExtendedModelBakery { @Inject(method = "uploadTextures", at = @At(value = "FIELD", target = "Lnet/minecraft/client/resources/model/ModelBakery;topLevelModels:Ljava/util/Map;", ordinal = 0), cancellable = true) private void skipBake(TextureManager resourceManager, ProfilerFiller profiler, CallbackInfoReturnable cir) { profiler.pop(); + // ensure missing model is a permanent override + this.bakedTopLevelModels.put(MISSING_MODEL_LOCATION, this.getBakedModel(MISSING_MODEL_LOCATION, BlockModelRotation.X0_Y0, this.atlasSet::getSprite)); cir.setReturnValue(atlasSet); } @@ -446,6 +450,8 @@ public abstract class ModelBakeryMixin implements IExtendedModelBakery { return loadOnlyRelevantBlockState(stateDefinition, location); } + private BakedModel bakedMissingModel = null; + @Inject(method = "getBakedModel", at = @At("HEAD"), cancellable = true) public void getOrLoadBakedModelDynamic(ResourceLocation arg, ModelState arg2, Function textureGetter, CallbackInfoReturnable cir) { Triple triple = Triple.of(arg, arg2.getRotation(), arg2.isUvLocked()); @@ -468,7 +474,15 @@ public abstract class ModelBakeryMixin implements IExtendedModelBakery { } } if(ibakedmodel == null) { - ibakedmodel = iunbakedmodel.bake((ModelBakery) (Object) this, textureGetter, arg2, arg); + if(iunbakedmodel == missingModel) { + // use a shared baked missing model + if(bakedMissingModel == null) { + bakedMissingModel = iunbakedmodel.bake((ModelBakery) (Object) this, textureGetter, arg2, arg); + ((DynamicBakedModelProvider)this.bakedTopLevelModels).setMissingModel(bakedMissingModel); + } + ibakedmodel = bakedMissingModel; + } else + ibakedmodel = iunbakedmodel.bake((ModelBakery) (Object) this, textureGetter, arg2, arg); } DynamicModelBakeEvent event = new DynamicModelBakeEvent(arg, iunbakedmodel, ibakedmodel, (ModelLoader)(Object)this); MinecraftForge.EVENT_BUS.post(event); From e771af233009391dd511551ee49da3fbe0f4c7d9 Mon Sep 17 00:00:00 2001 From: embeddedt <42941056+embeddedt@users.noreply.github.com> Date: Tue, 25 Apr 2023 11:33:26 -0400 Subject: [PATCH 2/2] AE2 model wrapping support --- build.gradle | 1 + .../ae2/RegistrationMixin.java | 58 +++++++++++++++++++ src/main/resources/modernfix.mixins.json | 1 + 3 files changed, 60 insertions(+) create mode 100644 src/main/java/org/embeddedt/modernfix/mixin/perf/dynamic_resources/ae2/RegistrationMixin.java diff --git a/build.gradle b/build.gradle index c4d6480f..f5df1f37 100644 --- a/build.gradle +++ b/build.gradle @@ -102,6 +102,7 @@ dependencies { modCompileOnly("curse.maven:supermartijncore-454372:4455378") modCompileOnly("curse.maven:valhesiastructures-347488:3476252") modCompileOnly files("deps/starlight-1.2.jar") + modCompileOnly("appeng:appliedenergistics2:8.4.7") } tasks.withType(JavaCompile) { diff --git a/src/main/java/org/embeddedt/modernfix/mixin/perf/dynamic_resources/ae2/RegistrationMixin.java b/src/main/java/org/embeddedt/modernfix/mixin/perf/dynamic_resources/ae2/RegistrationMixin.java new file mode 100644 index 00000000..a04946a8 --- /dev/null +++ b/src/main/java/org/embeddedt/modernfix/mixin/perf/dynamic_resources/ae2/RegistrationMixin.java @@ -0,0 +1,58 @@ +package org.embeddedt.modernfix.mixin.perf.dynamic_resources.ae2; + +import appeng.bootstrap.components.IModelBakeComponent; +import appeng.bootstrap.components.ModelOverrideComponent; +import appeng.core.Api; +import appeng.core.AppEng; +import net.minecraft.client.resources.model.BakedModel; +import net.minecraft.client.resources.model.ModelBakery; +import net.minecraft.resources.ResourceLocation; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.fml.common.ObfuscationReflectionHelper; +import org.embeddedt.modernfix.ModernFix; +import org.embeddedt.modernfix.dynamicresources.DynamicModelBakeEvent; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +import java.lang.reflect.Field; +import java.util.Map; +import java.util.function.BiFunction; + +@Mixin(targets = { "appeng/core/Registration" }) +public class RegistrationMixin { + private static Field customizerField; + @Inject(method = "registerClientEvents", at = @At("TAIL"), remap = false) + private void doRegisterDynBake(CallbackInfo ci) { + MinecraftForge.EVENT_BUS.addListener(this::onDynamicModelBake); + customizerField = ObfuscationReflectionHelper.findField(ModelOverrideComponent.class, "customizer"); + } + + private void onDynamicModelBake(DynamicModelBakeEvent event) { + if (!event.getLocation().getNamespace().equals(AppEng.MOD_ID)) { + return; + } + BakedModel missing = event.getModelLoader().getBakedTopLevelModels().get(ModelBakery.MISSING_MODEL_LOCATION); + if(event.getModel() == missing) + return; + Api.INSTANCE.definitions().getRegistry().getBootstrapComponents(IModelBakeComponent.class).forEachRemaining(c -> { + if(c instanceof ModelOverrideComponent) + handleModelOverride((ModelOverrideComponent)c, event); + }); + } + + private void handleModelOverride(ModelOverrideComponent c, DynamicModelBakeEvent event) { + Map> customizer; + try { + customizer = (Map>)customizerField.get(c); + } catch(ReflectiveOperationException e) { + ModernFix.LOGGER.error("Can't replace model", e); + return; + } + BiFunction fn = customizer.get(event.getLocation().getPath()); + if(fn != null) { + event.setModel(fn.apply(event.getLocation(), event.getModel())); + } + } +} diff --git a/src/main/resources/modernfix.mixins.json b/src/main/resources/modernfix.mixins.json index 5be112b9..81f58eb4 100644 --- a/src/main/resources/modernfix.mixins.json +++ b/src/main/resources/modernfix.mixins.json @@ -86,6 +86,7 @@ "perf.dynamic_resources.BlockModelShaperMixin", "perf.dynamic_resources.ItemModelShaperMixin", "perf.dynamic_resources.ModelBakeryMixin", + "perf.dynamic_resources.ae2.RegistrationMixin", "perf.dynamic_resources.ctm.TextureMetadataHandlerMixin", "perf.dynamic_resources.ctm.CTMPackReloadListenerMixin", "perf.dynamic_resources.supermartijncore.ClientRegistrationHandlerMixin",