From b67935513a445fbe00fa5493147a7571446f0ec1 Mon Sep 17 00:00:00 2001 From: LimePotato Date: Sun, 29 Oct 2023 13:22:39 -0600 Subject: [PATCH] Config & Refactor --- build.gradle.kts | 4 ---- .../potrogue/builders/EntityFactory.kt | 12 ++++++------ .../potrogue/{ => data}/config/Config.kt | 19 +++++++++++++------ .../potrogue/{ => data/config}/GameConfig.kt | 6 ++++-- .../{ => entity}/attributes/EntityPosition.kt | 2 +- .../{ => entity}/attributes/EntityTile.kt | 2 +- .../{ => entity}/attributes/types/Player.kt | 2 +- .../{ => entity}/messages/MoveCamera.kt | 2 +- .../potrogue/{ => entity}/messages/MoveTo.kt | 2 +- .../{ => entity}/systems/CameraMover.kt | 4 ++-- .../{ => entity}/systems/InputReceiver.kt | 4 ++-- .../potrogue/{ => entity}/systems/Movable.kt | 12 ++++++------ .../potrogue/extensions/TypeAliases.kt | 6 +++--- .../kotlin/group/ouroboros/potrogue/main.kt | 4 ++-- .../ouroboros/potrogue/view/ConfigView.kt | 2 +- .../group/ouroboros/potrogue/view/LoseView.kt | 2 +- .../ouroboros/potrogue/view/PauseView.kt | 2 +- .../group/ouroboros/potrogue/view/PlayView.kt | 10 +++++----- .../ouroboros/potrogue/view/StartView.kt | 2 +- .../group/ouroboros/potrogue/view/WinView.kt | 3 +-- .../group/ouroboros/potrogue/world/Game.kt | 2 +- .../ouroboros/potrogue/world/GameBuilder.kt | 14 +++++++------- .../ouroboros/potrogue/world/GameContext.kt | 2 +- src/test/kotlin/Test.kt | 10 ---------- 24 files changed, 62 insertions(+), 68 deletions(-) rename src/main/kotlin/group/ouroboros/potrogue/{ => data}/config/Config.kt (69%) rename src/main/kotlin/group/ouroboros/potrogue/{ => data/config}/GameConfig.kt (90%) rename src/main/kotlin/group/ouroboros/potrogue/{ => entity}/attributes/EntityPosition.kt (96%) rename src/main/kotlin/group/ouroboros/potrogue/{ => entity}/attributes/EntityTile.kt (83%) rename src/main/kotlin/group/ouroboros/potrogue/{ => entity}/attributes/types/Player.kt (65%) rename src/main/kotlin/group/ouroboros/potrogue/{ => entity}/messages/MoveCamera.kt (89%) rename src/main/kotlin/group/ouroboros/potrogue/{ => entity}/messages/MoveTo.kt (89%) rename src/main/kotlin/group/ouroboros/potrogue/{ => entity}/systems/CameraMover.kt (94%) rename src/main/kotlin/group/ouroboros/potrogue/{ => entity}/systems/InputReceiver.kt (95%) rename src/main/kotlin/group/ouroboros/potrogue/{ => entity}/systems/Movable.kt (92%) delete mode 100644 src/test/kotlin/Test.kt diff --git a/build.gradle.kts b/build.gradle.kts index 2df28e7..03d7ec8 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -36,10 +36,6 @@ dependencies { implementation(kotlin("stdlib-jdk8")) - testImplementation("junit:junit:$junit_version") - testImplementation("org.mockito:mockito-all:$mockito_version") - testImplementation("org.assertj:assertj-core:$assertj_version") - implementation("org.freedesktop:xdg-java:0.0.1-SNAPSHOT@jar") implementation("org.assertj:assertj-core:3.6.2") } diff --git a/src/main/kotlin/group/ouroboros/potrogue/builders/EntityFactory.kt b/src/main/kotlin/group/ouroboros/potrogue/builders/EntityFactory.kt index 4e2c20b..bfea7ba 100644 --- a/src/main/kotlin/group/ouroboros/potrogue/builders/EntityFactory.kt +++ b/src/main/kotlin/group/ouroboros/potrogue/builders/EntityFactory.kt @@ -1,11 +1,11 @@ package group.ouroboros.potrogue.builders -import group.ouroboros.potrogue.attributes.EntityPosition -import group.ouroboros.potrogue.attributes.EntityTile -import group.ouroboros.potrogue.attributes.types.Player -import group.ouroboros.potrogue.systems.CameraMover -import group.ouroboros.potrogue.systems.InputReceiver -import group.ouroboros.potrogue.systems.Movable +import group.ouroboros.potrogue.entity.attributes.EntityPosition +import group.ouroboros.potrogue.entity.attributes.EntityTile +import group.ouroboros.potrogue.entity.attributes.types.Player +import group.ouroboros.potrogue.entity.systems.CameraMover +import group.ouroboros.potrogue.entity.systems.InputReceiver +import group.ouroboros.potrogue.entity.systems.Movable import group.ouroboros.potrogue.world.GameContext import org.hexworks.amethyst.api.builder.EntityBuilder import org.hexworks.amethyst.api.entity.EntityType diff --git a/src/main/kotlin/group/ouroboros/potrogue/config/Config.kt b/src/main/kotlin/group/ouroboros/potrogue/data/config/Config.kt similarity index 69% rename from src/main/kotlin/group/ouroboros/potrogue/config/Config.kt rename to src/main/kotlin/group/ouroboros/potrogue/data/config/Config.kt index d2a580e..8a5fdef 100644 --- a/src/main/kotlin/group/ouroboros/potrogue/config/Config.kt +++ b/src/main/kotlin/group/ouroboros/potrogue/data/config/Config.kt @@ -1,4 +1,4 @@ -package group.ouroboros.potrogue.config +package group.ouroboros.potrogue.data.config import java.io.File import java.io.FileInputStream @@ -9,13 +9,17 @@ import java.nio.file.Path import java.nio.file.Paths import java.util.* +val file = File("./run/conf.properties") +val prop = Properties() + +//init values +public val winW = prop.getProperty("winWidth") +//public val WINDOW_WIDTH = winW.toInt() + class Config { + var fileExists = file.exists() init { //Config Stage - val file = File("./run/conf.properties") - val prop = Properties() - var fileExists = file.exists() - if(fileExists){ FileInputStream(file).use { prop.load(it) } } @@ -27,7 +31,8 @@ class Config { FileInputStream(file).use { prop.load(it) - prop.setProperty("myKey", "myValue") + prop.setProperty("winWidth", "80") + prop.setProperty("WINDOW_HEIGHT", "50") val out: OutputStream = FileOutputStream(file) prop.store(out, "some comment") @@ -38,4 +43,6 @@ class Config { .associateWith {prop.getProperty(it)} .forEach { println(it) } } + + val winW = prop.getProperty("winWidth") } \ No newline at end of file diff --git a/src/main/kotlin/group/ouroboros/potrogue/GameConfig.kt b/src/main/kotlin/group/ouroboros/potrogue/data/config/GameConfig.kt similarity index 90% rename from src/main/kotlin/group/ouroboros/potrogue/GameConfig.kt rename to src/main/kotlin/group/ouroboros/potrogue/data/config/GameConfig.kt index 0158241..2456db9 100644 --- a/src/main/kotlin/group/ouroboros/potrogue/GameConfig.kt +++ b/src/main/kotlin/group/ouroboros/potrogue/data/config/GameConfig.kt @@ -1,5 +1,7 @@ -package group.ouroboros.potrogue +package group.ouroboros.potrogue.data.config +import group.ouroboros.potrogue.GAME_ID +import group.ouroboros.potrogue.GAME_VER import org.hexworks.zircon.api.CP437TilesetResources import org.hexworks.zircon.api.ColorThemes import org.hexworks.zircon.api.application.AppConfig @@ -37,4 +39,4 @@ object GameConfig { .build() //TODO: Replace most of this with a json/yaml/whatever config file for the user to be able to edit. -} \ No newline at end of file +} diff --git a/src/main/kotlin/group/ouroboros/potrogue/attributes/EntityPosition.kt b/src/main/kotlin/group/ouroboros/potrogue/entity/attributes/EntityPosition.kt similarity index 96% rename from src/main/kotlin/group/ouroboros/potrogue/attributes/EntityPosition.kt rename to src/main/kotlin/group/ouroboros/potrogue/entity/attributes/EntityPosition.kt index 9c71857..3b1a4a7 100644 --- a/src/main/kotlin/group/ouroboros/potrogue/attributes/EntityPosition.kt +++ b/src/main/kotlin/group/ouroboros/potrogue/entity/attributes/EntityPosition.kt @@ -1,4 +1,4 @@ -package group.ouroboros.potrogue.attributes +package group.ouroboros.potrogue.entity.attributes import org.hexworks.amethyst.api.base.BaseAttribute import org.hexworks.cobalt.databinding.api.extension.toProperty diff --git a/src/main/kotlin/group/ouroboros/potrogue/attributes/EntityTile.kt b/src/main/kotlin/group/ouroboros/potrogue/entity/attributes/EntityTile.kt similarity index 83% rename from src/main/kotlin/group/ouroboros/potrogue/attributes/EntityTile.kt rename to src/main/kotlin/group/ouroboros/potrogue/entity/attributes/EntityTile.kt index c48eeb6..046a147 100644 --- a/src/main/kotlin/group/ouroboros/potrogue/attributes/EntityTile.kt +++ b/src/main/kotlin/group/ouroboros/potrogue/entity/attributes/EntityTile.kt @@ -1,4 +1,4 @@ -package group.ouroboros.potrogue.attributes +package group.ouroboros.potrogue.entity.attributes import org.hexworks.amethyst.api.base.BaseAttribute import org.hexworks.zircon.api.data.Tile diff --git a/src/main/kotlin/group/ouroboros/potrogue/attributes/types/Player.kt b/src/main/kotlin/group/ouroboros/potrogue/entity/attributes/types/Player.kt similarity index 65% rename from src/main/kotlin/group/ouroboros/potrogue/attributes/types/Player.kt rename to src/main/kotlin/group/ouroboros/potrogue/entity/attributes/types/Player.kt index b25ebf9..4906c04 100644 --- a/src/main/kotlin/group/ouroboros/potrogue/attributes/types/Player.kt +++ b/src/main/kotlin/group/ouroboros/potrogue/entity/attributes/types/Player.kt @@ -1,4 +1,4 @@ -package group.ouroboros.potrogue.attributes.types +package group.ouroboros.potrogue.entity.attributes.types import org.hexworks.amethyst.api.base.BaseEntityType diff --git a/src/main/kotlin/group/ouroboros/potrogue/messages/MoveCamera.kt b/src/main/kotlin/group/ouroboros/potrogue/entity/messages/MoveCamera.kt similarity index 89% rename from src/main/kotlin/group/ouroboros/potrogue/messages/MoveCamera.kt rename to src/main/kotlin/group/ouroboros/potrogue/entity/messages/MoveCamera.kt index 93192a3..cd283ad 100644 --- a/src/main/kotlin/group/ouroboros/potrogue/messages/MoveCamera.kt +++ b/src/main/kotlin/group/ouroboros/potrogue/entity/messages/MoveCamera.kt @@ -1,4 +1,4 @@ -package group.ouroboros.potrogue.messages +package group.ouroboros.potrogue.entity.messages import group.ouroboros.potrogue.extensions.GameEntity import group.ouroboros.potrogue.extensions.GameMessage diff --git a/src/main/kotlin/group/ouroboros/potrogue/messages/MoveTo.kt b/src/main/kotlin/group/ouroboros/potrogue/entity/messages/MoveTo.kt similarity index 89% rename from src/main/kotlin/group/ouroboros/potrogue/messages/MoveTo.kt rename to src/main/kotlin/group/ouroboros/potrogue/entity/messages/MoveTo.kt index 66b1130..4dd765d 100644 --- a/src/main/kotlin/group/ouroboros/potrogue/messages/MoveTo.kt +++ b/src/main/kotlin/group/ouroboros/potrogue/entity/messages/MoveTo.kt @@ -1,4 +1,4 @@ -package group.ouroboros.potrogue.messages +package group.ouroboros.potrogue.entity.messages import group.ouroboros.potrogue.extensions.GameEntity import group.ouroboros.potrogue.extensions.GameMessage diff --git a/src/main/kotlin/group/ouroboros/potrogue/systems/CameraMover.kt b/src/main/kotlin/group/ouroboros/potrogue/entity/systems/CameraMover.kt similarity index 94% rename from src/main/kotlin/group/ouroboros/potrogue/systems/CameraMover.kt rename to src/main/kotlin/group/ouroboros/potrogue/entity/systems/CameraMover.kt index c428668..b78bc8e 100644 --- a/src/main/kotlin/group/ouroboros/potrogue/systems/CameraMover.kt +++ b/src/main/kotlin/group/ouroboros/potrogue/entity/systems/CameraMover.kt @@ -1,7 +1,7 @@ -package group.ouroboros.potrogue.systems +package group.ouroboros.potrogue.entity.systems +import group.ouroboros.potrogue.entity.messages.MoveCamera import group.ouroboros.potrogue.extensions.position -import group.ouroboros.potrogue.messages.MoveCamera import group.ouroboros.potrogue.world.GameContext import org.hexworks.amethyst.api.Consumed import org.hexworks.amethyst.api.Response diff --git a/src/main/kotlin/group/ouroboros/potrogue/systems/InputReceiver.kt b/src/main/kotlin/group/ouroboros/potrogue/entity/systems/InputReceiver.kt similarity index 95% rename from src/main/kotlin/group/ouroboros/potrogue/systems/InputReceiver.kt rename to src/main/kotlin/group/ouroboros/potrogue/entity/systems/InputReceiver.kt index bb895ef..ed08940 100644 --- a/src/main/kotlin/group/ouroboros/potrogue/systems/InputReceiver.kt +++ b/src/main/kotlin/group/ouroboros/potrogue/entity/systems/InputReceiver.kt @@ -1,7 +1,7 @@ -package group.ouroboros.potrogue.systems +package group.ouroboros.potrogue.entity.systems +import group.ouroboros.potrogue.entity.messages.MoveTo import group.ouroboros.potrogue.extensions.position -import group.ouroboros.potrogue.messages.MoveTo import group.ouroboros.potrogue.world.GameContext import org.hexworks.amethyst.api.base.BaseBehavior import org.hexworks.amethyst.api.entity.Entity diff --git a/src/main/kotlin/group/ouroboros/potrogue/systems/Movable.kt b/src/main/kotlin/group/ouroboros/potrogue/entity/systems/Movable.kt similarity index 92% rename from src/main/kotlin/group/ouroboros/potrogue/systems/Movable.kt rename to src/main/kotlin/group/ouroboros/potrogue/entity/systems/Movable.kt index 9d1cd37..fd3ef63 100644 --- a/src/main/kotlin/group/ouroboros/potrogue/systems/Movable.kt +++ b/src/main/kotlin/group/ouroboros/potrogue/entity/systems/Movable.kt @@ -1,15 +1,15 @@ -package group.ouroboros.potrogue.systems +package group.ouroboros.potrogue.entity.systems -import group.ouroboros.potrogue.messages.MoveTo +import group.ouroboros.potrogue.entity.attributes.types.Player +import group.ouroboros.potrogue.entity.messages.MoveCamera +import group.ouroboros.potrogue.entity.messages.MoveTo +import group.ouroboros.potrogue.extensions.position import group.ouroboros.potrogue.world.GameContext import org.hexworks.amethyst.api.Consumed +import org.hexworks.amethyst.api.MessageResponse import org.hexworks.amethyst.api.Pass import org.hexworks.amethyst.api.Response import org.hexworks.amethyst.api.base.BaseFacet -import group.ouroboros.potrogue.attributes.types.Player -import group.ouroboros.potrogue.extensions.position -import group.ouroboros.potrogue.messages.MoveCamera -import org.hexworks.amethyst.api.MessageResponse /* * Hey, what’s Pass and Consumed? diff --git a/src/main/kotlin/group/ouroboros/potrogue/extensions/TypeAliases.kt b/src/main/kotlin/group/ouroboros/potrogue/extensions/TypeAliases.kt index 3d18d32..85feca1 100644 --- a/src/main/kotlin/group/ouroboros/potrogue/extensions/TypeAliases.kt +++ b/src/main/kotlin/group/ouroboros/potrogue/extensions/TypeAliases.kt @@ -1,14 +1,14 @@ package group.ouroboros.potrogue.extensions -import group.ouroboros.potrogue.attributes.EntityPosition -import group.ouroboros.potrogue.attributes.EntityTile +import group.ouroboros.potrogue.entity.attributes.EntityPosition +import group.ouroboros.potrogue.entity.attributes.EntityTile import group.ouroboros.potrogue.world.GameContext import org.hexworks.amethyst.api.Attribute +import org.hexworks.amethyst.api.Message import org.hexworks.amethyst.api.entity.Entity import org.hexworks.amethyst.api.entity.EntityType import org.hexworks.zircon.api.data.Tile import kotlin.reflect.KClass -import org.hexworks.amethyst.api.Message typealias AnyGameEntity = GameEntity typealias GameEntity = Entity diff --git a/src/main/kotlin/group/ouroboros/potrogue/main.kt b/src/main/kotlin/group/ouroboros/potrogue/main.kt index 86e6615..a4a4b77 100644 --- a/src/main/kotlin/group/ouroboros/potrogue/main.kt +++ b/src/main/kotlin/group/ouroboros/potrogue/main.kt @@ -1,6 +1,7 @@ package group.ouroboros.potrogue -import group.ouroboros.potrogue.config.Config +import group.ouroboros.potrogue.data.config.Config +import group.ouroboros.potrogue.data.config.GameConfig import group.ouroboros.potrogue.view.StartView import org.hexworks.zircon.api.SwingApplications @@ -8,7 +9,6 @@ import org.hexworks.zircon.api.SwingApplications const val GAME_ID = "PotRogue"; const val GAME_VER = "0.1.0-DEV"; - fun main(args: Array) { Config() //Start Application diff --git a/src/main/kotlin/group/ouroboros/potrogue/view/ConfigView.kt b/src/main/kotlin/group/ouroboros/potrogue/view/ConfigView.kt index 53d7185..d44a576 100644 --- a/src/main/kotlin/group/ouroboros/potrogue/view/ConfigView.kt +++ b/src/main/kotlin/group/ouroboros/potrogue/view/ConfigView.kt @@ -1,6 +1,6 @@ package group.ouroboros.potrogue.view -import group.ouroboros.potrogue.GameConfig +import group.ouroboros.potrogue.data.config.GameConfig import org.hexworks.zircon.api.ComponentDecorations import org.hexworks.zircon.api.Components import org.hexworks.zircon.api.component.ColorTheme diff --git a/src/main/kotlin/group/ouroboros/potrogue/view/LoseView.kt b/src/main/kotlin/group/ouroboros/potrogue/view/LoseView.kt index f34c7b3..0641e34 100644 --- a/src/main/kotlin/group/ouroboros/potrogue/view/LoseView.kt +++ b/src/main/kotlin/group/ouroboros/potrogue/view/LoseView.kt @@ -1,7 +1,7 @@ package group.ouroboros.potrogue.view -import group.ouroboros.potrogue.GameConfig +import group.ouroboros.potrogue.data.config.GameConfig import org.hexworks.zircon.api.ComponentDecorations.box import org.hexworks.zircon.api.Components import org.hexworks.zircon.api.component.ColorTheme diff --git a/src/main/kotlin/group/ouroboros/potrogue/view/PauseView.kt b/src/main/kotlin/group/ouroboros/potrogue/view/PauseView.kt index fc719ad..9cda93c 100644 --- a/src/main/kotlin/group/ouroboros/potrogue/view/PauseView.kt +++ b/src/main/kotlin/group/ouroboros/potrogue/view/PauseView.kt @@ -1,6 +1,6 @@ package group.ouroboros.potrogue.view -import group.ouroboros.potrogue.GameConfig +import group.ouroboros.potrogue.data.config.GameConfig import org.hexworks.zircon.api.ComponentDecorations import org.hexworks.zircon.api.Components import org.hexworks.zircon.api.component.ColorTheme diff --git a/src/main/kotlin/group/ouroboros/potrogue/view/PlayView.kt b/src/main/kotlin/group/ouroboros/potrogue/view/PlayView.kt index d91e033..d2098f3 100644 --- a/src/main/kotlin/group/ouroboros/potrogue/view/PlayView.kt +++ b/src/main/kotlin/group/ouroboros/potrogue/view/PlayView.kt @@ -1,9 +1,9 @@ package group.ouroboros.potrogue.view -import group.ouroboros.potrogue.GameConfig -import group.ouroboros.potrogue.GameConfig.LOG_AREA_HEIGHT -import group.ouroboros.potrogue.GameConfig.WINDOW_WIDTH import group.ouroboros.potrogue.builders.GameTileRepository +import group.ouroboros.potrogue.data.config.GameConfig +import group.ouroboros.potrogue.data.config.GameConfig.LOG_AREA_HEIGHT +import group.ouroboros.potrogue.data.config.GameConfig.WINDOW_WIDTH import group.ouroboros.potrogue.world.Game import group.ouroboros.potrogue.world.GameBuilder import org.hexworks.cobalt.databinding.api.extension.toProperty @@ -13,10 +13,10 @@ import org.hexworks.zircon.api.component.ColorTheme import org.hexworks.zircon.api.component.ComponentAlignment import org.hexworks.zircon.api.game.ProjectionMode import org.hexworks.zircon.api.grid.TileGrid -import org.hexworks.zircon.api.view.base.BaseView -import org.hexworks.zircon.internal.game.impl.GameAreaComponentRenderer import org.hexworks.zircon.api.uievent.KeyboardEventType import org.hexworks.zircon.api.uievent.Processed +import org.hexworks.zircon.api.view.base.BaseView +import org.hexworks.zircon.internal.game.impl.GameAreaComponentRenderer class PlayView (private val grid: TileGrid, private val game: Game = GameBuilder.create(), theme: ColorTheme = GameConfig.THEME) : BaseView(grid, theme) { diff --git a/src/main/kotlin/group/ouroboros/potrogue/view/StartView.kt b/src/main/kotlin/group/ouroboros/potrogue/view/StartView.kt index 87a87cd..7b3a256 100644 --- a/src/main/kotlin/group/ouroboros/potrogue/view/StartView.kt +++ b/src/main/kotlin/group/ouroboros/potrogue/view/StartView.kt @@ -1,7 +1,7 @@ package group.ouroboros.potrogue.view import group.ouroboros.potrogue.GAME_ID -import group.ouroboros.potrogue.GameConfig +import group.ouroboros.potrogue.data.config.GameConfig import org.hexworks.zircon.api.ComponentDecorations.box import org.hexworks.zircon.api.ComponentDecorations.shadow import org.hexworks.zircon.api.Components diff --git a/src/main/kotlin/group/ouroboros/potrogue/view/WinView.kt b/src/main/kotlin/group/ouroboros/potrogue/view/WinView.kt index 9f7ed89..ce10ab0 100644 --- a/src/main/kotlin/group/ouroboros/potrogue/view/WinView.kt +++ b/src/main/kotlin/group/ouroboros/potrogue/view/WinView.kt @@ -1,7 +1,6 @@ package group.ouroboros.potrogue.view -import group.ouroboros.potrogue.GameConfig -import org.hexworks.zircon.api.ColorThemes +import group.ouroboros.potrogue.data.config.GameConfig import org.hexworks.zircon.api.ComponentDecorations.box import org.hexworks.zircon.api.Components import org.hexworks.zircon.api.component.ColorTheme diff --git a/src/main/kotlin/group/ouroboros/potrogue/world/Game.kt b/src/main/kotlin/group/ouroboros/potrogue/world/Game.kt index c137acd..e8b0111 100644 --- a/src/main/kotlin/group/ouroboros/potrogue/world/Game.kt +++ b/src/main/kotlin/group/ouroboros/potrogue/world/Game.kt @@ -1,6 +1,6 @@ package group.ouroboros.potrogue.world -import group.ouroboros.potrogue.attributes.types.Player +import group.ouroboros.potrogue.entity.attributes.types.Player import group.ouroboros.potrogue.extensions.GameEntity /* diff --git a/src/main/kotlin/group/ouroboros/potrogue/world/GameBuilder.kt b/src/main/kotlin/group/ouroboros/potrogue/world/GameBuilder.kt index 1ea1f50..553fed7 100644 --- a/src/main/kotlin/group/ouroboros/potrogue/world/GameBuilder.kt +++ b/src/main/kotlin/group/ouroboros/potrogue/world/GameBuilder.kt @@ -1,14 +1,14 @@ package group.ouroboros.potrogue.world -import group.ouroboros.potrogue.GameConfig -import group.ouroboros.potrogue.GameConfig.LOG_AREA_HEIGHT -import group.ouroboros.potrogue.GameConfig.SIDEBAR_WIDTH -import group.ouroboros.potrogue.GameConfig.WINDOW_HEIGHT -import group.ouroboros.potrogue.GameConfig.WINDOW_WIDTH -import group.ouroboros.potrogue.GameConfig.WORLD_SIZE -import group.ouroboros.potrogue.attributes.types.Player import group.ouroboros.potrogue.builders.EntityFactory import group.ouroboros.potrogue.builders.WorldBuilder +import group.ouroboros.potrogue.data.config.GameConfig +import group.ouroboros.potrogue.data.config.GameConfig.LOG_AREA_HEIGHT +import group.ouroboros.potrogue.data.config.GameConfig.SIDEBAR_WIDTH +import group.ouroboros.potrogue.data.config.GameConfig.WINDOW_HEIGHT +import group.ouroboros.potrogue.data.config.GameConfig.WINDOW_WIDTH +import group.ouroboros.potrogue.data.config.GameConfig.WORLD_SIZE +import group.ouroboros.potrogue.entity.attributes.types.Player import group.ouroboros.potrogue.extensions.GameEntity import org.hexworks.zircon.api.data.Position3D import org.hexworks.zircon.api.data.Size3D diff --git a/src/main/kotlin/group/ouroboros/potrogue/world/GameContext.kt b/src/main/kotlin/group/ouroboros/potrogue/world/GameContext.kt index fbeb130..a722c4a 100644 --- a/src/main/kotlin/group/ouroboros/potrogue/world/GameContext.kt +++ b/src/main/kotlin/group/ouroboros/potrogue/world/GameContext.kt @@ -1,10 +1,10 @@ package group.ouroboros.potrogue.world +import group.ouroboros.potrogue.entity.attributes.types.Player import group.ouroboros.potrogue.extensions.GameEntity import org.hexworks.amethyst.api.Context import org.hexworks.zircon.api.screen.Screen import org.hexworks.zircon.api.uievent.UIEvent -import group.ouroboros.potrogue.attributes.types.Player data class GameContext( // The world itself diff --git a/src/test/kotlin/Test.kt b/src/test/kotlin/Test.kt deleted file mode 100644 index a1f6446..0000000 --- a/src/test/kotlin/Test.kt +++ /dev/null @@ -1,10 +0,0 @@ -import org.assertj.core.api.Assertions -import org.junit.Test - -class Test { - - @Test - fun test() { - Assertions.assertThat("this").isNotEqualTo("that") - } -}