Skip to content

Commit

Permalink
Merge branch 'feature/wardrobe-overlay' into wardrobe-overlay-addon
Browse files Browse the repository at this point in the history
# Conflicts:
#	src/main/java/at/hannibal2/skyhanni/features/inventory/wardrobe/CustomWardrobe.kt
  • Loading branch information
ItsEmpa committed Apr 30, 2024
2 parents 2299c67 + cbc1890 commit b36f789
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ class CustomWardrobe {
horizontalAlign = RenderUtils.HorizontalAlignment.CENTER
)

pos.renderRenderables(listOf(fullRenderable), posLabel = "Wardrobe Overlay")
pos.renderRenderables(listOf(fullRenderable), posLabel = "Wardrobe Overlay", addToGuiManager = false)
}

@SubscribeEvent
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/at/hannibal2/skyhanni/utils/RenderUtils.kt
Original file line number Diff line number Diff line change
Expand Up @@ -544,6 +544,7 @@ object RenderUtils {
renderables: List<Renderable>,
extraSpace: Int = 0,
posLabel: String,
addToGuiManager: Boolean = true,
) {
if (renderables.isEmpty()) return
var longestY = 0
Expand All @@ -560,7 +561,7 @@ object RenderUtils {

GlStateManager.popMatrix()
}
GuiEditManager.add(this, posLabel, longestX, longestY)
if (addToGuiManager) GuiEditManager.add(this, posLabel, longestX, longestY)
}

/**
Expand Down

0 comments on commit b36f789

Please sign in to comment.