diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/StarboundJsonAdapters.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/StarboundJsonAdapters.kt index bd5657d9..c7387e7e 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/StarboundJsonAdapters.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/StarboundJsonAdapters.kt @@ -70,7 +70,6 @@ fun addStarboundJsonAdapters(builder: GsonBuilder) { registerTypeAdapter(PolyTypeAdapter) // Снаряды - registerTypeAdapterFactory(ConfigurableProjectile.ADAPTER) registerTypeAdapterFactory(ActionConfig.ADAPTER) registerTypeAdapterFactory(ActionProjectile.ADAPTER) registerTypeAdapterFactory(ActionSound.ADAPTER) 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 f3b59b0e..03ac6e03 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/projectile/Configurable.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/projectile/Configurable.kt @@ -10,12 +10,14 @@ import ru.dbotthepony.kstarbound.defs.* import ru.dbotthepony.kstarbound.defs.image.ImageReference import ru.dbotthepony.kstarbound.io.json.builder.BuilderAdapter import ru.dbotthepony.kstarbound.io.json.builder.EnumAdapter +import ru.dbotthepony.kstarbound.io.json.builder.JsonBuilder import ru.dbotthepony.kstarbound.registerTypeAdapter import ru.dbotthepony.kstarbound.util.NotNullVar import ru.dbotthepony.kvector.vector.Color import java.util.concurrent.ConcurrentHashMap import kotlin.properties.Delegates +@JsonBuilder class ConfigurableProjectile : RawPrototype() { var projectileName by Delegates.notNull() var physics: ProjectilePhysics = ProjectilePhysics.DEFAULT @@ -94,33 +96,6 @@ class ConfigurableProjectile : RawPrototype