diff --git a/mods/lumien/init.lua b/mods/lumien/init.lua index e763ba43..1b2ddc4c 100644 --- a/mods/lumien/init.lua +++ b/mods/lumien/init.lua @@ -151,7 +151,7 @@ minetest.register_abm( util.nodefunc( {x = pos.x-1, y = pos.y-1, z = pos.z-1}, {x = pos.x+1, y = pos.y+1, z = pos.z+1}, - "tnt:tnt", + "rp_tnt:tnt", function(pos) tnt.burn(pos) end, diff --git a/mods/lumien/mod.conf b/mods/lumien/mod.conf index 6eb7142a..aa968dec 100644 --- a/mods/lumien/mod.conf +++ b/mods/lumien/mod.conf @@ -1,2 +1,2 @@ name = lumien -depends = rp_default, tnt, util, crafting, achievements +depends = rp_default, rp_tnt, util, crafting, achievements diff --git a/mods/mobs/mob_mineturtle.lua b/mods/mobs/mob_mineturtle.lua index f060c48b..f6519356 100644 --- a/mods/mobs/mob_mineturtle.lua +++ b/mods/mobs/mob_mineturtle.lua @@ -31,7 +31,7 @@ mobs:register_mob( jump = true, view_range = 10, drops = { - {name = "tnt:tnt", + {name = "rp_tnt:tnt", chance = 1, min = 1, max = 3}, }, water_damage = 0, diff --git a/mods/mobs/mob_npc.lua b/mods/mobs/mob_npc.lua index da7310b6..2784f4b5 100644 --- a/mods/mobs/mob_npc.lua +++ b/mods/mobs/mob_npc.lua @@ -246,7 +246,7 @@ for _, npc_type_table in pairs(npc_types) do else say(S("You can use this to light up torches."), name) end - elseif iname == "tnt:tnt" then + elseif iname == "rp_tnt:tnt" then if minetest.settings:get_bool("tnt_enable", true) then say(S("TNT needs to be ignited by a flint and steel."), name) else diff --git a/mods/rp_default/tools.lua b/mods/rp_default/tools.lua index a8f3f6a5..67fa4d60 100644 --- a/mods/rp_default/tools.lua +++ b/mods/rp_default/tools.lua @@ -862,8 +862,8 @@ minetest.register_tool( }) wear = true - elseif nodename == "tnt:tnt" then - local y = minetest.registered_nodes["tnt:tnt"] + elseif nodename == "rp_tnt:tnt" then + local y = minetest.registered_nodes["rp_tnt:tnt"] if y ~= nil then y.on_punch(pos, node, user) wear = true diff --git a/mods/tnt/README.txt b/mods/rp_tnt/README.txt similarity index 100% rename from mods/tnt/README.txt rename to mods/rp_tnt/README.txt diff --git a/mods/tnt/init.lua b/mods/rp_tnt/init.lua similarity index 95% rename from mods/tnt/init.lua rename to mods/rp_tnt/init.lua index 191afcfa..65a14f8f 100644 --- a/mods/tnt/init.lua +++ b/mods/rp_tnt/init.lua @@ -4,7 +4,7 @@ -- By PilzAdam and ShadowNinja -- Tweaked by Kaadmy, for Pixture -- -local S = minetest.get_translator("tnt") +local S = minetest.get_translator("rp_tnt") tnt = {} @@ -158,9 +158,9 @@ end function tnt.burn(pos) local name = minetest.get_node(pos).name - if tnt_enable and name == "tnt:tnt" then + if tnt_enable and name == "rp_tnt:tnt" then minetest.sound_play("tnt_ignite", {pos = pos}, true) - minetest.set_node(pos, {name = "tnt:tnt_burning"}) + minetest.set_node(pos, {name = "rp_tnt:tnt_burning"}) minetest.get_node_timer(pos):start(2) end end @@ -254,7 +254,7 @@ else end minetest.register_node( - "tnt:tnt", + "rp_tnt:tnt", { description = desc, _tt_help = tt, @@ -294,7 +294,7 @@ minetest.register_node( -- Nodes minetest.register_node( - "tnt:tnt_burning", + "rp_tnt:tnt_burning", { tiles = { { @@ -308,7 +308,7 @@ minetest.register_node( }, "tnt_bottom.png", "tnt_sides.png"}, light_source = 5, - drop = "tnt:tnt", + drop = "rp_tnt:tnt", is_ground_content = false, groups = {handy = 2}, sounds = default.node_sound_wood_defaults(), @@ -322,7 +322,7 @@ minetest.register_node( crafting.register_craft( { - output = "tnt:tnt", + output = "rp_tnt:tnt", items = { "group:planks 4", "rp_default:flint_and_steel", @@ -332,7 +332,7 @@ crafting.register_craft( minetest.register_craft( { type = "fuel", - recipe = "tnt:tnt", + recipe = "rp_tnt:tnt", burntime = 13, }) @@ -354,8 +354,8 @@ else title = S("Boom?"), description = S("Craft defused TNT."), times = 1, - craftitem = "tnt:tnt", + craftitem = "rp_tnt:tnt", }) end -default.log("mod:tnt", "loaded") +default.log("mod:rp_tnt", "loaded") diff --git a/mods/tnt/locale/tnt.de.tr b/mods/rp_tnt/locale/rp_tnt.de.tr similarity index 93% rename from mods/tnt/locale/tnt.de.tr rename to mods/rp_tnt/locale/rp_tnt.de.tr index d9e7f93a..2a7408f7 100644 --- a/mods/tnt/locale/tnt.de.tr +++ b/mods/rp_tnt/locale/rp_tnt.de.tr @@ -1,4 +1,4 @@ -# textdomain: tnt +# textdomain: rp_tnt TNT=TNT TNT (defused)=TNT (entschärft) Boom!=Bumm! diff --git a/mods/tnt/locale/tnt.fr.tr b/mods/rp_tnt/locale/rp_tnt.fr.tr similarity index 88% rename from mods/tnt/locale/tnt.fr.tr rename to mods/rp_tnt/locale/rp_tnt.fr.tr index 7308f3c0..18e124c2 100644 --- a/mods/tnt/locale/tnt.fr.tr +++ b/mods/rp_tnt/locale/rp_tnt.fr.tr @@ -1,4 +1,4 @@ -# textdomain: tnt +# textdomain: rp_tnt TNT=Explosif TNT (defused)=Explosif (désamorcé) Boom!=Boom! diff --git a/mods/tnt/locale/template.txt b/mods/rp_tnt/locale/template.txt similarity index 85% rename from mods/tnt/locale/template.txt rename to mods/rp_tnt/locale/template.txt index d1f807c9..010396cd 100644 --- a/mods/tnt/locale/template.txt +++ b/mods/rp_tnt/locale/template.txt @@ -1,4 +1,4 @@ -# textdomain: tnt +# textdomain: rp_tnt TNT= TNT (defused)= Boom!= diff --git a/mods/tnt/mod.conf b/mods/rp_tnt/mod.conf similarity index 76% rename from mods/tnt/mod.conf rename to mods/rp_tnt/mod.conf index 256527ce..435bbc84 100644 --- a/mods/tnt/mod.conf +++ b/mods/rp_tnt/mod.conf @@ -1,2 +1,2 @@ -name = tnt +name = rp_tnt depends = rp_default, crafting, achievements diff --git a/mods/tnt/sounds/tnt_explode.ogg b/mods/rp_tnt/sounds/tnt_explode.ogg similarity index 100% rename from mods/tnt/sounds/tnt_explode.ogg rename to mods/rp_tnt/sounds/tnt_explode.ogg diff --git a/mods/tnt/sounds/tnt_ignite.ogg b/mods/rp_tnt/sounds/tnt_ignite.ogg similarity index 100% rename from mods/tnt/sounds/tnt_ignite.ogg rename to mods/rp_tnt/sounds/tnt_ignite.ogg diff --git a/mods/tnt/textures/tnt_bottom.png b/mods/rp_tnt/textures/tnt_bottom.png similarity index 100% rename from mods/tnt/textures/tnt_bottom.png rename to mods/rp_tnt/textures/tnt_bottom.png diff --git a/mods/tnt/textures/tnt_bottom.xcf b/mods/rp_tnt/textures/tnt_bottom.xcf similarity index 100% rename from mods/tnt/textures/tnt_bottom.xcf rename to mods/rp_tnt/textures/tnt_bottom.xcf diff --git a/mods/tnt/textures/tnt_sides.png b/mods/rp_tnt/textures/tnt_sides.png similarity index 100% rename from mods/tnt/textures/tnt_sides.png rename to mods/rp_tnt/textures/tnt_sides.png diff --git a/mods/tnt/textures/tnt_sides.xcf b/mods/rp_tnt/textures/tnt_sides.xcf similarity index 100% rename from mods/tnt/textures/tnt_sides.xcf rename to mods/rp_tnt/textures/tnt_sides.xcf diff --git a/mods/tnt/textures/tnt_smoke.png b/mods/rp_tnt/textures/tnt_smoke.png similarity index 100% rename from mods/tnt/textures/tnt_smoke.png rename to mods/rp_tnt/textures/tnt_smoke.png diff --git a/mods/tnt/textures/tnt_smoke.xcf b/mods/rp_tnt/textures/tnt_smoke.xcf similarity index 100% rename from mods/tnt/textures/tnt_smoke.xcf rename to mods/rp_tnt/textures/tnt_smoke.xcf diff --git a/mods/tnt/textures/tnt_top.png b/mods/rp_tnt/textures/tnt_top.png similarity index 100% rename from mods/tnt/textures/tnt_top.png rename to mods/rp_tnt/textures/tnt_top.png diff --git a/mods/tnt/textures/tnt_top.xcf b/mods/rp_tnt/textures/tnt_top.xcf similarity index 100% rename from mods/tnt/textures/tnt_top.xcf rename to mods/rp_tnt/textures/tnt_top.xcf diff --git a/mods/tnt/textures/tnt_top_burning.png b/mods/rp_tnt/textures/tnt_top_burning.png similarity index 100% rename from mods/tnt/textures/tnt_top_burning.png rename to mods/rp_tnt/textures/tnt_top_burning.png diff --git a/mods/tnt/textures/tnt_top_burning.xcf b/mods/rp_tnt/textures/tnt_top_burning.xcf similarity index 100% rename from mods/tnt/textures/tnt_top_burning.xcf rename to mods/rp_tnt/textures/tnt_top_burning.xcf diff --git a/mods/tnt/textures/tnt_top_disabled.png b/mods/rp_tnt/textures/tnt_top_disabled.png similarity index 100% rename from mods/tnt/textures/tnt_top_disabled.png rename to mods/rp_tnt/textures/tnt_top_disabled.png