Skip to content

Commit 3a55da0

Browse files
Version 1.3.7
1 parent fb14708 commit 3a55da0

File tree

141 files changed

+4922
-3955
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

141 files changed

+4922
-3955
lines changed

api/src/main/kotlin/gg/essential/api/gui/EssentialGUI.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ import gg.essential.elementa.components.UIContainer
2020
import gg.essential.elementa.components.UIWrappedText
2121
import gg.essential.elementa.constraints.*
2222
import gg.essential.elementa.dsl.*
23-
import gg.essential.universal.USound
2423
import gg.essential.vigilance.utils.onLeftClick
2524
import org.jetbrains.annotations.ApiStatus
2625
import java.awt.Color
@@ -180,7 +179,6 @@ open class EssentialGUI(
180179

181180
@ApiStatus.Internal
182181
open fun backButtonPressed() {
183-
USound.playButtonPress()
184182
restorePreviousScreen()
185183
}
186184

changelog/release-1.3.7.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
Title: Drag & Drop Update
2+
Description: Drag and drop resource packs and servers
3+
4+
## Improvements
5+
- Added drag and drop functionality to the resource packs, data packs and server list screens
6+
7+
## Bug Fixes
8+
- Fixed friends not being sorted correctly after searching in Social Menu
9+
- Fixed particle cosmetics not being hidden when player is invisible

elementa/layoutdsl/src/main/kotlin/gg/essential/gui/transitions/FadeOutTransition.kt

Lines changed: 0 additions & 53 deletions
This file was deleted.

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ minecraftVersion=11202
1010
# TODO remove once upgrading to Loom 1.10
1111
# fabric-api 1.21.5 was built with Loom 1.10, seems to work well enough in dev with our current 1.7 though
1212
loom.ignoreDependencyLoomVersionValidation=true
13-
version=1.3.6.2
13+
version=1.3.7

gui/elementa/src/main/kotlin/gg/essential/gui/common/extensions.kt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,6 @@ import gg.essential.elementa.utils.ObservableRemoveEvent
2626
import gg.essential.gui.elementa.state.v2.toV1
2727
import kotlin.reflect.KProperty
2828

29-
@Deprecated("Using StateV1 is discouraged, use StateV2 instead")
30-
fun <T> State<T>.weak() = WeakState(this)
31-
3229
fun <T : UIComponent, S> T.bindConstraints(state: State<S>, config: UIConstraints.(S) -> Unit) = apply {
3330
state.onSetValueAndNow {
3431
constraints.config(it)

gui/essential/src/main/java/gg/essential/network/connectionmanager/media/ScreenshotCollectionChangeEvent.java

Lines changed: 0 additions & 38 deletions
This file was deleted.

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -508,7 +508,8 @@ object EssentialConfig : Vigilant2(), GuiEssentialPlatform.Config {
508508
}
509509
switch(showQuickActionBarState) {
510510
name = "Quick actions"
511-
description = "Shows the quick action bar in the main and pause menu. Quickly toggle notifications, cosmetics, and fullscreen."
511+
description =
512+
"Shows the quick action bar in the main and pause menu. Quickly toggle notifications, cosmetics, and fullscreen."
512513
visible = essentialMenuLayoutState.map { it == 0 }
513514
}
514515
switch(closerMenuSidebarState) {

gui/essential/src/main/kotlin/gg/essential/gui/common/ContextOptionMenu.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,8 @@ class ContextOptionMenu(
134134
close()
135135
}
136136
}
137+
138+
isFloating = true
137139
}
138140

139141
fun close() {

gui/essential/src/main/kotlin/gg/essential/gui/common/input/AbstractTextInput.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -443,7 +443,6 @@ abstract class AbstractTextInput(
443443
posY,
444444
*options.toTypedArray()
445445
) childOf Window.of(this)
446-
menu.isFloating = true
447446
menu.init()
448447
menu.onClose {
449448
setActive(false)

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,14 +217,16 @@ abstract class EssentialModal2(
217217
text: String,
218218
modifier: Modifier = Modifier,
219219
style: StyledButton.Style = StyledButton.Style.BLUE,
220+
disabled: State<Boolean> = stateOf(false),
220221
action: suspend () -> Unit,
221222
) {
222223
styledButton(
223224
Modifier
224225
.width(91f)
225226
.tag(PrimaryAction)
226227
.then(modifier),
227-
style = style,
228+
style = { style },
229+
disabled = disabled,
228230
action = action,
229231
) { currentStyle ->
230232
text(text, Modifier.textStyle(currentStyle))

0 commit comments

Comments
 (0)