From 413603de6fef042143c1ff4e906158b41f7b8c2a Mon Sep 17 00:00:00 2001 From: Song Minjae Date: Wed, 26 Oct 2016 00:37:49 +0900 Subject: [PATCH] fixed wrong package, fixed wrong creation date Former-commit-id: 8a2a91a5252347b5184f62ec0f7009292fbb01bb Former-commit-id: b31eaddf7596c8393c9a032e8897ef3f1a8234fd --- src/net/torvald/terrarum/StateInGame.kt | 2 +- src/net/torvald/terrarum/gameactors/Actor.kt | 2 +- src/net/torvald/terrarum/gameactors/ActorWithBody.kt | 2 +- src/net/torvald/terrarum/gameactors/AnyPlayer.kt | 2 +- src/net/torvald/terrarum/gameactors/CanBeAnItem.kt | 2 +- src/net/torvald/terrarum/gameactors/Controllable.kt | 2 +- src/net/torvald/terrarum/gameactors/CreatureBuilder.kt | 2 +- src/net/torvald/terrarum/gameactors/CreatureRawInjector.kt | 2 +- src/net/torvald/terrarum/gameactors/Factionable.kt | 2 +- src/net/torvald/terrarum/gameactors/HumanoidNPC.kt | 4 ++-- src/net/torvald/terrarum/gameactors/LandHolder.kt | 2 +- src/net/torvald/terrarum/gameactors/Luminous.kt | 4 +--- src/net/torvald/terrarum/gameactors/PhysTestBall.kt | 2 +- src/net/torvald/terrarum/gameactors/Player.kt | 4 ++-- src/net/torvald/terrarum/gameactors/PlayerBuilder.kt | 2 +- src/net/torvald/terrarum/gameactors/PlayerBuilderCynthia.kt | 2 +- src/net/torvald/terrarum/gameactors/PlayerBuilderSigrid.kt | 4 ++-- src/net/torvald/terrarum/gameactors/Pocketed.kt | 2 +- src/net/torvald/terrarum/gameactors/Visible.kt | 2 +- src/net/torvald/terrarum/gameactors/ai/ActorAI.kt | 2 +- 20 files changed, 23 insertions(+), 25 deletions(-) diff --git a/src/net/torvald/terrarum/StateInGame.kt b/src/net/torvald/terrarum/StateInGame.kt index 545e0429b..2ae384be4 100644 --- a/src/net/torvald/terrarum/StateInGame.kt +++ b/src/net/torvald/terrarum/StateInGame.kt @@ -3,7 +3,7 @@ package net.torvald.terrarum import net.torvald.imagefont.GameFontBase import net.torvald.terrarum.audio.AudioResourceLibrary import net.torvald.terrarum.concurrent.ThreadPool -import net.torvald.terrarum.console.ActorHumanoid +import net.torvald.terrarum.gameactors.ActorHumanoid import net.torvald.terrarum.gameactors.* import net.torvald.terrarum.console.Authenticator import net.torvald.terrarum.console.CommandDict diff --git a/src/net/torvald/terrarum/gameactors/Actor.kt b/src/net/torvald/terrarum/gameactors/Actor.kt index b349010c9..694ba423b 100644 --- a/src/net/torvald/terrarum/gameactors/Actor.kt +++ b/src/net/torvald/terrarum/gameactors/Actor.kt @@ -6,7 +6,7 @@ import net.torvald.terrarum.itemproperties.ItemPropCodex import org.newdawn.slick.GameContainer /** - * Created by minjaesong on 16-03-14. + * Created by minjaesong on 15-12-31. */ abstract class Actor : Comparable, Runnable { diff --git a/src/net/torvald/terrarum/gameactors/ActorWithBody.kt b/src/net/torvald/terrarum/gameactors/ActorWithBody.kt index 6cd9c2407..ad9359c47 100644 --- a/src/net/torvald/terrarum/gameactors/ActorWithBody.kt +++ b/src/net/torvald/terrarum/gameactors/ActorWithBody.kt @@ -16,7 +16,7 @@ import org.newdawn.slick.Graphics /** * Base class for every actor that has physical (or echo) body. This includes furnishings, paintings, gadgets, etc. * - * Created by minjaesong on 16-03-14. + * Created by minjaesong on 16-01-13. */ open class ActorWithBody : Actor(), Visible { diff --git a/src/net/torvald/terrarum/gameactors/AnyPlayer.kt b/src/net/torvald/terrarum/gameactors/AnyPlayer.kt index ac76edd97..91c0588a3 100644 --- a/src/net/torvald/terrarum/gameactors/AnyPlayer.kt +++ b/src/net/torvald/terrarum/gameactors/AnyPlayer.kt @@ -1,6 +1,6 @@ package net.torvald.terrarum.gameactors -import net.torvald.terrarum.console.ActorHumanoid +import net.torvald.terrarum.gameactors.ActorHumanoid import org.newdawn.slick.Input /** diff --git a/src/net/torvald/terrarum/gameactors/CanBeAnItem.kt b/src/net/torvald/terrarum/gameactors/CanBeAnItem.kt index 9cb148065..de394ac44 100644 --- a/src/net/torvald/terrarum/gameactors/CanBeAnItem.kt +++ b/src/net/torvald/terrarum/gameactors/CanBeAnItem.kt @@ -3,7 +3,7 @@ package net.torvald.terrarum.gameactors import net.torvald.terrarum.gameitem.InventoryItem /** - * Created by minjaesong on 16-03-14. + * Created by minjaesong on 16-01-31. */ interface CanBeAnItem { diff --git a/src/net/torvald/terrarum/gameactors/Controllable.kt b/src/net/torvald/terrarum/gameactors/Controllable.kt index a35a5b03f..5c53c88fa 100644 --- a/src/net/torvald/terrarum/gameactors/Controllable.kt +++ b/src/net/torvald/terrarum/gameactors/Controllable.kt @@ -6,7 +6,7 @@ import org.newdawn.slick.Input /** * Actors that has movement controlled by Keyboard or AI * - * Created by minjaesong on 16-03-14. + * Created by minjaesong on 15-12-31. */ interface Controllable { diff --git a/src/net/torvald/terrarum/gameactors/CreatureBuilder.kt b/src/net/torvald/terrarum/gameactors/CreatureBuilder.kt index 150374bc1..7c57d93b9 100644 --- a/src/net/torvald/terrarum/gameactors/CreatureBuilder.kt +++ b/src/net/torvald/terrarum/gameactors/CreatureBuilder.kt @@ -9,7 +9,7 @@ import org.newdawn.slick.SlickException import java.io.IOException /** - * Created by minjaesong on 16-03-14. + * Created by minjaesong on 16-02-05. */ object CreatureBuilder { diff --git a/src/net/torvald/terrarum/gameactors/CreatureRawInjector.kt b/src/net/torvald/terrarum/gameactors/CreatureRawInjector.kt index 8bef645d7..ee323256d 100644 --- a/src/net/torvald/terrarum/gameactors/CreatureRawInjector.kt +++ b/src/net/torvald/terrarum/gameactors/CreatureRawInjector.kt @@ -4,7 +4,7 @@ import net.torvald.JsonFetcher import net.torvald.random.Fudge3 import net.torvald.terrarum.langpack.Lang import com.google.gson.JsonObject -import net.torvald.terrarum.console.ActorHumanoid +import net.torvald.terrarum.gameactors.ActorHumanoid import org.newdawn.slick.SlickException import java.io.IOException import java.security.SecureRandom diff --git a/src/net/torvald/terrarum/gameactors/Factionable.kt b/src/net/torvald/terrarum/gameactors/Factionable.kt index ae7d0e044..195028905 100644 --- a/src/net/torvald/terrarum/gameactors/Factionable.kt +++ b/src/net/torvald/terrarum/gameactors/Factionable.kt @@ -4,7 +4,7 @@ import net.torvald.terrarum.gameactors.faction.Faction import java.util.* /** - * Created by minjaesong on 16-03-14. + * Created by minjaesong on 16-02-15. */ interface Factionable { diff --git a/src/net/torvald/terrarum/gameactors/HumanoidNPC.kt b/src/net/torvald/terrarum/gameactors/HumanoidNPC.kt index 23f466b5f..85176ca08 100644 --- a/src/net/torvald/terrarum/gameactors/HumanoidNPC.kt +++ b/src/net/torvald/terrarum/gameactors/HumanoidNPC.kt @@ -1,6 +1,6 @@ package net.torvald.terrarum.gameactors -import net.torvald.terrarum.console.ActorHumanoid +import net.torvald.terrarum.gameactors.ActorHumanoid import net.torvald.terrarum.gameitem.InventoryItem import org.luaj.vm2.Globals import org.luaj.vm2.LoadState @@ -15,7 +15,7 @@ import java.io.InputStreamReader import java.io.Reader /** - * Created by minjaesong on 16-03-14. + * Created by minjaesong on 16-01-31. */ open class HumanoidNPC(aiFile: String, born: GameDate) : ActorHumanoid(born), AIControlled, CanBeAnItem { diff --git a/src/net/torvald/terrarum/gameactors/LandHolder.kt b/src/net/torvald/terrarum/gameactors/LandHolder.kt index d1109b567..053102bf4 100644 --- a/src/net/torvald/terrarum/gameactors/LandHolder.kt +++ b/src/net/torvald/terrarum/gameactors/LandHolder.kt @@ -3,7 +3,7 @@ package net.torvald.terrarum.gameactors import java.util.* /** - * Created by minjaesong on 16-03-14. + * Created by minjaesong on 16-02-20. */ interface LandHolder { diff --git a/src/net/torvald/terrarum/gameactors/Luminous.kt b/src/net/torvald/terrarum/gameactors/Luminous.kt index 105ac0ca3..f1ffd251b 100644 --- a/src/net/torvald/terrarum/gameactors/Luminous.kt +++ b/src/net/torvald/terrarum/gameactors/Luminous.kt @@ -1,9 +1,7 @@ package net.torvald.terrarum.gameactors -import java.util.* - /** - * Created by minjaesong on 16-03-14. + * Created by minjaesong on 16-02-19. */ interface Luminous { diff --git a/src/net/torvald/terrarum/gameactors/PhysTestBall.kt b/src/net/torvald/terrarum/gameactors/PhysTestBall.kt index 4117d5304..9192ec5b3 100644 --- a/src/net/torvald/terrarum/gameactors/PhysTestBall.kt +++ b/src/net/torvald/terrarum/gameactors/PhysTestBall.kt @@ -6,7 +6,7 @@ import org.newdawn.slick.GameContainer import org.newdawn.slick.Graphics /** - * Created by minjaesong on 16-03-14. + * Created by minjaesong on 16-03-05. */ class PhysTestBall : ActorWithBody() { diff --git a/src/net/torvald/terrarum/gameactors/Player.kt b/src/net/torvald/terrarum/gameactors/Player.kt index 172f798db..22a250fc3 100644 --- a/src/net/torvald/terrarum/gameactors/Player.kt +++ b/src/net/torvald/terrarum/gameactors/Player.kt @@ -6,7 +6,7 @@ import net.torvald.terrarum.gamecontroller.EnumKeyFunc import net.torvald.terrarum.gamecontroller.KeyMap import net.torvald.terrarum.mapdrawer.MapDrawer import net.torvald.terrarum.Terrarum -import net.torvald.terrarum.console.ActorHumanoid +import net.torvald.terrarum.gameactors.ActorHumanoid import net.torvald.terrarum.ui.UIQuickBar import org.dyn4j.geometry.Vector2 import org.lwjgl.input.Controller @@ -19,7 +19,7 @@ import java.util.* /** * Game player (YOU!) * - * Created by minjaesong on 16-03-14. + * Created by minjaesong on 15-12-31. */ class Player(born: GameDate) : ActorHumanoid(born) { diff --git a/src/net/torvald/terrarum/gameactors/PlayerBuilder.kt b/src/net/torvald/terrarum/gameactors/PlayerBuilder.kt index eba8c93cb..b04fd98e9 100644 --- a/src/net/torvald/terrarum/gameactors/PlayerBuilder.kt +++ b/src/net/torvald/terrarum/gameactors/PlayerBuilder.kt @@ -5,7 +5,7 @@ import org.newdawn.slick.SlickException import java.io.IOException /** - * Created by minjaesong on 16-03-15. + * Created by minjaesong on 16-02-03. */ object PlayerBuilder { private val JSONPATH = "./assets/raw/" diff --git a/src/net/torvald/terrarum/gameactors/PlayerBuilderCynthia.kt b/src/net/torvald/terrarum/gameactors/PlayerBuilderCynthia.kt index 44647b8b9..6600a5254 100644 --- a/src/net/torvald/terrarum/gameactors/PlayerBuilderCynthia.kt +++ b/src/net/torvald/terrarum/gameactors/PlayerBuilderCynthia.kt @@ -1,7 +1,7 @@ package net.torvald.terrarum.gameactors import net.torvald.spriteanimation.SpriteAnimation -import net.torvald.terrarum.console.ActorHumanoid +import net.torvald.terrarum.gameactors.ActorHumanoid import net.torvald.terrarum.mapdrawer.MapDrawer /** diff --git a/src/net/torvald/terrarum/gameactors/PlayerBuilderSigrid.kt b/src/net/torvald/terrarum/gameactors/PlayerBuilderSigrid.kt index 33e1c5b52..7eb11d733 100644 --- a/src/net/torvald/terrarum/gameactors/PlayerBuilderSigrid.kt +++ b/src/net/torvald/terrarum/gameactors/PlayerBuilderSigrid.kt @@ -4,14 +4,14 @@ import net.torvald.JsonFetcher import net.torvald.terrarum.gameactors.faction.Faction import net.torvald.spriteanimation.SpriteAnimation import com.google.gson.JsonObject -import net.torvald.terrarum.console.ActorHumanoid +import net.torvald.terrarum.gameactors.ActorHumanoid import net.torvald.terrarum.gameactors.faction.FactionFactory import net.torvald.terrarum.mapdrawer.MapDrawer import org.newdawn.slick.SlickException import java.io.IOException /** - * Created by minjaesong on 16-03-14. + * Created by minjaesong on 16-02-03. */ object PlayerBuilderSigrid { diff --git a/src/net/torvald/terrarum/gameactors/Pocketed.kt b/src/net/torvald/terrarum/gameactors/Pocketed.kt index 83ea8ed77..f92c3d3be 100644 --- a/src/net/torvald/terrarum/gameactors/Pocketed.kt +++ b/src/net/torvald/terrarum/gameactors/Pocketed.kt @@ -1,7 +1,7 @@ package net.torvald.terrarum.gameactors /** - * Created by minjaesong on 16-03-14. + * Created by minjaesong on 16-01-15. */ interface Pocketed { diff --git a/src/net/torvald/terrarum/gameactors/Visible.kt b/src/net/torvald/terrarum/gameactors/Visible.kt index bf176477e..b14a6cf7d 100644 --- a/src/net/torvald/terrarum/gameactors/Visible.kt +++ b/src/net/torvald/terrarum/gameactors/Visible.kt @@ -4,7 +4,7 @@ import org.newdawn.slick.GameContainer import org.newdawn.slick.Graphics /** - * Created by minjaesong on 16-03-14. + * Created by minjaesong on 16-01-25. */ interface Visible { val hitbox: Hitbox diff --git a/src/net/torvald/terrarum/gameactors/ai/ActorAI.kt b/src/net/torvald/terrarum/gameactors/ai/ActorAI.kt index c6be599ba..ea8b15739 100644 --- a/src/net/torvald/terrarum/gameactors/ai/ActorAI.kt +++ b/src/net/torvald/terrarum/gameactors/ai/ActorAI.kt @@ -1,7 +1,7 @@ package net.torvald.terrarum.gameactors.ai /** - * Created by minjaesong on 16-03-14. + * Created by minjaesong on 16-03-02. */ interface ActorAI { } \ No newline at end of file