Skip to content

Commit 5048291

Browse files
Flatten dsl.property package into dsl
1 parent c643bbc commit 5048291

21 files changed

+5
-40
lines changed

invui-kotlin/src/main/kotlin/xyz/xenondevs/invui/dsl/AnvilWindowDsl.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ import xyz.xenondevs.commons.provider.Provider
77
import xyz.xenondevs.commons.provider.mutableProvider
88
import xyz.xenondevs.commons.provider.provider
99
import xyz.xenondevs.invui.ExperimentalReactiveApi
10-
import xyz.xenondevs.invui.dsl.property.GuiDslProperty
11-
import xyz.xenondevs.invui.dsl.property.ProviderDslProperty
1210
import xyz.xenondevs.invui.window.AnvilWindow
1311
import xyz.xenondevs.invui.window.addRenameHandler
1412
import xyz.xenondevs.invui.window.setResultAlwaysValid

invui-kotlin/src/main/kotlin/xyz/xenondevs/invui/dsl/BrewingWindowDsl.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@ import org.bukkit.entity.Player
66
import xyz.xenondevs.commons.provider.Provider
77
import xyz.xenondevs.commons.provider.provider
88
import xyz.xenondevs.invui.ExperimentalReactiveApi
9-
import xyz.xenondevs.invui.dsl.property.GuiDslProperty
10-
import xyz.xenondevs.invui.dsl.property.ProviderDslProperty
119
import xyz.xenondevs.invui.window.BrewingWindow
1210
import xyz.xenondevs.invui.window.setBrewProgress
1311
import xyz.xenondevs.invui.window.setFuelProgress

invui-kotlin/src/main/kotlin/xyz/xenondevs/invui/dsl/CartographyWindow.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@ import org.bukkit.entity.Player
66
import xyz.xenondevs.commons.provider.Provider
77
import xyz.xenondevs.commons.provider.provider
88
import xyz.xenondevs.invui.ExperimentalReactiveApi
9-
import xyz.xenondevs.invui.dsl.property.GuiDslProperty
10-
import xyz.xenondevs.invui.dsl.property.ProviderDslProperty
119
import xyz.xenondevs.invui.window.CartographyWindow
1210
import xyz.xenondevs.invui.window.setIcons
1311
import xyz.xenondevs.invui.window.setView

invui-kotlin/src/main/kotlin/xyz/xenondevs/invui/dsl/CrafterWindowDsl.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ package xyz.xenondevs.invui.dsl
55
import org.bukkit.entity.Player
66
import xyz.xenondevs.commons.provider.Provider
77
import xyz.xenondevs.invui.ExperimentalReactiveApi
8-
import xyz.xenondevs.invui.dsl.property.GuiDslProperty
9-
import xyz.xenondevs.invui.dsl.property.MutableProvider2dArrayDslProperty
108
import xyz.xenondevs.invui.window.CrafterWindow
119
import xyz.xenondevs.invui.window.setSlots
1210
import kotlin.contracts.InvocationKind

invui-kotlin/src/main/kotlin/xyz/xenondevs/invui/dsl/CraftingWindowDsl.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import net.kyori.adventure.key.Key
66
import org.bukkit.entity.Player
77
import xyz.xenondevs.commons.provider.Provider
88
import xyz.xenondevs.invui.ExperimentalReactiveApi
9-
import xyz.xenondevs.invui.dsl.property.GuiDslProperty
109
import xyz.xenondevs.invui.window.CraftingWindow
1110
import kotlin.contracts.InvocationKind
1211
import kotlin.contracts.contract

invui-kotlin/src/main/kotlin/xyz/xenondevs/invui/dsl/FurnaceWindowDsl.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@ import org.bukkit.entity.Player
66
import xyz.xenondevs.commons.provider.Provider
77
import xyz.xenondevs.commons.provider.provider
88
import xyz.xenondevs.invui.ExperimentalReactiveApi
9-
import xyz.xenondevs.invui.dsl.property.GuiDslProperty
10-
import xyz.xenondevs.invui.dsl.property.ProviderDslProperty
119
import xyz.xenondevs.invui.window.FurnaceWindow
1210
import xyz.xenondevs.invui.window.setBurnProgress
1311
import xyz.xenondevs.invui.window.setCookProgress

invui-kotlin/src/main/kotlin/xyz/xenondevs/invui/dsl/GrindstoneWindowDsl.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package xyz.xenondevs.invui.dsl
22

33
import org.bukkit.entity.Player
44
import xyz.xenondevs.commons.provider.Provider
5-
import xyz.xenondevs.invui.dsl.property.GuiDslProperty
65
import xyz.xenondevs.invui.window.GrindstoneWindow
76
import kotlin.contracts.InvocationKind
87
import kotlin.contracts.contract

invui-kotlin/src/main/kotlin/xyz/xenondevs/invui/dsl/GuiDsl.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ package xyz.xenondevs.invui.dsl
55
import xyz.xenondevs.commons.provider.Provider
66
import xyz.xenondevs.commons.provider.provider
77
import xyz.xenondevs.invui.ExperimentalReactiveApi
8-
import xyz.xenondevs.invui.dsl.property.ProviderDslProperty
98
import xyz.xenondevs.invui.gui.Gui
109
import xyz.xenondevs.invui.gui.IngredientPreset
1110
import xyz.xenondevs.invui.gui.setBackground

invui-kotlin/src/main/kotlin/xyz/xenondevs/invui/dsl/property/GuiDslProperty.kt renamed to invui-kotlin/src/main/kotlin/xyz/xenondevs/invui/dsl/GuiDslProperty.kt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
package xyz.xenondevs.invui.dsl.property
1+
package xyz.xenondevs.invui.dsl
22

3-
import xyz.xenondevs.invui.dsl.ExperimentalDslApi
43
import xyz.xenondevs.invui.gui.Gui
54
import xyz.xenondevs.invui.inventory.Inventory
65
import kotlin.math.ceil
@@ -14,7 +13,7 @@ internal data class Dimensions(val width: Int, val height: Int) {
1413
/**
1514
* A DSL property that holds a [Gui], used for the GUI slots in window DSLs.
1615
*
17-
* Can be set to a [Gui] (typically created via the [gui DSL][xyz.xenondevs.invui.dsl.gui])
16+
* Can be set to a [Gui] (typically created via the [gui DSL][gui])
1817
* or an [Inventory] using the [by] infix function:
1918
* ```
2019
* upperGui by gui(

invui-kotlin/src/main/kotlin/xyz/xenondevs/invui/dsl/ItemDsl.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import xyz.xenondevs.commons.provider.Provider
88
import xyz.xenondevs.commons.provider.provider
99
import xyz.xenondevs.invui.Click
1010
import xyz.xenondevs.invui.ExperimentalReactiveApi
11-
import xyz.xenondevs.invui.dsl.property.ProviderDslProperty
1211
import xyz.xenondevs.invui.item.AbstractItem
1312
import xyz.xenondevs.invui.item.Item
1413
import xyz.xenondevs.invui.item.ItemProvider

0 commit comments

Comments
 (0)