diff --git a/mods/_misc/aliases.lua b/mods/_misc/aliases.lua index f2cf4b87..4526e681 100755 --- a/mods/_misc/aliases.lua +++ b/mods/_misc/aliases.lua @@ -1,51 +1,58 @@ --- Removed duplicated items from the carbone subgame because of Moreores mod +local alias = minetest.register_alias +-- Remove duplicated items from the carbone subgame because of Moreores mod -- Stone -minetest.register_alias("default:stone_with_tin", "default:stone") -minetest.register_alias("default:stone_with_silver", "default:stone") +alias("default:stone_with_tin", "default:stone") +alias("default:stone_with_silver", "default:stone") -- Lump -minetest.register_alias("default:tin_lump", "default:stone") -minetest.register_alias("default:silver_lump", "default:stone") +alias("default:tin_lump", "default:stone") +alias("default:silver_lump", "default:stone") -- Ingot -minetest.register_alias("default:tin_ingot", "default:stone") -minetest.register_alias("default:silver_ingot", "default:stone") +alias("default:tin_ingot", "default:stone") +alias("default:silver_ingot", "default:stone") -- Block -minetest.register_alias("default:tinblock", "default:stone") -minetest.register_alias("default:silverblock", "default:stone") +alias("default:tinblock", "default:stone") +alias("default:silverblock", "default:stone") -- Tools -minetest.register_alias("default:pick_silver", "default:stone") -minetest.register_alias("default:shovel_silver", "default:stone") -minetest.register_alias("default:axe_silver", "default:stone") -minetest.register_alias("default:sword_silver", "default:stone") -minetest.register_alias("default:knife_silver", "default:stone") +alias("default:pick_silver", "default:stone") +alias("default:shovel_silver", "default:stone") +alias("default:axe_silver", "default:stone") +alias("default:sword_silver", "default:stone") +alias("default:knife_silver", "default:stone") -- Remove torch from torches => remise des torches par défaut -minetest.register_alias("torches:floor", "default:torch") -minetest.register_alias("torches:wand", "default:torch") +alias("torches:floor", "default:torch") +alias("torches:wand", "default:torch") -- Remove copper_rail from moreores => utilisation des rail_copper du mod carts -minetest.register_alias("moreores:copper_rail", "carts:rail_copper") +alias("moreores:copper_rail", "carts:rail_copper") -- Old fishing mod to the new fishing mod -minetest.register_alias("fishing:fish_cooked", "fishing:fish") -minetest.register_alias("fishing:worm", "fishing:bait_worm") +alias("fishing:fish_cooked", "fishing:fish") +alias("fishing:worm", "fishing:bait_worm") -- Old itemframes mod to the new itemframes(v2) mod -minetest.register_alias("itemframes:pedestal", "itemframes:pedestal_cobble") +alias("itemframes:pedestal", "itemframes:pedestal_cobble") -- Remove "moreores:copper_rail" for "carts:copper_rail" -minetest.register_alias("moreores:copper_rail", "carts:rail_copper") +alias("moreores:copper_rail", "carts:rail_copper") -- Remove "multitest:hayblock" because farming redo include it now -minetest.register_alias("multitest:hayblock", "farming:straw") +alias("multitest:hayblock", "farming:straw") -- Remove "darkage:stair_straw", "darkage:straw", "darkage:straw_bale" and "darkage:adobe" -minetest.register_alias("darkage:stair_straw", "farming:straw") -minetest.register_alias("darkage:straw", "farming:straw") -minetest.register_alias("darkage:straw_bale", "farming:straw") -minetest.register_alias("darkage:adobe", "farming:straw") +alias("darkage:stair_straw", "farming:straw") +alias("darkage:straw", "farming:straw") +alias("darkage:straw_bale", "farming:straw") +alias("darkage:adobe", "farming:straw") -- Remove "wiki:wiki" -minetest.register_alias("wiki:wiki", "default:bookshelf") +alias("wiki:wiki", "default:bookshelf") -- Remove "building_blocks:knife" -minetest.register_alias("building_blocks:knife", "default:sword_steel") +alias("building_blocks:knife", "default:sword_steel") + +-- Remove "jumping" mod +alias("jumping:cushion", "wool:dark_green") +for i = 1, 6 do + alias("jumping:trampoline_" .. i, "default:wood") +end \ No newline at end of file diff --git a/mods/jumping/README.md b/mods/jumping/README.md deleted file mode 100755 index 17e3a09b..00000000 --- a/mods/jumping/README.md +++ /dev/null @@ -1,7 +0,0 @@ -Jumping - -Jumping is a mod for minetest that adds trampolines, cushions, ... - -License: GPLv3 - -Creator: Jeija diff --git a/mods/jumping/init.lua b/mods/jumping/init.lua deleted file mode 100755 index 65ab9cc1..00000000 --- a/mods/jumping/init.lua +++ /dev/null @@ -1,79 +0,0 @@ -local trampolinebox = { - type = "fixed", - fixed = { - {-0.5, -0.2, -0.5, 0.5, 0, 0.5}, - - {-0.5, -0.5, -0.5, -0.4, -0.2, -0.4}, - { 0.4, -0.5, -0.5, 0.5, -0.2, -0.4}, - { 0.4, -0.5, 0.4, 0.5, -0.2, 0.5}, - {-0.5, -0.5, 0.4, -0.4, -0.2, 0.5}, - } -} - -local cushionbox = { - type = "fixed", - fixed = { - {-0.5, -0.5, -0.5, 0.5, -0.3, 0.5}, - } -} - -local trampoline_punch = function(pos, node) - local id = string.sub(node.name, #node.name) - id = id + 1 - if id == 7 then id = 1 end - minetest.add_node(pos, {name = string.sub(node.name, 1, #node.name - 1)..id}) -end - -for i = 1, 6 do - minetest.register_node("jumping:trampoline_" .. i, { - description = "Trampoline", - drawtype = "nodebox", - node_box = trampolinebox, - selection_box = trampolinebox, - paramtype = "light", - on_punch = trampoline_punch, - tiles = { - "jumping_trampoline_top.png", - "jumping_trampoline_bottom.png", - "jumping_trampoline_sides.png^jumping_trampoline_sides_overlay_" .. i .. ".png", - }, - drop = "jumping:trampoline_1", - groups = {dig_immediate = 2, bouncy = 16 + i * 16, fall_damage_add_percent = -65, disable_jump = 1}, - }) -end - -minetest.register_node("jumping:cushion", { - description = "Cushion", - drawtype = "nodebox", - node_box = cushionbox, - selection_box = cushionbox, - paramtype = "light", - tiles = { - "jumping_cushion_tb.png", - "jumping_cushion_tb.png", - "jumping_cushion_sides.png", - }, - groups = {dig_immediate = 2, disable_jump = 1, fall_damage_add_percent = -100}, -}) - -minetest.register_craft({ - output = "jumping:trampoline_1", - recipe = { - {"group:ingot", "group:ingot", "group:ingot"}, - {"default:leaves", "default:leaves", "default:leaves"}, - {"default:stick", "default:stick", "default:stick"}, - } -}) - -minetest.register_craft({ - output = "jumping:cushion", - recipe = { - {"default:junglegrass", "default:junglegrass", "default:junglegrass"}, - {"default:leaves", "default:leaves", "default:leaves"}, - {"default:stick", "default:stick", "default:stick"}, - } -}) - -if minetest.setting_getbool("log_mods") then - minetest.log("action", "Carbone: [jumping] loaded.") -end diff --git a/mods/jumping/textures/jumping_cushion_sides.png b/mods/jumping/textures/jumping_cushion_sides.png deleted file mode 100755 index 9d65797d..00000000 Binary files a/mods/jumping/textures/jumping_cushion_sides.png and /dev/null differ diff --git a/mods/jumping/textures/jumping_cushion_tb.png b/mods/jumping/textures/jumping_cushion_tb.png deleted file mode 100755 index 1cc91c8f..00000000 Binary files a/mods/jumping/textures/jumping_cushion_tb.png and /dev/null differ diff --git a/mods/jumping/textures/jumping_trampoline_bottom.png b/mods/jumping/textures/jumping_trampoline_bottom.png deleted file mode 100755 index 7ade61ef..00000000 Binary files a/mods/jumping/textures/jumping_trampoline_bottom.png and /dev/null differ diff --git a/mods/jumping/textures/jumping_trampoline_sides.png b/mods/jumping/textures/jumping_trampoline_sides.png deleted file mode 100755 index ff3f6e43..00000000 Binary files a/mods/jumping/textures/jumping_trampoline_sides.png and /dev/null differ diff --git a/mods/jumping/textures/jumping_trampoline_sides_overlay_1.png b/mods/jumping/textures/jumping_trampoline_sides_overlay_1.png deleted file mode 100755 index 1119f46a..00000000 Binary files a/mods/jumping/textures/jumping_trampoline_sides_overlay_1.png and /dev/null differ diff --git a/mods/jumping/textures/jumping_trampoline_sides_overlay_2.png b/mods/jumping/textures/jumping_trampoline_sides_overlay_2.png deleted file mode 100755 index 3853953f..00000000 Binary files a/mods/jumping/textures/jumping_trampoline_sides_overlay_2.png and /dev/null differ diff --git a/mods/jumping/textures/jumping_trampoline_sides_overlay_3.png b/mods/jumping/textures/jumping_trampoline_sides_overlay_3.png deleted file mode 100755 index 7c3ae249..00000000 Binary files a/mods/jumping/textures/jumping_trampoline_sides_overlay_3.png and /dev/null differ diff --git a/mods/jumping/textures/jumping_trampoline_sides_overlay_4.png b/mods/jumping/textures/jumping_trampoline_sides_overlay_4.png deleted file mode 100755 index f1ba54d1..00000000 Binary files a/mods/jumping/textures/jumping_trampoline_sides_overlay_4.png and /dev/null differ diff --git a/mods/jumping/textures/jumping_trampoline_sides_overlay_5.png b/mods/jumping/textures/jumping_trampoline_sides_overlay_5.png deleted file mode 100755 index fde0ad00..00000000 Binary files a/mods/jumping/textures/jumping_trampoline_sides_overlay_5.png and /dev/null differ diff --git a/mods/jumping/textures/jumping_trampoline_sides_overlay_6.png b/mods/jumping/textures/jumping_trampoline_sides_overlay_6.png deleted file mode 100755 index b1a93fe3..00000000 Binary files a/mods/jumping/textures/jumping_trampoline_sides_overlay_6.png and /dev/null differ diff --git a/mods/jumping/textures/jumping_trampoline_top.png b/mods/jumping/textures/jumping_trampoline_top.png deleted file mode 100755 index c5df874c..00000000 Binary files a/mods/jumping/textures/jumping_trampoline_top.png and /dev/null differ