From 43324ba5e9e732bfd4eed417d55b8c87c0962347 Mon Sep 17 00:00:00 2001 From: Frank Date: Fri, 15 Jul 2022 08:16:29 +0200 Subject: [PATCH] Renamed --- .../components/{Stack.java => AbstractStack.java} | 10 +++++++--- .../ui/layout/components/AbstractVanillaComponent.java | 4 ++++ .../betterx/ui/layout/components/HorizontalStack.java | 2 +- .../betterx/ui/layout/components/VerticalStack.java | 2 +- 4 files changed, 13 insertions(+), 5 deletions(-) rename src/main/java/org/betterx/ui/layout/components/{Stack.java => AbstractStack.java} (87%) create mode 100644 src/main/java/org/betterx/ui/layout/components/AbstractVanillaComponent.java diff --git a/src/main/java/org/betterx/ui/layout/components/Stack.java b/src/main/java/org/betterx/ui/layout/components/AbstractStack.java similarity index 87% rename from src/main/java/org/betterx/ui/layout/components/Stack.java rename to src/main/java/org/betterx/ui/layout/components/AbstractStack.java index 3ebc2a49..d8892136 100644 --- a/src/main/java/org/betterx/ui/layout/components/Stack.java +++ b/src/main/java/org/betterx/ui/layout/components/AbstractStack.java @@ -8,18 +8,22 @@ import org.betterx.ui.layout.values.Rectangle; import com.mojang.blaze3d.vertex.PoseStack; import net.minecraft.client.gui.components.events.GuiEventListener; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; + import java.util.LinkedList; import java.util.List; import org.jetbrains.annotations.Nullable; -public abstract class Stack> extends Component implements RelativeContainerEventHandler { +@Environment(EnvType.CLIENT) +public abstract class AbstractStack> extends Component implements RelativeContainerEventHandler { protected final List> components = new LinkedList<>(); - public Stack(DynamicSize width, DynamicSize height) { + public AbstractStack(DynamicSize width, DynamicSize height) { this(width, height, null); } - public Stack(DynamicSize width, DynamicSize height, R renderer) { + public AbstractStack(DynamicSize width, DynamicSize height, R renderer) { super(width, height, renderer); } diff --git a/src/main/java/org/betterx/ui/layout/components/AbstractVanillaComponent.java b/src/main/java/org/betterx/ui/layout/components/AbstractVanillaComponent.java new file mode 100644 index 00000000..df93dba4 --- /dev/null +++ b/src/main/java/org/betterx/ui/layout/components/AbstractVanillaComponent.java @@ -0,0 +1,4 @@ +package org.betterx.ui.layout.components; + +public class AbstractVanillaComponent { +} diff --git a/src/main/java/org/betterx/ui/layout/components/HorizontalStack.java b/src/main/java/org/betterx/ui/layout/components/HorizontalStack.java index 34febddf..c3284571 100644 --- a/src/main/java/org/betterx/ui/layout/components/HorizontalStack.java +++ b/src/main/java/org/betterx/ui/layout/components/HorizontalStack.java @@ -9,7 +9,7 @@ import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; @Environment(EnvType.CLIENT) -public class HorizontalStack extends Stack> implements RelativeContainerEventHandler { +public class HorizontalStack extends AbstractStack> implements RelativeContainerEventHandler { public HorizontalStack(DynamicSize width, DynamicSize height) { super(width, height); } diff --git a/src/main/java/org/betterx/ui/layout/components/VerticalStack.java b/src/main/java/org/betterx/ui/layout/components/VerticalStack.java index 21eb3441..afacf5af 100644 --- a/src/main/java/org/betterx/ui/layout/components/VerticalStack.java +++ b/src/main/java/org/betterx/ui/layout/components/VerticalStack.java @@ -10,7 +10,7 @@ import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; @Environment(EnvType.CLIENT) -public class VerticalStack extends Stack> implements RelativeContainerEventHandler { +public class VerticalStack extends AbstractStack> implements RelativeContainerEventHandler { public VerticalStack(DynamicSize width, DynamicSize height) { super(width, height); }