diff --git a/src/main/java/com/gtnewhorizons/angelica/config/AngelicaConfig.java b/src/main/java/com/gtnewhorizons/angelica/config/AngelicaConfig.java index bceee0ae6..4a42ac600 100644 --- a/src/main/java/com/gtnewhorizons/angelica/config/AngelicaConfig.java +++ b/src/main/java/com/gtnewhorizons/angelica/config/AngelicaConfig.java @@ -27,6 +27,11 @@ public class AngelicaConfig { @Config.RequiresMcRestart public static boolean enableNotFineOptimizations; + @Config.Comment("Replace some vanilla render paths with more optimized versions. Disable if you encounter mixin conflicts.") + @Config.DefaultBoolean(true) + @Config.RequiresMcRestart + public static boolean enableVBO; + @Config.Comment("Enable NotFine features") @Config.DefaultBoolean(true) @Config.RequiresMcRestart diff --git a/src/main/java/com/gtnewhorizons/angelica/mixins/Mixins.java b/src/main/java/com/gtnewhorizons/angelica/mixins/Mixins.java index 726e86965..204720650 100644 --- a/src/main/java/com/gtnewhorizons/angelica/mixins/Mixins.java +++ b/src/main/java/com/gtnewhorizons/angelica/mixins/Mixins.java @@ -29,7 +29,7 @@ public enum Mixins { ) ), ANGELICA_VBO( - new Builder("Angelica VBO").addTargetedMod(TargetedMod.VANILLA).setSide(Side.CLIENT) + new Builder("Angelica VBO").addTargetedMod(TargetedMod.VANILLA).setApplyIf(() -> AngelicaConfig.enableVBO).setSide(Side.CLIENT) .setPhase(Phase.EARLY).addMixinClasses( "angelica.vbo.MixinWavefrontObject" ,"angelica.vbo.MixinRenderGlobal" @@ -97,6 +97,7 @@ public enum Mixins { ,"sodium.MixinBiomeGenBase" ,"sodium.MixinChunk" ,"sodium.MixinChunkProviderServer" + ,"sodium.MixinClientRegistry" ,"sodium.MixinEntity" ,"sodium.MixinRenderManager" ,"sodium.MixinExtendedBlockStorage" diff --git a/src/main/java/com/gtnewhorizons/angelica/mixins/early/sodium/MixinClientRegistry.java b/src/main/java/com/gtnewhorizons/angelica/mixins/early/sodium/MixinClientRegistry.java new file mode 100644 index 000000000..3affed08b --- /dev/null +++ b/src/main/java/com/gtnewhorizons/angelica/mixins/early/sodium/MixinClientRegistry.java @@ -0,0 +1,20 @@ +package com.gtnewhorizons.angelica.mixins.early.sodium; + +import cpw.mods.fml.client.registry.ClientRegistry; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Redirect; + +import java.util.Map; + +@Mixin(ClientRegistry.class) +public class MixinClientRegistry { + @Redirect(method = "bindTileEntitySpecialRenderer", at = @At(value = "INVOKE", target = "Ljava/util/Map;put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;"), remap = false) + private static Object skipPuttingNullRenderer(Map instance, Object key, Object value) { + if(value != null && key != null) { + return instance.put(key, value); + } else { + return null; + } + } +} diff --git a/src/main/java/com/gtnewhorizons/angelica/mixins/early/sodium/MixinTileEntityRendererDispatcher.java b/src/main/java/com/gtnewhorizons/angelica/mixins/early/sodium/MixinTileEntityRendererDispatcher.java index de749f5e1..d82ed072a 100644 --- a/src/main/java/com/gtnewhorizons/angelica/mixins/early/sodium/MixinTileEntityRendererDispatcher.java +++ b/src/main/java/com/gtnewhorizons/angelica/mixins/early/sodium/MixinTileEntityRendererDispatcher.java @@ -33,7 +33,7 @@ public class MixinTileEntityRendererDispatcher { */ @Redirect(method = "getSpecialRendererByClass", at = @At(value = "INVOKE", target = "Ljava/util/Map;put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;")) private Object skipPuttingNullRenderer(Map instance, Object key, Object value) { - if(value != null) { + if(value != null && key != null) { return instance.put(key, value); } else { return null;