Add MC Font

Author: Avanatiker

src/main/kotlin/com/lambda/gui/DearImGui.kt

@@ -35,7 +35,6 @@ import imgui.gl3.ImGuiImplGl3
 import imgui.glfw.ImGuiImplGlfw
 import net.minecraft.client.gl.GlBackend
 import net.minecraft.client.texture.GlTexture
-import org.lwjgl.opengl.GL11.glViewport
 import org.lwjgl.opengl.GL30.GL_FRAMEBUFFER
 import kotlin.math.abs
 
@@ -45,6 +44,7 @@ object DearImGui : Loadable {
 
     const val EXTERNAL_LINK = '↗'
     const val BREADCRUMB_SEPARATOR = '»'
+    const val BASE_FONT_SCALE = 13f
 
     val io: ImGuiIO get() = ImGui.getIO()
     const val DEFAULT_FLAGS = ImGuiConfigFlags.NavEnableKeyboard or // Enable Keyboard Controls
@@ -57,16 +57,20 @@ object DearImGui : Loadable {
     private var targetScale = 0f
 
     private fun updateScale(scale: Float) {
-        io.fonts.clear()
-        val baseFontSize = 13f
         val glyphRanges = ImFontGlyphRangesBuilder().apply {
             addRanges(io.fonts.glyphRangesDefault)
             addRanges(io.fonts.glyphRangesGreek)
             addChar(EXTERNAL_LINK)
             addChar(BREADCRUMB_SEPARATOR)
         }.buildRanges()
-        io.fonts.addFontFromFileTTF("fonts/FiraSans-Regular.ttf".path, baseFontSize * scale, ImFontConfig(), glyphRanges)
-        io.fonts.build()
+        val fontConfig = ImFontConfig()
+        val size = BASE_FONT_SCALE * scale
+        with(io.fonts) {
+            clear()
+            addFontFromFileTTF("fonts/FiraSans-Regular.ttf".path, size, fontConfig, glyphRanges)
+            addFontFromFileTTF("fonts/MinecraftDefault-Regular.ttf".path, size, fontConfig, glyphRanges)
+            build()
+        }
         implGl3.createFontsTexture()
     }
 

src/main/kotlin/com/lambda/gui/components/QuickSearch.kt

@@ -47,11 +47,10 @@ object QuickSearch {
 
     private var lastShiftPressTime = 0L
     private var lastShiftKeyCode = -1
-    private const val DOUBLE_SHIFT_WINDOW_MS = 500L
 
+    private const val DOUBLE_SHIFT_WINDOW_MS = 500L
     private const val MAX_RESULTS = 50
     private const val SIMILARITY_THRESHOLD = 3
-
     private const val WINDOW_FLAGS = ImGuiWindowFlags.AlwaysAutoResize or
             ImGuiWindowFlags.NoTitleBar or
             ImGuiWindowFlags.NoMove or
@@ -136,12 +135,12 @@ object QuickSearch {
                     config.configurables.flatMap { configurable ->
                         val confNameL = configurable.name.lowercase()
                         configurable.settings.filter { setting ->
-                            setting.visibility() && (setting.name.lowercase().contains(query) || confNameL.contains(query))
+                            setting.visibility() && (setting.name.lowercase().contains(query))
                         }.map { setting ->
                             SettingResult(setting, configurable)
                         }
                     }
-                }.take(15)
+                }
         }
     }