Skip to content

Commit 1b5dde2

Browse files
Johni0702Johni0702
committed
unstable: Change package to gg.essential.elementa.unstable.
To make it easier to relocate, because the `g.essential.elementa.state.v2` package already contains the not-unstable `ReferenceHolder`.
1 parent 8247a96 commit 1b5dde2

Some content is hidden

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

61 files changed

+186
-182
lines changed

‎example/src/main/kotlin/gg/essential/elementa/example/ComponentsGui.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import gg.essential.elementa.components.inspector.Inspector
1010
import gg.essential.elementa.constraints.*
1111
import gg.essential.elementa.dsl.*
1212
import gg.essential.elementa.effects.OutlineEffect
13-
import gg.essential.elementa.layoutdsl.Modifier
14-
import gg.essential.elementa.layoutdsl.gradient
13+
import gg.essential.elementa.unstable.layoutdsl.Modifier
14+
import gg.essential.elementa.unstable.layoutdsl.gradient
1515
import gg.essential.elementa.markdown.MarkdownComponent
1616
import java.awt.Color
1717
import java.net.URL

‎example/src/main/kotlin/gg/essential/elementa/example/ExampleGui.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import gg.essential.elementa.constraints.*
88
import gg.essential.elementa.constraints.animation.Animations
99
import gg.essential.elementa.dsl.*
1010
import gg.essential.elementa.effects.ScissorEffect
11-
import gg.essential.elementa.layoutdsl.Modifier
12-
import gg.essential.elementa.layoutdsl.gradient
11+
import gg.essential.elementa.unstable.layoutdsl.Modifier
12+
import gg.essential.elementa.unstable.layoutdsl.gradient
1313
import java.awt.Color
1414

1515
/**

‎example/src/main/kotlin/gg/essential/elementa/example/ExamplesGui.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import gg.essential.elementa.components.*
66
import gg.essential.elementa.constraints.*
77
import gg.essential.elementa.constraints.animation.Animations
88
import gg.essential.elementa.dsl.*
9-
import gg.essential.elementa.layoutdsl.Modifier
10-
import gg.essential.elementa.layoutdsl.gradient
9+
import gg.essential.elementa.unstable.layoutdsl.Modifier
10+
import gg.essential.elementa.unstable.layoutdsl.gradient
1111
import gg.essential.universal.UMinecraft
1212
import gg.essential.universal.UScreen
1313
import java.awt.Color

unstable/layoutdsl/src/main/kotlin/gg/essential/elementa/common/HollowUIContainer.kt renamed to unstable/layoutdsl/src/main/kotlin/gg/essential/elementa/unstable/common/HollowUIContainer.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package gg.essential.elementa.common
1+
package gg.essential.elementa.unstable.common
22

33
import gg.essential.elementa.components.UIContainer
44

unstable/layoutdsl/src/main/kotlin/gg/essential/elementa/common/ListState.kt renamed to unstable/layoutdsl/src/main/kotlin/gg/essential/elementa/unstable/common/ListState.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
package gg.essential.elementa.common
1+
package gg.essential.elementa.unstable.common
22

33
import gg.essential.elementa.state.BasicState
44
import gg.essential.elementa.state.State
5-
import gg.essential.elementa.state.v2.collections.TrackedList
5+
import gg.essential.elementa.unstable.state.v2.collections.TrackedList
66

77
typealias AddListener<T> = (index: Int, element: T) -> Unit
88
typealias SetListener<T> = (index: Int, element: T, oldElement: T) -> Unit
99
typealias RemoveListener<T> = AddListener<T>
1010
typealias ClearListener<T> = (list: List<T>) -> Unit
1111

12-
@Deprecated("Using StateV1 is discouraged, use StateV2 instead", ReplaceWith("mutableListState(state)", "gg.essential.elementa.state.v2.ListKt.mutableListState"))
12+
@Deprecated("Using StateV1 is discouraged, use StateV2 instead", ReplaceWith("mutableListState(state)", "gg.essential.elementa.unstable.state.v2.ListKt.mutableListState"))
1313
class ListState<T>(initialList: MutableList<T> = mutableListOf()) : BasicState<MutableList<T>>(initialList) {
1414
private val addListeners = Listeners<AddListener<T>>()
1515
private val setListeners = Listeners<SetListener<T>>()
@@ -149,7 +149,7 @@ fun <T> ListState<T?>.filterNotNull() = mapList { it.filterNotNull() }
149149

150150
inline fun <reified T> ListState<*>.filterIsInstance() = mapList { it.filterIsInstance<T>() }
151151

152-
@Deprecated("Using StateV1 is discouraged, use StateV2 instead", ReplaceWith("state.map", "gg.essential.elementa.state.v2.combinators.StateKt.map"))
152+
@Deprecated("Using StateV1 is discouraged, use StateV2 instead", ReplaceWith("state.map", "gg.essential.elementa.unstable.state.v2.combinators.StateKt.map"))
153153
class MappedListState<T, U>(state: ListState<T>, mapper: (List<T>) -> U) : BasicState<U>(mapper(state.get())) {
154154
init {
155155
state.onAdd { _, _ ->

unstable/layoutdsl/src/main/kotlin/gg/essential/elementa/common/Spacer.kt renamed to unstable/layoutdsl/src/main/kotlin/gg/essential/elementa/unstable/common/Spacer.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package gg.essential.elementa.common
1+
package gg.essential.elementa.unstable.common
22

33
import gg.essential.elementa.constraints.HeightConstraint
44
import gg.essential.elementa.constraints.SiblingConstraint

unstable/layoutdsl/src/main/kotlin/gg/essential/elementa/common/constraints/AlternateConstraint.kt renamed to unstable/layoutdsl/src/main/kotlin/gg/essential/elementa/unstable/common/constraints/AlternateConstraint.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package gg.essential.elementa.common.constraints
1+
package gg.essential.elementa.unstable.common.constraints
22

33
import gg.essential.elementa.UIComponent
44
import gg.essential.elementa.constraints.ConstraintType

unstable/layoutdsl/src/main/kotlin/gg/essential/elementa/common/constraints/CenterPixelConstraint.kt renamed to unstable/layoutdsl/src/main/kotlin/gg/essential/elementa/unstable/common/constraints/CenterPixelConstraint.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package gg.essential.elementa.common.constraints
1+
package gg.essential.elementa.unstable.common.constraints
22

33
import gg.essential.elementa.UIComponent
44
import gg.essential.elementa.constraints.ConstraintType

unstable/layoutdsl/src/main/kotlin/gg/essential/elementa/common/constraints/FillConstraintIncludingPadding.kt renamed to unstable/layoutdsl/src/main/kotlin/gg/essential/elementa/unstable/common/constraints/FillConstraintIncludingPadding.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package gg.essential.elementa.common.constraints
1+
package gg.essential.elementa.unstable.common.constraints
22

33
import gg.essential.elementa.UIComponent
44
import gg.essential.elementa.constraints.ConstraintType

unstable/layoutdsl/src/main/kotlin/gg/essential/elementa/common/constraints/FlowLayoutController.kt renamed to unstable/layoutdsl/src/main/kotlin/gg/essential/elementa/unstable/common/constraints/FlowLayoutController.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package gg.essential.elementa.common.constraints
1+
package gg.essential.elementa.unstable.common.constraints
22

33
import gg.essential.elementa.UIComponent
44
import gg.essential.elementa.constraints.ConstraintType
@@ -10,8 +10,8 @@ import gg.essential.elementa.utils.ObservableClearEvent
1010
import gg.essential.elementa.utils.ObservableListEvent
1111
import gg.essential.elementa.utils.ObservableRemoveEvent
1212
import gg.essential.elementa.utils.roundToRealPixels
13-
import gg.essential.elementa.layoutdsl.Alignment
14-
import gg.essential.elementa.layoutdsl.Arrangement
13+
import gg.essential.elementa.unstable.layoutdsl.Alignment
14+
import gg.essential.elementa.unstable.layoutdsl.Arrangement
1515
import kotlin.math.max
1616

1717
class FlowLayoutController(

0 commit comments

Comments
 (0)