diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/Starbound.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/Starbound.kt index f8d3d142..6d0fc76b 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/Starbound.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/Starbound.kt @@ -15,8 +15,8 @@ import ru.dbotthepony.kstarbound.api.NonExistingFile import ru.dbotthepony.kstarbound.api.PhysicalFile import ru.dbotthepony.kstarbound.api.explore import ru.dbotthepony.kstarbound.defs.* -import ru.dbotthepony.kstarbound.defs.animation.AtlasConfiguration -import ru.dbotthepony.kstarbound.defs.animation.SpriteReference +import ru.dbotthepony.kstarbound.defs.image.AtlasConfiguration +import ru.dbotthepony.kstarbound.defs.image.SpriteReference import ru.dbotthepony.kstarbound.defs.item.ItemDefinition import ru.dbotthepony.kstarbound.defs.item.ItemRarity import ru.dbotthepony.kstarbound.defs.liquid.LiquidDefinition diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/client/render/BoundSprite.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/client/render/BoundSprite.kt index 58874298..3b32f066 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/client/render/BoundSprite.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/client/render/BoundSprite.kt @@ -3,9 +3,9 @@ package ru.dbotthepony.kstarbound.client.render import ru.dbotthepony.kstarbound.client.gl.GLStateTracker import ru.dbotthepony.kstarbound.client.gl.GLTexture2D import ru.dbotthepony.kstarbound.client.gl.vertex.QuadTransformers -import ru.dbotthepony.kstarbound.defs.animation.AtlasConfiguration -import ru.dbotthepony.kstarbound.defs.animation.IUVCoordinates -import ru.dbotthepony.kstarbound.defs.animation.SpriteReference +import ru.dbotthepony.kstarbound.defs.image.AtlasConfiguration +import ru.dbotthepony.kstarbound.defs.image.IUVCoordinates +import ru.dbotthepony.kstarbound.defs.image.SpriteReference /** * Связка текстуры-атласа + координат спрайта на ней diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/client/render/SpriteAnimator.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/client/render/SpriteAnimator.kt index f90a7779..0630517d 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/client/render/SpriteAnimator.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/client/render/SpriteAnimator.kt @@ -3,8 +3,8 @@ package ru.dbotthepony.kstarbound.client.render import com.google.common.collect.ImmutableList import ru.dbotthepony.kstarbound.client.gl.GLStateTracker import ru.dbotthepony.kstarbound.client.gl.GLTexture2D -import ru.dbotthepony.kstarbound.defs.animation.AtlasConfiguration -import ru.dbotthepony.kstarbound.defs.animation.ImageReference +import ru.dbotthepony.kstarbound.defs.image.AtlasConfiguration +import ru.dbotthepony.kstarbound.defs.image.ImageReference class SpriteAnimator( val sprites: List, diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/animation/AtlasConfiguration.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/image/AtlasConfiguration.kt similarity index 99% rename from src/main/kotlin/ru/dbotthepony/kstarbound/defs/animation/AtlasConfiguration.kt rename to src/main/kotlin/ru/dbotthepony/kstarbound/defs/image/AtlasConfiguration.kt index df98232a..3abe1c94 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/animation/AtlasConfiguration.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/image/AtlasConfiguration.kt @@ -1,4 +1,4 @@ -package ru.dbotthepony.kstarbound.defs.animation +package ru.dbotthepony.kstarbound.defs.image import com.google.common.collect.ImmutableList import com.google.common.collect.ImmutableMap diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/animation/IUVCoordinates.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/image/IUVCoordinates.kt similarity index 87% rename from src/main/kotlin/ru/dbotthepony/kstarbound/defs/animation/IUVCoordinates.kt rename to src/main/kotlin/ru/dbotthepony/kstarbound/defs/image/IUVCoordinates.kt index 644af650..ede7e374 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/animation/IUVCoordinates.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/image/IUVCoordinates.kt @@ -1,4 +1,4 @@ -package ru.dbotthepony.kstarbound.defs.animation +package ru.dbotthepony.kstarbound.defs.image import ru.dbotthepony.kvector.api.IStruct4f diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/animation/ImageReference.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/image/ImageReference.kt similarity index 96% rename from src/main/kotlin/ru/dbotthepony/kstarbound/defs/animation/ImageReference.kt rename to src/main/kotlin/ru/dbotthepony/kstarbound/defs/image/ImageReference.kt index eeaf78bb..03d086da 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/animation/ImageReference.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/image/ImageReference.kt @@ -1,4 +1,4 @@ -package ru.dbotthepony.kstarbound.defs.animation +package ru.dbotthepony.kstarbound.defs.image import com.google.gson.JsonSyntaxException import com.google.gson.TypeAdapter diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/animation/SpriteReference.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/image/SpriteReference.kt similarity index 96% rename from src/main/kotlin/ru/dbotthepony/kstarbound/defs/animation/SpriteReference.kt rename to src/main/kotlin/ru/dbotthepony/kstarbound/defs/image/SpriteReference.kt index 78263e56..fed0737e 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/animation/SpriteReference.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/image/SpriteReference.kt @@ -1,4 +1,4 @@ -package ru.dbotthepony.kstarbound.defs.animation +package ru.dbotthepony.kstarbound.defs.image import com.google.gson.GsonBuilder import com.google.gson.TypeAdapter diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/animation/UVCoordinates.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/image/UVCoordinates.kt similarity index 84% rename from src/main/kotlin/ru/dbotthepony/kstarbound/defs/animation/UVCoordinates.kt rename to src/main/kotlin/ru/dbotthepony/kstarbound/defs/image/UVCoordinates.kt index f8e45e7b..41a2d020 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/animation/UVCoordinates.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/image/UVCoordinates.kt @@ -1,4 +1,4 @@ -package ru.dbotthepony.kstarbound.defs.animation +package ru.dbotthepony.kstarbound.defs.image data class UVCoordinates( override val u0: Float, diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/ItemDefinition.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/ItemDefinition.kt index f25e3f66..05035001 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/ItemDefinition.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/ItemDefinition.kt @@ -2,7 +2,7 @@ package ru.dbotthepony.kstarbound.defs.item import com.google.gson.GsonBuilder import ru.dbotthepony.kstarbound.Starbound -import ru.dbotthepony.kstarbound.defs.animation.SpriteReference +import ru.dbotthepony.kstarbound.defs.image.SpriteReference import ru.dbotthepony.kstarbound.io.json.FactoryAdapter import ru.dbotthepony.kstarbound.io.json.ListAdapter import ru.dbotthepony.kstarbound.io.json.asJsonObject diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/projectile/Configurable.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/projectile/Configurable.kt index 6ca03077..c92f5a3f 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/projectile/Configurable.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/projectile/Configurable.kt @@ -7,7 +7,7 @@ import it.unimi.dsi.fastutil.objects.ObjectArraySet import org.apache.logging.log4j.LogManager import ru.dbotthepony.kstarbound.Starbound import ru.dbotthepony.kstarbound.defs.* -import ru.dbotthepony.kstarbound.defs.animation.ImageReference +import ru.dbotthepony.kstarbound.defs.image.ImageReference import ru.dbotthepony.kstarbound.io.json.BuilderAdapter import ru.dbotthepony.kstarbound.io.json.CustomEnumTypeAdapter import ru.dbotthepony.kstarbound.registerTypeAdapter diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/projectile/Configured.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/projectile/Configured.kt index 2ef23395..2e12b722 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/projectile/Configured.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/projectile/Configured.kt @@ -5,7 +5,7 @@ import org.apache.logging.log4j.LogManager import ru.dbotthepony.kstarbound.Starbound import ru.dbotthepony.kstarbound.defs.AssembledPrototype import ru.dbotthepony.kstarbound.defs.DamageType -import ru.dbotthepony.kstarbound.defs.animation.ImageReference +import ru.dbotthepony.kstarbound.defs.image.ImageReference import ru.dbotthepony.kstarbound.world.entities.projectile.AbstractProjectileMovementController import ru.dbotthepony.kstarbound.world.entities.projectile.Projectile import ru.dbotthepony.kvector.vector.Color