From f5f66ea321f3a268f63c62d3298428293a527ffb Mon Sep 17 00:00:00 2001 From: Shambles_SM <115082072+ShamblesSM@users.noreply.github.com> Date: Tue, 21 Feb 2023 12:13:26 +0800 Subject: [PATCH] Replace forward slashes with dots Seems like this is the standard for Lua now. Furthermore, forward slashes in requires are deprecated in LOVE 12.0. --- .vscode/lua_snippets.code-snippets | 4 ++-- conf.lua | 2 +- crash.lua | 2 +- main.lua | 24 +++++++++++------------ src/BonusScarab.lua | 6 +++--- src/Collectible.lua | 4 ++-- src/CollectibleGenerator/Entry.lua | 2 +- src/CollectibleGenerator/Manager.lua | 4 ++-- src/ColorManager.lua | 2 +- src/ConfigManager.lua | 10 +++++----- src/Configs/FoodItem.lua | 2 +- src/Configs/Power.lua | 4 ++-- src/Configs/Shooter.lua | 6 +++--- src/Configs/ShooterMovement.lua | 2 +- src/Configs/UI2Animation.lua | 4 ++-- src/Configs/UI2Node.lua | 6 +++--- src/Configs/UI2Sequence.lua | 6 +++--- src/Configs/UI2Widget.lua | 6 +++--- src/DiscordRichPresence.lua | 4 ++-- src/DummyLevel.lua | 4 ++-- src/Essentials/Color.lua | 2 +- src/Essentials/ColorPalette.lua | 6 +++--- src/Essentials/Font.lua | 6 +++--- src/Essentials/Image.lua | 4 ++-- src/Essentials/Music.lua | 2 +- src/Essentials/Sound.lua | 4 ++-- src/Essentials/SoundEvent.lua | 2 +- src/Essentials/SoundInstance.lua | 4 ++-- src/Essentials/Sprite.lua | 8 ++++---- src/Essentials/Vector2.lua | 2 +- src/Expression.lua | 2 +- src/ExpressionVariables.lua | 4 ++-- src/FloatingText.lua | 4 ++-- src/Game.lua | 24 +++++++++++------------ src/GameModuleManager.lua | 2 +- src/Highscores.lua | 2 +- src/Kernel/BootScreen.lua | 12 ++++++------ src/Kernel/Console.lua | 4 ++-- src/Kernel/CrashScreen.lua | 4 ++-- src/Kernel/Debug.lua | 10 +++++----- src/Kernel/Log.lua | 2 +- src/Kernel/Profiler.lua | 4 ++-- src/Kernel/Scene/BootMain.lua | 6 +++--- src/Kernel/Scene/BootSettings.lua | 8 ++++---- src/Kernel/Settings.lua | 2 +- src/Kernel/UI/Button.lua | 4 ++-- src/Kernel/UI/Checkbox.lua | 4 ++-- src/Kernel/VersionManager.lua | 2 +- src/Level.lua | 16 +++++++-------- src/Map.lua | 8 ++++---- src/Options.lua | 2 +- src/Particle/Manager.lua | 8 ++++---- src/Particle/Packet.lua | 2 +- src/Particle/Piece.lua | 6 +++--- src/Particle/Spawner.lua | 4 ++-- src/Path.lua | 10 +++++----- src/Profile.lua | 2 +- src/ProfileManager.lua | 4 ++-- src/ResourceManager.lua | 16 +++++++-------- src/RuntimeManager.lua | 8 ++++---- src/Scorpion.lua | 6 +++--- src/Session.lua | 8 ++++---- src/Shooter.lua | 12 ++++++------ src/ShotSphere.lua | 8 ++++---- src/Sphere.lua | 8 ++++---- src/SphereChain.lua | 4 ++-- src/SphereEntity.lua | 6 +++--- src/SphereGroup.lua | 10 +++++----- src/Target.lua | 4 ++-- src/Timer.lua | 2 +- src/UI/Manager.lua | 6 +++--- src/UI/Widget.lua | 28 +++++++++++++-------------- src/UI/WidgetLevel.lua | 4 ++-- src/UI/WidgetParticle.lua | 2 +- src/UI/WidgetRectangle.lua | 2 +- src/UI/WidgetSprite.lua | 2 +- src/UI/WidgetSpriteButton.lua | 4 ++-- src/UI/WidgetSpriteButtonCheckbox.lua | 6 +++--- src/UI/WidgetSpriteButtonSlider.lua | 6 +++--- src/UI/WidgetSpriteProgress.lua | 4 ++-- src/UI/WidgetSpriteProgressBlitz.lua | 4 ++-- src/UI/WidgetText.lua | 4 ++-- src/UI/WidgetTextInput.lua | 4 ++-- src/UI2/Manager.lua | 4 ++-- src/UI2/Node.lua | 10 +++++----- src/UI2/Sequence.lua | 2 +- src/UI2/Widget.lua | 6 +++--- src/UI2/WidgetRectangle.lua | 2 +- src/UI2/WidgetSprite.lua | 2 +- src/UI2/WidgetSpriteButton.lua | 4 ++-- src/UI2/WidgetText.lua | 2 +- 91 files changed, 253 insertions(+), 253 deletions(-) diff --git a/.vscode/lua_snippets.code-snippets b/.vscode/lua_snippets.code-snippets index eb512ee1..450899f5 100644 --- a/.vscode/lua_snippets.code-snippets +++ b/.vscode/lua_snippets.code-snippets @@ -19,7 +19,7 @@ "scope": "lua", "prefix": "!class", "body": [ - "local class = require \"com/class\"", + "local class = require \"com.class\"", "", "---@class ${TM_FILENAME_BASE}", "---@overload fun(${1:params}):${TM_FILENAME_BASE}", @@ -43,7 +43,7 @@ "scope": "lua", "prefix": "!classn", "body": [ - "local class = require \"com/class\"", + "local class = require \"com.class\"", "", "---@class ${1:${TM_FILENAME_BASE}}", "---@overload fun(${2:params}):${1:${TM_FILENAME_BASE}}", diff --git a/conf.lua b/conf.lua index f78a6147..f3a48030 100644 --- a/conf.lua +++ b/conf.lua @@ -1,4 +1,4 @@ -local json = require("com/json") +local json = require("com.json") diff --git a/crash.lua b/crash.lua index e138b344..ceac3d9d 100644 --- a/crash.lua +++ b/crash.lua @@ -2,7 +2,7 @@ local utf8 = require("utf8") -local CrashScreen = require("src/Kernel/CrashScreen") +local CrashScreen = require("src.Kernel.CrashScreen") local crashScreen = nil local DT = 0.1 diff --git a/main.lua b/main.lua index 218251dc..e9b700e7 100644 --- a/main.lua +++ b/main.lua @@ -4,24 +4,24 @@ require("crash") -- global utility methods -require("src/strmethods") -require("src/mathmethods") +require("src.strmethods") +require("src.mathmethods") -local json = require("com/json") +local json = require("com.json") -local Vec2 = require("src/Essentials/Vector2") -local Color = require("src/Essentials/Color") +local Vec2 = require("src.Essentials.Vector2") +local Color = require("src.Essentials.Color") -local Log = require("src/Kernel/Log") -local Debug = require("src/Kernel/Debug") +local Log = require("src.Kernel.Log") +local Debug = require("src.Kernel.Debug") -local BootScreen = require("src/Kernel/BootScreen") -local Game = require("src/Game") +local BootScreen = require("src.Kernel.BootScreen") +local Game = require("src.Game") -local ExpressionVariables = require("src/ExpressionVariables") -local Settings = require("src/Kernel/Settings") +local ExpressionVariables = require("src.ExpressionVariables") +local Settings = require("src.Kernel.Settings") -local DiscordRichPresence = require("src/DiscordRichPresence") +local DiscordRichPresence = require("src.DiscordRichPresence") diff --git a/src/BonusScarab.lua b/src/BonusScarab.lua index 9503dc62..94fbe576 100644 --- a/src/BonusScarab.lua +++ b/src/BonusScarab.lua @@ -1,11 +1,11 @@ -local class = require "com/class" +local class = require "com.class" ---@class BonusScarab ---@overload fun(path, deserializationTable):BonusScarab local BonusScarab = class:derive("BonusScarab") -local Vec2 = require("src/Essentials/Vector2") -local Color = require("src/Essentials/Color") +local Vec2 = require("src.Essentials.Vector2") +local Color = require("src.Essentials.Color") diff --git a/src/Collectible.lua b/src/Collectible.lua index af266307..ff8cb3cf 100644 --- a/src/Collectible.lua +++ b/src/Collectible.lua @@ -1,10 +1,10 @@ -local class = require "com/class" +local class = require "com.class" ---@class Collectible ---@overload fun(deserializationTable, pos, name):Collectible local Collectible = class:derive("Collectible") -local Vec2 = require("src/Essentials/Vector2") +local Vec2 = require("src.Essentials.Vector2") diff --git a/src/CollectibleGenerator/Entry.lua b/src/CollectibleGenerator/Entry.lua index 9adbf198..a0752f39 100644 --- a/src/CollectibleGenerator/Entry.lua +++ b/src/CollectibleGenerator/Entry.lua @@ -1,4 +1,4 @@ -local class = require "com/class" +local class = require "com.class" ---@class CollectibleGeneratorEntry ---@overload fun(manager, name):CollectibleGeneratorEntry diff --git a/src/CollectibleGenerator/Manager.lua b/src/CollectibleGenerator/Manager.lua index dfffc3cb..2a69671a 100644 --- a/src/CollectibleGenerator/Manager.lua +++ b/src/CollectibleGenerator/Manager.lua @@ -1,10 +1,10 @@ -local class = require "com/class" +local class = require "com.class" ---@class CollectibleGeneratorManager ---@overload fun():CollectibleGeneratorManager local CollectibleGeneratorManager = class:derive("CollectibleGeneratorManager") -local CollectibleGeneratorEntry = require("src/CollectibleGenerator/Entry") +local CollectibleGeneratorEntry = require("src.CollectibleGenerator.Entry") diff --git a/src/ColorManager.lua b/src/ColorManager.lua index 00e07ed4..9eade978 100644 --- a/src/ColorManager.lua +++ b/src/ColorManager.lua @@ -1,4 +1,4 @@ -local class = require "com/class" +local class = require "com.class" ---Counts spheres on the board. ---@class ColorManager diff --git a/src/ConfigManager.lua b/src/ConfigManager.lua index cf5b5093..4e9a8b7e 100644 --- a/src/ConfigManager.lua +++ b/src/ConfigManager.lua @@ -1,14 +1,14 @@ -local class = require "com/class" +local class = require "com.class" ---@class ConfigManager ---@overload fun():ConfigManager local ConfigManager = class:derive("ConfigManager") -local CollectibleGeneratorManager = require("src/CollectibleGenerator/Manager") +local CollectibleGeneratorManager = require("src.CollectibleGenerator.Manager") -local ShooterConfig = require("src/Configs/Shooter") -local Power = require("src/Configs/Power") -local FoodItem = require("src/Configs/FoodItem") +local ShooterConfig = require("src.Configs.Shooter") +local Power = require("src.Configs.Power") +local FoodItem = require("src.Configs.FoodItem") diff --git a/src/Configs/FoodItem.lua b/src/Configs/FoodItem.lua index a7e54697..7499ede4 100644 --- a/src/Configs/FoodItem.lua +++ b/src/Configs/FoodItem.lua @@ -1,4 +1,4 @@ -local class = require "com/class" +local class = require "com.class" ---@class FoodItem ---@overload fun(data, path):FoodItem diff --git a/src/Configs/Power.lua b/src/Configs/Power.lua index 94e90498..dd4e4e5b 100644 --- a/src/Configs/Power.lua +++ b/src/Configs/Power.lua @@ -1,10 +1,10 @@ -local class = require "com/class" +local class = require "com.class" ---@class Power ---@overload fun(data):Power local Power = class:derive("Power") -local Profile = require("src/Profile") +local Profile = require("src.Profile") diff --git a/src/Configs/Shooter.lua b/src/Configs/Shooter.lua index 7f7beb8c..525135ca 100644 --- a/src/Configs/Shooter.lua +++ b/src/Configs/Shooter.lua @@ -1,11 +1,11 @@ -local class = require "com/class" +local class = require "com.class" ---@class ShooterConfig ---@overload fun(data):ShooterConfig local ShooterConfig = class:derive("ShooterConfig") -local Vec2 = require("src/Essentials/Vector2") -local ShooterMovementConfig = require("src/Configs/ShooterMovement") +local Vec2 = require("src.Essentials.Vector2") +local ShooterMovementConfig = require("src.Configs.ShooterMovement") diff --git a/src/Configs/ShooterMovement.lua b/src/Configs/ShooterMovement.lua index 2cf91984..75b0a3ab 100644 --- a/src/Configs/ShooterMovement.lua +++ b/src/Configs/ShooterMovement.lua @@ -1,4 +1,4 @@ -local class = require "com/class" +local class = require "com.class" ---@class ShooterMovementConfig ---@overload fun(data):ShooterMovementConfig diff --git a/src/Configs/UI2Animation.lua b/src/Configs/UI2Animation.lua index c5300201..7569c25b 100644 --- a/src/Configs/UI2Animation.lua +++ b/src/Configs/UI2Animation.lua @@ -1,10 +1,10 @@ -local class = require "com/class" +local class = require "com.class" ---@class UI2AnimationConfig ---@overload fun(data):UI2AnimationConfig local UI2AnimationConfig = class:derive("UI2AnimationConfig") -local Vec2 = require("src/Essentials/Vector2") +local Vec2 = require("src.Essentials.Vector2") diff --git a/src/Configs/UI2Node.lua b/src/Configs/UI2Node.lua index a99303ed..377b5cd1 100644 --- a/src/Configs/UI2Node.lua +++ b/src/Configs/UI2Node.lua @@ -1,11 +1,11 @@ -local class = require "com/class" +local class = require "com.class" ---@class UI2NodeConfig ---@overload fun(data):UI2NodeConfig local UI2NodeConfig = class:derive("UI2NodeConfig") -local Vec2 = require("src/Essentials/Vector2") -local UI2WidgetConfig = require("src/Configs/UI2Widget") +local Vec2 = require("src.Essentials.Vector2") +local UI2WidgetConfig = require("src.Configs.UI2Widget") diff --git a/src/Configs/UI2Sequence.lua b/src/Configs/UI2Sequence.lua index f47d7e37..9507e2e9 100644 --- a/src/Configs/UI2Sequence.lua +++ b/src/Configs/UI2Sequence.lua @@ -1,11 +1,11 @@ -local class = require "com/class" +local class = require "com.class" ---@class UI2SequenceConfig ---@overload fun(data):UI2SequenceConfig local UI2SequenceConfig = class:derive("UI2SequenceConfig") -local Vec2 = require("src/Essentials/Vector2") -local Color = require("src/Essentials/Color") +local Vec2 = require("src.Essentials.Vector2") +local Color = require("src.Essentials.Color") diff --git a/src/Configs/UI2Widget.lua b/src/Configs/UI2Widget.lua index a16ccbf3..0ab6cfcd 100644 --- a/src/Configs/UI2Widget.lua +++ b/src/Configs/UI2Widget.lua @@ -1,11 +1,11 @@ -local class = require "com/class" +local class = require "com.class" ---@class UI2WidgetConfig ---@overload fun(data):UI2WidgetConfig local UI2WidgetConfig = class:derive("UI2WidgetConfig") -local Vec2 = require("src/Essentials/Vector2") -local Color = require("src/Essentials/Color") +local Vec2 = require("src.Essentials.Vector2") +local Color = require("src.Essentials.Color") diff --git a/src/DiscordRichPresence.lua b/src/DiscordRichPresence.lua index c3f7a12f..daf45b52 100644 --- a/src/DiscordRichPresence.lua +++ b/src/DiscordRichPresence.lua @@ -1,4 +1,4 @@ -local class = require "com/class" +local class = require "com.class" ---@class DiscordRichPresence ---@overload fun():DiscordRichPresence @@ -37,7 +37,7 @@ end ---Includes and initializes the actual Rich Presence code. function DiscordRichPresence:init() - self.rpcMain = require("com/discordRPC") + self.rpcMain = require("com.discordRPC") function self.rpcMain.ready(userId, username, discriminator, avatar) self.connected = true diff --git a/src/DummyLevel.lua b/src/DummyLevel.lua index 3997ffc5..0c143f76 100644 --- a/src/DummyLevel.lua +++ b/src/DummyLevel.lua @@ -1,10 +1,10 @@ -local class = require "com/class" +local class = require "com.class" ---@class DummyLevel ---@overload fun(path):DummyLevel local DummyLevel = class:derive("DummyLevel") -local Map = require("src/Map") +local Map = require("src.Map") diff --git a/src/Essentials/Color.lua b/src/Essentials/Color.lua index 678ca001..475f5d7d 100644 --- a/src/Essentials/Color.lua +++ b/src/Essentials/Color.lua @@ -1,4 +1,4 @@ -local class = require "com/class" +local class = require "com.class" ---@class Color ---@overload fun(r, g, b):Color diff --git a/src/Essentials/ColorPalette.lua b/src/Essentials/ColorPalette.lua index e51ad46a..fee7011b 100644 --- a/src/Essentials/ColorPalette.lua +++ b/src/Essentials/ColorPalette.lua @@ -1,11 +1,11 @@ -local class = require "com/class" +local class = require "com.class" ---@class ColorPalette ---@overload fun(path):ColorPalette local ColorPalette = class:derive("ColorPalette") -local Vec2 = require("src/Essentials/Vector2") -local Color = require("src/Essentials/Color") +local Vec2 = require("src.Essentials.Vector2") +local Color = require("src.Essentials.Color") diff --git a/src/Essentials/Font.lua b/src/Essentials/Font.lua index 0b5d136f..a0783641 100644 --- a/src/Essentials/Font.lua +++ b/src/Essentials/Font.lua @@ -1,11 +1,11 @@ -local class = require "com/class" +local class = require "com.class" ---@class ColorPalette ---@overload fun(path):ColorPalette local Font = class:derive("Font") -local Vec2 = require("src/Essentials/Vector2") -local Color = require("src/Essentials/Color") +local Vec2 = require("src.Essentials.Vector2") +local Color = require("src.Essentials.Color") diff --git a/src/Essentials/Image.lua b/src/Essentials/Image.lua index 1f77e9d2..51a13033 100644 --- a/src/Essentials/Image.lua +++ b/src/Essentials/Image.lua @@ -1,10 +1,10 @@ -local class = require "com/class" +local class = require "com.class" ---@class Image ---@overload fun(path):Image local Image = class:derive("Image") -local Vec2 = require("src/Essentials/Vector2") +local Vec2 = require("src.Essentials.Vector2") diff --git a/src/Essentials/Music.lua b/src/Essentials/Music.lua index fc45502f..edeb8262 100644 --- a/src/Essentials/Music.lua +++ b/src/Essentials/Music.lua @@ -1,4 +1,4 @@ -local class = require "com/class" +local class = require "com.class" ---@class Music ---@overload fun(path):Music diff --git a/src/Essentials/Sound.lua b/src/Essentials/Sound.lua index 58385451..125c5c87 100644 --- a/src/Essentials/Sound.lua +++ b/src/Essentials/Sound.lua @@ -1,10 +1,10 @@ -local class = require "com/class" +local class = require "com.class" ---@class Sound ---@overload fun(path):Sound local Sound = class:derive("Sound") -local SoundInstance = require("src/Essentials/SoundInstance") +local SoundInstance = require("src.Essentials.SoundInstance") diff --git a/src/Essentials/SoundEvent.lua b/src/Essentials/SoundEvent.lua index c3cc1f51..c7f41a98 100644 --- a/src/Essentials/SoundEvent.lua +++ b/src/Essentials/SoundEvent.lua @@ -1,4 +1,4 @@ -local class = require "com/class" +local class = require "com.class" ---@class SoundEvent ---@overload fun():SoundEvent diff --git a/src/Essentials/SoundInstance.lua b/src/Essentials/SoundInstance.lua index 8a1c0544..63058b9c 100644 --- a/src/Essentials/SoundInstance.lua +++ b/src/Essentials/SoundInstance.lua @@ -1,10 +1,10 @@ -local class = require "com/class" +local class = require "com.class" ---@class SoundInstance ---@overload fun(path, instance):SoundInstance local SoundInstance = class:derive("SoundInstance") -local Vec2 = require("src/Essentials/Vector2") +local Vec2 = require("src.Essentials.Vector2") diff --git a/src/Essentials/Sprite.lua b/src/Essentials/Sprite.lua index 9dad4de7..1ffe9cb5 100644 --- a/src/Essentials/Sprite.lua +++ b/src/Essentials/Sprite.lua @@ -1,12 +1,12 @@ -local class = require "com/class" +local class = require "com.class" ---@class Sprite ---@overload fun(path):Sprite local Sprite = class:derive("Sprite") -local Vec2 = require("src/Essentials/Vector2") -local Color = require("src/Essentials/Color") -local Image = require("src/Essentials/Image") +local Vec2 = require("src.Essentials.Vector2") +local Color = require("src.Essentials.Color") +local Image = require("src.Essentials.Image") diff --git a/src/Essentials/Vector2.lua b/src/Essentials/Vector2.lua index 33d09883..6cb89b2f 100644 --- a/src/Essentials/Vector2.lua +++ b/src/Essentials/Vector2.lua @@ -1,4 +1,4 @@ -local class = require "com/class" +local class = require "com.class" ---@class Vector2 ---@operator add(Vector2|number):Vector2 diff --git a/src/Expression.lua b/src/Expression.lua index dac71bb2..aef6e6e1 100644 --- a/src/Expression.lua +++ b/src/Expression.lua @@ -3,7 +3,7 @@ -local class = require "com/class" +local class = require "com.class" ---@class Expression ---@overload fun(str):Expression diff --git a/src/ExpressionVariables.lua b/src/ExpressionVariables.lua index b1953b95..d99ebc8e 100644 --- a/src/ExpressionVariables.lua +++ b/src/ExpressionVariables.lua @@ -2,13 +2,13 @@ -local class = require "com/class" +local class = require "com.class" ---@class ExpressionVariables ---@overload fun():ExpressionVariables local ExpressionVariables = class:derive("ExpressionVariables") -local Expression = require("src/Expression") +local Expression = require("src.Expression") diff --git a/src/FloatingText.lua b/src/FloatingText.lua index dc3f7f17..74130cba 100644 --- a/src/FloatingText.lua +++ b/src/FloatingText.lua @@ -1,10 +1,10 @@ -local class = require "com/class" +local class = require "com.class" ---@class FloatingText ---@overload fun(text, pos, font):FloatingText local FloatingText = class:derive("FloatingText") -local Vec2 = require("src/Essentials/Vector2") +local Vec2 = require("src.Essentials.Vector2") diff --git a/src/Game.lua b/src/Game.lua index 85f7cfba..65312fa6 100644 --- a/src/Game.lua +++ b/src/Game.lua @@ -1,4 +1,4 @@ -local class = require "com/class" +local class = require "com.class" ---@class Game ---@overload fun(name):Game @@ -6,21 +6,21 @@ local Game = class:derive("Game") -local strmethods = require("src/strmethods") +local strmethods = require("src.strmethods") -local Vec2 = require("src/Essentials/Vector2") +local Vec2 = require("src.Essentials.Vector2") -local Timer = require("src/Timer") +local Timer = require("src.Timer") -local ConfigManager = require("src/ConfigManager") -local ResourceManager = require("src/ResourceManager") -local GameModuleManager = require("src/GameModuleManager") -local RuntimeManager = require("src/RuntimeManager") -local Session = require("src/Session") +local ConfigManager = require("src.ConfigManager") +local ResourceManager = require("src.ResourceManager") +local GameModuleManager = require("src.GameModuleManager") +local RuntimeManager = require("src.RuntimeManager") +local Session = require("src.Session") -local UIManager = require("src/UI/Manager") -local UI2Manager = require("src/UI2/Manager") -local ParticleManager = require("src/Particle/Manager") +local UIManager = require("src.UI.Manager") +local UI2Manager = require("src.UI2.Manager") +local ParticleManager = require("src.Particle.Manager") diff --git a/src/GameModuleManager.lua b/src/GameModuleManager.lua index e29486ab..857ab3df 100644 --- a/src/GameModuleManager.lua +++ b/src/GameModuleManager.lua @@ -1,6 +1,6 @@ -- This class will be soon deprecated, and thus will not be documented. -local class = require "com/class" +local class = require "com.class" ---@class GameModuleManager ---@overload fun():GameModuleManager diff --git a/src/Highscores.lua b/src/Highscores.lua index f5ee41cd..54a0756e 100644 --- a/src/Highscores.lua +++ b/src/Highscores.lua @@ -1,4 +1,4 @@ -local class = require "com/class" +local class = require "com.class" ---@class Highscores ---@overload fun(data):Highscores diff --git a/src/Kernel/BootScreen.lua b/src/Kernel/BootScreen.lua index 8a2d65a9..de7ce8b2 100644 --- a/src/Kernel/BootScreen.lua +++ b/src/Kernel/BootScreen.lua @@ -1,16 +1,16 @@ -local class = require "com/class" +local class = require "com.class" ---@class BootScreen ---@overload fun():BootScreen local BootScreen = class:derive("BootScreen") -local Vec2 = require("src/Essentials/Vector2") -local Button = require("src/Kernel/UI/Button") +local Vec2 = require("src.Essentials.Vector2") +local Button = require("src.Kernel.UI.Button") -local VersionManager = require("src/Kernel/VersionManager") +local VersionManager = require("src.Kernel.VersionManager") -local BootMain = require("src/Kernel/Scene/BootMain") -local BootSettings = require("src/Kernel/Scene/BootSettings") +local BootMain = require("src.Kernel.Scene.BootMain") +local BootSettings = require("src.Kernel.Scene.BootSettings") diff --git a/src/Kernel/Console.lua b/src/Kernel/Console.lua index b7a3e448..ca6af6d6 100644 --- a/src/Kernel/Console.lua +++ b/src/Kernel/Console.lua @@ -1,11 +1,11 @@ -local class = require "com/class" +local class = require "com.class" ---@class Console ---@overload fun():Console local Console = class:derive("Console") local utf8 = require("utf8") -local Vec2 = require("src/Essentials/Vector2") +local Vec2 = require("src.Essentials.Vector2") diff --git a/src/Kernel/CrashScreen.lua b/src/Kernel/CrashScreen.lua index 83398c36..4831bc4f 100644 --- a/src/Kernel/CrashScreen.lua +++ b/src/Kernel/CrashScreen.lua @@ -1,10 +1,10 @@ -local class = require "com/class" +local class = require "com.class" ---@class CrashScreen ---@overload fun(err):CrashScreen local CrashScreen = class:derive("CrashScreen") -local Vec2 = require("src/Essentials/Vector2") +local Vec2 = require("src.Essentials.Vector2") diff --git a/src/Kernel/Debug.lua b/src/Kernel/Debug.lua index 9e66201f..9c2c5559 100644 --- a/src/Kernel/Debug.lua +++ b/src/Kernel/Debug.lua @@ -1,15 +1,15 @@ -local class = require "com/class" +local class = require "com.class" ---@class Debug ---@overload fun():Debug local Debug = class:derive("Debug") -local Vec2 = require("src/Essentials/Vector2") +local Vec2 = require("src.Essentials.Vector2") -local Profiler = require("src/Kernel/Profiler") -local Console = require("src/Kernel/Console") +local Profiler = require("src.Kernel.Profiler") +local Console = require("src.Kernel.Console") -local Expression = require("src/Expression") +local Expression = require("src.Expression") diff --git a/src/Kernel/Log.lua b/src/Kernel/Log.lua index cb96bce1..09b881ca 100644 --- a/src/Kernel/Log.lua +++ b/src/Kernel/Log.lua @@ -1,4 +1,4 @@ -local class = require "com/class" +local class = require "com.class" ---@class Log ---@overload fun():Log diff --git a/src/Kernel/Profiler.lua b/src/Kernel/Profiler.lua index a71e1115..73af9e8f 100644 --- a/src/Kernel/Profiler.lua +++ b/src/Kernel/Profiler.lua @@ -1,10 +1,10 @@ -local class = require "com/class" +local class = require "com.class" ---@class Profiler ---@overload fun(name):Profiler local Profiler = class:derive("Profiler") -local Vec2 = require("src/Essentials/Vector2") +local Vec2 = require("src.Essentials.Vector2") diff --git a/src/Kernel/Scene/BootMain.lua b/src/Kernel/Scene/BootMain.lua index db3cd077..0aff97bb 100644 --- a/src/Kernel/Scene/BootMain.lua +++ b/src/Kernel/Scene/BootMain.lua @@ -1,11 +1,11 @@ -local class = require "com/class" +local class = require "com.class" ---@class BootMain ---@overload fun(bootScreen):BootMain local BootMain = class:derive("BootMain") -local Vec2 = require("src/Essentials/Vector2") -local Button = require("src/Kernel/UI/Button") +local Vec2 = require("src.Essentials.Vector2") +local Button = require("src.Kernel.UI.Button") diff --git a/src/Kernel/Scene/BootSettings.lua b/src/Kernel/Scene/BootSettings.lua index ac08c362..608940e6 100644 --- a/src/Kernel/Scene/BootSettings.lua +++ b/src/Kernel/Scene/BootSettings.lua @@ -1,12 +1,12 @@ -local class = require "com/class" +local class = require "com.class" ---@class BootSettings ---@overload fun(bootScreen):BootSettings local BootSettings = class:derive("BootSettings") -local Vec2 = require("src/Essentials/Vector2") -local Button = require("src/Kernel/UI/Button") -local Checkbox = require("src/Kernel/UI/Checkbox") +local Vec2 = require("src.Essentials.Vector2") +local Button = require("src.Kernel.UI.Button") +local Checkbox = require("src.Kernel.UI.Checkbox") diff --git a/src/Kernel/Settings.lua b/src/Kernel/Settings.lua index 3cc4f9cf..f3007852 100644 --- a/src/Kernel/Settings.lua +++ b/src/Kernel/Settings.lua @@ -1,4 +1,4 @@ -local class = require "com/class" +local class = require "com.class" ---@class Settings ---@overload fun(path):Settings diff --git a/src/Kernel/UI/Button.lua b/src/Kernel/UI/Button.lua index 14e16e76..095975a0 100644 --- a/src/Kernel/UI/Button.lua +++ b/src/Kernel/UI/Button.lua @@ -1,10 +1,10 @@ -local class = require "com/class" +local class = require "com.class" ---@class Button ---@overload fun(name, font, pos, size, onClick):Button local Button = class:derive("Button") -local Vec2 = require("src/Essentials/Vector2") +local Vec2 = require("src.Essentials.Vector2") diff --git a/src/Kernel/UI/Checkbox.lua b/src/Kernel/UI/Checkbox.lua index 0e9e4e3f..70739c03 100644 --- a/src/Kernel/UI/Checkbox.lua +++ b/src/Kernel/UI/Checkbox.lua @@ -1,10 +1,10 @@ -local class = require "com/class" +local class = require "com.class" ---@class Checkbox ---@overload fun(name, font, pos, size, onClick):Checkbox local Checkbox = class:derive("Checkbox") -local Vec2 = require("src/Essentials/Vector2") +local Vec2 = require("src.Essentials.Vector2") diff --git a/src/Kernel/VersionManager.lua b/src/Kernel/VersionManager.lua index 8d6f5ebf..3c16a396 100644 --- a/src/Kernel/VersionManager.lua +++ b/src/Kernel/VersionManager.lua @@ -1,4 +1,4 @@ -local class = require "com/class" +local class = require "com.class" ---@class VersionManager ---@overload fun(path):VersionManager diff --git a/src/Level.lua b/src/Level.lua index f1ec6ec0..8fedaf4d 100644 --- a/src/Level.lua +++ b/src/Level.lua @@ -1,17 +1,17 @@ -local class = require "com/class" +local class = require "com.class" ---@class Level ---@overload fun(data):Level local Level = class:derive("Level") -local Vec2 = require("src/Essentials/Vector2") +local Vec2 = require("src.Essentials.Vector2") -local Map = require("src/Map") -local Shooter = require("src/Shooter") -local ShotSphere = require("src/ShotSphere") -local Target = require("src/Target") -local Collectible = require("src/Collectible") -local FloatingText = require("src/FloatingText") +local Map = require("src.Map") +local Shooter = require("src.Shooter") +local ShotSphere = require("src.ShotSphere") +local Target = require("src.Target") +local Collectible = require("src.Collectible") +local FloatingText = require("src.FloatingText") diff --git a/src/Map.lua b/src/Map.lua index 8e1739f1..5d34737c 100644 --- a/src/Map.lua +++ b/src/Map.lua @@ -1,13 +1,13 @@ -local class = require "com/class" +local class = require "com.class" ---@class Map ---@overload fun(level, path, pathsBehavior, isDummy):Map local Map = class:derive("Map") -local Vec2 = require("src/Essentials/Vector2") -local Sprite = require("src/Essentials/Sprite") +local Vec2 = require("src.Essentials.Vector2") +local Sprite = require("src.Essentials.Sprite") -local Path = require("src/Path") +local Path = require("src.Path") diff --git a/src/Options.lua b/src/Options.lua index 662b1573..99eb5555 100644 --- a/src/Options.lua +++ b/src/Options.lua @@ -1,4 +1,4 @@ -local class = require "com/class" +local class = require "com.class" ---@class Options ---@overload fun(data):Options diff --git a/src/Particle/Manager.lua b/src/Particle/Manager.lua index aae2f835..1016227f 100644 --- a/src/Particle/Manager.lua +++ b/src/Particle/Manager.lua @@ -1,12 +1,12 @@ -local class = require "com/class" +local class = require "com.class" ---@class ParticleManager ---@overload fun():ParticleManager local ParticleManager = class:derive("ParticleManager") -local ParticlePacket = require("src/Particle/Packet") -local ParticleSpawner = require("src/Particle/Spawner") -local ParticlePiece = require("src/Particle/Piece") +local ParticlePacket = require("src.Particle.Packet") +local ParticleSpawner = require("src.Particle.Spawner") +local ParticlePiece = require("src.Particle.Piece") diff --git a/src/Particle/Packet.lua b/src/Particle/Packet.lua index 377027f0..4b2f2b38 100644 --- a/src/Particle/Packet.lua +++ b/src/Particle/Packet.lua @@ -1,4 +1,4 @@ -local class = require "com/class" +local class = require "com.class" ---@class ParticlePacket ---@overload fun(manager, data, pos):ParticlePacket diff --git a/src/Particle/Piece.lua b/src/Particle/Piece.lua index a2860df2..6bc5d885 100644 --- a/src/Particle/Piece.lua +++ b/src/Particle/Piece.lua @@ -1,11 +1,11 @@ -local class = require "com/class" +local class = require "com.class" ---@class ParticlePiece ---@overload fun(manager, spawner, data):ParticlePiece local ParticlePiece = class:derive("ParticlePiece") -local Vec2 = require("src/Essentials/Vector2") -local Sprite = require("src/Essentials/Sprite") +local Vec2 = require("src.Essentials.Vector2") +local Sprite = require("src.Essentials.Sprite") diff --git a/src/Particle/Spawner.lua b/src/Particle/Spawner.lua index a8f4c98c..a76df64e 100644 --- a/src/Particle/Spawner.lua +++ b/src/Particle/Spawner.lua @@ -1,10 +1,10 @@ -local class = require "com/class" +local class = require "com.class" ---@class ParticleSpawner ---@overload fun(manager, packet, data):ParticleSpawner local ParticleSpawner = class:derive("ParticleSpawner") -local Vec2 = require("src/Essentials/Vector2") +local Vec2 = require("src.Essentials.Vector2") diff --git a/src/Path.lua b/src/Path.lua index c3677a2b..472b654d 100644 --- a/src/Path.lua +++ b/src/Path.lua @@ -1,13 +1,13 @@ -local class = require "com/class" +local class = require "com.class" ---@class Path ---@overload fun(map, pathData, pathBehavior):Path local Path = class:derive("Path") -local Vec2 = require("src/Essentials/Vector2") -local SphereChain = require("src/SphereChain") -local BonusScarab = require("src/BonusScarab") -local Scorpion = require("src/Scorpion") +local Vec2 = require("src.Essentials.Vector2") +local SphereChain = require("src.SphereChain") +local BonusScarab = require("src.BonusScarab") +local Scorpion = require("src.Scorpion") diff --git a/src/Profile.lua b/src/Profile.lua index aa0d1a38..81517215 100644 --- a/src/Profile.lua +++ b/src/Profile.lua @@ -1,4 +1,4 @@ -local class = require "com/class" +local class = require "com.class" ---@class Profile ---@overload fun(data, name):Profile diff --git a/src/ProfileManager.lua b/src/ProfileManager.lua index 4c18af5d..e49529bd 100644 --- a/src/ProfileManager.lua +++ b/src/ProfileManager.lua @@ -1,10 +1,10 @@ -local class = require "com/class" +local class = require "com.class" ---@class ProfileManager ---@overload fun(data):ProfileManager local ProfileManager = class:derive("ProfileManager") -local Profile = require("src/Profile") +local Profile = require("src.Profile") diff --git a/src/ResourceManager.lua b/src/ResourceManager.lua index 031a651f..1c4f4f20 100644 --- a/src/ResourceManager.lua +++ b/src/ResourceManager.lua @@ -1,16 +1,16 @@ -local class = require "com/class" +local class = require "com.class" ---@class ResourceManager ---@overload fun():ResourceManager local ResourceManager = class:derive("ResourceManager") -local Image = require("src/Essentials/Image") -local Sprite = require("src/Essentials/Sprite") -local Sound = require("src/Essentials/Sound") -local SoundEvent = require("src/Essentials/SoundEvent") -local Music = require("src/Essentials/Music") -local Font = require("src/Essentials/Font") -local ColorPalette = require("src/Essentials/ColorPalette") +local Image = require("src.Essentials.Image") +local Sprite = require("src.Essentials.Sprite") +local Sound = require("src.Essentials.Sound") +local SoundEvent = require("src.Essentials.SoundEvent") +local Music = require("src.Essentials.Music") +local Font = require("src.Essentials.Font") +local ColorPalette = require("src.Essentials.ColorPalette") diff --git a/src/RuntimeManager.lua b/src/RuntimeManager.lua index 012e1850..72947af0 100644 --- a/src/RuntimeManager.lua +++ b/src/RuntimeManager.lua @@ -1,12 +1,12 @@ -local class = require "com/class" +local class = require "com.class" ---@class RuntimeManager ---@overload fun():RuntimeManager local RuntimeManager = class:derive("RuntimeManager") -local ProfileManager = require("src/ProfileManager") -local Highscores = require("src/Highscores") -local Options = require("src/Options") +local ProfileManager = require("src.ProfileManager") +local Highscores = require("src.Highscores") +local Options = require("src.Options") diff --git a/src/Scorpion.lua b/src/Scorpion.lua index 181b184b..c2e262bf 100644 --- a/src/Scorpion.lua +++ b/src/Scorpion.lua @@ -1,11 +1,11 @@ -local class = require "com/class" +local class = require "com.class" ---@class Scorpion ---@overload fun(path, deserializationTable):Scorpion local Scorpion = class:derive("Scorpion") -local Vec2 = require("src/Essentials/Vector2") -local Color = require("src/Essentials/Color") +local Vec2 = require("src.Essentials.Vector2") +local Color = require("src.Essentials.Color") diff --git a/src/Session.lua b/src/Session.lua index ec31c3a1..eada82ed 100644 --- a/src/Session.lua +++ b/src/Session.lua @@ -7,18 +7,18 @@ -- Class identification -local class = require "com/class" +local class = require "com.class" ---@class Session ---@overload fun(path, deserializationTable):Session local Session = class:derive("Session") -- Include commons -local Vec2 = require("src/Essentials/Vector2") +local Vec2 = require("src.Essentials.Vector2") -- Include class constructors -local Level = require("src/Level") -local ColorManager = require("src/ColorManager") +local Level = require("src.Level") +local ColorManager = require("src.ColorManager") diff --git a/src/Shooter.lua b/src/Shooter.lua index 8bfd73a1..92596238 100644 --- a/src/Shooter.lua +++ b/src/Shooter.lua @@ -1,15 +1,15 @@ -local class = require "com/class" +local class = require "com.class" ---@class Shooter ---@overload fun():Shooter local Shooter = class:derive("Shooter") -local Vec2 = require("src/Essentials/Vector2") -local Sprite = require("src/Essentials/Sprite") -local Color = require("src/Essentials/Color") +local Vec2 = require("src.Essentials.Vector2") +local Sprite = require("src.Essentials.Sprite") +local Color = require("src.Essentials.Color") -local SphereEntity = require("src/SphereEntity") -local ShotSphere = require("src/ShotSphere") +local SphereEntity = require("src.SphereEntity") +local ShotSphere = require("src.ShotSphere") diff --git a/src/ShotSphere.lua b/src/ShotSphere.lua index f2be156b..dca5ddf6 100644 --- a/src/ShotSphere.lua +++ b/src/ShotSphere.lua @@ -1,13 +1,13 @@ -local class = require "com/class" +local class = require "com.class" ---@class ShotSphere ---@overload fun(deserializationTable, shooter, pos, angle, color, speed):ShotSphere local ShotSphere = class:derive("ShotSphere") -local Vec2 = require("src/Essentials/Vector2") -local Color = require("src/Essentials/Color") +local Vec2 = require("src.Essentials.Vector2") +local Color = require("src.Essentials.Color") -local SphereEntity = require("src/SphereEntity") +local SphereEntity = require("src.SphereEntity") diff --git a/src/Sphere.lua b/src/Sphere.lua index 69bf2fce..1327c440 100644 --- a/src/Sphere.lua +++ b/src/Sphere.lua @@ -1,14 +1,14 @@ ### This class is not used yet. All sphere algorithms are stored in SphereGroup.lua. -local class = require "com/class" +local class = require "com.class" ---@class Sphere ---@overload fun(sphereGroup, deserializationTable, color, shootOrigin, shootTime, sphereEntity):Sphere local Sphere = class:derive("Sphere") -local Vec2 = require("src/Essentials/Vector2") -local Color = require("src/Essentials/Color") -local SphereEntity = require("src/SphereEntity") +local Vec2 = require("src.Essentials.Vector2") +local Color = require("src.Essentials.Color") +local SphereEntity = require("src.SphereEntity") diff --git a/src/SphereChain.lua b/src/SphereChain.lua index 9d747a0d..65026983 100644 --- a/src/SphereChain.lua +++ b/src/SphereChain.lua @@ -1,10 +1,10 @@ -local class = require "com/class" +local class = require "com.class" ---@class SphereChain ---@overload fun(path, deserializationTable):SphereChain local SphereChain = class:derive("SphereChain") -local SphereGroup = require("src/SphereGroup") +local SphereGroup = require("src.SphereGroup") diff --git a/src/SphereEntity.lua b/src/SphereEntity.lua index 586023ea..468250e1 100644 --- a/src/SphereEntity.lua +++ b/src/SphereEntity.lua @@ -1,11 +1,11 @@ -local class = require "com/class" +local class = require "com.class" ---@class SphereEntity ---@overload fun(pos, color):SphereEntity local SphereEntity = class:derive("SphereEntity") -local Vec2 = require("src/Essentials/Vector2") -local Color = require("src/Essentials/Color") +local Vec2 = require("src.Essentials.Vector2") +local Color = require("src.Essentials.Color") diff --git a/src/SphereGroup.lua b/src/SphereGroup.lua index c4d8af59..02e00daa 100644 --- a/src/SphereGroup.lua +++ b/src/SphereGroup.lua @@ -1,14 +1,14 @@ -local class = require "com/class" +local class = require "com.class" ---@class SphereGroup ---@overload fun(sphereChain, deserializationTable):SphereGroup local SphereGroup = class:derive("SphereGroup") -local Vec2 = require("src/Essentials/Vector2") -local Sprite = require("src/Essentials/Sprite") -local Color = require("src/Essentials/Color") +local Vec2 = require("src.Essentials.Vector2") +local Sprite = require("src.Essentials.Sprite") +local Color = require("src.Essentials.Color") -local Sphere = require("src/Sphere") +local Sphere = require("src.Sphere") diff --git a/src/Target.lua b/src/Target.lua index 75c34c30..e8694c23 100644 --- a/src/Target.lua +++ b/src/Target.lua @@ -1,10 +1,10 @@ -local class = require "com/class" +local class = require "com.class" ---@class Target ---@overload fun(spritePath, pos, isFreeSpin):Target local Target = class:derive("Target") -local Vec2 = require("src/Essentials/Vector2") +local Vec2 = require("src.Essentials.Vector2") diff --git a/src/Timer.lua b/src/Timer.lua index a4cd01e7..ceedaa13 100644 --- a/src/Timer.lua +++ b/src/Timer.lua @@ -1,4 +1,4 @@ -local class = require "com/class" +local class = require "com.class" ---@class Timer ---@overload fun():Timer diff --git a/src/UI/Manager.lua b/src/UI/Manager.lua index e1f898b1..8d7d898a 100644 --- a/src/UI/Manager.lua +++ b/src/UI/Manager.lua @@ -1,12 +1,12 @@ -local class = require "com/class" +local class = require "com.class" ---@class UIManager ---@overload fun():UIManager local UIManager = class:derive("UIManager") -local strmethods = require("src/strmethods") +local strmethods = require("src.strmethods") -local UIWidget = require("src/UI/Widget") +local UIWidget = require("src.UI.Widget") diff --git a/src/UI/Widget.lua b/src/UI/Widget.lua index ba62da2e..9dc48789 100644 --- a/src/UI/Widget.lua +++ b/src/UI/Widget.lua @@ -1,22 +1,22 @@ -local class = require "com/class" +local class = require "com.class" ---@class UIWidget ---@overload fun(name, data, parent):UIWidget local UIWidget = class:derive("UIWidget") -local UIWidgetRectangle = require("src/UI/WidgetRectangle") -local UIWidgetSprite = require("src/UI/WidgetSprite") -local UIWidgetSpriteButton = require("src/UI/WidgetSpriteButton") -local UIWidgetSpriteButtonCheckbox = require("src/UI/WidgetSpriteButtonCheckbox") -local UIWidgetSpriteButtonSlider = require("src/UI/WidgetSpriteButtonSlider") -local UIWidgetSpriteProgress = require("src/UI/WidgetSpriteProgress") -local UIWidgetSpriteProgressBlitz = require("src/UI/WidgetSpriteProgressBlitz") -local UIWidgetText = require("src/UI/WidgetText") -local UIWidgetTextInput = require("src/UI/WidgetTextInput") -local UIWidgetParticle = require("src/UI/WidgetParticle") -local UIWidgetLevel = require("src/UI/WidgetLevel") - -local Vec2 = require("src/Essentials/Vector2") +local UIWidgetRectangle = require("src.UI.WidgetRectangle") +local UIWidgetSprite = require("src.UI.WidgetSprite") +local UIWidgetSpriteButton = require("src.UI.WidgetSpriteButton") +local UIWidgetSpriteButtonCheckbox = require("src.UI.WidgetSpriteButtonCheckbox") +local UIWidgetSpriteButtonSlider = require("src.UI.WidgetSpriteButtonSlider") +local UIWidgetSpriteProgress = require("src.UI.WidgetSpriteProgress") +local UIWidgetSpriteProgressBlitz = require("src.UI.WidgetSpriteProgressBlitz") +local UIWidgetText = require("src.UI.WidgetText") +local UIWidgetTextInput = require("src.UI.WidgetTextInput") +local UIWidgetParticle = require("src.UI.WidgetParticle") +local UIWidgetLevel = require("src.UI.WidgetLevel") + +local Vec2 = require("src.Essentials.Vector2") diff --git a/src/UI/WidgetLevel.lua b/src/UI/WidgetLevel.lua index 5f6ee284..e67baa45 100644 --- a/src/UI/WidgetLevel.lua +++ b/src/UI/WidgetLevel.lua @@ -1,10 +1,10 @@ -local class = require "com/class" +local class = require "com.class" ---@class UIWidgetLevel ---@overload fun(parent, path):UIWidgetLevel local UIWidgetLevel = class:derive("UIWidgetLevel") -local DummyLevel = require("src/DummyLevel") +local DummyLevel = require("src.DummyLevel") diff --git a/src/UI/WidgetParticle.lua b/src/UI/WidgetParticle.lua index a44885bc..06b8d835 100644 --- a/src/UI/WidgetParticle.lua +++ b/src/UI/WidgetParticle.lua @@ -1,4 +1,4 @@ -local class = require "com/class" +local class = require "com.class" ---@class UIWidgetParticle ---@overload fun(parent, path):UIWidgetParticle diff --git a/src/UI/WidgetRectangle.lua b/src/UI/WidgetRectangle.lua index cf1e1f23..8d2040c3 100644 --- a/src/UI/WidgetRectangle.lua +++ b/src/UI/WidgetRectangle.lua @@ -1,4 +1,4 @@ -local class = require "com/class" +local class = require "com.class" ---@class UIWidgetRectangle ---@overload fun(parent, size, color):UIWidgetRectangle diff --git a/src/UI/WidgetSprite.lua b/src/UI/WidgetSprite.lua index 8dc7dce4..382ef7d4 100644 --- a/src/UI/WidgetSprite.lua +++ b/src/UI/WidgetSprite.lua @@ -1,4 +1,4 @@ -local class = require "com/class" +local class = require "com.class" ---@class UIWidgetSprite ---@overload fun(parent, sprite):UIWidgetSprite diff --git a/src/UI/WidgetSpriteButton.lua b/src/UI/WidgetSpriteButton.lua index 0263b0e0..2339d012 100644 --- a/src/UI/WidgetSpriteButton.lua +++ b/src/UI/WidgetSpriteButton.lua @@ -1,10 +1,10 @@ -local class = require "com/class" +local class = require "com.class" ---@class UIWidgetSpriteButton ---@overload fun(parent, sprite):UIWidgetSpriteButton local UIWidgetSpriteButton = class:derive("UIWidgetSpriteButton") -local Vec2 = require("src/Essentials/Vector2") +local Vec2 = require("src.Essentials.Vector2") diff --git a/src/UI/WidgetSpriteButtonCheckbox.lua b/src/UI/WidgetSpriteButtonCheckbox.lua index 7285bb62..dcec5dad 100644 --- a/src/UI/WidgetSpriteButtonCheckbox.lua +++ b/src/UI/WidgetSpriteButtonCheckbox.lua @@ -1,11 +1,11 @@ -local class = require "com/class" +local class = require "com.class" ---@class UIWidgetSpriteButtonCheckbox ---@overload fun(parent, sprites):UIWidgetSpriteButtonCheckbox local UIWidgetSpriteButtonCheckbox = class:derive("UIWidgetSpriteButtonCheckbox") -local Vec2 = require("src/Essentials/Vector2") -local UIWidgetSpriteButton = require("src/UI/WidgetSpriteButton") +local Vec2 = require("src.Essentials.Vector2") +local UIWidgetSpriteButton = require("src.UI.WidgetSpriteButton") diff --git a/src/UI/WidgetSpriteButtonSlider.lua b/src/UI/WidgetSpriteButtonSlider.lua index 6f0ebec1..5ac04d31 100644 --- a/src/UI/WidgetSpriteButtonSlider.lua +++ b/src/UI/WidgetSpriteButtonSlider.lua @@ -1,11 +1,11 @@ -local class = require "com/class" +local class = require "com.class" ---@class UIWidgetSpriteButtonSlider ---@overload fun(parent, sprite, bounds):UIWidgetSpriteButtonSlider local UIWidgetSpriteButtonSlider = class:derive("UIWidgetSpriteButtonSlider") -local Vec2 = require("src/Essentials/Vector2") -local UIWidgetSpriteButton = require("src/UI/WidgetSpriteButton") +local Vec2 = require("src.Essentials.Vector2") +local UIWidgetSpriteButton = require("src.UI.WidgetSpriteButton") diff --git a/src/UI/WidgetSpriteProgress.lua b/src/UI/WidgetSpriteProgress.lua index 5d6ec0a6..403dcda3 100644 --- a/src/UI/WidgetSpriteProgress.lua +++ b/src/UI/WidgetSpriteProgress.lua @@ -1,10 +1,10 @@ -local class = require "com/class" +local class = require "com.class" ---@class UIWidgetSpriteProgress ---@overload fun(parent, sprite, value, smooth):UIWidgetSpriteProgress local UIWidgetSpriteProgress = class:derive("UIWidgetSpriteProgress") -local Vec2 = require("src/Essentials/Vector2") +local Vec2 = require("src.Essentials.Vector2") diff --git a/src/UI/WidgetSpriteProgressBlitz.lua b/src/UI/WidgetSpriteProgressBlitz.lua index d079d5ae..427ce35b 100644 --- a/src/UI/WidgetSpriteProgressBlitz.lua +++ b/src/UI/WidgetSpriteProgressBlitz.lua @@ -1,13 +1,13 @@ -- FORK-SPECIFIC-CODE: This is a special version of Progress Bar which is circular to mimic the Blitz's Hot Frog meter. -- The smoothness also works differently here and that's actually something that could be backported soon. -local class = require "com/class" +local class = require "com.class" ---@class UIWidgetSpriteProgressBlitz ---@overload fun(parent, sprite, value, smooth):UIWidgetSpriteProgressBlitz local UIWidgetSpriteProgressBlitz = class:derive("UIWidgetSpriteProgressBlitz") -local Vec2 = require("src/Essentials/Vector2") +local Vec2 = require("src.Essentials.Vector2") diff --git a/src/UI/WidgetText.lua b/src/UI/WidgetText.lua index 125d7349..7a8bcad9 100644 --- a/src/UI/WidgetText.lua +++ b/src/UI/WidgetText.lua @@ -1,10 +1,10 @@ -local class = require "com/class" +local class = require "com.class" ---@class UIWidgetText ---@overload fun(parent, text, font, align):UIWidgetText local UIWidgetText = class:derive("UIWidgetText") -local Vec2 = require("src/Essentials/Vector2") +local Vec2 = require("src.Essentials.Vector2") diff --git a/src/UI/WidgetTextInput.lua b/src/UI/WidgetTextInput.lua index 1faecae6..6bfa1523 100644 --- a/src/UI/WidgetTextInput.lua +++ b/src/UI/WidgetTextInput.lua @@ -1,10 +1,10 @@ -local class = require "com/class" +local class = require "com.class" ---@class UIWidgetTextInput ---@overload fun(parent, font, align, cursorSprite, maxLength):UIWidgetTextInput local UIWidgetTextInput = class:derive("UIWidgetTextInput") -local Vec2 = require("src/Essentials/Vector2") +local Vec2 = require("src.Essentials.Vector2") diff --git a/src/UI2/Manager.lua b/src/UI2/Manager.lua index b029f477..17339708 100644 --- a/src/UI2/Manager.lua +++ b/src/UI2/Manager.lua @@ -1,11 +1,11 @@ -local class = require "com/class" +local class = require "com.class" ---@class UI2Manager ---@overload fun():UI2Manager local UI2Manager = class:derive("UI2Manager") -- Place your imports here -local UI2Widget = require("src/UI2/Widget") +local UI2Widget = require("src.UI2.Widget") diff --git a/src/UI2/Node.lua b/src/UI2/Node.lua index c4b25588..e248f589 100644 --- a/src/UI2/Node.lua +++ b/src/UI2/Node.lua @@ -1,14 +1,14 @@ -local class = require "com/class" +local class = require "com.class" ---@class UI2Node ---@overload fun(manager, config, name, parent):UI2Node local UI2Node = class:derive("UI2Node") -- Place your imports here -local UI2WidgetRectangle = require("src/UI2/WidgetRectangle") -local UI2WidgetSprite = require("src/UI2/WidgetSprite") -local UI2WidgetSpriteButton = require("src/UI2/WidgetSpriteButton") -local UI2WidgetText = require("src/UI2/WidgetText") +local UI2WidgetRectangle = require("src.UI2.WidgetRectangle") +local UI2WidgetSprite = require("src.UI2.WidgetSprite") +local UI2WidgetSpriteButton = require("src.UI2.WidgetSpriteButton") +local UI2WidgetText = require("src.UI2.WidgetText") diff --git a/src/UI2/Sequence.lua b/src/UI2/Sequence.lua index 6c427bcb..ac010fd3 100644 --- a/src/UI2/Sequence.lua +++ b/src/UI2/Sequence.lua @@ -1,4 +1,4 @@ -local class = require "com/class" +local class = require "com.class" ---@class UI2Sequence ---@overload fun(manager, config):UI2Sequence diff --git a/src/UI2/Widget.lua b/src/UI2/Widget.lua index 52abbfe5..63503d44 100644 --- a/src/UI2/Widget.lua +++ b/src/UI2/Widget.lua @@ -1,13 +1,13 @@ -local class = require "com/class" +local class = require "com.class" ---@class UI2Widget ---@overload fun(path):UI2Widget local UI2Widget = class:derive("UI2Widget") -- Place your imports here -local UIWidgetRectangle = require("src/UI/WidgetRectangle") +local UIWidgetRectangle = require("src.UI.WidgetRectangle") -local Vec2 = require("src/Essentials/Vector2") +local Vec2 = require("src.Essentials.Vector2") diff --git a/src/UI2/WidgetRectangle.lua b/src/UI2/WidgetRectangle.lua index fb49db7c..c7f83448 100644 --- a/src/UI2/WidgetRectangle.lua +++ b/src/UI2/WidgetRectangle.lua @@ -1,4 +1,4 @@ -local class = require "com/class" +local class = require "com.class" ---@class UI2WidgetRectangle ---@overload fun(node, align, size, color):UI2WidgetRectangle diff --git a/src/UI2/WidgetSprite.lua b/src/UI2/WidgetSprite.lua index 02d128e7..6a505b57 100644 --- a/src/UI2/WidgetSprite.lua +++ b/src/UI2/WidgetSprite.lua @@ -1,4 +1,4 @@ -local class = require "com/class" +local class = require "com.class" ---@class UI2WidgetSprite ---@overload fun(node, align, sprite):UI2WidgetSprite diff --git a/src/UI2/WidgetSpriteButton.lua b/src/UI2/WidgetSpriteButton.lua index 1afd128e..44d63664 100644 --- a/src/UI2/WidgetSpriteButton.lua +++ b/src/UI2/WidgetSpriteButton.lua @@ -1,10 +1,10 @@ -local class = require "com/class" +local class = require "com.class" ---@class UI2WidgetSpriteButton ---@overload fun(node, align, sprite, callbacks):UI2WidgetSpriteButton local UI2WidgetSpriteButton = class:derive("UI2WidgetSpriteButton") -local Vec2 = require("src/Essentials/Vector2") +local Vec2 = require("src.Essentials.Vector2") diff --git a/src/UI2/WidgetText.lua b/src/UI2/WidgetText.lua index dd72c1bf..e6002832 100644 --- a/src/UI2/WidgetText.lua +++ b/src/UI2/WidgetText.lua @@ -1,4 +1,4 @@ -local class = require "com/class" +local class = require "com.class" ---@class UI2WidgetText ---@overload fun(node, align, font, text, color):UI2WidgetText