diff --git a/mods/mcl_farming/depends.txt b/mods/mcl_farming/depends.txt index 9e1c11721..bba645a33 100644 --- a/mods/mcl_farming/depends.txt +++ b/mods/mcl_farming/depends.txt @@ -1,4 +1,4 @@ mcl_core bucket mcl_wool -torches +mcl_torches diff --git a/mods/mcl_farming/pumpkin.lua b/mods/mcl_farming/pumpkin.lua index 5728bf1bb..a80755f52 100644 --- a/mods/mcl_farming/pumpkin.lua +++ b/mods/mcl_farming/pumpkin.lua @@ -280,7 +280,7 @@ minetest.register_node("mcl_farming:pumpkin_face_light", { minetest.register_craft({ output = "mcl_farming:pumpkin_face_light", recipe = {{"mcl_farming:pumpkin_face"}, - {"torches:torch"}} + {"mcl_torches:torch"}} }) minetest.register_craft({ diff --git a/mods/torches/LICENSE.txt b/mods/mcl_torches/LICENSE.txt similarity index 100% rename from mods/torches/LICENSE.txt rename to mods/mcl_torches/LICENSE.txt diff --git a/mods/torches/README.txt b/mods/mcl_torches/README.txt similarity index 97% rename from mods/torches/README.txt rename to mods/mcl_torches/README.txt index b03be44ef..17353c823 100644 --- a/mods/torches/README.txt +++ b/mods/mcl_torches/README.txt @@ -24,6 +24,8 @@ Changes for MineClone: ~~~~~~~~~~~~~~~~~~~~~~ - Torch does not generate light when wielding - Torch drops when near water +- Torch can't be placed on ceiling +- Simple API (WIP) License: ~~~~~~~~ diff --git a/mods/torches/depends.txt b/mods/mcl_torches/depends.txt similarity index 100% rename from mods/torches/depends.txt rename to mods/mcl_torches/depends.txt diff --git a/mods/torches/description.txt b/mods/mcl_torches/description.txt similarity index 100% rename from mods/torches/description.txt rename to mods/mcl_torches/description.txt diff --git a/mods/torches/init.lua b/mods/mcl_torches/init.lua similarity index 84% rename from mods/torches/init.lua rename to mods/mcl_torches/init.lua index a5848bd4c..24ee53a8f 100644 --- a/mods/torches/init.lua +++ b/mods/mcl_torches/init.lua @@ -6,12 +6,12 @@ mcl_torches = {} mcl_torches.register_torch = function(substring, description, icon, mesh_floor, mesh_wall, tiles, light, groups, sounds) - local itemstring = "torches:"..substring - local itemstring_wall = "torches:"..substring.."_wall" + local itemstring = "mcl_torches:"..substring + local itemstring_wall = "mcl_torches:"..substring.."_wall" if light == nil then light = 14 end - if mesh_floor == nil then mesh_floor = "torch_floor.obj" end - if mesh_wall == nil then mesh_wall = "torch_wall.obj" end + if mesh_floor == nil then mesh_floor = "mcl_torches_torch_floor.obj" end + if mesh_wall == nil then mesh_wall = "mcl_torches_torch_wall.obj" end if groups == nil then groups = {} end groups.attached_node = 1 @@ -63,16 +63,16 @@ mcl_torches.register_torch = function(substring, description, icon, mesh_floor, -- Prevent placement of ceiling torches return itemstack elseif wdir == 1 then - retval = fakestack:set_name("torches:torch") + retval = fakestack:set_name("mcl_torches:torch") else - retval = fakestack:set_name("torches:torch_wall") + retval = fakestack:set_name("mcl_torches:torch_wall") end if not retval then return itemstack end itemstack = minetest.item_place(fakestack, placer, pointed_thing, wdir) - itemstack:set_name("torches:torch") + itemstack:set_name("mcl_torches:torch") return itemstack end @@ -103,7 +103,7 @@ mcl_torches.register_torch = function(substring, description, icon, mesh_floor, end mcl_torches.register_torch("torch", "Torch", "default_torch_on_floor.png", - "torch_floor.obj", "torch_wall.obj", + "mcl_torches_torch_floor.obj", "mcl_torches_torch_wall.obj", {{ name = "default_torch_on_floor_animated.png", animation = {type = "vertical_frames", aspect_w = 16, aspect_h = 16, length = 3.3} @@ -114,7 +114,7 @@ mcl_torches.register_torch("torch", "Torch", "default_torch_on_floor.png", minetest.register_craft({ - output = "torches:torch 4", + output = "mcl_torches:torch 4", recipe = { { "group:coal" }, { "mcl_core:stick" }, diff --git a/mods/mcl_torches/mod.conf b/mods/mcl_torches/mod.conf new file mode 100644 index 000000000..ec9cfb624 --- /dev/null +++ b/mods/mcl_torches/mod.conf @@ -0,0 +1 @@ +name = mcl_torches diff --git a/mods/torches/models/torch_floor.obj b/mods/mcl_torches/models/mcl_torches_torch_floor.obj similarity index 100% rename from mods/torches/models/torch_floor.obj rename to mods/mcl_torches/models/mcl_torches_torch_floor.obj diff --git a/mods/torches/models/torch_wall.obj b/mods/mcl_torches/models/mcl_torches_torch_wall.obj similarity index 100% rename from mods/torches/models/torch_wall.obj rename to mods/mcl_torches/models/mcl_torches_torch_wall.obj diff --git a/mods/torches/screenshot.png b/mods/mcl_torches/screenshot.png similarity index 100% rename from mods/torches/screenshot.png rename to mods/mcl_torches/screenshot.png diff --git a/mods/mcl_walls/init.lua b/mods/mcl_walls/init.lua index d6ce0d2ff..8d952b7ab 100644 --- a/mods/mcl_walls/init.lua +++ b/mods/mcl_walls/init.lua @@ -45,7 +45,7 @@ local function update_wall(pos) -- Torches or walkable nodes above the wall local upnode = minetest.get_node({x = pos.x, y = pos.y+1, z = pos.z}) if sum == 5 or sum == 10 then - if minetest.registered_nodes[upnode.name].walkable or upnode.name == "torches:floor" then + if minetest.registered_nodes[upnode.name].walkable or upnode.name == "mcl_torches:floor" then sum = sum + 11 end end diff --git a/mods/minetest-3d_armor/3d_armor/armor.lua b/mods/minetest-3d_armor/3d_armor/armor.lua index 591243231..4254ca19c 100644 --- a/mods/minetest-3d_armor/3d_armor/armor.lua +++ b/mods/minetest-3d_armor/3d_armor/armor.lua @@ -25,7 +25,7 @@ ARMOR_FIRE_NODES = { {"fire:permanent_flame", 3, 4}, {"ethereal:crystal_spike", 2, 1}, {"ethereal:fire_flower", 2, 1}, - {"torches:torch", 1, 1}, + {"mcl_torches:torch", 1, 1}, } local skin_mod = nil diff --git a/mods/minetest-3d_armor/wieldview/transform.lua b/mods/minetest-3d_armor/wieldview/transform.lua index aeb2eb442..c2ee31886 100644 --- a/mods/minetest-3d_armor/wieldview/transform.lua +++ b/mods/minetest-3d_armor/wieldview/transform.lua @@ -1,7 +1,7 @@ -- Wielded Item Transformations - http://dev.minetest.net/texture wieldview_transform = { - ["torches:torch"]="R270", + ["mcl_torches:torch"]="R270", ["mcl_core:sapling"]="R270", ["flowers:dandelion_white"]="R270", ["flowers:dandelion_yellow"]="R270", diff --git a/mods/mobs_mc/enderman.lua b/mods/mobs_mc/enderman.lua index f2fa44fcb..5e738a861 100644 --- a/mods/mobs_mc/enderman.lua +++ b/mods/mobs_mc/enderman.lua @@ -54,7 +54,7 @@ mobs:register_mob("mobs_mc:enderman", { view_range = 16, attack_type = "dogfight", replace_rate = 1, - replace_what = {"torches:torch","mcl_core:sand","mcl_core:desert_sand","mcl_core:cobble","mcl_core:dirt","mcl_core:dirt_with_glass","mcl_core:dirt_with_dry_grass","mcl_core:wood","mcl_core:stone","mcl_core:sandstone"}, + replace_what = {"mcl_torches:torch","mcl_core:sand","mcl_core:desert_sand","mcl_core:cobble","mcl_core:dirt","mcl_core:dirt_with_glass","mcl_core:dirt_with_dry_grass","mcl_core:wood","mcl_core:stone","mcl_core:sandstone"}, replace_with = "air", replace_offset = -1, diff --git a/mods/mobs_mc/spider.lua b/mods/mobs_mc/spider.lua index b53929076..d8fb35602 100644 --- a/mods/mobs_mc/spider.lua +++ b/mods/mobs_mc/spider.lua @@ -35,7 +35,7 @@ mobs:register_mob("mobs_mc:spider", { floats = 0, group_attack = true, replace_rate = 5, - replace_what = {"torches:torch"}, + replace_what = {"mcl_torches:torch"}, replace_with = "air", replace_offset = -1, peaceful = false, diff --git a/mods/torches/changelog.txt b/mods/torches/changelog.txt deleted file mode 100644 index cab14fd77..000000000 --- a/mods/torches/changelog.txt +++ /dev/null @@ -1,37 +0,0 @@ -Changelog: ----------- -1.1 - 1.2.x: -- Torches on wall dont fall when node under it is dug -- Torches fall directly when not placed on floor or wall -- fixed different placing bugs - -1.3: -- Torches only show flames when player is near (13 blocks) -- Old torches are converted to new, ceiling torches are dropped - -1.3.1: -- fix dropping torches when digging a block next to it -- all torches attached to a block get droped when dug - -1.3.2: -- fix crashes by unknown nodes - -2.0: -- Use new mesh drawtype to improve wallmounted torches -- Update particle usage -- New textures; flame texture fix by Yepoleb -- Fix for doors, chests, etc (rightclick support) - -2.1 -- Fix wallmounted torch mesh -- Clean up code, use wallmounted paramtype2 -- Fix torches being placeable on ceilings (reported by kilbith) - -3.0 -- Minetest style added and used by default -- style can be changed via settings -- using Minetest style allows ceiling torches via settings -- Minetest style supports all texturepacks (as long torch shaped) - -3.0.1 -- Fix global variable that caused rarely placing issues (thanks to tchncs for pointing out) diff --git a/mods/torches/mod.conf b/mods/torches/mod.conf deleted file mode 100644 index b8c44b948..000000000 --- a/mods/torches/mod.conf +++ /dev/null @@ -1 +0,0 @@ -name = torches diff --git a/mods/torches/settingtypes.txt b/mods/torches/settingtypes.txt deleted file mode 100644 index 3d99e647e..000000000 --- a/mods/torches/settingtypes.txt +++ /dev/null @@ -1,9 +0,0 @@ - -# Enable wielded torches to light the area around it as the player moves. This is -# somewhat resource intensive and may be disabled to reduce lag. -torches_wieldlight_enable (Enable held torch to emit light) bool false - -# How often the wieldlight should be moved if the player moves with a torch in their -# hand. Reducing this makes it feel more laggy, but reduces the amount of network -# packets sent to clients. -torches_wieldlight_interval (Torch light from held torch update interval) float 0.25