diff --git a/gradle/scripts/mod_dependencies.gradle b/gradle/scripts/mod_dependencies.gradle index 66251f7d7..b33d89e54 100644 --- a/gradle/scripts/mod_dependencies.gradle +++ b/gradle/scripts/mod_dependencies.gradle @@ -39,7 +39,7 @@ //file:noinspection DependencyNotationArgument dependencies { - api("com.cleanroommc:modularui:3.1.4") { transitive = false } + api("com.cleanroommc:modularui:3.1.5") { transitive = false } api("codechicken:codechickenlib:3.2.3.358") api("com.cleanroommc:groovyscript:1.3.4") { transitive = false } diff --git a/src/main/kotlin/io/github/trcdevelopers/clayium/api/capability/AbstractWorkable.kt b/src/main/kotlin/io/github/trcdevelopers/clayium/api/capability/AbstractWorkable.kt index 4686fa1cc..d7d4a71b9 100644 --- a/src/main/kotlin/io/github/trcdevelopers/clayium/api/capability/AbstractWorkable.kt +++ b/src/main/kotlin/io/github/trcdevelopers/clayium/api/capability/AbstractWorkable.kt @@ -2,6 +2,7 @@ package io.github.trcdevelopers.clayium.api.capability import com.cleanroommc.modularui.api.drawable.IKey import com.cleanroommc.modularui.api.widget.IGuiAction +import com.cleanroommc.modularui.value.sync.DoubleSyncValue import com.cleanroommc.modularui.value.sync.PanelSyncManager import com.cleanroommc.modularui.value.sync.SyncHandlers import com.cleanroommc.modularui.widgets.ProgressWidget @@ -220,10 +221,11 @@ abstract class AbstractWorkable( fun getProgressBar(syncManager: PanelSyncManager, showRecipes: Boolean = true): ProgressWidget { syncManager.syncValue("requiredProgress", SyncHandlers.longNumber(::requiredProgress, ::requiredProgress::set)) syncManager.syncValue("craftingProgress", SyncHandlers.longNumber(::currentProgress, ::currentProgress::set)) + syncManager.syncValue("progress", DoubleSyncValue(::getNormalizedProgress)) val widget = ProgressWidget() .size(22, 17) - .progress(this::getNormalizedProgress) + .syncHandler("progress") .texture(ClayGuiTextures.PROGRESS_BAR, 22) if (showRecipes && Mods.JustEnoughItems.isModLoaded) { widget.addTooltipLine(IKey.lang("jei.tooltip.show.recipes")) diff --git a/src/main/kotlin/io/github/trcdevelopers/clayium/api/capability/impl/LaserEnergyHolder.kt b/src/main/kotlin/io/github/trcdevelopers/clayium/api/capability/impl/LaserEnergyHolder.kt index ff077636a..05ef4aa7c 100644 --- a/src/main/kotlin/io/github/trcdevelopers/clayium/api/capability/impl/LaserEnergyHolder.kt +++ b/src/main/kotlin/io/github/trcdevelopers/clayium/api/capability/impl/LaserEnergyHolder.kt @@ -63,7 +63,7 @@ class LaserEnergyHolder( )) return IKey.dynamic { "Laser : ${this.storedPower.format()}" }.asWidget() - .alignment(Alignment.Center) + .textAlign(Alignment.Center) .width(60) } diff --git a/src/main/kotlin/io/github/trcdevelopers/clayium/api/metatileentity/AbstractBuilderMetaTileEntity.kt b/src/main/kotlin/io/github/trcdevelopers/clayium/api/metatileentity/AbstractBuilderMetaTileEntity.kt index a24401a4b..fbbecd10f 100644 --- a/src/main/kotlin/io/github/trcdevelopers/clayium/api/metatileentity/AbstractBuilderMetaTileEntity.kt +++ b/src/main/kotlin/io/github/trcdevelopers/clayium/api/metatileentity/AbstractBuilderMetaTileEntity.kt @@ -182,7 +182,7 @@ abstract class AbstractBuilderMetaTileEntity( .child(SlotGroupWidget.builder() .matrix(*matrixStr.toTypedArray()) .key('I') { MuiSlots.itemSlotBuilder(itemInventory, it).slotGroup("builder_inventory").build() } - .build().alignX(Alignment.TopCenter.x).top(12) + .build().horizontalCenter().top(12) ) } diff --git a/src/main/kotlin/io/github/trcdevelopers/clayium/api/metatileentity/AbstractItemGeneratorMetaTileEntity.kt b/src/main/kotlin/io/github/trcdevelopers/clayium/api/metatileentity/AbstractItemGeneratorMetaTileEntity.kt index d2bd2d904..0400bb63c 100644 --- a/src/main/kotlin/io/github/trcdevelopers/clayium/api/metatileentity/AbstractItemGeneratorMetaTileEntity.kt +++ b/src/main/kotlin/io/github/trcdevelopers/clayium/api/metatileentity/AbstractItemGeneratorMetaTileEntity.kt @@ -128,7 +128,7 @@ abstract class AbstractItemGeneratorMetaTileEntity( MuiSlots.itemSlotBuilder(itemInventory, index) .slotGroup("machine_inventory") .build() - }.build().align(Alignment.Center)) + }.build().center()) ) } } diff --git a/src/main/kotlin/io/github/trcdevelopers/clayium/api/metatileentity/AbstractMinerMetaTileEntity.kt b/src/main/kotlin/io/github/trcdevelopers/clayium/api/metatileentity/AbstractMinerMetaTileEntity.kt index 08611b7bb..aec4000cb 100644 --- a/src/main/kotlin/io/github/trcdevelopers/clayium/api/metatileentity/AbstractMinerMetaTileEntity.kt +++ b/src/main/kotlin/io/github/trcdevelopers/clayium/api/metatileentity/AbstractMinerMetaTileEntity.kt @@ -132,8 +132,8 @@ abstract class AbstractMinerMetaTileEntity( return super.buildMainParentWidget(syncManager) .child(IKey.dynamic { "Laser : ${laser?.let { LaserEnergy(it.energy).format() } ?: 0}" }.asWidget() - .width(80).alignment(Alignment.Center) - .alignX(Alignment.Center.x).bottom(12) + .width(80).textAlign(Alignment.Center) + .horizontalCenter().bottom(12) ) .child(MuiSlots.phantomSlotBuilder(filterSlot, 0).filter { it.hasCapability(ClayiumCapabilities.ITEM_FILTER) }.build() .background(ClayGuiTextures.FILTER_SLOT) diff --git a/src/main/kotlin/io/github/trcdevelopers/clayium/api/metatileentity/ClayBufferMetaTileEntity.kt b/src/main/kotlin/io/github/trcdevelopers/clayium/api/metatileentity/ClayBufferMetaTileEntity.kt index 0af3ec3c4..78ae07489 100644 --- a/src/main/kotlin/io/github/trcdevelopers/clayium/api/metatileentity/ClayBufferMetaTileEntity.kt +++ b/src/main/kotlin/io/github/trcdevelopers/clayium/api/metatileentity/ClayBufferMetaTileEntity.kt @@ -7,7 +7,7 @@ import com.cleanroommc.modularui.utils.Alignment import com.cleanroommc.modularui.value.sync.PanelSyncManager import com.cleanroommc.modularui.widgets.SlotGroupWidget import com.cleanroommc.modularui.widgets.TextWidget -import com.cleanroommc.modularui.widgets.layout.Column +import com.cleanroommc.modularui.widgets.layout.Flow import io.github.trcdevelopers.clayium.api.GUI_DEFAULT_WIDTH import io.github.trcdevelopers.clayium.api.capability.IPipeConnectionLogic import io.github.trcdevelopers.clayium.api.capability.impl.ClayiumItemStackHandler @@ -79,8 +79,8 @@ class ClayBufferMetaTileEntity( .child( TextWidget(IKey.lang(this.translationKey, IKey.lang(tier.prefixTranslationKey))) .margin(6) - .align(Alignment.TopLeft)) - .child(Column() + .left(0).top(0)) + .child(Flow.column() .marginTop(18) .child(SlotGroupWidget.builder() .matrix(*matrixStr.toTypedArray()) diff --git a/src/main/kotlin/io/github/trcdevelopers/clayium/api/metatileentity/ClayLaserMetaTileEntity.kt b/src/main/kotlin/io/github/trcdevelopers/clayium/api/metatileentity/ClayLaserMetaTileEntity.kt index 7d2b9b2b2..02180b33e 100644 --- a/src/main/kotlin/io/github/trcdevelopers/clayium/api/metatileentity/ClayLaserMetaTileEntity.kt +++ b/src/main/kotlin/io/github/trcdevelopers/clayium/api/metatileentity/ClayLaserMetaTileEntity.kt @@ -66,7 +66,7 @@ class ClayLaserMetaTileEntity( .columnWithPlayerInv { child(buildMainParentWidget(syncManager).child( clayEnergyHolder.createCeTextWidget(syncManager).bottom(12).left(0)) - .child(clayEnergyHolder.createSlotWidget().align(Alignment.BottomRight))) + .child(clayEnergyHolder.createSlotWidget().right(0).bottom(0))) } } diff --git a/src/main/kotlin/io/github/trcdevelopers/clayium/api/metatileentity/MetaTileEntity.kt b/src/main/kotlin/io/github/trcdevelopers/clayium/api/metatileentity/MetaTileEntity.kt index a65d1b04a..742393320 100644 --- a/src/main/kotlin/io/github/trcdevelopers/clayium/api/metatileentity/MetaTileEntity.kt +++ b/src/main/kotlin/io/github/trcdevelopers/clayium/api/metatileentity/MetaTileEntity.kt @@ -5,7 +5,6 @@ import com.cleanroommc.modularui.screen.ModularPanel import com.cleanroommc.modularui.utils.Alignment import com.cleanroommc.modularui.value.sync.PanelSyncManager import com.cleanroommc.modularui.widget.ParentWidget -import com.cleanroommc.modularui.widgets.layout.Column import com.cleanroommc.modularui.widgets.layout.Flow import io.github.trcdevelopers.clayium.api.ClayiumApi import io.github.trcdevelopers.clayium.api.block.BlockMachine.Companion.IS_PIPE @@ -690,7 +689,7 @@ abstract class MetaTileEntity( protected inline fun ModularPanel.columnWithPlayerInv(builder: (Flow.() -> Flow)): ModularPanel { return this.child( - Column().margin(7).sizeRel(1f) + Flow.column().margin(7).sizeRel(1f) .builder() .child(MuiSlots.playerInventory(0)) ) @@ -702,12 +701,12 @@ abstract class MetaTileEntity( protected open fun buildMainParentWidget(syncManager: PanelSyncManager): ParentWidget<*> { return ParentWidget().widthRel(1f).expanded().marginBottom(2) .child(IKey.str(asStackForm().displayName).asWidget() - .align(Alignment.TopLeft)) - .child(IKey.lang("container.inventory").asWidget().align(Alignment.BottomLeft)) + .left(0).top(0)) + .child(IKey.lang("container.inventory").asWidget().left(0).bottom(0)) .child(IKey.dynamic { // if empty string, a bug occurs. if (overclock != 1.0) SidelessI18n.format("gui.clayium.overclock", overclock) else " " - }.asWidget().width(100).alignment(Alignment.CenterRight).align(Alignment.BottomRight)) + }.asWidget().width(100).textAlign(Alignment.CenterRight).right(0).bottom(0)) } @Deprecated("Use onRightClickServerSide instead.", ReplaceWith("onRightClickServerSide(player, hand, clickedSide, hitX, hitY, hitZ)")) diff --git a/src/main/kotlin/io/github/trcdevelopers/clayium/api/metatileentity/MultiTrackBufferMetaTileEntity.kt b/src/main/kotlin/io/github/trcdevelopers/clayium/api/metatileentity/MultiTrackBufferMetaTileEntity.kt index 2f828a83b..0430c093a 100644 --- a/src/main/kotlin/io/github/trcdevelopers/clayium/api/metatileentity/MultiTrackBufferMetaTileEntity.kt +++ b/src/main/kotlin/io/github/trcdevelopers/clayium/api/metatileentity/MultiTrackBufferMetaTileEntity.kt @@ -5,8 +5,7 @@ import com.cleanroommc.modularui.screen.ModularPanel import com.cleanroommc.modularui.utils.Alignment import com.cleanroommc.modularui.value.sync.PanelSyncManager import com.cleanroommc.modularui.widgets.SlotGroupWidget -import com.cleanroommc.modularui.widgets.layout.Column -import com.cleanroommc.modularui.widgets.layout.Row +import com.cleanroommc.modularui.widgets.layout.Flow import io.github.trcdevelopers.clayium.api.GUI_DEFAULT_WIDTH import io.github.trcdevelopers.clayium.api.capability.ClayiumCapabilities import io.github.trcdevelopers.clayium.api.capability.IPipeConnectionLogic @@ -118,14 +117,14 @@ class MultiTrackBufferMetaTileEntity( val slotsRowString = "I".repeat(trackInvSize) return ModularPanel("multi_track_buffer") .size(max(GUI_DEFAULT_WIDTH, trackInvSize * 18 + 4 + 18 + /* margin*/ 12), 18 + trackRow * 18 + 94 + 2) - .align(Alignment.Center) + .center() .columnWithPlayerInv { child(buildMainParentWidget(syncManager) - .child(Column().width(trackInvSize * 18 + 4 + 18).height(trackRow * 18) - .align(Alignment.Center) + .child(Flow.column().width(trackInvSize * 18 + 4 + 18).height(trackRow * 18) + .center() .also { column -> for ((i, handler) in tracks.withIndex()) { - column.child(Row().width(trackInvSize * 18 + 4 + 18).height(18) + column.child(Flow.row().width(trackInvSize * 18 + 4 + 18).height(18) .child(SlotGroupWidget.builder() .matrix(slotsRowString) .key('I') { slotIndex -> @@ -137,7 +136,7 @@ class MultiTrackBufferMetaTileEntity( .build()) .child(MuiSlots.phantomSlot(filtersHandler, i) .background(ClayGuiTextures.M_TRACK_FILTER_SLOTS[i]) - .align(Alignment.CenterRight))) + .right(0).verticalCenter())) } } ) diff --git a/src/main/kotlin/io/github/trcdevelopers/clayium/api/metatileentity/WorkableMetaTileEntity.kt b/src/main/kotlin/io/github/trcdevelopers/clayium/api/metatileentity/WorkableMetaTileEntity.kt index bc7821a29..219fa8d71 100644 --- a/src/main/kotlin/io/github/trcdevelopers/clayium/api/metatileentity/WorkableMetaTileEntity.kt +++ b/src/main/kotlin/io/github/trcdevelopers/clayium/api/metatileentity/WorkableMetaTileEntity.kt @@ -6,7 +6,7 @@ import com.cleanroommc.modularui.value.sync.PanelSyncManager import com.cleanroommc.modularui.widget.ParentWidget import com.cleanroommc.modularui.widgets.ButtonWidget import com.cleanroommc.modularui.widgets.SlotGroupWidget -import com.cleanroommc.modularui.widgets.layout.Row +import com.cleanroommc.modularui.widgets.layout.Flow import io.github.trcdevelopers.clayium.api.ClayEnergy import io.github.trcdevelopers.clayium.api.capability.impl.AbstractRecipeLogic import io.github.trcdevelopers.clayium.api.capability.impl.ClayEnergyHolder @@ -57,14 +57,14 @@ abstract class WorkableMetaTileEntity( } override fun buildMainParentWidget(syncManager: PanelSyncManager): ParentWidget<*> { - val slotsAndProgressBar = Row() + val slotsAndProgressBar = Flow.row() .widthRel(0.7f).height(26) - .align(Alignment.Center) - .child(workable.getProgressBar(syncManager).align(Alignment.Center)) + .center() + .child(workable.getProgressBar(syncManager).center()) if (importItems.slots == 1) { slotsAndProgressBar.child( - MuiSlots.itemSlotBuilder(importItems, 0).singletonSlotGroup().build().align(Alignment.CenterLeft) + MuiSlots.itemSlotBuilder(importItems, 0).singletonSlotGroup().build().left(0).verticalCenter() ) } else if (importItems.slots == 2) { syncManager.registerSlotGroup("input_inv", 1) @@ -76,12 +76,12 @@ abstract class WorkableMetaTileEntity( if (index == 0) background(ClayGuiTextures.IMPORT_1_SLOT) else background(ClayGuiTextures.IMPORT_2_SLOT) }} .build() - .align(Alignment.CenterLeft)) + .left(0).verticalCenter()) } if (exportItems.slots == 1) { slotsAndProgressBar.child( MuiSlots.itemSlotBuilder(exportItems, 0).singletonSlotGroup().takeOnly().buildLarge() - .align(Alignment.CenterRight)) + .right(0).verticalCenter()) } else if (exportItems.slots == 2) { syncManager.registerSlotGroup("output_inv", 1) slotsAndProgressBar.child( @@ -96,24 +96,24 @@ abstract class WorkableMetaTileEntity( } } .build() - .align(Alignment.CenterRight) + .right(0).verticalCenter() ) } return super.buildMainParentWidget(syncManager) - .child(slotsAndProgressBar.align(Alignment.Center)) + .child(slotsAndProgressBar.center()) .child(clayEnergyHolder.createCeTextWidget(syncManager) .name("CE Text") .bottom(12).left(0)) .child(clayEnergyHolder.createSlotWidget() .name("CE Slot") - .align(Alignment.BottomRight)) - .childIf(tier.numeric < 3, ButtonWidget() - .size(16, 16).align(Alignment.BottomCenter) + .right(0).bottom(0)) + .childIf(tier.numeric < 3) { ButtonWidget() + .size(16, 16).horizontalCenter().bottom(0) .overlay(ClayGuiTextures.CE_BUTTON) .hoverOverlay(ClayGuiTextures.CE_BUTTON_HOVERED) .syncHandler(InteractionSyncHandler().setOnMousePressed { clayEnergyHolder.addEnergy(ClayEnergy(1)) - })) + })} } } \ No newline at end of file diff --git a/src/main/kotlin/io/github/trcdevelopers/clayium/api/metatileentity/multiblock/ClayBlastFurnaceMetaTileEntity.kt b/src/main/kotlin/io/github/trcdevelopers/clayium/api/metatileentity/multiblock/ClayBlastFurnaceMetaTileEntity.kt index 79f4c9243..e046c503d 100644 --- a/src/main/kotlin/io/github/trcdevelopers/clayium/api/metatileentity/multiblock/ClayBlastFurnaceMetaTileEntity.kt +++ b/src/main/kotlin/io/github/trcdevelopers/clayium/api/metatileentity/multiblock/ClayBlastFurnaceMetaTileEntity.kt @@ -56,7 +56,7 @@ class ClayBlastFurnaceMetaTileEntity( override fun buildMainParentWidget(syncManager: PanelSyncManager): ParentWidget<*> { return super.buildMainParentWidget(syncManager) .child(multiblockLogic.tierTextWidget(syncManager) - .align(Alignment.BottomCenter)) + .horizontalCenter().bottom(0)) } override fun createMetaTileEntity(): MetaTileEntity { diff --git a/src/main/kotlin/io/github/trcdevelopers/clayium/api/metatileentity/multiblock/ClayReactorMetaTileEntity.kt b/src/main/kotlin/io/github/trcdevelopers/clayium/api/metatileentity/multiblock/ClayReactorMetaTileEntity.kt index a6c407fbc..14489d016 100644 --- a/src/main/kotlin/io/github/trcdevelopers/clayium/api/metatileentity/multiblock/ClayReactorMetaTileEntity.kt +++ b/src/main/kotlin/io/github/trcdevelopers/clayium/api/metatileentity/multiblock/ClayReactorMetaTileEntity.kt @@ -92,10 +92,10 @@ class ClayReactorMetaTileEntity( syncManager.syncValue("clay_laser", clayLaserSyncValue) return super.buildMainParentWidget(syncManager) .child(IKey.dynamic { SidelessI18n.format("gui.clayium.laser_energy", UtilLocale.laserNumeral(this.laser?.energy?.toLong() ?: 0L)) } - .asWidget().width(70).alignment(Alignment.Center) + .asWidget().width(70).textAlign(Alignment.Center) .pos(102, 53)) .child(multiblockLogic.tierTextWidget(syncManager) - .alignX(Alignment.Center.x).bottom(12)) + .horizontalCenter().bottom(12)) } override fun acceptLaser(irradiatedSide: EnumFacing, laser: ClayLaser?) { diff --git a/src/main/kotlin/io/github/trcdevelopers/clayium/api/metatileentity/multiblock/MultiblockLogic.kt b/src/main/kotlin/io/github/trcdevelopers/clayium/api/metatileentity/multiblock/MultiblockLogic.kt index 7309cf138..48bfbcfc8 100644 --- a/src/main/kotlin/io/github/trcdevelopers/clayium/api/metatileentity/multiblock/MultiblockLogic.kt +++ b/src/main/kotlin/io/github/trcdevelopers/clayium/api/metatileentity/multiblock/MultiblockLogic.kt @@ -132,7 +132,7 @@ class MultiblockLogic( fun tierTextWidget(syncManager: PanelSyncManager): TextWidget<*> { syncManager.syncValue("multiblock_tier", SyncHandlers.intNumber({ recipeLogicTier }, { recipeLogicTier = it })) return IKey.dynamic { SidelessI18n.format("tooltip.clayium.tier", recipeLogicTier) } - .asWidget().width(40).alignment(Alignment.Center) + .asWidget().width(40).textAlign(Alignment.Center) } override fun getCapability(capability: Capability, facing: EnumFacing?): T? { diff --git a/src/main/kotlin/io/github/trcdevelopers/clayium/common/blocks/TileEntityCreativeEnergySource.kt b/src/main/kotlin/io/github/trcdevelopers/clayium/common/blocks/TileEntityCreativeEnergySource.kt index 04efccfb5..444dcafd2 100644 --- a/src/main/kotlin/io/github/trcdevelopers/clayium/common/blocks/TileEntityCreativeEnergySource.kt +++ b/src/main/kotlin/io/github/trcdevelopers/clayium/common/blocks/TileEntityCreativeEnergySource.kt @@ -6,7 +6,7 @@ import com.cleanroommc.modularui.screen.ModularPanel import com.cleanroommc.modularui.utils.Alignment import com.cleanroommc.modularui.value.sync.PanelSyncManager import com.cleanroommc.modularui.widget.ParentWidget -import com.cleanroommc.modularui.widgets.layout.Column +import com.cleanroommc.modularui.widgets.layout.Flow import io.github.trcdevelopers.clayium.api.capability.impl.InfiniteItemStackHandler import io.github.trcdevelopers.clayium.api.unification.material.CPropertyKey import io.github.trcdevelopers.clayium.api.util.toItemStack @@ -39,13 +39,13 @@ class TileEntityCreativeEnergySource : TileEntity(), IGuiHolderClayium { override fun buildUI(data: PosGuiData, syncManager: PanelSyncManager): ModularPanel { syncManager.syncValue("craftingProgress", SyncHandlers.intNumber({ craftingProgress }, { craftingProgress = it })) syncManager.syncValue("requiredProgress", SyncHandlers.intNumber({ requiredProgress }, { requiredProgress = it })) + syncManager.syncValue("progress", DoubleSyncValue(::getNormalizedProgress)) val progressWidget: ProgressWidget = ProgressWidget().size(80, 16) .texture(ClayGuiTextures.WorkTable.PROGRESS_BAR_EMPTY, 80) - .progress(this::getNormalizedProgress) + .syncHandler("progress") if (Mods.JustEnoughItems.isModLoaded) { progressWidget.addTooltipLine(IKey.lang("jei.tooltip.show.recipes")) .listenGuiAction(IGuiAction.MousePressed { _ -> @@ -142,8 +144,8 @@ class TileClayWorkTable : TileEntity(), IGuiHolderClayium { return ModularPanel.defaultPanel("clay_work_table") .child(Flow.column().margin(7).sizeRel(1f) .child(ParentWidget().widthRel(1f).expanded().marginBottom(2) - .child(IKey.lang("tile.clayium.clay_work_table.name").asWidget().align(Alignment.TopLeft)) - .child(IKey.lang("container.inventory").asWidget().align(Alignment.BottomLeft)) + .child(IKey.lang("tile.clayium.clay_work_table.name").asWidget().left(0).top(0)) + .child(IKey.lang("container.inventory").asWidget().left(0).bottom(0)) .child(MuiSlots.itemSlotBuilder(this.itemHandler, INPUT_SLOT) .singletonSlotGroup() .buildLarge() diff --git a/src/main/kotlin/io/github/trcdevelopers/clayium/common/blocks/metalchest/TileEntityMetalChest.kt b/src/main/kotlin/io/github/trcdevelopers/clayium/common/blocks/metalchest/TileEntityMetalChest.kt index bee2498af..970de527c 100644 --- a/src/main/kotlin/io/github/trcdevelopers/clayium/common/blocks/metalchest/TileEntityMetalChest.kt +++ b/src/main/kotlin/io/github/trcdevelopers/clayium/common/blocks/metalchest/TileEntityMetalChest.kt @@ -10,7 +10,7 @@ import com.cleanroommc.modularui.widget.ParentWidget import com.cleanroommc.modularui.widgets.ButtonWidget import com.cleanroommc.modularui.widgets.PagedWidget import com.cleanroommc.modularui.widgets.SlotGroupWidget -import com.cleanroommc.modularui.widgets.layout.Column +import com.cleanroommc.modularui.widgets.layout.Flow import com.cleanroommc.modularui.widgets.slot.ItemSlot import io.github.trcdevelopers.clayium.api.ClayiumApi import io.github.trcdevelopers.clayium.api.GUI_DEFAULT_WIDTH @@ -239,22 +239,22 @@ class TileEntityMetalChest : SyncedTileEntityBase(), ITickable, IGuiHolderClayiu syncManager.addOpenListener { this.onInventoryOpen(it) } syncManager.addCloseListener { this.onInventoryClose(it) } return ModularPanel.defaultPanel("metal_chest_inv", width, 18 + inventoryHeight * 18 + 94 + 2) - .child(Column().margin(7).sizeRel(1f) + .child(Flow.column().margin(7).sizeRel(1f) .child(ParentWidget().widthRel(1f).expanded().marginBottom(2) .child(titleTextWidget.asWidget() .top(0).left(((width - 7 * 2) - chestInventoryWidth) / 2)) - .child(pagedWidget.alignX(Alignment.Center) + .child(pagedWidget.horizontalCenter() .margin(0, 9).height(18 * inventoryHeight).width(inventoryWidth * 18)) .child(IKey.lang("container.inventory").asWidget() .bottom(0).left(((width - 7 * 2) - playerInventoryWidth) / 2))) - .childIf(this.inventoryPage > 1, ParentWidget().right(0).bottom(14).width(12 + 2 + 12).height(12 + 4 + 9) + .childIf(this.inventoryPage > 1) { ParentWidget().right(0).bottom(14).width(12 + 2 + 12).height(12 + 4 + 9) .child(ButtonWidget() .onMousePressed { pagedWidget.previousPage() true } .overlay(IKey.str("<").shadow(false)) - .align(Alignment.TopLeft) + .left(0).top(0) .size(12, 12)) .child(ButtonWidget() .onMousePressed { @@ -262,12 +262,12 @@ class TileEntityMetalChest : SyncedTileEntityBase(), ITickable, IGuiHolderClayiu true } .overlay(IKey.str(">").shadow(false)) - .align(Alignment.TopRight) + .right(0).top(0) .size(12, 12)) .child(IKey.dynamic { "${pagedWidget.currentPageIndex + 1} / $inventoryPage" } - .asWidget().width(40).alignment(Alignment.Center) - .align(Alignment.BottomCenter)) - ) + .asWidget().width(40).textAlign(Alignment.Center) + .horizontalCenter().bottom(0)) + } .child(MuiSlots.playerInventory(0))) } } \ No newline at end of file diff --git a/src/main/kotlin/io/github/trcdevelopers/clayium/common/gui/ButtonToggleable.kt b/src/main/kotlin/io/github/trcdevelopers/clayium/common/gui/ButtonToggleable.kt index 696f755fd..5fd89cc0d 100644 --- a/src/main/kotlin/io/github/trcdevelopers/clayium/common/gui/ButtonToggleable.kt +++ b/src/main/kotlin/io/github/trcdevelopers/clayium/common/gui/ButtonToggleable.kt @@ -1,6 +1,5 @@ package io.github.trcdevelopers.clayium.common.gui -import com.cleanroommc.modularui.api.ITheme import com.cleanroommc.modularui.api.UpOrDown import com.cleanroommc.modularui.api.drawable.IDrawable import com.cleanroommc.modularui.api.widget.Interactable @@ -15,11 +14,11 @@ class ButtonToggleable : ButtonWidget() { private val clickable get() = this.clickableSupplier.asBoolean - override fun getCurrentBackground(theme: ITheme?, widgetTheme: WidgetThemeEntry<*>?): IDrawable? { + override fun getCurrentBackground(widgetTheme: WidgetThemeEntry<*>): IDrawable? { if (!this.clickable) { - return unclickableBackground ?: super.getCurrentBackground(theme, widgetTheme) + return unclickableBackground ?: super.getCurrentBackground(widgetTheme) } - return super.getCurrentBackground(theme, widgetTheme) + return super.getCurrentBackground(widgetTheme) } fun clickableIf(supplier: BooleanSupplier): ButtonToggleable { diff --git a/src/main/kotlin/io/github/trcdevelopers/clayium/common/items/filter/ItemFuzzyItemFilter.kt b/src/main/kotlin/io/github/trcdevelopers/clayium/common/items/filter/ItemFuzzyItemFilter.kt index a362188f9..b87f677a6 100644 --- a/src/main/kotlin/io/github/trcdevelopers/clayium/common/items/filter/ItemFuzzyItemFilter.kt +++ b/src/main/kotlin/io/github/trcdevelopers/clayium/common/items/filter/ItemFuzzyItemFilter.kt @@ -8,7 +8,7 @@ import com.cleanroommc.modularui.utils.ItemStackItemHandler import com.cleanroommc.modularui.value.sync.PanelSyncManager import com.cleanroommc.modularui.widget.ParentWidget import com.cleanroommc.modularui.widgets.SlotGroupWidget -import com.cleanroommc.modularui.widgets.layout.Column +import com.cleanroommc.modularui.widgets.layout.Flow import io.github.trcdevelopers.clayium.api.capability.IItemFilter import io.github.trcdevelopers.clayium.api.capability.ItemCapabilityProvider import io.github.trcdevelopers.clayium.common.capability.impl.ItemFilterFuzzy @@ -35,17 +35,17 @@ class ItemFuzzyItemFilter : ItemFilterBase(::ItemFilterFuzzy) { MuiSlots.lockHeldItem(syncManager, data.player) return ModularPanel.defaultPanel("item_filter_fuzzy") - .child(Column().margin(7) + .child(Flow.column().margin(7) .child(ParentWidget().widthRel(1f).expanded().marginBottom(2) .child(IKey.str(stack.displayName).asWidget() - .align(Alignment.TopLeft)) + .left(0).top(0)) .child(IKey.lang("container.inventory").asWidget() - .align(Alignment.BottomLeft)) + .left(0).bottom(0)) .child(SlotGroupWidget.builder() .matrix(*matrix) .key('I') { i -> MuiSlots.phantomSlotBuilder(itemHandler, i).slotGroup("filter").build() } .build() - .align(Alignment.Center))) + .center())) .child(MuiSlots.playerInventory(0))) } diff --git a/src/main/kotlin/io/github/trcdevelopers/clayium/common/items/filter/ItemSimpleItemFilter.kt b/src/main/kotlin/io/github/trcdevelopers/clayium/common/items/filter/ItemSimpleItemFilter.kt index ba7e7d6e1..d24b18383 100644 --- a/src/main/kotlin/io/github/trcdevelopers/clayium/common/items/filter/ItemSimpleItemFilter.kt +++ b/src/main/kotlin/io/github/trcdevelopers/clayium/common/items/filter/ItemSimpleItemFilter.kt @@ -12,7 +12,7 @@ import com.cleanroommc.modularui.value.sync.SyncHandlers import com.cleanroommc.modularui.widget.ParentWidget import com.cleanroommc.modularui.widgets.CycleButtonWidget import com.cleanroommc.modularui.widgets.SlotGroupWidget -import com.cleanroommc.modularui.widgets.layout.Column +import com.cleanroommc.modularui.widgets.layout.Flow import io.github.trcdevelopers.clayium.api.capability.IItemFilter import io.github.trcdevelopers.clayium.api.capability.ItemCapabilityProvider import io.github.trcdevelopers.clayium.common.capability.impl.ItemFilterSimple @@ -54,15 +54,15 @@ class ItemSimpleItemFilter : ItemFilterBase(:: ItemFilterSimple) { MuiSlots.lockHeldItem(syncManager, data.player) return ModularPanel.defaultPanel("simple_item_filter") - .child(Column().margin(7) + .child(Flow.column().margin(7) .child(ParentWidget().widthRel(1f).expanded().marginBottom(2) .child(IKey.str(stack.displayName).asWidget() - .align(Alignment.TopLeft)) + .left(0).top(0)) .child(IKey.lang("container.inventory").asWidget() - .align(Alignment.BottomLeft)) + .left(0).bottom(0)) .child(CycleButtonWidget() .length(2) - .align(Alignment.CenterRight) + .right(0).verticalCenter() .value(isWhiteListSyncHandler) .overlay(DynamicDrawable { if (isWhiteListSyncHandler.value) { @@ -78,7 +78,7 @@ class ItemSimpleItemFilter : ItemFilterBase(:: ItemFilterSimple) { .matrix(*matrix) .key('I') { i -> MuiSlots.phantomSlotBuilder(itemHandler, i).slotGroup("filter").build() } .build() - .align(Alignment.Center))) + .center())) .child(SlotGroupWidget.playerInventory(0, false))) } diff --git a/src/main/kotlin/io/github/trcdevelopers/clayium/common/items/filter/ItemStringItemFilter.kt b/src/main/kotlin/io/github/trcdevelopers/clayium/common/items/filter/ItemStringItemFilter.kt index c3dc88d48..e9334c72a 100644 --- a/src/main/kotlin/io/github/trcdevelopers/clayium/common/items/filter/ItemStringItemFilter.kt +++ b/src/main/kotlin/io/github/trcdevelopers/clayium/common/items/filter/ItemStringItemFilter.kt @@ -7,7 +7,7 @@ import com.cleanroommc.modularui.utils.Alignment import com.cleanroommc.modularui.value.sync.PanelSyncManager import com.cleanroommc.modularui.value.sync.SyncHandlers import com.cleanroommc.modularui.widget.ParentWidget -import com.cleanroommc.modularui.widgets.layout.Column +import com.cleanroommc.modularui.widgets.layout.Flow import com.cleanroommc.modularui.widgets.textfield.TextFieldWidget import io.github.trcdevelopers.clayium.api.capability.IItemFilter import io.github.trcdevelopers.clayium.integration.modularui.MuiSlots @@ -36,16 +36,16 @@ class ItemStringItemFilter( MuiSlots.lockHeldItem(syncManager, data.player) return ModularPanel.defaultPanel("string_type_filter") - .child(Column().margin(7) + .child(Flow.column().margin(7) .child(ParentWidget().widthRel(1f).expanded().marginBottom(2) .child(IKey.str(stack.displayName).asWidget() - .align(Alignment.TopLeft)) + .left(0).top(0)) .child(IKey.lang("container.inventory").asWidget() - .align(Alignment.BottomLeft)) + .left(0).bottom(0)) .child(TextFieldWidget().widthRel(0.8f) .hintText(hintText) .value(oreNameSyncValue) - .align(Alignment.Center)) + .center()) ) .child(MuiSlots.playerInventory(0))) } diff --git a/src/main/kotlin/io/github/trcdevelopers/clayium/common/metatileentities/AutoClayCondenserMetaTileEntity.kt b/src/main/kotlin/io/github/trcdevelopers/clayium/common/metatileentities/AutoClayCondenserMetaTileEntity.kt index a5f798864..ea6a7facd 100644 --- a/src/main/kotlin/io/github/trcdevelopers/clayium/common/metatileentities/AutoClayCondenserMetaTileEntity.kt +++ b/src/main/kotlin/io/github/trcdevelopers/clayium/common/metatileentities/AutoClayCondenserMetaTileEntity.kt @@ -4,7 +4,8 @@ import com.cleanroommc.modularui.screen.ModularPanel import com.cleanroommc.modularui.utils.Alignment import com.cleanroommc.modularui.value.sync.PanelSyncManager import com.cleanroommc.modularui.widgets.SlotGroupWidget -import com.cleanroommc.modularui.widgets.layout.Row +import com.cleanroommc.modularui.widgets.layout.Flow + import io.github.trcdevelopers.clayium.api.GUI_DEFAULT_HEIGHT import io.github.trcdevelopers.clayium.api.GUI_DEFAULT_WIDTH import io.github.trcdevelopers.clayium.api.capability.impl.ClayiumItemStackHandler @@ -79,8 +80,8 @@ class AutoClayCondenserMetaTileEntity( return ModularPanel.defaultPanel("auto_clay_condenser", GUI_DEFAULT_WIDTH, GUI_DEFAULT_HEIGHT + 20) .columnWithPlayerInv { child(buildMainParentWidget(syncManager) - .child(Row().widthRel(1f).height(18 * 4) - .align(Alignment.Center) + .child(Flow.row().widthRel(1f).height(18 * 4) + .center() .child(SlotGroupWidget.builder() .matrix(*matrix) .key('I') { @@ -88,10 +89,10 @@ class AutoClayCondenserMetaTileEntity( .filter { getMaterial(it)?.getPropOrNull(CPropertyKey.CLAY) != null } .slotGroup("compressor_inventory").build() } - .build().align(Alignment.Center)) + .build().center()) .child(MuiSlots.phantomSlotBuilder(maxCompressedClay, 0) .filter { getMaterial(it)?.getPropOrNull(CPropertyKey.CLAY) != null }.build() - .align(Alignment.TopRight) + .top(0).right(0) .background(ClayGuiTextures.CLAY_SLOT)) ) ) diff --git a/src/main/kotlin/io/github/trcdevelopers/clayium/common/metatileentities/AutoCrafterMetaTileEntity.kt b/src/main/kotlin/io/github/trcdevelopers/clayium/common/metatileentities/AutoCrafterMetaTileEntity.kt index e06526d4a..11950efb5 100644 --- a/src/main/kotlin/io/github/trcdevelopers/clayium/common/metatileentities/AutoCrafterMetaTileEntity.kt +++ b/src/main/kotlin/io/github/trcdevelopers/clayium/common/metatileentities/AutoCrafterMetaTileEntity.kt @@ -234,13 +234,13 @@ class AutoCrafterMetaTileEntity( .filter { stack -> isItemValidForCraftingGrid(i, stack) } .build() }.build() - .alignY(Alignment.Center).marginLeft(4) + .verticalCenter().marginLeft(4) ) .child(SlotGroupWidget.builder() .matrix("OO", "OO", "OO") .key('O') { MuiSlots.itemSlotBuilder(exportItems, it).takeOnly().build() } .build() - .align(Alignment.CenterRight) + .verticalCenter().right(0) ) ) // @see clayEnergyHoler declaration, it's not null if useEnergy is true @@ -250,7 +250,7 @@ class AutoCrafterMetaTileEntity( clayEnergyHolder!!.createCeTextWidget(syncManager).bottom(12).left(0) } .childIf(this.useEnergy) { - clayEnergyHolder!!.createSlotWidget().align(Alignment.BottomRight) + clayEnergyHolder!!.createSlotWidget().bottom(0).right(0) } } diff --git a/src/main/kotlin/io/github/trcdevelopers/clayium/common/metatileentities/AutoTraderMetaTileEntity.kt b/src/main/kotlin/io/github/trcdevelopers/clayium/common/metatileentities/AutoTraderMetaTileEntity.kt index d066efbde..d77896358 100644 --- a/src/main/kotlin/io/github/trcdevelopers/clayium/common/metatileentities/AutoTraderMetaTileEntity.kt +++ b/src/main/kotlin/io/github/trcdevelopers/clayium/common/metatileentities/AutoTraderMetaTileEntity.kt @@ -10,8 +10,7 @@ import com.cleanroommc.modularui.value.sync.PanelSyncManager import com.cleanroommc.modularui.value.sync.SyncHandlers import com.cleanroommc.modularui.widget.ParentWidget import com.cleanroommc.modularui.widgets.ToggleButton -import com.cleanroommc.modularui.widgets.layout.Column -import com.cleanroommc.modularui.widgets.layout.Row +import com.cleanroommc.modularui.widgets.layout.Flow import io.github.trcdevelopers.clayium.api.ClayEnergy import io.github.trcdevelopers.clayium.api.GUI_DEFAULT_HEIGHT import io.github.trcdevelopers.clayium.api.GUI_DEFAULT_WIDTH @@ -190,40 +189,40 @@ class AutoTraderMetaTileEntity( } })) return super.buildMainParentWidget(syncManager) - .child(Column().widthRel(0.9f).coverChildrenHeight().alignX(0.5f).top(16) - .child(Row().widthRel(1f).height(17).name("Preview Row").alignX(0.5f) - .child(prev.size(10, 15).align(Alignment.CenterLeft) + .child(Flow.column().widthRel(0.9f).coverChildrenHeight().horizontalCenter().top(16) + .child(Flow.row().widthRel(1f).height(17).name("Preview Row").horizontalCenter() + .child(prev.size(10, 15).left(0).verticalCenter() .background(PREV_DISALBED) .hoverBackground(PREV_DISALBED) .selectedBackground(PREV).selectedHoverBackground(PREV_SELECTED) ) .child(MuiSlots.itemSlotBuilder(tradePreviewItemHandler, 0).lock().build() - .alignY(0.5f).marginLeft(15).background(IDrawable.EMPTY) + .verticalCenter().marginLeft(15).background(IDrawable.EMPTY) ) .child(MuiSlots.itemSlotBuilder(tradePreviewItemHandler, 1).lock().build() - .alignY(0.5f).marginLeft(9).background(IDrawable.EMPTY) + .verticalCenter().marginLeft(9).background(IDrawable.EMPTY) ) .child(previewProgressBar.asWidget().size(22, 15) - .alignX(0.6f).alignY(0.5f) + .leftRel(0.6f).verticalCenter() ) .child(MuiSlots.itemSlotBuilder(tradePreviewItemHandler, 2).lock().build() - .right(15).alignY(0.5f).background(IDrawable.EMPTY) + .right(15).verticalCenter().background(IDrawable.EMPTY) ) - .child(next.size(10, 15).align(Alignment.CenterRight) + .child(next.size(10, 15).right(0).verticalCenter() .background(NEXT_DISABLED).hoverBackground(NEXT_DISABLED) .selectedBackground(NEXT).selectedHoverBackground(NEXT_SELECTED) ) ) - .child(Row().widthRel(1f).height(26).alignX(0.5f).marginTop(6) + .child(Flow.row().widthRel(1f).height(26).horizontalCenter().marginTop(6) .name("Inventory Row") .child(MuiSlots.itemSlotBuilder(importItems, 0).singletonSlotGroup(100).build() - .alignY(0.5f).marginLeft(15).background(ClayGuiTextures.IMPORT_1_SLOT) + .marginLeft(15).verticalCenter().background(ClayGuiTextures.IMPORT_1_SLOT) ) .child(MuiSlots.itemSlotBuilder(importItems, 1).singletonSlotGroup(101).build() - .alignY(0.5f).marginLeft(9).background(ClayGuiTextures.IMPORT_2_SLOT) + .marginLeft(9).verticalCenter().background(ClayGuiTextures.IMPORT_2_SLOT) ) .child(recipeLogic.getProgressBar(syncManager, showRecipes = false) - .alignX(0.6f).alignY(0.5f)) + .leftRel(0.6f).verticalCenter()) .child(MuiSlots.itemSlotBuilder(exportItems, 0).takeOnly().buildLarge() .right(11) ) diff --git a/src/main/kotlin/io/github/trcdevelopers/clayium/common/metatileentities/CentrifugeMetaTileEntity.kt b/src/main/kotlin/io/github/trcdevelopers/clayium/common/metatileentities/CentrifugeMetaTileEntity.kt index 869ca6898..ef5cb6ba4 100644 --- a/src/main/kotlin/io/github/trcdevelopers/clayium/common/metatileentities/CentrifugeMetaTileEntity.kt +++ b/src/main/kotlin/io/github/trcdevelopers/clayium/common/metatileentities/CentrifugeMetaTileEntity.kt @@ -6,7 +6,7 @@ import com.cleanroommc.modularui.utils.Alignment import com.cleanroommc.modularui.value.sync.PanelSyncManager import com.cleanroommc.modularui.widget.ParentWidget import com.cleanroommc.modularui.widgets.SlotGroupWidget -import com.cleanroommc.modularui.widgets.layout.Row +import com.cleanroommc.modularui.widgets.layout.Flow import io.github.trcdevelopers.clayium.api.GUI_DEFAULT_WIDTH import io.github.trcdevelopers.clayium.api.capability.impl.RecipeLogicEnergy import io.github.trcdevelopers.clayium.api.gui.data.MetaTileEntityGuiData @@ -47,36 +47,36 @@ class CentrifugeMetaTileEntity( } override fun buildMainParentWidget(syncManager: PanelSyncManager): ParentWidget<*> { - val slotsAndProgressBar = Row() + val slotsAndProgressBar = Flow.row() .widthRel(0.7f).height(26) - .align(Alignment.Center) + .center() .top(30) - .child(workable.getProgressBar(syncManager).align(Alignment.Center)) + .child(workable.getProgressBar(syncManager).center()) slotsAndProgressBar.child(MuiSlots.itemSlotBuilder(importItems, 0).singletonSlotGroup().buildLarge() - .align(Alignment.CenterLeft)) + .left(0).verticalCenter()) slotsAndProgressBar.child(SlotGroupWidget.builder() .matrix(*(0.. { syncManager.syncValue("clay_energy", SyncHandlers.longNumber({ workable.currentCe.energy }, { workable.currentCe = ClayEnergy(it) })) - val slotsAndProgressBar = Row().widthRel(0.7f).height(26) + val slotsAndProgressBar = Flow.row().widthRel(0.7f).height(26) .child(MuiSlots.itemSlotBuilder(importItems, 0).singletonSlotGroup().buildLarge() - .align(Alignment.CenterLeft)) - .child(workable.getProgressBar(syncManager).align(Alignment.Center)) + .left(0).verticalCenter()) + .child(workable.getProgressBar(syncManager).center()) .child(MuiSlots.itemSlotBuilder(exportItems, 0).takeOnly().buildLarge() - .align(Alignment.CenterRight)) + .right(0).verticalCenter()) return super.buildMainParentWidget(syncManager) - .child(slotsAndProgressBar.align(Alignment.Center)) + .child(slotsAndProgressBar.center()) .child(IKey.dynamic { workable.currentCe.formatWithTrailingZeros() }.asWidget().width(60) .left(0).bottom(10)) } diff --git a/src/main/kotlin/io/github/trcdevelopers/clayium/common/metatileentities/DistributorMetaTileEntity.kt b/src/main/kotlin/io/github/trcdevelopers/clayium/common/metatileentities/DistributorMetaTileEntity.kt index ba53b0a26..8592fcd99 100644 --- a/src/main/kotlin/io/github/trcdevelopers/clayium/common/metatileentities/DistributorMetaTileEntity.kt +++ b/src/main/kotlin/io/github/trcdevelopers/clayium/common/metatileentities/DistributorMetaTileEntity.kt @@ -5,8 +5,7 @@ import com.cleanroommc.modularui.utils.Alignment import com.cleanroommc.modularui.value.sync.PanelSyncManager import com.cleanroommc.modularui.widget.ParentWidget import com.cleanroommc.modularui.widgets.SlotGroupWidget -import com.cleanroommc.modularui.widgets.layout.Column -import com.cleanroommc.modularui.widgets.layout.Row +import com.cleanroommc.modularui.widgets.layout.Flow import io.github.trcdevelopers.clayium.api.GUI_DEFAULT_HEIGHT import io.github.trcdevelopers.clayium.api.GUI_DEFAULT_WIDTH import io.github.trcdevelopers.clayium.api.capability.impl.ClayiumItemStackHandler @@ -94,21 +93,21 @@ class DistributorMetaTileEntity( group } val slotGroupRows = groups.windowed(this.groupX, this.groupX).map { slotGroupList -> - val row = Row() + val row = Flow.row() .size((18 * 2) * this.groupX + 2 * (this.groupX - 1), 18 * 2) slotGroupList.forEachIndexed { i, g -> row.child(g.marginLeft(2 * min(i, 1))) } row } - val column = Column() + val column = Flow.column() .width(18 * 2 * this.groupX + 2 * (this.groupX - 1)) .height(18 * 2 * this.groupY + 2 * (this.groupY - 1)) val w = super.buildMainParentWidget(syncManager) slotGroupRows.forEachIndexed { i, row -> column.child(row.marginTop(2 * min(i, 1))) } - return w.child(column.align(Alignment.Center)) + return w.child(column.center()) } override fun getCapability(capability: Capability, facing: EnumFacing?): T? { diff --git a/src/main/kotlin/io/github/trcdevelopers/clayium/common/metatileentities/EnergyConverterMetaTileEntity.kt b/src/main/kotlin/io/github/trcdevelopers/clayium/common/metatileentities/EnergyConverterMetaTileEntity.kt index 3efeceaf7..62d2816b1 100644 --- a/src/main/kotlin/io/github/trcdevelopers/clayium/common/metatileentities/EnergyConverterMetaTileEntity.kt +++ b/src/main/kotlin/io/github/trcdevelopers/clayium/common/metatileentities/EnergyConverterMetaTileEntity.kt @@ -6,7 +6,7 @@ import com.cleanroommc.modularui.utils.Alignment import com.cleanroommc.modularui.value.sync.PanelSyncManager import com.cleanroommc.modularui.value.sync.SyncHandlers import com.cleanroommc.modularui.widget.ParentWidget -import com.cleanroommc.modularui.widgets.layout.Column +import com.cleanroommc.modularui.widgets.layout.Flow import io.github.trcdevelopers.clayium.api.ClayEnergy import io.github.trcdevelopers.clayium.api.GUI_DEFAULT_HEIGHT import io.github.trcdevelopers.clayium.api.GUI_DEFAULT_WIDTH @@ -91,10 +91,10 @@ class EnergyConverterMetaTileEntity( syncManager.syncValue("feStorage", SyncHandlers.intNumber(feStorage::getEnergyStored, feStorage::setEnergy)) return super.buildMainParentWidget(syncManager) .child(clayEnergyHolder.createSlotWidget() - .align(Alignment.BottomRight)) + .right(0).bottom(0)) .child(clayEnergyHolder.createCeTextWidget(syncManager) .left(0).bottom(10)) - .child(Column().widthRel(1f).height(8 * 3 + 3 * 2 + 10).align(Alignment.Center) + .child(Flow.column().widthRel(1f).height(8 * 3 + 3 * 2 + 10).center() .child(IKey.dynamic { SidelessI18n.format("gui.clayium.energy_converter.storage", feStorage.energyStored, feStorage.maxEnergyStored) } .asWidget().widthRel(1f)) .child(IKey.dynamic { SidelessI18n.format("gui.clayium.energy_converter.rate", cePerTick.format(), fePerTick) } diff --git a/src/main/kotlin/io/github/trcdevelopers/clayium/common/metatileentities/PanAdapterMetaTileEntity.kt b/src/main/kotlin/io/github/trcdevelopers/clayium/common/metatileentities/PanAdapterMetaTileEntity.kt index 0fa87965e..d0d0a3b55 100644 --- a/src/main/kotlin/io/github/trcdevelopers/clayium/common/metatileentities/PanAdapterMetaTileEntity.kt +++ b/src/main/kotlin/io/github/trcdevelopers/clayium/common/metatileentities/PanAdapterMetaTileEntity.kt @@ -12,7 +12,7 @@ import com.cleanroommc.modularui.widgets.PageButton import com.cleanroommc.modularui.widgets.PagedWidget import com.cleanroommc.modularui.widgets.SlotGroupWidget import com.cleanroommc.modularui.widgets.layout.Grid -import com.cleanroommc.modularui.widgets.layout.Row +import com.cleanroommc.modularui.widgets.layout.Flow import com.google.common.collect.ImmutableSet import io.github.trcdevelopers.clayium.api.ClayEnergy import io.github.trcdevelopers.clayium.api.ClayiumApi @@ -204,13 +204,13 @@ class PanAdapterMetaTileEntity( .matrix("III", "III", "III") .key('I') { MuiSlots.itemSlotBuilder(result, it).lock().build() } .build() - Row().widthRel(1f).height(64) - .child(Grid().width(32).heightRel(1f).align(Alignment.TopLeft) + Flow.row().widthRel(1f).height(64) + .child(Grid().width(32).heightRel(1f).left(0).top(0) .minElementMargin(0, 0) .matrix(buttons) ) .child(slots.left(32 + 8)) - .child(resultSlots.align(Alignment.TopRight)) + .child(resultSlots.right(0).top(0)) } return ModularPanel.defaultPanel("pan_adapter", GUI_DEFAULT_WIDTH, GUI_DEFAULT_HEIGHT + 32) .columnWithPlayerInv { diff --git a/src/main/kotlin/io/github/trcdevelopers/clayium/common/metatileentities/PanCoreMetaTileEntity.kt b/src/main/kotlin/io/github/trcdevelopers/clayium/common/metatileentities/PanCoreMetaTileEntity.kt index 7551c9622..863727851 100644 --- a/src/main/kotlin/io/github/trcdevelopers/clayium/common/metatileentities/PanCoreMetaTileEntity.kt +++ b/src/main/kotlin/io/github/trcdevelopers/clayium/common/metatileentities/PanCoreMetaTileEntity.kt @@ -9,7 +9,7 @@ import com.cleanroommc.modularui.utils.Color import com.cleanroommc.modularui.value.sync.PanelSyncManager import com.cleanroommc.modularui.widget.ParentWidget import com.cleanroommc.modularui.widget.scroll.VerticalScrollData -import com.cleanroommc.modularui.widgets.layout.Column +import com.cleanroommc.modularui.widgets.layout.Flow import com.cleanroommc.modularui.widgets.layout.Grid import io.github.trcdevelopers.clayium.api.ClayEnergy import io.github.trcdevelopers.clayium.api.GUI_DEFAULT_HEIGHT @@ -248,28 +248,28 @@ class PanCoreMetaTileEntity( } .also { if (!entry.isAllowedToDuplicate) { - it.background(Rectangle().setColor(0xFF5E1E0E.toInt())) + it.background(Rectangle().color(0xFF5E1E0E.toInt())) } } } val panDisplayMargin = 4 val panDisplayWidth = 16 * 9 + 0 return ModularPanel.defaultPanel("pan_core", GUI_DEFAULT_WIDTH, GUI_DEFAULT_HEIGHT + 50) - .child(Column().margin(7) + .child(Flow.column().margin(7) .child(ParentWidget().widthRel(1f).expanded().marginBottom(2) .child(IKey.lang(this.translationKey, IKey.lang(tier.prefixTranslationKey)).asWidget() - .align(Alignment.TopLeft)) + .left(0).top(0)) .child(IKey.lang("container.inventory").asWidget() - .align(Alignment.BottomLeft)) + .left(0).bottom(0)) .child(ParentWidget().width(panDisplayWidth + panDisplayMargin * 2).heightRel(1f) - .align(Alignment.TopCenter).margin(0, 2) - .child(Rectangle().setColor(Color.rgb(0, 0x1E, 0)).asWidget() + .horizontalCenter().top(0).margin(0, 2) + .child(Rectangle().color(Color.rgb(0, 0x1E, 0)).asWidget() .width(panDisplayWidth + panDisplayMargin * 2).heightRel(1f).margin(0, 9)) .child(Grid().width(panDisplayWidth).heightRel(1f).margin(panDisplayMargin, 13) .minElementMargin(0, 0) .matrix(displayItems) .scrollable(VerticalScrollData()) - .background(Rectangle().setColor(Color.rgb(0, 0x1E, 0)))) + .background(Rectangle().color(Color.rgb(0, 0x1E, 0)))) ) ) .child(MuiSlots.playerInventory(0))) diff --git a/src/main/kotlin/io/github/trcdevelopers/clayium/common/metatileentities/PanDuplicatorMetaTileEntity.kt b/src/main/kotlin/io/github/trcdevelopers/clayium/common/metatileentities/PanDuplicatorMetaTileEntity.kt index 4810fe2a7..3f0870cf9 100644 --- a/src/main/kotlin/io/github/trcdevelopers/clayium/common/metatileentities/PanDuplicatorMetaTileEntity.kt +++ b/src/main/kotlin/io/github/trcdevelopers/clayium/common/metatileentities/PanDuplicatorMetaTileEntity.kt @@ -4,7 +4,7 @@ import com.cleanroommc.modularui.utils.Alignment import com.cleanroommc.modularui.value.sync.PanelSyncManager import com.cleanroommc.modularui.widget.ParentWidget import com.cleanroommc.modularui.widgets.SlotGroupWidget -import com.cleanroommc.modularui.widgets.layout.Row +import com.cleanroommc.modularui.widgets.layout.Flow import io.github.trcdevelopers.clayium.api.ClayEnergy import io.github.trcdevelopers.clayium.api.capability.AbstractWorkable import io.github.trcdevelopers.clayium.api.capability.ClayiumTileCapabilities @@ -108,8 +108,8 @@ class PanDuplicatorMetaTileEntity( .child(clayEnergyHolder.createCeTextWidget(syncManager) .bottom(12).left(0)) .child(clayEnergyHolder.createSlotWidget() - .align(Alignment.BottomRight)) - .child(Row().widthRel(0.7f).height(26).align(Alignment.Center) + .right(0).bottom(0)) + .child(Flow.row().widthRel(0.7f).height(26).center() .child(SlotGroupWidget.builder() .row("AD") .key('A', MuiSlots.itemSlotBuilder(antimatterSlot, 0).singletonSlotGroup().build() @@ -117,13 +117,12 @@ class PanDuplicatorMetaTileEntity( .key('D', MuiSlots.itemSlotBuilder(duplicationTargetSlot, 0).singletonSlotGroup().build() .background(ClayGuiTextures.IMPORT_2_SLOT)) .build() - .align(Alignment.CenterLeft) + .left(0).verticalCenter() ) .child(MuiSlots.itemSlotBuilder(exportItems, 0).singletonSlotGroup().takeOnly().buildLarge() - .align(Alignment.CenterRight)) + .right(0).verticalCenter()) .child(recipeLogic.getProgressBar(syncManager, showRecipes = false) - .progress(recipeLogic::getNormalizedProgress) - .align(Alignment.Center) + .center() ) ) } diff --git a/src/main/kotlin/io/github/trcdevelopers/clayium/common/metatileentities/RangedMinerMetaTileEntity.kt b/src/main/kotlin/io/github/trcdevelopers/clayium/common/metatileentities/RangedMinerMetaTileEntity.kt index 06730f0ff..c431193b9 100644 --- a/src/main/kotlin/io/github/trcdevelopers/clayium/common/metatileentities/RangedMinerMetaTileEntity.kt +++ b/src/main/kotlin/io/github/trcdevelopers/clayium/common/metatileentities/RangedMinerMetaTileEntity.kt @@ -61,7 +61,7 @@ open class RangedMinerMetaTileEntity( .child(clayEnergyHolder.createCeTextWidget(syncManager) .left(0).bottom(12)) .child(clayEnergyHolder.createSlotWidget() - .align(Alignment.BottomRight)) + .right(0).bottom(0)) } override fun onPlacement() { diff --git a/src/main/kotlin/io/github/trcdevelopers/clayium/common/metatileentities/RangedReplacerMetaTileEntity.kt b/src/main/kotlin/io/github/trcdevelopers/clayium/common/metatileentities/RangedReplacerMetaTileEntity.kt index 979a68782..8912bc19c 100644 --- a/src/main/kotlin/io/github/trcdevelopers/clayium/common/metatileentities/RangedReplacerMetaTileEntity.kt +++ b/src/main/kotlin/io/github/trcdevelopers/clayium/common/metatileentities/RangedReplacerMetaTileEntity.kt @@ -10,7 +10,7 @@ import com.cleanroommc.modularui.widget.ParentWidget import com.cleanroommc.modularui.widgets.CycleButtonWidget import com.cleanroommc.modularui.widgets.SlotGroupWidget import com.cleanroommc.modularui.widgets.ToggleButton -import com.cleanroommc.modularui.widgets.layout.Column +import com.cleanroommc.modularui.widgets.layout.Flow import com.cleanroommc.modularui.widgets.layout.Grid import io.github.trcdevelopers.clayium.api.GUI_DEFAULT_HEIGHT import io.github.trcdevelopers.clayium.api.GUI_DEFAULT_WIDTH @@ -137,8 +137,8 @@ class RangedReplacerMetaTileEntity( child( ParentWidget().widthRel(1f).expanded().marginBottom(2) .child(IKey.str(asStackForm().displayName).asWidget() - .align(Alignment.TopLeft)) - .child(IKey.lang("container.inventory").asWidget().align(Alignment.BottomLeft)) + .left(0).top(0)) + .child(IKey.lang("container.inventory").asWidget().left(0).bottom(0)) .child(Grid().coverChildren() .row(startButton) .row(stopButton) @@ -146,7 +146,7 @@ class RangedReplacerMetaTileEntity( .row(displayRange) .minElementMargin(1) .left(2).top(12)) - .child(Column().coverChildren().top(12).alignX(Alignment.Center) + .child(Flow.column().coverChildren().top(12).horizontalCenter() .child(SlotGroupWidget.builder() .matrix("IIII", "IIII") .key('I') { MuiSlots.itemSlotBuilder(itemInventory, it) @@ -157,12 +157,12 @@ class RangedReplacerMetaTileEntity( .key('I') { MuiSlots.itemSlotBuilder(replaceBlockInventory, it).slotGroup("replace_inventory").build() } .build().marginTop(2))) .child(IKey.dynamic { "Laser : ${laser?.let { LaserEnergy(it.energy).format() } ?: 0}" }.asWidget() - .alignment(Alignment.Center).width(60) - .alignX(Alignment.Center.x).bottom(12)) + .textAlign(Alignment.Center).width(60) + .horizontalCenter().bottom(12)) .child(clayEnergyHolder.createCeTextWidget(syncManager) .left(0).bottom(12)) .child(clayEnergyHolder.createSlotWidget() - .align(Alignment.BottomRight)) + .right(0).bottom(0)) .child(MuiSlots.phantomSlotBuilder(filterSlot, 0).filter { it.hasCapability(ClayiumCapabilities.ITEM_FILTER) }.build() .background(ClayGuiTextures.FILTER_SLOT) .top(12).right(24) diff --git a/src/main/kotlin/io/github/trcdevelopers/clayium/common/metatileentities/ResonatingCollectorMetaTileEntity.kt b/src/main/kotlin/io/github/trcdevelopers/clayium/common/metatileentities/ResonatingCollectorMetaTileEntity.kt index 900d868ae..792c5424b 100644 --- a/src/main/kotlin/io/github/trcdevelopers/clayium/common/metatileentities/ResonatingCollectorMetaTileEntity.kt +++ b/src/main/kotlin/io/github/trcdevelopers/clayium/common/metatileentities/ResonatingCollectorMetaTileEntity.kt @@ -76,14 +76,14 @@ class ResonatingCollectorMetaTileEntity( return super.buildMainParentWidget(syncManager) .child(IKey.dynamic { SidelessI18n.format("gui.$MOD_ID.resonance", numberFormatter.format(resonanceManager.resonance)) - }.asWidget().width(90).alignment(Alignment.BottomRight) - .align(Alignment.BottomRight)) + }.asWidget().width(90).textAlign(Alignment.BottomRight) + .right(0).bottom(0)) .child(SlotGroupWidget.builder() .matrix("III", "III", "III") .key('I') { i -> MuiSlots.itemSlotBuilder(itemInventory, i) .slotGroup("machine_inventory").build() - }.build().align(Alignment.Center)) + }.build().center()) } override val renderingConfig by lazy { diff --git a/src/main/kotlin/io/github/trcdevelopers/clayium/common/metatileentities/SolarClayFabricatorMetaTileEntity.kt b/src/main/kotlin/io/github/trcdevelopers/clayium/common/metatileentities/SolarClayFabricatorMetaTileEntity.kt index 28a319ae6..c1a67baf9 100644 --- a/src/main/kotlin/io/github/trcdevelopers/clayium/common/metatileentities/SolarClayFabricatorMetaTileEntity.kt +++ b/src/main/kotlin/io/github/trcdevelopers/clayium/common/metatileentities/SolarClayFabricatorMetaTileEntity.kt @@ -6,7 +6,7 @@ import com.cleanroommc.modularui.value.sync.PanelSyncManager import com.cleanroommc.modularui.value.sync.SyncHandlers import com.cleanroommc.modularui.widget.ParentWidget import com.cleanroommc.modularui.widgets.TextWidget -import com.cleanroommc.modularui.widgets.layout.Row +import com.cleanroommc.modularui.widgets.layout.Flow import io.github.trcdevelopers.clayium.api.ClayEnergy import io.github.trcdevelopers.clayium.api.capability.impl.AbstractRecipeLogic import io.github.trcdevelopers.clayium.api.capability.impl.ItemHandlerProxy @@ -60,12 +60,12 @@ class SolarClayFabricatorMetaTileEntity( override fun buildMainParentWidget(syncManager: PanelSyncManager): ParentWidget<*> { return super.buildMainParentWidget(syncManager) - .child(Row().widthRel(0.7f).height(26).align(Alignment.Center) + .child(Flow.row().widthRel(0.7f).height(26).center() .child(MuiSlots.itemSlotBuilder(importItems, 0).singletonSlotGroup(2).buildLarge() - .align(Alignment.CenterLeft)) - .child(workable.getProgressBar(syncManager).align(Alignment.Center)) + .left(0).verticalCenter()) + .child(workable.getProgressBar(syncManager).center()) .child(MuiSlots.itemSlotBuilder(exportItems, 0).singletonSlotGroup(0).takeOnly().buildLarge() - .align(Alignment.CenterRight)) + .right(0).verticalCenter()) ) .child(workable.createCeTextWidget(syncManager) .bottom(12).left(0).widthRel(0.5f)) diff --git a/src/main/kotlin/io/github/trcdevelopers/clayium/common/metatileentities/StorageContainerMetaTileEntity.kt b/src/main/kotlin/io/github/trcdevelopers/clayium/common/metatileentities/StorageContainerMetaTileEntity.kt index 02cb401fc..f859913f7 100644 --- a/src/main/kotlin/io/github/trcdevelopers/clayium/common/metatileentities/StorageContainerMetaTileEntity.kt +++ b/src/main/kotlin/io/github/trcdevelopers/clayium/common/metatileentities/StorageContainerMetaTileEntity.kt @@ -4,7 +4,7 @@ import com.cleanroommc.modularui.api.drawable.IKey import com.cleanroommc.modularui.utils.Alignment import com.cleanroommc.modularui.value.sync.PanelSyncManager import com.cleanroommc.modularui.widget.ParentWidget -import com.cleanroommc.modularui.widgets.layout.Column +import com.cleanroommc.modularui.widgets.layout.Flow import io.github.trcdevelopers.clayium.api.block.BlockMachine import io.github.trcdevelopers.clayium.api.capability.ClayiumDataCodecs.UPDATE_FILTER_ITEM import io.github.trcdevelopers.clayium.api.capability.ClayiumDataCodecs.UPDATE_ITEMS_STORED @@ -265,13 +265,13 @@ class StorageContainerMetaTileEntity( override fun buildMainParentWidget(syncManager: PanelSyncManager): ParentWidget<*> { return super.buildMainParentWidget(syncManager) .child(IKey.dynamic { "$itemsStored / $maxStoredItems" }.asWidget() - .widthRel(0.5f).align(Alignment.BottomRight)) - .child(Column().widthRel(0.6f).height(26) + .widthRel(0.5f).right(0).bottom(0)) + .child(Flow.column().widthRel(0.6f).height(26) .child(MuiSlots.itemSlotBuilder(importItems, 0).singletonSlotGroup().buildLarge() - .align(Alignment.CenterLeft)) + .left(0).verticalCenter()) .child(MuiSlots.itemSlotBuilder(exportItems, 0).takeOnly().buildLarge() - .align(Alignment.CenterRight)) - .align(Alignment.Center)) + .right(0).verticalCenter()) + .center()) .child(MuiSlots.phantomSlot(filterSlot, 0) .right(10).top(15)) } diff --git a/src/main/kotlin/io/github/trcdevelopers/clayium/common/metatileentities/VoidContainerMetaTileEntity.kt b/src/main/kotlin/io/github/trcdevelopers/clayium/common/metatileentities/VoidContainerMetaTileEntity.kt index 7f02acb7e..99257f699 100644 --- a/src/main/kotlin/io/github/trcdevelopers/clayium/common/metatileentities/VoidContainerMetaTileEntity.kt +++ b/src/main/kotlin/io/github/trcdevelopers/clayium/common/metatileentities/VoidContainerMetaTileEntity.kt @@ -67,7 +67,7 @@ class VoidContainerMetaTileEntity( override fun buildMainParentWidget(syncManager: PanelSyncManager): ParentWidget<*> { return super.buildMainParentWidget(syncManager).child(MuiSlots.itemSlotBuilder(importItems, 0) .filter { filterStack.isEmpty || ItemHandlerHelper.canItemStacksStack(it, filterStack) }.buildLarge() - .align(Alignment.Center)).child(MuiSlots.phantomSlot(filterSlot, 0).right(10).top(15)) + .center()).child(MuiSlots.phantomSlot(filterSlot, 0).right(10).top(15)) } override fun receiveCustomData(discriminator: Int, buf: PacketBuffer) { diff --git a/src/main/kotlin/io/github/trcdevelopers/clayium/common/metatileentities/WaterwheelMetaTileEntity.kt b/src/main/kotlin/io/github/trcdevelopers/clayium/common/metatileentities/WaterwheelMetaTileEntity.kt index 0a43153ef..80e4be5e9 100644 --- a/src/main/kotlin/io/github/trcdevelopers/clayium/common/metatileentities/WaterwheelMetaTileEntity.kt +++ b/src/main/kotlin/io/github/trcdevelopers/clayium/common/metatileentities/WaterwheelMetaTileEntity.kt @@ -6,7 +6,7 @@ import com.cleanroommc.modularui.utils.Alignment import com.cleanroommc.modularui.value.sync.PanelSyncManager import com.cleanroommc.modularui.value.sync.SyncHandlers import com.cleanroommc.modularui.widget.ParentWidget -import com.cleanroommc.modularui.widgets.layout.Column +import com.cleanroommc.modularui.widgets.layout.Flow import io.github.trcdevelopers.clayium.api.ClayEnergy import io.github.trcdevelopers.clayium.api.GUI_DEFAULT_HEIGHT import io.github.trcdevelopers.clayium.api.GUI_DEFAULT_WIDTH @@ -83,16 +83,16 @@ class WaterwheelMetaTileEntity( syncManager.syncValue("waterCount", SyncHandlers.intNumber({ waterCount }, { waterCount = it })) syncManager.syncValue("progress", SyncHandlers.intNumber({ progress }, { progress = it })) return ModularPanel.defaultPanel("waterwheel", GUI_DEFAULT_WIDTH, GUI_DEFAULT_HEIGHT - 50) - .child(Column().margin(7) + .child(Flow.column().margin(7) .child(ParentWidget().widthRel(1f).expanded().marginBottom(2) .child(IKey.lang(this.translationKey, IKey.lang(tier.prefixTranslationKey)).asWidget() - .align(Alignment.TopLeft)) + .left(0).top(0)) .child(IKey.lang("container.inventory").asWidget() - .align(Alignment.BottomLeft)) + .left(0).bottom(0)) .child(IKey.dynamic { SidelessI18n.format("gui.clayium.waterwheel.waters", waterCount) }.asWidget() - .widthRel(0.3f).align(Alignment.CenterRight)) + .widthRel(0.3f).right(0).verticalCenter()) .child(IKey.dynamic { SidelessI18n.format("gui.clayium.waterwheel.progress", progress) }.asWidget() - .widthRel(0.6f).align(Alignment.CenterLeft))) + .widthRel(0.6f).left(0).verticalCenter())) .child(MuiSlots.playerInventory(0))) } diff --git a/src/main/kotlin/io/github/trcdevelopers/clayium/common/metatileentities/multiblock/CaReactorMetaTileEntity.kt b/src/main/kotlin/io/github/trcdevelopers/clayium/common/metatileentities/multiblock/CaReactorMetaTileEntity.kt index 8e2ade3af..b7e35fde2 100644 --- a/src/main/kotlin/io/github/trcdevelopers/clayium/common/metatileentities/multiblock/CaReactorMetaTileEntity.kt +++ b/src/main/kotlin/io/github/trcdevelopers/clayium/common/metatileentities/multiblock/CaReactorMetaTileEntity.kt @@ -232,7 +232,7 @@ class CaReactorMetaTileEntity( else I18n.format("gui.clayium.ca_reactor.invalid") }) - .align(Alignment.BottomRight) + .bottom(0).right(0) .syncHandler(InteractionSyncHandler().setOnMousePressed { mouseData -> if (multiblockLogic.structureFormed || mouseData.isClient) return@setOnMousePressed val err = errorMsg ?: return@setOnMousePressed @@ -240,10 +240,10 @@ class CaReactorMetaTileEntity( }) ) .child(IKey.dynamic { SidelessI18n.format("gui.clayium.ca_reactor.efficiency", efficiency) } - .asWidget().width(120).alignment(Alignment.CenterRight).alignX(Alignment.BottomRight.x).bottom(14) + .asWidget().width(120).textAlign(Alignment.CenterRight).right(0).bottom(14) ) .child(IKey.dynamic { SidelessI18n.format("gui.clayium.ca_reactor.rank_size", avgHullRank, hullCount) } - .asWidget().width(100).alignment(Alignment.CenterLeft).left(0).top(10)) + .asWidget().width(100).textAlign(Alignment.CenterLeft).left(0).top(10)) } override fun renderMetaTileEntity(x: Double, y: Double, z: Double, partialTicks: Float) { diff --git a/src/main/kotlin/io/github/trcdevelopers/clayium/common/metatileentities/multiblock/RedstoneProxyMetaTileEntity.kt b/src/main/kotlin/io/github/trcdevelopers/clayium/common/metatileentities/multiblock/RedstoneProxyMetaTileEntity.kt index e3379201e..511000ffc 100644 --- a/src/main/kotlin/io/github/trcdevelopers/clayium/common/metatileentities/multiblock/RedstoneProxyMetaTileEntity.kt +++ b/src/main/kotlin/io/github/trcdevelopers/clayium/common/metatileentities/multiblock/RedstoneProxyMetaTileEntity.kt @@ -103,7 +103,7 @@ class RedstoneProxyMetaTileEntity( override fun buildMainParentWidget(syncManager: PanelSyncManager): ParentWidget<*> { return super.buildMainParentWidget(syncManager) .child(CycleButtonWidget() - .align(Alignment.Center).widthRel(0.7f).height(24) + .center().widthRel(0.7f).height(24) .length(Mode.entries.size) .value(IntSyncValue({ mode.ordinal }, { i: Int -> mode = Mode.entries[i] })) .overlay(IKey.dynamic { SidelessI18n.format(mode.translationKey) }) diff --git a/src/main/kotlin/io/github/trcdevelopers/clayium/integration/modularui/ItemSlotBuilder.kt b/src/main/kotlin/io/github/trcdevelopers/clayium/integration/modularui/ItemSlotBuilder.kt index 5ce0c400f..3e29b55fa 100644 --- a/src/main/kotlin/io/github/trcdevelopers/clayium/integration/modularui/ItemSlotBuilder.kt +++ b/src/main/kotlin/io/github/trcdevelopers/clayium/integration/modularui/ItemSlotBuilder.kt @@ -30,7 +30,7 @@ class ItemSlotBuilder( return ParentWidget() .size(26, 26) .background(ClayGuiTextures.LARGE_SLOT) - .child(ItemSlot.create(phantom).align(Alignment.Center) + .child(ItemSlot.create(phantom).center() .slot(modularSlot) .background(IDrawable.EMPTY)) }