diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/animation/ParticleLayer.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/animation/ParticleLayer.kt deleted file mode 100644 index 06517379..00000000 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/animation/ParticleLayer.kt +++ /dev/null @@ -1,5 +0,0 @@ -package ru.dbotthepony.kstarbound.defs.animation - -enum class ParticleLayer { - FRONT -} diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/particle/IParticleConfig.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/particle/IParticleConfig.kt index 1000c108..16547893 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/particle/IParticleConfig.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/particle/IParticleConfig.kt @@ -2,7 +2,6 @@ package ru.dbotthepony.kstarbound.defs.particle import com.google.common.collect.ImmutableList import ru.dbotthepony.kstarbound.defs.animation.DestructionAction -import ru.dbotthepony.kstarbound.defs.animation.ParticleLayer import ru.dbotthepony.kstarbound.io.json.builder.JsonImplementation import ru.dbotthepony.kstarbound.util.ChainedProperty import ru.dbotthepony.kstarbound.util.SBPattern diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/particle/ParticleConfig.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/particle/ParticleConfig.kt index f7afd12d..25167621 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/particle/ParticleConfig.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/particle/ParticleConfig.kt @@ -3,8 +3,6 @@ package ru.dbotthepony.kstarbound.defs.particle import ru.dbotthepony.kstarbound.defs.AssetReference import ru.dbotthepony.kstarbound.defs.animation.AnimationDefinition import ru.dbotthepony.kstarbound.defs.animation.DestructionAction -import ru.dbotthepony.kstarbound.defs.animation.ParticleLayer -import ru.dbotthepony.kstarbound.defs.animation.ParticleType import ru.dbotthepony.kstarbound.defs.image.SpriteReference import ru.dbotthepony.kstarbound.io.json.builder.JsonFactory import ru.dbotthepony.kstarbound.util.SBPattern diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/particle/ParticleCreator.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/particle/ParticleCreator.kt index abeea140..be01fd50 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/particle/ParticleCreator.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/particle/ParticleCreator.kt @@ -1,13 +1,8 @@ package ru.dbotthepony.kstarbound.defs.particle import ru.dbotthepony.kstarbound.defs.RegistryReference -import ru.dbotthepony.kstarbound.defs.animation.DestructionAction -import ru.dbotthepony.kstarbound.defs.animation.ParticleLayer import ru.dbotthepony.kstarbound.io.json.builder.JsonFactory import ru.dbotthepony.kstarbound.util.Either -import ru.dbotthepony.kvector.vector.Color -import ru.dbotthepony.kvector.vector.ndouble.Vector2d -import ru.dbotthepony.kvector.vector.ndouble.Vector4d @JsonFactory data class ParticleCreator( diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/particle/ParticleEmitter.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/particle/ParticleEmitter.kt index ebba476f..9e84068e 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/particle/ParticleEmitter.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/particle/ParticleEmitter.kt @@ -2,7 +2,6 @@ package ru.dbotthepony.kstarbound.defs.particle import com.google.common.collect.ImmutableList import ru.dbotthepony.kstarbound.defs.animation.DestructionAction -import ru.dbotthepony.kstarbound.defs.animation.ParticleLayer import ru.dbotthepony.kstarbound.io.json.builder.JsonFactory import ru.dbotthepony.kstarbound.util.SBPattern import ru.dbotthepony.kvector.vector.Color diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/particle/ParticleLayer.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/particle/ParticleLayer.kt new file mode 100644 index 00000000..a5560579 --- /dev/null +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/particle/ParticleLayer.kt @@ -0,0 +1,5 @@ +package ru.dbotthepony.kstarbound.defs.particle + +enum class ParticleLayer { + FRONT +} diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/animation/ParticleType.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/particle/ParticleType.kt similarity index 55% rename from src/main/kotlin/ru/dbotthepony/kstarbound/defs/animation/ParticleType.kt rename to src/main/kotlin/ru/dbotthepony/kstarbound/defs/particle/ParticleType.kt index 5b717af9..ebe46927 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/animation/ParticleType.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/particle/ParticleType.kt @@ -1,4 +1,4 @@ -package ru.dbotthepony.kstarbound.defs.animation +package ru.dbotthepony.kstarbound.defs.particle enum class ParticleType { ANIMATED,