diff --git a/src/main/java/com/gtnewhorizons/angelica/mixins/Mixins.java b/src/main/java/com/gtnewhorizons/angelica/mixins/Mixins.java index 8c9784c33..067fb37ba 100644 --- a/src/main/java/com/gtnewhorizons/angelica/mixins/Mixins.java +++ b/src/main/java/com/gtnewhorizons/angelica/mixins/Mixins.java @@ -104,7 +104,7 @@ public enum Mixins { IRIS_STARTUP(new Builder("Start Iris").addTargetedMod(TargetedMod.VANILLA).setSide(Side.CLIENT) .setPhase(Phase.EARLY).setApplyIf(() -> AngelicaConfig.enableIris).addMixinClasses( "shaders.startup.MixinGameSettings" - ,"shaders.startup.MixinGuiMainMenu" + ,"shaders.startup.MixinMinecraft" ,"shaders.startup.MixinInitRenderer" ,"shaders.startup.MixinAbstractTexture" ,"shaders.startup.MixinTextureAtlasSprite" diff --git a/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/shaders/startup/MixinGuiMainMenu.java b/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/shaders/startup/MixinGuiMainMenu.java deleted file mode 100644 index 407bc8f68..000000000 --- a/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/shaders/startup/MixinGuiMainMenu.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.gtnewhorizons.angelica.mixins.early.shaders.startup; - -import net.coderbot.iris.Iris; -import net.minecraft.client.gui.GuiMainMenu; -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; - -@Mixin(GuiMainMenu.class) -public class MixinGuiMainMenu { - - @Inject(method = "initGui", at = @At("RETURN")) - public void angelica$shadersOnLoadingComplete(CallbackInfo ci) { - Iris.onLoadingComplete(); - } - -} diff --git a/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/shaders/startup/MixinMinecraft.java b/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/shaders/startup/MixinMinecraft.java new file mode 100644 index 000000000..840339659 --- /dev/null +++ b/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/shaders/startup/MixinMinecraft.java @@ -0,0 +1,30 @@ +package com.gtnewhorizons.angelica.mixins.early.shaders.startup; + +import com.gtnewhorizons.angelica.glsm.GLStateManager; +import net.coderbot.iris.Iris; +import net.minecraft.client.Minecraft; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Unique; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +@Mixin(Minecraft.class) +public class MixinMinecraft { + + @Unique + private static boolean angelica$hasFirstInit; + + @Inject(method = "startGame", + at = @At(value = "INVOKE", + remap = false, + shift = At.Shift.BEFORE, + target = "Lcpw/mods/fml/client/SplashProgress;clearVanillaResources(Lnet/minecraft/client/renderer/texture/TextureManager;Lnet/minecraft/util/ResourceLocation;)V")) + public void angelica$shadersOnLoadingComplete(CallbackInfo ci) { + if (!angelica$hasFirstInit && GLStateManager.isMainThread()) { + angelica$hasFirstInit = true; + Iris.onLoadingComplete(); + } + } + +}