Add logback config, update amethyst and cobalt versions

gradle.properties

@@ -4,13 +4,13 @@ org.gradle.jvmargs=-Xmx2048M
 org.gradle.daemon=true
 
 group=org.hexworks.cavesofzircon
-version=2019.1.0-PREVIEW
+version=2019.2.0
 
-kotlin_version=1.3.11
+kotlin_version=1.3.20
 
 cobalt_version=2018.1.0-PREVIEW
-amethyst_version=2019.0.1-PREVIEW
-zircon_version=2019.0.9-PREVIEW
+amethyst_version=2019.0.2-PREVIEW
+zircon_version=2019.0.10-PREVIEW
 junit_version=4.12
 mockito_version=1.10.19
 assertj_version=3.6.2

settings.gradle

@@ -1,4 +1 @@
 rootProject.name = "caves-of-zircon"
-
-include "caves-of-zircon.java"
-include "caves-of-zircon.kotlin"

src/main/kotlin/org/hexworks/cavesofzircon/GameConfig.kt

@@ -34,6 +34,7 @@ object GameConfig {
 
     fun buildAppConfig() = AppConfigs.newConfig()
             .enableBetaFeatures()
+            .withDebugMode(false)
             .withDefaultTileset(TILESET)
             .withSize(Sizes.create(WINDOW_WIDTH, WINDOW_HEIGHT))
             .build()

src/main/kotlin/org/hexworks/cavesofzircon/attributes/types/Armor.kt

@@ -2,13 +2,13 @@ package org.hexworks.cavesofzircon.attributes.types
 
 import org.hexworks.amethyst.api.entity.Entity
 import org.hexworks.cavesofzircon.attributes.ItemCombatStats
-import org.hexworks.cavesofzircon.extensions.attribute
+import org.hexworks.cavesofzircon.extensions.findAttribute
 import org.hexworks.cavesofzircon.world.GameContext
 
 interface Armor : Item
 
 val Entity<Armor, GameContext>.attackValue: Int
-    get() = attribute<ItemCombatStats>().attackValue
+    get() = findAttribute<ItemCombatStats>().attackValue
 
 val Entity<Armor, GameContext>.defenseValue: Int
-    get() = attribute<ItemCombatStats>().defenseValue
+    get() = findAttribute<ItemCombatStats>().defenseValue

src/main/kotlin/org/hexworks/cavesofzircon/attributes/types/Combatant.kt

@@ -4,13 +4,13 @@ import org.hexworks.amethyst.api.entity.EntityType
 import org.hexworks.cavesofzircon.attributes.CombatStats
 import org.hexworks.cavesofzircon.attributes.Equipment
 import org.hexworks.cavesofzircon.extensions.GameEntity
-import org.hexworks.cavesofzircon.extensions.attribute
+import org.hexworks.cavesofzircon.extensions.findAttribute
 import org.hexworks.cobalt.datatypes.Maybe
 
 interface Combatant : EntityType
 
 val GameEntity<Combatant>.combatStats: CombatStats
-    get() = attribute()
+    get() = findAttribute()
 
 val GameEntity<Combatant>.equipment: Maybe<Equipment>
-    get() = attribute(Equipment::class)
+    get() = findAttribute(Equipment::class)

src/main/kotlin/org/hexworks/cavesofzircon/attributes/types/EntityTypes.kt

@@ -4,13 +4,13 @@ import org.hexworks.amethyst.api.base.BaseEntityType
 import org.hexworks.amethyst.api.entity.EntityType
 import org.hexworks.cavesofzircon.attributes.ZirconCounter
 import org.hexworks.cavesofzircon.extensions.GameEntity
-import org.hexworks.cavesofzircon.extensions.attribute
+import org.hexworks.cavesofzircon.extensions.findAttribute
 
 object Player : BaseEntityType(
         name = "player"), ItemHolder, ExperienceGainer
 
 val GameEntity<Player>.zirconCounter: ZirconCounter
-    get() = attribute()
+    get() = findAttribute()
 
 object StairsDown : BaseEntityType(
         name = "stairs down")

src/main/kotlin/org/hexworks/cavesofzircon/attributes/types/ExperienceGainer.kt

@@ -4,13 +4,13 @@ import org.hexworks.amethyst.api.entity.EntityType
 import org.hexworks.cavesofzircon.attributes.CombatStats
 import org.hexworks.cavesofzircon.attributes.Experience
 import org.hexworks.cavesofzircon.extensions.GameEntity
-import org.hexworks.cavesofzircon.extensions.attribute
+import org.hexworks.cavesofzircon.extensions.findAttribute
 
 interface ExperienceGainer : EntityType
 
 val GameEntity<ExperienceGainer>.experience: Experience
-    get() = attribute()
+    get() = findAttribute()
 
 val GameEntity<ExperienceGainer>.combatStats: CombatStats
-    get() = attribute()
+    get() = findAttribute()
 

src/main/kotlin/org/hexworks/cavesofzircon/attributes/types/Food.kt

@@ -2,9 +2,9 @@ package org.hexworks.cavesofzircon.attributes.types
 
 import org.hexworks.cavesofzircon.attributes.NutritionalValue
 import org.hexworks.cavesofzircon.extensions.GameEntity
-import org.hexworks.cavesofzircon.extensions.attribute
+import org.hexworks.cavesofzircon.extensions.findAttribute
 
 interface Food : Item
 
 val GameEntity<Food>.nutritionalValue: NutritionalValue
-    get() = attribute()
+    get() = findAttribute()

src/main/kotlin/org/hexworks/cavesofzircon/attributes/types/Item.kt

@@ -4,14 +4,14 @@ import org.hexworks.amethyst.api.entity.EntityType
 import org.hexworks.cavesofzircon.attributes.EntityTile
 import org.hexworks.cavesofzircon.attributes.ItemIcon
 import org.hexworks.cavesofzircon.extensions.GameEntity
-import org.hexworks.cavesofzircon.extensions.attribute
+import org.hexworks.cavesofzircon.extensions.findAttribute
 import org.hexworks.zircon.api.data.GraphicTile
 import org.hexworks.zircon.api.data.Tile
 
 interface Item : EntityType
 
 val GameEntity<Item>.tile: Tile
-    get() = attribute<EntityTile>().tile
+    get() = findAttribute<EntityTile>().tile
 
 val GameEntity<Item>.iconTile: GraphicTile
-    get() = attribute<ItemIcon>().iconTile
+    get() = findAttribute<ItemIcon>().iconTile

src/main/kotlin/org/hexworks/cavesofzircon/attributes/types/ItemHolder.kt

@@ -3,9 +3,9 @@ package org.hexworks.cavesofzircon.attributes.types
 import org.hexworks.amethyst.api.entity.EntityType
 import org.hexworks.cavesofzircon.attributes.Inventory
 import org.hexworks.cavesofzircon.extensions.GameEntity
-import org.hexworks.cavesofzircon.extensions.attribute
+import org.hexworks.cavesofzircon.extensions.findAttribute
 
 interface ItemHolder : EntityType
 
 val GameEntity<ItemHolder>.inventory: Inventory
-    get() = attribute()
+    get() = findAttribute()

src/main/kotlin/org/hexworks/cavesofzircon/attributes/types/Weapon.kt

@@ -1,15 +1,13 @@
 package org.hexworks.cavesofzircon.attributes.types
 
 import org.hexworks.cavesofzircon.attributes.ItemCombatStats
-import org.hexworks.cavesofzircon.extensions.AnyGameEntity
 import org.hexworks.cavesofzircon.extensions.GameEntity
-import org.hexworks.cavesofzircon.extensions.attribute
-import org.hexworks.cavesofzircon.extensions.hasAttribute
+import org.hexworks.cavesofzircon.extensions.findAttribute
 
 interface Weapon : Item
 
 val GameEntity<Weapon>.attackValue: Int
-    get() = attribute<ItemCombatStats>().attackValue
+    get() = findAttribute<ItemCombatStats>().attackValue
 
 val GameEntity<Weapon>.defenseValue: Int
-    get() = attribute<ItemCombatStats>().defenseValue
+    get() = findAttribute<ItemCombatStats>().defenseValue

src/main/kotlin/org/hexworks/cavesofzircon/blocks/GameBlock.kt

@@ -3,6 +3,7 @@ package org.hexworks.cavesofzircon.blocks
 import org.hexworks.amethyst.api.entity.EntityType
 import org.hexworks.cavesofzircon.builders.GameTileRepository
 import org.hexworks.cavesofzircon.extensions.*
+import org.hexworks.zircon.api.data.Block
 import org.hexworks.zircon.api.data.BlockSide
 import org.hexworks.zircon.api.data.Tile
 import org.hexworks.zircon.api.data.base.BlockBase
@@ -59,6 +60,14 @@ class GameBlock private constructor(private var defaultTile: Tile = GameTileRepo
         return GameTileRepository.EMPTY
     }
 
+    override fun createCopy(): Block<Tile> {
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    }
+
+    override fun setSide(side: BlockSide, tile: Tile) {
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    }
+
     companion object {
 
         fun create(): GameBlock = GameBlock()

src/main/kotlin/org/hexworks/cavesofzircon/extensions/EntityExtensions.kt

@@ -19,17 +19,17 @@ import kotlin.reflect.full.isSubclassOf
 import kotlin.reflect.full.isSuperclassOf
 
 var AnyGameEntity.position
-    get() = attribute(EntityPosition::class).orElseThrow {
+    get() = findAttribute(EntityPosition::class).orElseThrow {
         IllegalArgumentException("This Entity has no EntityPosition")
     }.position
     set(value) {
-        attribute(EntityPosition::class).map {
+        findAttribute(EntityPosition::class).map {
             it.position = value
         }
     }
 
 val AnyGameEntity.tile: Tile
-    get() = this.attribute<EntityTile>().tile
+    get() = this.findAttribute<EntityTile>().tile
 
 val AnyGameEntity.occupiesBlock: Boolean
     get() = hasAttribute<BlockOccupier>()
@@ -52,13 +52,13 @@ val AnyGameEntity.isExit: Boolean
 val AnyGameEntity.isStairsDown: Boolean
     get() = this.type is StairsDown
 
-inline fun <reified T : Attribute> AnyGameEntity.attribute(): T = attribute(T::class).orElseThrow {
+inline fun <reified T : Attribute> AnyGameEntity.findAttribute(): T = findAttribute(T::class).orElseThrow {
     NoSuchElementException("Entity '$this' has no property with type '${T::class.simpleName}'.")
 }
 
-inline fun <reified T : Attribute> AnyGameEntity.hasAttribute() = attribute(T::class).isPresent
+inline fun <reified T : Attribute> AnyGameEntity.hasAttribute() = findAttribute(T::class).isPresent
 
-inline fun <reified T : Attribute> AnyGameEntity.whenHasAttribute(crossinline fn: (T) -> Unit) = attribute(T::class).map(fn)
+inline fun <reified T : Attribute> AnyGameEntity.whenHasAttribute(crossinline fn: (T) -> Unit) = findAttribute(T::class).map(fn)
 
 @Suppress("UNCHECKED_CAST")
 inline fun <reified T : EntityType> Iterable<AnyGameEntity>.filterType(): List<Entity<T, GameContext>> {
@@ -69,11 +69,11 @@ fun AnyGameEntity.hasPosition() = position.isUnknown().not()
 
 @Suppress("UNCHECKED_CAST")
 inline fun <reified T : Attribute> AnyGameEntity.attributesOfType(): List<T> {
-    return fetchAttributes().filter { T::class.isSuperclassOf(it::class) }.toList() as List<T>
+    return attributes.filter { T::class.isSuperclassOf(it::class) }.toList() as List<T>
 }
 
 fun AnyGameEntity.tryActionsOn(context: GameContext, target: AnyGameEntity) {
-    attribute<EntityActions>()
+    findAttribute<EntityActions>()
             .createActionsFor(context, this, target)
             .forEach { action ->
                 if (target.executeCommand(action) is Consumed) {

src/main/kotlin/org/hexworks/cavesofzircon/extensions/PlayerExtensions.kt

@@ -5,7 +5,7 @@ import org.hexworks.cavesofzircon.attributes.Hunger
 import org.hexworks.cavesofzircon.attributes.types.Player
 
 val GameEntity<Player>.hunger: Hunger
-    get() = attribute()
+    get() = findAttribute()
 
 val GameEntity<Player>.equipment: Equipment
-    get() = attribute()
+    get() = findAttribute()

src/main/kotlin/org/hexworks/cavesofzircon/systems/DigestiveSystem.kt

@@ -15,12 +15,13 @@ import org.hexworks.cavesofzircon.world.GameContext
 object DigestiveSystem : BaseActor<GameContext>(Hunger::class) {
 
     override fun executeCommand(command: GameCommand<out EntityType>): Response {
+        @Suppress("VARIABLE_WITH_REDUNDANT_INITIALIZER")
         var response: Response = command.responseWhenCommandIs<Eat> { (_, entity, food) ->
-            entity.attribute<Hunger>().currentValue += food.nutritionalValue.value
+            entity.findAttribute<Hunger>().currentValue += food.nutritionalValue.value
             Consumed
         }
         response = command.responseWhenCommandIs<Exert> { (context, entity, force) ->
-            val hunger = entity.attribute<Hunger>()
+            val hunger = entity.findAttribute<Hunger>()
             hunger.currentValue -= force
             checkStarvation(context, entity, hunger)
             Consumed
@@ -29,7 +30,7 @@ object DigestiveSystem : BaseActor<GameContext>(Hunger::class) {
     }
 
     override fun update(entity: GameEntity<out EntityType>, context: GameContext): Boolean {
-        val hunger = entity.attribute<Hunger>()
+        val hunger = entity.findAttribute<Hunger>()
         hunger.currentValue -= 2
         checkStarvation(context, entity, hunger)
         return true

src/main/kotlin/org/hexworks/cavesofzircon/systems/FungusGrower.kt

@@ -5,7 +5,7 @@ import org.hexworks.amethyst.api.entity.EntityType
 import org.hexworks.cavesofzircon.attributes.FungusSpread
 import org.hexworks.cavesofzircon.builders.EntityFactory
 import org.hexworks.cavesofzircon.extensions.GameEntity
-import org.hexworks.cavesofzircon.extensions.attribute
+import org.hexworks.cavesofzircon.extensions.findAttribute
 import org.hexworks.cavesofzircon.extensions.position
 import org.hexworks.cavesofzircon.world.GameContext
 import org.hexworks.cobalt.datatypes.extensions.map
@@ -15,7 +15,7 @@ object FungusGrower : BaseBehavior<GameContext>(FungusSpread::class) {
 
     override fun update(entity: GameEntity<out EntityType>, context: GameContext): Boolean {
         val world = context.world
-        val fungusSpread = entity.attribute<FungusSpread>()
+        val fungusSpread = entity.findAttribute<FungusSpread>()
         val (spreadcount) = fungusSpread
         return if (spreadcount < 4 && Math.random() < 0.015) {
             val spreadSize = Sizes.create(

src/main/kotlin/org/hexworks/cavesofzircon/systems/PlayerInputHandler.kt

@@ -67,6 +67,7 @@ object PlayerInputHandler : BaseBehavior<GameContext>() {
                             .firstOrNull { entity ->
                                 entity.hasInventory()
                             }?.let { lootable ->
+                                @Suppress("UNCHECKED_CAST")
                                 openLootDialog(context, player, lootable as GameEntity<ItemHolder>)
                             }
                 }

src/main/kotlin/org/hexworks/cavesofzircon/view/dialog/InventoryDialog.kt

@@ -4,7 +4,7 @@ import org.hexworks.cavesofzircon.attributes.Inventory
 import org.hexworks.cavesofzircon.attributes.types.Food
 import org.hexworks.cavesofzircon.commands.DropItem
 import org.hexworks.cavesofzircon.commands.Eat
-import org.hexworks.cavesofzircon.extensions.attribute
+import org.hexworks.cavesofzircon.extensions.findAttribute
 import org.hexworks.cavesofzircon.extensions.position
 import org.hexworks.cavesofzircon.extensions.whenTypeIs
 import org.hexworks.cavesofzircon.view.fragment.ItemInfoFragment
@@ -28,7 +28,7 @@ class InventoryDialog(context: GameContext) : Dialog(context.screen) {
             .build().also { inventoryPanel ->
                 val player = context.player
                 val playerPosition = player.position
-                val inventory = player.attribute<Inventory>()
+                val inventory = player.findAttribute<Inventory>()
                 val itemListFragment = ItemListFragment(inventory, 20)
                 inventoryPanel.addFragment(itemListFragment)
                 inventoryPanel.addFragment(ItemInfoFragment(

src/main/kotlin/org/hexworks/cavesofzircon/view/dialog/LevelUpDialog.kt

@@ -4,7 +4,7 @@ import org.hexworks.amethyst.api.entity.EntityType
 import org.hexworks.cavesofzircon.attributes.CombatStats
 import org.hexworks.cavesofzircon.attributes.VisionAttributes
 import org.hexworks.cavesofzircon.extensions.GameEntity
-import org.hexworks.cavesofzircon.extensions.attribute
+import org.hexworks.cavesofzircon.extensions.findAttribute
 import org.hexworks.cavesofzircon.extensions.logGameEvent
 import org.hexworks.zircon.api.Components
 import org.hexworks.zircon.api.graphics.BoxType
@@ -26,8 +26,8 @@ class LevelUpDialog(screen: Screen, player: GameEntity<EntityType>) : Dialog(scr
                         .addHeader("Congratulations, you levelled up!")
                         .addParagraph("Pick an improvement from the options below:"))
 
-                val stats = player.attribute<CombatStats>()
-                val vision = player.attribute<VisionAttributes>()
+                val stats = player.findAttribute<CombatStats>()
+                val vision = player.findAttribute<VisionAttributes>()
 
                 modalPanel.addComponent(Components.button()
                         .withText("Max HP")

src/main/resources/logback.xml

@@ -0,0 +1,16 @@
+<configuration>
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <root level="debug">
+        <appender-ref ref="STDOUT" />
+    </root>
+
+    <logger name="org.hexworks.cobalt" level="INFO" />
+    <logger name="org.hexworks.amethyst" level="INFO" />
+    <logger name="org.hexworks.cavesofzircon" level="INFO" />
+
+</configuration>