Skip to content

Commit e0d9b2b

Browse files
Kenshiin13Kenshiin13
authored
Merge pull request #1588 from esx-framework/revert-1587-copyright-year
Revert "chore: update copyright year"
2 parents 1ff7898 + 97aaf58 commit e0d9b2b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+789
-809
lines changed

‎.github/pull_request_template.md

-22
This file was deleted.

‎[core]/cron/LICENSE

+2-2
Original file line numberDiff line numberDiff line change
@@ -632,7 +632,7 @@ state the exclusion of warranty; and each file should have at least
632632
the "copyright" line and a pointer to where the full notice is found.
633633

634634
cron
635-
Copyright (C) 2015-2025 Jérémie N'gadi
635+
Copyright (C) 2015-2024 Jérémie N'gadi
636636

637637
This program is free software: you can redistribute it and/or modify
638638
it under the terms of the GNU General Public License as published by
@@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail.
652652
If the program does terminal interaction, make it output a short
653653
notice like this when it starts in an interactive mode:
654654

655-
cron Copyright (C) 2015-2025 Jérémie N'gadi
655+
cron Copyright (C) 2015-2024 Jérémie N'gadi
656656
This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
657657
This is free software, and you are welcome to redistribute it
658658
under certain conditions; type `show c' for details.

‎[core]/cron/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ TriggerEvent('cron:runAt', 18, 30, CronTask)
2828

2929
cron - run tasks at specific intervals!
3030

31-
Copyright (C) 2015-2025 Jérémie N'gadi
31+
Copyright (C) 2015-2024 Jérémie N'gadi
3232

3333
This program Is free software: you can redistribute it And/Or modify it under the terms Of the GNU General Public License As published by the Free Software Foundation, either version 3 Of the License, Or (at your option) any later version.
3434

‎[core]/cron/fxmanifest.lua

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ game 'gta5'
44
author 'ESX-Framework'
55
description 'Allows resources to Run tasks at specific intervals.'
66
lua54 'yes'
7-
version '1.12.3'
7+
version '1.12.2'
88

99
server_script 'server/main.lua'

‎[core]/es_extended/LICENSE

+2-2
Original file line numberDiff line numberDiff line change
@@ -632,7 +632,7 @@ state the exclusion of warranty; and each file should have at least
632632
the "copyright" line and a pointer to where the full notice is found.
633633

634634
es_extended
635-
Copyright (C) 2015-2025 Jérémie N'gadi
635+
Copyright (C) 2015-2024 Jérémie N'gadi
636636

637637
This program is free software: you can redistribute it and/or modify
638638
it under the terms of the GNU General Public License as published by
@@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail.
652652
If the program does terminal interaction, make it output a short
653653
notice like this when it starts in an interactive mode:
654654

655-
es_extended Copyright (C) 2015-2025 Jérémie N'gadi
655+
es_extended Copyright (C) 2015-2024 Jérémie N'gadi
656656
This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
657657
This is free software, and you are welcome to redistribute it
658658
under certain conditions; type `show c' for details.

‎[core]/es_extended/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
es_extended
66

7-
Copyright (C) 2015-2025 Jérémie N'gadi
7+
Copyright (C) 2015-2024 Jérémie N'gadi
88

99
This program Is free software: you can redistribute it And/Or modify it under the terms Of the GNU General Public License As published by the Free Software Foundation, either version 3 Of the License, Or (at your option) any later version.
1010

‎[core]/es_extended/client/modules/scaleform.lua

+43-41
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,7 @@ ESX.Scaleform = {}
22
ESX.Scaleform.Utils = {}
33

44
function ESX.Scaleform.ShowFreemodeMessage(title, msg, sec)
5-
local scaleform = ESX.Scaleform.Utils.RequestScaleformMovie("MP_BIG_MESSAGE_FREEMODE")
6-
7-
BeginScaleformMovieMethod(scaleform, "SHOW_SHARD_WASTED_MP_MESSAGE")
8-
ScaleformMovieMethodAddParamTextureNameString(title)
9-
ScaleformMovieMethodAddParamTextureNameString(msg)
10-
EndScaleformMovieMethod()
5+
local scaleform = ESX.Scaleform.Utils.RunMethod("MP_BIG_MESSAGE_FREEMODE", "SHOW_SHARD_WASTED_MP_MESSAGE", false, title, msg)
116

127
while sec > 0 do
138
Wait(0)
@@ -20,25 +15,9 @@ function ESX.Scaleform.ShowFreemodeMessage(title, msg, sec)
2015
end
2116

2217
function ESX.Scaleform.ShowBreakingNews(title, msg, bottom, sec)
23-
local scaleform = ESX.Scaleform.Utils.RequestScaleformMovie("BREAKING_NEWS")
24-
25-
BeginScaleformMovieMethod(scaleform, "SET_TEXT")
26-
ScaleformMovieMethodAddParamTextureNameString(msg)
27-
ScaleformMovieMethodAddParamTextureNameString(bottom)
28-
EndScaleformMovieMethod()
29-
30-
BeginScaleformMovieMethod(scaleform, "SET_SCROLL_TEXT")
31-
ScaleformMovieMethodAddParamInt(0) -- top ticker
32-
ScaleformMovieMethodAddParamInt(0) -- Since this is the first string, start at 0
33-
ScaleformMovieMethodAddParamTextureNameString(title)
34-
35-
EndScaleformMovieMethod()
36-
37-
BeginScaleformMovieMethod(scaleform, "DISPLAY_SCROLL_TEXT")
38-
ScaleformMovieMethodAddParamInt(0) -- Top ticker
39-
ScaleformMovieMethodAddParamInt(0) -- Index of string
40-
41-
EndScaleformMovieMethod()
18+
local scaleform = ESX.Scaleform.Utils.RunMethod("BREAKING_NEWS", "SET_TEXT", false, msg, bottom)
19+
ESX.Scaleform.Utils.RunMethod(scaleform, "SET_SCROLL_TEXT", false, 0, 0, title)
20+
ESX.Scaleform.Utils.RunMethod(scaleform, "DISPLAY_SCROLL_TEXT", false, 0, 0)
4221

4322
while sec > 0 do
4423
Wait(0)
@@ -51,17 +30,7 @@ function ESX.Scaleform.ShowBreakingNews(title, msg, bottom, sec)
5130
end
5231

5332
function ESX.Scaleform.ShowPopupWarning(title, msg, bottom, sec)
54-
local scaleform = ESX.Scaleform.Utils.RequestScaleformMovie("POPUP_WARNING")
55-
56-
BeginScaleformMovieMethod(scaleform, "SHOW_POPUP_WARNING")
57-
58-
ScaleformMovieMethodAddParamFloat(500.0) -- black background
59-
ScaleformMovieMethodAddParamTextureNameString(title)
60-
ScaleformMovieMethodAddParamTextureNameString(msg)
61-
ScaleformMovieMethodAddParamTextureNameString(bottom)
62-
ScaleformMovieMethodAddParamBool(true)
63-
64-
EndScaleformMovieMethod()
33+
local scaleform = ESX.Scaleform.Utils.RunMethod("POPUP_WARNING", "SHOW_POPUP_WARNING", false, 500.0, title, msg, bottom, true)
6534

6635
while sec > 0 do
6736
Wait(0)
@@ -74,11 +43,7 @@ function ESX.Scaleform.ShowPopupWarning(title, msg, bottom, sec)
7443
end
7544

7645
function ESX.Scaleform.ShowTrafficMovie(sec)
77-
local scaleform = ESX.Scaleform.Utils.RequestScaleformMovie("TRAFFIC_CAM")
78-
79-
BeginScaleformMovieMethod(scaleform, "PLAY_CAM_MOVIE")
80-
81-
EndScaleformMovieMethod()
46+
local scaleform = ESX.Scaleform.Utils.RunMethod("TRAFFIC_CAM", "PLAY_CAM_MOVIE", false)
8247

8348
while sec > 0 do
8449
Wait(0)
@@ -99,3 +64,40 @@ function ESX.Scaleform.Utils.RequestScaleformMovie(movie)
9964

10065
return scaleform
10166
end
67+
68+
--- Executes a method on a scaleform movie with optional arguments and return value.
69+
--- The caller is responsible for disposing of the scaleform using `SetScaleformMovieAsNoLongerNeeded`.
70+
---@param scaleform number|string # Scaleform handle or name to request the scaleform movie
71+
---@param methodName string # The method name to call on the scaleform
72+
---@param returnValue? boolean # Whether to return the value from the method
73+
---@param ... number|string|boolean # Arguments to pass to the method
74+
---@return number, number? # The scaleform handle, and the return value if `returnValue` is true
75+
function ESX.Scaleform.Utils.RunMethod(scaleform, methodName, returnValue, ...)
76+
scaleform = type(scaleform) == "number" and scaleform or ESX.Scaleform.Utils.RequestScaleformMovie(scaleform)
77+
BeginScaleformMovieMethod(scaleform, methodName)
78+
79+
local args = { ... }
80+
for i, arg in ipairs(args) do
81+
local typeArg = type(arg)
82+
83+
if typeArg == "number" then
84+
if math.type(arg) == "float" then
85+
ScaleformMovieMethodAddParamFloat(arg)
86+
else
87+
ScaleformMovieMethodAddParamInt(arg)
88+
end
89+
elseif typeArg == "string" then
90+
ScaleformMovieMethodAddParamTextureNameString(arg)
91+
elseif typeArg == "boolean" then
92+
ScaleformMovieMethodAddParamBool(arg)
93+
end
94+
end
95+
96+
if returnValue then
97+
return scaleform, EndScaleformMovieMethodReturnValue()
98+
end
99+
100+
EndScaleformMovieMethod()
101+
102+
return scaleform
103+
end

‎[core]/es_extended/fxmanifest.lua

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ fx_version 'cerulean'
33
game 'gta5'
44
description 'The Core resource that provides the functionalities for all other resources.'
55
lua54 'yes'
6-
version '1.12.3'
6+
version '1.12.2'
77

88
shared_scripts {
99
'locale.lua',

‎[core]/esx_chat_theme/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ A ESX-Based Chat-theme for your server
66

77
esx_chat_theme - ESX Chat Theme
88

9-
Copyright (C) 2025 Jérémie N'gadi
9+
Copyright (C) 2024 Jérémie N'gadi
1010

1111
This program Is free software: you can redistribute it And/Or modify it under the terms Of the GNU General Public License As published by the Free Software Foundation, either version 3 Of the License, Or (at your option) any later version.
1212

‎[core]/esx_chat_theme/fxmanifest.lua

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version '1.12.3'
1+
version '1.12.2'
22
author 'ESX-Framework'
33
description 'A ESX Stylised theme for the chat resource.'
44

‎[core]/esx_context/LICENSE

+2-2
Original file line numberDiff line numberDiff line change
@@ -632,7 +632,7 @@ state the exclusion of warranty; and each file should have at least
632632
the "copyright" line and a pointer to where the full notice is found.
633633

634634
esx_context
635-
Copyright (C) 2022-2025 ESX Framework
635+
Copyright (C) 2022-2024 ESX Framework
636636

637637
This program is free software: you can redistribute it and/or modify
638638
it under the terms of the GNU General Public License as published by
@@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail.
652652
If the program does terminal interaction, make it output a short
653653
notice like this when it starts in an interactive mode:
654654

655-
esx_context Copyright (C) 2022-2025 ESX Framework
655+
esx_context Copyright (C) 2022-2024 ESX Framework
656656
This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
657657
This is free software, and you are welcome to redistribute it
658658
under certain conditions; type `show c' for details.

‎[core]/esx_context/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ A elegant, easy to use Context Menu system to make User Interactions clean and h
66

77
esx_context
88

9-
Copyright (C) 2022-2025 ESX Framework
9+
Copyright (C) 2022-2024 ESX Framework
1010

1111
This program Is free software: you can redistribute it And/Or modify it under the terms Of the GNU General Public License As published by the Free Software Foundation, either version 3 Of the License, Or (at your option) any later version.
1212

‎[core]/esx_context/fxmanifest.lua

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ game 'gta5'
44
author 'ESX-Framework & Brayden'
55
description 'A simplistic context menu for ESX.'
66
lua54 'yes'
7-
version '1.12.3'
7+
version '1.12.2'
88

99
ui_page 'index.html'
1010

‎[core]/esx_identity/LICENSE

+2-2
Original file line numberDiff line numberDiff line change
@@ -632,7 +632,7 @@ state the exclusion of warranty; and each file should have at least
632632
the "copyright" line and a pointer to where the full notice is found.
633633

634634
esx_identity
635-
Copyright (C) 2015-2025 Jérémie N'gadi
635+
Copyright (C) 2015-2024 Jérémie N'gadi
636636

637637
This program is free software: you can redistribute it and/or modify
638638
it under the terms of the GNU General Public License as published by
@@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail.
652652
If the program does terminal interaction, make it output a short
653653
notice like this when it starts in an interactive mode:
654654

655-
esx_identity Copyright (C) 2015-2025 Jérémie N'gadi
655+
esx_identity Copyright (C) 2015-2024 Jérémie N'gadi
656656
This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
657657
This is free software, and you are welcome to redistribute it
658658
under certain conditions; type `show c' for details.

‎[core]/esx_identity/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ A Core Resource that Allows the player to Pick their characters, Name, Gender, H
2121

2222
esx_identity - Make your Character a Person!
2323

24-
Copyright (C) 2015-2025 Jérémie N'gadi
24+
Copyright (C) 2015-2024 Jérémie N'gadi
2525

2626
This program Is free software: you can redistribute it And/Or modify it under the terms Of the GNU General Public License As published by the Free Software Foundation, either version 3 Of the License, Or (at your option) any later version.
2727

‎[core]/esx_identity/fxmanifest.lua

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ fx_version 'adamant'
33
game 'gta5'
44
description 'Allows the player to Pick their characters: Name, Gender, Height and Date-of-birth.'
55
lua54 'yes'
6-
version '1.12.3'
6+
version '1.12.2'
77

88
shared_scripts {
99
'@es_extended/imports.lua',

‎[core]/esx_loadingscreen/LICENSE

+2-2
Original file line numberDiff line numberDiff line change
@@ -632,7 +632,7 @@ state the exclusion of warranty; and each file should have at least
632632
the "copyright" line and a pointer to where the full notice is found.
633633

634634
esx_loadingscreen
635-
Copyright (C) 2020-2025 ESX Framework
635+
Copyright (C) 2020-2024 ESX Framework
636636

637637
This program is free software: you can redistribute it and/or modify
638638
it under the terms of the GNU General Public License as published by
@@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail.
652652
If the program does terminal interaction, make it output a short
653653
notice like this when it starts in an interactive mode:
654654

655-
esx_loadingscreen Copyright (C) 2020-2025 ESX Framework
655+
esx_loadingscreen Copyright (C) 2020-2024 ESX Framework
656656
This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
657657
This is free software, and you are welcome to redistribute it
658658
under certain conditions; type `show c' for details.

‎[core]/esx_loadingscreen/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ A simple but beautiful Loading Screen for your server!
66

77
esx_loadingscreen - Loading in style!
88

9-
Copyright (C) 2020-2025 ESX Framework
9+
Copyright (C) 2020-2024 ESX Framework
1010

1111
This program Is free software: you can redistribute it And/Or modify it under the terms Of the GNU General Public License As published by the Free Software Foundation, either version 3 Of the License, Or (at your option) any later version.
1212

‎[core]/esx_loadingscreen/fxmanifest.lua

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ game 'common'
33
fx_version 'cerulean'
44
author 'ESX-Framework'
55
description 'Allows resources to Run tasks at specific intervals.'
6-
version '1.12.3'
6+
version '1.12.2'
77
lua54 'yes'
88

99
loadscreen 'index.html'

‎[core]/esx_menu_default/LICENSE

+2-2
Original file line numberDiff line numberDiff line change
@@ -632,7 +632,7 @@ state the exclusion of warranty; and each file should have at least
632632
the "copyright" line and a pointer to where the full notice is found.
633633

634634
esx_menu_default
635-
Copyright (C) 2015-2025 Jérémie N'gadi
635+
Copyright (C) 2015-2024 Jérémie N'gadi
636636

637637
This program is free software: you can redistribute it and/or modify
638638
it under the terms of the GNU General Public License as published by
@@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail.
652652
If the program does terminal interaction, make it output a short
653653
notice like this when it starts in an interactive mode:
654654

655-
esx_menu_default Copyright (C) 2015-2025 Jérémie N'gadi
655+
esx_menu_default Copyright (C) 2015-2024 Jérémie N'gadi
656656
This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
657657
This is free software, and you are welcome to redistribute it
658658
under certain conditions; type `show c' for details.

‎[core]/esx_menu_default/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ A default List type menu for ESX.
99

1010
esx_menu_default - Default Menu!
1111

12-
Copyright (C) 2015-2025 Jérémie N'gadi
12+
Copyright (C) 2015-2024 Jérémie N'gadi
1313

1414
This program Is free software: you can redistribute it And/Or modify it under the terms Of the GNU General Public License As published by the Free Software Foundation, either version 3 Of the License, Or (at your option) any later version.
1515

‎[core]/esx_menu_default/fxmanifest.lua

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ fx_version 'adamant'
33
game 'gta5'
44
description 'A basic menu system for ESX Legacy.'
55
lua54 'yes'
6-
version '1.12.3'
6+
version '1.12.2'
77

88
client_scripts { '@es_extended/imports.lua', 'client/main.lua' }
99

‎[core]/esx_menu_dialog/LICENSE

+2-2
Original file line numberDiff line numberDiff line change
@@ -632,7 +632,7 @@ state the exclusion of warranty; and each file should have at least
632632
the "copyright" line and a pointer to where the full notice is found.
633633

634634
esx_menu_dialog
635-
Copyright (C) 2015-2025 Jérémie N'gadi
635+
Copyright (C) 2015-2024 Jérémie N'gadi
636636

637637
This program is free software: you can redistribute it and/or modify
638638
it under the terms of the GNU General Public License as published by
@@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail.
652652
If the program does terminal interaction, make it output a short
653653
notice like this when it starts in an interactive mode:
654654

655-
esx_menu_dialog Copyright (C) 2015-2025 Jérémie N'gadi
655+
esx_menu_dialog Copyright (C) 2015-2024 Jérémie N'gadi
656656
This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
657657
This is free software, and you are welcome to redistribute it
658658
under certain conditions; type `show c' for details.

0 commit comments

Comments
 (0)