From b9ec7fb51c97c982da83596b1cc40884fec2c248 Mon Sep 17 00:00:00 2001 From: CookieBrigade <138534411+CookieBrigade@users.noreply.github.com> Date: Sun, 15 Sep 2024 21:16:17 -0500 Subject: [PATCH] Compat for optifine --- src/main/java/logisticspipes/LogisticsPipes.java | 8 ++++++-- .../renderer/newpipe/LogisticsNewPipeItemRenderer.java | 4 ++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/main/java/logisticspipes/LogisticsPipes.java b/src/main/java/logisticspipes/LogisticsPipes.java index b612a58ee..6d84cf0c0 100644 --- a/src/main/java/logisticspipes/LogisticsPipes.java +++ b/src/main/java/logisticspipes/LogisticsPipes.java @@ -287,7 +287,7 @@ public LogisticsPipes() { private static PlayerConfig playerConfig; public static boolean isGTNH = false; - public static boolean hasGTNHLib = false; + public static boolean enableVBO = false; @EventHandler public void init(FMLInitializationEvent event) { @@ -338,7 +338,11 @@ public void init(FMLInitializationEvent event) { public void preInit(FMLPreInitializationEvent evt) { // Gregtech New Horizons compat isGTNH = Loader.isModLoaded("dreamcraft") && Loader.isModLoaded("gregtech"); - hasGTNHLib = isGTNH || Loader.isModLoaded("gtnhlib"); + enableVBO = Loader.isModLoaded("gtnhlib"); + try { + Class.forName("optifine.OptiFineForgeTweaker"); + enableVBO = false; + } catch (ClassNotFoundException ignored) {} LogisticsPipes.log = evt.getModLog(); loadClasses(); diff --git a/src/main/java/logisticspipes/renderer/newpipe/LogisticsNewPipeItemRenderer.java b/src/main/java/logisticspipes/renderer/newpipe/LogisticsNewPipeItemRenderer.java index df524711a..5a03a2d98 100644 --- a/src/main/java/logisticspipes/renderer/newpipe/LogisticsNewPipeItemRenderer.java +++ b/src/main/java/logisticspipes/renderer/newpipe/LogisticsNewPipeItemRenderer.java @@ -56,14 +56,14 @@ private void renderPipeItem(RenderBlocks render, ItemStack item, float translate int renderList = lItem.getNewPipeRenderList(); if (renderList == -1) { - if (LogisticsPipes.hasGTNHLib) { + if (LogisticsPipes.enableVBO) { renderList = buildVBO(lItem); } else { renderList = buildDisplayList(lItem); } } - if (LogisticsPipes.hasGTNHLib) { + if (LogisticsPipes.enableVBO) { VBOManager.get(renderList).render(); } else { GL11.glCallList(renderList);