diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/StarboundJsonAdapters.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/StarboundJsonAdapters.kt index 3c040f13..0035a702 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/StarboundJsonAdapters.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/StarboundJsonAdapters.kt @@ -4,7 +4,7 @@ import com.google.gson.GsonBuilder import ru.dbotthepony.kstarbound.defs.DamageType import ru.dbotthepony.kstarbound.defs.JsonFunction import ru.dbotthepony.kstarbound.defs.MaterialReference -import ru.dbotthepony.kstarbound.defs.SBPattern +import ru.dbotthepony.kstarbound.util.SBPattern import ru.dbotthepony.kstarbound.defs.ThingDescription import ru.dbotthepony.kstarbound.defs.image.AtlasConfiguration import ru.dbotthepony.kstarbound.defs.image.SpriteReference diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/image/SpriteReference.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/image/SpriteReference.kt index 2e0a7239..3f2a7090 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/image/SpriteReference.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/image/SpriteReference.kt @@ -4,7 +4,7 @@ import com.google.gson.TypeAdapter import com.google.gson.stream.JsonReader import com.google.gson.stream.JsonWriter import ru.dbotthepony.kstarbound.Starbound -import ru.dbotthepony.kstarbound.defs.SBPattern +import ru.dbotthepony.kstarbound.util.SBPattern /** * Хранит данные (пару) вида "/example/image.png:sprite.name" diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/player/CompanionsConfig.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/player/CompanionsConfig.kt index 67c27ca9..9aac24f0 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/player/CompanionsConfig.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/player/CompanionsConfig.kt @@ -3,7 +3,7 @@ package ru.dbotthepony.kstarbound.defs.player import com.google.common.collect.ImmutableList import com.google.common.collect.ImmutableMap import ru.dbotthepony.kstarbound.defs.IScriptable -import ru.dbotthepony.kstarbound.defs.SBPattern +import ru.dbotthepony.kstarbound.util.SBPattern import ru.dbotthepony.kstarbound.io.json.builder.JsonFactory @JsonFactory diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/player/PlayerDefinition.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/player/PlayerDefinition.kt index b371d817..063dba22 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/player/PlayerDefinition.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/player/PlayerDefinition.kt @@ -5,7 +5,7 @@ import com.google.common.collect.ImmutableMap import com.google.common.collect.ImmutableSet import com.google.gson.JsonObject import ru.dbotthepony.kstarbound.defs.RegistryReference -import ru.dbotthepony.kstarbound.defs.SBPattern +import ru.dbotthepony.kstarbound.util.SBPattern import ru.dbotthepony.kstarbound.defs.animation.AnimationDefinition import ru.dbotthepony.kstarbound.defs.item.IItemDefinition import ru.dbotthepony.kstarbound.io.json.builder.JsonFactory diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/SBPattern.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/util/SBPattern.kt similarity index 99% rename from src/main/kotlin/ru/dbotthepony/kstarbound/defs/SBPattern.kt rename to src/main/kotlin/ru/dbotthepony/kstarbound/util/SBPattern.kt index 64259193..4304cb25 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/SBPattern.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/util/SBPattern.kt @@ -1,4 +1,4 @@ -package ru.dbotthepony.kstarbound.defs +package ru.dbotthepony.kstarbound.util import com.google.common.collect.ImmutableList import com.google.common.collect.ImmutableMap