From b112c33c5760674419dcb57354d76ba6caa26c24 Mon Sep 17 00:00:00 2001 From: NichtStudioCode <51272202+NichtStudioCode@users.noreply.github.com> Date: Sun, 29 Jan 2023 18:53:36 +0100 Subject: [PATCH] Rename BaseAnimation to AbstractAnimation --- .../impl/{BaseAnimation.java => AbstractAnimation.java} | 4 ++-- .../impl/{SoundAnimation.java => AbstractSoundAnimation.java} | 4 ++-- .../xyz/xenondevs/invui/animation/impl/ColumnAnimation.java | 2 +- .../invui/animation/impl/HorizontalSnakeAnimation.java | 2 +- .../xyz/xenondevs/invui/animation/impl/RandomAnimation.java | 2 +- .../java/xyz/xenondevs/invui/animation/impl/RowAnimation.java | 2 +- .../xenondevs/invui/animation/impl/SequentialAnimation.java | 2 +- .../invui/animation/impl/SplitSequentialAnimation.java | 2 +- .../invui/animation/impl/VerticalSnakeAnimation.java | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) rename invui/src/main/java/xyz/xenondevs/invui/animation/impl/{BaseAnimation.java => AbstractAnimation.java} (96%) rename invui/src/main/java/xyz/xenondevs/invui/animation/impl/{SoundAnimation.java => AbstractSoundAnimation.java} (68%) diff --git a/invui/src/main/java/xyz/xenondevs/invui/animation/impl/BaseAnimation.java b/invui/src/main/java/xyz/xenondevs/invui/animation/impl/AbstractAnimation.java similarity index 96% rename from invui/src/main/java/xyz/xenondevs/invui/animation/impl/BaseAnimation.java rename to invui/src/main/java/xyz/xenondevs/invui/animation/impl/AbstractAnimation.java index b0e9f72..7077767 100644 --- a/invui/src/main/java/xyz/xenondevs/invui/animation/impl/BaseAnimation.java +++ b/invui/src/main/java/xyz/xenondevs/invui/animation/impl/AbstractAnimation.java @@ -18,7 +18,7 @@ import java.util.concurrent.CopyOnWriteArrayList; import java.util.function.BiConsumer; import java.util.stream.Collectors; -public abstract class BaseAnimation implements Animation { +public abstract class AbstractAnimation implements Animation { private final List finishHandlers = new ArrayList<>(); private final int tickDelay; @@ -35,7 +35,7 @@ public abstract class BaseAnimation implements Animation { private int frame; private int noViewerTicks; - public BaseAnimation(int tickDelay) { + public AbstractAnimation(int tickDelay) { this.tickDelay = tickDelay; } diff --git a/invui/src/main/java/xyz/xenondevs/invui/animation/impl/SoundAnimation.java b/invui/src/main/java/xyz/xenondevs/invui/animation/impl/AbstractSoundAnimation.java similarity index 68% rename from invui/src/main/java/xyz/xenondevs/invui/animation/impl/SoundAnimation.java rename to invui/src/main/java/xyz/xenondevs/invui/animation/impl/AbstractSoundAnimation.java index 8baa028..d5659be 100644 --- a/invui/src/main/java/xyz/xenondevs/invui/animation/impl/SoundAnimation.java +++ b/invui/src/main/java/xyz/xenondevs/invui/animation/impl/AbstractSoundAnimation.java @@ -2,9 +2,9 @@ package xyz.xenondevs.invui.animation.impl; import org.bukkit.Sound; -public abstract class SoundAnimation extends BaseAnimation { +public abstract class AbstractSoundAnimation extends AbstractAnimation { - public SoundAnimation(int tickDelay, boolean sound) { + public AbstractSoundAnimation(int tickDelay, boolean sound) { super(tickDelay); if (sound) addShowHandler((frame, index) -> getCurrentViewers().forEach(player -> diff --git a/invui/src/main/java/xyz/xenondevs/invui/animation/impl/ColumnAnimation.java b/invui/src/main/java/xyz/xenondevs/invui/animation/impl/ColumnAnimation.java index 7f8609e..f903907 100644 --- a/invui/src/main/java/xyz/xenondevs/invui/animation/impl/ColumnAnimation.java +++ b/invui/src/main/java/xyz/xenondevs/invui/animation/impl/ColumnAnimation.java @@ -1,6 +1,6 @@ package xyz.xenondevs.invui.animation.impl; -public class ColumnAnimation extends SoundAnimation { +public class ColumnAnimation extends AbstractSoundAnimation { private int column; diff --git a/invui/src/main/java/xyz/xenondevs/invui/animation/impl/HorizontalSnakeAnimation.java b/invui/src/main/java/xyz/xenondevs/invui/animation/impl/HorizontalSnakeAnimation.java index 9bb9b0c..dc9ed37 100644 --- a/invui/src/main/java/xyz/xenondevs/invui/animation/impl/HorizontalSnakeAnimation.java +++ b/invui/src/main/java/xyz/xenondevs/invui/animation/impl/HorizontalSnakeAnimation.java @@ -1,6 +1,6 @@ package xyz.xenondevs.invui.animation.impl; -public class HorizontalSnakeAnimation extends SoundAnimation { +public class HorizontalSnakeAnimation extends AbstractSoundAnimation { private int x; private int y; diff --git a/invui/src/main/java/xyz/xenondevs/invui/animation/impl/RandomAnimation.java b/invui/src/main/java/xyz/xenondevs/invui/animation/impl/RandomAnimation.java index cb36c5c..5c7ce87 100644 --- a/invui/src/main/java/xyz/xenondevs/invui/animation/impl/RandomAnimation.java +++ b/invui/src/main/java/xyz/xenondevs/invui/animation/impl/RandomAnimation.java @@ -8,7 +8,7 @@ import java.util.Random; /** * Lets the {@link Item}s pop up randomly. */ -public class RandomAnimation extends SoundAnimation { +public class RandomAnimation extends AbstractSoundAnimation { private final Random random = new Random(); diff --git a/invui/src/main/java/xyz/xenondevs/invui/animation/impl/RowAnimation.java b/invui/src/main/java/xyz/xenondevs/invui/animation/impl/RowAnimation.java index 6df92df..01c9138 100644 --- a/invui/src/main/java/xyz/xenondevs/invui/animation/impl/RowAnimation.java +++ b/invui/src/main/java/xyz/xenondevs/invui/animation/impl/RowAnimation.java @@ -1,6 +1,6 @@ package xyz.xenondevs.invui.animation.impl; -public class RowAnimation extends SoundAnimation { +public class RowAnimation extends AbstractSoundAnimation { private int row; diff --git a/invui/src/main/java/xyz/xenondevs/invui/animation/impl/SequentialAnimation.java b/invui/src/main/java/xyz/xenondevs/invui/animation/impl/SequentialAnimation.java index 8acf80b..652b538 100644 --- a/invui/src/main/java/xyz/xenondevs/invui/animation/impl/SequentialAnimation.java +++ b/invui/src/main/java/xyz/xenondevs/invui/animation/impl/SequentialAnimation.java @@ -7,7 +7,7 @@ import java.util.List; /** * Lets the {@link Item}s pop up index after index. */ -public class SequentialAnimation extends SoundAnimation { +public class SequentialAnimation extends AbstractSoundAnimation { public SequentialAnimation(int tickDelay, boolean sound) { super(tickDelay, sound); diff --git a/invui/src/main/java/xyz/xenondevs/invui/animation/impl/SplitSequentialAnimation.java b/invui/src/main/java/xyz/xenondevs/invui/animation/impl/SplitSequentialAnimation.java index 3160488..a7f0d6c 100644 --- a/invui/src/main/java/xyz/xenondevs/invui/animation/impl/SplitSequentialAnimation.java +++ b/invui/src/main/java/xyz/xenondevs/invui/animation/impl/SplitSequentialAnimation.java @@ -2,7 +2,7 @@ package xyz.xenondevs.invui.animation.impl; import java.util.List; -public class SplitSequentialAnimation extends SoundAnimation { +public class SplitSequentialAnimation extends AbstractSoundAnimation { public SplitSequentialAnimation(int tickDelay, boolean sound) { super(tickDelay, sound); diff --git a/invui/src/main/java/xyz/xenondevs/invui/animation/impl/VerticalSnakeAnimation.java b/invui/src/main/java/xyz/xenondevs/invui/animation/impl/VerticalSnakeAnimation.java index f2cb400..415317e 100644 --- a/invui/src/main/java/xyz/xenondevs/invui/animation/impl/VerticalSnakeAnimation.java +++ b/invui/src/main/java/xyz/xenondevs/invui/animation/impl/VerticalSnakeAnimation.java @@ -1,6 +1,6 @@ package xyz.xenondevs.invui.animation.impl; -public class VerticalSnakeAnimation extends SoundAnimation { +public class VerticalSnakeAnimation extends AbstractSoundAnimation { private int x; private int y;