new: blackbar speed

Polyfrost · Dec 15, 2021 · 599e410 · 599e410
1 parent 8e6438b
commit 599e410
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 4 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -3,4 +3,4 @@ org.gradle.jvmargs=-Xmx2G
 
 # Define project properties.
 mod_name=REDACTION
-mod_ver=0.4.0
+mod_ver=0.4.1
diff --git a/src/main/kotlin/net/wyvest/redaction/Redaction.kt b/src/main/kotlin/net/wyvest/redaction/Redaction.kt
@@ -31,7 +31,7 @@ object Redaction {
     private val particleGenerator = ParticleGenerator()
 
     const val NAME = "REDACTION"
-    const val VERSION = "0.4.0"
+    const val VERSION = "0.4.1"
     const val ID = "redaction"
     val mc: Minecraft
         get() = Minecraft.getMinecraft()

diff --git a/src/main/kotlin/net/wyvest/redaction/config/RedactionConfig.kt b/src/main/kotlin/net/wyvest/redaction/config/RedactionConfig.kt
@@ -9,6 +9,7 @@ import net.wyvest.redaction.Redaction.NAME
 import net.wyvest.redaction.Redaction.hasChanged
 import net.wyvest.redaction.Redaction.mc
 import net.wyvest.redaction.gui.DownloadConfirmGui
+import net.wyvest.redaction.hud.HudManager
 import net.wyvest.redaction.utils.Updater
 import java.awt.Color
 import java.io.File
@@ -39,6 +40,16 @@ object RedactionConfig : Vigilant(File(Redaction.modDir, "${Redaction.ID}.toml")
     )
     var blackbar = false
 
+    @Property(
+        type = PropertyType.SLIDER,
+        name = "Blackbar Update Speed",
+        description = "Select the speed of the blackbar animation updating. Measured in milliseconds",
+        category = "Blackbar",
+        min = 10,
+        max = 100
+    )
+    var blackbarSpeed = 10
+
     @Property(
         type = PropertyType.COLOR,
         name = "Blackbar Color",
@@ -100,5 +111,9 @@ object RedactionConfig : Vigilant(File(Redaction.modDir, "${Redaction.ID}.toml")
             particles = newValue
             hasChanged = true
         }
+        registerListener("blackbarSpeed") { newValue: Int ->
+            blackbarSpeed = newValue
+            HudManager.elements[0].setTimer()
+        }
     }
 }
diff --git a/src/main/kotlin/net/wyvest/redaction/hud/elements/BlackBar.kt b/src/main/kotlin/net/wyvest/redaction/hud/elements/BlackBar.kt
@@ -11,6 +11,7 @@ import net.wyvest.redaction.config.RedactionConfig
 import net.wyvest.redaction.hud.Element
 import net.wyvest.redaction.utils.GlUtil
 import net.wyvest.redaction.utils.MathUtil
+import java.awt.event.ActionListener
 import javax.swing.Timer
 
 class BlackBar : Element() {
@@ -21,8 +22,9 @@ class BlackBar : Element() {
     private val texPath = ResourceLocation("textures/gui/widgets.png")
     private var firstTime = true
     private var entityplayer: EntityPlayer? = null
+    private var timer: Timer? = null
 
-    private val timer = Timer(25) {
+    private val timerTask: ActionListener = ActionListener {
         if (entityplayer != null && mc.thePlayer != null && mc.theWorld != null && scaledResolution != null && partialTicks != null) {
             data?.let {
                 val scaledHeight = scaledResolution!!.scaledHeight
@@ -53,12 +55,18 @@ class BlackBar : Element() {
 
 
     override fun initialize() {
-        timer.start()
+        setTimer()
         val resolution = ScaledResolution(Minecraft.getMinecraft())
         scaledResolution = resolution
         data = BlackBarData(-1.0F, resolution.scaledHeight - 22)
     }
 
+    fun setTimer() {
+        timer?.stop()
+        timer = Timer(RedactionConfig.blackbarSpeed, timerTask)
+        timer?.start()
+    }
+
     override fun render(
         res: ScaledResolution,
         partialTicks: Float