From 508b97c0b6234e856f3bf751b8295af66cf36043 Mon Sep 17 00:00:00 2001 From: quentin452 <42176772+quentin452@users.noreply.github.com> Date: Sun, 1 Dec 2024 02:44:01 +0100 Subject: [PATCH] Remove some angelica mixins since i added it in my fork of angelica https://github.com/quentin452/Angelica-Biggess-Pack-Cat-Edition --- .../optimizationsandtweaks/asm/Mixin.java | 6 --- .../config/OptimizationsandTweaksConfig.java | 8 ---- .../mixins/common/angelica/MixinGLDebug.java | 26 ------------- .../common/angelica/MixinHUDCaching.java | 39 ------------------- 4 files changed, 79 deletions(-) delete mode 100644 src/main/java/fr/iamacat/optimizationsandtweaks/mixins/common/angelica/MixinGLDebug.java delete mode 100644 src/main/java/fr/iamacat/optimizationsandtweaks/mixins/common/angelica/MixinHUDCaching.java diff --git a/src/main/java/fr/iamacat/optimizationsandtweaks/asm/Mixin.java b/src/main/java/fr/iamacat/optimizationsandtweaks/asm/Mixin.java index a58be525..741e9ae5 100644 --- a/src/main/java/fr/iamacat/optimizationsandtweaks/asm/Mixin.java +++ b/src/main/java/fr/iamacat/optimizationsandtweaks/asm/Mixin.java @@ -850,12 +850,6 @@ public enum Mixin implements IMixin { require(TargetedMod.PRACTICALLOGISTICS).and(m -> OptimizationsandTweaksConfig.enableMixinEventRegistry), "practicallogistics.MixinEventRegistry"), - common_angelica_MixinGLDebug(Side.COMMON, - require(TargetedMod.ANGELICA).and(m -> OptimizationsandTweaksConfig.enableMixinGLDebug), - "angelica.MixinGLDebug"), - common_angelica_MixinHUDCaching(Side.COMMON, - require(TargetedMod.ANGELICA).and(m -> OptimizationsandTweaksConfig.enableMixinHUDCaching), - "angelica.MixinHUDCaching"), common_angelica_MixinClientProxy(Side.COMMON, require(TargetedMod.ANGELICA).and(m -> OptimizationsandTweaksConfig.enableMixinClientProxy), "angelica.MixinClientProxy"), diff --git a/src/main/java/fr/iamacat/optimizationsandtweaks/config/OptimizationsandTweaksConfig.java b/src/main/java/fr/iamacat/optimizationsandtweaks/config/OptimizationsandTweaksConfig.java index 6961529c..49eb9eb9 100644 --- a/src/main/java/fr/iamacat/optimizationsandtweaks/config/OptimizationsandTweaksConfig.java +++ b/src/main/java/fr/iamacat/optimizationsandtweaks/config/OptimizationsandTweaksConfig.java @@ -1029,14 +1029,6 @@ public class OptimizationsandTweaksConfig { @Config.DefaultBoolean(true) @Config.RequiresWorldRestart public static boolean enableMixinXCEntityGod; - @Config.Comment("Fix Stack overflow crash when angelica is loaded by disabling some methods from GLDebug class from angelica") - @Config.DefaultBoolean(true) - @Config.RequiresWorldRestart - public static boolean enableMixinGLDebug; - @Config.Comment("Fix Invalid framebuffer operation (1286) caused by Hud Caching from angelica mod") - @Config.DefaultBoolean(true) - @Config.RequiresWorldRestart - public static boolean enableMixinHUDCaching; @Config.Comment("Fix \"java.lang.NullPointerException: Unexpected error\" caused by onKeypress from ClientProxy class from Angelica Mod") @Config.DefaultBoolean(true) @Config.RequiresWorldRestart diff --git a/src/main/java/fr/iamacat/optimizationsandtweaks/mixins/common/angelica/MixinGLDebug.java b/src/main/java/fr/iamacat/optimizationsandtweaks/mixins/common/angelica/MixinGLDebug.java deleted file mode 100644 index 22e448a3..00000000 --- a/src/main/java/fr/iamacat/optimizationsandtweaks/mixins/common/angelica/MixinGLDebug.java +++ /dev/null @@ -1,26 +0,0 @@ -package fr.iamacat.optimizationsandtweaks.mixins.common.angelica; - -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Overwrite; - -import com.gtnewhorizons.angelica.glsm.GLDebug; - -@Mixin(GLDebug.class) -public class MixinGLDebug { - - /** - * @author quentin452 - * @reason Fix Stack overflow crash when angelica is loaded by disabling some methods from GLDebug class from - * angelica - */ - @Overwrite - public static void pushGroup(String group) {} - - /** - * @author quentin452 - * @reason Fix Stack overflow crash when angelica is loaded by disabling some methods from GLDebug class from - * angelica - */ - @Overwrite - public static void popGroup() {} -} diff --git a/src/main/java/fr/iamacat/optimizationsandtweaks/mixins/common/angelica/MixinHUDCaching.java b/src/main/java/fr/iamacat/optimizationsandtweaks/mixins/common/angelica/MixinHUDCaching.java deleted file mode 100644 index 86e98d84..00000000 --- a/src/main/java/fr/iamacat/optimizationsandtweaks/mixins/common/angelica/MixinHUDCaching.java +++ /dev/null @@ -1,39 +0,0 @@ -package fr.iamacat.optimizationsandtweaks.mixins.common.angelica; - -import static com.gtnewhorizons.angelica.loading.AngelicaTweaker.LOGGER; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.shader.Framebuffer; -import net.minecraftforge.event.world.WorldEvent; - -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Overwrite; -import org.spongepowered.asm.mixin.Shadow; - -import com.gtnewhorizons.angelica.hudcaching.HUDCaching; - -import cpw.mods.fml.common.eventhandler.EventPriority; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; - -@Mixin(HUDCaching.class) -public class MixinHUDCaching { - - @Shadow - public static Framebuffer framebuffer; - - /** - * @author quentin452 - * @reason Fix Invalid framebuffer operation (1286) caused by Hud Caching from angelica mod - */ - @SubscribeEvent(priority = EventPriority.HIGH) - @Overwrite(remap = false) - public void onJoinWorld(WorldEvent.Load event) { - if (event.world.isRemote) { - LOGGER.info("World loaded - Initializing HUDCaching Fixed (OptimizationsAndTweaks)"); - int framebufferWidth = Minecraft.getMinecraft().displayWidth; - int framebufferHeight = Minecraft.getMinecraft().displayHeight; - framebuffer = new Framebuffer(framebufferWidth, framebufferHeight, true); - framebuffer.setFramebufferColor(0, 0, 0, 0); - } - } -}