From 48e1cd52635178424fb71d5bdaa4ae71cddcd40e Mon Sep 17 00:00:00 2001 From: DBotThePony Date: Sun, 13 Aug 2023 19:52:33 +0700 Subject: [PATCH] =?UTF-8?q?=D0=9A=D0=B0=D1=82=D0=B5=D0=B3=D0=BE=D1=80?= =?UTF-8?q?=D0=B8=D1=8F=20=D0=BC=D0=BE=D0=B6=D0=B5=D1=82=20=D0=B1=D1=8B?= =?UTF-8?q?=D1=82=D1=8C=20null?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../defs/item/api/IItemDefinition.kt | 2 +- .../defs/item/impl/ItemDefinition.kt | 40 +++++++++---------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/api/IItemDefinition.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/api/IItemDefinition.kt index 1a062f8a..1c293b3a 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/api/IItemDefinition.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/api/IItemDefinition.kt @@ -31,7 +31,7 @@ interface IItemDefinition : IThingWithDescription { /** * Категория предмета, определяет, в какую вкладку инвентаря оно попадает */ - val category: String + val category: String? /** * Иконка в инвентаре, относительный и абсолютный пути diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/impl/ItemDefinition.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/impl/ItemDefinition.kt index 873fc0e4..57ad5746 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/impl/ItemDefinition.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/impl/ItemDefinition.kt @@ -16,24 +16,24 @@ data class ItemDefinition( @JsonFlat val descriptionData: ThingDescription, - override var itemName: String, - override var price: Long = 0, - override var rarity: ItemRarity = ItemRarity.COMMON, - override var category: String, - override var inventoryIcon: ImmutableList? = null, - override var itemTags: ImmutableList = ImmutableList.of(), - override var learnBlueprintsOnPickup: ImmutableList> = ImmutableList.of(), - override var maxStack: Long = 9999L, - override var eventCategory: String? = null, - override var consumeOnPickup: Boolean = false, - override var pickupQuestTemplates: ImmutableList = ImmutableList.of(), - override var tooltipKind: String = "normal", - override var twoHanded: Boolean = false, - override var radioMessagesOnPickup: ImmutableList = ImmutableList.of(), - override var fuelAmount: Long = 0, - override var pickupSoundsSmall: ImmutableList = ImmutableList.of(), - override var pickupSoundsMedium: ImmutableList = ImmutableList.of(), - override var pickupSoundsLarge: ImmutableList = ImmutableList.of(), - override var smallStackLimit: Long? = null, - override var mediumStackLimit: Long? = null, + override val itemName: String, + override val price: Long = 0, + override val rarity: ItemRarity = ItemRarity.COMMON, + override val category: String? = null, + override val inventoryIcon: ImmutableList? = null, + override val itemTags: ImmutableList = ImmutableList.of(), + override val learnBlueprintsOnPickup: ImmutableList> = ImmutableList.of(), + override val maxStack: Long = 9999L, + override val eventCategory: String? = null, + override val consumeOnPickup: Boolean = false, + override val pickupQuestTemplates: ImmutableList = ImmutableList.of(), + override val tooltipKind: String = "normal", + override val twoHanded: Boolean = false, + override val radioMessagesOnPickup: ImmutableList = ImmutableList.of(), + override val fuelAmount: Long = 0, + override val pickupSoundsSmall: ImmutableList = ImmutableList.of(), + override val pickupSoundsMedium: ImmutableList = ImmutableList.of(), + override val pickupSoundsLarge: ImmutableList = ImmutableList.of(), + override val smallStackLimit: Long? = null, + override val mediumStackLimit: Long? = null, ) : IItemDefinition, IThingWithDescription by descriptionData