Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

build(deps): bump org.jetbrains.gradle.plugin.idea-ext from 1.1.7 to 1.1.8 #469

Open
wants to merge 6 commits into
base: 1.x
Choose a base branch
from
Open

build(deps): bump org.jetbrains.gradle.plugin.idea-ext from 1.1.7 to 1.1.8 #469

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
de3e876
fix: RenderUtil#drawAllInList() doesn't draw correctly (#446)
TakoTheDev Feb 29, 2024
2b7b8de
fix: creeper solver hitbox
My-Name-Is-Jeff Mar 7, 2024
a349af0
fix: wrong render position for Dungeon Chest Profit
My-Name-Is-Jeff Mar 6, 2024
25935e4
fix: DungeonListener#team doesn't update after disconnecting
My-Name-Is-Jeff Mar 9, 2024
facd868
version: 1.8.3
My-Name-Is-Jeff Mar 9, 2024
c1b9483
build(deps): bump org.jetbrains.gradle.plugin.idea-ext
dependabot[bot] Mar 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@ plugins {
id("gg.essential.loom") version "1.3.12"
id("gg.essential.defaults") version "0.3.0"
idea
id("org.jetbrains.gradle.plugin.idea-ext") version "1.1.7"
id("org.jetbrains.gradle.plugin.idea-ext") version "1.1.8"

signing
}

version = "1.8.2"
version = "1.8.3"
group = "gg.skytils"

repositories {
Expand Down
4 changes: 2 additions & 2 deletions src/main/kotlin/gg/skytils/skytilsmod/features/impl/dungeons/BossHPDisplays.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,13 +185,13 @@ object BossHPDisplays {
}

override fun demoRender() {
RenderUtil.drawAllInList(this, GIANT_NAMES.map { "$it §a20M§c❤" })
RenderUtil.drawAllInList(this, GIANT_NAMES.map { "$it §a19.5M§c❤" })
}

override val height: Int
get() = ScreenRenderer.fontRenderer.FONT_HEIGHT * GIANT_NAMES.size
override val width: Int
get() = ScreenRenderer.fontRenderer.getStringWidth("§3§lThe Diamond Giant §a19.9M§c❤")
get() = ScreenRenderer.fontRenderer.getStringWidth("§3§lThe Diamond Giant §a19.5M§c❤")

override val toggled: Boolean
get() = Skytils.config.showGiantHP
Expand Down
6 changes: 5 additions & 1 deletion src/main/kotlin/gg/skytils/skytilsmod/features/impl/dungeons/ChestProfit.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import gg.skytils.skytilsmod.core.structure.GuiElement
import gg.skytils.skytilsmod.events.impl.GuiContainerEvent
import gg.skytils.skytilsmod.features.impl.handlers.AuctionData
import gg.skytils.skytilsmod.features.impl.misc.ItemFeatures
import gg.skytils.skytilsmod.mixins.transformers.accessors.AccessorGuiContainer
import gg.skytils.skytilsmod.utils.*
import gg.skytils.skytilsmod.utils.NumberUtil.romanToDecimal
import gg.skytils.skytilsmod.utils.RenderUtil.highlight
Expand Down Expand Up @@ -86,7 +87,10 @@ object ChestProfit {
chestType.items.add(DungeonChestLootItem(lootSlot, value))
}
}
GlStateManager.pushMatrix()
GlStateManager.translate((-(event.gui as AccessorGuiContainer).guiLeft).toDouble(), -event.gui.guiTop.toDouble(), 299.0)
drawChestProfit(chestType)
GlStateManager.popMatrix()
} else if (croesusChestRegex.matches(event.chestName)) {
for (i in 10..16) {
val openChest = inv.getStackInSlot(i) ?: continue
Expand Down Expand Up @@ -312,7 +316,7 @@ object ChestProfit {
override val height: Int
get() = ScreenRenderer.fontRenderer.FONT_HEIGHT * DungeonChest.entries.size
override val width: Int
get() = ScreenRenderer.fontRenderer.getStringWidth("Obsidian Chest: 300M")
get() = ScreenRenderer.fontRenderer.getStringWidth("Obsidian Chest: +300M")

override val toggled: Boolean
get() = Skytils.config.dungeonChestProfit
Expand Down
2 changes: 1 addition & 1 deletion src/main/kotlin/gg/skytils/skytilsmod/features/impl/dungeons/DungeonTimer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,7 +320,7 @@ object DungeonTimer {
}

override val height: Int
get() = ScreenRenderer.fontRenderer.FONT_HEIGHT * 5
get() = ScreenRenderer.fontRenderer.FONT_HEIGHT * 6
override val width: Int
get() = ScreenRenderer.fontRenderer.getStringWidth("§7Wither King: 0s")

Expand Down
2 changes: 1 addition & 1 deletion src/main/kotlin/gg/skytils/skytilsmod/features/impl/dungeons/solvers/CreeperSolver.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ object CreeperSolver {
}?.firstOrNull()
} else if (solutionPairs.isEmpty()) {
val creeper = this.creeper!!.entityBoundingBox
val validBox = creeper.expand(0.5, 0.75, 0.5)
val validBox = creeper.expand(0.5, 0.5, 0.5).offset(0.0, 77 - creeper.minY, 0.0)

val roomBB = creeper.expand(14.0, 10.0, 13.0)
val candidates = BlockPos.getAllInBox(BlockPos(roomBB.minVec), BlockPos(roomBB.maxVec)).filter {
Expand Down
2 changes: 1 addition & 1 deletion src/main/kotlin/gg/skytils/skytilsmod/listeners/DungeonListener.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ object DungeonListener {
}
}
tickTimer(2, repeats = true) {
if (Utils.inDungeons && (DungeonTimer.scoreShownAt == -1L || System.currentTimeMillis() - DungeonTimer.scoreShownAt < 1500)) {
if (Utils.inDungeons && mc.thePlayer != null && (DungeonTimer.scoreShownAt == -1L || System.currentTimeMillis() - DungeonTimer.scoreShownAt < 1500)) {
val tabEntries = TabListUtils.tabEntries
if (team.isEmpty() || (DungeonTimer.dungeonStartTime != -1L && team.values.any { it.dungeonClass == DungeonClass.EMPTY })) {
if (tabEntries.isNotEmpty() && tabEntries[0].second.contains("§r§b§lParty §r§f(")) {
Expand Down
2 changes: 1 addition & 1 deletion src/main/kotlin/gg/skytils/skytilsmod/utils/RenderUtil.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -866,7 +866,7 @@ object RenderUtil {
val leftAlign = element.scaleX < UResolution.scaledWidth / 2f
val alignment =
if (leftAlign) SmartFontRenderer.TextAlignment.LEFT_RIGHT else SmartFontRenderer.TextAlignment.RIGHT_LEFT
val xPos = if (leftAlign) 0f else element.scaleWidth
val xPos = if (leftAlign) 0f else element.width.toFloat()
for ((i, str) in lines.withIndex()) {
ScreenRenderer.fontRenderer.drawString(
str,
Expand Down
Loading