diff --git a/dependencies.gradle b/dependencies.gradle index 47755b5ad..dad008d51 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -100,8 +100,6 @@ dependencies { compileOnly(rfg.deobf("curse.maven:xaeros-minimap-263420:5060684")) compileOnly(rfg.deobf("curse.maven:security-craft-64760:2818228")) - compileOnly("com.github.GTNewHorizons:HoloInventory:2.5.1-GTNH:dev") - runtimeOnlyNonPublishable(rfg.deobf("CoreTweaks:CoreTweaks:0.3.3.2")) // Hodgepodge diff --git a/src/main/java/com/gtnewhorizons/angelica/compat/ModStatus.java b/src/main/java/com/gtnewhorizons/angelica/compat/ModStatus.java index bfe8b69fb..26fa32083 100644 --- a/src/main/java/com/gtnewhorizons/angelica/compat/ModStatus.java +++ b/src/main/java/com/gtnewhorizons/angelica/compat/ModStatus.java @@ -1,11 +1,11 @@ package com.gtnewhorizons.angelica.compat; import com.gtnewhorizons.angelica.compat.backhand.BackhandReflectionCompat; +import com.gtnewhorizons.angelica.compat.holoinventory.HoloInventoryReflectionCompat; import com.gtnewhorizons.angelica.helpers.LoadControllerHelper; import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.versioning.DefaultArtifactVersion; import mods.battlegear2.Battlegear; -import net.dries007.holoInventory.HoloInventory; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -53,11 +53,8 @@ public class ModStatus { isThaumicHorizonsLoaded = Loader.isModLoaded("ThaumicHorizons"); isBaublesLoaded = Loader.isModLoaded("Baubles"); - if (isHoloInventoryLoaded){ - isHoloInventoryLoaded = new DefaultArtifactVersion("2.4.4-GTNH") - .compareTo( - LoadControllerHelper.getOwningMod(HoloInventory.class).getProcessedVersion() - ) <= 0; + if (isHoloInventoryLoaded) { + isHoloInventoryLoaded = HoloInventoryReflectionCompat.isHoloInventoryLoaded(); } // remove compat with original release of BG2 @@ -68,10 +65,9 @@ public class ModStatus { ) <= 0; } - isNEIDMetadataExtended = false; if (isNEIDLoaded) { - int majorVersion = Integer.parseInt(Loader.instance().getIndexedModList().get("neid").getVersion().split("\\.")[0]); + final int majorVersion = Integer.parseInt(Loader.instance().getIndexedModList().get("neid").getVersion().split("\\.")[0]); if (majorVersion >= 2) { isNEIDMetadataExtended = true; } diff --git a/src/main/java/com/gtnewhorizons/angelica/compat/holoinventory/HoloInventoryReflectionCompat.java b/src/main/java/com/gtnewhorizons/angelica/compat/holoinventory/HoloInventoryReflectionCompat.java new file mode 100644 index 000000000..655a9f34a --- /dev/null +++ b/src/main/java/com/gtnewhorizons/angelica/compat/holoinventory/HoloInventoryReflectionCompat.java @@ -0,0 +1,81 @@ +package com.gtnewhorizons.angelica.compat.holoinventory; + +import net.minecraftforge.client.event.RenderGameOverlayEvent; + +import java.lang.invoke.MethodHandle; +import java.lang.invoke.MethodHandles; +import java.lang.invoke.MethodType; +import java.lang.reflect.Field; + +import static com.gtnewhorizons.angelica.compat.ModStatus.LOGGER; + +public class HoloInventoryReflectionCompat { + private static final String RENDERER_CLASS = "net.dries007.holoInventory.client.Renderer"; + + private static boolean isLoaded; + private static final MethodHandle renderEventMethod; + private static final MethodHandle angelicaOverrideSetter; + private static final Object rendererInstance; + + static { + MethodHandle renderEventMethodTemp = null; + MethodHandle angelicaOverrideSetterTemp = null; + Object rendererInstanceTemp = null; + + try { + final Class rendererClass = Class.forName(RENDERER_CLASS); + + // Get and cache the Renderer.INSTANCE + final Field instanceField = rendererClass.getDeclaredField("INSTANCE"); + instanceField.setAccessible(true); + rendererInstanceTemp = instanceField.get(null); + + // Get the renderEvent method (RenderGameOverlayEvent base class) + final MethodHandles.Lookup lookup = MethodHandles.lookup(); + try { + renderEventMethodTemp = lookup.findVirtual(rendererClass, "renderEvent", MethodType.methodType(void.class, RenderGameOverlayEvent.Post.class)); + } catch (NoSuchMethodException e) { + // Fallback for 2.5.0-GTNH and earlier + renderEventMethodTemp = lookup.findVirtual(rendererClass, "renderEvent", MethodType.methodType(void.class, RenderGameOverlayEvent.class)); + } + + final Field angelicaOverrideField = rendererClass.getDeclaredField("angelicaOverride"); + angelicaOverrideField.setAccessible(true); + angelicaOverrideSetterTemp = lookup.unreflectSetter(angelicaOverrideField); + + isLoaded = true; + LOGGER.info("Successfully initialized HoloInventory compatibility layer"); + } catch (Exception e) { + LOGGER.warn("Failed to initialize HoloInventory compatibility layer", e); + isLoaded = false; + } + + renderEventMethod = renderEventMethodTemp; + angelicaOverrideSetter = angelicaOverrideSetterTemp; + rendererInstance = rendererInstanceTemp; + } + + public static boolean isHoloInventoryLoaded() { + return isLoaded; + } + + public static void renderEvent(RenderGameOverlayEvent event) { + if (!isLoaded) return; + try { + renderEventMethod.invoke(rendererInstance, event); + } catch (Throwable e) { + LOGGER.error("Failed to invoke HoloInventory renderEvent", e); + isLoaded = false; + } + } + + public static void setAngelicaOverride(boolean value) { + if (!isLoaded) return; + try { + angelicaOverrideSetter.invoke(rendererInstance, value); + } catch (Throwable e) { + LOGGER.error("Failed to set HoloInventory angelicaOverride", e); + isLoaded = false; + } + } +} diff --git a/src/main/java/com/gtnewhorizons/angelica/hudcaching/HUDCaching.java b/src/main/java/com/gtnewhorizons/angelica/hudcaching/HUDCaching.java index e5b64f7a3..cf5648970 100644 --- a/src/main/java/com/gtnewhorizons/angelica/hudcaching/HUDCaching.java +++ b/src/main/java/com/gtnewhorizons/angelica/hudcaching/HUDCaching.java @@ -2,13 +2,13 @@ package com.gtnewhorizons.angelica.hudcaching; import com.gtnewhorizon.gtnhlib.client.renderer.TessellatorManager; import com.gtnewhorizons.angelica.compat.ModStatus; +import com.gtnewhorizons.angelica.compat.holoinventory.HoloInventoryReflectionCompat; import com.gtnewhorizons.angelica.config.AngelicaConfig; import com.gtnewhorizons.angelica.mixins.interfaces.GuiIngameAccessor; import com.gtnewhorizons.angelica.mixins.interfaces.GuiIngameForgeAccessor; import com.gtnewhorizons.angelica.mixins.interfaces.RenderGameOverlayEventAccessor; import com.kentington.thaumichorizons.common.ThaumicHorizons; import cpw.mods.fml.common.eventhandler.EventPriority; -import net.dries007.holoInventory.client.Renderer; import net.minecraftforge.client.event.RenderGameOverlayEvent; import net.minecraftforge.event.world.WorldEvent; import org.lwjgl.opengl.GL11; @@ -60,7 +60,6 @@ public class HUDCaching { public static final HUDCaching INSTANCE = new HUDCaching(); - private HUDCaching() {} // highest so it runs before the GLSM load event @@ -99,7 +98,7 @@ public class HUDCaching { renderingCacheOverride = false; mc.getFramebuffer().bindFramebuffer(false); } else { - renderer.setupOverlayRendering(); + renderer.setupOverlayRendering(); } ScaledResolution resolution = new ScaledResolution(mc, mc.displayWidth, mc.displayHeight); @@ -112,52 +111,50 @@ public class HUDCaching { // render bits that were captured when rendering into cache GuiIngameAccessor gui = (GuiIngameAccessor) ingame; - if (renderVignetteCaptured) - { + if (renderVignetteCaptured) { gui.callRenderVignette(mc.thePlayer.getBrightness(partialTicks), width, height); } else { - GLStateManager.tryBlendFuncSeparate(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, 1, 0); + GLStateManager.tryBlendFuncSeparate(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, 1, 0); } + if (ingame instanceof GuiIngameForge) { - GuiIngameForgeAccessor guiForge = ((GuiIngameForgeAccessor) ingame); - if (renderHelmetCaptured) { - guiForge.callRenderHelmet(resolution, partialTicks, hasScreen, mouseX, mouseY); + GuiIngameForgeAccessor guiForge = ((GuiIngameForgeAccessor) ingame); + if (renderHelmetCaptured) { + guiForge.callRenderHelmet(resolution, partialTicks, hasScreen, mouseX, mouseY); if (ModStatus.isHoloInventoryLoaded) { - Renderer.INSTANCE.angelicaOverride = false; + HoloInventoryReflectionCompat.setAngelicaOverride(false); // only settings the partial ticks as mouseX and mouseY are not used in renderEvent ((RenderGameOverlayEventAccessor) fakePostEvent).setPartialTicks(partialTicks); - Renderer.INSTANCE.renderEvent(fakePostEvent); + HoloInventoryReflectionCompat.renderEvent(fakePostEvent); } - } - if (renderPortalCapturedTicks > 0) { - guiForge.callRenderPortal(width, height, partialTicks); - } - if (renderCrosshairsCaptured) { - if (ModStatus.isXaerosMinimapLoaded){ + } + if (renderPortalCapturedTicks > 0) { + guiForge.callRenderPortal(width, height, partialTicks); + } + if (renderCrosshairsCaptured) { + if (ModStatus.isXaerosMinimapLoaded) { // this fixes the crosshair going invisible when no lines are being drawn under the minimap GLStateManager.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); } - guiForge.callRenderCrosshairs(width, height); - } - if (ModStatus.isThaumcraftLoaded || ModStatus.isThaumicHorizonsLoaded){ + guiForge.callRenderCrosshairs(width, height); + } + if (ModStatus.isThaumcraftLoaded || ModStatus.isThaumicHorizonsLoaded) { ((RenderGameOverlayEventAccessor) fakeTextEvent).setPartialTicks(partialTicks); ((RenderGameOverlayEventAccessor) fakeTextEvent).setResolution(resolution); ((RenderGameOverlayEventAccessor) fakeTextEvent).setMouseX(mouseX); ((RenderGameOverlayEventAccessor) fakeTextEvent).setMouseY(mouseY); - if (ModStatus.isThaumcraftLoaded){ + if (ModStatus.isThaumcraftLoaded) { Thaumcraft.instance.renderEventHandler.renderOverlay(fakeTextEvent); } - if (ModStatus.isThaumicHorizonsLoaded){ + if (ModStatus.isThaumicHorizonsLoaded) { ThaumicHorizons.instance.renderEventHandler.renderOverlay(fakeTextEvent); } } } else { - if (renderHelmetCaptured) - { + if (renderHelmetCaptured) { gui.callRenderPumpkinBlur(width, height); } - if (renderPortalCapturedTicks > 0) - { + if (renderPortalCapturedTicks > 0) { gui.callRenderPortal(renderPortalCapturedTicks, width, height); } } @@ -180,19 +177,19 @@ public class HUDCaching { * the state before we start rendering */ public static void fixGLStateBeforeRenderingCache() { - GLStateManager.glDepthMask(true); - GLStateManager.enableDepthTest(); - GLStateManager.enableAlphaTest(); - GLStateManager.tryBlendFuncSeparate(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, GL11.GL_ONE, GL11.GL_ZERO); - GLStateManager.disableBlend(); + GLStateManager.glDepthMask(true); + GLStateManager.enableDepthTest(); + GLStateManager.enableAlphaTest(); + GLStateManager.tryBlendFuncSeparate(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, GL11.GL_ONE, GL11.GL_ZERO); + GLStateManager.disableBlend(); } private static void resetFramebuffer(int width, int height) { if (framebuffer.framebufferWidth != width || framebuffer.framebufferHeight != height) { - framebuffer.createBindFramebuffer(width, height); + framebuffer.createBindFramebuffer(width, height); framebuffer.setFramebufferFilter(GL11.GL_NEAREST); } else { - framebuffer.framebufferClear(); + framebuffer.framebufferClear(); } // copy depth buffer from MC OpenGlHelper.func_153171_g(GL30.GL_READ_FRAMEBUFFER, mc.getFramebuffer().framebufferObject); @@ -214,10 +211,9 @@ public class HUDCaching { GL11.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_MAG_FILTER, GL11.GL_NEAREST); } - // moved to here due to the method being called from a mixin public static void disableHoloInventory() { if (ModStatus.isHoloInventoryLoaded) { - Renderer.INSTANCE.angelicaOverride = true; + HoloInventoryReflectionCompat.setAngelicaOverride(true); } }