diff --git a/src/main/java/com/gtnewhorizons/angelica/compat/ModStatus.java b/src/main/java/com/gtnewhorizons/angelica/compat/ModStatus.java index a1ab40734..d7a8e12e5 100644 --- a/src/main/java/com/gtnewhorizons/angelica/compat/ModStatus.java +++ b/src/main/java/com/gtnewhorizons/angelica/compat/ModStatus.java @@ -46,7 +46,6 @@ public class ModStatus { isChunkAPILoaded = Loader.isModLoaded("chunkapi"); isXaerosMinimapLoaded = Loader.isModLoaded("XaeroMinimap"); isHoloInventoryLoaded = Loader.isModLoaded("holoinventory"); - isBattlegearLoaded = Loader.isModLoaded("battlegear2"); isThaumcraftLoaded = Loader.isModLoaded("Thaumcraft"); isThaumicHorizonsLoaded = Loader.isModLoaded("ThaumicHorizons"); isBaublesLoaded = Loader.isModLoaded("Baubles"); @@ -58,12 +57,16 @@ public class ModStatus { isHoloInventoryLoaded = Loader.isModLoaded("holoinventory"); isBOPLoaded = Loader.isModLoaded("BiomesOPlenty"); - // remove compat with original release of BG2 - if (isBattlegearLoaded){ - isBattlegearLoaded = new DefaultArtifactVersion("1.2.0") - .compareTo( - LoadControllerHelper.getOwningMod(Battlegear.class).getProcessedVersion() - ) <= 0; + // Angelica's compat relies on GTNH extensions, so this should only be true for NH Battlegear2, 1.2.0+ + if (Loader.isModLoaded("battlegear2")) { + // Don't ask me why battlegear2 reports as 1.7.10, I don't know + final var OG_BG2_VER = new DefaultArtifactVersion("1.7.10"); + final var NH_BG2_VER = new DefaultArtifactVersion("1.2.0"); + + @SuppressWarnings("DataFlowIssue") + var battlegearVersion = LoadControllerHelper.getOwningMod(Battlegear.class).getProcessedVersion(); + // We can be sure the NH version will never be 1.7.10, because that garbage got archived. + isBattlegearLoaded = battlegearVersion.compareTo(OG_BG2_VER) != 0 && battlegearVersion.compareTo(NH_BG2_VER) >= 0; } isNEIDMetadataExtended = false; diff --git a/src/main/java/com/gtnewhorizons/angelica/dynamiclights/DynamicLights.java b/src/main/java/com/gtnewhorizons/angelica/dynamiclights/DynamicLights.java index 7981500b4..3adabcbb3 100644 --- a/src/main/java/com/gtnewhorizons/angelica/dynamiclights/DynamicLights.java +++ b/src/main/java/com/gtnewhorizons/angelica/dynamiclights/DynamicLights.java @@ -620,8 +620,7 @@ public class DynamicLights { if (offhand != null) { luminance = Math.max(luminance, getLuminanceFromItemStack(offhand)); } - } - else if (ModStatus.isBackhandLoaded){ + } else if (ModStatus.isBackhandLoaded){ final ItemStack offhand = BackhandReflectionCompat.getOffhandItem(player); if (offhand != null) { luminance = Math.max(luminance, getLuminanceFromItemStack(offhand));