diff options
| author | hannibal2 <24389977+hannibal00212@users.noreply.github.com> | 2023-06-24 19:24:54 +0200 |
|---|---|---|
| committer | hannibal2 <24389977+hannibal00212@users.noreply.github.com> | 2023-06-24 19:24:54 +0200 |
| commit | 891675f68a1c4786c2e288ef3f1a191a0070e9ac (patch) | |
| tree | 898ef9b5b50ce4c4d20135217e7c2edbd184f6ba /src/main/java/at/hannibal2/skyhanni/utils | |
| parent | 847100cb50dea171d494e541bc3a19bf8438ba3d (diff) | |
| download | skyhanni-891675f68a1c4786c2e288ef3f1a191a0070e9ac.tar.gz skyhanni-891675f68a1c4786c2e288ef3f1a191a0070e9ac.tar.bz2 skyhanni-891675f68a1c4786c2e288ef3f1a191a0070e9ac.zip | |
code cleanup
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni/utils')
| -rw-r--r-- | src/main/java/at/hannibal2/skyhanni/utils/RenderUtils.kt | 64 | ||||
| -rw-r--r-- | src/main/java/at/hannibal2/skyhanni/utils/TimeUtils.kt | 1 |
2 files changed, 39 insertions, 26 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/RenderUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/RenderUtils.kt index cade8b0fe..69df66afa 100644 --- a/src/main/java/at/hannibal2/skyhanni/utils/RenderUtils.kt +++ b/src/main/java/at/hannibal2/skyhanni/utils/RenderUtils.kt @@ -104,7 +104,7 @@ object RenderUtils { */ renderRelativeToCamera: Boolean = true, drawVerticalBarriers: Boolean = true, - partialTicks: Float = 0F + partialTicks: Float = 0F, ) { GlStateManager.enableBlend() GlStateManager.disableLighting() @@ -127,16 +127,20 @@ object RenderUtils { if (drawVerticalBarriers) { GlStateManager.color(c.red / 255f, c.green / 255f, c.blue / 255f, c.alpha / 255f * alphaMultiplier) worldRenderer.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION) - worldRenderer.pos(effectiveAABB.minX, effectiveAABB.minY, effectiveAABB.minZ).endVertex() - worldRenderer.pos(effectiveAABB.maxX, effectiveAABB.minY, effectiveAABB.minZ).endVertex() - worldRenderer.pos(effectiveAABB.maxX, effectiveAABB.minY, effectiveAABB.maxZ).endVertex() - worldRenderer.pos(effectiveAABB.minX, effectiveAABB.minY, effectiveAABB.maxZ).endVertex() + with(effectiveAABB) { + worldRenderer.pos(minX, minY, minZ).endVertex() + worldRenderer.pos(maxX, minY, minZ).endVertex() + worldRenderer.pos(maxX, minY, maxZ).endVertex() + worldRenderer.pos(minX, minY, maxZ).endVertex() + } tessellator.draw() worldRenderer.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION) - worldRenderer.pos(effectiveAABB.minX, effectiveAABB.maxY, effectiveAABB.maxZ).endVertex() - worldRenderer.pos(effectiveAABB.maxX, effectiveAABB.maxY, effectiveAABB.maxZ).endVertex() - worldRenderer.pos(effectiveAABB.maxX, effectiveAABB.maxY, effectiveAABB.minZ).endVertex() - worldRenderer.pos(effectiveAABB.minX, effectiveAABB.maxY, effectiveAABB.minZ).endVertex() + with(effectiveAABB) { + worldRenderer.pos(minX, maxY, maxZ).endVertex() + worldRenderer.pos(maxX, maxY, maxZ).endVertex() + worldRenderer.pos(maxX, maxY, minZ).endVertex() + worldRenderer.pos(minX, maxY, minZ).endVertex() + } tessellator.draw() } GlStateManager.color( @@ -148,16 +152,20 @@ object RenderUtils { //x worldRenderer.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION) - worldRenderer.pos(effectiveAABB.minX, effectiveAABB.minY, effectiveAABB.maxZ).endVertex() - worldRenderer.pos(effectiveAABB.minX, effectiveAABB.maxY, effectiveAABB.maxZ).endVertex() - worldRenderer.pos(effectiveAABB.minX, effectiveAABB.maxY, effectiveAABB.minZ).endVertex() - worldRenderer.pos(effectiveAABB.minX, effectiveAABB.minY, effectiveAABB.minZ).endVertex() + with(effectiveAABB) { + worldRenderer.pos(minX, minY, maxZ).endVertex() + worldRenderer.pos(minX, maxY, maxZ).endVertex() + worldRenderer.pos(minX, maxY, minZ).endVertex() + worldRenderer.pos(minX, minY, minZ).endVertex() + } tessellator.draw() worldRenderer.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION) - worldRenderer.pos(effectiveAABB.maxX, effectiveAABB.minY, effectiveAABB.minZ).endVertex() - worldRenderer.pos(effectiveAABB.maxX, effectiveAABB.maxY, effectiveAABB.minZ).endVertex() - worldRenderer.pos(effectiveAABB.maxX, effectiveAABB.maxY, effectiveAABB.maxZ).endVertex() - worldRenderer.pos(effectiveAABB.maxX, effectiveAABB.minY, effectiveAABB.maxZ).endVertex() + with(effectiveAABB) { + worldRenderer.pos(maxX, minY, minZ).endVertex() + worldRenderer.pos(maxX, maxY, minZ).endVertex() + worldRenderer.pos(maxX, maxY, maxZ).endVertex() + worldRenderer.pos(maxX, minY, maxZ).endVertex() + } tessellator.draw() GlStateManager.color( c.red / 255f * 0.9f, @@ -167,16 +175,20 @@ object RenderUtils { ) //z worldRenderer.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION) - worldRenderer.pos(effectiveAABB.minX, effectiveAABB.maxY, effectiveAABB.minZ).endVertex() - worldRenderer.pos(effectiveAABB.maxX, effectiveAABB.maxY, effectiveAABB.minZ).endVertex() - worldRenderer.pos(effectiveAABB.maxX, effectiveAABB.minY, effectiveAABB.minZ).endVertex() - worldRenderer.pos(effectiveAABB.minX, effectiveAABB.minY, effectiveAABB.minZ).endVertex() + with(effectiveAABB) { + worldRenderer.pos(minX, maxY, minZ).endVertex() + worldRenderer.pos(maxX, maxY, minZ).endVertex() + worldRenderer.pos(maxX, minY, minZ).endVertex() + worldRenderer.pos(minX, minY, minZ).endVertex() + } tessellator.draw() worldRenderer.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION) - worldRenderer.pos(effectiveAABB.minX, effectiveAABB.minY, effectiveAABB.maxZ).endVertex() - worldRenderer.pos(effectiveAABB.maxX, effectiveAABB.minY, effectiveAABB.maxZ).endVertex() - worldRenderer.pos(effectiveAABB.maxX, effectiveAABB.maxY, effectiveAABB.maxZ).endVertex() - worldRenderer.pos(effectiveAABB.minX, effectiveAABB.maxY, effectiveAABB.maxZ).endVertex() + with(effectiveAABB) { + worldRenderer.pos(minX, minY, maxZ).endVertex() + worldRenderer.pos(maxX, minY, maxZ).endVertex() + worldRenderer.pos(maxX, maxY, maxZ).endVertex() + worldRenderer.pos(minX, maxY, maxZ).endVertex() + } tessellator.draw() GlStateManager.enableTexture2D() GlStateManager.enableCull() @@ -539,7 +551,7 @@ object RenderUtils { GlStateManager.translate(getAbsX().toFloat(), (getAbsY() + offsetY).toFloat(), 0F) var offsetX = 0 for (any in line) { - val renderable = Renderable.fromAny(any, itemScale = itemScale) ?: throw RuntimeException("Unknown render object: ${any}") + val renderable = Renderable.fromAny(any, itemScale = itemScale) ?: throw RuntimeException("Unknown render object: $any") renderable.render(getAbsX() + offsetX, getAbsY() + offsetY) offsetX += renderable.width diff --git a/src/main/java/at/hannibal2/skyhanni/utils/TimeUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/TimeUtils.kt index a0b6e91d8..8e3cbf78b 100644 --- a/src/main/java/at/hannibal2/skyhanni/utils/TimeUtils.kt +++ b/src/main/java/at/hannibal2/skyhanni/utils/TimeUtils.kt @@ -19,6 +19,7 @@ object TimeUtils { duration.inWholeMilliseconds - 999, biggestUnit, showMilliSeconds, longName, maxUnits ) + @Deprecated("Use kotlin.time.Duration instead!") fun formatDuration( millis: Long, biggestUnit: TimeUnit = TimeUnit.YEAR, |