Version 1.3.5.2

Author: EssentialGGBot

build-logic/build.gradle.kts

@@ -36,7 +36,7 @@ dependencies {
     implementation("org.ow2.asm:asm-commons:9.3")
     implementation ("com.google.guava:guava:30.1.1-jre")
 
-    implementation("gg.essential:essential-gradle-toolkit:0.6.3")
+    implementation("gg.essential:essential-gradle-toolkit:0.6.4")
 }
 
 gradlePlugin {

build-logic/src/main/kotlin/essential/universal.kt

@@ -63,6 +63,7 @@ fun Project.universalLibs() {
         compileOnly("org.lwjgl:lwjgl-opengl:3.3.1")
         // Depending on 1.8.9 for all of these because that's the oldest version we support
         compileOnly("com.google.code.gson:gson:2.2.4")
+        compileOnly("com.google.guava:guava:17.0")
         compileOnly("commons-codec:commons-codec:1.9")
         compileOnly("org.apache.httpcomponents:httpclient:4.3.3") // TODO ideally switch to one of the libs we bundle
         // These versions are configured in gradle/libs.versions.toml

changelog/release-1.3.5.2.md

@@ -0,0 +1,10 @@
+Title: Bug Patch
+Summary: Minor bug fixes
+
+## Wardrobe
+- Added emote sound settings
+
+## Bug Fixes
+- Fixed crash when unbinding the zoom key in 1.21.2+
+- Fixed emotes unlocked via bundles permanently playing on the player
+- Fixed incorrect small purchase banner positioning

elementa/statev2/src/main/kotlin/gg/essential/gui/elementa/state/v2/collections/utils.kt

@@ -13,6 +13,7 @@ package gg.essential.gui.elementa.state.v2.collections
 
 import gg.essential.elementa.state.v2.ReferenceHolder
 import gg.essential.gui.elementa.state.v2.ListState
+import gg.essential.gui.elementa.state.v2.effect
 
 // FIXME this is assuming there are no duplicate keys (good enough for now)
 fun <T, K, V> ListState<T>.asMap(owner: ReferenceHolder, block: (T) -> Pair<K, V>): Map<K, V> {
@@ -41,6 +42,35 @@ fun <T, K, V> ListState<T>.asMap(owner: ReferenceHolder, block: (T) -> Pair<K, V
     return map
 }
 
+fun <T> ListState<T>.effectOnChange(
+    referenceHolder: ReferenceHolder,
+    onChange: (TrackedList.Change<T>) -> Unit,
+) {
+    var oldList = trackedListOf<T>()
+    effect(referenceHolder) {
+        val newList = this@effectOnChange()
+        val changes = newList.getChangesSince(oldList).also { oldList = newList }
+        for (change in changes) {
+            onChange(change)
+        }
+    }
+}
+
+fun <T> ListState<T>.effectOnChange(
+    referenceHolder: ReferenceHolder,
+    add: (IndexedValue<T>) -> Unit,
+    remove: (IndexedValue<T>) -> Unit,
+    clear: (List<T>) -> Unit = { list -> list.forEach { remove(IndexedValue(0, it)) } },
+) {
+    effectOnChange(referenceHolder) { change ->
+        when (change) {
+            is TrackedList.Add -> add(change.element)
+            is TrackedList.Remove -> remove(change.element)
+            is TrackedList.Clear -> clear(change.oldElements)
+        }
+    }
+}
+
 fun <T> trackedListOf(vararg elements: T) : TrackedList<T> = MutableTrackedList(elements.toMutableList())
 
 fun <T> mutableTrackedListOf(vararg elements: T): MutableTrackedList<T> = MutableTrackedList(elements.toMutableList())

gradle.properties

@@ -7,4 +7,4 @@ org.gradle.configureondemand=true
 org.gradle.parallel.threads=128
 org.gradle.jvmargs=-Xmx16G
 minecraftVersion=11202
-version=1.3.5.1
+version=1.3.5.2

gui/essential/src/main/kotlin/gg/essential/config/EssentialConfig.kt

@@ -179,6 +179,14 @@ object EssentialConfig : Vigilant2(), GuiEssentialPlatform.Config {
     val disableEmotesState = property("Emotes.General.Disable Emotes", false)
     var disableEmotes by disableEmotesState
 
+    enum class AllowEmoteSounds(val label: String) {
+        FROM_EVERYONE("From everyone"),
+        FROM_MYSELF_AND_FRIENDS("From myself & friends"),
+        FROM_MYSELF_ONLY("From myself only"),
+        FROM_NOBODY("From nobody")
+    }
+    val allowEmoteSounds = property("Emotes.General.Allow emote sounds", AllowEmoteSounds.FROM_EVERYONE)
+
     val essentialScreenshotsState = property("Quality of Life.Screenshots.Essential Screenshots", true)
     var essentialScreenshots: Boolean
         get() = essentialEnabled && essentialScreenshotsState.get()
@@ -250,6 +258,8 @@ object EssentialConfig : Vigilant2(), GuiEssentialPlatform.Config {
     enum class PreviouslyLaunchedWithContainer { Unknown, Yes, No  }
     val previouslyLaunchedWithContainer = property("Hidden.previously_launched_with_container", PreviouslyLaunchedWithContainer.Unknown)
 
+    val playEmoteSoundsInWardrobe = property("Hidden.play_emote_sounds_in_wardrobe", true)
+
     override val migrations = listOf(
         Migration { config ->
             val overrideGuiScale = config.remove("general.general.gui_scale") as Boolean? ?: return@Migration
@@ -378,6 +388,12 @@ object EssentialConfig : Vigilant2(), GuiEssentialPlatform.Config {
                     description = "Show emote animations on yourself and other players."
                 }
 
+                selector(allowEmoteSounds) {
+                    name = "Allow emote sounds"
+                    description = "Select who you can hear emote sounds from."
+                    options = AllowEmoteSounds.entries.map { it.label }
+                }
+
                 switch(thirdPersonEmotesState) {
                     name = "Play emotes in third person view"
                     description = "Emotes will be shown in third-person view. You can still toggle between front and back view."

gui/essential/src/main/kotlin/gg/essential/gui/layoutdsl/effects.kt

@@ -25,6 +25,7 @@ import gg.essential.gui.common.LoadingIcon
 import gg.essential.gui.common.shadow.ShadowEffect
 import gg.essential.gui.common.shadow.ShadowIcon
 import gg.essential.gui.elementa.state.v2.combinators.map
+import gg.essential.gui.elementa.state.v2.combinators.zip
 import java.awt.Color
 import gg.essential.gui.elementa.state.v2.State as StateV2
 
@@ -38,6 +39,8 @@ fun Modifier.effect(effect: () -> Effect) = this then {
 
 fun Modifier.outline(color: Color, width: Float, drawInsideChildren: Boolean = false) = effect { OutlineEffect(color, width, drawInsideChildren = drawInsideChildren) }
 fun Modifier.outline(color: State<Color>, width: State<Float>, drawInsideChildren: Boolean = false) = effect { OutlineEffect(color, width, drawInsideChildren = drawInsideChildren) }
+// TODO: Implement this properly with statev2
+fun Modifier.outline(color: StateV2<Color>, width: StateV2<Float>, drawInsideChildren: Boolean = false) = then(color.zip(width).map { (color, width) -> outline(color, width, drawInsideChildren) })
 
 fun Modifier.shadow(color: Color? = null) = this then {
     when (this) {

gui/essential/src/main/kotlin/gg/essential/gui/overlay/LayerPriority.kt

@@ -12,6 +12,15 @@
 package gg.essential.gui.overlay
 
 enum class LayerPriority {
+    /**
+     * Layer which is logically positioned below the currently active screen.
+     *
+     * Note that this does not yet have dedicated input events and will instead use the same events as
+     * [AboveScreenContent] (i.e. it will handle events before the screen and can cancel them). This is not intentional
+     * and will change in the future if someone has an actual need for it.
+     */
+    BelowScreen,
+
     /**
      * Layer which is logically positioned below most of the content of the currently active screen.
      *