From ac9f5b51385124904e7ae24bce626e23efde448c Mon Sep 17 00:00:00 2001 From: Song Minjae Date: Tue, 12 Apr 2016 12:29:02 +0900 Subject: [PATCH] =?UTF-8?q?com.torvald=20=E2=86=92=20net.torvald?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Former-commit-id: 375604da8a20a6ba7cd0a8d05a44add02b2d04f4 Former-commit-id: 287287c5920b07618174d7a7573f049d350ded66 --- .../Torvald => net/torvald}/CSVFetcher.kt | 2 +- .../Torvald => net/torvald}/JsonFetcher.kt | 2 +- .../Torvald => net/torvald}/JsonWriter.kt | 2 +- .../Torvald => net/torvald}/RasterWriter.kt | 4 +- .../torvald/colourutil}/Col216.kt | 2 +- .../torvald/colourutil}/Col40 | 0 .../torvald/colourutil}/Col4096.kt | 2 +- .../torvald/colourutil}/HSV.kt | 2 +- .../torvald/colourutil}/HSVUtil.kt | 2 +- .../torvald/colourutil}/LimitedColours.kt | 2 +- .../torvald/imagefont}/GameFontBase.kt | 4 +- .../torvald/imagefont}/GameFontWhite.kt | 4 +- .../Point => net/torvald/point}/Point2f.kt | 2 +- src/{com => net}/torvald/random/Fudge3.kt | 2 +- src/{com => net}/torvald/random/FudgeDice.kt | 2 +- src/{com => net}/torvald/random/HQRNG.java | 2 +- src/{com => net}/torvald/random/MTRandom.java | 2 +- .../torvald/serialise}/WriteCSV.kt | 12 +- .../torvald/serialise}/WriteGameMapData.kt | 6 +- .../torvald/serialise}/WriteMeta.kt | 10 +- .../torvald/simplecipher}/ROTUtil.kt | 2 +- .../spriteanimation}/SpriteAnimation.kt | 6 +- src/{com => net}/torvald/terrarum/ABOUT.md | 0 src/{com => net}/torvald/terrarum/COPYING.md | 0 .../torvald/terrarum}/DefaultConfig.kt | 2 +- .../Terrarum => net/torvald/terrarum}/Game.kt | 42 +-- .../torvald/terrarum}/GameConfig.kt | 2 +- .../torvald/terrarum}/KVHashMap.kt | 2 +- .../torvald/terrarum/MECHNANICS.md | 0 .../torvald/terrarum/MISC_FEATURES.md | 0 .../torvald/terrarum/SAVE_FORMAT.md | 0 .../torvald/terrarum}/Terrarum.kt | 8 +- .../torvald/terrarum/console/Authenticator.kt | 6 +- .../torvald/terrarum/console/Batch.kt | 2 +- .../torvald/terrarum/console/CatStdout.kt | 2 +- .../torvald/terrarum/console/CodexEdictis.kt | 8 +- .../torvald/terrarum/console/CommandDict.kt | 4 +- .../terrarum/console/CommandInterpreter.kt | 6 +- .../terrarum/console/ConsoleCommand.kt | 2 +- .../torvald/terrarum/console/Echo.kt | 6 +- .../torvald/terrarum/console/ExportAV.kt | 6 +- .../torvald/terrarum/console/ExportMap.kt | 10 +- .../torvald/terrarum/console/ForceGC.kt | 2 +- .../torvald/terrarum/console/GetAV.kt | 8 +- .../torvald/terrarum/console/GetFactioning.kt | 8 +- .../torvald/terrarum/console/GetLocale.kt | 6 +- .../torvald/terrarum/console/GetTime.kt | 4 +- .../torvald/terrarum/console/GsonTest.kt | 4 +- .../torvald/terrarum/console/Help.kt | 6 +- .../torvald/terrarum/console/QuitApp.kt | 2 +- .../torvald/terrarum/console/SetAV.kt | 6 +- .../torvald/terrarum/console/SetBulletin.kt | 8 +- .../terrarum/console/SetGlobalLightLevel.kt | 6 +- .../torvald/terrarum/console/SetLocale.kt | 8 +- .../torvald/terrarum/console/SetTime.kt | 6 +- .../torvald/terrarum/console/SetTimeDelta.kt | 4 +- .../terrarum/console/SpawnPhysTestBall.kt | 12 +- .../terrarum/console/TeleportPlayer.kt | 8 +- .../torvald/terrarum/console/ToggleNoClip.kt | 6 +- .../torvald/terrarum/console/Zoom.kt | 4 +- .../terrarum}/gameactors/AIControlled.kt | 4 +- .../torvald/terrarum/gameactors/AVKey.kt | 2 +- .../torvald/terrarum}/gameactors/Actor.kt | 2 +- .../terrarum}/gameactors/ActorInventory.kt | 6 +- .../terrarum}/gameactors/ActorValue.kt | 4 +- .../terrarum}/gameactors/ActorWithBody.kt | 300 ++++++++---------- .../terrarum/gameactors/CanBeAnItem.kt | 4 +- .../terrarum}/gameactors/Controllable.kt | 2 +- .../terrarum/gameactors/CreatureBuilder.kt | 10 +- .../gameactors/CreatureRawInjector.kt | 8 +- .../terrarum}/gameactors/DroppedItem.kt | 2 +- .../terrarum}/gameactors/Factionable.kt | 4 +- .../torvald/terrarum}/gameactors/Glowing.kt | 2 +- .../torvald/terrarum}/gameactors/Hitbox.kt | 4 +- .../terrarum}/gameactors/LandHolder.kt | 2 +- .../torvald/terrarum}/gameactors/Luminous.kt | 2 +- .../gameactors/NPCIntelligentBase.kt | 12 +- .../torvald/terrarum/gameactors/PBCynthia.kt | 6 +- .../torvald/terrarum/gameactors/PBSigrid.kt | 12 +- .../terrarum}/gameactors/PhysTestBall.kt | 4 +- .../torvald/terrarum}/gameactors/Player.kt | 14 +- .../terrarum/gameactors/PlayerBuilder.kt | 2 +- .../torvald/terrarum}/gameactors/Pocketed.kt | 2 +- .../torvald/terrarum}/gameactors/Visible.kt | 2 +- .../terrarum}/gameactors/ai/ActorAI.kt | 2 +- .../terrarum}/gameactors/faction/Faction.kt | 4 +- .../gameactors/faction/FactionFactory.kt | 4 +- .../gameactors/scheduler/NPCSchedule.kt | 2 +- .../terrarum}/gamecontroller/EnumKeyFunc.kt | 2 +- .../gamecontroller/GameController.kt | 18 +- .../torvald/terrarum}/gamecontroller/Key.kt | 2 +- .../terrarum}/gamecontroller/KeyMap.kt | 2 +- .../terrarum}/gamecontroller/KeyToggler.kt | 2 +- .../terrarum/gameitem}/InventoryItem.kt | 2 +- .../torvald/terrarum/gameitem}/TileAsItem.kt | 4 +- .../torvald/terrarum/gamemap}/GameMap.kt | 2 +- .../torvald/terrarum/gamemap}/MapLayer.kt | 2 +- .../torvald/terrarum/gamemap}/MapPoint.kt | 4 +- .../terrarum/gamemap}/PairedMapLayer.kt | 2 +- .../torvald/terrarum/gamemap}/WorldTime.kt | 2 +- .../terrarum/itemproperties}/ItemProp.kt | 2 +- .../terrarum/itemproperties}/ItemPropCodex.kt | 8 +- .../terrarum/itemproperties}/Material.kt | 2 +- .../itemproperties}/MaterialFactory.kt | 2 +- .../itemproperties}/MaterialPropCodex.kt | 2 +- .../torvald/terrarum/langpack}/Lang.kt | 8 +- .../terrarum/mapdrawer}/LightmapRenderer.kt | 55 +--- .../torvald/terrarum/mapdrawer}/MapCamera.kt | 16 +- .../torvald/terrarum/mapdrawer}/MapDrawer.kt | 10 +- .../mapgenerator}/FloatingIslandsPreset.kt | 4 +- .../mapgenerator}/FloatingIslePreset01.kt | 2 +- .../mapgenerator}/FloatingIslePreset02.kt | 2 +- .../mapgenerator}/FloatingIslePreset03.kt | 2 +- .../mapgenerator}/FloatingIslePreset04.kt | 2 +- .../mapgenerator}/FloatingIslePreset05.kt | 2 +- .../terrarum/mapgenerator}/MapGenerator.kt | 8 +- .../terrarum/mapgenerator/NoiseFilter.kt | 2 +- .../terrarum/mapgenerator/NoiseFilterCubic.kt | 2 +- .../mapgenerator/NoiseFilterMinusQuadratic.kt | 2 +- .../mapgenerator/NoiseFilterQuadratic.kt | 2 +- .../terrarum/mapgenerator/NoiseFilterSqrt.kt | 2 +- .../mapgenerator/NoiseFilterUniform.kt | 2 +- .../mapgenerator}/RoguelikeRandomiser.kt | 6 +- .../terrarum/mapgenerator}/SimplexNoise.kt | 4 +- .../mapgenerator}/SimplexNoise_octave.kt | 4 +- .../mapgenerator}/floatingIslePreset01.png | Bin .../mapgenerator}/floatingIslePreset02.png | Bin .../mapgenerator}/floatingIslePreset03.png | Bin .../mapgenerator}/floatingIslePreset04.png | Bin .../mapgenerator}/floatingIslePreset05.png | Bin .../terrarum/realestate/RealEstateCodex.kt | 2 +- .../terrarum/realestate/RealEstateUtility.kt | 4 +- .../terrarum/tileproperties}/TileNameCode.kt | 4 +- .../terrarum/tileproperties}/TileProp.kt | 2 +- .../terrarum/tileproperties}/TilePropCodex.kt | 8 +- .../terrarum/tileproperties}/tileprop.csv | 0 .../tileproperties/tileprop_nohdr.csv | 0 .../torvald/terrarum/tilestats/TileStats.kt | 14 +- .../terrarum/ui/BasicDebugInfoWindow.kt | 14 +- .../torvald/terrarum/ui/ConsoleWindow.kt | 10 +- .../torvald/terrarum/ui/MessageWindow.kt | 8 +- .../terrarum/ui/MovementInterpolator.kt | 2 +- .../torvald/terrarum/ui/Notification.kt | 4 +- .../torvald/terrarum/ui/UICanvas.kt | 2 +- .../torvald/terrarum/ui/UIClickable.kt | 2 +- .../torvald/terrarum/ui/UIHandler.kt | 6 +- .../torvald/terrarum/ui/UIItem.kt | 2 +- .../torvald/terrarum/ui/UITypable.kt | 2 +- 148 files changed, 473 insertions(+), 524 deletions(-) rename src/{com/Torvald => net/torvald}/CSVFetcher.kt (98%) rename src/{com/Torvald => net/torvald}/JsonFetcher.kt (97%) rename src/{com/Torvald => net/torvald}/JsonWriter.kt (98%) rename src/{com/Torvald => net/torvald}/RasterWriter.kt (96%) rename src/{com/Torvald/ColourUtil => net/torvald/colourutil}/Col216.kt (98%) rename src/{com/Torvald/ColourUtil => net/torvald/colourutil}/Col40 (100%) rename src/{com/Torvald/ColourUtil => net/torvald/colourutil}/Col4096.kt (99%) rename src/{com/Torvald/ColourUtil => net/torvald/colourutil}/HSV.kt (88%) rename src/{com/Torvald/ColourUtil => net/torvald/colourutil}/HSVUtil.kt (98%) rename src/{com/Torvald/ColourUtil => net/torvald/colourutil}/LimitedColours.kt (90%) rename src/{com/Torvald/ImageFont => net/torvald/imagefont}/GameFontBase.kt (99%) rename src/{com/Torvald/ImageFont => net/torvald/imagefont}/GameFontWhite.kt (98%) rename src/{com/Torvald/Point => net/torvald/point}/Point2f.kt (92%) rename src/{com => net}/torvald/random/Fudge3.kt (89%) rename src/{com => net}/torvald/random/FudgeDice.kt (97%) rename src/{com => net}/torvald/random/HQRNG.java (98%) rename src/{com => net}/torvald/random/MTRandom.java (99%) rename src/{com/Torvald/Serialise => net/torvald/serialise}/WriteCSV.kt (89%) rename src/{com/Torvald/Serialise => net/torvald/serialise}/WriteGameMapData.kt (95%) rename src/{com/Torvald/Serialise => net/torvald/serialise}/WriteMeta.kt (92%) rename src/{com/Torvald/SimpleCipher => net/torvald/simplecipher}/ROTUtil.kt (98%) rename src/{com/Torvald/spriteAnimation => net/torvald/spriteanimation}/SpriteAnimation.kt (98%) rename src/{com => net}/torvald/terrarum/ABOUT.md (100%) rename src/{com => net}/torvald/terrarum/COPYING.md (100%) rename src/{com/Torvald/Terrarum => net/torvald/terrarum}/DefaultConfig.kt (93%) rename src/{com/Torvald/Terrarum => net/torvald/terrarum}/Game.kt (90%) rename src/{com/Torvald/Terrarum => net/torvald/terrarum}/GameConfig.kt (72%) rename src/{com/Torvald/Terrarum => net/torvald/terrarum}/KVHashMap.kt (98%) rename src/{com => net}/torvald/terrarum/MECHNANICS.md (100%) rename src/{com => net}/torvald/terrarum/MISC_FEATURES.md (100%) rename src/{com => net}/torvald/terrarum/SAVE_FORMAT.md (100%) rename src/{com/Torvald/Terrarum => net/torvald/terrarum}/Terrarum.kt (98%) rename src/{com => net}/torvald/terrarum/console/Authenticator.kt (89%) rename src/{com => net}/torvald/terrarum/console/Batch.kt (93%) rename src/{com => net}/torvald/terrarum/console/CatStdout.kt (94%) rename src/{com => net}/torvald/terrarum/console/CodexEdictis.kt (87%) rename src/{com => net}/torvald/terrarum/console/CommandDict.kt (95%) rename src/{com => net}/torvald/terrarum/console/CommandInterpreter.kt (96%) rename src/{com => net}/torvald/terrarum/console/ConsoleCommand.kt (81%) rename src/{com => net}/torvald/terrarum/console/Echo.kt (81%) rename src/{com => net}/torvald/terrarum/console/ExportAV.kt (89%) rename src/{com => net}/torvald/terrarum/console/ExportMap.kt (95%) rename src/{com => net}/torvald/terrarum/console/ForceGC.kt (88%) rename src/{com => net}/torvald/terrarum/console/GetAV.kt (90%) rename src/{com => net}/torvald/terrarum/console/GetFactioning.kt (89%) rename src/{com => net}/torvald/terrarum/console/GetLocale.kt (80%) rename src/{com => net}/torvald/terrarum/console/GetTime.kt (88%) rename src/{com => net}/torvald/terrarum/console/GsonTest.kt (94%) rename src/{com => net}/torvald/terrarum/console/Help.kt (84%) rename src/{com => net}/torvald/terrarum/console/QuitApp.kt (84%) rename src/{com => net}/torvald/terrarum/console/SetAV.kt (94%) rename src/{com => net}/torvald/terrarum/console/SetBulletin.kt (77%) rename src/{com => net}/torvald/terrarum/console/SetGlobalLightLevel.kt (91%) rename src/{com => net}/torvald/terrarum/console/SetLocale.kt (86%) rename src/{com => net}/torvald/terrarum/console/SetTime.kt (91%) rename src/{com => net}/torvald/terrarum/console/SetTimeDelta.kt (89%) rename src/{com => net}/torvald/terrarum/console/SpawnPhysTestBall.kt (74%) rename src/{com => net}/torvald/terrarum/console/TeleportPlayer.kt (83%) rename src/{com => net}/torvald/terrarum/console/ToggleNoClip.kt (79%) rename src/{com => net}/torvald/terrarum/console/Zoom.kt (92%) rename src/{com/Torvald/Terrarum => net/torvald/terrarum}/gameactors/AIControlled.kt (53%) rename src/{com => net}/torvald/terrarum/gameactors/AVKey.kt (95%) rename src/{com/Torvald/Terrarum => net/torvald/terrarum}/gameactors/Actor.kt (89%) rename src/{com/Torvald/Terrarum => net/torvald/terrarum}/gameactors/ActorInventory.kt (95%) rename src/{com/Torvald/Terrarum => net/torvald/terrarum}/gameactors/ActorValue.kt (50%) rename src/{com/Torvald/Terrarum => net/torvald/terrarum}/gameactors/ActorWithBody.kt (69%) rename src/{com => net}/torvald/terrarum/gameactors/CanBeAnItem.kt (71%) rename src/{com/Torvald/Terrarum => net/torvald/terrarum}/gameactors/Controllable.kt (81%) rename src/{com => net}/torvald/terrarum/gameactors/CreatureBuilder.kt (72%) rename src/{com/Torvald/Terrarum => net/torvald/terrarum}/gameactors/CreatureRawInjector.kt (96%) rename src/{com/Torvald/Terrarum => net/torvald/terrarum}/gameactors/DroppedItem.kt (90%) rename src/{com/Torvald/Terrarum => net/torvald/terrarum}/gameactors/Factionable.kt (57%) rename src/{com/Torvald/Terrarum => net/torvald/terrarum}/gameactors/Glowing.kt (86%) rename src/{com/Torvald/Terrarum => net/torvald/terrarum}/gameactors/Hitbox.kt (97%) rename src/{com/Torvald/Terrarum => net/torvald/terrarum}/gameactors/LandHolder.kt (90%) rename src/{com/Torvald/Terrarum => net/torvald/terrarum}/gameactors/Luminous.kt (91%) rename src/{com/Torvald/Terrarum => net/torvald/terrarum}/gameactors/NPCIntelligentBase.kt (89%) rename src/{com => net}/torvald/terrarum/gameactors/PBCynthia.kt (83%) rename src/{com => net}/torvald/terrarum/gameactors/PBSigrid.kt (87%) rename src/{com/Torvald/Terrarum => net/torvald/terrarum}/gameactors/PhysTestBall.kt (87%) rename src/{com/Torvald/Terrarum => net/torvald/terrarum}/gameactors/Player.kt (97%) rename src/{com => net}/torvald/terrarum/gameactors/PlayerBuilder.kt (92%) rename src/{com/Torvald/Terrarum => net/torvald/terrarum}/gameactors/Pocketed.kt (72%) rename src/{com/Torvald/Terrarum => net/torvald/terrarum}/gameactors/Visible.kt (86%) rename src/{com/Torvald/Terrarum => net/torvald/terrarum}/gameactors/ai/ActorAI.kt (61%) rename src/{com/Torvald/Terrarum => net/torvald/terrarum}/gameactors/faction/Faction.kt (94%) rename src/{com => net}/torvald/terrarum/gameactors/faction/FactionFactory.kt (92%) rename src/{com => net}/torvald/terrarum/gameactors/scheduler/NPCSchedule.kt (66%) rename src/{com/Torvald/Terrarum => net/torvald/terrarum}/gamecontroller/EnumKeyFunc.kt (78%) rename src/{com/Torvald/Terrarum => net/torvald/terrarum}/gamecontroller/GameController.kt (87%) rename src/{com/Torvald/Terrarum => net/torvald/terrarum}/gamecontroller/Key.kt (96%) rename src/{com/Torvald/Terrarum => net/torvald/terrarum}/gamecontroller/KeyMap.kt (94%) rename src/{com/Torvald/Terrarum => net/torvald/terrarum}/gamecontroller/KeyToggler.kt (96%) rename src/{com/Torvald/Terrarum/GameItem => net/torvald/terrarum/gameitem}/InventoryItem.kt (97%) rename src/{com/Torvald/Terrarum/GameItem => net/torvald/terrarum/gameitem}/TileAsItem.kt (91%) rename src/{com/Torvald/Terrarum/GameMap => net/torvald/terrarum/gamemap}/GameMap.kt (99%) rename src/{com/Torvald/Terrarum/GameMap => net/torvald/terrarum/gamemap}/MapLayer.kt (97%) rename src/{com/Torvald/Terrarum/GameMap => net/torvald/terrarum/gamemap}/MapPoint.kt (90%) rename src/{com/Torvald/Terrarum/GameMap => net/torvald/terrarum/gamemap}/PairedMapLayer.kt (98%) rename src/{com/Torvald/Terrarum/GameMap => net/torvald/terrarum/gamemap}/WorldTime.kt (99%) rename src/{com/Torvald/Terrarum/ItemProperties => net/torvald/terrarum/itemproperties}/ItemProp.kt (75%) rename src/{com/Torvald/Terrarum/ItemProperties => net/torvald/terrarum/itemproperties}/ItemPropCodex.kt (83%) rename src/{com/Torvald/Terrarum/ItemProperties => net/torvald/terrarum/itemproperties}/Material.kt (76%) rename src/{com/Torvald/Terrarum/ItemProperties => net/torvald/terrarum/itemproperties}/MaterialFactory.kt (62%) rename src/{com/Torvald/Terrarum/ItemProperties => net/torvald/terrarum/itemproperties}/MaterialPropCodex.kt (78%) rename src/{com/Torvald/Terrarum/LangPack => net/torvald/terrarum/langpack}/Lang.kt (97%) rename src/{com/Torvald/Terrarum/MapDrawer => net/torvald/terrarum/mapdrawer}/LightmapRenderer.kt (92%) rename src/{com/Torvald/Terrarum/MapDrawer => net/torvald/terrarum/mapdrawer}/MapCamera.kt (97%) rename src/{com/Torvald/Terrarum/MapDrawer => net/torvald/terrarum/mapdrawer}/MapDrawer.kt (92%) rename src/{com/Torvald/Terrarum/MapGenerator => net/torvald/terrarum/mapgenerator}/FloatingIslandsPreset.kt (96%) rename src/{com/Torvald/Terrarum/MapGenerator => net/torvald/terrarum/mapgenerator}/FloatingIslePreset01.kt (99%) rename src/{com/Torvald/Terrarum/MapGenerator => net/torvald/terrarum/mapgenerator}/FloatingIslePreset02.kt (99%) rename src/{com/Torvald/Terrarum/MapGenerator => net/torvald/terrarum/mapgenerator}/FloatingIslePreset03.kt (99%) rename src/{com/Torvald/Terrarum/MapGenerator => net/torvald/terrarum/mapgenerator}/FloatingIslePreset04.kt (99%) rename src/{com/Torvald/Terrarum/MapGenerator => net/torvald/terrarum/mapgenerator}/FloatingIslePreset05.kt (99%) rename src/{com/Torvald/Terrarum/MapGenerator => net/torvald/terrarum/mapgenerator}/MapGenerator.kt (99%) rename src/{com => net}/torvald/terrarum/mapgenerator/NoiseFilter.kt (76%) rename src/{com => net}/torvald/terrarum/mapgenerator/NoiseFilterCubic.kt (96%) rename src/{com => net}/torvald/terrarum/mapgenerator/NoiseFilterMinusQuadratic.kt (96%) rename src/{com => net}/torvald/terrarum/mapgenerator/NoiseFilterQuadratic.kt (96%) rename src/{com => net}/torvald/terrarum/mapgenerator/NoiseFilterSqrt.kt (93%) rename src/{com => net}/torvald/terrarum/mapgenerator/NoiseFilterUniform.kt (81%) rename src/{com/Torvald/Terrarum/MapGenerator => net/torvald/terrarum/mapgenerator}/RoguelikeRandomiser.kt (97%) rename src/{com/Torvald/Terrarum/MapGenerator => net/torvald/terrarum/mapgenerator}/SimplexNoise.kt (96%) rename src/{com/Torvald/Terrarum/MapGenerator => net/torvald/terrarum/mapgenerator}/SimplexNoise_octave.kt (99%) rename src/{com/Torvald/Terrarum/MapGenerator => net/torvald/terrarum/mapgenerator}/floatingIslePreset01.png (100%) rename src/{com/Torvald/Terrarum/MapGenerator => net/torvald/terrarum/mapgenerator}/floatingIslePreset02.png (100%) rename src/{com/Torvald/Terrarum/MapGenerator => net/torvald/terrarum/mapgenerator}/floatingIslePreset03.png (100%) rename src/{com/Torvald/Terrarum/MapGenerator => net/torvald/terrarum/mapgenerator}/floatingIslePreset04.png (100%) rename src/{com/Torvald/Terrarum/MapGenerator => net/torvald/terrarum/mapgenerator}/floatingIslePreset05.png (100%) rename src/{com => net}/torvald/terrarum/realestate/RealEstateCodex.kt (95%) rename src/{com => net}/torvald/terrarum/realestate/RealEstateUtility.kt (81%) rename src/{com/Torvald/Terrarum/TileProperties => net/torvald/terrarum/tileproperties}/TileNameCode.kt (98%) rename src/{com/Torvald/Terrarum/TileProperties => net/torvald/terrarum/tileproperties}/TileProp.kt (93%) rename src/{com/Torvald/Terrarum/TileProperties => net/torvald/terrarum/tileproperties}/TilePropCodex.kt (95%) rename src/{com/Torvald/Terrarum/TileProperties => net/torvald/terrarum/tileproperties}/tileprop.csv (100%) rename src/{com => net}/torvald/terrarum/tileproperties/tileprop_nohdr.csv (100%) rename src/{com => net}/torvald/terrarum/tilestats/TileStats.kt (88%) rename src/{com => net}/torvald/terrarum/ui/BasicDebugInfoWindow.kt (95%) rename src/{com => net}/torvald/terrarum/ui/ConsoleWindow.kt (96%) rename src/{com => net}/torvald/terrarum/ui/MessageWindow.kt (96%) rename src/{com => net}/torvald/terrarum/ui/MovementInterpolator.kt (96%) rename src/{com => net}/torvald/terrarum/ui/Notification.kt (96%) rename src/{com => net}/torvald/terrarum/ui/UICanvas.kt (95%) rename src/{com => net}/torvald/terrarum/ui/UIClickable.kt (93%) rename src/{com => net}/torvald/terrarum/ui/UIHandler.kt (98%) rename src/{com => net}/torvald/terrarum/ui/UIItem.kt (85%) rename src/{com => net}/torvald/terrarum/ui/UITypable.kt (82%) diff --git a/src/com/Torvald/CSVFetcher.kt b/src/net/torvald/CSVFetcher.kt similarity index 98% rename from src/com/Torvald/CSVFetcher.kt rename to src/net/torvald/CSVFetcher.kt index 9019265e6..934814eb2 100644 --- a/src/com/Torvald/CSVFetcher.kt +++ b/src/net/torvald/CSVFetcher.kt @@ -1,4 +1,4 @@ -package com.torvald +package net.torvald import org.apache.commons.csv.CSVFormat import org.apache.commons.csv.CSVParser diff --git a/src/com/Torvald/JsonFetcher.kt b/src/net/torvald/JsonFetcher.kt similarity index 97% rename from src/com/Torvald/JsonFetcher.kt rename to src/net/torvald/JsonFetcher.kt index 93c435a83..05c331ca8 100644 --- a/src/com/Torvald/JsonFetcher.kt +++ b/src/net/torvald/JsonFetcher.kt @@ -1,4 +1,4 @@ -package com.torvald +package net.torvald import com.google.gson.JsonObject import com.google.gson.JsonParser diff --git a/src/com/Torvald/JsonWriter.kt b/src/net/torvald/JsonWriter.kt similarity index 98% rename from src/com/Torvald/JsonWriter.kt rename to src/net/torvald/JsonWriter.kt index e6d99041c..51bfe8dc5 100644 --- a/src/com/Torvald/JsonWriter.kt +++ b/src/net/torvald/JsonWriter.kt @@ -1,4 +1,4 @@ -package com.torvald +package net.torvald import com.google.gson.Gson import com.google.gson.JsonElement diff --git a/src/com/Torvald/RasterWriter.kt b/src/net/torvald/RasterWriter.kt similarity index 96% rename from src/com/Torvald/RasterWriter.kt rename to src/net/torvald/RasterWriter.kt index 2cef7f216..905cddd2f 100644 --- a/src/com/Torvald/RasterWriter.kt +++ b/src/net/torvald/RasterWriter.kt @@ -1,6 +1,6 @@ -package com.torvald +package net.torvald -import com.torvald.terrarum.Terrarum +import net.torvald.terrarum.Terrarum import javax.imageio.ImageIO import java.awt.* diff --git a/src/com/Torvald/ColourUtil/Col216.kt b/src/net/torvald/colourutil/Col216.kt similarity index 98% rename from src/com/Torvald/ColourUtil/Col216.kt rename to src/net/torvald/colourutil/Col216.kt index 13f86b663..c92ab8f72 100644 --- a/src/com/Torvald/ColourUtil/Col216.kt +++ b/src/net/torvald/colourutil/Col216.kt @@ -1,4 +1,4 @@ -package com.torvald.colourutil +package net.torvald.colourutil import org.newdawn.slick.Color diff --git a/src/com/Torvald/ColourUtil/Col40 b/src/net/torvald/colourutil/Col40 similarity index 100% rename from src/com/Torvald/ColourUtil/Col40 rename to src/net/torvald/colourutil/Col40 diff --git a/src/com/Torvald/ColourUtil/Col4096.kt b/src/net/torvald/colourutil/Col4096.kt similarity index 99% rename from src/com/Torvald/ColourUtil/Col4096.kt rename to src/net/torvald/colourutil/Col4096.kt index e30d9ea66..19afce6bf 100644 --- a/src/com/Torvald/ColourUtil/Col4096.kt +++ b/src/net/torvald/colourutil/Col4096.kt @@ -1,4 +1,4 @@ -package com.torvald.colourutil +package net.torvald.colourutil import org.newdawn.slick.Color diff --git a/src/com/Torvald/ColourUtil/HSV.kt b/src/net/torvald/colourutil/HSV.kt similarity index 88% rename from src/com/Torvald/ColourUtil/HSV.kt rename to src/net/torvald/colourutil/HSV.kt index 82c38c3d0..bc475b988 100644 --- a/src/com/Torvald/ColourUtil/HSV.kt +++ b/src/net/torvald/colourutil/HSV.kt @@ -1,4 +1,4 @@ -package com.torvald.colourutil +package net.torvald.colourutil /** * Created by minjaesong on 16-03-10. diff --git a/src/com/Torvald/ColourUtil/HSVUtil.kt b/src/net/torvald/colourutil/HSVUtil.kt similarity index 98% rename from src/com/Torvald/ColourUtil/HSVUtil.kt rename to src/net/torvald/colourutil/HSVUtil.kt index 344de266d..5cdbae28c 100644 --- a/src/com/Torvald/ColourUtil/HSVUtil.kt +++ b/src/net/torvald/colourutil/HSVUtil.kt @@ -1,4 +1,4 @@ -package com.torvald.colourutil +package net.torvald.colourutil import com.jme3.math.FastMath import org.newdawn.slick.Color diff --git a/src/com/Torvald/ColourUtil/LimitedColours.kt b/src/net/torvald/colourutil/LimitedColours.kt similarity index 90% rename from src/com/Torvald/ColourUtil/LimitedColours.kt rename to src/net/torvald/colourutil/LimitedColours.kt index 416d550ec..40744be5c 100644 --- a/src/com/Torvald/ColourUtil/LimitedColours.kt +++ b/src/net/torvald/colourutil/LimitedColours.kt @@ -1,4 +1,4 @@ -package com.torvald.colourutil +package net.torvald.colourutil import org.newdawn.slick.Color diff --git a/src/com/Torvald/ImageFont/GameFontBase.kt b/src/net/torvald/imagefont/GameFontBase.kt similarity index 99% rename from src/com/Torvald/ImageFont/GameFontBase.kt rename to src/net/torvald/imagefont/GameFontBase.kt index b230dd313..1768511dd 100644 --- a/src/com/Torvald/ImageFont/GameFontBase.kt +++ b/src/net/torvald/imagefont/GameFontBase.kt @@ -1,6 +1,6 @@ -package com.torvald.imagefont +package net.torvald.imagefont -import com.torvald.terrarum.Terrarum +import net.torvald.terrarum.Terrarum import org.lwjgl.opengl.GL11 import org.newdawn.slick.* diff --git a/src/com/Torvald/ImageFont/GameFontWhite.kt b/src/net/torvald/imagefont/GameFontWhite.kt similarity index 98% rename from src/com/Torvald/ImageFont/GameFontWhite.kt rename to src/net/torvald/imagefont/GameFontWhite.kt index 9bfa2a6a7..e756b6337 100644 --- a/src/com/Torvald/ImageFont/GameFontWhite.kt +++ b/src/net/torvald/imagefont/GameFontWhite.kt @@ -1,6 +1,6 @@ -package com.torvald.imagefont +package net.torvald.imagefont -import com.torvald.terrarum.Terrarum +import net.torvald.terrarum.Terrarum import org.newdawn.slick.* /** diff --git a/src/com/Torvald/Point/Point2f.kt b/src/net/torvald/point/Point2f.kt similarity index 92% rename from src/com/Torvald/Point/Point2f.kt rename to src/net/torvald/point/Point2f.kt index e4c128dfe..ae80315e7 100644 --- a/src/com/Torvald/Point/Point2f.kt +++ b/src/net/torvald/point/Point2f.kt @@ -1,4 +1,4 @@ -package com.torvald.point +package net.torvald.point /** * Created by minjaesong on 16-01-15. diff --git a/src/com/torvald/random/Fudge3.kt b/src/net/torvald/random/Fudge3.kt similarity index 89% rename from src/com/torvald/random/Fudge3.kt rename to src/net/torvald/random/Fudge3.kt index fb6fc5509..d9112cbc8 100644 --- a/src/com/torvald/random/Fudge3.kt +++ b/src/net/torvald/random/Fudge3.kt @@ -1,4 +1,4 @@ -package com.torvald.random +package net.torvald.random import java.util.Random diff --git a/src/com/torvald/random/FudgeDice.kt b/src/net/torvald/random/FudgeDice.kt similarity index 97% rename from src/com/torvald/random/FudgeDice.kt rename to src/net/torvald/random/FudgeDice.kt index ca009ebe3..0a7917da9 100644 --- a/src/com/torvald/random/FudgeDice.kt +++ b/src/net/torvald/random/FudgeDice.kt @@ -1,4 +1,4 @@ -package com.torvald.random +package net.torvald.random import java.util.Random diff --git a/src/com/torvald/random/HQRNG.java b/src/net/torvald/random/HQRNG.java similarity index 98% rename from src/com/torvald/random/HQRNG.java rename to src/net/torvald/random/HQRNG.java index 82367c4c9..539be8491 100644 --- a/src/com/torvald/random/HQRNG.java +++ b/src/net/torvald/random/HQRNG.java @@ -1,4 +1,4 @@ -package com.torvald.random; +package net.torvald.random; import java.util.Random; //import java.util.concurrent.locks.*; diff --git a/src/com/torvald/random/MTRandom.java b/src/net/torvald/random/MTRandom.java similarity index 99% rename from src/com/torvald/random/MTRandom.java rename to src/net/torvald/random/MTRandom.java index 652e89918..43b97db90 100644 --- a/src/com/torvald/random/MTRandom.java +++ b/src/net/torvald/random/MTRandom.java @@ -1,4 +1,4 @@ -package com.torvald.random; +package net.torvald.random; import java.io.*; import java.util.*; diff --git a/src/com/Torvald/Serialise/WriteCSV.kt b/src/net/torvald/serialise/WriteCSV.kt similarity index 89% rename from src/com/Torvald/Serialise/WriteCSV.kt rename to src/net/torvald/serialise/WriteCSV.kt index 9de2c07df..733b49fc9 100644 --- a/src/com/Torvald/Serialise/WriteCSV.kt +++ b/src/net/torvald/serialise/WriteCSV.kt @@ -1,10 +1,10 @@ -package com.torvald.serialise +package net.torvald.serialise -import com.torvald.CSVFetcher -import com.torvald.terrarum.itemproperties.ItemPropCodex -import com.torvald.terrarum.itemproperties.MaterialPropCodex -import com.torvald.terrarum.Terrarum -import com.torvald.terrarum.tileproperties.TilePropCodex +import net.torvald.CSVFetcher +import net.torvald.terrarum.itemproperties.ItemPropCodex +import net.torvald.terrarum.itemproperties.MaterialPropCodex +import net.torvald.terrarum.Terrarum +import net.torvald.terrarum.tileproperties.TilePropCodex import java.io.IOException import java.nio.file.Files import java.nio.file.Path diff --git a/src/com/Torvald/Serialise/WriteGameMapData.kt b/src/net/torvald/serialise/WriteGameMapData.kt similarity index 95% rename from src/com/Torvald/Serialise/WriteGameMapData.kt rename to src/net/torvald/serialise/WriteGameMapData.kt index f2e422487..ed6b7787d 100644 --- a/src/com/Torvald/Serialise/WriteGameMapData.kt +++ b/src/net/torvald/serialise/WriteGameMapData.kt @@ -1,7 +1,7 @@ -package com.torvald.serialise +package net.torvald.serialise -import com.torvald.terrarum.gamemap.GameMap -import com.torvald.terrarum.Terrarum +import net.torvald.terrarum.gamemap.GameMap +import net.torvald.terrarum.Terrarum import java.io.IOException import java.nio.file.Files import java.nio.file.Path diff --git a/src/com/Torvald/Serialise/WriteMeta.kt b/src/net/torvald/serialise/WriteMeta.kt similarity index 92% rename from src/com/Torvald/Serialise/WriteMeta.kt rename to src/net/torvald/serialise/WriteMeta.kt index fb5db5e79..3b9f642ab 100644 --- a/src/com/Torvald/Serialise/WriteMeta.kt +++ b/src/net/torvald/serialise/WriteMeta.kt @@ -1,9 +1,9 @@ -package com.torvald.serialise +package net.torvald.serialise -import com.torvald.terrarum.mapgenerator.MapGenerator -import com.torvald.terrarum.mapgenerator.RoguelikeRandomiser -import com.torvald.terrarum.Terrarum -import com.torvald.terrarum.tileproperties.TilePropCodex +import net.torvald.terrarum.mapgenerator.MapGenerator +import net.torvald.terrarum.mapgenerator.RoguelikeRandomiser +import net.torvald.terrarum.Terrarum +import net.torvald.terrarum.tileproperties.TilePropCodex import org.apache.commons.codec.digest.DigestUtils import java.io.FileInputStream import java.io.File diff --git a/src/com/Torvald/SimpleCipher/ROTUtil.kt b/src/net/torvald/simplecipher/ROTUtil.kt similarity index 98% rename from src/com/Torvald/SimpleCipher/ROTUtil.kt rename to src/net/torvald/simplecipher/ROTUtil.kt index a8d8c8c05..429995afb 100644 --- a/src/com/Torvald/SimpleCipher/ROTUtil.kt +++ b/src/net/torvald/simplecipher/ROTUtil.kt @@ -1,4 +1,4 @@ -package com.torvald.simplecipher +package net.torvald.simplecipher /** * Created by minjaesong on 16-03-20. diff --git a/src/com/Torvald/spriteAnimation/SpriteAnimation.kt b/src/net/torvald/spriteanimation/SpriteAnimation.kt similarity index 98% rename from src/com/Torvald/spriteAnimation/SpriteAnimation.kt rename to src/net/torvald/spriteanimation/SpriteAnimation.kt index 268d471f9..347c69fe8 100644 --- a/src/com/Torvald/spriteAnimation/SpriteAnimation.kt +++ b/src/net/torvald/spriteanimation/SpriteAnimation.kt @@ -2,10 +2,10 @@ * This code is based on the original author's code written in Lua. */ -package com.torvald.spriteanimation +package net.torvald.spriteanimation -import com.torvald.terrarum.Game -import com.torvald.terrarum.Terrarum +import net.torvald.terrarum.Game +import net.torvald.terrarum.Terrarum import com.jme3.math.FastMath import org.newdawn.slick.Graphics import org.newdawn.slick.Image diff --git a/src/com/torvald/terrarum/ABOUT.md b/src/net/torvald/terrarum/ABOUT.md similarity index 100% rename from src/com/torvald/terrarum/ABOUT.md rename to src/net/torvald/terrarum/ABOUT.md diff --git a/src/com/torvald/terrarum/COPYING.md b/src/net/torvald/terrarum/COPYING.md similarity index 100% rename from src/com/torvald/terrarum/COPYING.md rename to src/net/torvald/terrarum/COPYING.md diff --git a/src/com/Torvald/Terrarum/DefaultConfig.kt b/src/net/torvald/terrarum/DefaultConfig.kt similarity index 93% rename from src/com/Torvald/Terrarum/DefaultConfig.kt rename to src/net/torvald/terrarum/DefaultConfig.kt index 592b96ef7..ed4975d76 100644 --- a/src/com/Torvald/Terrarum/DefaultConfig.kt +++ b/src/net/torvald/terrarum/DefaultConfig.kt @@ -1,4 +1,4 @@ -package com.torvald.terrarum +package net.torvald.terrarum import com.google.gson.JsonObject diff --git a/src/com/Torvald/Terrarum/Game.kt b/src/net/torvald/terrarum/Game.kt similarity index 90% rename from src/com/Torvald/Terrarum/Game.kt rename to src/net/torvald/terrarum/Game.kt index e51f4cfd0..06cf2bb6e 100644 --- a/src/com/Torvald/Terrarum/Game.kt +++ b/src/net/torvald/terrarum/Game.kt @@ -1,24 +1,24 @@ -package com.torvald.terrarum +package net.torvald.terrarum -import com.torvald.terrarum.gameactors.* -import com.torvald.terrarum.console.Authenticator -import com.torvald.terrarum.gamecontroller.GameController -import com.torvald.terrarum.gamecontroller.Key -import com.torvald.terrarum.gamecontroller.KeyMap -import com.torvald.terrarum.gamecontroller.KeyToggler -import com.torvald.terrarum.gamemap.GameMap -import com.torvald.terrarum.gamemap.WorldTime -import com.torvald.terrarum.mapdrawer.LightmapRenderer -import com.torvald.terrarum.mapdrawer.MapCamera -import com.torvald.terrarum.mapdrawer.MapDrawer -import com.torvald.terrarum.mapgenerator.MapGenerator -import com.torvald.terrarum.mapgenerator.RoguelikeRandomiser -import com.torvald.terrarum.tileproperties.TilePropCodex -import com.torvald.terrarum.tilestats.TileStats -import com.torvald.terrarum.ui.BasicDebugInfoWindow -import com.torvald.terrarum.ui.ConsoleWindow -import com.torvald.terrarum.ui.Notification -import com.torvald.terrarum.ui.UIHandler +import net.torvald.terrarum.gameactors.* +import net.torvald.terrarum.console.Authenticator +import net.torvald.terrarum.gamecontroller.GameController +import net.torvald.terrarum.gamecontroller.Key +import net.torvald.terrarum.gamecontroller.KeyMap +import net.torvald.terrarum.gamecontroller.KeyToggler +import net.torvald.terrarum.gamemap.GameMap +import net.torvald.terrarum.gamemap.WorldTime +import net.torvald.terrarum.mapdrawer.LightmapRenderer +import net.torvald.terrarum.mapdrawer.MapCamera +import net.torvald.terrarum.mapdrawer.MapDrawer +import net.torvald.terrarum.mapgenerator.MapGenerator +import net.torvald.terrarum.mapgenerator.RoguelikeRandomiser +import net.torvald.terrarum.tileproperties.TilePropCodex +import net.torvald.terrarum.tilestats.TileStats +import net.torvald.terrarum.ui.BasicDebugInfoWindow +import net.torvald.terrarum.ui.ConsoleWindow +import net.torvald.terrarum.ui.Notification +import net.torvald.terrarum.ui.UIHandler import org.lwjgl.opengl.GL11 import org.newdawn.slick.* import org.newdawn.slick.fills.GradientFill @@ -102,7 +102,7 @@ constructor() : BasicGameState() { // add new player and put it to actorContainer - player = PFSigrid.create() + player = PBSigrid.create() //player = PFCynthia.create() //player.setNoClip(true); addActor(player) diff --git a/src/com/Torvald/Terrarum/GameConfig.kt b/src/net/torvald/terrarum/GameConfig.kt similarity index 72% rename from src/com/Torvald/Terrarum/GameConfig.kt rename to src/net/torvald/terrarum/GameConfig.kt index 85e774b50..1b932fba3 100644 --- a/src/com/Torvald/Terrarum/GameConfig.kt +++ b/src/net/torvald/terrarum/GameConfig.kt @@ -1,4 +1,4 @@ -package com.torvald.terrarum +package net.torvald.terrarum /** * Created by minjaesong on 16-03-19. diff --git a/src/com/Torvald/Terrarum/KVHashMap.kt b/src/net/torvald/terrarum/KVHashMap.kt similarity index 98% rename from src/com/Torvald/Terrarum/KVHashMap.kt rename to src/net/torvald/terrarum/KVHashMap.kt index 447b5cd61..aa0240462 100644 --- a/src/com/Torvald/Terrarum/KVHashMap.kt +++ b/src/net/torvald/terrarum/KVHashMap.kt @@ -1,4 +1,4 @@ -package com.torvald.terrarum +package net.torvald.terrarum import com.google.gson.JsonPrimitive import java.util.* diff --git a/src/com/torvald/terrarum/MECHNANICS.md b/src/net/torvald/terrarum/MECHNANICS.md similarity index 100% rename from src/com/torvald/terrarum/MECHNANICS.md rename to src/net/torvald/terrarum/MECHNANICS.md diff --git a/src/com/torvald/terrarum/MISC_FEATURES.md b/src/net/torvald/terrarum/MISC_FEATURES.md similarity index 100% rename from src/com/torvald/terrarum/MISC_FEATURES.md rename to src/net/torvald/terrarum/MISC_FEATURES.md diff --git a/src/com/torvald/terrarum/SAVE_FORMAT.md b/src/net/torvald/terrarum/SAVE_FORMAT.md similarity index 100% rename from src/com/torvald/terrarum/SAVE_FORMAT.md rename to src/net/torvald/terrarum/SAVE_FORMAT.md diff --git a/src/com/Torvald/Terrarum/Terrarum.kt b/src/net/torvald/terrarum/Terrarum.kt similarity index 98% rename from src/com/Torvald/Terrarum/Terrarum.kt rename to src/net/torvald/terrarum/Terrarum.kt index 712075229..c875fb246 100644 --- a/src/com/Torvald/Terrarum/Terrarum.kt +++ b/src/net/torvald/terrarum/Terrarum.kt @@ -1,8 +1,8 @@ -package com.torvald.terrarum +package net.torvald.terrarum -import com.torvald.imagefont.GameFontWhite -import com.torvald.JsonFetcher -import com.torvald.JsonWriter +import net.torvald.imagefont.GameFontWhite +import net.torvald.JsonFetcher +import net.torvald.JsonWriter import org.lwjgl.input.Controllers import org.lwjgl.opengl.GL11 import org.newdawn.slick.AppGameContainer diff --git a/src/com/torvald/terrarum/console/Authenticator.kt b/src/net/torvald/terrarum/console/Authenticator.kt similarity index 89% rename from src/com/torvald/terrarum/console/Authenticator.kt rename to src/net/torvald/terrarum/console/Authenticator.kt index bbeda3d70..d33a10a61 100644 --- a/src/com/torvald/terrarum/console/Authenticator.kt +++ b/src/net/torvald/terrarum/console/Authenticator.kt @@ -1,7 +1,7 @@ -package com.torvald.terrarum.console +package net.torvald.terrarum.console -import com.torvald.terrarum.Terrarum -import com.torvald.terrarum.ui.ConsoleWindow +import net.torvald.terrarum.Terrarum +import net.torvald.terrarum.ui.ConsoleWindow import org.apache.commons.codec.digest.DigestUtils /** diff --git a/src/com/torvald/terrarum/console/Batch.kt b/src/net/torvald/terrarum/console/Batch.kt similarity index 93% rename from src/com/torvald/terrarum/console/Batch.kt rename to src/net/torvald/terrarum/console/Batch.kt index e10afb12f..3cbae7d9f 100644 --- a/src/com/torvald/terrarum/console/Batch.kt +++ b/src/net/torvald/terrarum/console/Batch.kt @@ -1,4 +1,4 @@ -package com.torvald.terrarum.console +package net.torvald.terrarum.console import java.nio.file.FileSystems import java.nio.file.Files diff --git a/src/com/torvald/terrarum/console/CatStdout.kt b/src/net/torvald/terrarum/console/CatStdout.kt similarity index 94% rename from src/com/torvald/terrarum/console/CatStdout.kt rename to src/net/torvald/terrarum/console/CatStdout.kt index 68fa449da..f48da3902 100644 --- a/src/com/torvald/terrarum/console/CatStdout.kt +++ b/src/net/torvald/terrarum/console/CatStdout.kt @@ -1,4 +1,4 @@ -package com.torvald.terrarum.console +package net.torvald.terrarum.console import java.io.IOException import java.nio.file.FileSystems diff --git a/src/com/torvald/terrarum/console/CodexEdictis.kt b/src/net/torvald/terrarum/console/CodexEdictis.kt similarity index 87% rename from src/com/torvald/terrarum/console/CodexEdictis.kt rename to src/net/torvald/terrarum/console/CodexEdictis.kt index 42715c7ee..e3d3a4b41 100644 --- a/src/com/torvald/terrarum/console/CodexEdictis.kt +++ b/src/net/torvald/terrarum/console/CodexEdictis.kt @@ -1,8 +1,8 @@ -package com.torvald.terrarum.console +package net.torvald.terrarum.console -import com.torvald.terrarum.Game -import com.torvald.terrarum.langpack.Lang -import com.torvald.terrarum.ui.ConsoleWindow +import net.torvald.terrarum.Game +import net.torvald.terrarum.langpack.Lang +import net.torvald.terrarum.ui.ConsoleWindow import java.util.Formatter diff --git a/src/com/torvald/terrarum/console/CommandDict.kt b/src/net/torvald/terrarum/console/CommandDict.kt similarity index 95% rename from src/com/torvald/terrarum/console/CommandDict.kt rename to src/net/torvald/terrarum/console/CommandDict.kt index 7ca92c12f..9a8f4bc5f 100644 --- a/src/com/torvald/terrarum/console/CommandDict.kt +++ b/src/net/torvald/terrarum/console/CommandDict.kt @@ -1,6 +1,6 @@ -package com.torvald.terrarum.console +package net.torvald.terrarum.console -import com.torvald.terrarum.Terrarum +import net.torvald.terrarum.Terrarum import java.util.HashMap diff --git a/src/com/torvald/terrarum/console/CommandInterpreter.kt b/src/net/torvald/terrarum/console/CommandInterpreter.kt similarity index 96% rename from src/com/torvald/terrarum/console/CommandInterpreter.kt rename to src/net/torvald/terrarum/console/CommandInterpreter.kt index 9a25d17d2..8230c595f 100644 --- a/src/com/torvald/terrarum/console/CommandInterpreter.kt +++ b/src/net/torvald/terrarum/console/CommandInterpreter.kt @@ -1,7 +1,7 @@ -package com.torvald.terrarum.console +package net.torvald.terrarum.console -import com.torvald.terrarum.langpack.Lang -import com.torvald.terrarum.Terrarum +import net.torvald.terrarum.langpack.Lang +import net.torvald.terrarum.Terrarum import java.util.ArrayList import java.util.Formatter diff --git a/src/com/torvald/terrarum/console/ConsoleCommand.kt b/src/net/torvald/terrarum/console/ConsoleCommand.kt similarity index 81% rename from src/com/torvald/terrarum/console/ConsoleCommand.kt rename to src/net/torvald/terrarum/console/ConsoleCommand.kt index 2b1eccc2b..9f94d0453 100644 --- a/src/com/torvald/terrarum/console/ConsoleCommand.kt +++ b/src/net/torvald/terrarum/console/ConsoleCommand.kt @@ -1,4 +1,4 @@ -package com.torvald.terrarum.console +package net.torvald.terrarum.console /** * Created by minjaesong on 16-01-15. diff --git a/src/com/torvald/terrarum/console/Echo.kt b/src/net/torvald/terrarum/console/Echo.kt similarity index 81% rename from src/com/torvald/terrarum/console/Echo.kt rename to src/net/torvald/terrarum/console/Echo.kt index 546e33a6e..1adfff981 100644 --- a/src/com/torvald/terrarum/console/Echo.kt +++ b/src/net/torvald/terrarum/console/Echo.kt @@ -1,7 +1,7 @@ -package com.torvald.terrarum.console +package net.torvald.terrarum.console -import com.torvald.terrarum.Terrarum -import com.torvald.terrarum.ui.ConsoleWindow +import net.torvald.terrarum.Terrarum +import net.torvald.terrarum.ui.ConsoleWindow import java.util.Arrays diff --git a/src/com/torvald/terrarum/console/ExportAV.kt b/src/net/torvald/terrarum/console/ExportAV.kt similarity index 89% rename from src/com/torvald/terrarum/console/ExportAV.kt rename to src/net/torvald/terrarum/console/ExportAV.kt index e0e8956b7..73100ed57 100644 --- a/src/com/torvald/terrarum/console/ExportAV.kt +++ b/src/net/torvald/terrarum/console/ExportAV.kt @@ -1,7 +1,7 @@ -package com.torvald.terrarum.console +package net.torvald.terrarum.console -import com.torvald.JsonWriter -import com.torvald.terrarum.Terrarum +import net.torvald.JsonWriter +import net.torvald.terrarum.Terrarum import java.io.IOException diff --git a/src/com/torvald/terrarum/console/ExportMap.kt b/src/net/torvald/terrarum/console/ExportMap.kt similarity index 95% rename from src/com/torvald/terrarum/console/ExportMap.kt rename to src/net/torvald/terrarum/console/ExportMap.kt index 0703df24c..24e1644ca 100644 --- a/src/com/torvald/terrarum/console/ExportMap.kt +++ b/src/net/torvald/terrarum/console/ExportMap.kt @@ -1,9 +1,9 @@ -package com.torvald.terrarum.console +package net.torvald.terrarum.console -import com.torvald.colourutil.Col4096 -import com.torvald.RasterWriter -import com.torvald.terrarum.Terrarum -import com.torvald.terrarum.tileproperties.TileNameCode +import net.torvald.colourutil.Col4096 +import net.torvald.RasterWriter +import net.torvald.terrarum.Terrarum +import net.torvald.terrarum.tileproperties.TileNameCode import java.io.* import java.util.HashMap diff --git a/src/com/torvald/terrarum/console/ForceGC.kt b/src/net/torvald/terrarum/console/ForceGC.kt similarity index 88% rename from src/com/torvald/terrarum/console/ForceGC.kt rename to src/net/torvald/terrarum/console/ForceGC.kt index e4d37bc10..ff40a3d31 100644 --- a/src/com/torvald/terrarum/console/ForceGC.kt +++ b/src/net/torvald/terrarum/console/ForceGC.kt @@ -1,4 +1,4 @@ -package com.torvald.terrarum.console +package net.torvald.terrarum.console /** * Created by minjaesong on 16-01-18. diff --git a/src/com/torvald/terrarum/console/GetAV.kt b/src/net/torvald/terrarum/console/GetAV.kt similarity index 90% rename from src/com/torvald/terrarum/console/GetAV.kt rename to src/net/torvald/terrarum/console/GetAV.kt index ff8ab8e8a..0b2845c97 100644 --- a/src/com/torvald/terrarum/console/GetAV.kt +++ b/src/net/torvald/terrarum/console/GetAV.kt @@ -1,8 +1,8 @@ -package com.torvald.terrarum.console +package net.torvald.terrarum.console -import com.torvald.terrarum.gameactors.ActorValue -import com.torvald.terrarum.Game -import com.torvald.terrarum.Terrarum +import net.torvald.terrarum.gameactors.ActorValue +import net.torvald.terrarum.Game +import net.torvald.terrarum.Terrarum /** * Created by minjaesong on 16-01-19. diff --git a/src/com/torvald/terrarum/console/GetFactioning.kt b/src/net/torvald/terrarum/console/GetFactioning.kt similarity index 89% rename from src/com/torvald/terrarum/console/GetFactioning.kt rename to src/net/torvald/terrarum/console/GetFactioning.kt index 30ffd0688..64d0f5367 100644 --- a/src/com/torvald/terrarum/console/GetFactioning.kt +++ b/src/net/torvald/terrarum/console/GetFactioning.kt @@ -1,8 +1,8 @@ -package com.torvald.terrarum.console +package net.torvald.terrarum.console -import com.torvald.terrarum.gameactors.faction.Faction -import com.torvald.terrarum.langpack.Lang -import com.torvald.terrarum.Terrarum +import net.torvald.terrarum.gameactors.faction.Faction +import net.torvald.terrarum.langpack.Lang +import net.torvald.terrarum.Terrarum import java.util.HashSet diff --git a/src/com/torvald/terrarum/console/GetLocale.kt b/src/net/torvald/terrarum/console/GetLocale.kt similarity index 80% rename from src/com/torvald/terrarum/console/GetLocale.kt rename to src/net/torvald/terrarum/console/GetLocale.kt index 043929924..83ebfed37 100644 --- a/src/com/torvald/terrarum/console/GetLocale.kt +++ b/src/net/torvald/terrarum/console/GetLocale.kt @@ -1,7 +1,7 @@ -package com.torvald.terrarum.console +package net.torvald.terrarum.console -import com.torvald.terrarum.langpack.Lang -import com.torvald.terrarum.Terrarum +import net.torvald.terrarum.langpack.Lang +import net.torvald.terrarum.Terrarum /** * Created by minjaesong on 16-01-22. diff --git a/src/com/torvald/terrarum/console/GetTime.kt b/src/net/torvald/terrarum/console/GetTime.kt similarity index 88% rename from src/com/torvald/terrarum/console/GetTime.kt rename to src/net/torvald/terrarum/console/GetTime.kt index 3ca39701f..876f749d0 100644 --- a/src/com/torvald/terrarum/console/GetTime.kt +++ b/src/net/torvald/terrarum/console/GetTime.kt @@ -1,6 +1,6 @@ -package com.torvald.terrarum.console +package net.torvald.terrarum.console -import com.torvald.terrarum.Terrarum +import net.torvald.terrarum.Terrarum /** * Created by minjaesong on 16-03-20. diff --git a/src/com/torvald/terrarum/console/GsonTest.kt b/src/net/torvald/terrarum/console/GsonTest.kt similarity index 94% rename from src/com/torvald/terrarum/console/GsonTest.kt rename to src/net/torvald/terrarum/console/GsonTest.kt index afcda820d..30be0adf0 100644 --- a/src/com/torvald/terrarum/console/GsonTest.kt +++ b/src/net/torvald/terrarum/console/GsonTest.kt @@ -1,6 +1,6 @@ -package com.torvald.terrarum.console +package net.torvald.terrarum.console -import com.torvald.terrarum.Terrarum +import net.torvald.terrarum.Terrarum import com.google.gson.Gson import com.google.gson.JsonElement diff --git a/src/com/torvald/terrarum/console/Help.kt b/src/net/torvald/terrarum/console/Help.kt similarity index 84% rename from src/com/torvald/terrarum/console/Help.kt rename to src/net/torvald/terrarum/console/Help.kt index 368ee0f47..1178c52f9 100644 --- a/src/com/torvald/terrarum/console/Help.kt +++ b/src/net/torvald/terrarum/console/Help.kt @@ -1,7 +1,7 @@ -package com.torvald.terrarum.console +package net.torvald.terrarum.console -import com.torvald.terrarum.Terrarum -import com.torvald.terrarum.langpack.Lang +import net.torvald.terrarum.Terrarum +import net.torvald.terrarum.langpack.Lang /** * Created by minjaesong on 16-03-22. diff --git a/src/com/torvald/terrarum/console/QuitApp.kt b/src/net/torvald/terrarum/console/QuitApp.kt similarity index 84% rename from src/com/torvald/terrarum/console/QuitApp.kt rename to src/net/torvald/terrarum/console/QuitApp.kt index 0b9ece74a..80cf19a21 100644 --- a/src/com/torvald/terrarum/console/QuitApp.kt +++ b/src/net/torvald/terrarum/console/QuitApp.kt @@ -1,4 +1,4 @@ -package com.torvald.terrarum.console +package net.torvald.terrarum.console /** * Created by minjaesong on 16-01-15. diff --git a/src/com/torvald/terrarum/console/SetAV.kt b/src/net/torvald/terrarum/console/SetAV.kt similarity index 94% rename from src/com/torvald/terrarum/console/SetAV.kt rename to src/net/torvald/terrarum/console/SetAV.kt index e2a6c0f67..7b6d81a35 100644 --- a/src/com/torvald/terrarum/console/SetAV.kt +++ b/src/net/torvald/terrarum/console/SetAV.kt @@ -1,7 +1,7 @@ -package com.torvald.terrarum.console +package net.torvald.terrarum.console -import com.torvald.terrarum.Game -import com.torvald.terrarum.Terrarum +import net.torvald.terrarum.Game +import net.torvald.terrarum.Terrarum /** * Created by minjaesong on 16-01-15. diff --git a/src/com/torvald/terrarum/console/SetBulletin.kt b/src/net/torvald/terrarum/console/SetBulletin.kt similarity index 77% rename from src/com/torvald/terrarum/console/SetBulletin.kt rename to src/net/torvald/terrarum/console/SetBulletin.kt index 88d7c1110..c6d8d2d76 100644 --- a/src/com/torvald/terrarum/console/SetBulletin.kt +++ b/src/net/torvald/terrarum/console/SetBulletin.kt @@ -1,8 +1,8 @@ -package com.torvald.terrarum.console +package net.torvald.terrarum.console -import com.torvald.terrarum.langpack.Lang -import com.torvald.terrarum.Terrarum -import com.torvald.terrarum.ui.Notification +import net.torvald.terrarum.langpack.Lang +import net.torvald.terrarum.Terrarum +import net.torvald.terrarum.ui.Notification /** * Created by minjaesong on 16-01-23. diff --git a/src/com/torvald/terrarum/console/SetGlobalLightLevel.kt b/src/net/torvald/terrarum/console/SetGlobalLightLevel.kt similarity index 91% rename from src/com/torvald/terrarum/console/SetGlobalLightLevel.kt rename to src/net/torvald/terrarum/console/SetGlobalLightLevel.kt index 16b93a28e..876737413 100644 --- a/src/com/torvald/terrarum/console/SetGlobalLightLevel.kt +++ b/src/net/torvald/terrarum/console/SetGlobalLightLevel.kt @@ -1,7 +1,7 @@ -package com.torvald.terrarum.console +package net.torvald.terrarum.console -import com.torvald.terrarum.mapdrawer.LightmapRenderer -import com.torvald.terrarum.Terrarum +import net.torvald.terrarum.mapdrawer.LightmapRenderer +import net.torvald.terrarum.Terrarum /** * Created by minjaesong on 16-02-17. diff --git a/src/com/torvald/terrarum/console/SetLocale.kt b/src/net/torvald/terrarum/console/SetLocale.kt similarity index 86% rename from src/com/torvald/terrarum/console/SetLocale.kt rename to src/net/torvald/terrarum/console/SetLocale.kt index f8503940e..8f367d764 100644 --- a/src/com/torvald/terrarum/console/SetLocale.kt +++ b/src/net/torvald/terrarum/console/SetLocale.kt @@ -1,8 +1,8 @@ -package com.torvald.terrarum.console +package net.torvald.terrarum.console -import com.torvald.imagefont.GameFontBase -import com.torvald.terrarum.langpack.Lang -import com.torvald.terrarum.Terrarum +import net.torvald.imagefont.GameFontBase +import net.torvald.terrarum.langpack.Lang +import net.torvald.terrarum.Terrarum import org.apache.commons.csv.CSVRecord import org.newdawn.slick.SlickException diff --git a/src/com/torvald/terrarum/console/SetTime.kt b/src/net/torvald/terrarum/console/SetTime.kt similarity index 91% rename from src/com/torvald/terrarum/console/SetTime.kt rename to src/net/torvald/terrarum/console/SetTime.kt index 91f372572..773ac2c58 100644 --- a/src/com/torvald/terrarum/console/SetTime.kt +++ b/src/net/torvald/terrarum/console/SetTime.kt @@ -1,7 +1,7 @@ -package com.torvald.terrarum.console +package net.torvald.terrarum.console -import com.torvald.terrarum.gamemap.WorldTime -import com.torvald.terrarum.Terrarum +import net.torvald.terrarum.gamemap.WorldTime +import net.torvald.terrarum.Terrarum /** * Created by minjaesong on 16-03-20. diff --git a/src/com/torvald/terrarum/console/SetTimeDelta.kt b/src/net/torvald/terrarum/console/SetTimeDelta.kt similarity index 89% rename from src/com/torvald/terrarum/console/SetTimeDelta.kt rename to src/net/torvald/terrarum/console/SetTimeDelta.kt index 1a42ccfe4..0ccc14319 100644 --- a/src/com/torvald/terrarum/console/SetTimeDelta.kt +++ b/src/net/torvald/terrarum/console/SetTimeDelta.kt @@ -1,6 +1,6 @@ -package com.torvald.terrarum.console +package net.torvald.terrarum.console -import com.torvald.terrarum.Terrarum +import net.torvald.terrarum.Terrarum /** * Created by minjaesong on 16-03-20. diff --git a/src/com/torvald/terrarum/console/SpawnPhysTestBall.kt b/src/net/torvald/terrarum/console/SpawnPhysTestBall.kt similarity index 74% rename from src/com/torvald/terrarum/console/SpawnPhysTestBall.kt rename to src/net/torvald/terrarum/console/SpawnPhysTestBall.kt index d1135c544..147a7474c 100644 --- a/src/com/torvald/terrarum/console/SpawnPhysTestBall.kt +++ b/src/net/torvald/terrarum/console/SpawnPhysTestBall.kt @@ -1,10 +1,10 @@ -package com.torvald.terrarum.console +package net.torvald.terrarum.console -import com.torvald.terrarum.gameactors.Actor -import com.torvald.terrarum.gameactors.ActorWithBody -import com.torvald.terrarum.gameactors.PhysTestBall -import com.torvald.terrarum.mapdrawer.MapCamera -import com.torvald.terrarum.Terrarum +import net.torvald.terrarum.gameactors.Actor +import net.torvald.terrarum.gameactors.ActorWithBody +import net.torvald.terrarum.gameactors.PhysTestBall +import net.torvald.terrarum.mapdrawer.MapCamera +import net.torvald.terrarum.Terrarum /** * Created by minjaesong on 16-03-05. diff --git a/src/com/torvald/terrarum/console/TeleportPlayer.kt b/src/net/torvald/terrarum/console/TeleportPlayer.kt similarity index 83% rename from src/com/torvald/terrarum/console/TeleportPlayer.kt rename to src/net/torvald/terrarum/console/TeleportPlayer.kt index 24d6f1c33..2def0d9ba 100644 --- a/src/com/torvald/terrarum/console/TeleportPlayer.kt +++ b/src/net/torvald/terrarum/console/TeleportPlayer.kt @@ -1,8 +1,8 @@ -package com.torvald.terrarum.console +package net.torvald.terrarum.console -import com.torvald.terrarum.Game -import com.torvald.terrarum.mapdrawer.MapDrawer -import com.torvald.terrarum.Terrarum +import net.torvald.terrarum.Game +import net.torvald.terrarum.mapdrawer.MapDrawer +import net.torvald.terrarum.Terrarum /** * Created by minjaesong on 16-01-24. diff --git a/src/com/torvald/terrarum/console/ToggleNoClip.kt b/src/net/torvald/terrarum/console/ToggleNoClip.kt similarity index 79% rename from src/com/torvald/terrarum/console/ToggleNoClip.kt rename to src/net/torvald/terrarum/console/ToggleNoClip.kt index 85342bacb..4bd17d63b 100644 --- a/src/com/torvald/terrarum/console/ToggleNoClip.kt +++ b/src/net/torvald/terrarum/console/ToggleNoClip.kt @@ -1,7 +1,7 @@ -package com.torvald.terrarum.console +package net.torvald.terrarum.console -import com.torvald.terrarum.Game -import com.torvald.terrarum.Terrarum +import net.torvald.terrarum.Game +import net.torvald.terrarum.Terrarum /** * Created by minjaesong on 16-01-19. diff --git a/src/com/torvald/terrarum/console/Zoom.kt b/src/net/torvald/terrarum/console/Zoom.kt similarity index 92% rename from src/com/torvald/terrarum/console/Zoom.kt rename to src/net/torvald/terrarum/console/Zoom.kt index db5c6bb48..47e482e18 100644 --- a/src/com/torvald/terrarum/console/Zoom.kt +++ b/src/net/torvald/terrarum/console/Zoom.kt @@ -1,6 +1,6 @@ -package com.torvald.terrarum.console +package net.torvald.terrarum.console -import com.torvald.terrarum.Terrarum +import net.torvald.terrarum.Terrarum /** * Created by minjaesong on 16-01-25. diff --git a/src/com/Torvald/Terrarum/gameactors/AIControlled.kt b/src/net/torvald/terrarum/gameactors/AIControlled.kt similarity index 53% rename from src/com/Torvald/Terrarum/gameactors/AIControlled.kt rename to src/net/torvald/terrarum/gameactors/AIControlled.kt index 2a330c734..ef76167fb 100644 --- a/src/com/Torvald/Terrarum/gameactors/AIControlled.kt +++ b/src/net/torvald/terrarum/gameactors/AIControlled.kt @@ -1,6 +1,6 @@ -package com.torvald.terrarum.gameactors +package net.torvald.terrarum.gameactors -import com.torvald.terrarum.gameactors.ai.ActorAI +import net.torvald.terrarum.gameactors.ai.ActorAI /** * Created by minjaesong on 16-03-14. diff --git a/src/com/torvald/terrarum/gameactors/AVKey.kt b/src/net/torvald/terrarum/gameactors/AVKey.kt similarity index 95% rename from src/com/torvald/terrarum/gameactors/AVKey.kt rename to src/net/torvald/terrarum/gameactors/AVKey.kt index 6ba142504..681c2070a 100644 --- a/src/com/torvald/terrarum/gameactors/AVKey.kt +++ b/src/net/torvald/terrarum/gameactors/AVKey.kt @@ -1,4 +1,4 @@ -package com.torvald.terrarum.gameactors +package net.torvald.terrarum.gameactors /** * Created by minjaesong on 16-04-02. diff --git a/src/com/Torvald/Terrarum/gameactors/Actor.kt b/src/net/torvald/terrarum/gameactors/Actor.kt similarity index 89% rename from src/com/Torvald/Terrarum/gameactors/Actor.kt rename to src/net/torvald/terrarum/gameactors/Actor.kt index ecb80ccc7..0ced4dcac 100644 --- a/src/com/Torvald/Terrarum/gameactors/Actor.kt +++ b/src/net/torvald/terrarum/gameactors/Actor.kt @@ -1,4 +1,4 @@ -package com.torvald.terrarum.gameactors +package net.torvald.terrarum.gameactors import org.newdawn.slick.GameContainer diff --git a/src/com/Torvald/Terrarum/gameactors/ActorInventory.kt b/src/net/torvald/terrarum/gameactors/ActorInventory.kt similarity index 95% rename from src/com/Torvald/Terrarum/gameactors/ActorInventory.kt rename to src/net/torvald/terrarum/gameactors/ActorInventory.kt index d33b2d793..39e6e7a2d 100644 --- a/src/com/Torvald/Terrarum/gameactors/ActorInventory.kt +++ b/src/net/torvald/terrarum/gameactors/ActorInventory.kt @@ -1,7 +1,7 @@ -package com.torvald.terrarum.gameactors +package net.torvald.terrarum.gameactors -import com.torvald.terrarum.gameitem.InventoryItem -import com.torvald.terrarum.itemproperties.ItemPropCodex +import net.torvald.terrarum.gameitem.InventoryItem +import net.torvald.terrarum.itemproperties.ItemPropCodex import java.util.* /** diff --git a/src/com/Torvald/Terrarum/gameactors/ActorValue.kt b/src/net/torvald/terrarum/gameactors/ActorValue.kt similarity index 50% rename from src/com/Torvald/Terrarum/gameactors/ActorValue.kt rename to src/net/torvald/terrarum/gameactors/ActorValue.kt index 8167f065f..907267412 100644 --- a/src/com/Torvald/Terrarum/gameactors/ActorValue.kt +++ b/src/net/torvald/terrarum/gameactors/ActorValue.kt @@ -1,6 +1,6 @@ -package com.torvald.terrarum.gameactors +package net.torvald.terrarum.gameactors -import com.torvald.terrarum.KVHashMap +import net.torvald.terrarum.KVHashMap /** * Created by minjaesong on 16-03-19. diff --git a/src/com/Torvald/Terrarum/gameactors/ActorWithBody.kt b/src/net/torvald/terrarum/gameactors/ActorWithBody.kt similarity index 69% rename from src/com/Torvald/Terrarum/gameactors/ActorWithBody.kt rename to src/net/torvald/terrarum/gameactors/ActorWithBody.kt index 0d8d32c18..5801efdf1 100644 --- a/src/com/Torvald/Terrarum/gameactors/ActorWithBody.kt +++ b/src/net/torvald/terrarum/gameactors/ActorWithBody.kt @@ -1,13 +1,13 @@ -package com.torvald.terrarum.gameactors +package net.torvald.terrarum.gameactors -import com.torvald.random.HQRNG -import com.torvald.terrarum.* -import com.torvald.terrarum.gamemap.GameMap -import com.torvald.terrarum.mapdrawer.MapDrawer -import com.torvald.terrarum.tileproperties.TilePropCodex -import com.torvald.spriteanimation.SpriteAnimation +import net.torvald.random.HQRNG +import net.torvald.terrarum.* +import net.torvald.terrarum.gamemap.GameMap +import net.torvald.terrarum.mapdrawer.MapDrawer +import net.torvald.terrarum.tileproperties.TilePropCodex +import net.torvald.spriteanimation.SpriteAnimation import com.jme3.math.FastMath -import com.torvald.terrarum.tileproperties.TileNameCode +import net.torvald.terrarum.tileproperties.TileNameCode import org.newdawn.slick.GameContainer import org.newdawn.slick.Graphics @@ -57,8 +57,8 @@ open class ActorWithBody constructor() : Actor, Visible, Glowing { /** * Positions: top-left point */ - @Volatile var hitbox: Hitbox? = null - @Volatile @Transient var nextHitbox: Hitbox? = null + val hitbox = Hitbox(0f,0f,0f,0f) + @Transient val nextHitbox = Hitbox(0f,0f,0f,0f) /** * Physical properties @@ -127,16 +127,14 @@ open class ActorWithBody constructor() : Actor, Visible, Glowing { */ @Transient val INVINCIBILITY_TIME = 500 - /** - * Will ignore fluid resistance if (submerged height / actor height) <= this var - */ - @Transient private val FLUID_RESISTANCE_IGNORE_THRESHOLD_RATIO = 0.2f - @Transient private val FLUID_RESISTANCE_APPLY_FULL_RATIO = 0.5f - @Transient private val map: GameMap @Transient private val MASS_DEFAULT = 60f + + private var posAdjustX = 0 + private var posAdjustY = 0 + init { do { referenceID = HQRNG().nextLong() // set new ID @@ -172,11 +170,17 @@ open class ActorWithBody constructor() : Actor, Visible, Glowing { * @param y */ fun setPosition(x: Float, y: Float) { - hitbox = Hitbox( - x - (baseHitboxW / 2 - hitboxTranslateX) * scale, y - (baseHitboxH - hitboxTranslateY) * scale, baseHitboxW * scale, baseHitboxH * scale) + hitbox.set( + x - (baseHitboxW / 2 - hitboxTranslateX) * scale, + y - (baseHitboxH - hitboxTranslateY) * scale, + baseHitboxW * scale, + baseHitboxH * scale) - nextHitbox = Hitbox( - x - (baseHitboxW / 2 - hitboxTranslateX) * scale, y - (baseHitboxH - hitboxTranslateY) * scale, baseHitboxW * scale, baseHitboxH * scale) + nextHitbox.set( + x - (baseHitboxW / 2 - hitboxTranslateX) * scale, + y - (baseHitboxH - hitboxTranslateY) * scale, + baseHitboxW * scale, + baseHitboxH * scale) } private fun updatePhysicalInfos() { @@ -216,24 +220,16 @@ open class ActorWithBody constructor() : Actor, Visible, Glowing { // Actors are subject to the gravity and the buoyancy if they are not levitating if (!isNoSubjectToGrav) { applyGravitation() - applyBuoyancy() + //applyBuoyancy() } // hard limit velocity if (veloX > VELO_HARD_LIMIT) veloX = VELO_HARD_LIMIT if (veloY > VELO_HARD_LIMIT) veloY = VELO_HARD_LIMIT - // limit velocity by fluid resistance - //int tilePropResistance = getTileMvmtRstc(); - //if (!noSubjectToFluidResistance) { - // veloX *= mvmtRstcToMultiplier(tilePropResistance); - // veloY *= mvmtRstcToMultiplier(tilePropResistance); - //} - // Set 'next' position (hitbox) to fiddle with updateNextHitboxFromVelo() - // if not horizontally moving then ... //if (Math.abs(veloX) < 0.5) { // fix for special situations (see fig. 1 at the bottom of the source) // updateVerticalPos(); @@ -286,10 +282,12 @@ open class ActorWithBody constructor() : Actor, Visible, Glowing { if (veloY >= 0) { // check downward if (isColliding(CONTACT_AREA_BOTTOM)) { // the ground has dug into the body adjustHitBottom() + veloY = 0f // reset veloY, simulating normal force elasticReflectY() grounded = true } else if (isColliding(CONTACT_AREA_BOTTOM, 0, 1)) { // the actor is standing ON the ground + veloY = 0f // reset veloY, simulating normal force elasticReflectY() grounded = true } @@ -301,9 +299,11 @@ open class ActorWithBody constructor() : Actor, Visible, Glowing { grounded = false if (isColliding(CONTACT_AREA_TOP)) { // the ceiling has dug into the body adjustHitTop() + veloY = 0f // reset veloY, simulating normal force elasticReflectY() } else if (isColliding(CONTACT_AREA_TOP, 0, -1)) { // the actor is touching the ceiling + veloY = 0f // reset veloY, simulating normal force elasticReflectY() // reflect on ceiling, for reversed gravity } else { // the actor is not grounded at all @@ -313,9 +313,9 @@ open class ActorWithBody constructor() : Actor, Visible, Glowing { } private fun adjustHitBottom() { - val newX = nextHitbox!!.pointedX // look carefully, getPos or getPointed + val newX = nextHitbox.pointedX // look carefully, getPos or getPointed // int-ify posY of nextHitbox - nextHitbox!!.setPositionYFromPoint(FastMath.floor(nextHitbox!!.pointedY).toFloat()) + nextHitbox.setPositionYFromPoint(FastMath.floor(nextHitbox.pointedY).toFloat()) var newYOff = 0 // always positive @@ -326,14 +326,15 @@ open class ActorWithBody constructor() : Actor, Visible, Glowing { colliding = isColliding(CONTACT_AREA_BOTTOM, 0, -newYOff) } while (colliding) - val newY = nextHitbox!!.pointedY - newYOff - nextHitbox!!.setPositionFromPoint(newX, newY) + posAdjustY = -newYOff + val newY = nextHitbox.pointedY - newYOff + nextHitbox.setPositionFromPoint(newX, newY) } private fun adjustHitTop() { - val newX = nextHitbox!!.posX + val newX = nextHitbox.posX // int-ify posY of nextHitbox - nextHitbox!!.setPositionY(FastMath.ceil(nextHitbox!!.posY).toFloat()) + nextHitbox.setPositionY(FastMath.ceil(nextHitbox.posY).toFloat()) var newYOff = 0 // always positive @@ -344,8 +345,9 @@ open class ActorWithBody constructor() : Actor, Visible, Glowing { colliding = isColliding(CONTACT_AREA_TOP, 0, newYOff) } while (colliding) - val newY = nextHitbox!!.posY + newYOff - nextHitbox!!.setPosition(newX, newY) + posAdjustY = newYOff + val newY = nextHitbox.posY + newYOff + nextHitbox.setPosition(newX, newY) } private fun updateHorizontalPos() { @@ -354,10 +356,12 @@ open class ActorWithBody constructor() : Actor, Visible, Glowing { if (isColliding(CONTACT_AREA_RIGHT) && !isColliding(CONTACT_AREA_LEFT)) { // the actor is embedded to the wall adjustHitRight() + veloX = 0f // reset veloX, simulating normal force elasticReflectX() } - else if (isColliding(CONTACT_AREA_RIGHT, 1, 0) && !isColliding(CONTACT_AREA_LEFT, -1, 0)) { + else if (isColliding(CONTACT_AREA_RIGHT, 2, 0) && !isColliding(CONTACT_AREA_LEFT, 0, 0)) { // offset by +1, to fix directional quarks // the actor is touching the wall + veloX = 0f // reset veloX, simulating normal force elasticReflectX() } else { @@ -368,10 +372,12 @@ open class ActorWithBody constructor() : Actor, Visible, Glowing { if (isColliding(CONTACT_AREA_LEFT) && !isColliding(CONTACT_AREA_RIGHT)) { // the actor is embedded to the wall adjustHitLeft() + veloX = 0f // reset veloX, simulating normal force elasticReflectX() } else if (isColliding(CONTACT_AREA_LEFT, -1, 0) && !isColliding(CONTACT_AREA_RIGHT, 1, 0)) { // the actor is touching the wall + veloX = 0f // reset veloX, simulating normal force elasticReflectX() } else { @@ -380,6 +386,7 @@ open class ActorWithBody constructor() : Actor, Visible, Glowing { else { // check both sides? // System.out.println("updatehorizontal - |velo| < 0.5"); //if (isColliding(CONTACT_AREA_LEFT) || isColliding(CONTACT_AREA_RIGHT)) { + // veloX = 0f // reset veloX, simulating normal force // elasticReflectX() //} } @@ -387,9 +394,9 @@ open class ActorWithBody constructor() : Actor, Visible, Glowing { } private fun adjustHitRight() { - val newY = nextHitbox!!.posY // look carefully, posY or pointedY + val newY = nextHitbox.posY // look carefully, posY or pointedY // int-ify posY of nextHitbox - nextHitbox!!.setPositionX(FastMath.floor(nextHitbox!!.posX + nextHitbox!!.width) - nextHitbox!!.width) + nextHitbox.setPositionX(FastMath.floor(nextHitbox.posX + nextHitbox.width) - nextHitbox.width) var newXOff = 0 // always positive @@ -397,17 +404,17 @@ open class ActorWithBody constructor() : Actor, Visible, Glowing { var colliding: Boolean do { newXOff += 1 - colliding = isColliding(CONTACT_AREA_BOTTOM, -newXOff, 0) + colliding = isColliding(CONTACT_AREA_BOTTOM, -newXOff + 1, 0) // offset by +1, to fix directional quarks } while (newXOff < TSIZE && colliding) - val newX = nextHitbox!!.posX - newXOff -1 // -1: Q&D way to prevent the actor sticking to the wall and won't detach - nextHitbox!!.setPosition(newX, newY) + val newX = nextHitbox.posX - newXOff // -1: Q&D way to prevent the actor sticking to the wall and won't detach + nextHitbox.setPosition(newX, newY) } private fun adjustHitLeft() { - val newY = nextHitbox!!.posY + val newY = nextHitbox.posY // int-ify posY of nextHitbox - nextHitbox!!.setPositionX(FastMath.ceil(nextHitbox!!.posX).toFloat()) + nextHitbox.setPositionX(FastMath.ceil(nextHitbox.posX).toFloat()) var newXOff = 0 // always positive @@ -418,44 +425,50 @@ open class ActorWithBody constructor() : Actor, Visible, Glowing { colliding = isColliding(CONTACT_AREA_TOP, newXOff, 0) } while (newXOff < TSIZE && colliding) - val newX = nextHitbox!!.posX + newXOff +1 // +1: Q&D way to prevent the actor sticking to the wall and won't detach - nextHitbox!!.setPosition(newX, newY) + posAdjustX = newXOff + val newX = nextHitbox.posX + newXOff // +1: Q&D way to prevent the actor sticking to the wall and won't detach + nextHitbox.setPosition(newX, newY) } private fun elasticReflectX() { - if (veloX != 0f) veloX = -veloX * elasticity + if (veloX != 0f && (veloX * elasticity).abs() > 0.5) { + veloX = -veloX * elasticity + + } } private fun elasticReflectY() { - if (veloY != 0f) veloY = -veloY * elasticity + if (veloY != 0f && (veloY * elasticity).abs() > 0.5) { + veloY = -veloY * elasticity + } } private fun isColliding(side: Int, tx: Int = 0, ty: Int = 0): Boolean = getContactingArea(side, tx, ty) > 1 private fun getContactingArea(side: Int, translateX: Int = 0, translateY: Int = 0): Int { var contactAreaCounter = 0 - for (i in 0..Math.round(if (side % 2 == 0) nextHitbox!!.width else nextHitbox!!.height) - 1) { + for (i in 0..(if (side % 2 == 0) nextHitbox.width else nextHitbox.height).roundToInt() - 1) { // set tile positions val tileX: Int val tileY: Int if (side == CONTACT_AREA_BOTTOM) { - tileX = div16TruncateToMapWidth(Math.round(nextHitbox!!.hitboxStart.x) + tileX = div16TruncateToMapWidth(nextHitbox.hitboxStart.x.roundToInt() + i + translateX) - tileY = div16TruncateToMapHeight(Math.round(nextHitbox!!.hitboxEnd.y) + translateY) + tileY = div16TruncateToMapHeight(nextHitbox.hitboxEnd.y.roundToInt() + translateY) } else if (side == CONTACT_AREA_TOP) { - tileX = div16TruncateToMapWidth(Math.round(nextHitbox!!.hitboxStart.x) + tileX = div16TruncateToMapWidth(nextHitbox.hitboxStart.x.roundToInt() + i + translateX) - tileY = div16TruncateToMapHeight(Math.round(nextHitbox!!.hitboxStart.y) + translateY) + tileY = div16TruncateToMapHeight(nextHitbox.hitboxStart.y.roundToInt() + translateY) } else if (side == CONTACT_AREA_RIGHT) { - tileX = div16TruncateToMapWidth(Math.round(nextHitbox!!.hitboxEnd.x) + translateX) - tileY = div16TruncateToMapHeight(Math.round(nextHitbox!!.hitboxStart.y) + tileX = div16TruncateToMapWidth(nextHitbox.hitboxEnd.x.roundToInt() + translateX) + tileY = div16TruncateToMapHeight(nextHitbox.hitboxStart.y.roundToInt() + i + translateY) } else if (side == CONTACT_AREA_LEFT) { - tileX = div16TruncateToMapWidth(Math.round(nextHitbox!!.hitboxStart.x) + translateX) - tileY = div16TruncateToMapHeight(Math.round(nextHitbox!!.hitboxStart.y) + tileX = div16TruncateToMapWidth(nextHitbox.hitboxStart.x.roundToInt() + translateX) + tileY = div16TruncateToMapHeight(nextHitbox.hitboxStart.y.roundToInt() + i + translateY) } else { @@ -473,28 +486,28 @@ open class ActorWithBody constructor() : Actor, Visible, Glowing { private fun getContactingAreaFluid(side: Int, translateX: Int = 0, translateY: Int = 0): Int { var contactAreaCounter = 0 - for (i in 0..Math.round(if (side % 2 == 0) nextHitbox!!.width else nextHitbox!!.height) - 1) { + for (i in 0..(if (side % 2 == 0) nextHitbox.width else nextHitbox.height).roundToInt() - 1) { // set tile positions val tileX: Int val tileY: Int if (side == CONTACT_AREA_BOTTOM) { - tileX = div16TruncateToMapWidth(Math.round(nextHitbox!!.hitboxStart.x) + tileX = div16TruncateToMapWidth(nextHitbox.hitboxStart.x.roundToInt() + i + translateX) - tileY = div16TruncateToMapHeight(Math.round(nextHitbox!!.hitboxEnd.y) + translateY) + tileY = div16TruncateToMapHeight(nextHitbox.hitboxEnd.y.roundToInt() + translateY) } else if (side == CONTACT_AREA_TOP) { - tileX = div16TruncateToMapWidth(Math.round(nextHitbox!!.hitboxStart.x) + tileX = div16TruncateToMapWidth(nextHitbox.hitboxStart.x.roundToInt() + i + translateX) - tileY = div16TruncateToMapHeight(Math.round(nextHitbox!!.hitboxStart.y) + translateY) + tileY = div16TruncateToMapHeight(nextHitbox.hitboxStart.y.roundToInt() + translateY) } else if (side == CONTACT_AREA_RIGHT) { - tileX = div16TruncateToMapWidth(Math.round(nextHitbox!!.hitboxEnd.x) + translateX) - tileY = div16TruncateToMapHeight(Math.round(nextHitbox!!.hitboxStart.y) + tileX = div16TruncateToMapWidth(nextHitbox.hitboxEnd.x.roundToInt() + translateX) + tileY = div16TruncateToMapHeight(nextHitbox.hitboxStart.y.roundToInt() + i + translateY) } else if (side == CONTACT_AREA_LEFT) { - tileX = div16TruncateToMapWidth(Math.round(nextHitbox!!.hitboxStart.x) + translateX) - tileY = div16TruncateToMapHeight(Math.round(nextHitbox!!.hitboxStart.y) + tileX = div16TruncateToMapWidth(nextHitbox.hitboxStart.x.roundToInt() + translateX) + tileY = div16TruncateToMapHeight(nextHitbox.hitboxStart.y.roundToInt() + i + translateY) } else { @@ -514,7 +527,7 @@ open class ActorWithBody constructor() : Actor, Visible, Glowing { * [N] = [kg * m / s^2] * F(bo) = density * submerged_volume * gravitational_acceleration [N] */ - private fun applyBuoyancy() { + /*private fun applyBuoyancy() { val fluidDensity = tileDensity val submergedVolume = submergedVolume @@ -525,16 +538,16 @@ open class ActorWithBody constructor() : Actor, Visible, Glowing { * Math.pow(mass.toDouble(), -1.0) * SI_TO_GAME_ACC.toDouble()).toFloat() } - } + }*/ - private val submergedVolume: Float - get() = submergedHeight * hitbox!!.width * hitbox!!.width + /*private val submergedVolume: Float + get() = submergedHeight * hitbox.width * hitbox.width private val submergedHeight: Float get() = Math.max( getContactingAreaFluid(CONTACT_AREA_LEFT), getContactingAreaFluid(CONTACT_AREA_RIGHT) - ).toFloat() + ).toFloat()*/ /** @@ -546,9 +559,9 @@ open class ActorWithBody constructor() : Actor, Visible, Glowing { var friction = 0 //get highest fluid density - val tilePosXStart = Math.round(nextHitbox!!.posX / TSIZE) - val tilePosXEnd = Math.round(nextHitbox!!.hitboxEnd.x / TSIZE) - val tilePosY = Math.round(nextHitbox!!.pointedY / TSIZE) + val tilePosXStart = (nextHitbox.posX / TSIZE).roundToInt() + val tilePosXEnd = (nextHitbox.hitboxEnd.x / TSIZE).roundToInt() + val tilePosY = (nextHitbox.pointedY / TSIZE).roundToInt() for (x in tilePosXStart..tilePosXEnd) { val tile = map.getTileFromTerrain(x, tilePosY) if (TilePropCodex.getProp(tile).isFluid) { @@ -561,33 +574,6 @@ open class ActorWithBody constructor() : Actor, Visible, Glowing { return friction } - /** - * Get highest movement resistance value from tiles that the body occupies. - * @return - */ - private val tileMvmtRstc: Int - get() { - var resistance = 0 - - //get highest fluid density - val tilePosXStart = Math.round(nextHitbox!!.posX / TSIZE) - val tilePosYStart = Math.round(nextHitbox!!.posY / TSIZE) - val tilePosXEnd = Math.round(nextHitbox!!.hitboxEnd.x / TSIZE) - val tilePosYEnd = Math.round(nextHitbox!!.hitboxEnd.y / TSIZE) - for (y in tilePosYStart..tilePosYEnd) { - for (x in tilePosXStart..tilePosXEnd) { - val tile = map.getTileFromTerrain(x, y) - if (TilePropCodex.getProp(tile).isFluid) { - val thisFluidDensity = TilePropCodex.getProp(tile).movementResistance - - if (thisFluidDensity > resistance) resistance = thisFluidDensity - } - } - } - - return resistance - } - /** * Get highest density (specific gravity) value from tiles that the body occupies. * @return @@ -597,10 +583,10 @@ open class ActorWithBody constructor() : Actor, Visible, Glowing { var density = 0 //get highest fluid density - val tilePosXStart = Math.round(nextHitbox!!.posX / TSIZE) - val tilePosYStart = Math.round(nextHitbox!!.posY / TSIZE) - val tilePosXEnd = Math.round(nextHitbox!!.hitboxEnd.x / TSIZE) - val tilePosYEnd = Math.round(nextHitbox!!.hitboxEnd.y / TSIZE) + val tilePosXStart = (nextHitbox.posX / TSIZE).roundToInt() + val tilePosYStart = (nextHitbox.posY / TSIZE).roundToInt() + val tilePosXEnd = (nextHitbox.hitboxEnd.x / TSIZE).roundToInt() + val tilePosYEnd = (nextHitbox.hitboxEnd.y / TSIZE).roundToInt() for (y in tilePosYStart..tilePosYEnd) { for (x in tilePosXStart..tilePosXEnd) { val tile = map.getTileFromTerrain(x, y) @@ -620,55 +606,45 @@ open class ActorWithBody constructor() : Actor, Visible, Glowing { } private fun clampHitbox() { - hitbox!!.setPositionFromPoint( - clampW(hitbox!!.pointedX), clampH(hitbox!!.pointedY)) + hitbox.setPositionFromPoint( + clampW(hitbox.pointedX), clampH(hitbox.pointedY)) } private fun clampNextHitbox() { - nextHitbox!!.setPositionFromPoint( - clampW(nextHitbox!!.pointedX), clampH(nextHitbox!!.pointedY)) + nextHitbox.setPositionFromPoint( + clampW(nextHitbox.pointedX), clampH(nextHitbox.pointedY)) } private fun updateNextHitboxFromVelo() { - val fluidResistance = mvmtRstcToMultiplier(tileMvmtRstc) - val submergedRatio = FastMath.clamp( - submergedHeight / nextHitbox!!.height, - 0f, 1f - ) - val applyResistance: Boolean = !isNoSubjectToFluidResistance - && submergedRatio > FLUID_RESISTANCE_IGNORE_THRESHOLD_RATIO - val resistance: Float = FastMath.interpolateLinear( - submergedRatio, - 1f, fluidResistance - ) - nextHitbox!!.set( - Math.round(hitbox!!.posX + veloX * (if (!applyResistance) 1f else resistance)).toFloat() - , Math.round(hitbox!!.posY + veloY * (if (!applyResistance) 1f else resistance)).toFloat() - , Math.round(baseHitboxW * scale).toFloat() - , Math.round(baseHitboxH * scale).toFloat()) + nextHitbox.set( + (hitbox.posX + veloX).round() + , (hitbox.posY + veloY).round() + , (baseHitboxW * scale).round() + , (baseHitboxH * scale).round() + ) /** Full quantisation; wonder what havoc these statements would wreak... */ } private fun updateHitboxX() { - hitbox!!.setDimension( - nextHitbox!!.width, nextHitbox!!.height) - hitbox!!.setPositionX(nextHitbox!!.posX) + hitbox.setDimension( + nextHitbox.width, nextHitbox.height) + hitbox.setPositionX(nextHitbox.posX) } private fun updateHitboxY() { - hitbox!!.setDimension( - nextHitbox!!.width, nextHitbox!!.height) - hitbox!!.setPositionY(nextHitbox!!.posY) + hitbox.setDimension( + nextHitbox.width, nextHitbox.height) + hitbox.setPositionY(nextHitbox.posY) } override fun drawGlow(gc: GameContainer, g: Graphics) { if (isVisible && spriteGlow != null) { if (!sprite!!.flippedHorizontal()) { - spriteGlow!!.render(g, hitbox!!.posX - hitboxTranslateX * scale, hitbox!!.posY + hitboxTranslateY * scale - (baseSpriteHeight - baseHitboxH) * scale + 2, scale) + spriteGlow!!.render(g, hitbox.posX - hitboxTranslateX * scale, hitbox.posY + hitboxTranslateY * scale - (baseSpriteHeight - baseHitboxH) * scale + 2, scale) } else { - spriteGlow!!.render(g, hitbox!!.posX - scale, hitbox!!.posY + hitboxTranslateY * scale - (baseSpriteHeight - baseHitboxH) * scale + 2, scale) + spriteGlow!!.render(g, hitbox.posX - scale, hitbox.posY + hitboxTranslateY * scale - (baseSpriteHeight - baseHitboxH) * scale + 2, scale) } } } @@ -676,9 +652,9 @@ open class ActorWithBody constructor() : Actor, Visible, Glowing { override fun drawBody(gc: GameContainer, g: Graphics) { if (isVisible && sprite != null) { if (!sprite!!.flippedHorizontal()) { - sprite!!.render(g, hitbox!!.posX - hitboxTranslateX * scale, hitbox!!.posY + hitboxTranslateY * scale - (baseSpriteHeight - baseHitboxH) * scale + 2, scale) + sprite!!.render(g, hitbox.posX - hitboxTranslateX * scale, hitbox.posY + hitboxTranslateY * scale - (baseSpriteHeight - baseHitboxH) * scale + 2, scale) } else { - sprite!!.render(g, hitbox!!.posX - scale, hitbox!!.posY + hitboxTranslateY * scale - (baseSpriteHeight - baseHitboxH) * scale + 2, scale) + sprite!!.render(g, hitbox.posX - scale, hitbox.posY + hitboxTranslateY * scale - (baseSpriteHeight - baseHitboxH) * scale + 2, scale) } } } @@ -691,52 +667,46 @@ open class ActorWithBody constructor() : Actor, Visible, Glowing { if (sprite != null) sprite!!.update(delta) } - private fun clampW(x: Float): Float { - if (x < TSIZE + nextHitbox!!.width / 2) { - return TSIZE + nextHitbox!!.width / 2 - } else if (x >= (map.width * TSIZE).toFloat() - TSIZE.toFloat() - nextHitbox!!.width / 2) { - return (map.width * TSIZE).toFloat() - 1f - TSIZE.toFloat() - nextHitbox!!.width / 2 + private fun clampW(x: Float): Float = + if (x < TSIZE + nextHitbox.width / 2) { + TSIZE + nextHitbox.width / 2 + } else if (x >= (map.width * TSIZE).toFloat() - TSIZE.toFloat() - nextHitbox.width / 2) { + (map.width * TSIZE).toFloat() - 1f - TSIZE.toFloat() - nextHitbox.width / 2 } else { - return x + x } - } - private fun clampH(y: Float): Float { - if (y < TSIZE + nextHitbox!!.height) { - return TSIZE + nextHitbox!!.height - } else if (y >= (map.height * TSIZE).toFloat() - TSIZE.toFloat() - nextHitbox!!.height) { - return (map.height * TSIZE).toFloat() - 1f - TSIZE.toFloat() - nextHitbox!!.height + private fun clampH(y: Float): Float = + if (y < TSIZE + nextHitbox.height) { + TSIZE + nextHitbox.height + } else if (y >= (map.height * TSIZE).toFloat() - TSIZE.toFloat() - nextHitbox.height) { + (map.height * TSIZE).toFloat() - 1f - TSIZE.toFloat() - nextHitbox.height } else { - return y + y } - } - private fun clampWtile(x: Int): Int { + private fun clampWtile(x: Int): Int = if (x < 0) { - return 0 + 0 } else if (x >= map.width) { - return map.width - 1 + map.width - 1 } else { - return x + x } - } - private fun clampHtile(x: Int): Int { + private fun clampHtile(x: Int): Int = if (x < 0) { - return 0 + 0 } else if (x >= map.height) { - return map.height - 1 + map.height - 1 } else { - return x + x } - } private val isPlayerNoClip: Boolean get() = this is Player && this.isNoClip() - private fun quantiseTSize(v: Float): Int { - return FastMath.floor(v / TSIZE) * TSIZE - } + private fun quantiseTSize(v: Float): Int = FastMath.floor(v / TSIZE) * TSIZE fun setDensity(density: Int) { if (density < 0) @@ -745,6 +715,10 @@ open class ActorWithBody constructor() : Actor, Visible, Glowing { this.density = density.toFloat() } + fun Float.round() = Math.round(this).toFloat() + fun Float.roundToInt(): Int = Math.round(this) + fun Float.abs() = FastMath.abs(this) + companion object { @Transient private val TSIZE = MapDrawer.TILE_SIZE diff --git a/src/com/torvald/terrarum/gameactors/CanBeAnItem.kt b/src/net/torvald/terrarum/gameactors/CanBeAnItem.kt similarity index 71% rename from src/com/torvald/terrarum/gameactors/CanBeAnItem.kt rename to src/net/torvald/terrarum/gameactors/CanBeAnItem.kt index 2ecd648ac..e74cdf1fb 100644 --- a/src/com/torvald/terrarum/gameactors/CanBeAnItem.kt +++ b/src/net/torvald/terrarum/gameactors/CanBeAnItem.kt @@ -1,6 +1,6 @@ -package com.torvald.terrarum.gameactors +package net.torvald.terrarum.gameactors -import com.torvald.terrarum.gameitem.InventoryItem +import net.torvald.terrarum.gameitem.InventoryItem /** * Created by minjaesong on 16-03-14. diff --git a/src/com/Torvald/Terrarum/gameactors/Controllable.kt b/src/net/torvald/terrarum/gameactors/Controllable.kt similarity index 81% rename from src/com/Torvald/Terrarum/gameactors/Controllable.kt rename to src/net/torvald/terrarum/gameactors/Controllable.kt index 255e5d60f..c911f4125 100644 --- a/src/com/Torvald/Terrarum/gameactors/Controllable.kt +++ b/src/net/torvald/terrarum/gameactors/Controllable.kt @@ -1,4 +1,4 @@ -package com.torvald.terrarum.gameactors +package net.torvald.terrarum.gameactors import org.newdawn.slick.Input diff --git a/src/com/torvald/terrarum/gameactors/CreatureBuilder.kt b/src/net/torvald/terrarum/gameactors/CreatureBuilder.kt similarity index 72% rename from src/com/torvald/terrarum/gameactors/CreatureBuilder.kt rename to src/net/torvald/terrarum/gameactors/CreatureBuilder.kt index dcdcc8b76..150374bc1 100644 --- a/src/com/torvald/terrarum/gameactors/CreatureBuilder.kt +++ b/src/net/torvald/terrarum/gameactors/CreatureBuilder.kt @@ -1,9 +1,9 @@ -package com.torvald.terrarum.gameactors +package net.torvald.terrarum.gameactors -import com.torvald.JsonFetcher -import com.torvald.random.Fudge3 -import com.torvald.random.HQRNG -import com.torvald.terrarum.langpack.Lang +import net.torvald.JsonFetcher +import net.torvald.random.Fudge3 +import net.torvald.random.HQRNG +import net.torvald.terrarum.langpack.Lang import com.google.gson.JsonObject import org.newdawn.slick.SlickException import java.io.IOException diff --git a/src/com/Torvald/Terrarum/gameactors/CreatureRawInjector.kt b/src/net/torvald/terrarum/gameactors/CreatureRawInjector.kt similarity index 96% rename from src/com/Torvald/Terrarum/gameactors/CreatureRawInjector.kt rename to src/net/torvald/terrarum/gameactors/CreatureRawInjector.kt index 52afb3c41..c2d95276c 100644 --- a/src/com/Torvald/Terrarum/gameactors/CreatureRawInjector.kt +++ b/src/net/torvald/terrarum/gameactors/CreatureRawInjector.kt @@ -1,8 +1,8 @@ -package com.torvald.terrarum.gameactors +package net.torvald.terrarum.gameactors -import com.torvald.JsonFetcher -import com.torvald.random.Fudge3 -import com.torvald.terrarum.langpack.Lang +import net.torvald.JsonFetcher +import net.torvald.random.Fudge3 +import net.torvald.terrarum.langpack.Lang import com.google.gson.JsonObject import org.newdawn.slick.SlickException import java.io.IOException diff --git a/src/com/Torvald/Terrarum/gameactors/DroppedItem.kt b/src/net/torvald/terrarum/gameactors/DroppedItem.kt similarity index 90% rename from src/com/Torvald/Terrarum/gameactors/DroppedItem.kt rename to src/net/torvald/terrarum/gameactors/DroppedItem.kt index 6eb4d3ecc..89cd21bd2 100644 --- a/src/com/Torvald/Terrarum/gameactors/DroppedItem.kt +++ b/src/net/torvald/terrarum/gameactors/DroppedItem.kt @@ -1,4 +1,4 @@ -package com.torvald.terrarum.gameactors +package net.torvald.terrarum.gameactors import org.newdawn.slick.GameContainer import org.newdawn.slick.Graphics diff --git a/src/com/Torvald/Terrarum/gameactors/Factionable.kt b/src/net/torvald/terrarum/gameactors/Factionable.kt similarity index 57% rename from src/com/Torvald/Terrarum/gameactors/Factionable.kt rename to src/net/torvald/terrarum/gameactors/Factionable.kt index e6dc5e179..ae7d0e044 100644 --- a/src/com/Torvald/Terrarum/gameactors/Factionable.kt +++ b/src/net/torvald/terrarum/gameactors/Factionable.kt @@ -1,6 +1,6 @@ -package com.torvald.terrarum.gameactors +package net.torvald.terrarum.gameactors -import com.torvald.terrarum.gameactors.faction.Faction +import net.torvald.terrarum.gameactors.faction.Faction import java.util.* /** diff --git a/src/com/Torvald/Terrarum/gameactors/Glowing.kt b/src/net/torvald/terrarum/gameactors/Glowing.kt similarity index 86% rename from src/com/Torvald/Terrarum/gameactors/Glowing.kt rename to src/net/torvald/terrarum/gameactors/Glowing.kt index de6acb7a2..ca86c3f47 100644 --- a/src/com/Torvald/Terrarum/gameactors/Glowing.kt +++ b/src/net/torvald/terrarum/gameactors/Glowing.kt @@ -1,4 +1,4 @@ -package com.torvald.terrarum.gameactors +package net.torvald.terrarum.gameactors import org.newdawn.slick.GameContainer import org.newdawn.slick.Graphics diff --git a/src/com/Torvald/Terrarum/gameactors/Hitbox.kt b/src/net/torvald/terrarum/gameactors/Hitbox.kt similarity index 97% rename from src/com/Torvald/Terrarum/gameactors/Hitbox.kt rename to src/net/torvald/terrarum/gameactors/Hitbox.kt index 7bdb40fb4..636cb2f71 100644 --- a/src/com/Torvald/Terrarum/gameactors/Hitbox.kt +++ b/src/net/torvald/terrarum/gameactors/Hitbox.kt @@ -1,6 +1,6 @@ -package com.torvald.terrarum.gameactors +package net.torvald.terrarum.gameactors -import com.torvald.point.Point2f +import net.torvald.point.Point2f /** * Created by minjaesong on 16-01-15. diff --git a/src/com/Torvald/Terrarum/gameactors/LandHolder.kt b/src/net/torvald/terrarum/gameactors/LandHolder.kt similarity index 90% rename from src/com/Torvald/Terrarum/gameactors/LandHolder.kt rename to src/net/torvald/terrarum/gameactors/LandHolder.kt index 22224f44d..5be653fc9 100644 --- a/src/com/Torvald/Terrarum/gameactors/LandHolder.kt +++ b/src/net/torvald/terrarum/gameactors/LandHolder.kt @@ -1,4 +1,4 @@ -package com.torvald.terrarum.gameactors +package net.torvald.terrarum.gameactors import java.util.* diff --git a/src/com/Torvald/Terrarum/gameactors/Luminous.kt b/src/net/torvald/terrarum/gameactors/Luminous.kt similarity index 91% rename from src/com/Torvald/Terrarum/gameactors/Luminous.kt rename to src/net/torvald/terrarum/gameactors/Luminous.kt index 9051890b7..5f503b8b5 100644 --- a/src/com/Torvald/Terrarum/gameactors/Luminous.kt +++ b/src/net/torvald/terrarum/gameactors/Luminous.kt @@ -1,4 +1,4 @@ -package com.torvald.terrarum.gameactors +package net.torvald.terrarum.gameactors /** * Created by minjaesong on 16-03-14. diff --git a/src/com/Torvald/Terrarum/gameactors/NPCIntelligentBase.kt b/src/net/torvald/terrarum/gameactors/NPCIntelligentBase.kt similarity index 89% rename from src/com/Torvald/Terrarum/gameactors/NPCIntelligentBase.kt rename to src/net/torvald/terrarum/gameactors/NPCIntelligentBase.kt index d454d1933..d39402ec4 100644 --- a/src/com/Torvald/Terrarum/gameactors/NPCIntelligentBase.kt +++ b/src/net/torvald/terrarum/gameactors/NPCIntelligentBase.kt @@ -1,10 +1,10 @@ -package com.torvald.terrarum.gameactors +package net.torvald.terrarum.gameactors -import com.torvald.random.HQRNG -import com.torvald.terrarum.gameactors.ai.ActorAI -import com.torvald.terrarum.gameactors.faction.Faction -import com.torvald.terrarum.gameitem.InventoryItem -import com.torvald.terrarum.Terrarum +import net.torvald.random.HQRNG +import net.torvald.terrarum.gameactors.ai.ActorAI +import net.torvald.terrarum.gameactors.faction.Faction +import net.torvald.terrarum.gameitem.InventoryItem +import net.torvald.terrarum.Terrarum import org.newdawn.slick.GameContainer import java.util.* diff --git a/src/com/torvald/terrarum/gameactors/PBCynthia.kt b/src/net/torvald/terrarum/gameactors/PBCynthia.kt similarity index 83% rename from src/com/torvald/terrarum/gameactors/PBCynthia.kt rename to src/net/torvald/terrarum/gameactors/PBCynthia.kt index 2842f8e5b..bd2b28dfa 100644 --- a/src/com/torvald/terrarum/gameactors/PBCynthia.kt +++ b/src/net/torvald/terrarum/gameactors/PBCynthia.kt @@ -1,7 +1,7 @@ -package com.torvald.terrarum.gameactors +package net.torvald.terrarum.gameactors -import com.torvald.spriteanimation.SpriteAnimation -import com.torvald.terrarum.mapdrawer.MapDrawer +import net.torvald.spriteanimation.SpriteAnimation +import net.torvald.terrarum.mapdrawer.MapDrawer /** * Created by minjaesong on 16-03-25. diff --git a/src/com/torvald/terrarum/gameactors/PBSigrid.kt b/src/net/torvald/terrarum/gameactors/PBSigrid.kt similarity index 87% rename from src/com/torvald/terrarum/gameactors/PBSigrid.kt rename to src/net/torvald/terrarum/gameactors/PBSigrid.kt index f0f0b2e58..fcdcaf2ba 100644 --- a/src/com/torvald/terrarum/gameactors/PBSigrid.kt +++ b/src/net/torvald/terrarum/gameactors/PBSigrid.kt @@ -1,11 +1,11 @@ -package com.torvald.terrarum.gameactors +package net.torvald.terrarum.gameactors -import com.torvald.JsonFetcher -import com.torvald.terrarum.gameactors.faction.Faction -import com.torvald.spriteanimation.SpriteAnimation +import net.torvald.JsonFetcher +import net.torvald.terrarum.gameactors.faction.Faction +import net.torvald.spriteanimation.SpriteAnimation import com.google.gson.JsonObject -import com.torvald.terrarum.gameactors.faction.FactionFactory -import com.torvald.terrarum.mapdrawer.MapDrawer +import net.torvald.terrarum.gameactors.faction.FactionFactory +import net.torvald.terrarum.mapdrawer.MapDrawer import org.newdawn.slick.SlickException import java.io.IOException diff --git a/src/com/Torvald/Terrarum/gameactors/PhysTestBall.kt b/src/net/torvald/terrarum/gameactors/PhysTestBall.kt similarity index 87% rename from src/com/Torvald/Terrarum/gameactors/PhysTestBall.kt rename to src/net/torvald/terrarum/gameactors/PhysTestBall.kt index a0a860cd2..85f589f09 100644 --- a/src/com/Torvald/Terrarum/gameactors/PhysTestBall.kt +++ b/src/net/torvald/terrarum/gameactors/PhysTestBall.kt @@ -1,6 +1,6 @@ -package com.torvald.terrarum.gameactors +package net.torvald.terrarum.gameactors -import com.torvald.terrarum.mapgenerator.RoguelikeRandomiser +import net.torvald.terrarum.mapgenerator.RoguelikeRandomiser import org.newdawn.slick.Color import org.newdawn.slick.GameContainer import org.newdawn.slick.Graphics diff --git a/src/com/Torvald/Terrarum/gameactors/Player.kt b/src/net/torvald/terrarum/gameactors/Player.kt similarity index 97% rename from src/com/Torvald/Terrarum/gameactors/Player.kt rename to src/net/torvald/terrarum/gameactors/Player.kt index dfd17a42d..4a5cbb594 100644 --- a/src/com/Torvald/Terrarum/gameactors/Player.kt +++ b/src/net/torvald/terrarum/gameactors/Player.kt @@ -1,11 +1,11 @@ -package com.torvald.terrarum.gameactors +package net.torvald.terrarum.gameactors -import com.torvald.terrarum.gameactors.faction.Faction -import com.torvald.terrarum.gamecontroller.EnumKeyFunc -import com.torvald.terrarum.gamecontroller.KeyMap -import com.torvald.terrarum.mapdrawer.MapDrawer -import com.torvald.terrarum.Terrarum -import com.torvald.spriteanimation.SpriteAnimation +import net.torvald.terrarum.gameactors.faction.Faction +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.spriteanimation.SpriteAnimation import com.jme3.math.FastMath import org.lwjgl.input.Controller import org.lwjgl.input.Controllers diff --git a/src/com/torvald/terrarum/gameactors/PlayerBuilder.kt b/src/net/torvald/terrarum/gameactors/PlayerBuilder.kt similarity index 92% rename from src/com/torvald/terrarum/gameactors/PlayerBuilder.kt rename to src/net/torvald/terrarum/gameactors/PlayerBuilder.kt index 90b93d9c5..65e9240a9 100644 --- a/src/com/torvald/terrarum/gameactors/PlayerBuilder.kt +++ b/src/net/torvald/terrarum/gameactors/PlayerBuilder.kt @@ -1,4 +1,4 @@ -package com.torvald.terrarum.gameactors +package net.torvald.terrarum.gameactors import org.newdawn.slick.SlickException import java.io.IOException diff --git a/src/com/Torvald/Terrarum/gameactors/Pocketed.kt b/src/net/torvald/terrarum/gameactors/Pocketed.kt similarity index 72% rename from src/com/Torvald/Terrarum/gameactors/Pocketed.kt rename to src/net/torvald/terrarum/gameactors/Pocketed.kt index 63a1a40f7..83ea8ed77 100644 --- a/src/com/Torvald/Terrarum/gameactors/Pocketed.kt +++ b/src/net/torvald/terrarum/gameactors/Pocketed.kt @@ -1,4 +1,4 @@ -package com.torvald.terrarum.gameactors +package net.torvald.terrarum.gameactors /** * Created by minjaesong on 16-03-14. diff --git a/src/com/Torvald/Terrarum/gameactors/Visible.kt b/src/net/torvald/terrarum/gameactors/Visible.kt similarity index 86% rename from src/com/Torvald/Terrarum/gameactors/Visible.kt rename to src/net/torvald/terrarum/gameactors/Visible.kt index da18377ec..1a44d75c7 100644 --- a/src/com/Torvald/Terrarum/gameactors/Visible.kt +++ b/src/net/torvald/terrarum/gameactors/Visible.kt @@ -1,4 +1,4 @@ -package com.torvald.terrarum.gameactors +package net.torvald.terrarum.gameactors import org.newdawn.slick.GameContainer import org.newdawn.slick.Graphics diff --git a/src/com/Torvald/Terrarum/gameactors/ai/ActorAI.kt b/src/net/torvald/terrarum/gameactors/ai/ActorAI.kt similarity index 61% rename from src/com/Torvald/Terrarum/gameactors/ai/ActorAI.kt rename to src/net/torvald/terrarum/gameactors/ai/ActorAI.kt index c4c18780d..c6be599ba 100644 --- a/src/com/Torvald/Terrarum/gameactors/ai/ActorAI.kt +++ b/src/net/torvald/terrarum/gameactors/ai/ActorAI.kt @@ -1,4 +1,4 @@ -package com.torvald.terrarum.gameactors.ai +package net.torvald.terrarum.gameactors.ai /** * Created by minjaesong on 16-03-14. diff --git a/src/com/Torvald/Terrarum/gameactors/faction/Faction.kt b/src/net/torvald/terrarum/gameactors/faction/Faction.kt similarity index 94% rename from src/com/Torvald/Terrarum/gameactors/faction/Faction.kt rename to src/net/torvald/terrarum/gameactors/faction/Faction.kt index 0024773d8..df840f103 100644 --- a/src/com/Torvald/Terrarum/gameactors/faction/Faction.kt +++ b/src/net/torvald/terrarum/gameactors/faction/Faction.kt @@ -1,6 +1,6 @@ -package com.torvald.terrarum.gameactors.faction +package net.torvald.terrarum.gameactors.faction -import com.torvald.random.HQRNG +import net.torvald.random.HQRNG import java.util.HashSet /** diff --git a/src/com/torvald/terrarum/gameactors/faction/FactionFactory.kt b/src/net/torvald/terrarum/gameactors/faction/FactionFactory.kt similarity index 92% rename from src/com/torvald/terrarum/gameactors/faction/FactionFactory.kt rename to src/net/torvald/terrarum/gameactors/faction/FactionFactory.kt index ce78a8f89..10f88a208 100644 --- a/src/com/torvald/terrarum/gameactors/faction/FactionFactory.kt +++ b/src/net/torvald/terrarum/gameactors/faction/FactionFactory.kt @@ -1,6 +1,6 @@ -package com.torvald.terrarum.gameactors.faction +package net.torvald.terrarum.gameactors.faction -import com.torvald.JsonFetcher +import net.torvald.JsonFetcher import com.google.gson.JsonObject import java.io.IOException diff --git a/src/com/torvald/terrarum/gameactors/scheduler/NPCSchedule.kt b/src/net/torvald/terrarum/gameactors/scheduler/NPCSchedule.kt similarity index 66% rename from src/com/torvald/terrarum/gameactors/scheduler/NPCSchedule.kt rename to src/net/torvald/terrarum/gameactors/scheduler/NPCSchedule.kt index 55135533b..0539fa032 100644 --- a/src/com/torvald/terrarum/gameactors/scheduler/NPCSchedule.kt +++ b/src/net/torvald/terrarum/gameactors/scheduler/NPCSchedule.kt @@ -1,4 +1,4 @@ -package com.torvald.terrarum.gameactors.scheduler +package net.torvald.terrarum.gameactors.scheduler /** * Ultima-like NPC scheduler diff --git a/src/com/Torvald/Terrarum/gamecontroller/EnumKeyFunc.kt b/src/net/torvald/terrarum/gamecontroller/EnumKeyFunc.kt similarity index 78% rename from src/com/Torvald/Terrarum/gamecontroller/EnumKeyFunc.kt rename to src/net/torvald/terrarum/gamecontroller/EnumKeyFunc.kt index e7530240c..2ce511db5 100644 --- a/src/com/Torvald/Terrarum/gamecontroller/EnumKeyFunc.kt +++ b/src/net/torvald/terrarum/gamecontroller/EnumKeyFunc.kt @@ -1,4 +1,4 @@ -package com.torvald.terrarum.gamecontroller +package net.torvald.terrarum.gamecontroller /** * Created by minjaesong on 15-12-31. diff --git a/src/com/Torvald/Terrarum/gamecontroller/GameController.kt b/src/net/torvald/terrarum/gamecontroller/GameController.kt similarity index 87% rename from src/com/Torvald/Terrarum/gamecontroller/GameController.kt rename to src/net/torvald/terrarum/gamecontroller/GameController.kt index 5163ffc2c..94705e3f5 100644 --- a/src/com/Torvald/Terrarum/gamecontroller/GameController.kt +++ b/src/net/torvald/terrarum/gamecontroller/GameController.kt @@ -1,13 +1,13 @@ -package com.torvald.terrarum.gamecontroller +package net.torvald.terrarum.gamecontroller -import com.torvald.terrarum.gameactors.Controllable -import com.torvald.terrarum.gameactors.Player -import com.torvald.terrarum.mapdrawer.MapCamera -import com.torvald.terrarum.mapdrawer.MapDrawer -import com.torvald.terrarum.Terrarum -import com.torvald.terrarum.tileproperties.TileNameCode -import com.torvald.terrarum.tileproperties.TilePropCodex -import com.torvald.terrarum.ui.UIHandler +import net.torvald.terrarum.gameactors.Controllable +import net.torvald.terrarum.gameactors.Player +import net.torvald.terrarum.mapdrawer.MapCamera +import net.torvald.terrarum.mapdrawer.MapDrawer +import net.torvald.terrarum.Terrarum +import net.torvald.terrarum.tileproperties.TileNameCode +import net.torvald.terrarum.tileproperties.TilePropCodex +import net.torvald.terrarum.ui.UIHandler import org.newdawn.slick.Input /** diff --git a/src/com/Torvald/Terrarum/gamecontroller/Key.kt b/src/net/torvald/terrarum/gamecontroller/Key.kt similarity index 96% rename from src/com/Torvald/Terrarum/gamecontroller/Key.kt rename to src/net/torvald/terrarum/gamecontroller/Key.kt index 2fa19315a..c42118457 100644 --- a/src/com/Torvald/Terrarum/gamecontroller/Key.kt +++ b/src/net/torvald/terrarum/gamecontroller/Key.kt @@ -1,4 +1,4 @@ -package com.torvald.terrarum.gamecontroller +package net.torvald.terrarum.gamecontroller /** * Created by minjaesong on 16-01-15. diff --git a/src/com/Torvald/Terrarum/gamecontroller/KeyMap.kt b/src/net/torvald/terrarum/gamecontroller/KeyMap.kt similarity index 94% rename from src/com/Torvald/Terrarum/gamecontroller/KeyMap.kt rename to src/net/torvald/terrarum/gamecontroller/KeyMap.kt index 858e6b5a8..9b5d95f2a 100644 --- a/src/com/Torvald/Terrarum/gamecontroller/KeyMap.kt +++ b/src/net/torvald/terrarum/gamecontroller/KeyMap.kt @@ -1,4 +1,4 @@ -package com.torvald.terrarum.gamecontroller +package net.torvald.terrarum.gamecontroller import java.util.Hashtable diff --git a/src/com/Torvald/Terrarum/gamecontroller/KeyToggler.kt b/src/net/torvald/terrarum/gamecontroller/KeyToggler.kt similarity index 96% rename from src/com/Torvald/Terrarum/gamecontroller/KeyToggler.kt rename to src/net/torvald/terrarum/gamecontroller/KeyToggler.kt index 5429d5df2..ee80671cd 100644 --- a/src/com/Torvald/Terrarum/gamecontroller/KeyToggler.kt +++ b/src/net/torvald/terrarum/gamecontroller/KeyToggler.kt @@ -1,4 +1,4 @@ -package com.torvald.terrarum.gamecontroller +package net.torvald.terrarum.gamecontroller import org.newdawn.slick.GameContainer import org.newdawn.slick.Input diff --git a/src/com/Torvald/Terrarum/GameItem/InventoryItem.kt b/src/net/torvald/terrarum/gameitem/InventoryItem.kt similarity index 97% rename from src/com/Torvald/Terrarum/GameItem/InventoryItem.kt rename to src/net/torvald/terrarum/gameitem/InventoryItem.kt index 0b38e661f..beb9c98f2 100644 --- a/src/com/Torvald/Terrarum/GameItem/InventoryItem.kt +++ b/src/net/torvald/terrarum/gameitem/InventoryItem.kt @@ -1,4 +1,4 @@ -package com.torvald.terrarum.gameitem +package net.torvald.terrarum.gameitem import org.newdawn.slick.GameContainer diff --git a/src/com/Torvald/Terrarum/GameItem/TileAsItem.kt b/src/net/torvald/terrarum/gameitem/TileAsItem.kt similarity index 91% rename from src/com/Torvald/Terrarum/GameItem/TileAsItem.kt rename to src/net/torvald/terrarum/gameitem/TileAsItem.kt index f87668814..d0f7c6b79 100644 --- a/src/com/Torvald/Terrarum/GameItem/TileAsItem.kt +++ b/src/net/torvald/terrarum/gameitem/TileAsItem.kt @@ -1,6 +1,6 @@ -package com.torvald.terrarum.gameitem +package net.torvald.terrarum.gameitem -import com.torvald.terrarum.tileproperties.TilePropCodex +import net.torvald.terrarum.tileproperties.TilePropCodex import org.newdawn.slick.GameContainer /** diff --git a/src/com/Torvald/Terrarum/GameMap/GameMap.kt b/src/net/torvald/terrarum/gamemap/GameMap.kt similarity index 99% rename from src/com/Torvald/Terrarum/GameMap/GameMap.kt rename to src/net/torvald/terrarum/gamemap/GameMap.kt index ea54f0d8a..febaabcbc 100644 --- a/src/com/Torvald/Terrarum/GameMap/GameMap.kt +++ b/src/net/torvald/terrarum/gamemap/GameMap.kt @@ -1,5 +1,5 @@ -package com.torvald.terrarum.gamemap +package net.torvald.terrarum.gamemap import org.newdawn.slick.SlickException diff --git a/src/com/Torvald/Terrarum/GameMap/MapLayer.kt b/src/net/torvald/terrarum/gamemap/MapLayer.kt similarity index 97% rename from src/com/Torvald/Terrarum/GameMap/MapLayer.kt rename to src/net/torvald/terrarum/gamemap/MapLayer.kt index 1c992af4b..33665093b 100644 --- a/src/com/Torvald/Terrarum/GameMap/MapLayer.kt +++ b/src/net/torvald/terrarum/gamemap/MapLayer.kt @@ -1,4 +1,4 @@ -package com.torvald.terrarum.gamemap +package net.torvald.terrarum.gamemap /** * Created by minjaesong on 16-01-17. diff --git a/src/com/Torvald/Terrarum/GameMap/MapPoint.kt b/src/net/torvald/terrarum/gamemap/MapPoint.kt similarity index 90% rename from src/com/Torvald/Terrarum/GameMap/MapPoint.kt rename to src/net/torvald/terrarum/gamemap/MapPoint.kt index 67483036d..571c51aec 100644 --- a/src/com/Torvald/Terrarum/GameMap/MapPoint.kt +++ b/src/net/torvald/terrarum/gamemap/MapPoint.kt @@ -1,6 +1,6 @@ -package com.torvald.terrarum.gamemap +package net.torvald.terrarum.gamemap -import com.torvald.point.Point2f +import net.torvald.point.Point2f import java.io.Serializable diff --git a/src/com/Torvald/Terrarum/GameMap/PairedMapLayer.kt b/src/net/torvald/terrarum/gamemap/PairedMapLayer.kt similarity index 98% rename from src/com/Torvald/Terrarum/GameMap/PairedMapLayer.kt rename to src/net/torvald/terrarum/gamemap/PairedMapLayer.kt index f62c1d5fc..027192736 100644 --- a/src/com/Torvald/Terrarum/GameMap/PairedMapLayer.kt +++ b/src/net/torvald/terrarum/gamemap/PairedMapLayer.kt @@ -1,4 +1,4 @@ -package com.torvald.terrarum.gamemap +package net.torvald.terrarum.gamemap import java.io.Serializable import java.util.Spliterator diff --git a/src/com/Torvald/Terrarum/GameMap/WorldTime.kt b/src/net/torvald/terrarum/gamemap/WorldTime.kt similarity index 99% rename from src/com/Torvald/Terrarum/GameMap/WorldTime.kt rename to src/net/torvald/terrarum/gamemap/WorldTime.kt index 5a275722b..5af87efda 100644 --- a/src/com/Torvald/Terrarum/GameMap/WorldTime.kt +++ b/src/net/torvald/terrarum/gamemap/WorldTime.kt @@ -1,4 +1,4 @@ -package com.torvald.terrarum.gamemap +package net.torvald.terrarum.gamemap /** * Created by minjaesong on 16-01-24. diff --git a/src/com/Torvald/Terrarum/ItemProperties/ItemProp.kt b/src/net/torvald/terrarum/itemproperties/ItemProp.kt similarity index 75% rename from src/com/Torvald/Terrarum/ItemProperties/ItemProp.kt rename to src/net/torvald/terrarum/itemproperties/ItemProp.kt index b9272c4df..27e348377 100644 --- a/src/com/Torvald/Terrarum/ItemProperties/ItemProp.kt +++ b/src/net/torvald/terrarum/itemproperties/ItemProp.kt @@ -1,4 +1,4 @@ -package com.torvald.terrarum.itemproperties +package net.torvald.terrarum.itemproperties /** * Created by minjaesong on 16-03-18. diff --git a/src/com/Torvald/Terrarum/ItemProperties/ItemPropCodex.kt b/src/net/torvald/terrarum/itemproperties/ItemPropCodex.kt similarity index 83% rename from src/com/Torvald/Terrarum/ItemProperties/ItemPropCodex.kt rename to src/net/torvald/terrarum/itemproperties/ItemPropCodex.kt index 55a135a4d..b7271780c 100644 --- a/src/com/Torvald/Terrarum/ItemProperties/ItemPropCodex.kt +++ b/src/net/torvald/terrarum/itemproperties/ItemPropCodex.kt @@ -1,8 +1,8 @@ -package com.torvald.terrarum.itemproperties +package net.torvald.terrarum.itemproperties -import com.torvald.terrarum.gameactors.CanBeAnItem -import com.torvald.terrarum.gameitem.InventoryItem -import com.torvald.terrarum.Terrarum +import net.torvald.terrarum.gameactors.CanBeAnItem +import net.torvald.terrarum.gameitem.InventoryItem +import net.torvald.terrarum.Terrarum import org.newdawn.slick.GameContainer import java.util.* diff --git a/src/com/Torvald/Terrarum/ItemProperties/Material.kt b/src/net/torvald/terrarum/itemproperties/Material.kt similarity index 76% rename from src/com/Torvald/Terrarum/ItemProperties/Material.kt rename to src/net/torvald/terrarum/itemproperties/Material.kt index 07cc13820..46260e4bd 100644 --- a/src/com/Torvald/Terrarum/ItemProperties/Material.kt +++ b/src/net/torvald/terrarum/itemproperties/Material.kt @@ -1,4 +1,4 @@ -package com.torvald.terrarum.itemproperties +package net.torvald.terrarum.itemproperties /** * Created by minjaesong on 16-03-18. diff --git a/src/com/Torvald/Terrarum/ItemProperties/MaterialFactory.kt b/src/net/torvald/terrarum/itemproperties/MaterialFactory.kt similarity index 62% rename from src/com/Torvald/Terrarum/ItemProperties/MaterialFactory.kt rename to src/net/torvald/terrarum/itemproperties/MaterialFactory.kt index dd2ddab87..a9c92dbfa 100644 --- a/src/com/Torvald/Terrarum/ItemProperties/MaterialFactory.kt +++ b/src/net/torvald/terrarum/itemproperties/MaterialFactory.kt @@ -1,4 +1,4 @@ -package com.torvald.terrarum.itemproperties +package net.torvald.terrarum.itemproperties /** * Created by minjaesong on 16-03-19. diff --git a/src/com/Torvald/Terrarum/ItemProperties/MaterialPropCodex.kt b/src/net/torvald/terrarum/itemproperties/MaterialPropCodex.kt similarity index 78% rename from src/com/Torvald/Terrarum/ItemProperties/MaterialPropCodex.kt rename to src/net/torvald/terrarum/itemproperties/MaterialPropCodex.kt index 8c080606e..4c8543742 100644 --- a/src/com/Torvald/Terrarum/ItemProperties/MaterialPropCodex.kt +++ b/src/net/torvald/terrarum/itemproperties/MaterialPropCodex.kt @@ -1,4 +1,4 @@ -package com.torvald.terrarum.itemproperties +package net.torvald.terrarum.itemproperties /** * Created by minjaesong on 16-03-18. diff --git a/src/com/Torvald/Terrarum/LangPack/Lang.kt b/src/net/torvald/terrarum/langpack/Lang.kt similarity index 97% rename from src/com/Torvald/Terrarum/LangPack/Lang.kt rename to src/net/torvald/terrarum/langpack/Lang.kt index fe5f413ec..f1efd07c1 100644 --- a/src/com/Torvald/Terrarum/LangPack/Lang.kt +++ b/src/net/torvald/terrarum/langpack/Lang.kt @@ -1,8 +1,8 @@ -package com.torvald.terrarum.langpack +package net.torvald.terrarum.langpack -import com.torvald.CSVFetcher -import com.torvald.imagefont.GameFontWhite -import com.torvald.terrarum.Terrarum +import net.torvald.CSVFetcher +import net.torvald.imagefont.GameFontWhite +import net.torvald.terrarum.Terrarum import org.apache.commons.csv.CSVRecord import org.newdawn.slick.SlickException diff --git a/src/com/Torvald/Terrarum/MapDrawer/LightmapRenderer.kt b/src/net/torvald/terrarum/mapdrawer/LightmapRenderer.kt similarity index 92% rename from src/com/Torvald/Terrarum/MapDrawer/LightmapRenderer.kt rename to src/net/torvald/terrarum/mapdrawer/LightmapRenderer.kt index d9b835779..b936546d2 100644 --- a/src/com/Torvald/Terrarum/MapDrawer/LightmapRenderer.kt +++ b/src/net/torvald/terrarum/mapdrawer/LightmapRenderer.kt @@ -1,12 +1,12 @@ -package com.torvald.terrarum.mapdrawer +package net.torvald.terrarum.mapdrawer -import com.torvald.terrarum.gameactors.ActorWithBody -import com.torvald.terrarum.gameactors.Luminous -import com.torvald.terrarum.gamemap.WorldTime -import com.torvald.terrarum.Terrarum -import com.torvald.terrarum.tileproperties.TilePropCodex +import net.torvald.terrarum.gameactors.ActorWithBody +import net.torvald.terrarum.gameactors.Luminous +import net.torvald.terrarum.gamemap.WorldTime +import net.torvald.terrarum.Terrarum +import net.torvald.terrarum.tileproperties.TilePropCodex import com.jme3.math.FastMath -import com.torvald.terrarum.tileproperties.TileNameCode +import net.torvald.terrarum.tileproperties.TileNameCode import org.newdawn.slick.Color import org.newdawn.slick.Graphics import java.util.* @@ -51,11 +51,11 @@ object LightmapRenderer { } fun renderLightMap() { - val for_x_start = div16(MapCamera.cameraX) - 1 // fix for premature lightmap rendering - val for_y_start = div16(MapCamera.cameraY) - 1 // on topmost/leftmost side + val for_x_start = MapCamera.cameraX / TSIZE - 1 // fix for premature lightmap rendering + val for_y_start = MapCamera.cameraY / TSIZE - 1 // on topmost/leftmost side - val for_x_end = for_x_start + div16(MapCamera.getRenderWidth()) + 3 - val for_y_end = for_y_start + div16(MapCamera.getRenderHeight()) + 2 // same fix as above + val for_x_end = for_x_start + MapCamera.getRenderWidth() / TSIZE + 3 + val for_y_end = for_y_start + MapCamera.getRenderHeight() / TSIZE + 2 // same fix as above val overscan_open: Int = (256f / (TilePropCodex.getProp(TileNameCode.AIR).opacity and 0xFF).toFloat()).ceil() val overscan_opaque: Int = (256f / (TilePropCodex.getProp(TileNameCode.STONE).opacity and 0xFF).toFloat()).ceil() @@ -206,11 +206,11 @@ object LightmapRenderer { } fun draw(g: Graphics) { - val for_x_start = div16(MapCamera.cameraX) - 1 // fix for premature lightmap rendering - val for_y_start = div16(MapCamera.cameraY) - 1 // on topmost/leftmost side + val for_x_start = MapCamera.cameraX / TSIZE - 1 // fix for premature lightmap rendering + val for_y_start = MapCamera.cameraY / TSIZE - 1 // on topmost/leftmost side - val for_x_end = for_x_start + div16(MapCamera.getRenderWidth()) + 3 - val for_y_end = for_y_start + div16(MapCamera.getRenderHeight()) + 2 // same fix as above + val for_x_end = for_x_start + MapCamera.getRenderWidth() / TSIZE + 3 + val for_y_end = for_y_start + MapCamera.getRenderHeight() / TSIZE + 2 // same fix as above // draw @@ -469,31 +469,6 @@ object LightmapRenderer { return constructRGBFromInt(r, g, b) } - private fun quantise16(x: Int): Int { - if (x < 0) throw IllegalArgumentException("positive integer only.") - return x and 0xFFFFFFF0.toInt() - } - - private fun div16(x: Int): Int { - if (x < 0) throw IllegalArgumentException("positive integer only.") - return x and 0x7FFFFFFF shr 4 - } - - private fun mul16(x: Int): Int { - if (x < 0) throw IllegalArgumentException("positive integer only.") - return x shl 4 - } - - private fun max(vararg i: Int): Int { - Arrays.sort(i) - return i[i.size - 1] - } - - private fun min(vararg i: Int): Int { - Arrays.sort(i) - return i[0] - } - private fun outOfBounds(x: Int, y: Int): Boolean = x !in 0..Terrarum.game.map.width - 1 || y !in 0..Terrarum.game.map.height - 1 diff --git a/src/com/Torvald/Terrarum/MapDrawer/MapCamera.kt b/src/net/torvald/terrarum/mapdrawer/MapCamera.kt similarity index 97% rename from src/com/Torvald/Terrarum/MapDrawer/MapCamera.kt rename to src/net/torvald/terrarum/mapdrawer/MapCamera.kt index 10469ba9d..33e7948a7 100644 --- a/src/com/Torvald/Terrarum/MapDrawer/MapCamera.kt +++ b/src/net/torvald/terrarum/mapdrawer/MapCamera.kt @@ -1,13 +1,13 @@ -package com.torvald.terrarum.mapdrawer +package net.torvald.terrarum.mapdrawer -import com.torvald.terrarum.gamemap.GameMap -import com.torvald.terrarum.gamemap.PairedMapLayer -import com.torvald.terrarum.Terrarum -import com.torvald.terrarum.tileproperties.TileNameCode -import com.torvald.terrarum.tileproperties.TilePropCodex +import net.torvald.terrarum.gamemap.GameMap +import net.torvald.terrarum.gamemap.PairedMapLayer +import net.torvald.terrarum.Terrarum +import net.torvald.terrarum.tileproperties.TileNameCode +import net.torvald.terrarum.tileproperties.TilePropCodex import com.jme3.math.FastMath -import com.torvald.terrarum.setBlendMul -import com.torvald.terrarum.setBlendNormal +import net.torvald.terrarum.setBlendMul +import net.torvald.terrarum.setBlendNormal import org.lwjgl.opengl.GL11 import org.newdawn.slick.GameContainer import org.newdawn.slick.Graphics diff --git a/src/com/Torvald/Terrarum/MapDrawer/MapDrawer.kt b/src/net/torvald/terrarum/mapdrawer/MapDrawer.kt similarity index 92% rename from src/com/Torvald/Terrarum/MapDrawer/MapDrawer.kt rename to src/net/torvald/terrarum/mapdrawer/MapDrawer.kt index 2501606e9..071950cef 100644 --- a/src/com/Torvald/Terrarum/MapDrawer/MapDrawer.kt +++ b/src/net/torvald/terrarum/mapdrawer/MapDrawer.kt @@ -1,9 +1,9 @@ -package com.torvald.terrarum.mapdrawer +package net.torvald.terrarum.mapdrawer -import com.torvald.terrarum.gamemap.GameMap -import com.torvald.terrarum.Terrarum -import com.torvald.terrarum.tileproperties.TileNameCode -import com.torvald.terrarum.tilestats.TileStats +import net.torvald.terrarum.gamemap.GameMap +import net.torvald.terrarum.Terrarum +import net.torvald.terrarum.tileproperties.TileNameCode +import net.torvald.terrarum.tilestats.TileStats import com.jme3.math.FastMath import org.newdawn.slick.* diff --git a/src/com/Torvald/Terrarum/MapGenerator/FloatingIslandsPreset.kt b/src/net/torvald/terrarum/mapgenerator/FloatingIslandsPreset.kt similarity index 96% rename from src/com/Torvald/Terrarum/MapGenerator/FloatingIslandsPreset.kt rename to src/net/torvald/terrarum/mapgenerator/FloatingIslandsPreset.kt index 1ce4ae945..1581f14bf 100644 --- a/src/com/Torvald/Terrarum/MapGenerator/FloatingIslandsPreset.kt +++ b/src/net/torvald/terrarum/mapgenerator/FloatingIslandsPreset.kt @@ -1,6 +1,6 @@ -package com.torvald.terrarum.mapgenerator +package net.torvald.terrarum.mapgenerator -import com.torvald.random.HQRNG +import net.torvald.random.HQRNG import com.sun.javaws.exceptions.InvalidArgumentException import java.util.Random diff --git a/src/com/Torvald/Terrarum/MapGenerator/FloatingIslePreset01.kt b/src/net/torvald/terrarum/mapgenerator/FloatingIslePreset01.kt similarity index 99% rename from src/com/Torvald/Terrarum/MapGenerator/FloatingIslePreset01.kt rename to src/net/torvald/terrarum/mapgenerator/FloatingIslePreset01.kt index 1f4fd49fc..dd95159c9 100644 --- a/src/com/Torvald/Terrarum/MapGenerator/FloatingIslePreset01.kt +++ b/src/net/torvald/terrarum/mapgenerator/FloatingIslePreset01.kt @@ -1,4 +1,4 @@ -package com.torvald.terrarum.mapgenerator +package net.torvald.terrarum.mapgenerator internal object FloatingIslePreset01 { var w = 100 diff --git a/src/com/Torvald/Terrarum/MapGenerator/FloatingIslePreset02.kt b/src/net/torvald/terrarum/mapgenerator/FloatingIslePreset02.kt similarity index 99% rename from src/com/Torvald/Terrarum/MapGenerator/FloatingIslePreset02.kt rename to src/net/torvald/terrarum/mapgenerator/FloatingIslePreset02.kt index a2f71ac3e..e067821d2 100644 --- a/src/com/Torvald/Terrarum/MapGenerator/FloatingIslePreset02.kt +++ b/src/net/torvald/terrarum/mapgenerator/FloatingIslePreset02.kt @@ -1,4 +1,4 @@ -package com.torvald.terrarum.mapgenerator +package net.torvald.terrarum.mapgenerator internal object FloatingIslePreset02 { var w = 80 diff --git a/src/com/Torvald/Terrarum/MapGenerator/FloatingIslePreset03.kt b/src/net/torvald/terrarum/mapgenerator/FloatingIslePreset03.kt similarity index 99% rename from src/com/Torvald/Terrarum/MapGenerator/FloatingIslePreset03.kt rename to src/net/torvald/terrarum/mapgenerator/FloatingIslePreset03.kt index 830df1524..cdeaf5c6f 100644 --- a/src/com/Torvald/Terrarum/MapGenerator/FloatingIslePreset03.kt +++ b/src/net/torvald/terrarum/mapgenerator/FloatingIslePreset03.kt @@ -1,4 +1,4 @@ -package com.torvald.terrarum.mapgenerator +package net.torvald.terrarum.mapgenerator internal object FloatingIslePreset03 { var w = 66 diff --git a/src/com/Torvald/Terrarum/MapGenerator/FloatingIslePreset04.kt b/src/net/torvald/terrarum/mapgenerator/FloatingIslePreset04.kt similarity index 99% rename from src/com/Torvald/Terrarum/MapGenerator/FloatingIslePreset04.kt rename to src/net/torvald/terrarum/mapgenerator/FloatingIslePreset04.kt index 645b26735..d1c7a0745 100644 --- a/src/com/Torvald/Terrarum/MapGenerator/FloatingIslePreset04.kt +++ b/src/net/torvald/terrarum/mapgenerator/FloatingIslePreset04.kt @@ -1,4 +1,4 @@ -package com.torvald.terrarum.mapgenerator +package net.torvald.terrarum.mapgenerator internal object FloatingIslePreset04 { var w = 88 diff --git a/src/com/Torvald/Terrarum/MapGenerator/FloatingIslePreset05.kt b/src/net/torvald/terrarum/mapgenerator/FloatingIslePreset05.kt similarity index 99% rename from src/com/Torvald/Terrarum/MapGenerator/FloatingIslePreset05.kt rename to src/net/torvald/terrarum/mapgenerator/FloatingIslePreset05.kt index 849539553..f8787be18 100644 --- a/src/com/Torvald/Terrarum/MapGenerator/FloatingIslePreset05.kt +++ b/src/net/torvald/terrarum/mapgenerator/FloatingIslePreset05.kt @@ -1,4 +1,4 @@ -package com.torvald.terrarum.mapgenerator +package net.torvald.terrarum.mapgenerator internal object FloatingIslePreset05 { var w = 74 diff --git a/src/com/Torvald/Terrarum/MapGenerator/MapGenerator.kt b/src/net/torvald/terrarum/mapgenerator/MapGenerator.kt similarity index 99% rename from src/com/Torvald/Terrarum/MapGenerator/MapGenerator.kt rename to src/net/torvald/terrarum/mapgenerator/MapGenerator.kt index 9928b3add..0f8edec8f 100644 --- a/src/com/Torvald/Terrarum/MapGenerator/MapGenerator.kt +++ b/src/net/torvald/terrarum/mapgenerator/MapGenerator.kt @@ -1,8 +1,8 @@ -package com.torvald.terrarum.mapgenerator +package net.torvald.terrarum.mapgenerator -import com.torvald.random.HQRNG -import com.torvald.terrarum.gamemap.GameMap -import com.torvald.terrarum.tileproperties.TileNameCode +import net.torvald.random.HQRNG +import net.torvald.terrarum.gamemap.GameMap +import net.torvald.terrarum.tileproperties.TileNameCode import com.jme3.math.FastMath import com.sudoplay.joise.Joise import com.sudoplay.joise.module.* diff --git a/src/com/torvald/terrarum/mapgenerator/NoiseFilter.kt b/src/net/torvald/terrarum/mapgenerator/NoiseFilter.kt similarity index 76% rename from src/com/torvald/terrarum/mapgenerator/NoiseFilter.kt rename to src/net/torvald/terrarum/mapgenerator/NoiseFilter.kt index 80c7ddb34..60bc280ee 100644 --- a/src/com/torvald/terrarum/mapgenerator/NoiseFilter.kt +++ b/src/net/torvald/terrarum/mapgenerator/NoiseFilter.kt @@ -1,4 +1,4 @@ -package com.torvald.terrarum.mapgenerator +package net.torvald.terrarum.mapgenerator /** * Created by minjaesong on 16-03-31. diff --git a/src/com/torvald/terrarum/mapgenerator/NoiseFilterCubic.kt b/src/net/torvald/terrarum/mapgenerator/NoiseFilterCubic.kt similarity index 96% rename from src/com/torvald/terrarum/mapgenerator/NoiseFilterCubic.kt rename to src/net/torvald/terrarum/mapgenerator/NoiseFilterCubic.kt index 3b4d7ecd7..28397e2cd 100644 --- a/src/com/torvald/terrarum/mapgenerator/NoiseFilterCubic.kt +++ b/src/net/torvald/terrarum/mapgenerator/NoiseFilterCubic.kt @@ -1,4 +1,4 @@ -package com.torvald.terrarum.mapgenerator +package net.torvald.terrarum.mapgenerator import com.jme3.math.FastMath diff --git a/src/com/torvald/terrarum/mapgenerator/NoiseFilterMinusQuadratic.kt b/src/net/torvald/terrarum/mapgenerator/NoiseFilterMinusQuadratic.kt similarity index 96% rename from src/com/torvald/terrarum/mapgenerator/NoiseFilterMinusQuadratic.kt rename to src/net/torvald/terrarum/mapgenerator/NoiseFilterMinusQuadratic.kt index a7b7c783c..8c3292834 100644 --- a/src/com/torvald/terrarum/mapgenerator/NoiseFilterMinusQuadratic.kt +++ b/src/net/torvald/terrarum/mapgenerator/NoiseFilterMinusQuadratic.kt @@ -1,4 +1,4 @@ -package com.torvald.terrarum.mapgenerator +package net.torvald.terrarum.mapgenerator import com.jme3.math.FastMath diff --git a/src/com/torvald/terrarum/mapgenerator/NoiseFilterQuadratic.kt b/src/net/torvald/terrarum/mapgenerator/NoiseFilterQuadratic.kt similarity index 96% rename from src/com/torvald/terrarum/mapgenerator/NoiseFilterQuadratic.kt rename to src/net/torvald/terrarum/mapgenerator/NoiseFilterQuadratic.kt index 058b22d1a..c2ffbb410 100644 --- a/src/com/torvald/terrarum/mapgenerator/NoiseFilterQuadratic.kt +++ b/src/net/torvald/terrarum/mapgenerator/NoiseFilterQuadratic.kt @@ -1,4 +1,4 @@ -package com.torvald.terrarum.mapgenerator +package net.torvald.terrarum.mapgenerator import com.jme3.math.FastMath diff --git a/src/com/torvald/terrarum/mapgenerator/NoiseFilterSqrt.kt b/src/net/torvald/terrarum/mapgenerator/NoiseFilterSqrt.kt similarity index 93% rename from src/com/torvald/terrarum/mapgenerator/NoiseFilterSqrt.kt rename to src/net/torvald/terrarum/mapgenerator/NoiseFilterSqrt.kt index 8eb9d7779..2e46593cc 100644 --- a/src/com/torvald/terrarum/mapgenerator/NoiseFilterSqrt.kt +++ b/src/net/torvald/terrarum/mapgenerator/NoiseFilterSqrt.kt @@ -1,4 +1,4 @@ -package com.torvald.terrarum.mapgenerator +package net.torvald.terrarum.mapgenerator import com.jme3.math.FastMath diff --git a/src/com/torvald/terrarum/mapgenerator/NoiseFilterUniform.kt b/src/net/torvald/terrarum/mapgenerator/NoiseFilterUniform.kt similarity index 81% rename from src/com/torvald/terrarum/mapgenerator/NoiseFilterUniform.kt rename to src/net/torvald/terrarum/mapgenerator/NoiseFilterUniform.kt index f72802b6e..e71bca803 100644 --- a/src/com/torvald/terrarum/mapgenerator/NoiseFilterUniform.kt +++ b/src/net/torvald/terrarum/mapgenerator/NoiseFilterUniform.kt @@ -1,4 +1,4 @@ -package com.torvald.terrarum.mapgenerator +package net.torvald.terrarum.mapgenerator /** * Created by minjaesong on 16-03-31. diff --git a/src/com/Torvald/Terrarum/MapGenerator/RoguelikeRandomiser.kt b/src/net/torvald/terrarum/mapgenerator/RoguelikeRandomiser.kt similarity index 97% rename from src/com/Torvald/Terrarum/MapGenerator/RoguelikeRandomiser.kt rename to src/net/torvald/terrarum/mapgenerator/RoguelikeRandomiser.kt index 1ad8cff23..9f8bdf621 100644 --- a/src/com/Torvald/Terrarum/MapGenerator/RoguelikeRandomiser.kt +++ b/src/net/torvald/terrarum/mapgenerator/RoguelikeRandomiser.kt @@ -1,7 +1,7 @@ -package com.torvald.terrarum.mapgenerator +package net.torvald.terrarum.mapgenerator -import com.torvald.colourutil.Col4096 -import com.torvald.random.HQRNG +import net.torvald.colourutil.Col4096 +import net.torvald.random.HQRNG import org.newdawn.slick.Color import java.util.* diff --git a/src/com/Torvald/Terrarum/MapGenerator/SimplexNoise.kt b/src/net/torvald/terrarum/mapgenerator/SimplexNoise.kt similarity index 96% rename from src/com/Torvald/Terrarum/MapGenerator/SimplexNoise.kt rename to src/net/torvald/terrarum/mapgenerator/SimplexNoise.kt index 45c416e5f..9b169454a 100644 --- a/src/com/Torvald/Terrarum/MapGenerator/SimplexNoise.kt +++ b/src/net/torvald/terrarum/mapgenerator/SimplexNoise.kt @@ -1,6 +1,6 @@ -package com.torvald.terrarum.mapgenerator +package net.torvald.terrarum.mapgenerator -import com.torvald.random.HQRNG +import net.torvald.random.HQRNG import com.jme3.math.FastMath class SimplexNoise diff --git a/src/com/Torvald/Terrarum/MapGenerator/SimplexNoise_octave.kt b/src/net/torvald/terrarum/mapgenerator/SimplexNoise_octave.kt similarity index 99% rename from src/com/Torvald/Terrarum/MapGenerator/SimplexNoise_octave.kt rename to src/net/torvald/terrarum/mapgenerator/SimplexNoise_octave.kt index 574c6bc7d..535e93a02 100644 --- a/src/com/Torvald/Terrarum/MapGenerator/SimplexNoise_octave.kt +++ b/src/net/torvald/terrarum/mapgenerator/SimplexNoise_octave.kt @@ -1,4 +1,4 @@ -package com.torvald.terrarum.mapgenerator +package net.torvald.terrarum.mapgenerator /* * A speed-improved simplex noise algorithm for 2D, 3D and 4D in Java. @@ -17,7 +17,7 @@ package com.torvald.terrarum.mapgenerator * */ -import com.torvald.random.HQRNG +import net.torvald.random.HQRNG class SimplexNoise_octave(seed: Int) { // Simplex noise in 2D, 3D and 4D diff --git a/src/com/Torvald/Terrarum/MapGenerator/floatingIslePreset01.png b/src/net/torvald/terrarum/mapgenerator/floatingIslePreset01.png similarity index 100% rename from src/com/Torvald/Terrarum/MapGenerator/floatingIslePreset01.png rename to src/net/torvald/terrarum/mapgenerator/floatingIslePreset01.png diff --git a/src/com/Torvald/Terrarum/MapGenerator/floatingIslePreset02.png b/src/net/torvald/terrarum/mapgenerator/floatingIslePreset02.png similarity index 100% rename from src/com/Torvald/Terrarum/MapGenerator/floatingIslePreset02.png rename to src/net/torvald/terrarum/mapgenerator/floatingIslePreset02.png diff --git a/src/com/Torvald/Terrarum/MapGenerator/floatingIslePreset03.png b/src/net/torvald/terrarum/mapgenerator/floatingIslePreset03.png similarity index 100% rename from src/com/Torvald/Terrarum/MapGenerator/floatingIslePreset03.png rename to src/net/torvald/terrarum/mapgenerator/floatingIslePreset03.png diff --git a/src/com/Torvald/Terrarum/MapGenerator/floatingIslePreset04.png b/src/net/torvald/terrarum/mapgenerator/floatingIslePreset04.png similarity index 100% rename from src/com/Torvald/Terrarum/MapGenerator/floatingIslePreset04.png rename to src/net/torvald/terrarum/mapgenerator/floatingIslePreset04.png diff --git a/src/com/Torvald/Terrarum/MapGenerator/floatingIslePreset05.png b/src/net/torvald/terrarum/mapgenerator/floatingIslePreset05.png similarity index 100% rename from src/com/Torvald/Terrarum/MapGenerator/floatingIslePreset05.png rename to src/net/torvald/terrarum/mapgenerator/floatingIslePreset05.png diff --git a/src/com/torvald/terrarum/realestate/RealEstateCodex.kt b/src/net/torvald/terrarum/realestate/RealEstateCodex.kt similarity index 95% rename from src/com/torvald/terrarum/realestate/RealEstateCodex.kt rename to src/net/torvald/terrarum/realestate/RealEstateCodex.kt index c8e0a4d0b..ca8d94784 100644 --- a/src/com/torvald/terrarum/realestate/RealEstateCodex.kt +++ b/src/net/torvald/terrarum/realestate/RealEstateCodex.kt @@ -1,4 +1,4 @@ -package com.torvald.terrarum.realestate +package net.torvald.terrarum.realestate import java.io.Serializable import java.util.* diff --git a/src/com/torvald/terrarum/realestate/RealEstateUtility.kt b/src/net/torvald/terrarum/realestate/RealEstateUtility.kt similarity index 81% rename from src/com/torvald/terrarum/realestate/RealEstateUtility.kt rename to src/net/torvald/terrarum/realestate/RealEstateUtility.kt index c271568f8..3849b0eb4 100644 --- a/src/com/torvald/terrarum/realestate/RealEstateUtility.kt +++ b/src/net/torvald/terrarum/realestate/RealEstateUtility.kt @@ -1,6 +1,6 @@ -package com.torvald.terrarum.realestate +package net.torvald.terrarum.realestate -import com.torvald.terrarum.Terrarum +import net.torvald.terrarum.Terrarum /** * Created by minjaesong on 16-03-27. diff --git a/src/com/Torvald/Terrarum/TileProperties/TileNameCode.kt b/src/net/torvald/terrarum/tileproperties/TileNameCode.kt similarity index 98% rename from src/com/Torvald/Terrarum/TileProperties/TileNameCode.kt rename to src/net/torvald/terrarum/tileproperties/TileNameCode.kt index 58d333286..5572fccb9 100644 --- a/src/com/Torvald/Terrarum/TileProperties/TileNameCode.kt +++ b/src/net/torvald/terrarum/tileproperties/TileNameCode.kt @@ -1,6 +1,6 @@ -package com.torvald.terrarum.tileproperties +package net.torvald.terrarum.tileproperties -import com.torvald.terrarum.Terrarum +import net.torvald.terrarum.Terrarum /** * Created by minjaesong on 16-02-21. diff --git a/src/com/Torvald/Terrarum/TileProperties/TileProp.kt b/src/net/torvald/terrarum/tileproperties/TileProp.kt similarity index 93% rename from src/com/Torvald/Terrarum/TileProperties/TileProp.kt rename to src/net/torvald/terrarum/tileproperties/TileProp.kt index 45b373225..b255df6c3 100644 --- a/src/com/Torvald/Terrarum/TileProperties/TileProp.kt +++ b/src/net/torvald/terrarum/tileproperties/TileProp.kt @@ -1,4 +1,4 @@ -package com.torvald.terrarum.tileproperties +package net.torvald.terrarum.tileproperties /** * Created by minjaesong on 16-02-16. diff --git a/src/com/Torvald/Terrarum/TileProperties/TilePropCodex.kt b/src/net/torvald/terrarum/tileproperties/TilePropCodex.kt similarity index 95% rename from src/com/Torvald/Terrarum/TileProperties/TilePropCodex.kt rename to src/net/torvald/terrarum/tileproperties/TilePropCodex.kt index 600b3332c..45e31cdd2 100644 --- a/src/com/Torvald/Terrarum/TileProperties/TilePropCodex.kt +++ b/src/net/torvald/terrarum/tileproperties/TilePropCodex.kt @@ -1,8 +1,8 @@ -package com.torvald.terrarum.tileproperties +package net.torvald.terrarum.tileproperties -import com.torvald.CSVFetcher -import com.torvald.terrarum.gamemap.MapLayer -import com.torvald.terrarum.gamemap.PairedMapLayer +import net.torvald.CSVFetcher +import net.torvald.terrarum.gamemap.MapLayer +import net.torvald.terrarum.gamemap.PairedMapLayer import org.apache.commons.csv.CSVRecord import java.io.IOException diff --git a/src/com/Torvald/Terrarum/TileProperties/tileprop.csv b/src/net/torvald/terrarum/tileproperties/tileprop.csv similarity index 100% rename from src/com/Torvald/Terrarum/TileProperties/tileprop.csv rename to src/net/torvald/terrarum/tileproperties/tileprop.csv diff --git a/src/com/torvald/terrarum/tileproperties/tileprop_nohdr.csv b/src/net/torvald/terrarum/tileproperties/tileprop_nohdr.csv similarity index 100% rename from src/com/torvald/terrarum/tileproperties/tileprop_nohdr.csv rename to src/net/torvald/terrarum/tileproperties/tileprop_nohdr.csv diff --git a/src/com/torvald/terrarum/tilestats/TileStats.kt b/src/net/torvald/terrarum/tilestats/TileStats.kt similarity index 88% rename from src/com/torvald/terrarum/tilestats/TileStats.kt rename to src/net/torvald/terrarum/tilestats/TileStats.kt index 40d83f589..d27229b77 100644 --- a/src/com/torvald/terrarum/tilestats/TileStats.kt +++ b/src/net/torvald/terrarum/tilestats/TileStats.kt @@ -1,11 +1,11 @@ -package com.torvald.terrarum.tilestats +package net.torvald.terrarum.tilestats -import com.torvald.terrarum.gameactors.Player -import com.torvald.terrarum.gamemap.GameMap -import com.torvald.terrarum.gamemap.MapLayer -import com.torvald.terrarum.mapdrawer.MapCamera -import com.torvald.terrarum.mapdrawer.MapDrawer -import com.torvald.terrarum.Terrarum +import net.torvald.terrarum.gameactors.Player +import net.torvald.terrarum.gamemap.GameMap +import net.torvald.terrarum.gamemap.MapLayer +import net.torvald.terrarum.mapdrawer.MapCamera +import net.torvald.terrarum.mapdrawer.MapDrawer +import net.torvald.terrarum.Terrarum import com.jme3.math.FastMath import java.util.Arrays diff --git a/src/com/torvald/terrarum/ui/BasicDebugInfoWindow.kt b/src/net/torvald/terrarum/ui/BasicDebugInfoWindow.kt similarity index 95% rename from src/com/torvald/terrarum/ui/BasicDebugInfoWindow.kt rename to src/net/torvald/terrarum/ui/BasicDebugInfoWindow.kt index b30b2f626..8bc363581 100644 --- a/src/com/torvald/terrarum/ui/BasicDebugInfoWindow.kt +++ b/src/net/torvald/terrarum/ui/BasicDebugInfoWindow.kt @@ -1,11 +1,11 @@ -package com.torvald.terrarum.ui +package net.torvald.terrarum.ui -import com.torvald.terrarum.gamemap.PairedMapLayer -import com.torvald.terrarum.langpack.Lang -import com.torvald.terrarum.mapdrawer.LightmapRenderer -import com.torvald.terrarum.mapdrawer.MapCamera -import com.torvald.terrarum.mapdrawer.MapDrawer -import com.torvald.terrarum.Terrarum +import net.torvald.terrarum.gamemap.PairedMapLayer +import net.torvald.terrarum.langpack.Lang +import net.torvald.terrarum.mapdrawer.LightmapRenderer +import net.torvald.terrarum.mapdrawer.MapCamera +import net.torvald.terrarum.mapdrawer.MapDrawer +import net.torvald.terrarum.Terrarum import org.newdawn.slick.Color import org.newdawn.slick.GameContainer import org.newdawn.slick.Graphics diff --git a/src/com/torvald/terrarum/ui/ConsoleWindow.kt b/src/net/torvald/terrarum/ui/ConsoleWindow.kt similarity index 96% rename from src/com/torvald/terrarum/ui/ConsoleWindow.kt rename to src/net/torvald/terrarum/ui/ConsoleWindow.kt index f552f8aa9..01212ca6e 100644 --- a/src/com/torvald/terrarum/ui/ConsoleWindow.kt +++ b/src/net/torvald/terrarum/ui/ConsoleWindow.kt @@ -1,9 +1,9 @@ -package com.torvald.terrarum.ui +package net.torvald.terrarum.ui -import com.torvald.terrarum.langpack.Lang -import com.torvald.terrarum.Terrarum -import com.torvald.terrarum.console.CommandInterpreter -import com.torvald.terrarum.gamecontroller.Key +import net.torvald.terrarum.langpack.Lang +import net.torvald.terrarum.Terrarum +import net.torvald.terrarum.console.CommandInterpreter +import net.torvald.terrarum.gamecontroller.Key import org.newdawn.slick.Color import org.newdawn.slick.GameContainer import org.newdawn.slick.Graphics diff --git a/src/com/torvald/terrarum/ui/MessageWindow.kt b/src/net/torvald/terrarum/ui/MessageWindow.kt similarity index 96% rename from src/com/torvald/terrarum/ui/MessageWindow.kt rename to src/net/torvald/terrarum/ui/MessageWindow.kt index c4f0266dc..cdfd4db2b 100644 --- a/src/com/torvald/terrarum/ui/MessageWindow.kt +++ b/src/net/torvald/terrarum/ui/MessageWindow.kt @@ -1,9 +1,9 @@ -package com.torvald.terrarum.ui +package net.torvald.terrarum.ui -import com.torvald.imagefont.GameFontWhite +import net.torvald.imagefont.GameFontWhite import com.jme3.math.FastMath -import com.torvald.terrarum.setBlendDisable -import com.torvald.terrarum.setBlendNormal +import net.torvald.terrarum.setBlendDisable +import net.torvald.terrarum.setBlendNormal import org.lwjgl.opengl.GL11 import org.newdawn.slick.* diff --git a/src/com/torvald/terrarum/ui/MovementInterpolator.kt b/src/net/torvald/terrarum/ui/MovementInterpolator.kt similarity index 96% rename from src/com/torvald/terrarum/ui/MovementInterpolator.kt rename to src/net/torvald/terrarum/ui/MovementInterpolator.kt index b7cf5f79b..5b0ce0168 100644 --- a/src/com/torvald/terrarum/ui/MovementInterpolator.kt +++ b/src/net/torvald/terrarum/ui/MovementInterpolator.kt @@ -1,4 +1,4 @@ -package com.torvald.terrarum.ui +package net.torvald.terrarum.ui import com.jme3.math.FastMath diff --git a/src/com/torvald/terrarum/ui/Notification.kt b/src/net/torvald/terrarum/ui/Notification.kt similarity index 96% rename from src/com/torvald/terrarum/ui/Notification.kt rename to src/net/torvald/terrarum/ui/Notification.kt index f258888fb..4081e4e71 100644 --- a/src/com/torvald/terrarum/ui/Notification.kt +++ b/src/net/torvald/terrarum/ui/Notification.kt @@ -1,6 +1,6 @@ -package com.torvald.terrarum.ui +package net.torvald.terrarum.ui -import com.torvald.terrarum.Terrarum +import net.torvald.terrarum.Terrarum import org.newdawn.slick.GameContainer import org.newdawn.slick.Graphics import org.newdawn.slick.Input diff --git a/src/com/torvald/terrarum/ui/UICanvas.kt b/src/net/torvald/terrarum/ui/UICanvas.kt similarity index 95% rename from src/com/torvald/terrarum/ui/UICanvas.kt rename to src/net/torvald/terrarum/ui/UICanvas.kt index ebb412dcf..c30baa170 100644 --- a/src/com/torvald/terrarum/ui/UICanvas.kt +++ b/src/net/torvald/terrarum/ui/UICanvas.kt @@ -1,4 +1,4 @@ -package com.torvald.terrarum.ui +package net.torvald.terrarum.ui import org.newdawn.slick.GameContainer import org.newdawn.slick.Graphics diff --git a/src/com/torvald/terrarum/ui/UIClickable.kt b/src/net/torvald/terrarum/ui/UIClickable.kt similarity index 93% rename from src/com/torvald/terrarum/ui/UIClickable.kt rename to src/net/torvald/terrarum/ui/UIClickable.kt index a9f4dbccf..a41040e5c 100644 --- a/src/com/torvald/terrarum/ui/UIClickable.kt +++ b/src/net/torvald/terrarum/ui/UIClickable.kt @@ -1,4 +1,4 @@ -package com.torvald.terrarum.ui +package net.torvald.terrarum.ui /** * Created by minjaesong on 16-03-06. diff --git a/src/com/torvald/terrarum/ui/UIHandler.kt b/src/net/torvald/terrarum/ui/UIHandler.kt similarity index 98% rename from src/com/torvald/terrarum/ui/UIHandler.kt rename to src/net/torvald/terrarum/ui/UIHandler.kt index 5e0ea06c1..0c701fedf 100644 --- a/src/com/torvald/terrarum/ui/UIHandler.kt +++ b/src/net/torvald/terrarum/ui/UIHandler.kt @@ -1,7 +1,7 @@ -package com.torvald.terrarum.ui +package net.torvald.terrarum.ui -import com.torvald.terrarum.mapdrawer.MapCamera -import com.torvald.terrarum.Terrarum +import net.torvald.terrarum.mapdrawer.MapCamera +import net.torvald.terrarum.Terrarum import com.jme3.math.FastMath import org.newdawn.slick.* diff --git a/src/com/torvald/terrarum/ui/UIItem.kt b/src/net/torvald/terrarum/ui/UIItem.kt similarity index 85% rename from src/com/torvald/terrarum/ui/UIItem.kt rename to src/net/torvald/terrarum/ui/UIItem.kt index dfd22e042..7e26e68fc 100644 --- a/src/com/torvald/terrarum/ui/UIItem.kt +++ b/src/net/torvald/terrarum/ui/UIItem.kt @@ -1,4 +1,4 @@ -package com.torvald.terrarum.ui +package net.torvald.terrarum.ui /** * Created by minjaesong on 15-12-31. diff --git a/src/com/torvald/terrarum/ui/UITypable.kt b/src/net/torvald/terrarum/ui/UITypable.kt similarity index 82% rename from src/com/torvald/terrarum/ui/UITypable.kt rename to src/net/torvald/terrarum/ui/UITypable.kt index a5ca19048..6502f0cf0 100644 --- a/src/com/torvald/terrarum/ui/UITypable.kt +++ b/src/net/torvald/terrarum/ui/UITypable.kt @@ -1,4 +1,4 @@ -package com.torvald.terrarum.ui +package net.torvald.terrarum.ui /** * Created by minjaesong on 16-03-06.