Rename StackContainer to StackLayout and introduce UIContainer

Renamed `StackContainer` to `StackLayout` for consistency and clarity. Added a new `UIContainer` class to serve as a base for containers, simplifying child management by centralizing common logic. Adjusted references in `TestScreen` and related files to use the updated naming and structure.

Author: ThePandaOliver

common-testmod/src/main/java/me/pandamods/test/client/screen/TestScreen.java

@@ -15,23 +15,23 @@
 import me.pandamods.pandalib.client.screen.BasePLScreen;
 import me.pandamods.pandalib.client.screen.components.TextUIComponent;
 import me.pandamods.pandalib.client.screen.components.VanillaUIComponent;
-import me.pandamods.pandalib.client.screen.layouts.StackContainer;
+import me.pandamods.pandalib.client.screen.containers.StackLayout;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.components.Button;
 import net.minecraft.client.gui.components.EditBox;
 import net.minecraft.network.chat.Component;
 
-public class TestScreen extends BasePLScreen<StackContainer> {
+public class TestScreen extends BasePLScreen<StackLayout> {
 	public TestScreen() {
 		super(() -> {
-			StackContainer stack = StackContainer.createVerticalLayout();
+			StackLayout stack = StackLayout.createVerticalLayout();
 			stack.setGapSize(4);
 			return stack;
 		});
 	}
 
 	@Override
-	protected void build(StackContainer rootComponent) {
+	protected void build(StackLayout rootComponent) {
 		VanillaUIComponent vanillaTestButton = VanillaUIComponent.of(Button.builder(Component.literal("Test Vanilla Button"),
 				button -> System.out.println("Test click"))
 				.width(200)

common/src/main/java/me/pandamods/pandalib/client/screen/layouts/StackContainer.java renamed to common/src/main/java/me/pandamods/pandalib/client/screen/containers/StackLayout.java

@@ -10,9 +10,8 @@
  *  along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
-package me.pandamods.pandalib.client.screen.layouts;
+package me.pandamods.pandalib.client.screen.containers;
 
-import me.pandamods.pandalib.client.screen.BaseParentUIComponent;
 import me.pandamods.pandalib.client.screen.core.UIComponent;
 
 import java.util.ArrayList;
@@ -22,49 +21,31 @@
 import java.util.function.Consumer;
 import java.util.function.Supplier;
 
-public class StackContainer extends BaseParentUIComponent {
-	private final List<UIComponent> children = new ArrayList<>();
-	private final List<UIComponent> viewChildren = Collections.unmodifiableList(children);
-
+public class StackLayout extends UIContainer {
 	protected Direction direction;
 	protected int gapSize = 0;
 
 	private int contentWidth = 0;
 	private int contentHeight = 0;
 
-	public static StackContainer createHorizontalLayout() {
-		return new StackContainer(Direction.HORIZONTAL);
+	public static StackLayout createHorizontalLayout() {
+		return new StackLayout(Direction.HORIZONTAL);
 	}
 
-	public static StackContainer createVerticalLayout() {
-		return new StackContainer(Direction.VERTICAL);
+	public static StackLayout createVerticalLayout() {
+		return new StackLayout(Direction.VERTICAL);
 	}
 
-	public StackContainer(Direction direction) {
+	public StackLayout(Direction direction) {
 		this.direction = direction;
 	}
-
-	@Override
-	public List<UIComponent> getChildren() {
-		return viewChildren;
-	}
-
+	
 	@Override
 	public void updateChildState(UIComponent uiComponent) {
 		super.updateChildState(uiComponent);
 		align();
 	}
 
-	@Override
-	protected void addChild(UIComponent UIComponent) {
-		children.add(UIComponent);
-	}
-
-	@Override
-	protected void removeChild(UIComponent UIComponent) {
-		children.remove(UIComponent);
-	}
-
 	public void setDirection(Direction direction) {
 		this.direction = direction;
 		this.align();

common/src/main/java/me/pandamods/pandalib/client/screen/containers/UIContainer.java

@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2024 Oliver Froberg (The Panda Oliver)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  any later version.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ *  along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package me.pandamods.pandalib.client.screen.containers;
+
+import me.pandamods.pandalib.client.screen.BaseParentUIComponent;
+import me.pandamods.pandalib.client.screen.core.UIComponent;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+public class UIContainer extends BaseParentUIComponent {
+	protected final List<UIComponent> children = new ArrayList<>();
+	protected final List<UIComponent> viewChildren = Collections.unmodifiableList(children);
+
+	@Override
+	public List<UIComponent> getChildren() {
+		return viewChildren;
+	}
+
+	@Override
+	protected void addChild(UIComponent UIComponent) {
+		children.add(UIComponent);
+	}
+
+	@Override
+	protected void removeChild(UIComponent UIComponent) {
+		children.remove(UIComponent);
+	}
+}