xtex/quaedam
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: int silder

Browse Source
This commit is contained in:
xtex 2023-07-25 11:18:52 +08:00
parent 5a41bf0665
commit bc2f250bae
Signed by: xtex
GPG Key ID: B918086ED8045B91
2 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/src/main/kotlin/quaedam/projection/swarm/SwarmProjectionEffect.kt
View File

@ -53,7 +53,7 @@ data class SwarmProjectionEffect(
} }
override fun createShell() = buildProjectionEffectShell(this) { override fun createShell() = buildProjectionEffectShell(this) {
intSlider("quaedam.shell.swarm.max_count", ::maxCount, 0..180 step 5) intSlider("quaedam.shell.swarm.max_count", ::maxCount, 0..250 step 5)
} }
} }

27
common/src/main/kotlin/quaedam/shell/ProjectionEffectShell.kt
View File

@ -6,7 +6,6 @@ import net.minecraft.client.gui.components.StringWidget
import net.minecraft.client.gui.layouts.LayoutElement import net.minecraft.client.gui.layouts.LayoutElement
import net.minecraft.network.chat.Component import net.minecraft.network.chat.Component
import quaedam.projection.ProjectionEffect import quaedam.projection.ProjectionEffect
import kotlin.math.floor
import kotlin.reflect.KMutableProperty0 import kotlin.reflect.KMutableProperty0
class ProjectionEffectShell(val effect: ProjectionEffect) { class ProjectionEffectShell(val effect: ProjectionEffect) {
@ -35,15 +34,20 @@ class ProjectionEffectShell(val effect: ProjectionEffect) {
row(key) { row(key) {
object : AbstractSliderButton( object : AbstractSliderButton(
0, 0, width, height, 0, 0, width, height,
Component.literal(property.get().toString()), (property.get() - range.start).toDouble() / len Component.literal(property.get().toString()), (property.get() - range.start) / len
) { ) {
override fun updateMessage() { override fun updateMessage() {
message = Component.literal(value.toString()) message = Component.literal(property.get().toString())
} }
override fun applyValue() { override fun applyValue() {
value = floor(value / step) * step val diff = value % step
property.set(range.start + floor(value * len)) if (diff < 0.5) {
value -= diff
} else {
value += (step - diff)
}
property.set(range.start + (value * len))
} }
} }
} }
@ -51,19 +55,24 @@ class ProjectionEffectShell(val effect: ProjectionEffect) {
fun intSlider(key: String, property: KMutableProperty0<Int>, range: IntProgression) { fun intSlider(key: String, property: KMutableProperty0<Int>, range: IntProgression) {
val len = range.last - range.first val len = range.last - range.first
val step = range.step / len val step = range.step.toDouble() / len
row(key) { row(key) {
object : AbstractSliderButton( object : AbstractSliderButton(
0, 0, width, height, 0, 0, width, height,
Component.literal(property.get().toString()), (property.get() - range.first).toDouble() / len Component.literal(property.get().toString()), (property.get() - range.first).toDouble() / len
) { ) {
override fun updateMessage() { override fun updateMessage() {
message = Component.literal(value.toString()) message = Component.literal(property.get().toString())
} }
override fun applyValue() { override fun applyValue() {
value = floor(value / step) * step val diff = value % step
property.set((range.first + floor(value * len)).toInt()) if (diff < 0.5) {
value -= diff
} else {
value += (step - diff)
}
property.set(range.first + (value * len).toInt())
} }
} }
} }