Skip to content

Commit e0b12fe

Browse files
committed
New corporate design
1 parent f21b526 commit e0b12fe

File tree

11 files changed

+14
-16
lines changed

11 files changed

+14
-16
lines changed

src/main/kotlin/com/lambda/client/module/modules/client/CustomFont.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ import java.awt.GraphicsEnvironment
1111

1212
object CustomFont : Module(
1313
name = "CustomFont",
14-
description = "Use the better font instead of the stupid Minecraft font",
14+
description = "Use different GUI fonts",
1515
showOnArray = false,
1616
category = Category.CLIENT,
1717
enabledByDefault = true
1818
) {
19-
private const val DEFAULT_FONT_NAME = "Lato"
19+
private const val DEFAULT_FONT_NAME = "Fira Code"
2020

2121
val fontName = setting("Font Name", DEFAULT_FONT_NAME, consumer = { prev, value ->
2222
getMatchingFontName(value) ?: getMatchingFontName(prev) ?: DEFAULT_FONT_NAME

src/main/kotlin/com/lambda/client/module/modules/client/GuiColors.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ object GuiColors : Module(
1111
category = Category.CLIENT,
1212
alwaysEnabled = true
1313
) {
14-
private val primarySetting by setting("Primary Color", ColorHolder(111, 166, 222, 255))
15-
private val outlineSetting by setting("Outline Color", ColorHolder(88, 99, 111, 200))
16-
private val backgroundSetting by setting("Background Color", ColorHolder(30, 36, 48, 200))
14+
private val primarySetting by setting("Primary Color", ColorHolder(108, 0, 43, 255))
15+
private val outlineSetting by setting("Outline Color", ColorHolder(78, 0, 31, 200))
16+
private val backgroundSetting by setting("Background Color", ColorHolder(31, 10, 18, 200))
1717
private val textSetting by setting("Text Color", ColorHolder(255, 255, 255, 255))
1818
private val aHover by setting("Hover Alpha", 32, 0..255, 1)
1919

src/main/kotlin/com/lambda/client/module/modules/misc/DiscordRPC.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,7 @@ import net.minecraftforge.fml.common.gameevent.TickEvent
2727
object DiscordRPC : Module(
2828
name = "DiscordRPC",
2929
category = Category.MISC,
30-
description = "Discord Rich Presence",
31-
enabledByDefault = false
30+
description = "Discord Rich Presence"
3231
) {
3332
private val line1Left by setting("Line 1 Left", LineInfo.VERSION) // details left
3433
private val line1Right by setting("Line 1 Right", LineInfo.USERNAME) // details right

src/main/kotlin/com/lambda/client/util/graphics/font/FontRenderAdapter.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import kotlin.math.round
1010
* For the sake of dumb Minecraftia simps
1111
*/
1212
object FontRenderAdapter {
13-
private val dumbMcFontRenderer = Wrapper.minecraft.fontRenderer
13+
private val mcFontRenderer = Wrapper.minecraft.fontRenderer
1414
val useCustomFont get() = CustomFont.isEnabled
1515

1616
fun drawString(text: String, posXIn: Float = 0f, posYIn: Float = 0f, drawShadow: Boolean = true, color: ColorHolder = ColorHolder(255, 255, 255), scale: Float = 1f, customFont: Boolean = useCustomFont) {
@@ -20,20 +20,20 @@ object FontRenderAdapter {
2020
glPushMatrix()
2121
glTranslatef(round(posXIn), round(posYIn), 0f)
2222
glScalef(scale, scale, 1f)
23-
dumbMcFontRenderer.drawString(text, 0f, 2.0f, color.toHex(), drawShadow)
23+
mcFontRenderer.drawString(text, 0f, 2.0f, color.toHex(), drawShadow)
2424
glPopMatrix()
2525
}
2626
}
2727

2828
fun getFontHeight(scale: Float = 1f, customFont: Boolean = useCustomFont) = if (customFont) {
2929
LambdaFontRenderer.getFontHeight(scale)
3030
} else {
31-
dumbMcFontRenderer.FONT_HEIGHT * scale
31+
mcFontRenderer.FONT_HEIGHT * scale
3232
}
3333

3434
fun getStringWidth(text: String, scale: Float = 1f, customFont: Boolean = useCustomFont) = if (customFont) {
3535
LambdaFontRenderer.getStringWidth(text, scale)
3636
} else {
37-
dumbMcFontRenderer.getStringWidth(text) * scale
37+
mcFontRenderer.getStringWidth(text) * scale
3838
}
3939
}

src/main/kotlin/com/lambda/client/util/graphics/font/Style.kt

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,8 @@ package com.lambda.client.util.graphics.font
22

33
import java.awt.Font
44

5-
@Suppress("UNUSED")
65
enum class Style(val code: String, val codeChar: Char, val fontPath: String, val styleConst: Int) {
7-
REGULAR("§r", 'r', "/assets/lambda/fonts/Lato/Lato-Regular.ttf", Font.PLAIN),
8-
BOLD("§l", 'l', "/assets/lambda/fonts/Lato/Lato-Bold.ttf", Font.BOLD),
9-
ITALIC("§o", 'o', "/assets/lambda/fonts/Lato/Lato-Italic.ttf", Font.ITALIC)
6+
REGULAR("§r", 'r', "/assets/fonts/FiraCode-Regular.ttf", Font.PLAIN),
7+
BOLD("§l", 'l', "/assets/fonts/FiraCode-Bold.ttf", Font.BOLD),
8+
ITALIC("§o", 'o', "/assets/fonts/FiraCode-Regular.ttf", Font.ITALIC)
109
}
Binary file not shown.
Binary file not shown.

src/main/resources/assets/lambda/fonts/Lato/OFL.txt renamed to src/main/resources/assets/fonts/OTF.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2010-2014 by tyPoland Lukasz Dziedzic (team@latofonts.com) with Reserved Font Name "Lato"
1+
Copyright (c) 2014, The Fira Code Project Authors (https://github.com/tonsky/FiraCode)
22

33
This Font Software is licensed under the SIL Open Font License, Version 1.1.
44
This license is copied below, and is also available with a FAQ at:
Binary file not shown.
Binary file not shown.

0 commit comments

Comments
 (0)