Chieri/Firmament
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: Add Pet overlay

Browse Source 
* feat: pet overlay

* fix: missing shadow

* fix: getting pet when not in pets menu

* sort translations

* Merge branch 'master' into feat/pet-overlay

* Merge branch 'master' into feat/pet-overlay

* Add requested changes for Pet Overlay
This commit is contained in:
Jacob
2025-05-08 05:20:29 +08:00
committed by GitHub
parent 63669bc28b
commit 40256ca601
7 changed files with 75 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/kotlin/features/fixes/Fixes.kt
View File

@@ -50,7 +50,7 @@ object Fixes : FirmamentFeature {
"firmament.fixes.auto-sprint.sprinting"
else
"firmament.fixes.auto-sprint.not-sprinting"
), 0, 0, -1, false
), 0, 0, -1, true
)
it.context.matrices.pop()
}

57
src/main/kotlin/features/inventory/PetFeatures.kt
View File

@@ -1,14 +1,24 @@
package moe.nea.firmament.features.inventory
import net.minecraft.util.Identifier
import moe.nea.jarvis.api.Point
import net.minecraft.item.ItemStack
import net.minecraft.text.Text
import net.minecraft.util.Formatting
import moe.nea.firmament.Firmament
import moe.nea.firmament.annotations.Subscribe
import moe.nea.firmament.events.HudRenderEvent
import moe.nea.firmament.events.SlotRenderEvents
import moe.nea.firmament.features.FirmamentFeature
import moe.nea.firmament.gui.config.ManagedConfig
import moe.nea.firmament.util.FirmFormatters.formatPercent
import moe.nea.firmament.util.FirmFormatters.shortFormat
import moe.nea.firmament.util.MC
import moe.nea.firmament.util.petData
import moe.nea.firmament.util.render.drawGuiTexture
import moe.nea.firmament.util.skyblock.Rarity
import moe.nea.firmament.util.titleCase
import moe.nea.firmament.util.useMatch
import moe.nea.firmament.util.withColor
object PetFeatures : FirmamentFeature {
override val identifier: String
@@ -19,9 +29,12 @@ object PetFeatures : FirmamentFeature {
object TConfig : ManagedConfig(identifier, Category.INVENTORY) {
val highlightEquippedPet by toggle("highlight-pet") { true }
var petOverlay by toggle("pet-overlay") { false }
val petOverlayHud by position("pet-overlay-hud", 80, 10) { Point(0.5, 1.0) }
}
val petMenuTitle = "Pets(?: \\([0-9]+/[0-9]+\\))?".toPattern()
var petItemStack: ItemStack? = null
@Subscribe
fun onSlotRender(event: SlotRenderEvents.Before) {
@@ -29,12 +42,44 @@ object PetFeatures : FirmamentFeature {
val stack = event.slot.stack
if (stack.petData?.active == true)
petMenuTitle.useMatch(MC.screenName ?: return) {
event.context.drawGuiTexture(
event.slot.x, event.slot.y, 0, 16, 16,
Identifier.of("firmament:selected_pet_background")
)
}
petItemStack = stack
event.context.drawGuiTexture(
Firmament.identifier("selected_pet_background"),
event.slot.x, event.slot.y, 16, 16,
)
}
}
@Subscribe
fun onRenderHud(it: HudRenderEvent) {
if (!TConfig.petOverlay) return
val itemStack = petItemStack ?: return
val petData = petItemStack?.petData ?: return
val rarity = Rarity.fromNeuRepo(petData.tier)
val rarityCode = Rarity.colourMap[rarity] ?: Formatting.WHITE
val xp = petData.level
val petType = titleCase(petData.type)
val heldItem = petData.heldItem?.let { item -> "Held Item: ${titleCase(item)}" }
it.context.matrices.push()
TConfig.petOverlayHud.applyTransformations(it.context.matrices)
val lines = mutableListOf<Text>()
it.context.matrices.push()
it.context.matrices.translate(-0.5, -0.5, 0.0)
it.context.matrices.scale(2f, 2f, 1f)
it.context.drawItem(itemStack, 0, 0)
it.context.matrices.pop()
lines.add(Text.literal("[Lvl ${xp.currentLevel}] ").append(Text.literal(petType).withColor(rarityCode)))
if (heldItem != null) lines.add(Text.literal(heldItem))
if (xp.currentLevel != xp.maxLevel) lines.add(Text.literal("Required L${xp.currentLevel + 1}: ${shortFormat(xp.expInCurrentLevel.toDouble())}/${shortFormat(xp.expRequiredForNextLevel.toDouble())} (${formatPercent(xp.percentageToNextLevel.toDouble())})"))
lines.add(Text.literal("Required L100: ${shortFormat(xp.expTotal.toDouble())}/${shortFormat(xp.expRequiredForMaxLevel.toDouble())} (${formatPercent(xp.percentageToMaxLevel.toDouble())})"))
for ((index, line) in lines.withIndex()) {
it.context.drawText(MC.font, line.copy().withColor(Formatting.GRAY), 36, MC.font.fontHeight * index, -1, true)
}
it.context.matrices.pop()
}
}