diff --git a/src/main/java/com/gtnewhorizons/angelica/compat/ModStatus.java b/src/main/java/com/gtnewhorizons/angelica/compat/ModStatus.java index 4ad18adc8..23db0023d 100644 --- a/src/main/java/com/gtnewhorizons/angelica/compat/ModStatus.java +++ b/src/main/java/com/gtnewhorizons/angelica/compat/ModStatus.java @@ -25,6 +25,7 @@ public class ModStatus { public static boolean isThaumicHorizonsLoaded; public static boolean isBaublesLoaded; public static boolean isFluidLoggedLoaded; + public static boolean isBOPLoaded; public static void preInit() { if (Loader.isModLoaded("backhand")) { @@ -45,6 +46,7 @@ public class ModStatus { isFluidLoggedLoaded = Loader.isModLoaded("fluidlogged"); isHoloInventoryLoaded = Loader.isModLoaded("holoinventory"); + isBOPLoaded = Loader.isModLoaded("BiomesOPlenty"); // remove compat with original release of BG2 if (isBattlegearLoaded){ diff --git a/src/main/java/com/gtnewhorizons/angelica/proxy/ClientProxy.java b/src/main/java/com/gtnewhorizons/angelica/proxy/ClientProxy.java index f8c33b874..77bf4b572 100644 --- a/src/main/java/com/gtnewhorizons/angelica/proxy/ClientProxy.java +++ b/src/main/java/com/gtnewhorizons/angelica/proxy/ClientProxy.java @@ -1,5 +1,6 @@ package com.gtnewhorizons.angelica.proxy; +import biomesoplenty.api.content.BOPCBlocks; import com.google.common.base.Objects; import com.gtnewhorizon.gtnhlib.client.model.loading.ModelRegistry; import com.gtnewhorizon.gtnhlib.client.renderer.vao.VAOManager; @@ -85,6 +86,7 @@ public final class ClientProxy extends CommonProxy { private final Minecraft mc = Minecraft.getMinecraft(); private final FrametimeGraph frametimeGraph = new FrametimeGraph(); private final TPSGraph tpsGraph = new TPSGraph(); + public static Block bopGrass; public static SodiumGameOptions options() { if (CONFIG == null) { @@ -182,6 +184,9 @@ public final class ClientProxy extends CommonProxy { LOGGER.error("Could not replace LOTR handle render code with thread safe version"); } } + if(ModStatus.isBOPLoaded) { + bopGrass = BOPCBlocks.newBopGrass; + } } float lastIntegratedTickTime; diff --git a/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/rendering/MixinRenderBlocks.java b/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/rendering/MixinRenderBlocks.java index 5ae623cce..6817e487e 100644 --- a/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/rendering/MixinRenderBlocks.java +++ b/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/rendering/MixinRenderBlocks.java @@ -123,7 +123,7 @@ public abstract class MixinRenderBlocks { @ModifyExpressionValue(method = "renderStandardBlockWithColorMultiplier", at = @At(value = "FIELD", target = "Lnet/minecraft/init/Blocks;grass:Lnet/minecraft/block/BlockGrass;", opcode = Opcodes.GETSTATIC)) private BlockGrass angelica$widenGrassCheck(BlockGrass grassBlock, @Local(argsOnly = true, ordinal = 0) Block block) { - return (block instanceof BlockGrass bg) ? bg : grassBlock; + return (block instanceof BlockGrass bg && block == ClientProxy.bopGrass) ? bg : grassBlock; } /* Disable diffuse when celeritas AO is in use */