Skip to content

Commit 0716d9d

Browse files
My-Name-Is-JeffMy-Name-Is-Jeff
committed
fix: Update imports for unstable Elementa refactor
1 parent 8741cc4 commit 0716d9d

38 files changed

+176
-176
lines changed

‎mod/src/main/kotlin/gg/skytils/skytilsmod/core/Config.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ package gg.skytils.skytilsmod.core
2020
import com.fasterxml.jackson.databind.annotation.JsonAppend.Prop
2121
import gg.essential.api.EssentialAPI
2222
import gg.essential.elementa.state.v2.ReferenceHolder
23-
import gg.essential.elementa.state.v2.effect
24-
import gg.essential.elementa.state.v2.onChange
23+
import gg.essential.elementa.unstable.state.v2.effect
24+
import gg.essential.elementa.unstable.state.v2.onChange
2525
import gg.essential.elementa.utils.withAlpha
2626
import gg.essential.universal.UChat
2727
import gg.essential.universal.UDesktop

‎mod/src/main/kotlin/gg/skytils/skytilsmod/core/structure/v2/HudElement.kt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ package gg.skytils.skytilsmod.core.structure.v2
2020

2121
import gg.essential.elementa.components.UIBlock
2222
import gg.essential.elementa.components.UIContainer
23-
import gg.essential.elementa.layoutdsl.*
24-
import gg.essential.elementa.state.v2.MutableState
25-
import gg.essential.elementa.state.v2.memo
26-
import gg.essential.elementa.state.v2.mutableStateOf
27-
import gg.essential.elementa.state.v2.stateOf
23+
import gg.essential.elementa.unstable.layoutdsl.*
24+
import gg.essential.elementa.unstable.state.v2.MutableState
25+
import gg.essential.elementa.unstable.state.v2.memo
26+
import gg.essential.elementa.unstable.state.v2.mutableStateOf
27+
import gg.essential.elementa.unstable.state.v2.stateOf
2828
import gg.essential.elementa.utils.withAlpha
2929
import gg.essential.universal.UResolution
3030
import gg.skytils.skytilsmod.core.GuiManager

‎mod/src/main/kotlin/gg/skytils/skytilsmod/features/impl/crimson/KuudraChestProfit.kt‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,14 @@ import gg.essential.elementa.components.UIContainer
3838
import gg.essential.elementa.constraints.CopyConstraintFloat
3939
import gg.essential.elementa.dsl.boundTo
4040
import gg.essential.elementa.dsl.constrain
41-
import gg.essential.elementa.layoutdsl.LayoutScope
42-
import gg.essential.elementa.layoutdsl.column
43-
import gg.essential.elementa.layoutdsl.layout
44-
import gg.essential.elementa.state.v2.add
45-
import gg.essential.elementa.state.v2.clear
46-
import gg.essential.elementa.state.v2.mutableSetState
47-
import gg.essential.elementa.state.v2.mutableStateOf
48-
import gg.essential.elementa.state.v2.toList
41+
import gg.essential.elementa.unstable.layoutdsl.LayoutScope
42+
import gg.essential.elementa.unstable.layoutdsl.column
43+
import gg.essential.elementa.unstable.layoutdsl.layout
44+
import gg.essential.elementa.unstable.state.v2.add
45+
import gg.essential.elementa.unstable.state.v2.clear
46+
import gg.essential.elementa.unstable.state.v2.mutableSetState
47+
import gg.essential.elementa.unstable.state.v2.mutableStateOf
48+
import gg.essential.elementa.unstable.state.v2.toList
4949
import gg.essential.universal.UMatrixStack
5050
import gg.skytils.event.impl.screen.ScreenOpenEvent
5151
import gg.skytils.skytilsmod.core.structure.v2.HudElement

‎mod/src/main/kotlin/gg/skytils/skytilsmod/features/impl/crimson/TrophyFish.kt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@
1818

1919
package gg.skytils.skytilsmod.features.impl.crimson
2020

21-
import gg.essential.elementa.layoutdsl.LayoutScope
22-
import gg.essential.elementa.layoutdsl.column
23-
import gg.essential.elementa.state.v2.State
24-
import gg.essential.elementa.state.v2.combinators.and
25-
import gg.essential.elementa.state.v2.mutableListStateOf
26-
import gg.essential.elementa.state.v2.setAll
21+
import gg.essential.elementa.unstable.layoutdsl.LayoutScope
22+
import gg.essential.elementa.unstable.layoutdsl.column
23+
import gg.essential.elementa.unstable.state.v2.State
24+
import gg.essential.elementa.unstable.state.v2.combinators.and
25+
import gg.essential.elementa.unstable.state.v2.mutableListStateOf
26+
import gg.essential.elementa.unstable.state.v2.setAll
2727
import gg.essential.universal.ChatColor
2828
import gg.essential.universal.wrappers.UPlayer
2929
import gg.skytils.event.EventPriority

‎mod/src/main/kotlin/gg/skytils/skytilsmod/features/impl/dungeons/BossHPDisplays.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
*/
1818
package gg.skytils.skytilsmod.features.impl.dungeons
1919

20-
import gg.essential.elementa.layoutdsl.LayoutScope
21-
import gg.essential.elementa.layoutdsl.column
20+
import gg.essential.elementa.unstable.layoutdsl.LayoutScope
21+
import gg.essential.elementa.unstable.layoutdsl.column
2222
import gg.essential.universal.UMatrixStack
2323
import gg.skytils.event.EventPriority
2424
import gg.skytils.event.EventSubscriber
@@ -44,7 +44,7 @@ import java.awt.Color
4444
import gg.skytils.skytilsmod.utils.formattedText
4545
import net.minecraft.entity.EntityType
4646
import com.mojang.blaze3d.opengl.GlStateManager
47-
import gg.essential.elementa.state.v2.*
47+
import gg.essential.elementa.unstable.state.v2.*
4848
import java.util.LinkedList
4949
//#endif
5050

‎mod/src/main/kotlin/gg/skytils/skytilsmod/features/impl/dungeons/DungeonChestProfit.kt‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,13 @@ import gg.skytils.skytilsmod.utils.RenderUtil.highlight
3636
import gg.skytils.skytilsmod.utils.SBInfo
3737
import gg.skytils.skytilsmod.utils.SkyblockIsland
3838
import com.mojang.blaze3d.systems.RenderSystem
39-
import gg.essential.elementa.layoutdsl.LayoutScope
40-
import gg.essential.elementa.layoutdsl.Modifier
41-
import gg.essential.elementa.layoutdsl.color
42-
import gg.essential.elementa.layoutdsl.column
43-
import gg.essential.elementa.state.v2.State
44-
import gg.essential.elementa.state.v2.combinators.or
45-
import gg.essential.elementa.state.v2.mutableStateOf
39+
import gg.essential.elementa.unstable.layoutdsl.LayoutScope
40+
import gg.essential.elementa.unstable.layoutdsl.Modifier
41+
import gg.essential.elementa.unstable.layoutdsl.color
42+
import gg.essential.elementa.unstable.layoutdsl.column
43+
import gg.essential.elementa.unstable.state.v2.State
44+
import gg.essential.elementa.unstable.state.v2.combinators.or
45+
import gg.essential.elementa.unstable.state.v2.mutableStateOf
4646
import gg.essential.universal.UMatrixStack
4747
import gg.essential.universal.UMinecraft
4848
import gg.skytils.skytilsmod.core.structure.v2.HudElement

‎mod/src/main/kotlin/gg/skytils/skytilsmod/features/impl/dungeons/DungeonFeatures.kt‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -50,14 +50,14 @@ import gg.skytils.skytilsmod.listeners.DungeonListener
5050
import gg.skytils.skytilsmod.utils.*
5151
import gg.skytils.skytilsmod.utils.Utils.equalsOneOf
5252
import net.minecraft.client.network.OtherClientPlayerEntity
53-
import gg.essential.elementa.layoutdsl.LayoutScope
54-
import gg.essential.elementa.layoutdsl.Modifier
55-
import gg.essential.elementa.layoutdsl.color
56-
import gg.essential.elementa.state.v2.MutableState
57-
import gg.essential.elementa.state.v2.State
58-
import gg.essential.elementa.state.v2.combinators.map
59-
import gg.essential.elementa.state.v2.mutableStateOf
60-
import gg.essential.elementa.state.v2.stateUsingSystemTime
53+
import gg.essential.elementa.unstable.layoutdsl.LayoutScope
54+
import gg.essential.elementa.unstable.layoutdsl.Modifier
55+
import gg.essential.elementa.unstable.layoutdsl.color
56+
import gg.essential.elementa.unstable.state.v2.MutableState
57+
import gg.essential.elementa.unstable.state.v2.State
58+
import gg.essential.elementa.unstable.state.v2.combinators.map
59+
import gg.essential.elementa.unstable.state.v2.mutableStateOf
60+
import gg.essential.elementa.unstable.state.v2.stateUsingSystemTime
6161
import gg.essential.universal.UDesktop
6262
import gg.essential.universal.UMinecraft
6363
import gg.skytils.skytilsmod.core.structure.v2.HudElement

‎mod/src/main/kotlin/gg/skytils/skytilsmod/features/impl/dungeons/DungeonTimer.kt‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@
1717
*/
1818
package gg.skytils.skytilsmod.features.impl.dungeons
1919

20-
import gg.essential.elementa.layoutdsl.LayoutScope
21-
import gg.essential.elementa.layoutdsl.column
22-
import gg.essential.elementa.state.v2.MutableState
23-
import gg.essential.elementa.state.v2.State
24-
import gg.essential.elementa.state.v2.combinators.and
25-
import gg.essential.elementa.state.v2.mutableStateOf
26-
import gg.essential.elementa.state.v2.stateOf
27-
import gg.essential.elementa.state.v2.withSystemTime
20+
import gg.essential.elementa.unstable.layoutdsl.LayoutScope
21+
import gg.essential.elementa.unstable.layoutdsl.column
22+
import gg.essential.elementa.unstable.state.v2.MutableState
23+
import gg.essential.elementa.unstable.state.v2.State
24+
import gg.essential.elementa.unstable.state.v2.combinators.and
25+
import gg.essential.elementa.unstable.state.v2.mutableStateOf
26+
import gg.essential.elementa.unstable.state.v2.stateOf
27+
import gg.essential.elementa.unstable.state.v2.withSystemTime
2828
import gg.essential.universal.UChat
2929
import gg.skytils.event.EventPriority
3030
import gg.skytils.event.EventSubscriber

‎mod/src/main/kotlin/gg/skytils/skytilsmod/features/impl/dungeons/LividFinder.kt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@
1818

1919
package gg.skytils.skytilsmod.features.impl.dungeons
2020

21-
import gg.essential.elementa.layoutdsl.LayoutScope
22-
import gg.essential.elementa.state.v2.MutableState
23-
import gg.essential.elementa.state.v2.State
24-
import gg.essential.elementa.state.v2.mutableStateOf
21+
import gg.essential.elementa.unstable.layoutdsl.LayoutScope
22+
import gg.essential.elementa.unstable.state.v2.MutableState
23+
import gg.essential.elementa.unstable.state.v2.State
24+
import gg.essential.elementa.unstable.state.v2.mutableStateOf
2525
import gg.essential.universal.UChat
2626
import gg.skytils.event.EventSubscriber
2727
import gg.skytils.event.impl.TickEvent

‎mod/src/main/kotlin/gg/skytils/skytilsmod/features/impl/dungeons/ScoreCalculation.kt‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,17 @@
1717
*/
1818
package gg.skytils.skytilsmod.features.impl.dungeons
1919

20-
import gg.essential.elementa.layoutdsl.LayoutScope
21-
import gg.essential.elementa.layoutdsl.Modifier
22-
import gg.essential.elementa.layoutdsl.color
23-
import gg.essential.elementa.layoutdsl.column
20+
import gg.essential.elementa.unstable.layoutdsl.LayoutScope
21+
import gg.essential.elementa.unstable.layoutdsl.Modifier
22+
import gg.essential.elementa.unstable.layoutdsl.color
23+
import gg.essential.elementa.unstable.layoutdsl.column
2424
import gg.essential.elementa.state.BasicState
2525
import gg.essential.elementa.state.State
26-
import gg.essential.elementa.state.v2.clear
27-
import gg.essential.elementa.state.v2.collections.MutableTrackedList
28-
import gg.essential.elementa.state.v2.combinators.and
29-
import gg.essential.elementa.state.v2.mutableListStateOf
30-
import gg.essential.elementa.state.v2.toV2
26+
import gg.essential.elementa.unstable.state.v2.clear
27+
import gg.essential.elementa.unstable.state.v2.collections.MutableTrackedList
28+
import gg.essential.elementa.unstable.state.v2.combinators.and
29+
import gg.essential.elementa.unstable.state.v2.mutableListStateOf
30+
import gg.essential.elementa.unstable.state.v2.toV2
3131
import gg.skytils.event.EventPriority
3232
import gg.skytils.event.EventSubscriber
3333
import gg.skytils.event.impl.play.ChatMessageReceivedEvent
@@ -510,7 +510,7 @@ object ScoreCalculation: EventSubscriber {
510510
}
511511

512512
class HugeCryptsHud : HudElement("Dungeon Crypts Counter", 200f, 200f) {
513-
override val toggleState: gg.essential.elementa.state.v2.State<Boolean>
513+
override val toggleState: gg.essential.elementa.unstable.state.v2.State<Boolean>
514514
get() = Skytils.config.bigCryptsCounter
515515

516516
override fun LayoutScope.render() {
@@ -526,7 +526,7 @@ object ScoreCalculation: EventSubscriber {
526526
}
527527

528528
object ScoreCalculationHud : HudElement("Dungeon Score Estimate", 200f, 100f) {
529-
override val toggleState: gg.essential.elementa.state.v2.State<Boolean>
529+
override val toggleState: gg.essential.elementa.unstable.state.v2.State<Boolean>
530530
get() = Skytils.config.showScoreCalculation
531531

532532
val text = mutableListStateOf<String>()

0 commit comments

Comments
 (0)