From de8fa6d31f1a25cbfdc02f4749865c5cfa33d2ed Mon Sep 17 00:00:00 2001 From: Will FP Date: Sat, 13 Jan 2024 12:33:31 +0000 Subject: [PATCH] Refactor on particle animations --- .../impl/particles/ParticleAnimations.kt | 24 +++++++++---------- ...onCircle.kt => ParticleAnimationCircle.kt} | 2 +- ...lix.kt => ParticleAnimationDoubleHelix.kt} | 2 +- ...al.kt => ParticleAnimationGroundSpiral.kt} | 2 +- ...tionHelix.kt => ParticleAnimationHelix.kt} | 2 +- ...tionTrace.kt => ParticleAnimationTrace.kt} | 2 +- ...tionTwirl.kt => ParticleAnimationTwirl.kt} | 2 +- 7 files changed, 18 insertions(+), 18 deletions(-) rename core/src/main/kotlin/com/willfp/libreforge/effects/impl/particles/impl/{AnimationCircle.kt => ParticleAnimationCircle.kt} (96%) rename core/src/main/kotlin/com/willfp/libreforge/effects/impl/particles/impl/{AnimationDoubleHelix.kt => ParticleAnimationDoubleHelix.kt} (95%) rename core/src/main/kotlin/com/willfp/libreforge/effects/impl/particles/impl/{AnimationGroundSpiral.kt => ParticleAnimationGroundSpiral.kt} (95%) rename core/src/main/kotlin/com/willfp/libreforge/effects/impl/particles/impl/{AnimationHelix.kt => ParticleAnimationHelix.kt} (96%) rename core/src/main/kotlin/com/willfp/libreforge/effects/impl/particles/impl/{AnimationTrace.kt => ParticleAnimationTrace.kt} (94%) rename core/src/main/kotlin/com/willfp/libreforge/effects/impl/particles/impl/{AnimationTwirl.kt => ParticleAnimationTwirl.kt} (97%) diff --git a/core/src/main/kotlin/com/willfp/libreforge/effects/impl/particles/ParticleAnimations.kt b/core/src/main/kotlin/com/willfp/libreforge/effects/impl/particles/ParticleAnimations.kt index 2fd75a9c0..79c6e3625 100644 --- a/core/src/main/kotlin/com/willfp/libreforge/effects/impl/particles/ParticleAnimations.kt +++ b/core/src/main/kotlin/com/willfp/libreforge/effects/impl/particles/ParticleAnimations.kt @@ -4,12 +4,12 @@ import com.willfp.eco.core.config.interfaces.Config import com.willfp.eco.core.registry.Registry import com.willfp.libreforge.ConfigViolation import com.willfp.libreforge.ViolationContext -import com.willfp.libreforge.effects.impl.particles.impl.AnimationCircle -import com.willfp.libreforge.effects.impl.particles.impl.AnimationDoubleHelix -import com.willfp.libreforge.effects.impl.particles.impl.AnimationGroundSpiral -import com.willfp.libreforge.effects.impl.particles.impl.AnimationHelix -import com.willfp.libreforge.effects.impl.particles.impl.AnimationTrace -import com.willfp.libreforge.effects.impl.particles.impl.AnimationTwirl +import com.willfp.libreforge.effects.impl.particles.impl.ParticleAnimationCircle +import com.willfp.libreforge.effects.impl.particles.impl.ParticleAnimationDoubleHelix +import com.willfp.libreforge.effects.impl.particles.impl.ParticleAnimationGroundSpiral +import com.willfp.libreforge.effects.impl.particles.impl.ParticleAnimationHelix +import com.willfp.libreforge.effects.impl.particles.impl.ParticleAnimationTrace +import com.willfp.libreforge.effects.impl.particles.impl.ParticleAnimationTwirl @Suppress("UNUSED") object ParticleAnimations : Registry>() { @@ -47,11 +47,11 @@ object ParticleAnimations : Registry>() { } init { - register(AnimationCircle) - register(AnimationDoubleHelix) - register(AnimationGroundSpiral) - register(AnimationHelix) - register(AnimationTrace) - register(AnimationTwirl) + register(ParticleAnimationCircle) + register(ParticleAnimationDoubleHelix) + register(ParticleAnimationGroundSpiral) + register(ParticleAnimationHelix) + register(ParticleAnimationTrace) + register(ParticleAnimationTwirl) } } \ No newline at end of file diff --git a/core/src/main/kotlin/com/willfp/libreforge/effects/impl/particles/impl/AnimationCircle.kt b/core/src/main/kotlin/com/willfp/libreforge/effects/impl/particles/impl/ParticleAnimationCircle.kt similarity index 96% rename from core/src/main/kotlin/com/willfp/libreforge/effects/impl/particles/impl/AnimationCircle.kt rename to core/src/main/kotlin/com/willfp/libreforge/effects/impl/particles/impl/ParticleAnimationCircle.kt index 67a615a85..15bee60c1 100644 --- a/core/src/main/kotlin/com/willfp/libreforge/effects/impl/particles/impl/AnimationCircle.kt +++ b/core/src/main/kotlin/com/willfp/libreforge/effects/impl/particles/impl/ParticleAnimationCircle.kt @@ -12,7 +12,7 @@ import dev.romainguy.kotlin.math.Float3 import org.bukkit.entity.Player import kotlin.math.PI -object AnimationCircle : ParticleAnimation("circle") { +object ParticleAnimationCircle : ParticleAnimation("circle") { override val arguments = arguments { require("radius", "You must specify the radius!") require("duration", "You must specify the duration!") diff --git a/core/src/main/kotlin/com/willfp/libreforge/effects/impl/particles/impl/AnimationDoubleHelix.kt b/core/src/main/kotlin/com/willfp/libreforge/effects/impl/particles/impl/ParticleAnimationDoubleHelix.kt similarity index 95% rename from core/src/main/kotlin/com/willfp/libreforge/effects/impl/particles/impl/AnimationDoubleHelix.kt rename to core/src/main/kotlin/com/willfp/libreforge/effects/impl/particles/impl/ParticleAnimationDoubleHelix.kt index c8b4ecf8e..69d98648c 100644 --- a/core/src/main/kotlin/com/willfp/libreforge/effects/impl/particles/impl/AnimationDoubleHelix.kt +++ b/core/src/main/kotlin/com/willfp/libreforge/effects/impl/particles/impl/ParticleAnimationDoubleHelix.kt @@ -10,7 +10,7 @@ import dev.romainguy.kotlin.math.Float3 import org.bukkit.entity.Player import kotlin.math.PI -object AnimationDoubleHelix : ParticleAnimation("double_helix") { +object ParticleAnimationDoubleHelix : ParticleAnimation("double_helix") { override val arguments = arguments { require("height", "You must specify the height!") require("duration", "You must specify the duration!") diff --git a/core/src/main/kotlin/com/willfp/libreforge/effects/impl/particles/impl/AnimationGroundSpiral.kt b/core/src/main/kotlin/com/willfp/libreforge/effects/impl/particles/impl/ParticleAnimationGroundSpiral.kt similarity index 95% rename from core/src/main/kotlin/com/willfp/libreforge/effects/impl/particles/impl/AnimationGroundSpiral.kt rename to core/src/main/kotlin/com/willfp/libreforge/effects/impl/particles/impl/ParticleAnimationGroundSpiral.kt index 4a9b08104..d70035098 100644 --- a/core/src/main/kotlin/com/willfp/libreforge/effects/impl/particles/impl/AnimationGroundSpiral.kt +++ b/core/src/main/kotlin/com/willfp/libreforge/effects/impl/particles/impl/ParticleAnimationGroundSpiral.kt @@ -11,7 +11,7 @@ import kotlin.math.PI import kotlin.math.cos import kotlin.math.sin -object AnimationGroundSpiral : ParticleAnimation("ground_spiral") { +object ParticleAnimationGroundSpiral : ParticleAnimation("ground_spiral") { override val arguments = arguments { require("scalar", "You must specify the scalar!") require("distance-scalar", "You must specify the distance scalar!") diff --git a/core/src/main/kotlin/com/willfp/libreforge/effects/impl/particles/impl/AnimationHelix.kt b/core/src/main/kotlin/com/willfp/libreforge/effects/impl/particles/impl/ParticleAnimationHelix.kt similarity index 96% rename from core/src/main/kotlin/com/willfp/libreforge/effects/impl/particles/impl/AnimationHelix.kt rename to core/src/main/kotlin/com/willfp/libreforge/effects/impl/particles/impl/ParticleAnimationHelix.kt index b982b856d..efa31e0a7 100644 --- a/core/src/main/kotlin/com/willfp/libreforge/effects/impl/particles/impl/AnimationHelix.kt +++ b/core/src/main/kotlin/com/willfp/libreforge/effects/impl/particles/impl/ParticleAnimationHelix.kt @@ -10,7 +10,7 @@ import dev.romainguy.kotlin.math.Float3 import org.bukkit.entity.Player import kotlin.math.PI -object AnimationHelix : ParticleAnimation("helix") { +object ParticleAnimationHelix : ParticleAnimation("helix") { override val arguments = arguments { require("height", "You must specify the height!") require("duration", "You must specify the duration!") diff --git a/core/src/main/kotlin/com/willfp/libreforge/effects/impl/particles/impl/AnimationTrace.kt b/core/src/main/kotlin/com/willfp/libreforge/effects/impl/particles/impl/ParticleAnimationTrace.kt similarity index 94% rename from core/src/main/kotlin/com/willfp/libreforge/effects/impl/particles/impl/AnimationTrace.kt rename to core/src/main/kotlin/com/willfp/libreforge/effects/impl/particles/impl/ParticleAnimationTrace.kt index 60f3c2e6f..d66bb96b8 100644 --- a/core/src/main/kotlin/com/willfp/libreforge/effects/impl/particles/impl/AnimationTrace.kt +++ b/core/src/main/kotlin/com/willfp/libreforge/effects/impl/particles/impl/ParticleAnimationTrace.kt @@ -10,7 +10,7 @@ import dev.romainguy.kotlin.math.Float2 import dev.romainguy.kotlin.math.Float3 import org.bukkit.entity.Player -object AnimationTrace : ParticleAnimation("trace") { +object ParticleAnimationTrace : ParticleAnimation("trace") { override val arguments = arguments { require("spacing", "You must specify the spacing!") } diff --git a/core/src/main/kotlin/com/willfp/libreforge/effects/impl/particles/impl/AnimationTwirl.kt b/core/src/main/kotlin/com/willfp/libreforge/effects/impl/particles/impl/ParticleAnimationTwirl.kt similarity index 97% rename from core/src/main/kotlin/com/willfp/libreforge/effects/impl/particles/impl/AnimationTwirl.kt rename to core/src/main/kotlin/com/willfp/libreforge/effects/impl/particles/impl/ParticleAnimationTwirl.kt index 47f2847d7..70c86874c 100644 --- a/core/src/main/kotlin/com/willfp/libreforge/effects/impl/particles/impl/AnimationTwirl.kt +++ b/core/src/main/kotlin/com/willfp/libreforge/effects/impl/particles/impl/ParticleAnimationTwirl.kt @@ -11,7 +11,7 @@ import dev.romainguy.kotlin.math.Float3 import org.bukkit.entity.Player import kotlin.math.PI -object AnimationTwirl : ParticleAnimation("twirl") { +object ParticleAnimationTwirl : ParticleAnimation("twirl") { override val arguments = arguments { require("small-radius", "You must specify the small radius!") require("large-radius", "You must specify the large radius!")