Move some classes into the correct packages

Rename base classes to lose the redundant "LP" prefix

Author: Bernasss12

.idea/externalAnnotations/net/minecraft/client/gui/inventory/annotations.xml

@@ -202,9 +202,9 @@
 import network.rs485.logisticspipes.compat.TheOneProbeIntegration;
 import network.rs485.logisticspipes.config.ClientConfiguration;
 import network.rs485.logisticspipes.config.ServerConfigurationManager;
-import network.rs485.logisticspipes.gui.PropertyUpdaterEventListener;
 import network.rs485.logisticspipes.gui.font.LPFontRenderer;
 import network.rs485.logisticspipes.guidebook.ItemGuideBook;
+import network.rs485.logisticspipes.property.PropertyUpdaterEventListener;
 import network.rs485.util.SystemUtilKt;
 
 //@formatter:off

common/logisticspipes/LogisticsPipes.java

@@ -40,7 +40,7 @@
 import logisticspipes.utils.gui.GuiGraphics;
 import logisticspipes.utils.gui.SmallGuiButton;
 import logisticspipes.utils.gui.extention.GuiExtention;
-import network.rs485.logisticspipes.gui.widget.module.Label;
+import network.rs485.logisticspipes.gui.widget.Label;
 import network.rs485.logisticspipes.gui.widget.VerticalLabel;
 import network.rs485.logisticspipes.inventory.IItemIdentifierInventory;
 import network.rs485.logisticspipes.property.BooleanProperty;

common/logisticspipes/gui/GuiCraftingPipe.java

@@ -1,5 +1,7 @@
 package logisticspipes.modplugins.jei;
 
+import javax.annotation.Nonnull;
+
 import net.minecraft.item.ItemStack;
 
 import net.minecraftforge.fml.relauncher.Side;
@@ -15,7 +17,7 @@
 import logisticspipes.utils.gui.LogisticsBaseGuiScreen;
 import network.rs485.logisticspipes.compat.JEIAdvancedGuiHandler;
 import network.rs485.logisticspipes.compat.JEIGhostIngredientHandler;
-import network.rs485.logisticspipes.gui.LPBaseGuiContainer;
+import network.rs485.logisticspipes.gui.BaseGuiContainer;
 
 @JEIPlugin
 public class JEIPluginLoader implements IModPlugin {
@@ -27,12 +29,12 @@ public void register(IModRegistry registry) {
 		IRecipeTransferRegistry recipeTransferRegistry = registry.getRecipeTransferRegistry();
 		recipeTransferRegistry.addUniversalRecipeTransferHandler(new RecipeTransferHandler(registry.getJeiHelpers().recipeTransferHandlerHelper()));
 		registry.addGhostIngredientHandler(LogisticsBaseGuiScreen.class, new GhostIngredientHandler());
-		registry.addGhostIngredientHandler(LPBaseGuiContainer.class, new JEIGhostIngredientHandler());
+		registry.addGhostIngredientHandler(BaseGuiContainer.class, new JEIGhostIngredientHandler());
 		registry.addAdvancedGuiHandlers(new AdvancedGuiHandler(), new JEIAdvancedGuiHandler());
 	}
 
 	@Override
-	public void onRuntimeAvailable(IJeiRuntime jeiRuntime) {
+	public void onRuntimeAvailable(@Nonnull IJeiRuntime jeiRuntime) {
 		JEIPluginLoader.jeiRuntime = jeiRuntime;
 	}
 

common/logisticspipes/modplugins/jei/JEIPluginLoader.java

@@ -11,7 +11,7 @@
 import logisticspipes.utils.StaticResolve;
 import logisticspipes.utils.gui.DummyContainer;
 import logisticspipes.utils.gui.DummyModuleContainer;
-import network.rs485.logisticspipes.gui.widget.module.ItemSinkGui;
+import network.rs485.logisticspipes.gui.module.ItemSinkGui;
 
 @StaticResolve
 public class ItemSinkInHand extends ModuleInHandGuiProvider {

common/logisticspipes/network/guis/module/inhand/ItemSinkInHand.java

@@ -10,7 +10,7 @@
 import logisticspipes.utils.gui.DummyModuleContainer;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
-import network.rs485.logisticspipes.gui.widget.module.ProviderGui;
+import network.rs485.logisticspipes.gui.module.ProviderGui;
 
 @StaticResolve
 public class ProviderModuleInHand extends ModuleInHandGuiProvider {

common/logisticspipes/network/guis/module/inhand/ProviderModuleInHand.java

@@ -12,8 +12,8 @@
 import logisticspipes.network.abstractguis.GuiProvider;
 import logisticspipes.network.abstractguis.ModuleCoordinatesGuiProvider;
 import logisticspipes.utils.StaticResolve;
-import network.rs485.logisticspipes.gui.widget.module.ItemSinkContainer;
-import network.rs485.logisticspipes.gui.widget.module.ItemSinkGui;
+import network.rs485.logisticspipes.inventory.container.ItemSinkContainer;
+import network.rs485.logisticspipes.gui.module.ItemSinkGui;
 import network.rs485.logisticspipes.property.PropertyLayer;
 import network.rs485.logisticspipes.util.LPDataInput;
 import network.rs485.logisticspipes.util.LPDataOutput;

common/logisticspipes/network/guis/module/inpipe/ItemSinkSlot.java

@@ -11,8 +11,8 @@
 import logisticspipes.network.abstractguis.GuiProvider;
 import logisticspipes.network.abstractguis.ModuleCoordinatesGuiProvider;
 import logisticspipes.utils.StaticResolve;
-import network.rs485.logisticspipes.gui.widget.module.ProviderContainer;
-import network.rs485.logisticspipes.gui.widget.module.ProviderGui;
+import network.rs485.logisticspipes.inventory.container.ProviderContainer;
+import network.rs485.logisticspipes.gui.module.ProviderGui;
 import network.rs485.logisticspipes.inventory.ProviderMode;
 import network.rs485.logisticspipes.util.LPDataInput;
 import network.rs485.logisticspipes.util.LPDataOutput;

common/logisticspipes/network/guis/module/inpipe/ProviderModuleGuiProvider.java

@@ -17,7 +17,7 @@
 import logisticspipes.proxy.MainProxy;
 import logisticspipes.utils.StaticResolve;
 import logisticspipes.utils.item.ItemIdentifier;
-import network.rs485.logisticspipes.gui.widget.module.ItemSinkGui;
+import network.rs485.logisticspipes.gui.module.ItemSinkGui;
 import network.rs485.logisticspipes.util.LPDataInput;
 import network.rs485.logisticspipes.util.LPDataOutput;
 

common/logisticspipes/network/packets/module/ItemSinkImportPacket.java

@@ -37,12 +37,13 @@
 
 package network.rs485.logisticspipes.gui
 
-import network.rs485.logisticspipes.util.IRectangle
 import java.awt.Container
-import javax.swing.*
+import javax.swing.JButton
+import javax.swing.JLabel
+import javax.swing.JPanel
 
 interface WidgetRenderer<T : Any> {
-    fun render(componentContainer: ComponentContainer, body: IRectangle): T
+    fun render(componentContainer: ComponentContainer): T
 }
 
 object SwingRenderer : WidgetRenderer<JPanel> {
@@ -82,7 +83,7 @@ object SwingRenderer : WidgetRenderer<JPanel> {
         }
     }
 
-    override fun render(componentContainer: ComponentContainer, body: IRectangle): JPanel {
+    override fun render(componentContainer: ComponentContainer): JPanel {
         return JPanel().apply {
             addContainer(componentContainer)
         }

src/api/kotlin/network/rs485/logisticspipes/gui/SwingStuff.kt

@@ -37,15 +37,15 @@
 
 package network.rs485.logisticspipes.compat
 
-import network.rs485.logisticspipes.gui.LPBaseGuiContainer
+import network.rs485.logisticspipes.gui.BaseGuiContainer
 import mezz.jei.api.gui.IAdvancedGuiHandler
 import java.awt.Rectangle
 
-class JEIAdvancedGuiHandler : IAdvancedGuiHandler<LPBaseGuiContainer> {
+class JEIAdvancedGuiHandler : IAdvancedGuiHandler<BaseGuiContainer> {
 
-    override fun getGuiContainerClass(): Class<LPBaseGuiContainer> = LPBaseGuiContainer::class.java
+    override fun getGuiContainerClass(): Class<BaseGuiContainer> = BaseGuiContainer::class.java
 
-    override fun getGuiExtraAreas(guiContainer: LPBaseGuiContainer): MutableList<Rectangle> =
+    override fun getGuiExtraAreas(guiContainer: BaseGuiContainer): MutableList<Rectangle> =
         guiContainer.getExtraGuiAreas().map { rect ->
             Rectangle(rect.roundedLeft, rect.roundedTop, rect.roundedWidth, rect.roundedHeight)
         }.toMutableList()

src/main/kotlin/network/rs485/logisticspipes/compat/JEIAdvancedGuiHandler.kt

@@ -37,13 +37,13 @@
 
 package network.rs485.logisticspipes.compat
 
-import network.rs485.logisticspipes.gui.LPBaseGuiContainer
+import network.rs485.logisticspipes.gui.BaseGuiContainer
 import mezz.jei.api.gui.IGhostIngredientHandler
 
-class JEIGhostIngredientHandler : IGhostIngredientHandler<LPBaseGuiContainer> {
+class JEIGhostIngredientHandler : IGhostIngredientHandler<BaseGuiContainer> {
 
     override fun <I : Any?> getTargets(
-        gui: LPBaseGuiContainer,
+        gui: BaseGuiContainer,
         ingredient: I,
         doStart: Boolean,
     ): MutableList<IGhostIngredientHandler.Target<I>> = gui.getFilterSlots()

src/main/kotlin/network/rs485/logisticspipes/compat/JEIGhostIngredientHandler.kt

@@ -38,15 +38,14 @@
 package network.rs485.logisticspipes.gui
 
 import network.rs485.logisticspipes.gui.guidebook.Drawable
-import network.rs485.logisticspipes.gui.guidebook.MouseHoverable
 import network.rs485.logisticspipes.gui.guidebook.MouseInteractable
 import network.rs485.logisticspipes.gui.guidebook.Screen
 import network.rs485.logisticspipes.gui.widget.FuzzyItemSlot
 import network.rs485.logisticspipes.gui.widget.FuzzySelectionWidget
 import network.rs485.logisticspipes.gui.widget.GhostSlot
 import network.rs485.logisticspipes.gui.widget.Tooltipped
+import network.rs485.logisticspipes.inventory.container.LPBaseContainer
 import network.rs485.logisticspipes.util.IRectangle
-import network.rs485.logisticspipes.util.math.MutableRectangle
 import logisticspipes.utils.gui.DummySlot
 import mezz.jei.api.gui.IGhostIngredientHandler
 import net.minecraft.client.Minecraft
@@ -57,76 +56,29 @@ import net.minecraft.inventory.ClickType
 import net.minecraft.inventory.Slot
 import kotlin.math.roundToInt
 
-abstract class LPBaseGuiContainer(
+abstract class BaseGuiContainer(
     private val baseContainer: LPBaseContainer,
-    private val xOffset: Int = 0,
-    private val yOffset: Int = 0,
-) : GuiContainer(baseContainer), Drawable {
+    val xOffset: Int = 0,
+    val yOffset: Int = 0,
+    private val widgetScreen: WidgetScreen,
+) : GuiContainer(baseContainer), Drawable by widgetScreen {
 
     // TODO
     // Make it so only the highest "z" widget can be drawn as hovered - hovered state should be managed by gui class.
 
-    final override var parent: Drawable? = Screen
-    final override val relativeBody = MutableRectangle()
-    private var hoveredWidget: MouseHoverable? = null
-
-    protected abstract val widgets: ComponentContainer
-    private var widgetContainer: WidgetContainer = VerticalWidgetContainer(emptyList(), parent, Margin.DEFAULT, 0)
-
     open val fuzzySelector: FuzzySelectionWidget? = null
 
     override fun initGui() {
-        // In case the screen size has changed.
-        Screen.relativeBody.setSize(width, height)
-
-        // Create gui widgets from dls components.
-        widgetContainer = GuiRenderer.render(widgets, relativeBody).also {
-            it.parent = this@LPBaseGuiContainer
-        }
-
-        // Set position back to 0 before placing children to respect minecraft's gui translation.
-        widgetContainer.relativeBody.resetPos()
-        relativeBody.resetPos()
-
-        // Initialize every widget and place it relative to its parent.
-        widgetContainer.apply {
-            initWidget()
-            placeChildren()
-        }
-
-        // Set size of the main container to the minimum necessary size to fit all children.
-        widgetContainer.relativeBody.setSize(
-            widgetContainer.minWidth,
-            widgetContainer.minHeight,
-        ).translate(
-            widgetContainer.margin.left,
-            widgetContainer.margin.top,
-        )
-
-        // Set the root body of the gui based on the size of the first container
-        // and taking into account it's margin.
-        relativeBody.setSizeFromRectangle(
-            widgetContainer.relativeBody.copy().grow(
-                widgetContainer.margin.horizontal,
-                widgetContainer.margin.vertical,
-            ),
-        )
-
-        // Center gui with possible offsets
-        relativeBody.setPos(
-            newX = (Screen.xCenter - relativeBody.width / 2) + xOffset,
-            newY = (Screen.yCenter - relativeBody.height / 2) + yOffset,
-        )
+        widgetScreen.initGuiWidget(this@BaseGuiContainer, super<GuiContainer>.width, super<GuiContainer>.height)
 
         // To use minecraft's slot and item rendering. Might remove later.
-        guiLeft = widgetContainer.absoluteBody.roundedLeft
-        guiTop = widgetContainer.absoluteBody.roundedTop
+        guiLeft = widgetScreen.widgetContainer.absoluteBody.roundedLeft
+        guiTop = widgetScreen.widgetContainer.absoluteBody.roundedTop
 
         // Clear button and widget lists
         buttonList.clear()
         mc.player.openContainer = inventorySlots
     }
-
     /**
      * Draw what is supposed to not be important to the gui and is behind everything else.
      * Origin is top left corner of the minecraft window.
@@ -136,7 +88,7 @@ abstract class LPBaseGuiContainer(
      */
     open fun drawBackgroundLayer(mouseX: Int, mouseY: Int, partialTicks: Float) {
         drawDefaultBackground()
-        helper.drawGuiContainerBackground(absoluteBody, guiLeft to guiTop, inventorySlots)
+        GuiDrawer.drawGuiContainerBackground(absoluteBody, guiLeft to guiTop, inventorySlots)
     }
 
     /**
@@ -156,15 +108,12 @@ abstract class LPBaseGuiContainer(
      * @param partialTicks time so animations don't have to depend on game ticks which can be unstable.
      */
     open fun drawForegroundLayer(mouseX: Float, mouseY: Float, partialTicks: Float) {
-        widgetContainer.draw(mouseX, mouseY, partialTicks, Screen.absoluteBody)
-        (hoveredWidget as? Tooltipped)?.getTooltipText()?.takeIf { it.isNotEmpty() }?.also {
+        widgetScreen.widgetContainer.draw(mouseX, mouseY, partialTicks, Screen.absoluteBody)
+        (widgetScreen.hoveredWidget as? Tooltipped)?.getTooltipText()?.takeIf { it.isNotEmpty() }?.also {
             drawHoveringText(it, mouseX.roundToInt(), mouseY.roundToInt())
         } ?: renderHoveredToolTip(mouseX.roundToInt(), mouseY.roundToInt())
     }
 
-    private fun getHovered(mouseX: Float, mouseY: Float): MouseHoverable? =
-        widgetContainer.getHovered(mouseX, mouseY)
-
     // Call super and call all the normally used methods.
     override fun drawScreen(mouseX: Int, mouseY: Int, partialTicks: Float) {
         super.drawScreen(mouseX, mouseY, partialTicks)
@@ -176,7 +125,7 @@ abstract class LPBaseGuiContainer(
         drawFocalgroundLayer(floatMouseX, floatMouseY, partialTicks)
         GlStateManager.translate(0.0f, 0.0f, 10.0f)
         RenderHelper.disableStandardItemLighting()
-        hoveredWidget = getHovered(floatMouseX, floatMouseY)
+        widgetScreen.updateHoveredState(floatMouseX, floatMouseY)
         drawForegroundLayer(floatMouseX, floatMouseY, partialTicks)
         RenderHelper.disableStandardItemLighting()
         fuzzySelector?.let { fuzzySelector ->
@@ -210,7 +159,7 @@ abstract class LPBaseGuiContainer(
         ) {
             return
         }
-        val currentHovered = hoveredWidget
+        val currentHovered = widgetScreen.hoveredWidget
         if (currentHovered is MouseInteractable) {
             if (currentHovered.mouseClicked(
                     mouseX = mouseX.toFloat(),
@@ -244,10 +193,6 @@ abstract class LPBaseGuiContainer(
         drawBackgroundLayer(mouseX, mouseY, partialTicks)
     }
 
-    companion object {
-        val helper = LPGuiDrawer
-    }
-
     fun List<Drawable>.draw(mouseX: Float, mouseY: Float, partialTicks: Float, visibleArea: IRectangle) =
         forEach {
             it.draw(mouseX, mouseY, partialTicks, visibleArea)

src/main/kotlin/network/rs485/logisticspipes/gui/LPBaseGuiContainer.kt src/main/kotlin/network/rs485/logisticspipes/gui/BaseGuiContainer.kt

@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2023  RS485
+ *
+ * "LogisticsPipes" is distributed under the terms of the Minecraft Mod Public
+ * License 1.0.1, or MMPL. Please check the contents of the license located in
+ * https://github.com/RS485/LogisticsPipes/blob/dev/LICENSE.md
+ *
+ * This file can instead be distributed under the license terms of the
+ * MIT license:
+ *
+ * Copyright (c) 2023  RS485
+ *
+ * This MIT license was reworded to only match this file. If you use the regular
+ * MIT license in your project, replace this copyright notice (this line and any
+ * lines below and NOT the copyright line above) with the lines from the original
+ * MIT license located here: http://opensource.org/licenses/MIT
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this file and associated documentation files (the "Source Code"), to deal in
+ * the Source Code without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Source Code, and to permit persons to whom the Source Code is furnished
+ * to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Source Code, which also can be
+ * distributed under the MIT.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package network.rs485.logisticspipes.gui
+
+import network.rs485.logisticspipes.gui.guidebook.Drawable
+import net.minecraft.client.gui.GuiScreen
+
+class BaseGuiScreen(private val widgetScreen: WidgetScreen) : GuiScreen(), Drawable by widgetScreen {
+
+    override fun initGui() {
+        widgetScreen.initGuiWidget(this, widgetScreen.width, widgetScreen.height)
+
+        // Clear button and widget lists
+        buttonList.clear()
+    }
+}

src/main/kotlin/network/rs485/logisticspipes/gui/BaseGuiScreen.kt

@@ -69,7 +69,7 @@ import kotlin.math.abs
 /**
  * Drawing methods to help with Guis
  */
-object LPGuiDrawer {
+object GuiDrawer {
 
     private const val BORDER: Int = 4
     private const val NORMAL_SLOT_SIZE = 18