From 61a3206a9575ce502d5c14d84672c67fba46f4a1 Mon Sep 17 00:00:00 2001
From: Kazhnuz <kazhnuz@kobold.cafe>
Date: Wed, 5 May 2021 11:41:25 +0200
Subject: [PATCH] chore: put tweenmanager into the class folder

---
 .../classes/time}/init.lua                    | 27 ++++++++++++++++++-
 .../actors/utils => classes/time}/timer.lua   |  0
 .../birb/modules/transitions/parent.lua       |  2 +-
 .../birb/modules/world/actors/baseactor.lua   |  3 +--
 .../game/modules/gui/bosshpbar.lua            |  2 +-
 .../game/modules/gui/simplehpbar.lua          |  2 +-
 .../game/modules/gui/statusbar.lua            |  2 +-
 .../game/modules/menus/parents/menu.lua       |  2 +-
 .../game/modules/messagequeue/message.lua     |  2 +-
 .../scenes/battlesystem/actors/parent.lua     |  2 +-
 .../scenes/battlesystem/gui/hud.lua           |  2 +-
 .../scenes/battlesystem/init.lua              |  2 +-
 .../scenes/battlesystem/screens/gameover.lua  |  2 +-
 .../scenes/battlesystem/screens/victory.lua   |  2 +-
 .../scenes/battlesystem/world.lua             |  2 +-
 .../scenes/debug/menu/init.lua                |  2 +-
 .../scenes/menus/titlescreen/init.lua         |  2 +-
 .../scenes/overworld/actors/player/init.lua   |  2 +-
 sonic-radiance.love/scenes/overworld/init.lua |  2 +-
 .../scenes/overworld/screens/gameover.lua     |  2 +-
 20 files changed, 44 insertions(+), 20 deletions(-)
 rename sonic-radiance.love/{game/modules/tweenmanager => birb/classes/time}/init.lua (64%)
 rename sonic-radiance.love/birb/{modules/world/actors/utils => classes/time}/timer.lua (100%)

diff --git a/sonic-radiance.love/game/modules/tweenmanager/init.lua b/sonic-radiance.love/birb/classes/time/init.lua
similarity index 64%
rename from sonic-radiance.love/game/modules/tweenmanager/init.lua
rename to sonic-radiance.love/birb/classes/time/init.lua
index a6acf7a..e8988f5 100644
--- a/sonic-radiance.love/game/modules/tweenmanager/init.lua
+++ b/sonic-radiance.love/birb/classes/time/init.lua
@@ -1,7 +1,32 @@
+
+-- time.lua :: a timer, tweener and timed switch handler.
+-- This class need birb.libs.tween to work
+
+--[[
+  Copyright © 2019 Kazhnuz
+
+  Permission is hereby granted, free of charge, to any person obtaining a copy of
+  this software and associated documentation files (the "Software"), to deal in
+  the Software without restriction, including without limitation the rights to
+  use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+  the Software, and to permit persons to whom the Software is furnished to do so,
+  subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be included in all
+  copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+  FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+  COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+  IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+]]
+
 local TweenManager = Object:extend()
 
 local tween = require "birb.libs.tween"
-local Timer = require "birb.modules.world.actors.utils.timer"
+local Timer = require "birb.classes.time.timer"
 
 function TweenManager:new(subject)
   self.subject  = subject
diff --git a/sonic-radiance.love/birb/modules/world/actors/utils/timer.lua b/sonic-radiance.love/birb/classes/time/timer.lua
similarity index 100%
rename from sonic-radiance.love/birb/modules/world/actors/utils/timer.lua
rename to sonic-radiance.love/birb/classes/time/timer.lua
diff --git a/sonic-radiance.love/birb/modules/transitions/parent.lua b/sonic-radiance.love/birb/modules/transitions/parent.lua
index 2effce0..32dd61f 100644
--- a/sonic-radiance.love/birb/modules/transitions/parent.lua
+++ b/sonic-radiance.love/birb/modules/transitions/parent.lua
@@ -1,5 +1,5 @@
 local TransitionParent = Object:extend()
-local TweenManager = require "game.modules.tweenmanager"
+local TweenManager = require "birb.classes.time"
 
 function TransitionParent:new(func, ox, oy, fadeOut, easeIn, easeOut, duration, wait)
     self.tween = TweenManager(self)
diff --git a/sonic-radiance.love/birb/modules/world/actors/baseactor.lua b/sonic-radiance.love/birb/modules/world/actors/baseactor.lua
index c211997..c38d29a 100644
--- a/sonic-radiance.love/birb/modules/world/actors/baseactor.lua
+++ b/sonic-radiance.love/birb/modules/world/actors/baseactor.lua
@@ -22,10 +22,9 @@
   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 ]]
 
-local cwd   = (...):gsub('%.baseactor$', '') .. "."
 local BaseActor = Object:extend()
 
-local Timer   = require(cwd .. "utils.timer")
+local Timer   = require("birb.classes.time.timer")
 
 -- INIT FUNCTIONS
 -- Initialise the actor and its base functions
diff --git a/sonic-radiance.love/game/modules/gui/bosshpbar.lua b/sonic-radiance.love/game/modules/gui/bosshpbar.lua
index c00c2e5..f421f28 100644
--- a/sonic-radiance.love/game/modules/gui/bosshpbar.lua
+++ b/sonic-radiance.love/game/modules/gui/bosshpbar.lua
@@ -1,6 +1,6 @@
 local BossHpBar = Object:extend()
 
-local TweenManager = require "game.modules.tweenmanager"
+local TweenManager = require "birb.classes.time"
 local ComplexHPBar = require "game.modules.gui.complexhpbar"
 
 function BossHpBar:new(hp)
diff --git a/sonic-radiance.love/game/modules/gui/simplehpbar.lua b/sonic-radiance.love/game/modules/gui/simplehpbar.lua
index e3b2adc..42e2e26 100644
--- a/sonic-radiance.love/game/modules/gui/simplehpbar.lua
+++ b/sonic-radiance.love/game/modules/gui/simplehpbar.lua
@@ -1,6 +1,6 @@
 local SimpleHPBar = Object:extend()
 
-local TweenManager = require "game.modules.tweenmanager"
+local TweenManager = require "birb.classes.time"
 local gui         = require "game.modules.gui"
 
 function SimpleHPBar:new(hp)
diff --git a/sonic-radiance.love/game/modules/gui/statusbar.lua b/sonic-radiance.love/game/modules/gui/statusbar.lua
index 922df74..13be04c 100644
--- a/sonic-radiance.love/game/modules/gui/statusbar.lua
+++ b/sonic-radiance.love/game/modules/gui/statusbar.lua
@@ -1,5 +1,5 @@
 local StatusBar = Object:extend()
-local TweenManager = require "game.modules.tweenmanager"
+local TweenManager = require "birb.classes.time"
 
 local gui = require "game.modules.gui"
 
diff --git a/sonic-radiance.love/game/modules/menus/parents/menu.lua b/sonic-radiance.love/game/modules/menus/parents/menu.lua
index fb942cb..cc9557a 100644
--- a/sonic-radiance.love/game/modules/menus/parents/menu.lua
+++ b/sonic-radiance.love/game/modules/menus/parents/menu.lua
@@ -1,5 +1,5 @@
 local ListBox = require "birb.modules.menusystem.listbox"
-local TweenManager = require "game.modules.tweenmanager"
+local TweenManager = require "birb.classes.time"
 
 local RadianceMenu = ListBox:extend()
 
diff --git a/sonic-radiance.love/game/modules/messagequeue/message.lua b/sonic-radiance.love/game/modules/messagequeue/message.lua
index 9fb5d04..403141f 100644
--- a/sonic-radiance.love/game/modules/messagequeue/message.lua
+++ b/sonic-radiance.love/game/modules/messagequeue/message.lua
@@ -1,5 +1,5 @@
 local Message = Object:extend()
-local TweenManager = require "game.modules.tweenmanager"
+local TweenManager = require "birb.classes.time"
 
 local SPACING = 20
 local PLAYER_MESSAGE = 240 - 24
diff --git a/sonic-radiance.love/scenes/battlesystem/actors/parent.lua b/sonic-radiance.love/scenes/battlesystem/actors/parent.lua
index 9f7bf7d..46ba7ab 100644
--- a/sonic-radiance.love/scenes/battlesystem/actors/parent.lua
+++ b/sonic-radiance.love/scenes/battlesystem/actors/parent.lua
@@ -2,7 +2,7 @@ local Parent = Object:extend() -- On créer la classe des entitées, c'est la cl
 
 local maputils = require "scenes.battlesystem.utils"
 
-local TweenManager = require "game.modules.tweenmanager"
+local TweenManager = require "birb.classes.time"
 
 -- INIT FUNCTION
 -- Initilize the actor
diff --git a/sonic-radiance.love/scenes/battlesystem/gui/hud.lua b/sonic-radiance.love/scenes/battlesystem/gui/hud.lua
index 905f487..47d91a3 100644
--- a/sonic-radiance.love/scenes/battlesystem/gui/hud.lua
+++ b/sonic-radiance.love/scenes/battlesystem/gui/hud.lua
@@ -1,7 +1,7 @@
 local HUD = Object:extend()
 
 local gui         = require "game.modules.gui"
-local TweenManager = require "game.modules.tweenmanager"
+local TweenManager = require "birb.classes.time"
 local MessageQueue = require "game.modules.messagequeue"
 
 local PLAYER_HUD_HIDDEN   = 240+64
diff --git a/sonic-radiance.love/scenes/battlesystem/init.lua b/sonic-radiance.love/scenes/battlesystem/init.lua
index 12eb24e..e37bf3b 100644
--- a/sonic-radiance.love/scenes/battlesystem/init.lua
+++ b/sonic-radiance.love/scenes/battlesystem/init.lua
@@ -9,7 +9,7 @@ local Turns         = require "scenes.battlesystem.controllers"
 local VictoryScreen = require "scenes.battlesystem.screens.victory"
 local GameOverScreen = require "scenes.battlesystem.screens.gameover"
 
-local TweenManager = require "game.modules.tweenmanager"
+local TweenManager = require "birb.classes.time"
 
 function BattleSystem:new(battleData)
   BattleSystem.super.new(self)
diff --git a/sonic-radiance.love/scenes/battlesystem/screens/gameover.lua b/sonic-radiance.love/scenes/battlesystem/screens/gameover.lua
index 0b01b39..efabb3e 100644
--- a/sonic-radiance.love/scenes/battlesystem/screens/gameover.lua
+++ b/sonic-radiance.love/scenes/battlesystem/screens/gameover.lua
@@ -1,6 +1,6 @@
 local VictoryScreen = Object:extend()
 
-local TweenManager = require "game.modules.tweenmanager"
+local TweenManager = require "birb.classes.time"
 
 local BATTLECOMPLETE_START = 2
 local BATTLECOMPLETE_STOP  = 4
diff --git a/sonic-radiance.love/scenes/battlesystem/screens/victory.lua b/sonic-radiance.love/scenes/battlesystem/screens/victory.lua
index a2ed706..17f97c5 100644
--- a/sonic-radiance.love/scenes/battlesystem/screens/victory.lua
+++ b/sonic-radiance.love/scenes/battlesystem/screens/victory.lua
@@ -1,6 +1,6 @@
 local VictoryScreen = Object:extend()
 
-local TweenManager = require "game.modules.tweenmanager"
+local TweenManager = require "birb.classes.time"
 
 local BATTLECOMPLETE_START = 2
 local BATTLECOMPLETE_STOP  = 4
diff --git a/sonic-radiance.love/scenes/battlesystem/world.lua b/sonic-radiance.love/scenes/battlesystem/world.lua
index 75a5907..1f7f772 100644
--- a/sonic-radiance.love/scenes/battlesystem/world.lua
+++ b/sonic-radiance.love/scenes/battlesystem/world.lua
@@ -3,7 +3,7 @@ local World = Object:extend()
 local maputils  = require "scenes.battlesystem.utils"
 local Map       = require "game.modules.drawing.parallaxBackground"
 
-local TweenManager = require "game.modules.tweenmanager"
+local TweenManager = require "birb.classes.time"
 
 local POSITIONS = {
   {x = 3, y = 4},
diff --git a/sonic-radiance.love/scenes/debug/menu/init.lua b/sonic-radiance.love/scenes/debug/menu/init.lua
index 4762e3e..88bff76 100644
--- a/sonic-radiance.love/scenes/debug/menu/init.lua
+++ b/sonic-radiance.love/scenes/debug/menu/init.lua
@@ -9,7 +9,7 @@ local itemutils = require "game.utils.items"
 local gui         = require "game.modules.gui"
 local MenuBack    = require "game.modules.gui.menuback"
 
-local TweenManager = require "game.modules.tweenmanager"
+local TweenManager = require "birb.classes.time"
 
 function DebugMenu:new()
   DebugMenu.super.new(self)
diff --git a/sonic-radiance.love/scenes/menus/titlescreen/init.lua b/sonic-radiance.love/scenes/menus/titlescreen/init.lua
index 18a3078..efb710a 100644
--- a/sonic-radiance.love/scenes/menus/titlescreen/init.lua
+++ b/sonic-radiance.love/scenes/menus/titlescreen/init.lua
@@ -25,7 +25,7 @@ local Scene       = require "birb.modules.scenes"
 local TitleScreen = Scene:extend()
 local gui         = require "game.modules.gui"
 
-local TweenManager = require "game.modules.tweenmanager"
+local TweenManager = require "birb.classes.time"
 local Background = require "game.modules.drawing.parallaxBackground"
 local Menu = require "scenes.menus.titlescreen.menu"
 
diff --git a/sonic-radiance.love/scenes/overworld/actors/player/init.lua b/sonic-radiance.love/scenes/overworld/actors/player/init.lua
index 485fada..b9c17af 100644
--- a/sonic-radiance.love/scenes/overworld/actors/player/init.lua
+++ b/sonic-radiance.love/scenes/overworld/actors/player/init.lua
@@ -1,7 +1,7 @@
 local Parent = require "scenes.overworld.actors.parent"
 local Player = Parent:extend()
 
-local TweenManager = require "game.modules.tweenmanager"
+local TweenManager = require "birb.classes.time"
 local Team = require "scenes.overworld.actors.player.team"
 local Interactions = require "scenes.overworld.actors.player.interactions"
 local Actions = require "scenes.overworld.actors.player.actions"
diff --git a/sonic-radiance.love/scenes/overworld/init.lua b/sonic-radiance.love/scenes/overworld/init.lua
index 54b8fbd..36abcb0 100644
--- a/sonic-radiance.love/scenes/overworld/init.lua
+++ b/sonic-radiance.love/scenes/overworld/init.lua
@@ -30,7 +30,7 @@ local CharsetManager = require "scenes.overworld.charsetmanager"
 local screens = require "scenes.overworld.screens"
 
 local gui = require "game.modules.gui"
-local TweenManager = require "game.modules.tweenmanager"
+local TweenManager = require "birb.classes.time"
 
 local EventManager = require "game.events"
 local MessageQueue = require "game.modules.messagequeue"
diff --git a/sonic-radiance.love/scenes/overworld/screens/gameover.lua b/sonic-radiance.love/scenes/overworld/screens/gameover.lua
index fce55ff..341822a 100644
--- a/sonic-radiance.love/scenes/overworld/screens/gameover.lua
+++ b/sonic-radiance.love/scenes/overworld/screens/gameover.lua
@@ -1,7 +1,7 @@
 local BaseScreen = require "scenes.overworld.screens.parent"
 local GameOver = BaseScreen:extend()
 
-local TweenManager = require "game.modules.tweenmanager"
+local TweenManager = require "birb.classes.time"
 
 local gui         = require "game.modules.gui"