From 3ad3da36801fe57726f048278d7778048e72344f Mon Sep 17 00:00:00 2001 From: embeddedt <42941056+embeddedt@users.noreply.github.com> Date: Tue, 2 May 2023 21:03:40 -0400 Subject: [PATCH 1/2] Fix resource cache not being generated on Forge --- .../forge/mixin/perf/resourcepacks/ModFileResourcePackMixin.java | 1 + 1 file changed, 1 insertion(+) diff --git a/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/resourcepacks/ModFileResourcePackMixin.java b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/resourcepacks/ModFileResourcePackMixin.java index 44b8675f..08c67bba 100644 --- a/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/resourcepacks/ModFileResourcePackMixin.java +++ b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/resourcepacks/ModFileResourcePackMixin.java @@ -48,6 +48,7 @@ public abstract class ModFileResourcePackMixin { @Inject(method = "hasResource(Ljava/lang/String;)Z", at = @At(value = "HEAD"), cancellable = true) private void useCacheForExistence(String path, CallbackInfoReturnable cir) { + this.generateResourceCache(); if(cacheEngine != null) cir.setReturnValue(this.cacheEngine.hasResource(path)); } From 8f71606faddc9d722001e3b1c40b7ee1a428a867 Mon Sep 17 00:00:00 2001 From: embeddedt <42941056+embeddedt@users.noreply.github.com> Date: Tue, 2 May 2023 22:00:49 -0400 Subject: [PATCH 2/2] Fix entity renderer crash in some modpacks --- .../EntityRenderDispatcherMixin.java | 38 ++++++ .../EntityRenderersMixin.java | 107 +-------------- .../modernfix/entity/EntityRendererMap.java | 125 ++++++++++++++++++ 3 files changed, 166 insertions(+), 104 deletions(-) create mode 100644 common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_entity_renderers/EntityRenderDispatcherMixin.java create mode 100644 common/src/main/java/org/embeddedt/modernfix/entity/EntityRendererMap.java diff --git a/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_entity_renderers/EntityRenderDispatcherMixin.java b/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_entity_renderers/EntityRenderDispatcherMixin.java new file mode 100644 index 00000000..4d3f3b41 --- /dev/null +++ b/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_entity_renderers/EntityRenderDispatcherMixin.java @@ -0,0 +1,38 @@ +package org.embeddedt.modernfix.common.mixin.perf.dynamic_entity_renderers; + +import net.minecraft.client.renderer.entity.EntityRenderDispatcher; +import net.minecraft.client.renderer.entity.EntityRenderer; +import net.minecraft.world.entity.Entity; +import net.minecraft.world.entity.EntityType; +import org.embeddedt.modernfix.annotation.ClientOnlyMixin; +import org.embeddedt.modernfix.entity.EntityRendererMap; +import org.objectweb.asm.Opcodes; +import org.spongepowered.asm.mixin.Mixin; +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.Redirect; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; + +import java.util.Map; + +@Mixin(EntityRenderDispatcher.class) +@ClientOnlyMixin +public class EntityRenderDispatcherMixin { + @Shadow private Map, EntityRenderer> renderers; + + private EntityRendererMap mfix$dynamicRenderers; + + @Inject(method = "getRenderer", at = @At("RETURN"), cancellable = true) + private void checkNullness(T entity, CallbackInfoReturnable> cir) { + // apparently some mods yeet the renderers map and cause issues + if(cir.getReturnValue() == null) + cir.setReturnValue((EntityRenderer)mfix$dynamicRenderers.get(entity.getType())); + } + + @Redirect(method = "onResourceManagerReload", at = @At(value = "FIELD", opcode = Opcodes.PUTFIELD, target = "Lnet/minecraft/client/renderer/entity/EntityRenderDispatcher;renderers:Ljava/util/Map;")) + private void setRendererField(EntityRenderDispatcher instance, Map, EntityRenderer> incomingMap) { + this.renderers = incomingMap; + this.mfix$dynamicRenderers = (EntityRendererMap)incomingMap; + } +} diff --git a/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_entity_renderers/EntityRenderersMixin.java b/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_entity_renderers/EntityRenderersMixin.java index a5c78050..a6d93ca0 100644 --- a/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_entity_renderers/EntityRenderersMixin.java +++ b/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_entity_renderers/EntityRenderersMixin.java @@ -1,18 +1,12 @@ package org.embeddedt.modernfix.common.mixin.perf.dynamic_entity_renderers; -import com.google.common.cache.CacheBuilder; -import com.google.common.cache.CacheLoader; -import com.google.common.cache.LoadingCache; import net.minecraft.client.renderer.entity.EntityRenderer; import net.minecraft.client.renderer.entity.EntityRendererProvider; import net.minecraft.client.renderer.entity.EntityRenderers; -import net.minecraft.core.Registry; import net.minecraft.world.entity.EntityType; import org.embeddedt.modernfix.ModernFix; import org.embeddedt.modernfix.annotation.ClientOnlyMixin; -import org.embeddedt.modernfix.entity.ErroredEntityRenderer; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; +import org.embeddedt.modernfix.entity.EntityRendererMap; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; @@ -20,10 +14,7 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; -import java.util.Collection; import java.util.Map; -import java.util.Set; -import java.util.concurrent.ExecutionException; @Mixin(EntityRenderers.class) @ClientOnlyMixin @@ -32,99 +23,7 @@ public class EntityRenderersMixin { @Inject(method = "createEntityRenderers", at = @At("HEAD"), cancellable = true) private static void createDynamicRendererLoader(EntityRendererProvider.Context context, CallbackInfoReturnable, EntityRenderer>> cir) { - Map, EntityRendererProvider> rendererProviders = PROVIDERS; - LoadingCache, EntityRenderer> rendererMap = CacheBuilder.newBuilder() - .build(new CacheLoader<>() { - @Override - public EntityRenderer load(EntityType key) throws Exception { - EntityRendererProvider provider = rendererProviders.get(key); - synchronized(EntityRenderers.class) { - EntityRenderer renderer; - try { - if(provider == null) - throw new RuntimeException("Provider not registered"); - renderer = provider.create(context); - ModernFix.LOGGER.info("Loaded entity {}", Registry.ENTITY_TYPE.getKey(key)); - } catch(RuntimeException e) { - ModernFix.LOGGER.error("Failed to create entity model for " + Registry.ENTITY_TYPE.getKey(key) + ":", e); - renderer = new ErroredEntityRenderer<>(context); - } - return renderer; - } - } - }); - cir.setReturnValue(new Map, EntityRenderer>() { - @Override - public int size() { - return rendererProviders.size(); - } - - @Override - public boolean isEmpty() { - return rendererProviders.isEmpty(); - } - - @Override - public boolean containsKey(Object o) { - return rendererProviders.containsKey(o); - } - - @Override - public boolean containsValue(Object o) { - return false; - } - - @Override - public EntityRenderer get(Object o) { - try { - return rendererMap.get((EntityType)o); - } catch(ExecutionException e) { - throw new RuntimeException(e); - } - } - - @Nullable - @Override - public EntityRenderer put(EntityType entityType, EntityRenderer entityRenderer) { - EntityRenderer old = rendererMap.getIfPresent(entityType); - rendererMap.put(entityType, entityRenderer); - return old; - } - - @Override - public EntityRenderer remove(Object o) { - EntityRenderer r = rendererMap.getIfPresent(o); - rendererMap.invalidate(o); - return r; - } - - @Override - public void putAll(@NotNull Map, ? extends EntityRenderer> map) { - rendererMap.putAll(map); - } - - @Override - public void clear() { - rendererMap.invalidateAll(); - } - - @NotNull - @Override - public Set> keySet() { - return rendererProviders.keySet(); - } - - @NotNull - @Override - public Collection> values() { - return rendererMap.asMap().values(); - } - - @NotNull - @Override - public Set, EntityRenderer>> entrySet() { - return rendererMap.asMap().entrySet(); - } - }); + cir.setReturnValue(new EntityRendererMap(PROVIDERS, context)); + ModernFix.LOGGER.info("Dynamic entity renderer hook setup"); } } diff --git a/common/src/main/java/org/embeddedt/modernfix/entity/EntityRendererMap.java b/common/src/main/java/org/embeddedt/modernfix/entity/EntityRendererMap.java new file mode 100644 index 00000000..df280415 --- /dev/null +++ b/common/src/main/java/org/embeddedt/modernfix/entity/EntityRendererMap.java @@ -0,0 +1,125 @@ +package org.embeddedt.modernfix.entity; + +import com.google.common.cache.CacheBuilder; +import com.google.common.cache.CacheLoader; +import com.google.common.cache.LoadingCache; +import net.minecraft.client.renderer.entity.EntityRenderer; +import net.minecraft.client.renderer.entity.EntityRendererProvider; +import net.minecraft.client.renderer.entity.EntityRenderers; +import net.minecraft.core.Registry; +import net.minecraft.world.entity.EntityType; +import org.embeddedt.modernfix.ModernFix; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + +import java.util.Collection; +import java.util.Map; +import java.util.Set; +import java.util.concurrent.ExecutionException; + +public class EntityRendererMap implements Map, EntityRenderer> { + private final Map, EntityRendererProvider> rendererProviders; + private final LoadingCache, EntityRenderer> rendererMap; + private final EntityRendererProvider.Context context; + + public EntityRendererMap(Map, EntityRendererProvider> rendererProviders, EntityRendererProvider.Context context) { + this.rendererProviders = rendererProviders; + this.context = context; + this.rendererMap = CacheBuilder.newBuilder().build(new RenderConstructor()); + } + + class RenderConstructor extends CacheLoader, EntityRenderer> { + @Override + public EntityRenderer load(EntityType key) throws Exception { + EntityRendererProvider provider = rendererProviders.get(key); + synchronized(EntityRenderers.class) { + EntityRenderer renderer; + try { + if(provider == null) + throw new RuntimeException("Provider not registered"); + renderer = provider.create(context); + ModernFix.LOGGER.info("Loaded entity {}", Registry.ENTITY_TYPE.getKey(key)); + } catch(RuntimeException e) { + ModernFix.LOGGER.error("Failed to create entity model for " + Registry.ENTITY_TYPE.getKey(key) + ":", e); + renderer = new ErroredEntityRenderer<>(context); + } + return renderer; + } + } + } + + @Override + public int size() { + return rendererProviders.size(); + } + + @Override + public boolean isEmpty() { + return rendererProviders.isEmpty(); + } + + @Override + public boolean containsKey(Object o) { + return rendererProviders.containsKey(o); + } + + @Override + public boolean containsValue(Object o) { + return false; + } + + @Override + public EntityRenderer get(Object o) { + try { + EntityRenderer renderer = rendererMap.get((EntityType)o); + if(renderer == null) + throw new AssertionError("Returned entity renderer should never be null"); + return renderer; + } catch(ExecutionException e) { + throw new RuntimeException(e); + } + } + + @Nullable + @Override + public EntityRenderer put(EntityType entityType, EntityRenderer entityRenderer) { + EntityRenderer old = rendererMap.getIfPresent(entityType); + rendererMap.put(entityType, entityRenderer); + return old; + } + + @Override + public EntityRenderer remove(Object o) { + EntityRenderer r = rendererMap.getIfPresent(o); + rendererMap.invalidate(o); + return r; + } + + @Override + public void putAll(@NotNull Map, ? extends EntityRenderer> map) { + rendererMap.putAll(map); + } + + @Override + public void clear() { + rendererMap.invalidateAll(); + } + + @NotNull + @Override + public Set> keySet() { + return rendererProviders.keySet(); + } + + @NotNull + @Override + public Collection> values() { + return rendererMap.asMap().values(); + } + + @NotNull + @Override + public Set, EntityRenderer>> entrySet() { + return rendererMap.asMap().entrySet(); + } +}