Version 1.3.10

Author: EssentialGGBot

changelog/release-1.3.10.md

@@ -0,0 +1,18 @@
+Title: Bug Patch
+Summary: Minor bug fixes
+
+## Social
+- Added Community Rules modal, which must be accepted before being able to engage with social features
+- Added modal to mute or block user after reporting them
+- Added notification to confirm when a user has been successfully muted
+- Added modals to communicate why and for how long you were suspended
+- Improved Social Menu to show when you cannot talk to a user because they are suspended
+- Improved Terms of Use and Privacy Policy modal design
+
+## Bug Fixes
+- Fixed skin textures being removed after opening Wardrobe on Minecraft 1.20.2 to 1.21.8
+- Fixed Essential's Pause Menu showing up in Minecraft's Game Paused menu on Minecraft 1.17+
+- Fixed game freezing when uploading skin
+- Fixed notifications with a single character not displaying the message
+- Fixed keybinds for Screenshot Manager, Wardrobe, and Social Menu sometimes soft-locking the game
+- Fixed server names in Friends tab of Multiplayer menu

gradle.properties

@@ -10,4 +10,4 @@ minecraftVersion=11202
 # TODO remove once upgrading to Loom 1.10
 # fabric-api 1.21.5 was built with Loom 1.10, seems to work well enough in dev with our current 1.7 though
 loom.ignoreDependencyLoomVersionValidation=true
-version=1.3.9.3
+version=1.3.10

gradle/libs.versions.toml

@@ -1,6 +1,6 @@
 [versions]
 universalcraft = "431"
-elementa = "708"
+elementa = "712"
 vigilance = "306"
 mixinextras = "0.4.0"
 

gui/essential/src/main/java/gg/essential/handlers/MojangSkinManager.java

@@ -107,7 +107,7 @@ public void flushChanges(boolean notification) {
     }
 
     @Nullable
-    protected synchronized Skin updateSkinNow(boolean notification, boolean userSet) {
+    protected synchronized Skin updateSkinNow(boolean notification, boolean ignoreForClientUpdate) {
         SkinUpdate queuedSkinChange = this.queuedSkinChange;
         this.queuedSkinChange = null;
         if (queuedSkinChange == null) return null;

gui/essential/src/main/kotlin/gg/essential/gui/common/modal/ConfirmDenyModal.kt

@@ -55,14 +55,6 @@ open class ConfirmDenyModal(
         get() = cancelButtonTextState.get()
         set(value) = cancelButtonTextState.set(value)
 
-    var cancelButtonStyle: StyledButton.Style
-        get() = cancelButtonStyleState.get()
-        set(value) = cancelButtonStyleState.set(value)
-
-    var cancelButtonEnabled: Boolean
-        get() = cancelButtonEnabledState.get()
-        set(value) = cancelButtonEnabledState.set(value)
-
     val cancelButton: UIComponent by OutlineButton(
             cancelButtonStyleState.toV2(),
             cancelButtonEnabledState.not().toV2(),

gui/essential/src/main/kotlin/gg/essential/gui/common/outline/GuiScaleOffsetOutline.kt

@@ -214,12 +214,12 @@ interface IMessengerStates {
     /**
      * Deletes [message] from the channel it is in
      */
-    fun deleteMessage(message: ClientMessage) = deleteMessage(message.id, message.channel.id)
+    fun deleteMessage(message: ClientMessage) = deleteMessage(message.channel.id, message.id)
 
     /**
      * Deletes [message] from the channel it is in
      */
-    fun deleteMessage(message: Message) = deleteMessage(message.id, message.channelId)
+    fun deleteMessage(message: Message) = deleteMessage(message.channelId, message.id)
 
     fun leaveGroup(channelId: Long)
 

gui/essential/src/main/kotlin/gg/essential/gui/friends/state/SocialStates.kt

@@ -16,6 +16,7 @@ import gg.essential.gui.EssentialPalette
 import gg.essential.gui.common.Checkbox
 import gg.essential.gui.elementa.state.v2.MutableState
 import gg.essential.gui.elementa.state.v2.State
+import gg.essential.gui.elementa.state.v2.combinators.not
 import gg.essential.gui.elementa.state.v2.stateOf
 import gg.essential.universal.USound
 import gg.essential.util.onLeftClick
@@ -39,9 +40,12 @@ fun LayoutScope.checkbox(
 
 // Alternative checkbox style used in modern modals
 fun LayoutScope.checkboxAlt(selected: MutableState<Boolean>, modifier: Modifier = Modifier, disabled: State<Boolean> = stateOf(false)) {
-    val selectedModifier = Modifier.color(EssentialPalette.LINK).whenTrue(disabled, Modifier.color(EssentialPalette.LINK.darker()), Modifier.hoverColor(EssentialPalette.LINK_HIGHLIGHT))
-    val outlineColorModifier = Modifier.whenTrue(selected, selectedModifier, Modifier.color(EssentialPalette.CHECKBOX_OUTLINE).whenTrue(disabled, Modifier.color(EssentialPalette.CHECKBOX_OUTLINE.darker())))
-    val innerColorModifier = Modifier.whenTrue(selected, selectedModifier, Modifier.color(EssentialPalette.BUTTON).whenTrue(disabled, Modifier.color(EssentialPalette.BUTTON.darker()), Modifier.hoverColor(EssentialPalette.BUTTON_HIGHLIGHT)))
+    val selectedModifier = Modifier.color(EssentialPalette.CHECKBOX_SELECTED_BACKGROUND)
+        .whenTrue(disabled, Modifier.color(EssentialPalette.CHECKBOX_SELECTED_BACKGROUND.darker()), Modifier.hoverColor(EssentialPalette.CHECKBOX_SELECTED_BACKGROUND_HOVER))
+    val outlineColorModifier = Modifier.whenTrue(selected, selectedModifier, Modifier.color(EssentialPalette.CHECKBOX_OUTLINE)
+        .whenTrue(disabled, Modifier.color(EssentialPalette.CHECKBOX_OUTLINE.darker())))
+    val innerColorModifier = Modifier.whenTrue(selected, selectedModifier, Modifier.color(EssentialPalette.CHECKBOX_BACKGROUND)
+        .whenTrue(disabled, Modifier.color(EssentialPalette.CHECKBOX_BACKGROUND.darker()), Modifier.hoverColor(EssentialPalette.CHECKBOX_BACKGROUND_HOVER)))
 
     box(Modifier.width(9f).heightAspect(1f).hoverScope() then outlineColorModifier then modifier) {
         box(Modifier.width(7f).heightAspect(1f) then innerColorModifier) {

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

@@ -11,9 +11,12 @@
  */
 package gg.essential.gui.modals
 
+import gg.essential.gui.elementa.state.v2.await
 import gg.essential.gui.overlay.ModalFlow
 import gg.essential.util.GuiEssentialPlatform.Companion.platform
 import kotlinx.coroutines.CancellationException
+import kotlinx.coroutines.cancel
+import kotlinx.coroutines.launch
 
 abstract class ModalPrerequisites {
 
@@ -61,6 +64,11 @@ suspend fun ModalFlow.ensurePrerequisites(
         }
 
         ensurePrerequisitesInternal(prerequisites)
+
+        modalManager.coroutineScope.launch {
+            platform.suspensionManager.activeSuspension.await { it != null && (social || it.isPermanent) }
+            modalManager.coroutineScope.cancel()
+        }
     }
 }
 

gui/essential/src/main/kotlin/gg/essential/gui/modals/ModalPrerequisites.kt

@@ -26,7 +26,6 @@ import gg.essential.elementa.utils.ObservableList
 import gg.essential.gui.EssentialPalette
 import gg.essential.gui.common.modal.EssentialModal
 import gg.essential.gui.common.modal.configure
-import gg.essential.gui.elementa.state.v2.MutableState
 import gg.essential.gui.elementa.state.v2.State
 import gg.essential.gui.elementa.state.v2.addAll
 import gg.essential.gui.elementa.state.v2.collections.MutableTrackedList
@@ -208,18 +207,6 @@ suspend fun ModalFlow.selectFriendsToGiftModal(
     validFriends: State<MutableTrackedList<UUID>>,
     loadingFriends: State<Boolean>,
 ): Set<UUID>? {
-    fun LayoutScope.addRemoveCheckbox(selected: MutableState<Boolean>) {
-        val hoverColor = selected.map { if (it) EssentialPalette.CHECKBOX_SELECTED_BACKGROUND_HOVER else EssentialPalette.CHECKBOX_BACKGROUND_HOVER }
-        val colorModifier = Modifier.color(EssentialPalette.CHECKBOX_BACKGROUND)
-            .whenTrue(!selected, Modifier.outline(EssentialPalette.CHECKBOX_OUTLINE, 1f, true))
-            .whenTrue(selected, Modifier.color(EssentialPalette.CHECKBOX_SELECTED_BACKGROUND))
-
-        box(colorModifier.width(9f).heightAspect(1f).hoverScope().hoverColor(hoverColor)) {
-            if_(selected) {
-                image(EssentialPalette.CHECKMARK_7X5, Modifier.color(EssentialPalette.TEXT_HIGHLIGHT))
-            }
-        }
-    }
 
     return selectModal(
         "Select friends to gift\nthem ${ChatColor.WHITE + item.name + ChatColor.RESET}.", "SelectFriendsToGift"
@@ -244,7 +231,7 @@ suspend fun ModalFlow.selectFriendsToGiftModal(
             box(Modifier.fillParent()) {
                 row(Modifier.fillParent(padding = 3f)) {
                     playerEntry(selected, uuid)
-                    addRemoveCheckbox(selected)
+                    checkboxAlt(selected)
                 }
             }.onLeftClick { event ->
                 USound.playButtonPress()