DBot/KStarbound
DBot/KStarbound
3
0
Fork 0
Code Issues1 Pull Requests Packages Projects Releases Wiki Activity

Разделение одного пакета item на api и impl для удобства

Browse Source
This commit is contained in:
DBotThePony 2023-03-29 12:24:12 +07:00
parent 59fd54499b
commit 4f4baef997
Signed by: DBot
GPG Key ID: DCC23B5715498507
26 changed files with 55 additions and 49 deletions

25
src/main/kotlin/ru/dbotthepony/kstarbound/Starbound.kt
View File

@ -2,7 +2,6 @@ package ru.dbotthepony.kstarbound
import com.github.benmanes.caffeine.cache.Cache
import com.github.benmanes.caffeine.cache.Caffeine
import com.google.common.cache.CacheBuilder
import com.google.common.collect.Interner
import com.google.common.collect.Interners
import com.google.gson.*
@ -19,19 +18,19 @@ import ru.dbotthepony.kstarbound.api.explore
import ru.dbotthepony.kstarbound.defs.*
import ru.dbotthepony.kstarbound.defs.image.AtlasConfiguration
import ru.dbotthepony.kstarbound.defs.image.ImageReference
import ru.dbotthepony.kstarbound.defs.item.BackArmorItemPrototype
import ru.dbotthepony.kstarbound.defs.item.ChestArmorItemPrototype
import ru.dbotthepony.kstarbound.defs.item.CurrencyItemPrototype
import ru.dbotthepony.kstarbound.defs.item.FlashlightPrototype
import ru.dbotthepony.kstarbound.defs.item.HarvestingToolPrototype
import ru.dbotthepony.kstarbound.defs.item.HeadArmorItemPrototype
import ru.dbotthepony.kstarbound.defs.item.IArmorItemDefinition
import ru.dbotthepony.kstarbound.defs.item.IItemDefinition
import ru.dbotthepony.kstarbound.defs.item.impl.BackArmorItemPrototype
import ru.dbotthepony.kstarbound.defs.item.impl.ChestArmorItemPrototype
import ru.dbotthepony.kstarbound.defs.item.impl.CurrencyItemPrototype
import ru.dbotthepony.kstarbound.defs.item.impl.FlashlightPrototype
import ru.dbotthepony.kstarbound.defs.item.impl.HarvestingToolPrototype
import ru.dbotthepony.kstarbound.defs.item.impl.HeadArmorItemPrototype
import ru.dbotthepony.kstarbound.defs.item.api.IArmorItemDefinition
import ru.dbotthepony.kstarbound.defs.item.api.IItemDefinition
import ru.dbotthepony.kstarbound.defs.item.InventoryIcon
import ru.dbotthepony.kstarbound.defs.item.ItemPrototype
import ru.dbotthepony.kstarbound.defs.item.LegsArmorItemPrototype
import ru.dbotthepony.kstarbound.defs.item.LiquidItemPrototype
import ru.dbotthepony.kstarbound.defs.item.MaterialItemPrototype
import ru.dbotthepony.kstarbound.defs.item.impl.ItemPrototype
import ru.dbotthepony.kstarbound.defs.item.impl.LegsArmorItemPrototype
import ru.dbotthepony.kstarbound.defs.item.impl.LiquidItemPrototype
import ru.dbotthepony.kstarbound.defs.item.impl.MaterialItemPrototype
import ru.dbotthepony.kstarbound.defs.npc.NpcTypeDefinition
import ru.dbotthepony.kstarbound.defs.tile.LiquidDefinition
import ru.dbotthepony.kstarbound.defs.particle.ParticleDefinition

2
src/main/kotlin/ru/dbotthepony/kstarbound/defs/ItemReference.kt
View File

@ -9,7 +9,7 @@ import com.google.gson.reflect.TypeToken
import com.google.gson.stream.JsonReader
import com.google.gson.stream.JsonToken
import com.google.gson.stream.JsonWriter
import ru.dbotthepony.kstarbound.defs.item.IItemDefinition
import ru.dbotthepony.kstarbound.defs.item.api.IItemDefinition
import ru.dbotthepony.kstarbound.io.json.builder.FactoryAdapter
import ru.dbotthepony.kstarbound.io.json.builder.JsonFactory
import ru.dbotthepony.kstarbound.io.json.consumeNull

2
src/main/kotlin/ru/dbotthepony/kstarbound/defs/Species.kt
View File

@ -3,7 +3,7 @@ package ru.dbotthepony.kstarbound.defs
import com.google.common.collect.ImmutableList
import com.google.common.collect.ImmutableSet
import ru.dbotthepony.kstarbound.defs.image.ImageReference
import ru.dbotthepony.kstarbound.defs.item.IItemDefinition
import ru.dbotthepony.kstarbound.defs.item.api.IItemDefinition
import ru.dbotthepony.kstarbound.defs.player.BlueprintLearnList
import ru.dbotthepony.kstarbound.io.json.builder.JsonFactory

1
src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/DynamicItemDefinition.kt
View File

@ -3,6 +3,7 @@ package ru.dbotthepony.kstarbound.defs.item
import com.google.gson.JsonObject
import ru.dbotthepony.kstarbound.RegistryObject
import ru.dbotthepony.kstarbound.defs.DynamicDefinition
import ru.dbotthepony.kstarbound.defs.item.api.IItemDefinition
class DynamicItemDefinition(def: RegistryObject<IItemDefinition>) : DynamicDefinition<IItemDefinition>(def) {
override fun sanitize(saveInput: JsonObject) {

4
src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/IArmorItemDefinition.kt → src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/api/IArmorItemDefinition.kt
View File

@ -1,4 +1,4 @@
package ru.dbotthepony.kstarbound.defs.item
package ru.dbotthepony.kstarbound.defs.item.api
import com.google.gson.Gson
import com.google.gson.TypeAdapter
@ -7,11 +7,9 @@ import com.google.gson.reflect.TypeToken
import com.google.gson.stream.JsonReader
import com.google.gson.stream.JsonToken
import com.google.gson.stream.JsonWriter
import ru.dbotthepony.kstarbound.defs.image.AtlasConfiguration
import ru.dbotthepony.kstarbound.defs.image.ImageReference
import ru.dbotthepony.kstarbound.io.json.builder.FactoryAdapter
import ru.dbotthepony.kstarbound.io.json.builder.JsonImplementation
import ru.dbotthepony.kstarbound.util.PathStack
interface IArmorItemDefinition : ILeveledItemDefinition, IScriptableItemDefinition {
/**

2
src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/ICurrencyItemDefinition.kt → src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/api/ICurrencyItemDefinition.kt
View File

@ -1,4 +1,4 @@
package ru.dbotthepony.kstarbound.defs.item
package ru.dbotthepony.kstarbound.defs.item.api
interface ICurrencyItemDefinition : IItemDefinition {
/**

2
src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/IFlashlightDefinition.kt → src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/api/IFlashlightDefinition.kt
View File

@ -1,4 +1,4 @@
package ru.dbotthepony.kstarbound.defs.item
package ru.dbotthepony.kstarbound.defs.item.api
import ru.dbotthepony.kvector.vector.Color
import ru.dbotthepony.kvector.vector.ndouble.Vector2d

2
src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/IHarvestingToolDefinition.kt → src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/api/IHarvestingToolDefinition.kt
View File

@ -1,4 +1,4 @@
package ru.dbotthepony.kstarbound.defs.item
package ru.dbotthepony.kstarbound.defs.item.api
import ru.dbotthepony.kstarbound.defs.animation.IAnimated

4
src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/IItemDefinition.kt → src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/api/IItemDefinition.kt
View File

@ -1,7 +1,9 @@
package ru.dbotthepony.kstarbound.defs.item
package ru.dbotthepony.kstarbound.defs.item.api
import ru.dbotthepony.kstarbound.defs.IThingWithDescription
import ru.dbotthepony.kstarbound.defs.RegistryReference
import ru.dbotthepony.kstarbound.defs.item.IInventoryIcon
import ru.dbotthepony.kstarbound.defs.item.ItemRarity
interface IItemDefinition : IThingWithDescription {
/**

3
src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/IItemInHandDefinition.kt → src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/api/IItemInHandDefinition.kt
View File

@ -1,5 +1,6 @@
package ru.dbotthepony.kstarbound.defs.item
package ru.dbotthepony.kstarbound.defs.item.api
import ru.dbotthepony.kstarbound.defs.item.api.IItemDefinition
import ru.dbotthepony.kvector.vector.ndouble.Vector2d
interface IItemInHandDefinition : IItemDefinition {

4
src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/ILeveledItemDefinition.kt → src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/api/ILeveledItemDefinition.kt
View File

@ -1,4 +1,6 @@
package ru.dbotthepony.kstarbound.defs.item
package ru.dbotthepony.kstarbound.defs.item.api
import ru.dbotthepony.kstarbound.defs.item.ILeveledStatusEffect
interface ILeveledItemDefinition : IItemDefinition {
/**

3
src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/ILiquidItem.kt → src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/api/ILiquidItem.kt
View File

@ -1,5 +1,6 @@
package ru.dbotthepony.kstarbound.defs.item
package ru.dbotthepony.kstarbound.defs.item.api
import ru.dbotthepony.kstarbound.defs.item.api.IItemDefinition
import ru.dbotthepony.kstarbound.util.Either
interface ILiquidItem : IItemDefinition {

3
src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/IMaterialItem.kt → src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/api/IMaterialItem.kt
View File

@ -1,5 +1,6 @@
package ru.dbotthepony.kstarbound.defs.item
package ru.dbotthepony.kstarbound.defs.item.api
import ru.dbotthepony.kstarbound.defs.item.api.IItemDefinition
import ru.dbotthepony.kstarbound.util.Either
interface IMaterialItem : IItemDefinition {

3
src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/IScriptableItemDefinition.kt → src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/api/IScriptableItemDefinition.kt
View File

@ -1,5 +1,6 @@
package ru.dbotthepony.kstarbound.defs.item
package ru.dbotthepony.kstarbound.defs.item.api
import ru.dbotthepony.kstarbound.defs.IScriptable
import ru.dbotthepony.kstarbound.defs.item.api.IItemDefinition
interface IScriptableItemDefinition : IItemDefinition, IScriptable

5
src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/ArmorItemPrototype.kt → src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/impl/ArmorItemPrototype.kt
View File

@ -1,9 +1,10 @@
package ru.dbotthepony.kstarbound.defs.item
package ru.dbotthepony.kstarbound.defs.item.impl
import com.google.common.collect.ImmutableList
import ru.dbotthepony.kstarbound.defs.DirectAssetReference
import ru.dbotthepony.kstarbound.defs.item.api.IArmorItemDefinition
import ru.dbotthepony.kstarbound.defs.item.LeveledStatusEffect
import ru.dbotthepony.kstarbound.io.json.builder.JsonBuilder
import ru.dbotthepony.kstarbound.io.json.builder.JsonIgnoreProperty
@JsonBuilder
abstract class ArmorItemPrototype : ItemPrototype(), IArmorItemDefinition {

7
src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/CurrencyItemPrototype.kt → src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/impl/CurrencyItemPrototype.kt
View File

@ -1,10 +1,7 @@
package ru.dbotthepony.kstarbound.defs.item
package ru.dbotthepony.kstarbound.defs.item.impl
import com.google.common.collect.ImmutableList
import ru.dbotthepony.kstarbound.defs.util.enrollMap
import ru.dbotthepony.kstarbound.io.json.builder.BuilderAdapter
import ru.dbotthepony.kstarbound.defs.item.api.ICurrencyItemDefinition
import ru.dbotthepony.kstarbound.io.json.builder.JsonBuilder
import ru.dbotthepony.kstarbound.util.NotNullVar
@JsonBuilder
class CurrencyItemPrototype : ItemPrototype(), ICurrencyItemDefinition {

5
src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/FlashlightPrototype.kt → src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/impl/FlashlightPrototype.kt
View File

@ -1,8 +1,7 @@
package ru.dbotthepony.kstarbound.defs.item
package ru.dbotthepony.kstarbound.defs.item.impl
import ru.dbotthepony.kstarbound.defs.util.enrollMap
import ru.dbotthepony.kstarbound.defs.item.api.IFlashlightDefinition
import ru.dbotthepony.kstarbound.io.json.builder.JsonBuilder
import ru.dbotthepony.kstarbound.util.NotNullVar
import ru.dbotthepony.kvector.vector.Color
import ru.dbotthepony.kvector.vector.ndouble.Vector2d

5
src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/HarvestingToolPrototype.kt → src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/impl/HarvestingToolPrototype.kt
View File

@ -1,9 +1,8 @@
package ru.dbotthepony.kstarbound.defs.item
package ru.dbotthepony.kstarbound.defs.item.impl
import com.google.common.collect.ImmutableList
import ru.dbotthepony.kstarbound.defs.util.enrollMap
import ru.dbotthepony.kstarbound.defs.item.api.IHarvestingToolDefinition
import ru.dbotthepony.kstarbound.io.json.builder.JsonBuilder
import ru.dbotthepony.kstarbound.util.NotNullVar
import ru.dbotthepony.kvector.vector.ndouble.Vector2d
@JsonBuilder

6
src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/ItemPrototype.kt → src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/impl/ItemPrototype.kt
View File

@ -1,13 +1,15 @@
package ru.dbotthepony.kstarbound.defs.item
package ru.dbotthepony.kstarbound.defs.item.impl
import com.google.common.collect.ImmutableList
import ru.dbotthepony.kstarbound.defs.FreezableDefintionBuilder
import ru.dbotthepony.kstarbound.defs.RegistryReference
import ru.dbotthepony.kstarbound.defs.ThingDescription
import ru.dbotthepony.kstarbound.defs.item.api.IItemDefinition
import ru.dbotthepony.kstarbound.defs.item.InventoryIcon
import ru.dbotthepony.kstarbound.defs.item.ItemRarity
import ru.dbotthepony.kstarbound.io.json.builder.JsonBuilder
import ru.dbotthepony.kstarbound.io.json.builder.JsonPropertyConfig
import ru.dbotthepony.kstarbound.io.json.builder.JsonIgnoreProperty
import ru.dbotthepony.kstarbound.util.NotNullVar
@JsonBuilder
open class ItemPrototype : FreezableDefintionBuilder(), IItemDefinition {

3
src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/LiquidItemPrototype.kt → src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/impl/LiquidItemPrototype.kt
View File

@ -1,5 +1,6 @@
package ru.dbotthepony.kstarbound.defs.item
package ru.dbotthepony.kstarbound.defs.item.impl
import ru.dbotthepony.kstarbound.defs.item.api.ILiquidItem
import ru.dbotthepony.kstarbound.io.json.builder.JsonBuilder
import ru.dbotthepony.kstarbound.util.Either

3
src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/MaterialItemPrototype.kt → src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/impl/MaterialItemPrototype.kt
View File

@ -1,5 +1,6 @@
package ru.dbotthepony.kstarbound.defs.item
package ru.dbotthepony.kstarbound.defs.item.impl
import ru.dbotthepony.kstarbound.defs.item.api.IMaterialItem
import ru.dbotthepony.kstarbound.io.json.builder.JsonBuilder
import ru.dbotthepony.kstarbound.util.Either

2
src/main/kotlin/ru/dbotthepony/kstarbound/defs/player/BlueprintLearnList.kt
View File

@ -11,7 +11,7 @@ import com.google.gson.stream.JsonToken
import com.google.gson.stream.JsonWriter
import it.unimi.dsi.fastutil.ints.Int2ObjectArrayMap
import ru.dbotthepony.kstarbound.defs.RegistryReference
import ru.dbotthepony.kstarbound.defs.item.IItemDefinition
import ru.dbotthepony.kstarbound.defs.item.api.IItemDefinition
import ru.dbotthepony.kstarbound.io.json.builder.JsonFactory
class BlueprintLearnList private constructor(private val tiers: Int2ObjectArrayMap<ImmutableList<Entry>>) {

2
src/main/kotlin/ru/dbotthepony/kstarbound/defs/player/DeploymentConfig.kt
View File

@ -5,7 +5,7 @@ import com.google.common.collect.ImmutableMap
import ru.dbotthepony.kstarbound.defs.DirectAssetReference
import ru.dbotthepony.kstarbound.defs.IScriptable
import ru.dbotthepony.kstarbound.defs.RegistryReference
import ru.dbotthepony.kstarbound.defs.item.IItemDefinition
import ru.dbotthepony.kstarbound.defs.item.api.IItemDefinition
import ru.dbotthepony.kstarbound.io.json.builder.JsonFactory
@JsonFactory

2
src/main/kotlin/ru/dbotthepony/kstarbound/defs/player/PlayerDefinition.kt
View File

@ -9,7 +9,7 @@ import ru.dbotthepony.kstarbound.defs.RegistryReference
import ru.dbotthepony.kstarbound.defs.Species
import ru.dbotthepony.kstarbound.util.SBPattern
import ru.dbotthepony.kstarbound.defs.animation.AnimationDefinition
import ru.dbotthepony.kstarbound.defs.item.IItemDefinition
import ru.dbotthepony.kstarbound.defs.item.api.IItemDefinition
import ru.dbotthepony.kstarbound.io.json.builder.JsonFactory
import ru.dbotthepony.kvector.util2d.AABB
import ru.dbotthepony.kvector.vector.Color

2
src/main/kotlin/ru/dbotthepony/kstarbound/util/ItemStack.kt
View File

@ -9,7 +9,7 @@ import com.google.gson.stream.JsonToken
import com.google.gson.stream.JsonWriter
import ru.dbotthepony.kstarbound.RegistryObject
import ru.dbotthepony.kstarbound.Starbound
import ru.dbotthepony.kstarbound.defs.item.IItemDefinition
import ru.dbotthepony.kstarbound.defs.item.api.IItemDefinition
class ItemStack private constructor(item: RegistryObject<IItemDefinition>?, count: Long, val parameters: JsonObject, marker: Unit) {
constructor(item: RegistryObject<IItemDefinition>, count: Long = 1L, parameters: JsonObject = JsonObject()) : this(item, count, parameters, Unit)

2
src/main/kotlin/ru/dbotthepony/kstarbound/world/entities/ItemEntity.kt
View File

@ -5,7 +5,7 @@ import ru.dbotthepony.kbox2d.api.FixtureDef
import ru.dbotthepony.kbox2d.api.Manifold
import ru.dbotthepony.kbox2d.collision.shapes.PolygonShape
import ru.dbotthepony.kbox2d.dynamics.contact.AbstractContact
import ru.dbotthepony.kstarbound.defs.item.IItemDefinition
import ru.dbotthepony.kstarbound.defs.item.api.IItemDefinition
import ru.dbotthepony.kstarbound.world.World
class ItemEntity(world: World<*, *>, val def: IItemDefinition) : Entity(world) {