DBot/overdrive_that_matters
DBot/overdrive_that_matters
3
1
Fork 0
Code Issues 63 Pull Requests Packages Releases Wiki Activity

Compare commits

base: DBot:ba5d3a404386a33bc8919352e7016139cd965159
Branches Tags
DBot:1.21
DBot:item-pipes
DBot:world-structures
DBot:worldgen-placement-providers
DBot:1.20.1
DBot:1.19.2
DBot:1.19.3
DBot:1.19.4
DBot:1.20.2
DBot:1.20
...
compare: DBot:1965720053851dc0c900b05ace4f1c9a536d8a3a
Branches Tags
DBot:item-pipes
DBot:world-structures
DBot:1.21
DBot:worldgen-placement-providers
DBot:1.20.1
DBot:1.19.2
DBot:1.19.3
DBot:1.19.4
DBot:1.20.2
DBot:1.20

3 Commits
ba5d3a4043 ... 1965720053

Author SHA1 Message Date
DBotThePony
1965720053
Fix energy counter for android being rendered incorrectly 2025-02-21 21:15:29 +07:00
DBotThePony
fb8a28d423
Animate gauges slower in matter entangler recipe category 2025-02-21 21:11:29 +07:00
DBotThePony
63383c22eb
Fix power gauge in matter entangler recipe category rendering wrong 2025-02-21 21:10:15 +07:00
3 changed files with 5 additions and 5 deletions
Show Stats Expand all files Collapse all files

4
src/main/kotlin/ru/dbotthepony/mc/otm/client/MatteryGUI.kt
View File

@ -156,10 +156,10 @@ object MatteryGUI {
if (ply.hasEffect(MobEffects.HUNGER)) { if (ply.hasEffect(MobEffects.HUNGER)) {
CHARGE_HUNGER_BG.render(guiGraphics, left.toFloat(), top.toFloat()) CHARGE_HUNGER_BG.render(guiGraphics, left.toFloat(), top.toFloat())
CHARGE_HUNGER.renderPartial(guiGraphics, left.toFloat() - leftPadding + 80f, top.toFloat(), width = leftPadding) CHARGE_HUNGER.renderPartial(guiGraphics, left.toFloat() - leftPadding + 81f, top.toFloat(), width = leftPadding, leftRight = false)
} else { } else {
CHARGE_BG.render(guiGraphics, left.toFloat(), top.toFloat()) CHARGE_BG.render(guiGraphics, left.toFloat(), top.toFloat())
CHARGE.renderPartial(guiGraphics, left.toFloat() - leftPadding + 80f, top.toFloat(), width = leftPadding) CHARGE.renderPartial(guiGraphics, left.toFloat() - leftPadding + 81f, top.toFloat(), width = leftPadding, leftRight = false)
} }
val formattedPower = mattery.androidEnergy.batteryLevel.formatPower() val formattedPower = mattery.androidEnergy.batteryLevel.formatPower()

2
src/main/kotlin/ru/dbotthepony/mc/otm/compat/jei/Gauges.kt
View File

@ -34,7 +34,7 @@ fun renderEnergyGauge(
) { ) {
val perc = 1f - ((systemTime.secondsF * drainSpeed) % 1f) val perc = 1f - ((systemTime.secondsF * drainSpeed) % 1f)
PowerGaugePanel.GAUGE_BACKGROUND.render(guiGraphics, x, y, width, height) PowerGaugePanel.GAUGE_BACKGROUND.render(guiGraphics, x, y, width, height)
PowerGaugePanel.GAUGE_FOREGROUND.renderPartial(guiGraphics, x, y + height * (1f - perc) - 1f, width, height * perc) PowerGaugePanel.GAUGE_FOREGROUND.renderPartial(guiGraphics, x, y + height * (1f - perc) - 1f, width, height * perc, topDown = false)
} }
fun matterGaugeTooltips(target: ITooltipBuilder, matter: Decimal, mouseX: Double, mouseY: Double, x: Float, y: Float, width: Float = MatterGaugePanel.GAUGE_BACKGROUND.width, height: Float = MatterGaugePanel.GAUGE_BACKGROUND.height) { fun matterGaugeTooltips(target: ITooltipBuilder, matter: Decimal, mouseX: Double, mouseY: Double, x: Float, y: Float, width: Float = MatterGaugePanel.GAUGE_BACKGROUND.width, height: Float = MatterGaugePanel.GAUGE_BACKGROUND.height) {

4
src/main/kotlin/ru/dbotthepony/mc/otm/compat/jei/MatterEntanglerRecipeCategory.kt
View File

@ -81,8 +81,8 @@ object MatterEntanglerRecipeCategory : IRecipeCategory<IMatterEntanglerRecipe>,
override fun draw(recipe: IMatterEntanglerRecipe, recipeSlotsView: IRecipeSlotsView, guiGraphics: GuiGraphics, mouseX: Double, mouseY: Double) { override fun draw(recipe: IMatterEntanglerRecipe, recipeSlotsView: IRecipeSlotsView, guiGraphics: GuiGraphics, mouseX: Double, mouseY: Double) {
val wrap = MGUIGraphics(guiGraphics) val wrap = MGUIGraphics(guiGraphics)
renderMatterGauge(wrap, 13f, 6f, drainSpeed = (recipe.matter / Decimal(300)).toFloat()) renderMatterGauge(wrap, 13f, 6f, drainSpeed = (recipe.matter / Decimal(900)).toFloat())
renderEnergyGauge(wrap, 4f, 6f, drainSpeed = (recipe.ticks / 2000.0).toFloat()) renderEnergyGauge(wrap, 4f, 6f, drainSpeed = (recipe.ticks / 12000.0).toFloat())
wrap.draw(x = 85f, y = 45f, text = TranslatableComponent("otm.gui.recipe.ticks", recipe.ticks), drawShadow = true) wrap.draw(x = 85f, y = 45f, text = TranslatableComponent("otm.gui.recipe.ticks", recipe.ticks), drawShadow = true)
} }