diff --git a/src/main/java/me/zeroeightsix/kami/module/modules/render/Search.kt b/src/main/java/me/zeroeightsix/kami/module/modules/render/Search.kt index 67aa0d476..a6a4ed92a 100644 --- a/src/main/java/me/zeroeightsix/kami/module/modules/render/Search.kt +++ b/src/main/java/me/zeroeightsix/kami/module/modules/render/Search.kt @@ -100,7 +100,7 @@ object Search : Module() { } override fun onEnable() { - if (!overrideWarning.value && ShaderHelper.isIntegratedGraphics()) { + if (!overrideWarning.value && ShaderHelper.isIntegratedGraphics) { MessageSendHelper.sendErrorMessage("$chatName Warning: Running Search with an Intel Integrated GPU is not recommended, as it has a &llarge&r impact on performance.") MessageSendHelper.sendWarningMessage("$chatName If you're sure you want to try, run the &7 ${Command.getCommandPrefix()}search override&f command") disable() diff --git a/src/main/java/me/zeroeightsix/kami/util/graphics/ShaderHelper.kt b/src/main/java/me/zeroeightsix/kami/util/graphics/ShaderHelper.kt index 9e2630e0b..14fcf91fe 100644 --- a/src/main/java/me/zeroeightsix/kami/util/graphics/ShaderHelper.kt +++ b/src/main/java/me/zeroeightsix/kami/util/graphics/ShaderHelper.kt @@ -12,7 +12,7 @@ import net.minecraft.client.shader.ShaderGroup import net.minecraft.client.shader.ShaderLinkHelper import net.minecraft.util.ResourceLocation import net.minecraftforge.fml.common.gameevent.TickEvent -import org.lwjgl.opengl.GL11 +import org.lwjgl.opengl.GL11.GL_VENDOR class ShaderHelper(shaderIn: ResourceLocation, vararg frameBufferNames: String) { private val mc = Wrapper.minecraft @@ -28,7 +28,7 @@ class ShaderHelper(shaderIn: ResourceLocation, vararg frameBufferNames: String) null } - isIntegratedGraphics() -> { + isIntegratedGraphics -> { KamiMod.LOG.warn("Running on Intel Integrated Graphics!") null } @@ -72,13 +72,8 @@ class ShaderHelper(shaderIn: ResourceLocation, vararg frameBufferNames: String) fun getFrameBuffer(name: String) = frameBufferMap[name] companion object { - private var cachedIsIntegratedGraphics: Boolean? = null - - fun isIntegratedGraphics() = cachedIsIntegratedGraphics ?: run { - GlStateManager.glGetString(GL11.GL_VENDOR).contains("Intel").apply { - cachedIsIntegratedGraphics = this - return this - } + val isIntegratedGraphics by lazy { + GlStateManager.glGetString(GL_VENDOR).contains("Intel") } } } \ No newline at end of file