From bf756191a5e3565978b8e972fc64036992057683 Mon Sep 17 00:00:00 2001 From: DBotThePony Date: Thu, 26 Jan 2023 22:01:30 +0700 Subject: [PATCH] Move panels to subpackages --- .../mc/otm/client/screen/ExoPackInventoryScreen.kt | 5 +++-- .../ru/dbotthepony/mc/otm/client/screen/MatteryScreen.kt | 3 +++ .../mc/otm/client/screen/decorative/CargoCrateScreen.kt | 2 +- .../client/screen/decorative/MinecartCargoCrateScreen.kt | 2 +- .../mc/otm/client/screen/matter/MatterBottlerScreen.kt | 2 ++ .../otm/client/screen/matter/MatterCapacitorBankScreen.kt | 2 +- .../mc/otm/client/screen/matter/MatterDecomposerScreen.kt | 2 +- .../mc/otm/client/screen/matter/MatterPanelScreen.kt | 2 ++ .../mc/otm/client/screen/matter/MatterRecyclerScreen.kt | 2 +- .../mc/otm/client/screen/matter/MatterReplicatorScreen.kt | 2 +- .../mc/otm/client/screen/matter/MatterScannerScreen.kt | 2 +- .../mc/otm/client/screen/matter/PatternStorageScreen.kt | 2 +- .../mc/otm/client/screen/panels/EditablePanel.kt | 1 + .../otm/client/screen/panels/ScrollbarBackgroundPanel.kt | 3 +++ .../otm/client/screen/panels/{ => input}/EditBoxPanel.kt | 6 ++++-- .../screen/panels/{ => input}/NetworkNumberInputPanel.kt | 3 ++- .../otm/client/screen/panels/{ => input}/QueryUserPanel.kt | 6 +++++- .../otm/client/screen/panels/{ => input}/TextInputPanel.kt | 3 ++- .../client/screen/panels/{ => slot}/AbstractSlotPanel.kt | 4 +++- .../otm/client/screen/panels/{ => slot}/FilterSlotPanel.kt | 4 ++-- .../client/screen/panels/{ => slot}/FoldableSlotPanel.kt | 7 +++++-- .../mc/otm/client/screen/panels/{ => slot}/SlotPanel.kt | 4 +++- .../screen/panels/{ => util}/AnalogScrollBarPanel.kt | 3 ++- .../otm/client/screen/panels/{ => util}/BackgroundPanel.kt | 4 +++- .../screen/panels/{ => util}/DiscreteScrollBarPanel.kt | 3 ++- .../screen/panels/{ => util}/DraggableCanvasPanel.kt | 5 +++-- .../mc/otm/client/screen/panels/{ => util}/GridPanel.kt | 4 +++- .../otm/client/screen/panels/{ => util}/HeightControls.kt | 4 +++- .../client/screen/panels/{ => util}/ScrollBarConstants.kt | 2 +- .../mc/otm/client/screen/storage/DriveRackScreen.kt | 2 +- .../mc/otm/client/screen/storage/DriveViewerScreen.kt | 3 +++ .../mc/otm/client/screen/storage/ItemMonitorScreen.kt | 3 +++ .../mc/otm/client/screen/storage/StorageBusScreen.kt | 2 ++ .../mc/otm/client/screen/storage/StorageExporterScreen.kt | 2 ++ .../mc/otm/client/screen/storage/StorageImporterScreen.kt | 2 ++ .../client/screen/storage/StoragePowerSupplierScreen.kt | 1 + .../mc/otm/client/screen/tech/AndroidStationScreen.kt | 3 +++ .../mc/otm/client/screen/tech/BatteryBankScreen.kt | 2 +- .../mc/otm/client/screen/tech/ChemicalGeneratorScreen.kt | 1 + .../mc/otm/client/screen/tech/EnergyCounterScreen.kt | 1 + .../mc/otm/client/screen/tech/EnergyServoScreen.kt | 2 +- .../mc/otm/client/screen/tech/PlatePressScreen.kt | 2 +- 42 files changed, 87 insertions(+), 33 deletions(-) rename src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/{ => input}/EditBoxPanel.kt (87%) rename src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/{ => input}/NetworkNumberInputPanel.kt (94%) rename src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/{ => input}/QueryUserPanel.kt (86%) rename src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/{ => input}/TextInputPanel.kt (99%) rename src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/{ => slot}/AbstractSlotPanel.kt (95%) rename src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/{ => slot}/FilterSlotPanel.kt (89%) rename src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/{ => slot}/FoldableSlotPanel.kt (89%) rename src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/{ => slot}/SlotPanel.kt (96%) rename src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/{ => util}/AnalogScrollBarPanel.kt (97%) rename src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/{ => util}/BackgroundPanel.kt (90%) rename src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/{ => util}/DiscreteScrollBarPanel.kt (97%) rename src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/{ => util}/DraggableCanvasPanel.kt (87%) rename src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/{ => util}/GridPanel.kt (85%) rename src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/{ => util}/HeightControls.kt (93%) rename src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/{ => util}/ScrollBarConstants.kt (96%) diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/ExoPackInventoryScreen.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/ExoPackInventoryScreen.kt index f69f02ebe..e5bfc79cf 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/ExoPackInventoryScreen.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/ExoPackInventoryScreen.kt @@ -9,6 +9,7 @@ import ru.dbotthepony.mc.otm.core.TranslatableComponent import ru.dbotthepony.mc.otm.client.render.sprite import ru.dbotthepony.mc.otm.client.screen.panels.* import ru.dbotthepony.mc.otm.client.screen.panels.buttons.LargeRectangleButtonPanel +import ru.dbotthepony.mc.otm.client.screen.panels.util.BackgroundPanel import ru.dbotthepony.mc.otm.client.setMousePos import ru.dbotthepony.mc.otm.client.shouldOpenVanillaInventory import ru.dbotthepony.mc.otm.core.math.integerDivisionDown @@ -177,8 +178,8 @@ class ExoPackInventoryScreen(menu: ExoPackInventoryMenu) : MatteryScreen( screen: S, diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/EditBoxPanel.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/input/EditBoxPanel.kt similarity index 87% rename from src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/EditBoxPanel.kt rename to src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/input/EditBoxPanel.kt index 41678aacd..050256363 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/EditBoxPanel.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/input/EditBoxPanel.kt @@ -1,8 +1,10 @@ -package ru.dbotthepony.mc.otm.client.screen.panels +package ru.dbotthepony.mc.otm.client.screen.panels.input import net.minecraft.client.gui.components.EditBox import net.minecraft.client.gui.screens.Screen import net.minecraft.network.chat.Component +import ru.dbotthepony.mc.otm.client.screen.panels.EditablePanel +import ru.dbotthepony.mc.otm.client.screen.panels.Widget2Panel import ru.dbotthepony.mc.otm.core.TextComponent open class EditBoxPanel( @@ -52,4 +54,4 @@ open class EditBoxPanel( requestFocus() return true } -} \ No newline at end of file +} diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/NetworkNumberInputPanel.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/input/NetworkNumberInputPanel.kt similarity index 94% rename from src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/NetworkNumberInputPanel.kt rename to src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/input/NetworkNumberInputPanel.kt index ded232d00..4e9c1cbf6 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/NetworkNumberInputPanel.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/input/NetworkNumberInputPanel.kt @@ -1,8 +1,9 @@ -package ru.dbotthepony.mc.otm.client.screen.panels +package ru.dbotthepony.mc.otm.client.screen.panels.input import net.minecraft.client.gui.screens.Screen import net.minecraft.network.chat.Component import ru.dbotthepony.mc.otm.client.minecraft +import ru.dbotthepony.mc.otm.client.screen.panels.EditablePanel import ru.dbotthepony.mc.otm.core.TextComponent import ru.dbotthepony.mc.otm.menu.MatteryMenu import java.math.BigDecimal diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/QueryUserPanel.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/input/QueryUserPanel.kt similarity index 86% rename from src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/QueryUserPanel.kt rename to src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/input/QueryUserPanel.kt index 6b6a9fcc0..d36109441 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/QueryUserPanel.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/input/QueryUserPanel.kt @@ -1,8 +1,12 @@ -package ru.dbotthepony.mc.otm.client.screen.panels +package ru.dbotthepony.mc.otm.client.screen.panels.input import net.minecraft.client.gui.screens.Screen import net.minecraft.network.chat.Component import ru.dbotthepony.mc.otm.client.screen.MatteryScreen +import ru.dbotthepony.mc.otm.client.screen.panels.Dock +import ru.dbotthepony.mc.otm.client.screen.panels.EditablePanel +import ru.dbotthepony.mc.otm.client.screen.panels.FramePanel +import ru.dbotthepony.mc.otm.client.screen.panels.Label import ru.dbotthepony.mc.otm.client.screen.panels.buttons.ButtonPanel import ru.dbotthepony.mc.otm.core.TranslatableComponent diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/TextInputPanel.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/input/TextInputPanel.kt similarity index 99% rename from src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/TextInputPanel.kt rename to src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/input/TextInputPanel.kt index 286b6c9cd..64d52ae70 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/TextInputPanel.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/input/TextInputPanel.kt @@ -1,4 +1,4 @@ -package ru.dbotthepony.mc.otm.client.screen.panels +package ru.dbotthepony.mc.otm.client.screen.panels.input import com.mojang.blaze3d.platform.InputConstants import com.mojang.blaze3d.systems.RenderSystem @@ -22,6 +22,7 @@ import ru.dbotthepony.mc.otm.client.render.TextAlign import ru.dbotthepony.mc.otm.client.render.drawAligned import ru.dbotthepony.mc.otm.client.render.drawRect import ru.dbotthepony.mc.otm.client.render.tesselator +import ru.dbotthepony.mc.otm.client.screen.panels.EditablePanel import ru.dbotthepony.mc.otm.core.addAll import ru.dbotthepony.mc.otm.core.math.RGBAColor import ru.dbotthepony.mc.otm.milliTime diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/AbstractSlotPanel.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/slot/AbstractSlotPanel.kt similarity index 95% rename from src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/AbstractSlotPanel.kt rename to src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/slot/AbstractSlotPanel.kt index 701e5c21e..8bb20e1cd 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/AbstractSlotPanel.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/slot/AbstractSlotPanel.kt @@ -1,4 +1,4 @@ -package ru.dbotthepony.mc.otm.client.screen.panels +package ru.dbotthepony.mc.otm.client.screen.panels.slot import com.mojang.blaze3d.systems.RenderSystem import com.mojang.blaze3d.vertex.PoseStack @@ -10,6 +10,8 @@ import org.lwjgl.opengl.GL11 import ru.dbotthepony.mc.otm.client.minecraft import ru.dbotthepony.mc.otm.client.render.* import ru.dbotthepony.mc.otm.client.screen.MatteryScreen +import ru.dbotthepony.mc.otm.client.screen.panels.EditablePanel +import ru.dbotthepony.mc.otm.client.screen.panels.IItemStackPanel import ru.dbotthepony.mc.otm.core.math.RGBAColor abstract class AbstractSlotPanel> @JvmOverloads constructor( diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/FilterSlotPanel.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/slot/FilterSlotPanel.kt similarity index 89% rename from src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/FilterSlotPanel.kt rename to src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/slot/FilterSlotPanel.kt index ede980d40..5cb0b7ef5 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/FilterSlotPanel.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/slot/FilterSlotPanel.kt @@ -1,8 +1,8 @@ -package ru.dbotthepony.mc.otm.client.screen.panels +package ru.dbotthepony.mc.otm.client.screen.panels.slot -import net.minecraft.client.gui.screens.Screen import net.minecraft.world.item.ItemStack import ru.dbotthepony.mc.otm.client.screen.MatteryScreen +import ru.dbotthepony.mc.otm.client.screen.panels.EditablePanel import ru.dbotthepony.mc.otm.container.ItemFilterNetworkSlot import ru.dbotthepony.mc.otm.container.ItemFilterSlotPacket import ru.dbotthepony.mc.otm.network.MenuNetworkChannel diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/FoldableSlotPanel.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/slot/FoldableSlotPanel.kt similarity index 89% rename from src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/FoldableSlotPanel.kt rename to src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/slot/FoldableSlotPanel.kt index d0b3a2a82..7adfe743b 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/FoldableSlotPanel.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/slot/FoldableSlotPanel.kt @@ -1,9 +1,12 @@ -package ru.dbotthepony.mc.otm.client.screen.panels +package ru.dbotthepony.mc.otm.client.screen.panels.slot import net.minecraft.world.inventory.Slot import ru.dbotthepony.mc.otm.SystemTime import ru.dbotthepony.mc.otm.client.screen.MatteryScreen -import ru.dbotthepony.mc.otm.nanoTime +import ru.dbotthepony.mc.otm.client.screen.panels.util.BackgroundPanel +import ru.dbotthepony.mc.otm.client.screen.panels.Dock +import ru.dbotthepony.mc.otm.client.screen.panels.EditablePanel +import ru.dbotthepony.mc.otm.client.screen.panels.ISlotPanel open class FoldableSlotPanel, out T : Slot> @JvmOverloads constructor( screen: S, diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/SlotPanel.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/slot/SlotPanel.kt similarity index 96% rename from src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/SlotPanel.kt rename to src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/slot/SlotPanel.kt index f411c6a7d..05b1efef6 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/SlotPanel.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/slot/SlotPanel.kt @@ -1,6 +1,6 @@ @file:Suppress("FunctionName") -package ru.dbotthepony.mc.otm.client.screen.panels +package ru.dbotthepony.mc.otm.client.screen.panels.slot import com.mojang.blaze3d.systems.RenderSystem import com.mojang.blaze3d.vertex.PoseStack @@ -16,6 +16,8 @@ import ru.dbotthepony.mc.otm.client.render.Widgets18 import ru.dbotthepony.mc.otm.client.render.drawRect import ru.dbotthepony.mc.otm.client.render.setDrawColor import ru.dbotthepony.mc.otm.client.screen.MatteryScreen +import ru.dbotthepony.mc.otm.client.screen.panels.EditablePanel +import ru.dbotthepony.mc.otm.client.screen.panels.ISlotPanel import javax.annotation.Nonnull import kotlin.math.roundToInt diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/AnalogScrollBarPanel.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/util/AnalogScrollBarPanel.kt similarity index 97% rename from src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/AnalogScrollBarPanel.kt rename to src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/util/AnalogScrollBarPanel.kt index 38cb1b5f4..dff0e3f95 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/AnalogScrollBarPanel.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/util/AnalogScrollBarPanel.kt @@ -1,8 +1,9 @@ -package ru.dbotthepony.mc.otm.client.screen.panels +package ru.dbotthepony.mc.otm.client.screen.panels.util import com.mojang.blaze3d.platform.InputConstants import com.mojang.blaze3d.vertex.PoseStack import net.minecraft.client.gui.screens.Screen +import ru.dbotthepony.mc.otm.client.screen.panels.EditablePanel import ru.dbotthepony.mc.otm.core.math.linearInterpolation import ru.dbotthepony.mc.otm.milliTimeD import kotlin.math.roundToInt diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/BackgroundPanel.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/util/BackgroundPanel.kt similarity index 90% rename from src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/BackgroundPanel.kt rename to src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/util/BackgroundPanel.kt index 4ab428291..9c95e6a1b 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/BackgroundPanel.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/util/BackgroundPanel.kt @@ -1,9 +1,11 @@ -package ru.dbotthepony.mc.otm.client.screen.panels +package ru.dbotthepony.mc.otm.client.screen.panels.util import com.mojang.blaze3d.vertex.PoseStack import net.minecraft.client.gui.screens.Screen import ru.dbotthepony.mc.otm.client.render.StretchingRectangleElement import ru.dbotthepony.mc.otm.client.render.WidgetLocation +import ru.dbotthepony.mc.otm.client.screen.panels.DockProperty +import ru.dbotthepony.mc.otm.client.screen.panels.EditablePanel open class BackgroundPanel( screen: S, diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/DiscreteScrollBarPanel.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/util/DiscreteScrollBarPanel.kt similarity index 97% rename from src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/DiscreteScrollBarPanel.kt rename to src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/util/DiscreteScrollBarPanel.kt index a2abea412..6bd79d6d2 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/DiscreteScrollBarPanel.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/util/DiscreteScrollBarPanel.kt @@ -1,8 +1,9 @@ -package ru.dbotthepony.mc.otm.client.screen.panels +package ru.dbotthepony.mc.otm.client.screen.panels.util import com.mojang.blaze3d.platform.InputConstants import com.mojang.blaze3d.vertex.PoseStack import net.minecraft.client.gui.screens.Screen +import ru.dbotthepony.mc.otm.client.screen.panels.EditablePanel import kotlin.math.roundToInt open class DiscreteScrollBarPanel( diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/DraggableCanvasPanel.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/util/DraggableCanvasPanel.kt similarity index 87% rename from src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/DraggableCanvasPanel.kt rename to src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/util/DraggableCanvasPanel.kt index ca49b34a5..ec27abccf 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/DraggableCanvasPanel.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/util/DraggableCanvasPanel.kt @@ -1,6 +1,7 @@ -package ru.dbotthepony.mc.otm.client.screen.panels +package ru.dbotthepony.mc.otm.client.screen.panels.util import net.minecraft.client.gui.screens.Screen +import ru.dbotthepony.mc.otm.client.screen.panels.EditablePanel open class DraggableCanvasPanel @JvmOverloads constructor( screen: S, @@ -40,4 +41,4 @@ open class DraggableCanvasPanel @JvmOverloads constructor( init { scissor = true } -} \ No newline at end of file +} diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/GridPanel.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/util/GridPanel.kt similarity index 85% rename from src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/GridPanel.kt rename to src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/util/GridPanel.kt index 62a4865c4..62c17e32d 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/GridPanel.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/util/GridPanel.kt @@ -1,6 +1,8 @@ -package ru.dbotthepony.mc.otm.client.screen.panels +package ru.dbotthepony.mc.otm.client.screen.panels.util import net.minecraft.client.gui.screens.Screen +import ru.dbotthepony.mc.otm.client.screen.panels.Dock +import ru.dbotthepony.mc.otm.client.screen.panels.EditablePanel open class GridPanel @JvmOverloads constructor( screen: S, diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/HeightControls.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/util/HeightControls.kt similarity index 93% rename from src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/HeightControls.kt rename to src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/util/HeightControls.kt index 68013d638..294a4d69a 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/HeightControls.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/util/HeightControls.kt @@ -1,9 +1,11 @@ -package ru.dbotthepony.mc.otm.client.screen.panels +package ru.dbotthepony.mc.otm.client.screen.panels.util import com.mojang.blaze3d.platform.InputConstants import net.minecraft.client.gui.screens.Screen import ru.dbotthepony.mc.otm.client.render.AbstractMatterySprite import ru.dbotthepony.mc.otm.client.render.Widgets +import ru.dbotthepony.mc.otm.client.screen.panels.Dock +import ru.dbotthepony.mc.otm.client.screen.panels.EditablePanel import ru.dbotthepony.mc.otm.client.screen.panels.buttons.RectangleButtonPanel open class HeightControls( diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/ScrollBarConstants.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/util/ScrollBarConstants.kt similarity index 96% rename from src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/ScrollBarConstants.kt rename to src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/util/ScrollBarConstants.kt index e9473e0a6..546346c56 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/ScrollBarConstants.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/util/ScrollBarConstants.kt @@ -1,4 +1,4 @@ -package ru.dbotthepony.mc.otm.client.screen.panels +package ru.dbotthepony.mc.otm.client.screen.panels.util import net.minecraft.resources.ResourceLocation import ru.dbotthepony.mc.otm.OverdriveThatMatters diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/storage/DriveRackScreen.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/storage/DriveRackScreen.kt index b2f2f49eb..78b77d536 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/storage/DriveRackScreen.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/storage/DriveRackScreen.kt @@ -4,7 +4,7 @@ import net.minecraft.network.chat.Component import ru.dbotthepony.mc.otm.menu.storage.DriveRackMenu import net.minecraft.world.entity.player.Inventory import ru.dbotthepony.mc.otm.client.screen.MatteryScreen -import ru.dbotthepony.mc.otm.client.screen.panels.BatterySlotPanel +import ru.dbotthepony.mc.otm.client.screen.panels.slot.BatterySlotPanel import ru.dbotthepony.mc.otm.client.screen.panels.FramePanel import ru.dbotthepony.mc.otm.client.screen.panels.SlotPanel import ru.dbotthepony.mc.otm.client.screen.widget.WidePowerGaugePanel diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/storage/DriveViewerScreen.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/storage/DriveViewerScreen.kt index f54264cb6..886d14206 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/storage/DriveViewerScreen.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/storage/DriveViewerScreen.kt @@ -8,6 +8,9 @@ import ru.dbotthepony.mc.otm.client.screen.MatteryScreen import ru.dbotthepony.mc.otm.core.TranslatableComponent import ru.dbotthepony.mc.otm.client.screen.panels.* import ru.dbotthepony.mc.otm.client.screen.panels.buttons.CheckBoxLabelInputPanel +import ru.dbotthepony.mc.otm.client.screen.panels.slot.BatterySlotPanel +import ru.dbotthepony.mc.otm.client.screen.panels.slot.FilterSlotPanel +import ru.dbotthepony.mc.otm.client.screen.panels.util.GridPanel import ru.dbotthepony.mc.otm.client.screen.widget.PowerGaugePanel import ru.dbotthepony.mc.otm.core.math.integerDivisionDown import ru.dbotthepony.mc.otm.item.PortableCondensationDriveItem diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/storage/ItemMonitorScreen.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/storage/ItemMonitorScreen.kt index d9cf6b17d..9e9d2e718 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/storage/ItemMonitorScreen.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/storage/ItemMonitorScreen.kt @@ -15,6 +15,9 @@ import ru.dbotthepony.mc.otm.client.render.Widgets8 import ru.dbotthepony.mc.otm.client.screen.MatteryScreen import ru.dbotthepony.mc.otm.client.screen.panels.* import ru.dbotthepony.mc.otm.client.screen.panels.buttons.SmallEnumRectangleButtonPanel +import ru.dbotthepony.mc.otm.client.screen.panels.slot.BatterySlotPanel +import ru.dbotthepony.mc.otm.client.screen.panels.util.BackgroundPanel +import ru.dbotthepony.mc.otm.client.screen.panels.util.GridPanel import ru.dbotthepony.mc.otm.client.screen.widget.ProgressGaugePanel import ru.dbotthepony.mc.otm.client.screen.widget.WidePowerGaugePanel import ru.dbotthepony.mc.otm.core.asGetterSetter diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/storage/StorageBusScreen.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/storage/StorageBusScreen.kt index febb0e26a..8c916c248 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/storage/StorageBusScreen.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/storage/StorageBusScreen.kt @@ -6,6 +6,8 @@ import ru.dbotthepony.mc.otm.client.screen.MatteryScreen import ru.dbotthepony.mc.otm.core.TranslatableComponent import ru.dbotthepony.mc.otm.client.screen.panels.* import ru.dbotthepony.mc.otm.client.screen.panels.buttons.CheckBoxLabelInputPanel +import ru.dbotthepony.mc.otm.client.screen.panels.slot.BatterySlotPanel +import ru.dbotthepony.mc.otm.client.screen.panels.slot.FilterSlotPanel import ru.dbotthepony.mc.otm.client.screen.widget.WidePowerGaugePanel import ru.dbotthepony.mc.otm.menu.storage.StorageBusMenu diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/storage/StorageExporterScreen.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/storage/StorageExporterScreen.kt index 61a60e96e..2be138184 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/storage/StorageExporterScreen.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/storage/StorageExporterScreen.kt @@ -6,6 +6,8 @@ import ru.dbotthepony.mc.otm.client.screen.MatteryScreen import ru.dbotthepony.mc.otm.core.TranslatableComponent import ru.dbotthepony.mc.otm.client.screen.panels.* import ru.dbotthepony.mc.otm.client.screen.panels.buttons.CheckBoxLabelInputPanel +import ru.dbotthepony.mc.otm.client.screen.panels.slot.BatterySlotPanel +import ru.dbotthepony.mc.otm.client.screen.panels.slot.FilterSlotPanel import ru.dbotthepony.mc.otm.client.screen.widget.WidePowerGaugePanel import ru.dbotthepony.mc.otm.menu.storage.StorageExporterMenu diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/storage/StorageImporterScreen.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/storage/StorageImporterScreen.kt index a3ac11dd7..54021703a 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/storage/StorageImporterScreen.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/storage/StorageImporterScreen.kt @@ -6,6 +6,8 @@ import ru.dbotthepony.mc.otm.client.screen.MatteryScreen import ru.dbotthepony.mc.otm.core.TranslatableComponent import ru.dbotthepony.mc.otm.client.screen.panels.* import ru.dbotthepony.mc.otm.client.screen.panels.buttons.CheckBoxLabelInputPanel +import ru.dbotthepony.mc.otm.client.screen.panels.slot.BatterySlotPanel +import ru.dbotthepony.mc.otm.client.screen.panels.slot.FilterSlotPanel import ru.dbotthepony.mc.otm.client.screen.widget.WidePowerGaugePanel import ru.dbotthepony.mc.otm.menu.storage.StorageImporterMenu diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/storage/StoragePowerSupplierScreen.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/storage/StoragePowerSupplierScreen.kt index a8c413979..86b616aa1 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/storage/StoragePowerSupplierScreen.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/storage/StoragePowerSupplierScreen.kt @@ -5,6 +5,7 @@ import net.minecraft.world.entity.player.Inventory import ru.dbotthepony.mc.otm.client.screen.MatteryScreen import ru.dbotthepony.mc.otm.core.TranslatableComponent import ru.dbotthepony.mc.otm.client.screen.panels.* +import ru.dbotthepony.mc.otm.client.screen.panels.slot.BatterySlotPanel import ru.dbotthepony.mc.otm.client.screen.widget.HorizontalPowerGaugePanel import ru.dbotthepony.mc.otm.core.util.formatPower diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/tech/AndroidStationScreen.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/tech/AndroidStationScreen.kt index 06c8e3409..0ef836012 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/tech/AndroidStationScreen.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/tech/AndroidStationScreen.kt @@ -28,6 +28,9 @@ import ru.dbotthepony.mc.otm.client.render.drawRect import ru.dbotthepony.mc.otm.client.screen.MatteryScreen import ru.dbotthepony.mc.otm.client.screen.panels.* import ru.dbotthepony.mc.otm.client.screen.panels.buttons.ButtonPanel +import ru.dbotthepony.mc.otm.client.screen.panels.slot.BatterySlotPanel +import ru.dbotthepony.mc.otm.client.screen.panels.slot.EquipmentBatterySlotPanel +import ru.dbotthepony.mc.otm.client.screen.panels.util.DraggableCanvasPanel import ru.dbotthepony.mc.otm.client.screen.widget.WidePowerGaugePanel import ru.dbotthepony.mc.otm.core.math.RGBAColor import ru.dbotthepony.mc.otm.core.ifPresentK diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/tech/BatteryBankScreen.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/tech/BatteryBankScreen.kt index 593aee7a6..9308536ac 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/tech/BatteryBankScreen.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/tech/BatteryBankScreen.kt @@ -4,7 +4,7 @@ import net.minecraft.network.chat.Component import ru.dbotthepony.mc.otm.menu.tech.BatteryBankMenu import net.minecraft.world.entity.player.Inventory import ru.dbotthepony.mc.otm.client.screen.MatteryScreen -import ru.dbotthepony.mc.otm.client.screen.panels.BatterySlotPanel +import ru.dbotthepony.mc.otm.client.screen.panels.slot.BatterySlotPanel import ru.dbotthepony.mc.otm.client.screen.panels.FramePanel import ru.dbotthepony.mc.otm.client.screen.widget.WidePowerGaugePanel diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/tech/ChemicalGeneratorScreen.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/tech/ChemicalGeneratorScreen.kt index b9d1f34bb..f024bb793 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/tech/ChemicalGeneratorScreen.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/tech/ChemicalGeneratorScreen.kt @@ -5,6 +5,7 @@ import net.minecraft.world.entity.player.Inventory import ru.dbotthepony.mc.otm.client.screen.MatteryScreen import ru.dbotthepony.mc.otm.core.TranslatableComponent import ru.dbotthepony.mc.otm.client.screen.panels.* +import ru.dbotthepony.mc.otm.client.screen.panels.slot.BatterySlotPanel import ru.dbotthepony.mc.otm.client.screen.widget.ProgressGaugePanel import ru.dbotthepony.mc.otm.client.screen.widget.WidePowerGaugePanel import ru.dbotthepony.mc.otm.menu.tech.ChemicalGeneratorMenu diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/tech/EnergyCounterScreen.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/tech/EnergyCounterScreen.kt index c198e87a4..4385ac4a3 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/tech/EnergyCounterScreen.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/tech/EnergyCounterScreen.kt @@ -6,6 +6,7 @@ import ru.dbotthepony.mc.otm.client.screen.MatteryScreen import ru.dbotthepony.mc.otm.core.TranslatableComponent import ru.dbotthepony.mc.otm.client.screen.panels.* import ru.dbotthepony.mc.otm.client.screen.panels.buttons.ButtonPanel +import ru.dbotthepony.mc.otm.client.screen.panels.input.NetworkNumberInputPanel import ru.dbotthepony.mc.otm.core.util.formatPower import ru.dbotthepony.mc.otm.menu.tech.EnergyCounterMenu diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/tech/EnergyServoScreen.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/tech/EnergyServoScreen.kt index 942f04b8a..eb2cebd56 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/tech/EnergyServoScreen.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/tech/EnergyServoScreen.kt @@ -5,7 +5,7 @@ import net.minecraft.network.chat.Component import net.minecraft.world.entity.player.Inventory import ru.dbotthepony.mc.otm.client.screen.MatteryScreen import ru.dbotthepony.mc.otm.client.screen.panels.AbstractSlotPanel -import ru.dbotthepony.mc.otm.client.screen.panels.BatterySlotPanel +import ru.dbotthepony.mc.otm.client.screen.panels.slot.BatterySlotPanel import ru.dbotthepony.mc.otm.client.screen.panels.Dock import ru.dbotthepony.mc.otm.client.screen.panels.EditablePanel import ru.dbotthepony.mc.otm.client.screen.panels.FramePanel diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/tech/PlatePressScreen.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/tech/PlatePressScreen.kt index 472267c09..5931ef5a5 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/tech/PlatePressScreen.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/tech/PlatePressScreen.kt @@ -3,7 +3,7 @@ package ru.dbotthepony.mc.otm.client.screen.tech import net.minecraft.network.chat.Component import net.minecraft.world.entity.player.Inventory import ru.dbotthepony.mc.otm.client.screen.MatteryScreen -import ru.dbotthepony.mc.otm.client.screen.panels.BatterySlotPanel +import ru.dbotthepony.mc.otm.client.screen.panels.slot.BatterySlotPanel import ru.dbotthepony.mc.otm.client.screen.panels.FramePanel import ru.dbotthepony.mc.otm.client.screen.panels.SlotPanel import ru.dbotthepony.mc.otm.client.screen.widget.ProgressGaugePanel