From 4602bd5999545ef71f206db6e85bfb5c4bd0b389 Mon Sep 17 00:00:00 2001 From: BlockMen Date: Wed, 16 Apr 2014 18:16:02 +0200 Subject: [PATCH] Remove legacy, move aliases to default --- mods/{legacy/init.lua => default/aliases.lua} | 43 +----------------- mods/default/init.lua | 1 + mods/legacy/depends.txt | 2 - mods/legacy/textures/apple_iron.png | Bin 189 -> 0 bytes mods/legacy/textures/cooked_rat.png | Bin 171 -> 0 bytes mods/legacy/textures/dungeon_master.png | Bin 5659 -> 0 bytes mods/legacy/textures/fireball.png | Bin 400 -> 0 bytes mods/legacy/textures/firefly.png | Bin 100 -> 0 bytes mods/legacy/textures/oerkki1.png | Bin 201 -> 0 bytes mods/legacy/textures/oerkki1_damaged.png | Bin 265 -> 0 bytes mods/legacy/textures/rat.png | Bin 891 -> 0 bytes 11 files changed, 3 insertions(+), 43 deletions(-) rename mods/{legacy/init.lua => default/aliases.lua} (82%) delete mode 100644 mods/legacy/depends.txt delete mode 100644 mods/legacy/textures/apple_iron.png delete mode 100644 mods/legacy/textures/cooked_rat.png delete mode 100644 mods/legacy/textures/dungeon_master.png delete mode 100644 mods/legacy/textures/fireball.png delete mode 100644 mods/legacy/textures/firefly.png delete mode 100644 mods/legacy/textures/oerkki1.png delete mode 100644 mods/legacy/textures/oerkki1_damaged.png delete mode 100644 mods/legacy/textures/rat.png diff --git a/mods/legacy/init.lua b/mods/default/aliases.lua similarity index 82% rename from mods/legacy/init.lua rename to mods/default/aliases.lua index 1cb99ef5..eadb2a3a 100644 --- a/mods/legacy/init.lua +++ b/mods/default/aliases.lua @@ -1,9 +1,5 @@ --- legacy (Minetest 0.4 mod) --- Provides as much backwards-compatibility as feasible - --- --- Aliases to support loading 0.3 and old 0.4 worlds and inventories --- +-- aliases (Minetest 0.4 mod) +-- Provides alias for most default items minetest.register_alias("stone", "default:stone") minetest.register_alias("stone_with_coal", "default:stone_with_coal") @@ -70,38 +66,3 @@ minetest.register_alias("lump_of_clay", "default:clay_lump") minetest.register_alias("steel_ingot", "default:steel_ingot") minetest.register_alias("clay_brick", "default:clay_brick") minetest.register_alias("scorched_stuff", "default:scorched_stuff") - --- --- Old items --- - -minetest.register_craftitem(":rat", { - description = "Rat", - inventory_image = "rat.png", -}) - -minetest.register_craftitem(":cooked_rat", { - description = "Cooked rat", - inventory_image = "cooked_rat.png", - on_use = minetest.item_eat(6), -}) - -minetest.register_craftitem(":firefly", { - description = "Firefly", - inventory_image = "firefly.png", - groups = {not_in_creative_inventory=1}, -}) - -minetest.register_craft({ - type = "cooking", - output = "cooked_rat", - recipe = "rat", -}) - -minetest.register_craft({ - type = "cooking", - output = "scorched_stuff", - recipe = "cooked_rat", -}) - --- END diff --git a/mods/default/init.lua b/mods/default/init.lua index dbddd200..82e558de 100644 --- a/mods/default/init.lua +++ b/mods/default/init.lua @@ -44,3 +44,4 @@ dofile(minetest.get_modpath("default").."/crafting.lua") dofile(minetest.get_modpath("default").."/mapgen.lua") dofile(minetest.get_modpath("default").."/player.lua") dofile(minetest.get_modpath("default").."/trees.lua") +dofile(minetest.get_modpath("default").."/aliases.lua") diff --git a/mods/legacy/depends.txt b/mods/legacy/depends.txt deleted file mode 100644 index 3a7daa1d..00000000 --- a/mods/legacy/depends.txt +++ /dev/null @@ -1,2 +0,0 @@ -default - diff --git a/mods/legacy/textures/apple_iron.png b/mods/legacy/textures/apple_iron.png deleted file mode 100644 index b1d180457a39fc8f6e49e717fc015fe089a5fb23..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 189 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;>1s;*b z3=DjSK$uZf!>a)(C|TkfQ4*Y=R#Ki=l*$m0n3-3i=jR%tP-d)Ws%K$t-4F{@Waa7N z7-DfcIYEN;u;hxX#(&%o^`uBUbt?Z`oOsDp-m-|L=cFOaI?1yFmv}77-^obu&taTW d(fA^QfuY|usa=P95m44$rjF6*2UngANHHc0>g diff --git a/mods/legacy/textures/cooked_rat.png b/mods/legacy/textures/cooked_rat.png deleted file mode 100644 index db802985d673e70ef874901e57cf3881d8b31bb5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 171 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf4nJ z@ErkR#;MwT(m+99PZ!4!i_^&o5+(=2dmq}nvYA*I{9#X=;Ak)_MO;Ce>G9+@Tq$Q& zq?>$=Bkwh4x*Sho*ND_RD7qqrT_-Z`pr~Ams?nys4QCbF99bFe%B2|VU%cB2G?>BD L)z4*}Q$iB}W7{u} diff --git a/mods/legacy/textures/dungeon_master.png b/mods/legacy/textures/dungeon_master.png deleted file mode 100644 index 56caa50e7bfd621480beec4e48a864ea611569aa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5659 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 diff --git a/mods/legacy/textures/fireball.png b/mods/legacy/textures/fireball.png deleted file mode 100644 index ed21a5b46b7d29927db33ddac76d4fd90401a8a3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 400 zcmeAS@N?(olHy`uVBq!ia0vp^0zhoQ!3HEH;(vt$DVAa<&kznEsNqQI0P;BtJR*x3 z7`TN&n2}-D90>*nMk7xb#}JR>d&3S2GAZ)--2A?0y=_3x(Ho7d3(hdKP4NAecICL8 z%}JqYDa~`1UupccC-m>^#*~BizJJTD5#O8fCo!?Pq-VjEtd|*$spm5UxOnO$rr7>% zO;~oP`TbYs{v)D=%l^1=+gOP$5)w4|a+kl^GvUacb%FAUoY&k_IJWR@VY@BLX1-By z$I+m$8&(aiDV=w8E_<1D?@jnGb?{wB%(`v*Iq6Frr%hd;ce>@S%NMa5J_&5^`VR0r zxhMTmSi^jc-+=KY`@)VMc?YIz{D+)?g0ea@VC85^rO*_%mw5(Muo1O_RCr>mdKI;Vst0MpE%Y5)KL diff --git a/mods/legacy/textures/firefly.png b/mods/legacy/textures/firefly.png deleted file mode 100644 index 41bb25da56ef25241643df075b402bb4461b3f6e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 100 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|j|8wkkX>9P~>p2tuoKAcP^Tp(_A=H;e~S6yu~YSF1@IC+fm>7=L&nE21TocH(Kym$}@hr+E2pdvP>a z{X*4_Yk&M?ZwR__PWZ7}kKwF@A_F6b0|S#l0|SdfLq3DtH|gn|jvo)z1D(y_>FVdQ I&MBb@05U>fnE(I) diff --git a/mods/legacy/textures/rat.png b/mods/legacy/textures/rat.png deleted file mode 100644 index e62e60328cf0bd1a0ff48b4c282e50370453ea98..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 891 zcmZvaF>6&p5QT>*5&{9i=Al(!3wf0`cA}9N^niq5QVB{>NOxLWK`U*PBWNZ503i^N z!BV?)3Tc$7Y{b$s-8lCK!n^N!VRvUQJNunEvoE$bZ?CRgTrsm%+?n00^?Z%x<#RRv zee(33*%{lqyR%W->__%X)-Jm*BHUdPNdT?2Fmp4R(F|s-vPQom%-tj-4Y2mVLt)|O zGSLV_tD8n?V|==YrE7A^gK|&} zv=$3qTM3=B+vu^70eMmZRu5#2!*aVfqI8Df)j1fe&f#l-4f|6fEo4rs<7plyH>#ek zrzuK;6{!EdO_$DAa1FEdoy*&gcP9_O9KHE<<6!dfcjoo4nof_ezFa$8`ZM{k_j&E+ my57G!x^(6F>z_Z44