From 9e55cfed6594e8790da54fc9d4af7647782b1fd7 Mon Sep 17 00:00:00 2001 From: the-real-herowl Date: Tue, 31 Dec 2024 03:04:36 +0100 Subject: [PATCH 1/2] Added a conversion for legacy fireworks --- mods/ITEMS/vl_fireworks/mod.conf | 2 +- mods/ITEMS/vl_fireworks/rockets.lua | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/mods/ITEMS/vl_fireworks/mod.conf b/mods/ITEMS/vl_fireworks/mod.conf index efb925363..c3c8fb9d4 100644 --- a/mods/ITEMS/vl_fireworks/mod.conf +++ b/mods/ITEMS/vl_fireworks/mod.conf @@ -1,3 +1,3 @@ name = vl_fireworks description = Adds fun fireworks to the game which players can use. -depends = vl_projectile +depends = vl_projectile, vl_legacy diff --git a/mods/ITEMS/vl_fireworks/rockets.lua b/mods/ITEMS/vl_fireworks/rockets.lua index f0e6c897d..c5bd9f579 100644 --- a/mods/ITEMS/vl_fireworks/rockets.lua +++ b/mods/ITEMS/vl_fireworks/rockets.lua @@ -199,3 +199,16 @@ local firework_def = { vl_fireworks.firework_def = table.copy(firework_def) core.register_craftitem("vl_fireworks:rocket", firework_def) + +-- legacy +for i=1, 3 do + vl_legacy.register_item_conversion("mcl_fireworks:rocket_"..i, nil, function(itemstack) + itemstack:set_name("vl_fireworks:rocket") + local meta = itemstack:get_meta() + local tbl = vl_fireworks.firework_def._vl_fireworks_std_durs_forces[i] + meta:set_float("vl_fireworks:duration", tbl[1]) + meta:set_int("vl_fireworks:force", tbl[2]) + tt.reload_itemstack_description(itemstack) + end) +end + From ce01fc29aed6a78fac6e1d55087501e32c98bc71 Mon Sep 17 00:00:00 2001 From: the-real-herowl Date: Tue, 31 Dec 2024 03:45:44 +0100 Subject: [PATCH 2/2] Translation files textdomain fix --- mods/ITEMS/vl_fireworks/locale/template.txt | 2 +- mods/ITEMS/vl_fireworks/locale/vl_fireworks.de.tr | 2 +- mods/ITEMS/vl_fireworks/locale/vl_fireworks.es.tr | 2 +- mods/ITEMS/vl_fireworks/locale/vl_fireworks.fr.tr | 2 +- mods/ITEMS/vl_fireworks/locale/vl_fireworks.ja.tr | 2 +- mods/ITEMS/vl_fireworks/locale/vl_fireworks.nb.tr | 2 +- mods/ITEMS/vl_fireworks/locale/vl_fireworks.pl.tr | 10 +++++----- mods/ITEMS/vl_fireworks/locale/vl_fireworks.pt_BR.tr | 2 +- mods/ITEMS/vl_fireworks/locale/vl_fireworks.ru.tr | 2 +- mods/ITEMS/vl_fireworks/locale/vl_fireworks.zh_CN.tr | 8 ++------ 10 files changed, 15 insertions(+), 19 deletions(-) diff --git a/mods/ITEMS/vl_fireworks/locale/template.txt b/mods/ITEMS/vl_fireworks/locale/template.txt index c468941dc..6d0eb163e 100644 --- a/mods/ITEMS/vl_fireworks/locale/template.txt +++ b/mods/ITEMS/vl_fireworks/locale/template.txt @@ -1,4 +1,4 @@ -# textdomain: mcl_fireworks +# textdomain: vl_fireworks ##[ star.lua ]## Firework Star= A firework star is the key component of a firework rocket which is responsible for the visible explosion.= diff --git a/mods/ITEMS/vl_fireworks/locale/vl_fireworks.de.tr b/mods/ITEMS/vl_fireworks/locale/vl_fireworks.de.tr index 97af37f8b..21ca40d38 100644 --- a/mods/ITEMS/vl_fireworks/locale/vl_fireworks.de.tr +++ b/mods/ITEMS/vl_fireworks/locale/vl_fireworks.de.tr @@ -1,4 +1,4 @@ -# textdomain: mcl_fireworks +# textdomain: vl_fireworks ##[ star.lua ]## Firework Star=Feuerwerksstern A firework star is the key component of a firework rocket which is responsible for the visible explosion.=Ein Feuerwerksstern ist der Hauptbestandteil einer Feuerwerksrakete, der für die sichtbare Explosion verantwortlich ist. diff --git a/mods/ITEMS/vl_fireworks/locale/vl_fireworks.es.tr b/mods/ITEMS/vl_fireworks/locale/vl_fireworks.es.tr index c468941dc..6d0eb163e 100644 --- a/mods/ITEMS/vl_fireworks/locale/vl_fireworks.es.tr +++ b/mods/ITEMS/vl_fireworks/locale/vl_fireworks.es.tr @@ -1,4 +1,4 @@ -# textdomain: mcl_fireworks +# textdomain: vl_fireworks ##[ star.lua ]## Firework Star= A firework star is the key component of a firework rocket which is responsible for the visible explosion.= diff --git a/mods/ITEMS/vl_fireworks/locale/vl_fireworks.fr.tr b/mods/ITEMS/vl_fireworks/locale/vl_fireworks.fr.tr index 7d0e4c948..16b5157a6 100644 --- a/mods/ITEMS/vl_fireworks/locale/vl_fireworks.fr.tr +++ b/mods/ITEMS/vl_fireworks/locale/vl_fireworks.fr.tr @@ -1,4 +1,4 @@ -# textdomain: mcl_fireworks +# textdomain: vl_fireworks ##[ star.lua ]## Firework Star= A firework star is the key component of a firework rocket which is responsible for the visible explosion.= diff --git a/mods/ITEMS/vl_fireworks/locale/vl_fireworks.ja.tr b/mods/ITEMS/vl_fireworks/locale/vl_fireworks.ja.tr index cc21d349a..341248c4a 100644 --- a/mods/ITEMS/vl_fireworks/locale/vl_fireworks.ja.tr +++ b/mods/ITEMS/vl_fireworks/locale/vl_fireworks.ja.tr @@ -1,4 +1,4 @@ -# textdomain: mcl_fireworks +# textdomain: vl_fireworks ##[ star.lua ]## Firework Star= A firework star is the key component of a firework rocket which is responsible for the visible explosion.= diff --git a/mods/ITEMS/vl_fireworks/locale/vl_fireworks.nb.tr b/mods/ITEMS/vl_fireworks/locale/vl_fireworks.nb.tr index e339cd89f..97868796e 100644 --- a/mods/ITEMS/vl_fireworks/locale/vl_fireworks.nb.tr +++ b/mods/ITEMS/vl_fireworks/locale/vl_fireworks.nb.tr @@ -1,4 +1,4 @@ -# textdomain: mcl_fireworks +# textdomain: vl_fireworks ##[ star.lua ]## Firework Star= A firework star is the key component of a firework rocket which is responsible for the visible explosion.= diff --git a/mods/ITEMS/vl_fireworks/locale/vl_fireworks.pl.tr b/mods/ITEMS/vl_fireworks/locale/vl_fireworks.pl.tr index 01856d9f2..7c3d322cf 100644 --- a/mods/ITEMS/vl_fireworks/locale/vl_fireworks.pl.tr +++ b/mods/ITEMS/vl_fireworks/locale/vl_fireworks.pl.tr @@ -1,9 +1,9 @@ -# textdomain: mcl_fireworks +# textdomain: vl_fireworks ##[ star.lua ]## -Firework Star= -A firework star is the key component of a firework rocket which is responsible for the visible explosion.= -Generic Firework Star= -Size:= +Firework Star=Gwiazdka pirotechniczna +A firework star is the key component of a firework rocket which is responsible for the visible explosion.=Gwiazdka pirotechniczna jest kluczowym składnikiem rakiety fajerwerkowej, odpowiedzialnym za widoczną eksplozję. +Generic Firework Star=Zwyczajna gwiazdka pirotechniczna +Size:=Rozmiar: ##[ rockets.lua ]## Flight Duration:=Czas lotu: Firework Rocket=Fajerwerkowa rakieta diff --git a/mods/ITEMS/vl_fireworks/locale/vl_fireworks.pt_BR.tr b/mods/ITEMS/vl_fireworks/locale/vl_fireworks.pt_BR.tr index f7873ec7f..7faf2c8e8 100644 --- a/mods/ITEMS/vl_fireworks/locale/vl_fireworks.pt_BR.tr +++ b/mods/ITEMS/vl_fireworks/locale/vl_fireworks.pt_BR.tr @@ -1,4 +1,4 @@ -# textdomain: mcl_fireworks +# textdomain: vl_fireworks ##[ star.lua ]## Firework Star= A firework star is the key component of a firework rocket which is responsible for the visible explosion.= diff --git a/mods/ITEMS/vl_fireworks/locale/vl_fireworks.ru.tr b/mods/ITEMS/vl_fireworks/locale/vl_fireworks.ru.tr index 2f3299c35..03b4ff7ad 100644 --- a/mods/ITEMS/vl_fireworks/locale/vl_fireworks.ru.tr +++ b/mods/ITEMS/vl_fireworks/locale/vl_fireworks.ru.tr @@ -1,4 +1,4 @@ -# textdomain: mcl_fireworks +# textdomain: vl_fireworks ##[ star.lua ]## Firework Star= A firework star is the key component of a firework rocket which is responsible for the visible explosion.= diff --git a/mods/ITEMS/vl_fireworks/locale/vl_fireworks.zh_CN.tr b/mods/ITEMS/vl_fireworks/locale/vl_fireworks.zh_CN.tr index b8cc19df6..a3d4c7cdd 100644 --- a/mods/ITEMS/vl_fireworks/locale/vl_fireworks.zh_CN.tr +++ b/mods/ITEMS/vl_fireworks/locale/vl_fireworks.zh_CN.tr @@ -1,14 +1,10 @@ -# textdomain: mcl_fireworks +# textdomain: vl_fireworks ##[ star.lua ]## Firework Star= A firework star is the key component of a firework rocket which is responsible for the visible explosion.= Generic Firework Star= Size:= ##[ rockets.lua ]## -Flight Duration:= +Flight Duration:=飞行时长: Firework Rocket=烟花火箭 - -##### not used anymore ##### - -Flight Duration=飞行时长