From 0e49837e1884545cd4e5582b6f5d29f13dce9f4e Mon Sep 17 00:00:00 2001 From: Hersi Date: Thu, 11 Aug 2022 03:12:58 +0200 Subject: [PATCH] move third-party stuff to 'lib' --- docs/lua_api/gfx.lua | 9 +++++++-- scripts/challengeresult.lua | 2 +- scripts/downloadscreen.lua | 4 ++-- scripts/gameplay.lua | 2 +- scripts/gameplay/track_end.lua | 4 ++-- scripts/{common => lib}/easing.lua | 0 scripts/{common => lib}/json.lua | 0 scripts/multiplayerscreen.lua | 2 +- scripts/result.lua | 4 ++-- scripts/songselect/filterwheel.lua | 2 +- scripts/songselect/songwheel.lua | 4 ++-- scripts/songselect/sortwheel.lua | 2 +- 12 files changed, 20 insertions(+), 15 deletions(-) rename scripts/{common => lib}/easing.lua (100%) rename scripts/{common => lib}/json.lua (100%) diff --git a/docs/lua_api/gfx.lua b/docs/lua_api/gfx.lua index 2541f20..ca23c26 100644 --- a/docs/lua_api/gfx.lua +++ b/docs/lua_api/gfx.lua @@ -282,7 +282,12 @@ LoadImageJob = function(filepath, placeholder, w, h) end -- Loads a font from `skins//textures/` -- Sets it as the current font if it is already loaded ----@param name? string +---@param filename string +LoadSkinFont = function(filename) end + +-- Loads a font from `skins//textures/` +-- Sets it as the current font if it is already loaded +---@param name string ---@param filename string LoadSkinFont = function(name, filename) end @@ -595,4 +600,4 @@ gfx = { Translate = Translate, UpdateImagePattern = UpdateImagePattern, UpdateLabel = UpdateLabel, -}; \ No newline at end of file +}; diff --git a/scripts/challengeresult.lua b/scripts/challengeresult.lua index 3d381bc..6734671 100644 --- a/scripts/challengeresult.lua +++ b/scripts/challengeresult.lua @@ -1,4 +1,4 @@ -local Easing = require("common.easing"); +local Easing = require("lib.easing"); local Footer = require("components.footer"); local DiffRectangle = require('components.diff_rectangle'); local common = require('common.util'); diff --git a/scripts/downloadscreen.lua b/scripts/downloadscreen.lua index b3aeecb..ca07ee3 100644 --- a/scripts/downloadscreen.lua +++ b/scripts/downloadscreen.lua @@ -1,4 +1,4 @@ -json = require "common.json" +json = require "lib.json" local header = {} header["user-agent"] = "unnamed_sdvx_clone" @@ -426,4 +426,4 @@ function render_sorting_selection() gfx.Text(opt, resX/2, y) end gfx.Restore() -end \ No newline at end of file +end diff --git a/scripts/gameplay.lua b/scripts/gameplay.lua index ab78608..585bed7 100644 --- a/scripts/gameplay.lua +++ b/scripts/gameplay.lua @@ -21,7 +21,7 @@ local HitFX = require 'gameplay.hitfx' local TrackEnd = require('gameplay.track_end') -local json = require("common.json") +local json = require("lib.json") local showHitAnims = true; diff --git a/scripts/gameplay/track_end.lua b/scripts/gameplay/track_end.lua index 0a07d87..cee6157 100644 --- a/scripts/gameplay/track_end.lua +++ b/scripts/gameplay/track_end.lua @@ -1,5 +1,5 @@ local Common = require('common.util') -local Easing = require('common.easing') +local Easing = require('lib.easing') local bgImage = gfx.CreateSkinImage("gameplay/track_end/bg.png", 0) local bgHexTopImage = gfx.CreateSkinImage("gameplay/track_end/top_hex.png", gfx.IMAGE_REPEATX) @@ -672,4 +672,4 @@ end return { render = render -} \ No newline at end of file +} diff --git a/scripts/common/easing.lua b/scripts/lib/easing.lua similarity index 100% rename from scripts/common/easing.lua rename to scripts/lib/easing.lua diff --git a/scripts/common/json.lua b/scripts/lib/json.lua similarity index 100% rename from scripts/common/json.lua rename to scripts/lib/json.lua diff --git a/scripts/multiplayerscreen.lua b/scripts/multiplayerscreen.lua index 28a3bfb..3933b42 100644 --- a/scripts/multiplayerscreen.lua +++ b/scripts/multiplayerscreen.lua @@ -1,4 +1,4 @@ -local json = require("common.json") +local json = require("lib.json") local common = require('common.util'); local Sound = require("common.sound") diff --git a/scripts/result.lua b/scripts/result.lua index 6a7a389..08bc78a 100644 --- a/scripts/result.lua +++ b/scripts/result.lua @@ -1,4 +1,4 @@ -local Easing = require('common.easing'); +local Easing = require('lib.easing'); local Charting = require('common.charting'); local Background = require('components.background'); local Footer = require('components.footer'); @@ -823,4 +823,4 @@ end screenshot_captured = function(path) game.PlaySample("shutter") - end \ No newline at end of file + end diff --git a/scripts/songselect/filterwheel.lua b/scripts/songselect/filterwheel.lua index 088f37f..8f0a5bc 100644 --- a/scripts/songselect/filterwheel.lua +++ b/scripts/songselect/filterwheel.lua @@ -1,4 +1,4 @@ -local Easing = require('common.easing') +local Easing = require('lib.easing') local Dim = require("common.dimensions") local SongSelectHeader = require('components.headers.songSelectHeader') local Footer = require('components.footer') diff --git a/scripts/songselect/songwheel.lua b/scripts/songselect/songwheel.lua index 68e3371..664ce97 100644 --- a/scripts/songselect/songwheel.lua +++ b/scripts/songselect/songwheel.lua @@ -1,5 +1,5 @@ local Charting = require('common.charting') -local Easing = require('common.easing') +local Easing = require('lib.easing') local Background = require('components.background') local Dim = require("common.dimensions") local Wallpaper = require("components.wallpaper") @@ -1166,4 +1166,4 @@ set_diff = function(newDiff) irLeaderboard = {} irRequestStatus = 1 irRequestTimeout = 2 -end \ No newline at end of file +end diff --git a/scripts/songselect/sortwheel.lua b/scripts/songselect/sortwheel.lua index f76dc7c..a58a240 100644 --- a/scripts/songselect/sortwheel.lua +++ b/scripts/songselect/sortwheel.lua @@ -1,4 +1,4 @@ -local Easing = require('common.easing'); +local Easing = require('lib.easing'); local resx, resy = game.GetResolution() local desw, desh = 1080, 1920