Username404-59
/
SnowyGUI
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move a few methods

This commit is contained in:
Username404-59 2021-04-30 19:48:53 +02:00
parent b4b137560c
commit 60bf5377cd
Signed by: Username404-59
GPG Key ID: 7AB361FBB257A5D1
3 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
common/src/main/kotlin/fr/username404/snowygui/gui/Element.kt
View File

@ -6,7 +6,14 @@ import com.mojang.blaze3d.vertex.Tesselator
import com.mojang.blaze3d.vertex.VertexConsumer import com.mojang.blaze3d.vertex.VertexConsumer
import fr.username404.snowygui.Snowy import fr.username404.snowygui.Snowy
fun interface Renderable { fun render(poseStack: PoseStack?) } fun interface Renderable {
companion object Rendering {
@JvmStatic val tessellator: Tesselator = Tesselator.getInstance()
@JvmStatic val buffer: BufferBuilder = tessellator.builder
}
fun render(poseStack: PoseStack?)
}
abstract class Element( abstract class Element(
@JvmField val xOrigin: Double, @JvmField val yOrigin: Double, @JvmField val xOrigin: Double, @JvmField val yOrigin: Double,
val width: Int, val height: Int val width: Int, val height: Int
@ -14,10 +21,13 @@ abstract class Element(
var x = xOrigin; var y = yOrigin var x = xOrigin; var y = yOrigin
internal fun withinBounds(coordinateX: Double, coordinateY: Double): Boolean = internal fun withinBounds(coordinateX: Double, coordinateY: Double): Boolean =
((coordinateX >= this.x) && (coordinateX <= (this.x + this.width))) and ((coordinateY >= this.y) && (coordinateY <= (this.y + this.height))) ((coordinateX >= this.x) && (coordinateX <= (this.x + this.width))) and ((coordinateY >= this.y) && (coordinateY <= (this.y + this.height)))
companion object Rendering { companion object {
private var caughtError: Boolean = false private var caughtError: Boolean = false
@JvmStatic protected val tessellator: Tesselator = Tesselator.getInstance() fun fromRenderable(r: Renderable, x: Int, y: Int, width: Int, height: Int): Element {
@JvmStatic protected val buffer: BufferBuilder = tessellator.builder return object: Element(x.toDouble(), y.toDouble(), width, height) {
override fun render(poseStack: PoseStack?) = r.render(poseStack)
}
}
} }
fun display(stack: PoseStack? = null) { fun display(stack: PoseStack? = null) {
if (!hidden && !caughtError) try { if (!hidden && !caughtError) try {

7
common/src/main/kotlin/fr/username404/snowygui/gui/SnowyScreen.kt
View File

@ -6,13 +6,6 @@ import net.minecraft.network.chat.TranslatableComponent
import kotlin.properties.Delegates import kotlin.properties.Delegates
abstract class SnowyScreen(translatableString: String = "screen.snowy.gui", private val willPauseScreen: Boolean = false): Screen(TranslatableComponent(translatableString)) { abstract class SnowyScreen(translatableString: String = "screen.snowy.gui", private val willPauseScreen: Boolean = false): Screen(TranslatableComponent(translatableString)) {
companion object {
fun fromRenderable(r: Renderable, x: Int, y: Int, width: Int, height: Int): Element {
return object: Element(x.toDouble(), y.toDouble(), width, height) {
override fun render(poseStack: PoseStack?) = r.render(poseStack)
}
}
}
open val components: MutableSet<Element> by Delegates.notNull() open val components: MutableSet<Element> by Delegates.notNull()
override fun render(poseStack: PoseStack?, i: Int, j: Int, f: Float) { override fun render(poseStack: PoseStack?, i: Int, j: Int, f: Float) {
if (poseStack != null) { if (poseStack != null) {

2
common/src/main/kotlin/fr/username404/snowygui/gui/elements/ClickBox.kt
View File

@ -4,6 +4,8 @@ import com.mojang.blaze3d.systems.RenderSystem
import com.mojang.blaze3d.vertex.DefaultVertexFormat import com.mojang.blaze3d.vertex.DefaultVertexFormat
import com.mojang.blaze3d.vertex.PoseStack import com.mojang.blaze3d.vertex.PoseStack
import fr.username404.snowygui.gui.ColoredElement import fr.username404.snowygui.gui.ColoredElement
import fr.username404.snowygui.gui.Renderable.Rendering.buffer
import fr.username404.snowygui.gui.Renderable.Rendering.tessellator
import net.minecraft.client.Minecraft import net.minecraft.client.Minecraft
import net.minecraft.network.chat.TranslatableComponent import net.minecraft.network.chat.TranslatableComponent
import org.lwjgl.opengl.GL20 import org.lwjgl.opengl.GL20